diff --git a/.gitignore b/.gitignore
index 35134564af6..27c3dc7e43a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ funnel_comp
 # CMake build directory
 ######################################
 /build
+Buildings/Resources/src/fmi-library/build
 
 
 # Temporary files generated by emacs
diff --git a/.travis.yml b/.travis.yml
index dd2237fc56e..a51c831d1f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,8 @@
-<<<<<<< HEAD
-dist: trusty
-sudo: false
-=======
 os: Linux
 dist: bionic
->>>>>>> master
 
 language: python
+
 python:
   - "3.6"
 
@@ -26,14 +22,6 @@ git:
 
 services:
   - docker
-<<<<<<< HEAD
-
-env:
-  global:
-    - ENERGYPLUS_VERSION=EnergyPlus-9.2.0-921312fa1d-Linux-x86_64
-  jobs:
-    - TEST_ARG="make test-documentation test-experiment-setup test-autogenerated-files test-verify-files"
-=======
   - xvfb
 
 
@@ -57,10 +45,12 @@ env:
     - TEST_ARG="make test-cdl-conformance"
     - TEST_ARG="make test-energyplus-validations"
     - TEST_ARG="make test-bestest test-spawn-portability"
->>>>>>> master
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Air,Examples}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.EnergyPlus\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.EnergyPlus\""
+    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
@@ -70,12 +60,18 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
+    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
+    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Applications,Experimental}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Applications,Experimental}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Applications,Experimental}\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,Delays}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,Delays}\""
-    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,Delays}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
+    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Examples,FMI,FixedResistances,Geothermal}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Examples,FMI,FixedResistances,Geothermal}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{Examples,FMI,FixedResistances,Geothermal}\""
@@ -85,12 +81,6 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
-    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
-    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.ThermalZones.ReducedOrder\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Electrical\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Electrical\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Electrical\""
@@ -100,37 +90,27 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.HeatTransfer\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.HeatTransfer\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.HeatTransfer\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
-    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Obsolete.Controls,Occupants,Media}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Obsolete.Controls,Occupants,Media}\""
+    - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Obsolete.Controls,Occupants,Media}\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Utilities\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Utilities\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.Utilities\""
+    - TEST_ARG="make test-omc"
 
 before_install:
+  - sudo apt-get -y install python3.6-minimal  # Provides /usr/bin/python3.6m
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-<<<<<<< HEAD
-  - if [[ "$TEST_ARG" == *test-dymola* ]]; then
-       docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2020x-x86_64;
-       chmod +x Buildings/Resources/Scripts/travis/dymola/dymola;
-       cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
-    fi;
-  - if [[ "$TEST_ARG" == *test-optimica* ]]; then
-       docker pull "$DOCKER_USERNAME"/travis-ubuntu-1804-optimica;
-       chmod +x Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh;
-=======
   - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
        docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola:2022-x86_64;
        cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
     fi;
   - if [[ "$TEST_ARG" == *test-optimica* ]]; then
        docker pull "$DOCKER_USERNAME"/travis-ubuntu-1804-optimica:r19089;
->>>>>>> master
        cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
     fi;
   - if [[ "$TEST_ARG" == *test-jmodelica* ]]; then
        docker pull "$DOCKER_USERNAME"/ubuntu-1804_jmodelica_trunk;
-       chmod +x Buildings/Resources/Scripts/travis/jmodelica/jm_ipython.sh;
        cp Buildings/Resources/Scripts/travis/jmodelica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
     fi;
   - if [[ "$TEST_ARG" == *test-energyplus* ]]; then
@@ -167,3 +147,11 @@ install:
 # Execute tests
 script:
   - (cd Buildings/Resources/Scripts/travis && travis_wait 90 $TEST_ARG)
+
+after_failure:
+  - |
+    for ff in `find Buildings -maxdepth 1 -name '*.log'`; do
+      echo "*** Content of $ff"
+      cat $ff
+      echo "*** End of $ff"
+    done
diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
index 33dd51f7d4d..276c09870ef 100644
--- a/Buildings/.copiedFiles.txt
+++ b/Buildings/.copiedFiles.txt
@@ -82,6 +82,8 @@ Buildings/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo
 Buildings/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo
 Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.mo
 Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.order
+Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthNoEvent.mo
+Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthWithEvent.mo
 Buildings/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mo
 Buildings/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mo
 Buildings/BoundaryConditions/SolarGeometry/Examples/package.mo
@@ -257,6 +259,9 @@ Buildings/Fluid/Actuators/Dampers/Examples/package.order
 Buildings/Fluid/Actuators/Dampers/Exponential.mo
 Buildings/Fluid/Actuators/Dampers/MixingBox.mo
 Buildings/Fluid/Actuators/Dampers/PressureIndependent.mo
+Buildings/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo
+Buildings/Fluid/Actuators/Dampers/Validation/package.mo
+Buildings/Fluid/Actuators/Dampers/Validation/package.order
 Buildings/Fluid/Actuators/Dampers/package.mo
 Buildings/Fluid/Actuators/Dampers/package.order
 Buildings/Fluid/Actuators/Motors/Examples/IdealMotor.mo
@@ -1216,11 +1221,7 @@ Buildings/Media/Examples/PropyleneGlycolWaterProperties.mo
 Buildings/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mo
 Buildings/Media/Examples/SteamDerivativeCheck.mo
 Buildings/Media/Examples/SteamProperties.mo
-<<<<<<< HEAD
-Buildings/Media/Examples/SteamSaturatedProperties.mo
-=======
 Buildings/Media/Examples/SteamSaturationConsistencyCheck.mo
->>>>>>> master
 Buildings/Media/Examples/SteamTemperatureEnthalpyInversion.mo
 Buildings/Media/Examples/WaterDerivativeCheck.mo
 Buildings/Media/Examples/WaterProperties.mo
@@ -1407,6 +1408,8 @@ Buildings/Resources/Images/Fluid/Sensors/onePortHex.png
 Buildings/Resources/Images/Fluid/Sensors/onePortHex.tiff
 Buildings/Resources/Images/Fluid/Sensors/twoPortHex.png
 Buildings/Resources/Images/Fluid/Sensors/twoPortHex.tiff
+Buildings/Resources/Images/Fluid/Sensors/warningIcon.png
+Buildings/Resources/Images/Fluid/Sensors/warningIcon.svg
 Buildings/Resources/Images/Fluid/Storage/Stratified.pdf
 Buildings/Resources/Images/Fluid/Storage/Stratified.png
 Buildings/Resources/Images/Fluid/Storage/Stratified.svg
@@ -1426,8 +1429,6 @@ Buildings/Resources/Images/Media/Antifreeze/PropyleneGlycolWaterError20degC.png
 Buildings/Resources/Images/Media/Antifreeze/PropyleneGlycolWaterProperties.pdf
 Buildings/Resources/Images/Media/Antifreeze/PropyleneGlycolWaterProperties.png
 Buildings/Resources/Images/Media/Antifreeze/propyleneGlycol.py
-Buildings/Resources/Images/Media/Steam/numericalError.pdf
-Buildings/Resources/Images/Media/Steam/numericalError.png
 Buildings/Resources/Images/Media/Water/plotCp.pdf
 Buildings/Resources/Images/Media/Water/plotCp.png
 Buildings/Resources/Images/Media/Water/plotCp.py
@@ -1516,6 +1517,7 @@ Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Ex
 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mos
 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3LongHeader.mos
 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3_NonzeroStart.mos
+Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mos
 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos
 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mos
 Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos
@@ -1544,6 +1546,7 @@ Buildings/Resources/Scripts/Dymola/Fluid/Actuators/BaseClasses/Examples/EqualPer
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/Damper.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/MixingBox.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/VAVBoxExponential.mos
+Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Validation/PressureIndependent.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Motors/Examples/IdealMotor.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/ThreeWayValves.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos
@@ -1866,11 +1869,7 @@ Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterProperties
 Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mos
 Buildings/Resources/Scripts/Dymola/Media/Examples/SteamDerivativeCheck.mos
 Buildings/Resources/Scripts/Dymola/Media/Examples/SteamProperties.mos
-<<<<<<< HEAD
-Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturatedProperties.mos
-=======
 Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturationConsistencyCheck.mos
->>>>>>> master
 Buildings/Resources/Scripts/Dymola/Media/Examples/SteamTemperatureEnthalpyInversion.mos
 Buildings/Resources/Scripts/Dymola/Media/Examples/WaterDerivativeCheck.mos
 Buildings/Resources/Scripts/Dymola/Media/Examples/WaterProperties.mos
@@ -1883,6 +1882,7 @@ Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureD
 Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityTemperatureEnthalpyInversion.mos
 Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/WaterProperties_pT.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mos
+Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mos
 Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mos
@@ -1988,24 +1988,19 @@ Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonths.
 Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsMinus.mos
 Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsPlus.mos
 Buildings/Resources/Scripts/JModelica/buildingspy_to_csv.py
-<<<<<<< HEAD
-Buildings/Resources/Scripts/travis/bin/dymola
-Buildings/Resources/Scripts/travis/bin/jm_ipython.sh
-=======
 Buildings/Resources/Scripts/travis/dymola/dymola
->>>>>>> master
 Buildings/Resources/bin/ConvertWeatherData.jar
 Buildings/Resources/src/convertEPW/Makefile
 Buildings/Resources/src/convertEPW/doc/ConvertWeatherData.html
-Buildings/Resources/src/convertEPW/doc/allclasses-frame.html
-Buildings/Resources/src/convertEPW/doc/allclasses-noframe.html
+Buildings/Resources/src/convertEPW/doc/allclasses-index.html
+Buildings/Resources/src/convertEPW/doc/allclasses.html
+Buildings/Resources/src/convertEPW/doc/allpackages-index.html
 Buildings/Resources/src/convertEPW/doc/constant-values.html
 Buildings/Resources/src/convertEPW/doc/deprecated-list.html
+Buildings/Resources/src/convertEPW/doc/element-list
 Buildings/Resources/src/convertEPW/doc/help-doc.html
 Buildings/Resources/src/convertEPW/doc/index-all.html
 Buildings/Resources/src/convertEPW/doc/index.html
-<<<<<<< HEAD
-=======
 Buildings/Resources/src/convertEPW/doc/jquery/external/jquery/jquery.js
 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
 Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_65_dadada_1x400.png
@@ -2035,14 +2030,19 @@ Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.js
 Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.min.js
 Buildings/Resources/src/convertEPW/doc/member-search-index.js
 Buildings/Resources/src/convertEPW/doc/member-search-index.zip
->>>>>>> master
 Buildings/Resources/src/convertEPW/doc/overview-tree.html
-Buildings/Resources/src/convertEPW/doc/package-frame.html
-Buildings/Resources/src/convertEPW/doc/package-list
+Buildings/Resources/src/convertEPW/doc/package-search-index.js
+Buildings/Resources/src/convertEPW/doc/package-search-index.zip
 Buildings/Resources/src/convertEPW/doc/package-summary.html
 Buildings/Resources/src/convertEPW/doc/package-tree.html
+Buildings/Resources/src/convertEPW/doc/resources/glass.png
 Buildings/Resources/src/convertEPW/doc/resources/inherit.gif
+Buildings/Resources/src/convertEPW/doc/resources/x.png
+Buildings/Resources/src/convertEPW/doc/script.js
+Buildings/Resources/src/convertEPW/doc/search.js
 Buildings/Resources/src/convertEPW/doc/stylesheet.css
+Buildings/Resources/src/convertEPW/doc/type-search-index.js
+Buildings/Resources/src/convertEPW/doc/type-search-index.zip
 Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java
 Buildings/Resources/src/convertEPW/src/Makefile
 Buildings/Resources/src/convertEPW/src/Manifest.txt
@@ -2060,6 +2060,7 @@ Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.m
 Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/package.mo
 Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/package.order
 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo
+Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo
 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mo
 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mo
 Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mo
diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
index 20e98caa8a3..bcf2e856340 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
@@ -6,127 +6,200 @@ model ControllerChillerDXHeatingEconomizer
   parameter Modelica.SIunits.Temperature TSupChi_nominal
     "Design value for chiller leaving water temperature";
   parameter Real minAirFlo(
-    min=0,
-    max=1,
-    unit="1") = 0.2
-    "Minimum airflow rate of system"
-    annotation(Dialog(group="Air design"));
+    final min=0,
+    final max=1,
+    final unit="1")
+    "Minimum airflow fraction of system"
+    annotation(Dialog(group="Setpoints"));
+  parameter Modelica.SIunits.DimensionlessRatio minOAFra
+    "Minimum outdoor air fraction of system"
+    annotation(Dialog(group="Setpoints"));
+  parameter Modelica.SIunits.Temperature TSetSupAir
+    "Cooling supply air temperature setpoint"
+    annotation(Dialog(group="Setpoints"));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeHea=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation(Dialog(group="Heating coil control"));
+  parameter Real kHea(
+    final unit="1/K")=0.1
+    "Gain for heating coil control signal"
+    annotation(Dialog(group="Heating coil control"));
+  parameter Real TiHea(
+    final unit="s",
+    final quantity="Time")=900
+    "Time constant of integrator block for heating coil control signal"
+    annotation(Dialog(group="Heating coil control",
+    enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+        or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real TdHea(
+    final unit="s",
+    final quantity="Time")=0.1
+    "Time constant of derivative block for heating coil control signal"
+    annotation (Dialog(group="Heating coil control",
+      enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+          or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeCoo=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation(Dialog(group="Cooling coil control"));
+  parameter Real kCoo(
+    final unit="1/K")=0.1
+    "Gain for cooling coil control signal"
+    annotation(Dialog(group="Cooling coil control"));
+  parameter Real TiCoo(
+    final unit="s")=900
+    "Time constant of integrator block for cooling coil control signal"
+    annotation(Dialog(group="Cooling coil control",
+    enable=controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+        or controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real TdCoo(
+    final unit="s")=0.1
+    "Time constant of derivative block for cooling coil control signal"
+    annotation (Dialog(group="Cooling coil control",
+    enable=controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+        or controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeFan=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation(Dialog(group="Fan control"));
+  parameter Real kFan(final unit="1/K")=0.1
+    "Gain for fan signal"
+    annotation(Dialog(group="Fan control"));
+  parameter Real TiFan(
+    final unit="s",
+    final quantity="Time")=900
+    "Time constant of integrator block for fan signal"
+    annotation(Dialog(group="Fan control",
+    enable=controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+        or controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real TdFan(
+    final unit="s",
+    final quantity="Time")=0.1
+    "Time constant of derivative block for fan signal"
+    annotation (Dialog(group="Fan control",
+    enable=controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+        or controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeEco=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation(Dialog(group="Economizer control"));
+  parameter Real kEco(final unit="1/K")=0.1
+    "Gain for economizer control signal"
+    annotation(Dialog(group="Economizer control"));
+  parameter Real TiEco=300
+    "Time constant of integrator block for economizer control signal"
+    annotation(Dialog(group="Economizer control",
+    enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+        or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real TdEco(
+    final unit="s",
+    final quantity="Time")=0.1
+    "Time constant of derivative block for economizer control signal"
+    annotation (Dialog(group="Economizer control",
+      enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+          or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
 
-  parameter Modelica.SIunits.DimensionlessRatio minOAFra "Minimum outdoor air fraction of system"
-    annotation(Dialog(group="Air design"));
-
-  parameter Modelica.SIunits.Temperature TSetSupAir "Cooling supply air temperature setpoint"
-    annotation(Dialog(group="Air design"));
-
-  parameter Real kHea(min=Modelica.Constants.small) = 2
-    "Gain of heating controller"
-    annotation(Dialog(group="Control gain"));
-
-  parameter Real kCoo(min=Modelica.Constants.small)=1
-    "Gain of controller for cooling valve"
-    annotation(Dialog(group="Control gain"));
-
-  parameter Real kFan(min=Modelica.Constants.small) = 0.5
-    "Gain of controller for fan"
-    annotation(Dialog(group="Control gain"));
-
-  parameter Real kEco(min=Modelica.Constants.small) = 4
-    "Gain of controller for economizer"
-    annotation(Dialog(group="Control gain"));
-
-  Modelica.Blocks.Interfaces.RealInput TRoo(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSetRooCoo(
     final unit="K",
-    displayUnit="degC") "Zone temperature measurement"
-  annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        origin={-120,-60})));
-
-  Modelica.Blocks.Interfaces.RealInput TSetRooCoo(
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Zone cooling setpoint temperature"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+        iconTransformation(extent={{-140,10},{-100,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSetRooHea(
     final unit="K",
-    displayUnit="degC")
-    "Zone cooling setpoint temperature" annotation (Placement(transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=180,
-        origin={-120,60})));
-  Modelica.Blocks.Interfaces.RealInput TSetRooHea(
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Zone heating setpoint temperature"
+    annotation (Placement(transformation(extent={{-140,100},{-100,140}}),
+        iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TRoo(
     final unit="K",
-    displayUnit="degC")
-    "Zone heating setpoint temperature" annotation (Placement(transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=180,
-        origin={-120,100})));
-
-  Modelica.Blocks.Interfaces.RealInput TMix(
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Zone temperature measurement"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-120,-80}),
+        iconTransformation(extent={{-20,-20},{20,20}},origin={-120,-60})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TMix(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Measured mixed air temperature"
-    annotation (Placement(transformation(extent={{-140,0},{-100,40}})));
-
-  Modelica.Blocks.Interfaces.RealInput TSup(
+    annotation (Placement(transformation(extent={{-140,10},{-100,50}}),
+        iconTransformation(extent={{-140,70},{-100,110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Measured supply air temperature after the cooling coil"
-    annotation (Placement(transformation(extent={{-140,-110},{-100,-70}})));
-
-  Modelica.Blocks.Interfaces.RealInput TOut(
+    annotation (Placement(transformation(extent={{-140,-130},{-100,-90}}),
+        iconTransformation(extent={{-140,-110},{-100,-70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TOut(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Measured outside air temperature"
-    annotation (Placement(transformation(extent={{-140,-40},{-100,0}})));
-
-  Modelica.Blocks.Interfaces.RealOutput yHea(final unit="1") "Control signal for heating coil"
-    annotation (Placement(transformation(extent={{100,50},{120,70}})));
-
-  Modelica.Blocks.Interfaces.RealOutput yFan(final unit="1") "Control signal for fan"
-    annotation (Placement(transformation(extent={{100,80},{120,100}})));
-
-  Modelica.Blocks.Interfaces.RealOutput yOutAirFra(final unit="1")
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+        iconTransformation(extent={{-140,-50},{-100,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHea(
+    final unit="1") "Control signal for heating coil"
+    annotation (Placement(transformation(extent={{100,44},{120,64}}),
+        iconTransformation(extent={{100,30},{140,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yFan(
+    final unit="1") "Control signal for fan"
+    annotation (Placement(transformation(extent={{100,80},{120,100}}),
+        iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yOutAirFra(
+    final unit="1")
     "Control signal for outside air fraction"
-    annotation (Placement(transformation(extent={{100,20},{120,40}})));
-
-  Modelica.Blocks.Interfaces.RealOutput yCooCoiVal(final unit="1")
+    annotation (Placement(transformation(extent={{100,10},{120,30}}),
+        iconTransformation(extent={{100,0},{140,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCooCoiVal(
+    final unit="1")
     "Control signal for cooling coil valve"
-    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
-
-  Modelica.Blocks.Interfaces.RealOutput TSetSupChi(
+    annotation (Placement(transformation(extent={{100,-30},{120,-10}}),
+        iconTransformation(extent={{100,-40},{140,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSetSupChi(
     final unit="K",
     displayUnit="degC")
     "Set point for chiller leaving water temperature"
-    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
-
-  Modelica.Blocks.Interfaces.BooleanOutput chiOn "On signal for chiller"
-    annotation (Placement(transformation(extent={{100,-50},{120,-30}})));
+    annotation (Placement(transformation(extent={{100,-100},{120,-80}}),
+        iconTransformation(extent={{100,-100},{140,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput chiOn
+    "On signal for chiller"
+    annotation (Placement(transformation(extent={{100,-64},{120,-44}}),
+        iconTransformation(extent={{100,-70},{140,-30}})));
 
   BaseClasses.ControllerHeatingFan conSup(
-    minAirFlo = minAirFlo,
-    kHea = kHea,
-    kFan = kFan) "Heating coil, cooling coil and fan controller"
-    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
+    final controllerTypeHea=controllerTypeHea,
+    final kHea=kHea,
+    final TiHea=TiHea,
+    final TdHea=TdHea,
+    final controllerTypeFan=controllerTypeFan,
+    final kFan=kFan,
+    final TiFan=TiFan,
+    final TdFan=TdFan,
+    final minAirFlo = minAirFlo)
+    "Heating coil and fan controller"
+    annotation (Placement(transformation(extent={{-60,80},{-40,100}})));
   BaseClasses.ControllerEconomizer conEco(
-    final kEco = kEco)
+    final controllerTypeEco=controllerTypeEco,
+    final kEco=kEco,
+    final TiEco=TiEco,
+    final TdEco=TdEco)
     "Economizer control"
-    annotation (Placement(transformation(extent={{0,40},{20,60}})));
-
-  Controls.OBC.CDL.Continuous.Hysteresis                   hysChiPla(
-    uLow=-1,
-    uHigh=0)
-    "Hysteresis with delay to switch on cooling"
-    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
-
-  Modelica.Blocks.Math.Feedback errTRooCoo
-    "Control error on room temperature for cooling"
-    annotation (Placement(transformation(extent={{-42,-70},{-22,-50}})));
-  Controls.Continuous.LimPID conCooVal(
-    controllerType=Modelica.Blocks.Types.SimpleController.P,
+    annotation (Placement(transformation(extent={{40,60},{60,80}})));
+  Buildings.Controls.Continuous.LimPID conCooVal(
+    final controllerType=controllerTypeCoo,
+    final k=kCoo,
+    final Ti=TiCoo,
+    final Td=TdCoo,
     final yMax=1,
     final yMin=0,
-    final k=kCoo,
-    final reverseAction=true)
+    final reverseActing=false)
     "Cooling coil valve controller"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
-<<<<<<< HEAD:Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizerController.mo
-=======
   Buildings.Controls.OBC.CDL.Logical.Switch swi
     "Switch the outdoor air fraction to 0 when in unoccupied mode"
     annotation (Placement(transformation(extent={{0,20},{20,40}})));
@@ -152,73 +225,22 @@ model ControllerChillerDXHeatingEconomizer
   Buildings.Controls.OBC.CDL.Continuous.Greater chiOnTRoo(h=1)
     "Chiller on signal based on room temperature"
     annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
->>>>>>> master:Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
 
 protected
   Modelica.Blocks.Sources.Constant TSetSupChiConst(
     final k=TSupChi_nominal)
     "Set point for chiller temperature"
-    annotation (Placement(transformation(extent={{40,-90},{60,-70}})));
-
+    annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
   Modelica.Blocks.Sources.Constant conMinOAFra(
     final k=minOAFra)
     "Minimum outside air fraction"
-    annotation (Placement(transformation(extent={{-70,38},{-50,58}})));
-
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
   Modelica.Blocks.Sources.Constant TSetSupAirConst(
     final k=TSetSupAir)
     "Set point for supply air temperature"
-    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
+    annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
 
 equation
-<<<<<<< HEAD:Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizerController.mo
-  connect(conMinOAFra.y,conEco. minOAFra) annotation (Line(points={{-49,48},{
-          -26,48},{-1,48}},                 color={0,0,127}));
-  connect(TSetSupAirConst.y, conEco.TMixSet) annotation (Line(points={{-39,-20},
-          {-20,-20},{-20,58},{-1,58}}, color={0,0,127}));
-  connect(errTRooCoo.y, hysChiPla.u) annotation (Line(points={{-23,-60},{0,-60},
-          {0,-40},{38,-40}},                           color={0,0,127}));
-  connect(TSetRooCoo, errTRooCoo.u2) annotation (Line(points={{-120,60},{-80,60},
-          {-80,-80},{-32,-80},{-32,-68}}, color={0,0,127}));
-  connect(errTRooCoo.u1, TRoo) annotation (Line(points={{-40,-60},{-74,-60},{
-          -120,-60}}, color={0,0,127}));
-  connect(TSetSupAirConst.y,conCooVal. u_s)
-    annotation (Line(points={{-39,-20},{-2,-20}},        color={0,0,127}));
-  connect(conSup.TSetRooHea, TSetRooHea) annotation (Line(points={{-41,86},{-88,
-          86},{-88,100},{-120,100}},
-                                   color={0,0,127}));
-  connect(conSup.TSetRooCoo, TSetRooCoo) annotation (Line(points={{-41,80},{-80,
-          80},{-80,60},{-120,60}}, color={0,0,127}));
-  connect(conSup.TRoo, TRoo) annotation (Line(points={{-41,74},{-74,74},{-74,
-          -60},{-120,-60}},
-                       color={0,0,127}));
-  connect(conSup.yHea, conEco.yHea) annotation (Line(points={{-19,76},{-10,76},
-          {-10,42},{-1,42}},color={0,0,127}));
-  connect(conEco.TMix, TMix) annotation (Line(points={{-1,55},{-40,55},{-40,20},
-          {-120,20}}, color={0,0,127}));
-  connect(conEco.TRet, TRoo) annotation (Line(points={{-1,52},{-34,52},{-34,12},
-          {-88,12},{-88,-60},{-120,-60}},     color={0,0,127}));
-  connect(conEco.TOut, TOut) annotation (Line(points={{-1,45},{-30,45},{-30,8},
-          {-94,8},{-94,-20},{-120,-20}},   color={0,0,127}));
-  connect(conSup.yHea, yHea) annotation (Line(points={{-19,76},{40,76},{40,60},
-          {80,60},{110,60}},
-                    color={0,0,127}));
-  connect(conSup.yFan, yFan) annotation (Line(points={{-19,84},{40,84},{40,90},
-          {40,90},{40,90},{110,90},{110,90}},
-                    color={0,0,127}));
-  connect(conEco.yOutAirFra, yOutAirFra) annotation (Line(points={{21,50},{80,50},
-          {80,30},{110,30}}, color={0,0,127}));
-  connect(conCooVal.y, yCooCoiVal)
-    annotation (Line(points={{21,-20},{76,-20},{76,0},{110,0}},
-                                              color={0,0,127}));
-  connect(TSetSupChiConst.y, TSetSupChi)
-    annotation (Line(points={{61,-80},{110,-80}}, color={0,0,127}));
-  connect(conCooVal.u_m, TSup)
-    annotation (Line(points={{10,-32},{10,-90},{-120,-90}}, color={0,0,127}));
-  connect(hysChiPla.y, chiOn) annotation (Line(points={{61,-40},{80,-40},{110,
-          -40}},           color={255,0,255}));
-  annotation (Icon(graphics={Line(points={{-100,-100},{0,2},{-100,100}}, color=
-=======
   connect(TSetSupAirConst.y,conCooVal. u_s)    annotation (Line(points={{-19,-50},
           {-10,-50},{-10,-20},{-2,-20}}, color={0,0,127}));
   connect(conSup.TRoo, TRoo) annotation (Line(points={{-61,84},{-74,84},{-74,
@@ -286,16 +308,14 @@ equation
   annotation (
   defaultComponentName="conChiDXHeaEco",
   Icon(graphics={Line(points={{-100,-100},{0,2},{-100,100}}, color=
->>>>>>> master:Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
               {0,0,0})}), Documentation(info="<html>
 <p>
-This is the controller for the VAV system with economizer, heating coil and cooling coil.
+This is a controller for the single-zone VAV system with an economizer, a 
+heating coil and a cooling coil.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD:Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizerController.mo
-=======
 November 20, 2020, by David Blum:<br/>
 Turn fan on when setup cooling required.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2265\">issue 2265</a>.
@@ -305,7 +325,6 @@ July 21, 2020, by Kun Zhang:<br/>
 Exposed PID control parameters to allow users to tune for their specific systems.
 </li>
 <li>
->>>>>>> master:Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
 June 21, 2017, by Michael Wetter:<br/>
 Refactored implementation.
 </li>
@@ -314,11 +333,6 @@ June 1, 2017, by David Blum:<br/>
 First implementation.
 </li>
 </ul>
-<<<<<<< HEAD:Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizerController.mo
-</html>"));
-end ChillerDXHeatingEconomizerController;
-=======
 </html>"),
     Diagram(coordinateSystem(extent={{-100,-120},{100,140}})));
 end ControllerChillerDXHeatingEconomizer;
->>>>>>> master:Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo
index 2cea7bae3eb..a5b10f96a3c 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo
@@ -2,92 +2,123 @@ within Buildings.Air.Systems.SingleZone.VAV.BaseClasses;
 model ControllerEconomizer "Controller for economizer"
   extends Modelica.Blocks.Icons.Block;
 
-  parameter Real kEco(min=Modelica.Constants.small) = 1
-    "Gain of controller"
-    annotation(Dialog(group="Control gain"));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeEco=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation(Dialog(group="Economizer control signal"));
+  parameter Real kEco(final unit="1/K")=0.1
+    "Gain for economizer control signal"
+    annotation(Dialog(group="Economizer control signal"));
+  parameter Real TiEco(
+    final unit="s",
+    final quantity="Time")=900
+    "Time constant of integrator block for economizer control signal"
+    annotation(Dialog(group="Economizer control signal",
+    enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+        or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real TdEco(
+    final unit="s",
+    final quantity="Time")=0.1
+    "Time constant of derivative block for economizer control signal"
+    annotation (Dialog(group="Economizer control signal",
+      enable=controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+          or controllerTypeEco == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
 
   Modelica.Blocks.Interfaces.RealInput TMixSet(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Mixed air setpoint temperature"
     annotation (Placement(transformation(extent={{-120,70},{-100,90}})));
   Modelica.Blocks.Interfaces.RealInput TMix(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Measured mixed air temperature"
     annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
-
   Modelica.Blocks.Interfaces.RealInput TOut(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Measured outside air temperature"
     annotation (Placement(
         transformation(extent={{-120,-60},{-100,-40}})));
-  Modelica.Blocks.Interfaces.RealInput yHea(final unit="1")
-    "Control signal for heating coil" annotation (Placement(transformation(
-          extent={{-120,-90},{-100,-70}})));
-
+  Modelica.Blocks.Interfaces.BooleanInput cooSta "Cooling status"
+    annotation (Placement(transformation(extent={{-120,-90},{-100,-70}})));
   Modelica.Blocks.Interfaces.RealInput TRet(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Return air temperature"
     annotation (Placement(transformation(extent={{-120,10},{-100,30}})));
-
   Modelica.Blocks.Interfaces.RealInput minOAFra(
-    min = 0,
-    max = 1,
+    final min = 0,
+    final max = 1,
     final unit="1")
     "Minimum outside air fraction"
     annotation (Placement(transformation(extent={{-120,-30},{-100,-10}})));
-
-  Modelica.Blocks.Interfaces.RealOutput yOutAirFra(final unit="1")
+  Modelica.Blocks.Interfaces.RealOutput yOutAirFra(
+    final unit="1")
     "Control signal for outside air fraction"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
-  Modelica.Blocks.Nonlinear.VariableLimiter Limiter(strict=true)
+  Modelica.Blocks.Nonlinear.VariableLimiter Limiter(
+    final strict=true)
     "Signal limiter"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Modelica.Blocks.Sources.Constant const(final k=1)
+  Modelica.Blocks.Sources.Constant const(
+    final k=1)
     "Constant output signal with value 1"
     annotation (Placement(transformation(extent={{20,60},{40,80}})));
-
   Modelica.Blocks.Logical.Switch switch1 "Switch to select control output"
     annotation (Placement(transformation(extent={{20,10},{40,30}})));
-
-  Modelica.Blocks.MathBoolean.And and1(final nu=3) "Logical and"
+  Modelica.Blocks.MathBoolean.And and1(
+    final nu=3) "Logical and"
     annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
   Controls.Continuous.LimPID con(
+    final controllerType=controllerTypeEco,
     final k=kEco,
-    final reverseAction=true,
+    final Ti=TiEco,
+    final Td=TdEco,
+    final reverseActing=false,
     final yMax=Modelica.Constants.inf,
-    final yMin=-Modelica.Constants.inf,
-    controllerType=Modelica.Blocks.Types.SimpleController.P)
+    final yMin=-Modelica.Constants.inf)
     "Controller"
     annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
   Modelica.Blocks.Math.Feedback feedback "Control error"
-    annotation (Placement(transformation(extent={{-50,-38},{-30,-18}})));
-  Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold hysYHea(
-    trueHoldDuration=60*15,
-    uLow=0.05,
-    uHigh=0.15) "Hysteresis with delay for heating signal"
-    annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
-  Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold hysTMix(
-    uLow=-0.5,
-    uHigh=0.5,
-    trueHoldDuration=60*15)
-    "Hysteresis with delay for mixed air temperature"
-    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-  Modelica.Blocks.Logical.Not not1
-    annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
-
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
   Modelica.Blocks.Math.Feedback feedback1
-    annotation (Placement(transformation(extent={{-70,20},{-50,40}})));
-  Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold hysCooPot(
-    uHigh=0.5,
-    uLow=0,
-    trueHoldDuration=60*15)
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  Controls.OBC.CDL.Continuous.Hysteresis hysChiPla(
+    final uLow=0.95,
+    final uHigh=0.98)
+    "Hysteresis with delay to switch on cooling"
+    annotation (Placement(transformation(extent={{60,-60},{80,-40}})));
+  Modelica.Blocks.Logical.Or or1 "Saturated ecnomizer or no economizer"
+    annotation (Placement(transformation(extent={{70,-90},{90,-70}})));
+  Modelica.Blocks.Interfaces.BooleanOutput yCoiSta "Cooling coil status"
+    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
+  Modelica.Blocks.Logical.Not not1 "No economizer"
+    annotation (Placement(transformation(extent={{40,-100},{60,-80}})));
+
+  Controls.OBC.CDL.Continuous.Hysteresis hysCooPot(
+    final uLow=0,
+    final uHigh=0.5)
     "Hysteresis with delay to check for cooling potential of outside air"
-    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
+    annotation (Placement(transformation(extent={{-54,20},{-34,40}})));
+  Controls.OBC.CDL.Logical.TrueFalseHold truFalHolCooPot(
+    final trueHoldDuration=60*15)
+    "True/false hold for cooling potential"
+    annotation (Placement(transformation(extent={{-26,20},{-6,40}})));
+  Controls.OBC.CDL.Logical.TrueFalseHold truFalHolTMix(
+    final trueHoldDuration=60*15)
+    "True/false hold for mixing temperature"
+    annotation (Placement(transformation(extent={{-24,-40},{-4,-20}})));
+  Controls.OBC.CDL.Continuous.Hysteresis hysTMix(
+    final uLow=-0.5,
+    final uHigh=0.5)
+    "Hysteresis with delay for mixed air temperature"
+    annotation (Placement(transformation(extent={{-52,-40},{-32,-20}})));
 equation
   connect(Limiter.limit2, minOAFra) annotation (Line(points={{58,-8},{-20,-8},{
           -20,-8},{-94,-8},{-94,-20},{-110,-20},{-110,-20}},
@@ -101,45 +132,61 @@ equation
   connect(and1.y, switch1.u2) annotation (Line(points={{41.5,-50},{48,-50},{48,
           -6},{10,-6},{10,20},{18,20}},
                                      color={255,0,255}));
-  connect(con.u_s, TMixSet)
-    annotation (Line(points={{-92,80},{-92,80},{-110,80}}, color={0,0,127}));
-  connect(TMix, con.u_m)
-    annotation (Line(points={{-110,50},{-80,50},{-80,68}}, color={0,0,127}));
+  connect(con.u_s, TMixSet)   annotation (Line(points={{-92,80},{-92,80},{-110,80}}, color={0,0,127}));
+  connect(TMix, con.u_m)    annotation (Line(points={{-110,50},{-80,50},{-80,68}}, color={0,0,127}));
   connect(con.y, switch1.u1) annotation (Line(points={{-69,80},{12,80},{12,28},
           {18,28}}, color={0,0,127}));
-  connect(TOut, feedback.u2) annotation (Line(points={{-110,-50},{-40,-50},{-40,
-          -36}}, color={0,0,127}));
-  connect(feedback.u1, TMix) annotation (Line(points={{-48,-28},{-80,-28},{-80,
-          50},{-110,50}}, color={0,0,127}));
-  connect(Limiter.y, yOutAirFra)
-    annotation (Line(points={{81,0},{110,0}}, color={0,0,127}));
-  connect(hysYHea.u, yHea)
-    annotation (Line(points={{-82,-80},{-110,-80}}, color={0,0,127}));
+  connect(TOut, feedback.u2) annotation (Line(points={{-110,-50},{-70,-50},{-70,
+          -38}}, color={0,0,127}));
+  connect(feedback.u1, TMix) annotation (Line(points={{-78,-30},{-90,-30},{-90,50},
+          {-110,50}},     color={0,0,127}));
+  connect(Limiter.y, yOutAirFra)    annotation (Line(points={{81,0},{110,0}}, color={0,0,127}));
+  connect(feedback1.u1, TRet)   annotation (Line(points={{-78,30},{-96,30},{-96,
+          20},{-110,20}},                         color={0,0,127}));
+  connect(feedback1.u2,TOut)    annotation (Line(points={{-70,22},{-70,16},{-86,
+          16},{-86,-50},{-110,-50}},                                                     color={0,0,127}));
+  connect(Limiter.y, hysChiPla.u) annotation (Line(points={{81,0},{90,0},{90,
+          -20},{52,-20},{52,-50},{58,-50}}, color={0,0,127}));
+  connect(or1.y, yCoiSta)    annotation (Line(points={{91,-80},{110,-80}}, color={255,0,255}));
+  connect(not1.y, or1.u2) annotation (Line(points={{61,-90},{64,-90},{64,-88},{
+          68,-88}}, color={255,0,255}));
+  connect(and1.y, not1.u) annotation (Line(points={{41.5,-50},{48,-50},{48,-70},
+          {30,-70},{30,-90},{38,-90}}, color={255,0,255}));
+  connect(hysChiPla.y, or1.u1) annotation (Line(points={{82,-50},{88,-50},{88,
+          -64},{62,-64},{62,-80},{68,-80}}, color={255,0,255}));
+
   connect(feedback.y, hysTMix.u)
-    annotation (Line(points={{-31,-28},{-28,-28},{-28,-50},{-22,-50}},
-                                                   color={0,0,127}));
-  connect(feedback1.u1, TRet)
-    annotation (Line(points={{-68,30},{-88,30},{-88,20},{-110,20}},
-                                                  color={0,0,127}));
-  connect(feedback1.u2,TOut)
-    annotation (Line(points={{-60,22},{-60,-50},{-110,-50}}, color={0,0,127}));
+    annotation (Line(points={{-61,-30},{-54,-30}}, color={0,0,127}));
+  connect(hysTMix.y, truFalHolTMix.u)
+    annotation (Line(points={{-30,-30},{-26,-30}}, color={255,0,255}));
   connect(feedback1.y, hysCooPot.u)
-    annotation (Line(points={{-51,30},{-42,30}}, color={0,0,127}));
-  connect(hysCooPot.y, and1.u[1]) annotation (Line(points={{-19,30},{6,30},{6,
-          -45.3333},{20,-45.3333}}, color={255,0,255}));
-  connect(hysTMix.y, and1.u[2])
-    annotation (Line(points={{1,-50},{20,-50},{20,-50}}, color={255,0,255}));
-  connect(not1.y, and1.u[3]) annotation (Line(points={{-19,-80},{-19,-80},{6,
-          -80},{6,-54.6667},{20,-54.6667}}, color={255,0,255}));
-  connect(hysYHea.y, not1.u) annotation (Line(points={{-59,-80},{-42,-80},{-42,
-          -80}}, color={255,0,255}));
-  annotation (    Documentation(info="<html>
+    annotation (Line(points={{-61,30},{-56,30}}, color={0,0,127}));
+  connect(hysCooPot.y, truFalHolCooPot.u)
+    annotation (Line(points={{-32,30},{-28,30}}, color={255,0,255}));
+  connect(truFalHolCooPot.y, and1.u[1]) annotation (Line(points={{-4,30},{8,30},
+          {8,-45.3333},{20,-45.3333}}, color={255,0,255}));
+  connect(truFalHolTMix.y, and1.u[2]) annotation (Line(points={{-2,-30},{4,-30},
+          {4,-50},{20,-50}}, color={255,0,255}));
+  connect(cooSta, and1.u[3]) annotation (Line(points={{-110,-80},{-44,-80},{-44,
+          -54.6667},{20,-54.6667}}, color={255,0,255}));
+   annotation (
+  defaultComponentName="conEco",
+  Documentation(info="<html>
 <p>
 Economizer controller.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+September 30, 2020, by Michael Wetter:<br/>
+Refactored implementation of hysteresis with hold, which was using a block that is now obsolete.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2134\">issue 2134</a>.
+</li>
+<li>
+July 21, 2020, by Kun Zhang:<br/>
+Exposed PID control parameters to allow users to tune for their specific systems.
+</li>
+<li>
 June 21, 2017, by Michael Wetter:<br/>
 Refactored implementation.
 </li>
diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerHeatingFan.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerHeatingFan.mo
index 8cc0bf7de18..496925279f4 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerHeatingFan.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerHeatingFan.mo
@@ -1,71 +1,115 @@
 within Buildings.Air.Systems.SingleZone.VAV.BaseClasses;
-model ControllerHeatingFan "Controller for heating and cooling"
+model ControllerHeatingFan "Controller for heating coil and fan signal"
   extends Modelica.Blocks.Icons.Block;
 
-  parameter Real kHea(min=Modelica.Constants.small) = 1
-    "Gain of heating controller"
-    annotation(Dialog(group="Control gain"));
-
-  parameter Real kFan(min=Modelica.Constants.small) = 1
-    "Gain of controller for fan"
-    annotation(Dialog(group="Control gain"));
-
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeHea=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation(Dialog(group="Heating coil signal"));
+  parameter Real kHea(final unit="1/K")=0.1
+    "Gain for heating coil control signal"
+    annotation(Dialog(group="Heating coil signal"));
+  parameter Real TiHea(
+    final unit="s",
+    final quantity="Time")=900
+    "Time constant of integrator block for heating coil control signal"
+    annotation(Dialog(group="Heating coil signal",
+    enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+        or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real TdHea(
+    final unit="s",
+    final quantity="Time")=0.1
+    "Time constant of derivative block for heating coil control signal"
+    annotation (Dialog(group="Heating coil signal",
+      enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+          or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeFan=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation(Dialog(group="Fan signal"));
+  parameter Real kFan(final unit="1/K")=0.1
+    "Gain for fan signal"
+    annotation(Dialog(group="Fan signal"));
+  parameter Real TiFan(
+    final unit="s",
+    final quantity="Time")=900
+    "Time constant of integrator block for fan signal"
+    annotation(Dialog(group="Fan signal",
+    enable=controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+        or controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real TdFan(
+    final unit="s",
+    final quantity="Time")=0.1
+    "Time constant of derivative block for fan signal"
+    annotation (Dialog(group="Fan signal",
+      enable=controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+          or controllerTypeFan == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   parameter Real minAirFlo(
-    min=0,
-    max=1,
-    unit="1")
-    "Minimum airflow rate of system";
+    final min=0,
+    final max=1,
+    final unit="1")
+    "Minimum airflow fraction of system";
 
   Modelica.Blocks.Interfaces.RealInput TSetRooCoo(
     final unit="K",
-    displayUnit="degC") "Zone cooling setpoint"
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Zone cooling setpoint"
     annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
   Modelica.Blocks.Interfaces.RealInput TRoo(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Zone temperature measurement"
     annotation (Placement(transformation(extent={{-120,-70},{-100,-50}})));
   Modelica.Blocks.Interfaces.RealInput TSetRooHea(
     final unit="K",
-    displayUnit="degC") "Zone heating setpoint"
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Zone heating setpoint"
     annotation (Placement(transformation(extent={{-120,50},{-100,70}})));
-  Modelica.Blocks.Interfaces.RealOutput yFan(final unit="1") "Control signal for fan"
+  Modelica.Blocks.Interfaces.RealOutput yFan(
+    final unit="1")
+    "Control signal for fan"
     annotation (Placement(transformation(extent={{100,30},{120,50}})));
-  Modelica.Blocks.Interfaces.RealOutput yHea(final unit="1")
+  Modelica.Blocks.Interfaces.RealOutput yHea(
+    final unit="1")
     "Control signal for heating coil"
     annotation (Placement(transformation(extent={{100,-50},{120,-30}})));
+
   Controls.Continuous.LimPID conHeaCoi(
+    final controllerType=controllerTypeHea,
     final k=kHea,
-    controllerType=Modelica.Blocks.Types.SimpleController.P)
+    final Ti=TiHea,
+    final Td=TdHea)
     "Controller for heating coil"
     annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
   Controls.Continuous.LimPID conFan(
+    final controllerType=controllerTypeFan,
     final k=kFan,
+    final Ti=TiFan,
+    final Td=TdFan,
     final yMax=1,
     final yMin=minAirFlo,
-    controllerType=Modelica.Blocks.Types.SimpleController.P,
-    final reverseAction=true)
+    final reverseActing=false)
     "Controller for fan"
     annotation (Placement(transformation(extent={{20,30},{40,50}})));
 
 equation
-  connect(TSetRooHea, conHeaCoi.u_s)
-    annotation (Line(points={{-110,60},{-60,60},{-60,-40},{-12,-40}},
+  connect(TSetRooHea, conHeaCoi.u_s)   annotation (Line(points={{-110,60},{-60,60},{-60,-40},{-12,-40}},
                                                      color={0,0,127}));
   connect(TRoo, conHeaCoi.u_m) annotation (Line(points={{-110,-60},{-80,-60},{
           -80,-60},{0,-60},{0,-52}},   color={0,0,127}));
-  connect(conHeaCoi.y, yHea)
-    annotation (Line(points={{11,-40},{60,-40},{110,-40}},
+  connect(conHeaCoi.y, yHea)   annotation (Line(points={{11,-40},{60,-40},{110,-40}},
                                                  color={0,0,127}));
   connect(conFan.u_s, TSetRooCoo) annotation (Line(points={{18,40},{18,40},{-48,
           40},{-48,40},{-80,40},{-80,0},{-110,0}},
                                                  color={0,0,127}));
   connect(TRoo, conFan.u_m) annotation (Line(points={{-110,-60},{-110,-60},{30,
           -60},{30,28}},                        color={0,0,127}));
-
-  connect(conFan.y, yFan)
-    annotation (Line(points={{41,40},{41,40},{110,40}},
+  connect(conFan.y, yFan)   annotation (Line(points={{41,40},{41,40},{110,40}},
                                                    color={0,0,127}));
+
   annotation (
   defaultComponentName="conHeaFan",
   Documentation(info="<html>
@@ -75,6 +119,10 @@ Controller for heating coil and fan speed.
 </html>", revisions="<html>
 <ul>
 <li>
+July 21, 2020, by Kun Zhang:<br/>
+Exposed PID control parameters to allow users to tune for their specific systems.
+</li>
+<li>
 June 21, 2017, by Michael Wetter:<br/>
 Refactored implementation.
 </li>
diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo
index 16acb7fefb5..c99d063b06e 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mo
@@ -1,6 +1,7 @@
 within Buildings.Air.Systems.SingleZone.VAV.BaseClasses.Validation;
 model ControllerEconomizer "Validate the block ControllerEconomizer"
   extends Modelica.Icons.Example;
+
   Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerEconomizer conEco
     "Controller for economizer"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
@@ -29,11 +30,9 @@ model ControllerEconomizer "Validate the block ControllerEconomizer"
     amplitude=6,
     offset=18 + 273.15) "Measured outdoor air temperature"
     annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
-  Modelica.Blocks.Sources.Sine heaConSig(
-    amplitude=0.1,
-    freqHz=1/86400,
-    offset=0.2) "Heating control signal"
+  Modelica.Blocks.Sources.BooleanConstant cooSta(k=true) "Cooling status"
     annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
+
 equation
   connect(mixAirTemSet.y, conEco.TMixSet) annotation (Line(points={{-59,80},{-20,
           80},{20,80},{20,8},{39,8}}, color={0,0,127}));
@@ -45,9 +44,10 @@ equation
           {-59,-20},{0,-20},{0,-2},{39,-2}}, color={0,0,127}));
   connect(outAirTem.y, conEco.TOut) annotation (Line(points={{-59,-50},{-59,-50},
           {10,-50},{10,-5},{39,-5}}, color={0,0,127}));
-  connect(heaConSig.y, conEco.yHea) annotation (Line(points={{-59,-80},{-18,-80},
-          {20,-80},{20,-8},{39,-8}}, color={0,0,127}));
-  annotation (
+  connect(cooSta.y, conEco.cooSta) annotation (Line(points={{-59,-80},{30,-80},{
+          30,-8},{39,-8}}, color={255,0,255}));
+
+   annotation (
   experiment(StopTime=604800,  Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mos"
         "Simulate and plot"),
@@ -57,7 +57,9 @@ Validation test for the block
 <a href=\"modelica://Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerEconomizer\">
 Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerEconomizer</a>.
 </p>
-The sine inputs include:
+<p>
+The inputs include:
+</p>
 <ul>
 <li>
 Mixed air temperature <code>mixAirTem</code>, varying from <i>12.5</i> &deg;C
@@ -80,14 +82,17 @@ Minimum outdoor air fraction <code>minOutAirFra</code>, varying from <i>0.05
 </i> to <i>0.35</i>
 </li>
 <li>
-Heating control signal <code>heaConSig</code>, varying from <i>0.1</i> to
-<i>0.3</i>
+Cooling status signal <code>cooSta</code>, set to true.
 </li>
 </ul>
 
 </html>", revisions="<html>
 <ul>
 <li>
+July 28, 2020, by Kun Zhang:<br/>
+Added cooling status input signal and removed obsoleted heating control signal.
+</li>
+<li>
 July 3, 2017, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo
index 9b8535a68b9..25c4326b45d 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mo
@@ -3,30 +3,35 @@ model ControllerHeatingFan "Validate the block ControllerHeatingFan"
   extends Modelica.Icons.Example;
 
   Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerHeatingFan
-    conHeaFan(minAirFlo=0.6) "Controller for heating and cooling"
-              annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+    conHeaFan(minAirFlo=0.6)
+    "Controller for heating and cooling"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
   Modelica.Blocks.Sources.Sine zonHeaSet(
     freqHz=1/86400,
     offset=20 + 273.15,
-    amplitude=1) "Zone heating setpoint"
+    amplitude=1)
+    "Zone heating setpoint"
     annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
   Modelica.Blocks.Sources.Sine zonCooSet(
     freqHz=1/86400,
     amplitude=2,
-    offset=25 + 273.15) "Zone cooling setpoint"
+    offset=25 + 273.15)
+    "Zone cooling setpoint"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
   Modelica.Blocks.Sources.Sine zonTem(
     amplitude=4,
     freqHz=1/86400,
-    offset=21 + 273.15) "Zone temperature"
+    offset=21 + 273.15)
+    "Zone temperature"
     annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+
 equation
   connect(zonHeaSet.y, conHeaFan.TSetRooHea) annotation (Line(points={{-39,30},{
           -20,30},{0,30},{0,6},{19,6}}, color={0,0,127}));
-  connect(zonCooSet.y, conHeaFan.TSetRooCoo)
-    annotation (Line(points={{-39,0},{19,0}},        color={0,0,127}));
+  connect(zonCooSet.y, conHeaFan.TSetRooCoo)    annotation (Line(points={{-39,0},{19,0}},        color={0,0,127}));
   connect(zonTem.y, conHeaFan.TRoo) annotation (Line(points={{-39,-30},{-20,-30},
           {0,-30},{0,-6},{19,-6}}, color={0,0,127}));
+
   annotation (
   experiment(StopTime=604800,  Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerHeatingFan.mos"
diff --git a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo
index d4e37d795b5..d325add66ae 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo
@@ -1,11 +1,7 @@
 within Buildings.Air.Systems.SingleZone.VAV;
 model ChillerDXHeatingEconomizer
-<<<<<<< HEAD
-  "HVAC system model with a dry cooling coil, air-cooled chiller, electric heating coil, variable speed fan, and mixing box with economizer control."
-=======
   "HVAC system model with a dry cooling coil, air-cooled chiller, electric heating coil,
    variable speed fan, and mixing box with economizer control."
->>>>>>> master
   replaceable package MediumA = Buildings.Media.Air "Medium model for air"
       annotation (choicesAllMatching = true);
   replaceable package MediumW = Buildings.Media.Water "Medium model for water"
@@ -13,165 +9,156 @@ model ChillerDXHeatingEconomizer
 
   parameter Modelica.SIunits.DimensionlessRatio COP_nominal = 5.5
     "Nominal COP of the chiller";
-
   parameter Modelica.SIunits.Temperature TSupChi_nominal
     "Design value for chiller leaving water temperature";
-
-  parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal "Design airflow rate of system"
+  parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal
+    "Design airflow rate of system"
     annotation(Dialog(group="Air design"));
-
-  parameter Modelica.SIunits.Power QHea_flow_nominal(min=0) "Design heating capacity of heating coil"
+  parameter Modelica.SIunits.Power QHea_flow_nominal(min=0)
+    "Design capacity of heating coil"
     annotation(Dialog(group="Heating design"));
-
-  parameter Real etaHea_nominal(min=0, max=1, unit="1") "Design heating efficiency of the heating coil"
+  parameter Real etaHea_nominal(min=0, max=1, unit="1")
+    "Design heating efficiency of the heating coil"
     annotation(Dialog(group="Heating design"));
-
-  parameter Modelica.SIunits.Power QCoo_flow_nominal(max=0) "Design heating capacity of cooling coil"
+  parameter Modelica.SIunits.Power QCoo_flow_nominal(max=0)
+    "Design capacity of cooling coil"
     annotation(Dialog(group="Cooling design"));
-
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa") = 500
+  parameter Modelica.SIunits.PressureDifference dp_nominal(
+    displayUnit="Pa") = 500
     "Design pressure drop of flow leg with fan"
     annotation(Dialog(group="Air design"));
-
   final parameter Modelica.SIunits.MassFlowRate mChiEva_flow_nominal=
     -QCoo_flow_nominal/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq/4
     "Design chilled water supply flow";
-
   final parameter Modelica.SIunits.MassFlowRate mChiCon_flow_nominal=
     -QCoo_flow_nominal*(1+1/COP_nominal)/Buildings.Utilities.Psychrometrics.Constants.cpAir/10
     "Design condenser air flow";
 
   Modelica.Blocks.Interfaces.BooleanInput chiOn "On signal for chiller plant"
-    annotation (Placement(transformation(extent={{-240,-160},{-200,-120}})));
-
+    annotation (Placement(transformation(extent={{-240,-140},{-200,-100}}),
+        iconTransformation(extent={{-240,-140},{-200,-100}})));
   Modelica.Blocks.Interfaces.RealInput uFan(
     final unit="1") "Fan control signal"
-    annotation (Placement(transformation(extent={{-240,120},{-200,160}})));
+    annotation (Placement(transformation(extent={{-240,140},{-200,180}}),
+        iconTransformation(extent={{-240,140},{-200,180}})));
   Modelica.Blocks.Interfaces.RealInput uHea(
     final unit="1") "Control input for heater"
-    annotation (Placement(transformation(extent={{-240,60},{-200,100}})));
+    annotation (Placement(transformation(extent={{-240,80},{-200,120}}),
+        iconTransformation(extent={{-240,80},{-200,120}})));
   Modelica.Blocks.Interfaces.RealInput uCooVal(final unit="1")
     "Control signal for cooling valve"
-    annotation (Placement(transformation(extent={{-240,-10},{-200,30}})));
+    annotation (Placement(transformation(extent={{-240,10},{-200,50}}),
+        iconTransformation(extent={{-240,10},{-200,50}})));
   Modelica.Blocks.Interfaces.RealInput TSetChi(
     final unit="K",
-    displayUnit="degC")
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
     "Set point for leaving chilled water temperature"
-    annotation (Placement(transformation(extent={{-240,-210},{-200,-170}})));
-  Modelica.Blocks.Interfaces.RealInput uEco "Control signal for economizer"
-    annotation (Placement(transformation(extent={{-240,-80},{-200,-40}})));
-
+    annotation (Placement(transformation(extent={{-240,-220},{-200,-180}}),
+        iconTransformation(extent={{-240,-220},{-200,-180}})));
+  Modelica.Blocks.Interfaces.RealInput uEco
+    "Control signal for economizer"
+    annotation (Placement(transformation(extent={{-240,-60},{-200,-20}}),
+        iconTransformation(extent={{-240,-60},{-200,-20}})));
   Modelica.Fluid.Interfaces.FluidPort_a supplyAir(
     redeclare final package Medium = MediumA) "Supply air"
-    annotation (Placement(transformation(extent={{190,30},{210,50}}),
-        iconTransformation(extent={{190,30},{210,50}})));
+    annotation (Placement(transformation(extent={{192,50},{212,70}}),
+        iconTransformation(extent={{192,50},{212,70}})));
   Modelica.Fluid.Interfaces.FluidPort_b returnAir(
     redeclare final package Medium = MediumA) "Return air"
-    annotation (Placement(transformation(extent={{190,-50},{210,-30}}),
-        iconTransformation(extent={{190,-50},{210,-30}})));
-
+    annotation (Placement(transformation(extent={{192,-30},{212,-10}}),
+        iconTransformation(extent={{192,-30},{212,-10}})));
   Modelica.Blocks.Interfaces.RealOutput PFan(final unit="W")
     "Electrical power consumed by the supply fan"
-    annotation (Placement(transformation(extent={{200,130},{220,150}}),
-        iconTransformation(extent={{200,130},{220,150}})));
-
+    annotation (Placement(transformation(extent={{202,150},{222,170}}),
+        iconTransformation(extent={{202,150},{222,170}})));
   Modelica.Blocks.Interfaces.RealOutput QHea_flow(final unit="W")
     "Electrical power consumed by the heating equipment" annotation (Placement(
-        transformation(extent={{200,110},{220,130}}), iconTransformation(extent={{200,110},
-            {220,130}})));
-
+        transformation(extent={{202,130},{222,150}}), iconTransformation(extent={{202,130},
+            {222,150}})));
   Modelica.Blocks.Interfaces.RealOutput PCoo(final unit="W")
     "Electrical power consumed by the cooling equipment" annotation (Placement(
-        transformation(extent={{200,90},{220,110}}), iconTransformation(extent={{200,90},
-            {220,110}})));
+        transformation(extent={{202,110},{222,130}}),iconTransformation(extent={{202,110},
+            {222,130}})));
   Modelica.Blocks.Interfaces.RealOutput PPum(final unit="W")
     "Electrical power consumed by the pumps"
-    annotation (Placement(transformation(extent={{200,70},{220,90}}),
-        iconTransformation(extent={{200,70},{220,90}})));
-
-  Modelica.Blocks.Interfaces.RealOutput TMix(final unit="K", displayUnit="degC")
-    "Mixed air temperature" annotation (Placement(transformation(extent={{200,-90},
-            {220,-70}}), iconTransformation(extent={{200,-90},{220,-70}})));
-
+    annotation (Placement(transformation(extent={{202,90},{222,110}}),
+        iconTransformation(extent={{202,90},{222,110}})));
+  Modelica.Blocks.Interfaces.RealOutput TMix(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Mixed air temperature" annotation (Placement(transformation(extent={{202,-70},
+            {222,-50}}), iconTransformation(extent={{202,-70},{222,-50}})));
   Modelica.Blocks.Interfaces.RealOutput TSup(
     final unit="K",
-    displayUnit="degC") "Supply air temperature after coils"
-    annotation (Placement(transformation(extent={{200,-130},{220,-110}}),
-        iconTransformation(extent={{200,-130},{220,-110}})));
-
-  Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather bus"
-  annotation (Placement(
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Supply air temperature after coils"
+    annotation (Placement(transformation(extent={{202,-110},{222,-90}}),
+        iconTransformation(extent={{202,-110},{222,-90}})));
+
+  Buildings.BoundaryConditions.WeatherData.Bus weaBus
+    "Weather bus"
+    annotation (Placement(
         transformation(extent={{-200,20},{-160,60}}),   iconTransformation(
-          extent={{-170,128},{-150,148}})));
-
+          extent={{-168,148},{-148,168}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTSup(
-    m_flow_nominal=mAir_flow_nominal,
-    allowFlowReversal=false,
-    tau=0,
-    redeclare package Medium = MediumA) "Supply air temperature sensor"
+    final m_flow_nominal=mAir_flow_nominal,
+    final allowFlowReversal=false,
+    final tau=0,
+    redeclare package Medium = MediumA)
+    "Supply air temperature sensor"
     annotation (Placement(transformation(extent={{128,30},{148,50}})));
   Buildings.Fluid.HeatExchangers.HeaterCooler_u heaCoi(
-    m_flow_nominal=mAir_flow_nominal,
-    Q_flow_nominal=QHea_flow_nominal,
-    u(start=0),
-    dp_nominal=0,
-    allowFlowReversal=false,
-    tau=90,
+    final m_flow_nominal=mAir_flow_nominal,
+    final Q_flow_nominal=QHea_flow_nominal,
+    final u(start=0),
+    final dp_nominal=0,
+    final allowFlowReversal=false,
+    final tau=90,
     redeclare package Medium = MediumA,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    show_T=true)
-     "Air heating coil"
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    final show_T=true)
+    "Air heating coil"
     annotation (Placement(transformation(extent={{52,30},{72,50}})));
-
   Buildings.Fluid.Movers.FlowControlled_m_flow fanSup(
-    m_flow_nominal=mAir_flow_nominal,
-    nominalValuesDefineDefaultPressureCurve=true,
-    dp_nominal=875,
-    per(use_powerCharacteristic=false),
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    allowFlowReversal=false,
-    use_inputFilter=false,
-    redeclare package Medium = MediumA) "Supply fan"
+    final m_flow_nominal=mAir_flow_nominal,
+    final nominalValuesDefineDefaultPressureCurve=true,
+    final dp_nominal=875,
+    final per(use_powerCharacteristic=false),
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    final allowFlowReversal=false,
+    final use_inputFilter=false,
+    redeclare package Medium = MediumA)
+    "Supply fan"
     annotation (Placement(transformation(extent={{-30,30},{-10,50}})));
-
   Buildings.Fluid.FixedResistances.PressureDrop totalRes(
-    m_flow_nominal=mAir_flow_nominal,
-    dp_nominal=dp_nominal,
-    allowFlowReversal=false,
+    final m_flow_nominal=mAir_flow_nominal,
+    final dp_nominal=dp_nominal,
+    final allowFlowReversal=false,
     redeclare package Medium = MediumA)
+    "Total resistance"
     annotation (Placement(transformation(extent={{10,30},{30,50}})));
-
   Modelica.Blocks.Math.Gain eff(k=1/etaHea_nominal)
+    "Heating efficiency"
     annotation (Placement(transformation(extent={{120,110},{140,130}})));
-
   Buildings.Fluid.Sources.Outside out(
-    nPorts=3,
+    final C=fill(0.0004, 1),
+    final nPorts=3,
     redeclare package Medium = MediumA)
     "Boundary conditions for outside air"
     annotation (Placement(transformation(extent={{-140,30},{-120,50}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTMixAir(
-    m_flow_nominal=mAir_flow_nominal,
-    allowFlowReversal=false,
-    tau=0,
-    redeclare package Medium = MediumA) "Mixed air temperature sensor"
+    final m_flow_nominal=mAir_flow_nominal,
+    final allowFlowReversal=false,
+    final tau=0,
+    redeclare package Medium = MediumA)
+    "Mixed air temperature sensor"
     annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
-
   Buildings.Fluid.HeatExchangers.DryCoilEffectivenessNTU cooCoi(
     redeclare package Medium1 = MediumW,
     redeclare package Medium2 = MediumA,
-<<<<<<< HEAD
-    dp1_nominal=0,
-    dp2_nominal=0,
-    m2_flow_nominal=mAir_flow_nominal,
-    Q_flow_nominal=-QCoo_flow_nominal,
-    configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow,
-    allowFlowReversal1=false,
-    allowFlowReversal2=false,
-    m1_flow_nominal=mChiEva_flow_nominal,
-    show_T=true,
-    T_a1_nominal=279.15,
-    T_a2_nominal=298.15)
-=======
     final dp1_nominal=0,
     final dp2_nominal=0,
     final m2_flow_nominal=mAir_flow_nominal,
@@ -183,50 +170,46 @@ model ChillerDXHeatingEconomizer
     final show_T=true,
     final T_a1_nominal=279.15,
     final T_a2_nominal=298.15)
->>>>>>> master
     "Cooling coil"
     annotation (Placement(transformation(extent={{110,44},{90,24}})));
-
   Buildings.Fluid.Sources.MassFlowSource_T souChiWat(
     redeclare package Medium = MediumA,
-    nPorts=1,
-    use_T_in=true,
-    m_flow=mChiCon_flow_nominal)
+    final nPorts=1,
+    final use_T_in=true,
+    final m_flow=mChiCon_flow_nominal)
     "Mass flow source for chiller"
     annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         origin={138,-174})));
-
   Buildings.Fluid.Movers.FlowControlled_m_flow pumChiWat(
-    use_inputFilter=false,
-    allowFlowReversal=false,
+    final use_inputFilter=false,
+    final allowFlowReversal=false,
     redeclare package Medium = MediumW,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    m_flow_nominal=mChiEva_flow_nominal,
-    addPowerToMedium=false,
-    per(
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    final m_flow_nominal=mChiEva_flow_nominal,
+    final addPowerToMedium=false,
+    final per(
       hydraulicEfficiency(eta={1}),
       motorEfficiency(eta={0.9}),
       motorCooledByFluid=false),
-    dp_nominal=12000,
-    inputType=Buildings.Fluid.Types.InputType.Continuous,
-    nominalValuesDefineDefaultPressureCurve=true)
+    final dp_nominal=12000,
+    final inputType=Buildings.Fluid.Types.InputType.Continuous,
+    final nominalValuesDefineDefaultPressureCurve=true)
     "Pump for chilled water loop"
     annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={120,-90})));
-
   Buildings.Fluid.Chillers.ElectricEIR chi(
-    allowFlowReversal1=false,
-    allowFlowReversal2=false,
+    final allowFlowReversal1=false,
+    final allowFlowReversal2=false,
     redeclare package Medium1 = MediumA,
     redeclare package Medium2 = MediumW,
-    m2_flow_nominal=mChiEva_flow_nominal,
-    dp1_nominal=0,
-    m1_flow_nominal=mChiCon_flow_nominal,
-    per(
+    final m2_flow_nominal=mChiEva_flow_nominal,
+    final dp1_nominal=0,
+    final m1_flow_nominal=mChiCon_flow_nominal,
+    final per(
       capFunT={1.0433811,0.0407077,0.0004506,-0.0041514,-8.86e-5,-0.0003467},
       PLRMax=1.2,
       EIRFunT={0.5961915,-0.0099496,0.0007888,0.0004506,0.0004875,-0.0007623},
@@ -244,130 +227,77 @@ model ChillerDXHeatingEconomizer
       TConEnt_nominal=302.55,
       TConEntMin=274.15,
       TConEntMax=323.15),
-    dp2_nominal=12E3,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    final dp2_nominal=12E3,
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Air cooled chiller"
     annotation (Placement(transformation(extent={{110,-158},{90,-178}})));
-
   Buildings.Fluid.Sources.Boundary_pT bouPreChi(
     redeclare package Medium = MediumW, nPorts=1)
     "Pressure boundary condition for chilled water loop"
     annotation (Placement(transformation(extent={{50,-172},{70,-152}})));
-
   Modelica.Blocks.Math.Gain gaiFan(k=mAir_flow_nominal)
     "Gain for fan mass flow rate"
     annotation (Placement(transformation(extent={{-80,130},{-60,150}})));
-
   IdealValve ideVal(
     redeclare package Medium = MediumW,
-    final m_flow_nominal = mChiEva_flow_nominal) "Ideal valve"
+    final m_flow_nominal = mChiEva_flow_nominal)
+    "Ideal valve"
     annotation (Placement(transformation(extent={{70,0},{90,20}})));
-
-  Modelica.Blocks.Math.BooleanToReal booToInt(final realTrue=
-        mChiEva_flow_nominal) "Boolean to integer conversion"
+  Modelica.Blocks.Math.BooleanToReal booToInt(
+    final realTrue=mChiEva_flow_nominal)
+    "Boolean to integer conversion"
     annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
-
   IdealValve ideEco(
     redeclare package Medium = MediumA,
-    final m_flow_nominal=mAir_flow_nominal) "Ideal economizer" annotation (
+    final m_flow_nominal=mAir_flow_nominal)
+    "Ideal economizer" annotation (
       Placement(transformation(
         rotation=90,
         extent={{10,-10},{-10,10}},
         origin={-90,46})));
   Fluid.Sensors.TemperatureTwoPort senTRetAir(
-    m_flow_nominal=mAir_flow_nominal,
-    allowFlowReversal=false,
-    tau=0,
-    redeclare package Medium = MediumA) "Return air temperature sensor"
+    final m_flow_nominal=mAir_flow_nominal,
+    final allowFlowReversal=false,
+    final tau=0,
+    redeclare package Medium = MediumA)
+    "Return air temperature sensor"
     annotation (Placement(transformation(extent={{-20,-50},{-40,-30}})));
-  Modelica.Blocks.Interfaces.RealOutput TRet(final unit="K", displayUnit="degC")
-    "Return air temperature" annotation (Placement(transformation(extent={{200,
-            -110},{220,-90}}), iconTransformation(extent={{200,-110},{220,-90}})));
-equation
-  connect(fanSup.port_b, totalRes.port_a)
-    annotation (Line(points={{-10,40},{10,40}},  color={0,127,255}));
-  connect(fanSup.P, PFan) annotation (Line(points={{-9,49},{-6,49},{-6,140},{210,
-          140}},             color={0,0,127}));
-  connect(eff.y, QHea_flow) annotation (Line(points={{141,120},{210,120}},
-                      color={0,0,127}));
-  connect(weaBus, out.weaBus) annotation (Line(
-      points={{-180,40},{-140,40},{-140,40.2}},
-      color={255,204,51},
-      thickness=0.5), Text(
-      textString="%first",
-      index=-1,
-      extent={{-6,3},{-6,3}}));
-  connect(senTMixAir.port_b, fanSup.port_a)
-    annotation (Line(points={{-40,40},{-30,40}},          color={0,127,255}));
-  connect(heaCoi.Q_flow, eff.u) annotation (Line(points={{73,46},{80,46},{80,
-          120},{118,120}},                        color={0,0,127}));
-  connect(heaCoi.port_b, cooCoi.port_a2)
-    annotation (Line(points={{72,40},{90,40}}, color={0,127,255}));
-  connect(cooCoi.port_b2, senTSup.port_a)
-    annotation (Line(points={{110,40},{128,40}},          color={0,127,255}));
-  connect(cooCoi.port_b1, ideVal.port_1) annotation (Line(
-      points={{90,28},{86,28},{86,19.8}},
-      color={0,0,255},
-      thickness=0.5));
-  connect(chi.port_b2, pumChiWat.port_a) annotation (Line(points={{110,-162},{120,
-          -162},{120,-100}},            color={0,0,255},
-      thickness=0.5));
-  connect(souChiWat.ports[1], chi.port_a1) annotation (Line(points={{128,-174},
-          {128,-174},{110,-174}},       color={0,127,255}));
-  connect(chi.port_b1, out.ports[1]) annotation (Line(points={{90,-174},{-116,
-          -174},{-116,42.6667},{-120,42.6667}},                  color={0,127,255}));
-  connect(weaBus.TDryBul, souChiWat.T_in) annotation (Line(
-      points={{-180,40},{-180,-208},{160,-208},{160,-170},{150,-170}},
-      color={255,204,51},
-      thickness=0.5), Text(
-      textString="%first",
-      index=-1,
-      extent={{-6,3},{-6,3}}));
-
-  connect(pumChiWat.P, PPum) annotation (Line(points={{111,-79},{111,-52},{180,-52},
-          {180,80},{210,80}},      color={0,0,127}));
-  connect(chi.P, PCoo) annotation (Line(points={{89,-177},{84,-177},{84,-128},{98,
-          -128},{98,-50},{178,-50},{178,100},{210,100}},
-        color={0,0,127}));
-  connect(ideVal.port_2, chi.port_a2)
-    annotation (Line(points={{86,0.2},{86,-162},{90,-162}},
-                                                          color={0,127,255}));
-  connect(cooCoi.port_a1, pumChiWat.port_b) annotation (Line(points={{110,28},{120,
-          28},{120,-80}},              color={0,127,255}));
-  connect(cooCoi.port_a1, ideVal.port_3) annotation (Line(points={{110,28},{120,
-          28},{120,10},{90,10}}, color={0,127,255}));
-  connect(bouPreChi.ports[1], chi.port_a2) annotation (Line(points={{70,-162},{90,
-          -162}},              color={0,127,255}));
-  connect(totalRes.port_b, heaCoi.port_a)
-    annotation (Line(points={{30,40},{52,40}}, color={0,127,255}));
-  connect(senTSup.port_b, supplyAir) annotation (Line(points={{148,40},{200,40}},
-                              color={0,127,255}));
-  connect(gaiFan.y, fanSup.m_flow_in)
-    annotation (Line(points={{-59,140},{-20,140},{-20,52}}, color={0,0,127}));
+  Modelica.Blocks.Interfaces.RealOutput TRet(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Return air temperature" annotation (Placement(transformation(extent={{202,-90},
+            {222,-70}}),       iconTransformation(extent={{202,-90},{222,-70}})));
+  Fluid.Sensors.TraceSubstancesTwoPort senTraSub(
+    redeclare package Medium=MediumA,
+    final m_flow_nominal=mAir_flow_nominal,
+    final tau=0)
+    "Sensor for trace substance"
+    annotation (Placement(transformation(extent={{40,-50},{20,-30}})));
 
 protected
   model IdealValve
     extends Modelica.Blocks.Icons.Block;
-
-    replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component"
-        annotation (choicesAllMatching = true);
-
+    replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
+    "Medium in the component"
+    annotation (choicesAllMatching = true);
     parameter Modelica.SIunits.MassFlowRate m_flow_nominal
-      "Design chilled water supply flow";
-    Modelica.Fluid.Interfaces.FluidPort_a port_1(redeclare package Medium =
-          Medium) annotation (Placement(transformation(extent={{50,88},
+    "Design chilled water supply flow";
+    Modelica.Fluid.Interfaces.FluidPort_a port_1(
+      redeclare package Medium = Medium) annotation (Placement(transformation(extent={{50,88},
               {70,108}}), iconTransformation(extent={{50,88},{70,108}})));
-    Modelica.Fluid.Interfaces.FluidPort_b port_2(redeclare package Medium =
-          Medium) annotation (Placement(transformation(extent={{50,-108},
+    Modelica.Fluid.Interfaces.FluidPort_b port_2(
+      redeclare package Medium = Medium) annotation (Placement(transformation(extent={{50,-108},
               {70,-88}}), iconTransformation(extent={{50,-108},{70,-88}})));
-    Modelica.Fluid.Interfaces.FluidPort_a port_3(redeclare package Medium =
-          Medium) annotation (Placement(transformation(extent={{90,-10},
+    Modelica.Fluid.Interfaces.FluidPort_a port_3(
+      redeclare package Medium = Medium) annotation (Placement(transformation(extent={{90,-10},
               {110,10}}), iconTransformation(extent={{90,-10},{110,10}})));
     Modelica.Blocks.Interfaces.RealInput y(min=0, max=1) annotation (Placement(
           transformation(extent={{-120,-10},{-100,10}}),
           iconTransformation(extent={{-120,-10},{-100,10}})));
-    Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium,
-        allowFlowReversal=false)
+    Fluid.Sensors.MassFlowRate senMasFlo(
+      redeclare package Medium = Medium,
+      allowFlowReversal=false)
       "Mass flow rate sensor" annotation (Placement(transformation(
           extent={{10,-10},{-10,10}},
           rotation=90,
@@ -379,7 +309,7 @@ protected
       m_flow_small=m_flow_nominal*1E-5,
       show_V_flow=false,
       allowFlowReversal=false)
-                        "Prescribed mass flow rate for the bypass" annotation (
+      "Prescribed mass flow rate for the bypass" annotation (
         Placement(transformation(
           extent={{-10,10},{10,-10}},
           rotation=180,
@@ -393,24 +323,17 @@ protected
   equation
     connect(senMasFlo.m_flow, pro.u2) annotation (Line(points={{-11,-40},{-40,
             -40},{-40,10},{-30,10}},      color={0,0,127}));
-    connect(feedback.u1, one.y)
-      annotation (Line(points={{-58,22},{-69,22}},
+    connect(feedback.u1, one.y)     annotation (Line(points={{-58,22},{-69,22}},
                                                  color={0,0,127}));
-    connect(y, feedback.u2)
-      annotation (Line(points={{-110,0},{-50,0},{-50,14}},color={0,0,127}));
-    connect(preMasFlo.port_a, port_3)
-      annotation (Line(points={{60,-1.33227e-15},{80,-1.33227e-15},{80,0},{100,
+    connect(y, feedback.u2)    annotation (Line(points={{-110,0},{-50,0},{-50,14}},color={0,0,127}));
+    connect(preMasFlo.port_a, port_3)     annotation (Line(points={{60,-1.33227e-15},{80,-1.33227e-15},{80,0},{100,
             0}},                                   color={0,127,255}));
-    connect(feedback.y, pro.u1)
-      annotation (Line(points={{-41,22},{-30,22}},
+    connect(feedback.y, pro.u1)     annotation (Line(points={{-41,22},{-30,22}},
                                                  color={0,0,127}));
-    connect(pro.y, preMasFlo.m_flow_in)
-      annotation (Line(points={{-7,16},{56,16},{56,8}},    color={0,0,127}));
-    connect(port_1, senMasFlo.port_a)
-      annotation (Line(points={{60,98},{60,60},{4.44089e-16,60},{4.44089e-16,
+    connect(pro.y, preMasFlo.m_flow_in)     annotation (Line(points={{-7,16},{56,16},{56,8}},    color={0,0,127}));
+    connect(port_1, senMasFlo.port_a)      annotation (Line(points={{60,98},{60,60},{4.44089e-16,60},{4.44089e-16,
             -30}},                                  color={0,127,255}));
-    connect(senMasFlo.port_b, port_2)
-      annotation (Line(points={{-4.44089e-16,-50},{0,-50},{0,-72},{60,-72},{60,
+    connect(senMasFlo.port_b, port_2)     annotation (Line(points={{-4.44089e-16,-50},{0,-50},{0,-72},{60,-72},{60,
             -92},{60,-92},{60,-98},{60,-98}},      color={0,127,255}));
     connect(preMasFlo.port_b, senMasFlo.port_a) annotation (Line(points={{40,
             1.33227e-15},{4.44089e-16,1.33227e-15},{4.44089e-16,-30}},
@@ -443,106 +366,160 @@ protected
             fillColor={0,0,0},
             fillPattern=FillPattern.Solid)}));
   end IdealValve;
+
 equation
-  connect(booToInt.y, pumChiWat.m_flow_in)
-    annotation (Line(points={{81,-90},{108,-90}}, color={0,0,127}));
-  connect(booToInt.u, chiOn) annotation (Line(points={{58,-90},{40,-90},{40,-140},
-          {-220,-140}}, color={255,0,255}));
-  connect(chiOn, chi.on) annotation (Line(points={{-220,-140},{40,-140},{40,-188},
+  connect(fanSup.port_b, totalRes.port_a)    annotation (Line(points={{-10,40},{10,40}},  color={0,127,255}));
+  connect(fanSup.P, PFan) annotation (Line(points={{-9,49},{-6,49},{-6,160},{212,
+          160}},             color={0,0,127}));
+  connect(eff.y, QHea_flow) annotation (Line(points={{141,120},{176,120},{176,140},
+          {212,140}}, color={0,0,127}));
+  connect(weaBus, out.weaBus) annotation (Line(
+      points={{-180,40},{-140,40},{-140,40.2}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      textString="%first",
+      index=-1,
+      extent={{-6,3},{-6,3}}));
+  connect(senTMixAir.port_b, fanSup.port_a)   annotation (Line(points={{-40,40},{-30,40}},          color={0,127,255}));
+  connect(heaCoi.Q_flow, eff.u) annotation (Line(points={{73,46},{80,46},{80,
+          120},{118,120}},                        color={0,0,127}));
+  connect(heaCoi.port_b, cooCoi.port_a2)    annotation (Line(points={{72,40},{90,40}}, color={0,127,255}));
+  connect(cooCoi.port_b2, senTSup.port_a)    annotation (Line(points={{110,40},{128,40}},          color={0,127,255}));
+  connect(cooCoi.port_b1, ideVal.port_1) annotation (Line(
+      points={{90,28},{86,28},{86,19.8}},
+      color={0,0,255},
+      thickness=0.5));
+  connect(chi.port_b2, pumChiWat.port_a) annotation (Line(points={{110,-162},{120,
+          -162},{120,-100}},            color={0,0,255},
+      thickness=0.5));
+  connect(souChiWat.ports[1], chi.port_a1) annotation (Line(points={{128,-174},
+          {128,-174},{110,-174}},       color={0,127,255}));
+  connect(chi.port_b1, out.ports[1]) annotation (Line(points={{90,-174},{-116,
+          -174},{-116,42.6667},{-120,42.6667}},                  color={0,127,255}));
+  connect(weaBus.TDryBul, souChiWat.T_in) annotation (Line(
+      points={{-180,40},{-180,-208},{160,-208},{160,-170},{150,-170}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      textString="%first",
+      index=-1,
+      extent={{-6,3},{-6,3}}));
+  connect(pumChiWat.P, PPum) annotation (Line(points={{111,-79},{111,-52},{180,-52},
+          {180,100},{212,100}},    color={0,0,127}));
+  connect(chi.P, PCoo) annotation (Line(points={{89,-177},{84,-177},{84,-128},{98,
+          -128},{98,-50},{178,-50},{178,120},{212,120}},
+        color={0,0,127}));
+  connect(ideVal.port_2, chi.port_a2)    annotation (Line(points={{86,0.2},{86,-162},{90,-162}},
+                                                          color={0,127,255}));
+  connect(cooCoi.port_a1, pumChiWat.port_b) annotation (Line(points={{110,28},{120,
+          28},{120,-80}},              color={0,127,255}));
+  connect(cooCoi.port_a1, ideVal.port_3) annotation (Line(points={{110,28},{120,
+          28},{120,10},{90,10}}, color={0,127,255}));
+  connect(bouPreChi.ports[1], chi.port_a2) annotation (Line(points={{70,-162},{90,
+          -162}},              color={0,127,255}));
+  connect(totalRes.port_b, heaCoi.port_a)    annotation (Line(points={{30,40},{52,40}}, color={0,127,255}));
+  connect(senTSup.port_b, supplyAir) annotation (Line(points={{148,40},{174,40},
+          {174,60},{202,60}}, color={0,127,255}));
+  connect(gaiFan.y, fanSup.m_flow_in)    annotation (Line(points={{-59,140},{-20,140},{-20,52}}, color={0,0,127}));
+  connect(booToInt.y, pumChiWat.m_flow_in)   annotation (Line(points={{81,-90},{108,-90}}, color={0,0,127}));
+  connect(booToInt.u, chiOn) annotation (Line(points={{58,-90},{40,-90},{40,-120},
+          {-220,-120}}, color={255,0,255}));
+  connect(chiOn, chi.on) annotation (Line(points={{-220,-120},{40,-120},{40,-188},
           {120,-188},{120,-171},{112,-171}}, color={255,0,255}));
-  connect(gaiFan.u, uFan)
-    annotation (Line(points={{-82,140},{-220,140}}, color={0,0,127}));
-  connect(heaCoi.u, uHea) annotation (Line(points={{50,46},{40,46},{40,80},{-220,
-          80}}, color={0,0,127}));
-  connect(ideVal.y, uCooVal)
-    annotation (Line(points={{69,10},{-220,10}}, color={0,0,127}));
+  connect(gaiFan.u, uFan)   annotation (Line(points={{-82,140},{-152,140},{-152,160},{-220,160}},
+                                                    color={0,0,127}));
+  connect(heaCoi.u, uHea) annotation (Line(points={{50,46},{40,46},{40,100},{-220,
+          100}},color={0,0,127}));
+  connect(ideVal.y, uCooVal)   annotation (Line(points={{69,10},{-76,10},{-76,30},{-220,30}},
+                                                 color={0,0,127}));
   connect(chi.TSet, TSetChi) annotation (Line(points={{112,-165},{124,-165},{124,
-          -190},{-220,-190}}, color={0,0,127}));
-  connect(senTMixAir.T, TMix) annotation (Line(points={{-50,51},{-50,70},{188,
-          70},{188,-80},{210,-80}}, color={0,0,127}));
-  connect(senTSup.T, TSup) annotation (Line(points={{138,51},{138,64},{170,64},
-          {170,-120},{210,-120}},color={0,0,127}));
+          -200},{-220,-200}}, color={0,0,127}));
+  connect(senTMixAir.T, TMix) annotation (Line(points={{-50,51},{-50,70},{188,70},
+          {188,-60},{212,-60}},     color={0,0,127}));
+  connect(senTSup.T, TSup) annotation (Line(points={{138,51},{138,64},{170,64},{
+          170,-100},{212,-100}}, color={0,0,127}));
   connect(out.ports[2], ideEco.port_1) annotation (Line(points={{-120,40},{-120,
           40},{-99.8,40}},             color={0,127,255}));
-  connect(ideEco.port_2, senTMixAir.port_a)
-    annotation (Line(points={{-80.2,40},{-60,40}}, color={0,127,255}));
-  connect(uEco, ideEco.y) annotation (Line(points={{-220,-60},{-148,-60},{-148,70},
+  connect(ideEco.port_2, senTMixAir.port_a)   annotation (Line(points={{-80.2,40},{-60,40}}, color={0,127,255}));
+  connect(uEco, ideEco.y) annotation (Line(points={{-220,-40},{-148,-40},{-148,70},
           {-90,70},{-90,57}}, color={0,0,127}));
-  connect(senTRetAir.port_a, returnAir)
-    annotation (Line(points={{-20,-40},{200,-40}}, color={0,127,255}));
   connect(ideEco.port_3, senTRetAir.port_b) annotation (Line(points={{-90,36},{
           -90,-40},{-40,-40}}, color={0,127,255}));
   connect(senTRetAir.port_b, out.ports[3]) annotation (Line(points={{-40,-40},{
           -112,-40},{-112,36},{-120,36},{-120,37.3333}}, color={0,127,255}));
-  connect(TRet, senTRetAir.T) annotation (Line(points={{210,-100},{174,-100},{
-          174,-20},{-30,-20},{-30,-29}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-240},
-            {200,160}}), graphics={
+  connect(TRet, senTRetAir.T) annotation (Line(points={{212,-80},{174,-80},{174,
+          -20},{-30,-20},{-30,-29}},     color={0,0,127}));
+  connect(senTRetAir.port_a, senTraSub.port_b)    annotation (Line(points={{-20,-40},{20,-40}}, color={0,127,255}));
+  connect(senTraSub.port_a, returnAir)   annotation (Line(points={{40,-40},{120,-40},{120,-20},{202,-20}},
+                                                  color={0,127,255}));
+
+  annotation (defaultComponentName="chiDXHeaEco",
+  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-220},
+            {200,180}}), graphics={
         Rectangle(
-          extent={{-202,160},{200,-240}},
+          extent={{-200,180},{202,-220}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{180,40},{-160,0}},
+          extent={{182,60},{-158,20}},
           lineColor={175,175,175},
           fillColor={175,175,175},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-32,36},{-4,22}},
+          extent={{-30,56},{-2,42}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{180,-72},{-160,-112}},
+          extent={{182,-52},{-158,-92}},
           lineColor={175,175,175},
           fillColor={175,175,175},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-80,0},{-120,-72}},
+          extent={{-78,20},{-118,-52}},
           lineColor={175,175,175},
           fillColor={175,175,175},
           fillPattern=FillPattern.Solid),
         Ellipse(
-          extent={{-48,36},{-14,2}},
+          extent={{-46,56},{-12,22}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Ellipse(
-          extent={{-38,26},{-24,12}},
+          extent={{-36,46},{-22,32}},
           lineColor={0,0,0},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{40,40},{54,0}},
+          extent={{42,60},{56,20}},
           lineColor={255,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Backward),
         Rectangle(
-          extent={{102,40},{116,0}},
+          extent={{104,60},{118,20}},
           lineColor={0,0,255},
           fillColor={255,255,255},
           fillPattern=FillPattern.Backward),
         Rectangle(
-          extent={{42,54},{52,46}},
+          extent={{44,74},{54,66}},
           lineColor={0,0,0},
           fillColor={0,0,0},
           fillPattern=FillPattern.Backward),
         Rectangle(
-          extent={{38,56},{56,54}},
+          extent={{40,76},{58,74}},
           lineColor={0,0,0},
           fillColor={0,0,0},
           fillPattern=FillPattern.Backward),
-        Line(points={{44,56},{44,60}}, color={0,0,0}),
-        Line(points={{50,56},{50,60}}, color={0,0,0}),
-        Line(points={{48,40},{48,48}}, color={0,0,0}),
+        Line(points={{46,76},{46,80}}, color={0,0,0}),
+        Line(points={{52,76},{52,80}}, color={0,0,0}),
+        Line(points={{50,60},{50,68}}, color={0,0,0}),
         Rectangle(
-          extent={{-140,40},{-126,0}},
+          extent={{-138,60},{-124,20}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Backward),
         Rectangle(
-          extent={{-140,-72},{-126,-112}},
+          extent={{-138,-52},{-124,-92}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Backward),
@@ -551,23 +528,23 @@ equation
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Backward,
-          origin={-100,-37},
+          origin={-98,-17},
           rotation=90),
-        Line(points={{200,100},{86,100},{86,46}},   color={0,0,127}),
-        Line(points={{198,118},{48,118},{48,68}}, color={0,0,127}),
-        Line(points={{198,140},{-30,140},{-30,50}}, color={0,0,127}),
-        Line(points={{104,0},{104,-66}}, color={0,0,255}),
-        Line(points={{114,0},{114,-66}}, color={0,0,255}),
-        Line(points={{104,-26},{114,-26}}, color={0,0,255}),
+        Line(points={{202,120},{88,120},{88,66}},   color={0,0,127}),
+        Line(points={{200,138},{50,138},{50,88}}, color={0,0,127}),
+        Line(points={{200,160},{-28,160},{-28,70}}, color={0,0,127}),
+        Line(points={{106,20},{106,-46}},color={0,0,255}),
+        Line(points={{116,20},{116,-46}},color={0,0,255}),
+        Line(points={{106,-6},{116,-6}},   color={0,0,255}),
         Polygon(
           points={{-3,4},{-3,-4},{3,0},{-3,4}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
-          origin={115,-24},
+          origin={117,-4},
           rotation=-90),
         Polygon(
-          points={{110,-22},{110,-30},{116,-26},{110,-22}},
+          points={{112,-2},{112,-10},{118,-6},{112,-2}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
@@ -576,48 +553,51 @@ equation
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
-          origin={115,-28}),
-        Line(points={{116,-26},{122,-26}}, color={0,0,0}),
-        Line(points={{122,-24},{122,-30}}, color={0,0,0}),
+          origin={117,-8}),
+        Line(points={{118,-6},{124,-6}},   color={0,0,0}),
+        Line(points={{124,-4},{124,-10}},  color={0,0,0}),
         Ellipse(
-          extent={{96,-124},{124,-152}},
+          extent={{98,-104},{126,-132}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Polygon(
-          points={{110,-124},{98,-144},{122,-144},{110,-124}},
+          points={{112,-104},{100,-124},{124,-124},{112,-104}},
           lineColor={0,0,0},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
-        Line(points={{114,-116},{114,-124}},
+        Line(points={{116,-96},{116,-104}},
                                          color={0,0,255}),
-        Line(points={{104,-116},{104,-124}},
+        Line(points={{106,-96},{106,-104}},
                                          color={0,0,255}),
         Ellipse(
-          extent={{84,-148},{110,-158}},
+          extent={{86,-128},{112,-138}},
           lineColor={0,0,0},
           fillColor={95,95,95},
           fillPattern=FillPattern.Solid),
         Ellipse(
-          extent={{110,-148},{136,-158}},
+          extent={{112,-128},{138,-138}},
           lineColor={0,0,0},
           fillColor={95,95,95},
           fillPattern=FillPattern.Solid),
         Ellipse(
-          extent={{108,-48},{120,-58}},
+          extent={{110,-28},{122,-38}},
           lineColor={0,0,0},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid),
         Polygon(
-          points={{114,-48},{110,-56},{118,-56},{114,-48}},
+          points={{116,-28},{112,-36},{120,-36},{116,-28}},
           lineColor={0,0,0},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
-        Line(points={{200,80},{132,80},{132,46}},   color={0,0,127}),
-        Line(points={{124,-54},{132,-54},{132,-4}}, color={0,0,127}),
-        Line(points={{92,-136},{86,-136},{86,-4}},  color={0,0,127})}),
-                                                                 Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-200,-240},{200,160}})),
+        Line(points={{202,100},{134,100},{134,66}}, color={0,0,127}),
+        Line(points={{126,-34},{134,-34},{134,16}}, color={0,0,127}),
+        Line(points={{94,-116},{88,-116},{88,16}},  color={0,0,127}),
+                                        Text(
+        extent={{-154,260},{164,196}},
+        textString="%name",
+        lineColor={0,0,255})}),                                  Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-200,-220},{200,180}})),
       Documentation(info="<html>
 <p>
 This is a conventional single zone VAV HVAC system model. The system contains
diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/InternalLoads.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/InternalLoads.mo
deleted file mode 100644
index be3c32417a9..00000000000
--- a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/InternalLoads.mo
+++ /dev/null
@@ -1,25 +0,0 @@
-within Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses;
-model InternalLoads "Schedule for time varying internal loads"
-  extends Modelica.Blocks.Sources.CombiTimeTable(
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    table=[
-      0,0.1;
-      8*3600,0.1;
-      8*3600,1.0;
-      18*3600,1.0;
-      18*3600,0.1;
-      24*3600,0.1],
-    columns={2});
-  annotation (Documentation(info="<html>
-<p>
-Internal load profile for the thermal zone.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-June 1, 2017, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end InternalLoads;
diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo
index 2061579da62..3c8a2391f9b 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/PartialOpenLoop.mo
@@ -2,9 +2,10 @@ within Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses;
 partial model PartialOpenLoop
   "Partial model of a single zone variable air volume flow system and thermal zone"
 
-  package MediumA = Buildings.Media.Air "Buildings library air media package";
-  package MediumW = Buildings.Media.Water "Buildings library air media package";
-
+  package MediumA = Buildings.Media.Air(extraPropertiesNames={"CO2"})
+    "Buildings library air media package with CO2";
+  package MediumW = Buildings.Media.Water
+    "Buildings library air media package";
   parameter Modelica.SIunits.Temperature TSupChi_nominal=279.15
     "Design value for chiller leaving water temperature";
 
@@ -15,71 +16,79 @@ partial model PartialOpenLoop
     etaHea_nominal=0.99,
     QHea_flow_nominal=7000,
     QCoo_flow_nominal=-7000,
-    TSupChi_nominal=TSupChi_nominal)   "Single zone VAV system"
+    TSupChi_nominal=TSupChi_nominal)
+    "Single zone VAV system"
     annotation (Placement(transformation(extent={{-40,-20},{0,20}})));
   Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.Room zon(
+    redeclare package MediumA = MediumA,
       mAir_flow_nominal=0.75,
-      lat=weaDat.lat) "Thermal envelope of single zone"
+      lat=weaDat.lat)
+    "Thermal envelope of single zone"
     annotation (Placement(transformation(extent={{40,-20},{80,20}})));
   Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
       computeWetBulbTemperature=false,
-      filNam=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/DRYCOLD.mos"))
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-  Modelica.Blocks.Continuous.Integrator EFan "Total fan energy"
+      filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/weatherdata/DRYCOLD.mos"))
+    "Weather data"
+    annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
+  Modelica.Blocks.Continuous.Integrator EFan
+  "Total fan energy"
     annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
-  Modelica.Blocks.Continuous.Integrator EHea "Total heating energy"
+  Modelica.Blocks.Continuous.Integrator EHea
+  "Total heating energy"
     annotation (Placement(transformation(extent={{40,-80},{60,-60}})));
-  Modelica.Blocks.Continuous.Integrator ECoo "Total cooling energy"
+  Modelica.Blocks.Continuous.Integrator ECoo
+  "Total cooling energy"
     annotation (Placement(transformation(extent={{40,-110},{60,-90}})));
-  Modelica.Blocks.Math.MultiSum EHVAC(nu=4)  "Total HVAC energy"
+  Modelica.Blocks.Math.MultiSum EHVAC(nu=4)
+  "Total HVAC energy"
     annotation (Placement(transformation(extent={{80,-80},{100,-60}})));
-  Modelica.Blocks.Continuous.Integrator EPum "Total pump energy"
+  Modelica.Blocks.Continuous.Integrator EPum
+  "Total pump energy"
     annotation (Placement(transformation(extent={{40,-140},{60,-120}})));
-
-  BoundaryConditions.WeatherData.Bus weaBus annotation (Placement(
-        transformation(extent={{-50,60},{-10,100}}), iconTransformation(extent=
+  BoundaryConditions.WeatherData.Bus weaBus
+  "Weather bus"
+    annotation (Placement(
+        transformation(extent={{-88,70},{-70,90}}),  iconTransformation(extent=
             {{-250,-2},{-230,18}})));
+
 equation
   connect(weaDat.weaBus, weaBus) annotation (Line(
-      points={{-60,80},{-30,80}},
+      points={{-120,80},{-79,80}},
       color={255,204,51},
       thickness=0.5), Text(
       textString="%second",
       index=1,
       extent={{6,3},{6,3}}));
-
-  connect(hvac.supplyAir, zon.supplyAir) annotation (Line(points={{0,8},{10,8},
+  connect(hvac.supplyAir, zon.supplyAir) annotation (Line(points={{0.2,8},{10,8},
           {10,2},{40,2}},          color={0,127,255}));
-  connect(hvac.returnAir, zon.returnAir) annotation (Line(points={{0,0},{6,0},{
-          6,-2},{10,-2},{40,-2}},  color={0,127,255}));
-
+  connect(hvac.returnAir, zon.returnAir) annotation (Line(points={{0.2,0},{6,0},
+          {6,-2},{10,-2},{40,-2}}, color={0,127,255}));
   connect(hvac.weaBus, weaBus) annotation (Line(
-      points={{-36,17.8},{-36,80},{-30,80}},
+      points={{-35.8,17.8},{-35.8,80},{-79,80}},
       color={255,204,51},
       thickness=0.5));
   connect(zon.weaBus, weaBus) annotation (Line(
-      points={{46,18},{42,18},{42,80},{-30,80}},
+      points={{46,18},{46,80},{-79,80}},
       color={255,204,51},
       thickness=0.5));
-
-  connect(hvac.PFan, EFan.u) annotation (Line(points={{1,18},{24,18},{24,-40},{
-          38,-40}},  color={0,0,127}));
-  connect(hvac.QHea_flow, EHea.u) annotation (Line(points={{1,16},{22,16},{22,
+  connect(hvac.PFan, EFan.u) annotation (Line(points={{1.2,18},{24,18},{24,-40},
+          {38,-40}}, color={0,0,127}));
+  connect(hvac.QHea_flow, EHea.u) annotation (Line(points={{1.2,16},{22,16},{22,
           -70},{38,-70}},
                      color={0,0,127}));
-  connect(hvac.PCoo, ECoo.u) annotation (Line(points={{1,14},{20,14},{20,-100},
+  connect(hvac.PCoo, ECoo.u) annotation (Line(points={{1.2,14},{20,14},{20,-100},
           {38,-100}},color={0,0,127}));
-  connect(hvac.PPum, EPum.u) annotation (Line(points={{1,12},{18,12},{18,-130},{
-          38,-130}},   color={0,0,127}));
-
+  connect(hvac.PPum, EPum.u) annotation (Line(points={{1.2,12},{18,12},{18,-130},
+          {38,-130}},  color={0,0,127}));
   connect(EFan.y, EHVAC.u[1]) annotation (Line(points={{61,-40},{70,-40},{70,
           -64.75},{80,-64.75}}, color={0,0,127}));
-  connect(EHea.y, EHVAC.u[2])
-    annotation (Line(points={{61,-70},{80,-70},{80,-68.25}}, color={0,0,127}));
+  connect(EHea.y, EHVAC.u[2])    annotation (Line(points={{61,-70},{80,-70},{80,-68.25}}, color={0,0,127}));
   connect(ECoo.y, EHVAC.u[3]) annotation (Line(points={{61,-100},{70,-100},{70,
           -71.75},{80,-71.75}}, color={0,0,127}));
   connect(EPum.y, EHVAC.u[4]) annotation (Line(points={{61,-130},{74,-130},{74,
           -75.25},{80,-75.25}}, color={0,0,127}));
+
   annotation (
 Documentation(info="<html>
 <p>
diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo
index 7626d5e32e2..f9a2c50bb60 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo
@@ -3,12 +3,9 @@ model Room
   "BESTest Case 600 with fluid ports for air HVAC and internal load"
 
   replaceable package MediumA = Buildings.Media.Air "Medium model";
-
   parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal
     "Design airflow rate of system";
-
   parameter Modelica.SIunits.Angle lat "Building latitude";
-
   parameter Modelica.SIunits.Angle S_=
     Buildings.Types.Azimuth.S "Azimuth for south walls";
   parameter Modelica.SIunits.Angle E_=
@@ -53,7 +50,6 @@ model Room
         nStaRef=Buildings.ThermalZones.Detailed.Validation.BESTEST.nStaRef)})
     "Exterior wall"
     annotation (Placement(transformation(extent={{100,80},{114,94}})));
-
   parameter Buildings.HeatTransfer.Data.OpaqueConstructions.Generic matFlo(
     final nLay= 2,
     absIR_a=0.9,
@@ -81,7 +77,6 @@ model Room
     c=800,
     d=1500) "Soil properties"
     annotation (Placement(transformation(extent={{100,60},{120,80}})));
-
   parameter Buildings.HeatTransfer.Data.OpaqueConstructions.Generic roof(
     nLay=3,
     absIR_a=0.9,
@@ -109,12 +104,12 @@ model Room
         nStaRef=Buildings.ThermalZones.Detailed.Validation.BESTEST.nStaRef)})
     "Roof"
     annotation (Placement(transformation(extent={{140,80},{154,94}})));
-
   parameter Buildings.ThermalZones.Detailed.Validation.BESTEST.Data.Win600 window600(
     UFra=3,
     haveExteriorShade=false,
     haveInteriorShade=false) "Window"
     annotation (Placement(transformation(extent={{120,80},{134,94}})));
+
   Buildings.HeatTransfer.Conduction.SingleLayer soi(
     A=48,
     material=soil,
@@ -122,32 +117,33 @@ model Room
     stateAtSurface_a=false,
     stateAtSurface_b=true,
     T_a_start=283.15,
-    T_b_start=283.75) "2 m deep soil (per definition on p.4 of ASHRAE 140-2007)"
+    T_b_start=283.75)
+    "2 m deep soil (per definition on p.4 of ASHRAE 140-2007)"
     annotation (Placement(transformation(
         extent={{12.5,-12.5},{-7.5,7.5}},
         rotation=-90,
         origin={70.5,-47.5})));
-
   Modelica.Fluid.Interfaces.FluidPort_a supplyAir(redeclare final package
-      Medium = MediumA) "Supply air"
+      Medium = MediumA)
+    "Supply air"
     annotation (Placement(transformation(extent={{-210,10},{-190,30}}),
         iconTransformation(extent={{-210,10},{-190,30}})));
   Modelica.Fluid.Interfaces.FluidPort_b returnAir(redeclare final package
-      Medium = MediumA) "Return air"
+      Medium = MediumA)
+    "Return air"
     annotation (Placement(transformation(extent={{-210,-30},{-190,-10}}),
         iconTransformation(extent={{-210,-30},{-190,-10}})));
-
   Buildings.BoundaryConditions.WeatherData.Bus weaBus
     "Weather data bus"
     annotation (Placement(transformation(extent={{-148,172},{-132,188}}),
         iconTransformation(extent={{-148,172},{-132,188}})));
-
-  Modelica.Blocks.Interfaces.RealOutput TRooAir "Room air temperature"
+  Modelica.Blocks.Interfaces.RealOutput TRooAir
+    "Room air temperature"
     annotation (Placement(transformation(extent={{200,-10},{220,10}}),
         iconTransformation(extent={{200,-10},{220,10}})));
-
   Buildings.ThermalZones.Detailed.MixedAir roo(
     redeclare package Medium = MediumA,
+    use_C_flow=true,
     nPorts=5,
     hRoo=2.7,
     nConExtWin=nConExtWin,
@@ -182,30 +178,31 @@ model Room
     steadyStateWindow=false)
     "Room model for Case 600"
     annotation (Placement(transformation(extent={{34,-26},{86,26}})));
-
-  Modelica.Blocks.Sources.Constant qConGai_flow(k=192/48) "Convective heat gain"
+  Modelica.Blocks.Sources.Constant qConGai_flow(k=192/48)
+    "Convective heat gain"
     annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
-
-  Modelica.Blocks.Sources.Constant qRadGai_flow(k=288/48) "Radiative heat gain"
+  Modelica.Blocks.Sources.Constant qRadGai_flow(k=288/48)
+    "Radiative heat gain"
     annotation (Placement(transformation(extent={{-120,120},{-100,140}})));
-
-  Modelica.Blocks.Routing.Multiplex3 mul "Multiplex"
+  Modelica.Blocks.Routing.Multiplex3 mul
+    "Multiplex"
     annotation (Placement(transformation(extent={{0,80},{22,102}})));
-
-  Modelica.Blocks.Sources.Constant qLatGai_flow(k=96/48) "Latent heat gain"
+  Modelica.Blocks.Sources.Constant qLatGai_flow(k=96/48)
+    "Latent heat gain"
     annotation (Placement(transformation(extent={{-120,60},{-100,80}})));
   Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TSoi[nConBou](
-    each T= 283.15) "Boundary condition for construction"
+    each T= 283.15)
+    "Boundary condition for construction"
     annotation (Placement(transformation(
         extent={{0,0},{-20,20}},
         origin={140,-80})));
-
   Fluid.Sources.MassFlowSource_WeatherData sinInf(
     redeclare package Medium = MediumA,
+    C=fill(0.0004, 1),
     nPorts=1,
     use_m_flow_in=true)
     "Sink model for air infiltration"
-           annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
+    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
   Modelica.Blocks.Sources.Constant InfiltrationRate(k=48*2.7*0.5/3600)
     "0.41 ACH adjusted for the altitude (0.5 at sea level)"
     annotation (Placement(transformation(extent={{-180,-94},{-160,-74}})));
@@ -215,30 +212,52 @@ model Room
       warnAboutOnePortConnection=false)
     "Air density inside the building"
     annotation (Placement(transformation(extent={{0,-100},{-20,-80}})));
-
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTZon
     "Zone air temperature sensor"
     annotation (Placement(transformation(extent={{160,-10},{180,10}})));
-
   Fluid.Sources.MassFlowSource_WeatherData souInf(
     redeclare package Medium = MediumA,
     use_m_flow_in=true,
-    nPorts=1)   "Source model for air infiltration"
+    C=fill(0.0004, 1),
+    nPorts=1)
+    "Source model for air infiltration"
     annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
-
-  Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.InternalLoads intLoad
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable intLoad(table=[0,
+        0.1; 8*3600,0.1; 8*3600,1.0; 18*3600,1.0; 18*3600,0.1; 24*3600,0.1])
     "Internal loads"
     annotation (Placement(transformation(extent={{-120,150},{-100,170}})));
+  Modelica.Blocks.Sources.Constant CO2_flow_per(k=1.023e-5)
+    "Latent heat gain"
+    annotation (Placement(transformation(extent={{-40,14},{-20,34}})));
+  Modelica.Blocks.Logical.GreaterThreshold greThr(threshold=0.1)
+    "Greater than"
+    annotation (Placement(transformation(extent={{-60,150},{-40,170}})));
+  Modelica.Blocks.Sources.Constant desOcc(k=2)
+    "Design number of occupants"
+    annotation (Placement(transformation(extent={{-120,180},{-100,200}})));
+  Modelica.Blocks.Math.Product numOcc
+    "Number of occupants in the zone"
+    annotation (Placement(transformation(extent={{10,150},{30,170}})));
+  Modelica.Blocks.Math.BooleanToReal booToRea
+    "Convert Boolean to Real signal"
+    annotation (Placement(transformation(extent={{-30,150},{-10,170}})));
+
 protected
-  Modelica.Blocks.Math.Product pro1 "Product for internal gain"
+  Modelica.Blocks.Math.Product pro1
+    "Product for internal gain"
     annotation (Placement(transformation(extent={{-40,120},{-20,140}})));
-  Modelica.Blocks.Math.Product pro2 "Product for internal gain"
+  Modelica.Blocks.Math.Product pro2
+    "Product for internal gain"
     annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
-  Modelica.Blocks.Math.Product pro3 "Product for internal gain"
+  Modelica.Blocks.Math.Product pro3
+    "Product for internal gain"
     annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
-
-  Modelica.Blocks.Math.Gain gaiInf(final k=-1) "Gain for infiltration"
+  Modelica.Blocks.Math.Gain gaiInf(final k=-1)
+    "Gain for infiltration"
     annotation (Placement(transformation(extent={{-80,-100},{-60,-80}})));
+  Modelica.Blocks.Math.Product pro4
+    "Product for internal gain"
+    annotation (Placement(transformation(extent={{0,20},{20,40}})));
 
 equation
   connect(mul.y, roo.qGai_flow) annotation (Line(
@@ -261,7 +280,6 @@ equation
       points={{68,-40},{68,-20.8},{67.8,-20.8}},
       color={191,0,0},
       smooth=Smooth.None));
-
   connect(sinInf.ports[1], roo.ports[2]) annotation (Line(points={{-20,-10},{14,
           -10},{14,-15.08},{40.5,-15.08}},color={0,127,255}));
   connect(weaBus,sinInf. weaBus) annotation (Line(
@@ -278,7 +296,6 @@ equation
       textString="%first",
       index=-1,
       extent={{-6,3},{-6,3}}));
-
   connect(senTZon.T, TRooAir) annotation (Line(points={{180,0},{210,0}},
                     color={0,0,127}));
   connect(senTZon.port, roo.heaPorAir) annotation (Line(points={{160,0},{58.7,0}},
@@ -289,8 +306,8 @@ equation
           -70,76},{-42,76}}, color={0,0,127}));
   connect(qConGai_flow.y, pro3.u1) annotation (Line(points={{-99,100},{-94,100},
           {-94,96},{-82,96}}, color={0,0,127}));
-  connect(intLoad.y[1], pro2.u2) annotation (Line(points={{-99,160},{-90,160},{
-          -90,64},{-42,64}}, color={0,0,127}));
+  connect(intLoad.y[1], pro2.u2) annotation (Line(points={{-98,160},{-90,160},{-90,
+          64},{-42,64}},     color={0,0,127}));
   connect(pro1.y, mul.u1[1]) annotation (Line(points={{-19,130},{-12,130},{-12,
           98.7},{-2.2,98.7}}, color={0,0,127}));
   connect(pro3.y, mul.u2[1]) annotation (Line(points={{-59,90},{-58,90},{-58,91},
@@ -303,8 +320,7 @@ equation
       thickness=0.5));
   connect(souInf.ports[1], roo.ports[3]) annotation (Line(points={{-20,-50},{-6,
           -50},{-6,-13},{40.5,-13}},      color={0,127,255}));
-  connect(product.y, gaiInf.u)
-    annotation (Line(points={{-99,-90},{-82,-90}},     color={0,0,127}));
+  connect(product.y, gaiInf.u)    annotation (Line(points={{-99,-90},{-82,-90}},     color={0,0,127}));
   connect(gaiInf.y, souInf.m_flow_in) annotation (Line(points={{-59,-90},{-46,-90},
           {-46,-42},{-40,-42}},          color={0,0,127}));
   connect(product.y, sinInf.m_flow_in) annotation (Line(points={{-99,-90},{-92,-90},
@@ -314,13 +330,27 @@ equation
   connect(returnAir, roo.ports[5]) annotation (Line(points={{-200,-20},{-114,-20},
           {-114,42},{-2,42},{-2,-8.84},{40.5,-8.84}},
         color={0,127,255}));
-  connect(InfiltrationRate.y, product.u1)
-    annotation (Line(points={{-159,-84},{-122,-84}}, color={0,0,127}));
-  connect(intLoad.y[1], pro1.u2) annotation (Line(points={{-99,160},{-90,160},{
-          -90,124},{-42,124}}, color={0,0,127}));
+  connect(InfiltrationRate.y, product.u1)   annotation (Line(points={{-159,-84},{-122,-84}}, color={0,0,127}));
+  connect(intLoad.y[1], pro1.u2) annotation (Line(points={{-98,160},{-90,160},{-90,
+          124},{-42,124}},     color={0,0,127}));
   connect(pro3.u2, intLoad.y[1]) annotation (Line(points={{-82,84},{-90,84},{-90,
-          160},{-99,160}}, color={0,0,127}));
-annotation (Documentation(info="<html>
+          160},{-98,160}}, color={0,0,127}));
+  connect(CO2_flow_per.y, pro4.u2)    annotation (Line(points={{-19,24},{-2,24}}, color={0,0,127}));
+  connect(desOcc.y, numOcc.u1) annotation (Line(points={{-99,190},{0,190},{0,
+          166},{8,166}}, color={0,0,127}));
+  connect(greThr.y, booToRea.u)    annotation (Line(points={{-39,160},{-32,160}}, color={255,0,255}));
+  connect(booToRea.y, numOcc.u2) annotation (Line(points={{-9,160},{0,160},{0,
+          154},{8,154}}, color={0,0,127}));
+  connect(greThr.u, pro2.u2) annotation (Line(points={{-62,160},{-90,160},{-90,
+          64},{-42,64}}, color={0,0,127}));
+  connect(numOcc.y, pro4.u1) annotation (Line(points={{31,160},{40,160},{40,54},
+          {-12,54},{-12,36},{-2,36}}, color={0,0,127}));
+  connect(pro4.y, roo.C_flow[1]) annotation (Line(points={{21,30},{26,30},{26,
+          3.64},{31.92,3.64}}, color={0,0,127}));
+
+  annotation (
+defaultComponentName="roo",
+Documentation(info="<html>
 <p>
 This is a single zone model based on the envelope of the BESTEST Case 600
 building, though it has some modifications.  Supply and return air ports are
@@ -335,6 +365,12 @@ the <code>Schedules</code> and <code>Constructions</code> packages.
 </html>", revisions="<html>
 <ul>
 <li>
+July 21, 2020, by Kun Zhang:<br/>
+Replaced the internal gain block from BaseClasses by directly using the block 
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable\">
+Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable</a>.
+</li>
+<li>
 June 21, 2017, by Michael Wetter:<br/>
 Refactored implementation.
 </li>
@@ -367,5 +403,9 @@ First implementation.
           extent={{148,70},{156,-70}},
           lineColor={95,95,95},
           fillColor={170,213,255},
-          fillPattern=FillPattern.Solid)}));
+          fillPattern=FillPattern.Solid),
+                                        Text(
+        extent={{-156,234},{160,172}},
+        textString="%name",
+        lineColor={0,0,255})}));
 end Room;
diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/package.order b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/package.order
index 09bb4fa975d..8f4b452d1cc 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/package.order
+++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/package.order
@@ -1,3 +1,2 @@
-InternalLoads
 PartialOpenLoop
 Room
diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo
index 01d43638fd5..ffafc04cc71 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo
@@ -3,18 +3,11 @@ model ChillerDXHeatingEconomizer
   "Variable air volume flow system with single themal zone and conventional control"
   extends Modelica.Icons.Example;
   extends
-    Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop;
-
-  package MediumA = Buildings.Media.Air "Buildings library air media package";
-  package MediumW = Buildings.Media.Water "Buildings library air media package";
-
+    Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop(
+    hvac(QCoo_flow_nominal=-10000));
   parameter Modelica.SIunits.Temperature TSupChi_nominal=279.15
     "Design value for chiller leaving water temperature";
 
-<<<<<<< HEAD
-  ChillerDXHeatingEconomizerController con(
-    minOAFra=0.2,
-=======
   Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerChillerDXHeatingEconomizer con(
     minAirFlo=0.1,
     minOAFra=0.4,
@@ -23,65 +16,38 @@ model ChillerDXHeatingEconomizer
     kCoo=1,
     TiCoo=120,
     controllerTypeFan=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
->>>>>>> master
     kFan=4,
+    controllerTypeEco=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
     kEco=4,
     kHea=4,
     TSupChi_nominal=TSupChi_nominal,
-    TSetSupAir=286.15)
-   "Controller"
+    TSetSupAir=286.15) "Controller for single zone VAV system"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
-
-  Modelica.Blocks.Sources.CombiTimeTable TSetRooHea(
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooHea(
     table=[
       0,       15 + 273.15;
       8*3600,  20 + 273.15;
       18*3600, 15 + 273.15;
       24*3600, 15 + 273.15],
-    smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments,
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments,
+    extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.Periodic)
     "Heating setpoint for room temperature"
-    annotation (Placement(transformation(extent={{-140,40},{-120,60}})));
-  Modelica.Blocks.Sources.CombiTimeTable TSetRooCoo(
+    annotation (Placement(transformation(extent={{-152,40},{-132,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooCoo(
     table=[
       0,       30 + 273.15;
       8*3600,  25 + 273.15;
       18*3600, 30 + 273.15;
       24*3600, 30 + 273.15],
-    smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments,
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments,
+    extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.Periodic)
     "Cooling setpoint for room temperature"
-    annotation (Placement(transformation(extent={{-140,10},{-120,30}})));
+    annotation (Placement(transformation(extent={{-152,10},{-132,30}})));
+  Buildings.Controls.SetPoints.OccupancySchedule occSch(occupancy=3600*{8,18})
+    "Occupancy schedule"
+    annotation (Placement(transformation(extent={{-152,-44},{-132,-24}})));
 
 equation
-<<<<<<< HEAD
-  connect(TSetRooHea.y[1], con.TSetRooHea)
-    annotation (Line(points={{-119,50},{-110,50},{-110,10},{-102,10}},
-                                                   color={0,0,127}));
-  connect(TSetRooCoo.y[1], con.TSetRooCoo)
-    annotation (Line(points={{-119,20},{-116,20},{-116,6},{-102,6}},   color={0,0,127}));
-
-  connect(hvac.uFan, con.yFan) annotation (Line(points={{-42,18},{-60,18},{-60,9},
-          {-79,9}}, color={0,0,127}));
-  connect(hvac.uHea, con.yHea) annotation (Line(points={{-42,12},{-58,12},{-58,6},
-          {-79,6}}, color={0,0,127}));
-  connect(con.yCooCoiVal, hvac.uCooVal) annotation (Line(points={{-79,0},{-56,0},
-          {-56,5},{-42,5}}, color={0,0,127}));
-  connect(hvac.uEco, con.yOutAirFra) annotation (Line(points={{-42,-2},{-58,-2},
-          {-58,3},{-79,3}}, color={0,0,127}));
-  connect(con.chiOn, hvac.chiOn) annotation (Line(points={{-79,-4},{-58,-4},{-58,
-          -10},{-42,-10}}, color={255,0,255}));
-  connect(hvac.TSetChi, con.TSetSupChi) annotation (Line(points={{-42,-15},{-50,
-          -15},{-50,-16},{-60,-16},{-60,-8},{-79,-8}}, color={0,0,127}));
-  connect(hvac.TMix, con.TMix) annotation (Line(points={{1,-4},{8,-4},{8,-40},{
-          -114,-40},{-114,2},{-102,2}}, color={0,0,127}));
-  connect(hvac.TSup, con.TSup) annotation (Line(points={{1,-8},{6,-8},{6,-36},{
-          -110,-36},{-110,-9},{-102,-9}}, color={0,0,127}));
-  connect(con.TOut, weaBus.TDryBul) annotation (Line(points={{-102,-2},{-108,-2},
-          {-108,60},{-30,60},{-30,80}}, color={0,0,127}), Text(
-      textString="%second",
-      index=1,
-=======
   connect(TSetRooHea.y[1], con.TSetRooHea)   annotation (Line(points={{-130,50},
           {-110,50},{-110,6},{-102,6}},            color={0,0,127}));
   connect(TSetRooCoo.y[1], con.TSetRooCoo)    annotation (Line(points={{-130,20},
@@ -117,11 +83,9 @@ equation
       thickness=0.5), Text(
       string="%first",
       index=-1,
->>>>>>> master
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  connect(zon.TRooAir, con.TRoo) annotation (Line(points={{81,0},{108,0},{108,
-          -148},{-120,-148},{-120,-6},{-102,-6}}, color={0,0,127}));
+
   annotation (
     experiment(
       StopTime=504800,
@@ -138,8 +102,13 @@ with conventional single-maximum control sequence.
 </html>", revisions="<html>
 <ul>
 <li>
+July 27, 2020, by Kun Zhang:<br/>
+Changed parameters of PID controllers.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1608\">issue 1608</a>.
+</li>
+<li>
 August 3, 2019, by David Blum:<br/>
-Update to using <a href=\"modelica://Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop\">
+Updated to using <a href=\"modelica://Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop\">
 Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop</a>.
 </li>
 <li>
diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo
index 91c42f74cc7..744e3e7f93f 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo
@@ -2,13 +2,18 @@ within Buildings.Air.Systems.SingleZone.VAV.Examples;
 model Guideline36
   "Variable air volume flow system with single themal zone and ASHRAE Guideline 36 sequence control"
   extends Modelica.Icons.Example;
-  extends Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop;
-
+  extends
+    Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.PartialOpenLoop(
+    hvac(QCoo_flow_nominal=-10000));
   parameter Modelica.SIunits.Temperature TSupChi_nominal=279.15
     "Design value for chiller leaving water temperature";
-  Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller controller(
-    controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    kCoo=1,
+
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller con(
+    have_winSen=true,
+    TZonHeaOn=293.15,
+    TZonCooOff=303.15,
+    kCoo=4,
+    kCooCoi=1,
     yHeaMax=0.2,
     AFlo=48,
     VOutMin_flow=0.0144,
@@ -19,94 +24,92 @@ model Guideline36
     have_occSen=false,
     TZonHeaOff=288.15,
     TZonCooOn=298.15,
-    TSupSetMax=323.15,
-    TSupSetMin=285.15)
+    TSupSetMax=343.15,
+    TSupSetMin=286.15,
+    yDam_VOutMin_minSpe=0.2304,
+    yDam_VOutMin_maxSpe=0.02304,
+    yDam_VOutDes_minSpe=0.4,
+    yDam_VOutDes_maxSpe=0.04)
     "VAV controller"
     annotation (Placement(transformation(extent={{-120,-28},{-80,20}})));
-  Controls.OBC.CDL.Continuous.Hysteresis hysChiPla(
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysChiPla(
     uLow=-1,
     uHigh=0)
     "Hysteresis with delay to switch on cooling"
-    annotation (Placement(transformation(extent={{-72,-120},{-52,-100}})));
+    annotation (Placement(transformation(extent={{-80,-100},{-60,-80}})));
   Modelica.Blocks.Math.Feedback errTRooCoo
     "Control error on room temperature for cooling"
-    annotation (Placement(transformation(extent={{-110,-120},{-90,-100}})));
+    annotation (Placement(transformation(extent={{-110,-100},{-90,-80}})));
   Controls.SetPoints.OccupancySchedule occSch(occupancy=3600*{8,18})
     "Occupancy schedule"
-    annotation (Placement(transformation(extent={{-180,40},{-160,60}})));
+    annotation (Placement(transformation(extent={{-180,0},{-160,20}})));
   Modelica.Blocks.Sources.BooleanConstant uWin(k=false) "Window opening signal"
-    annotation (Placement(transformation(extent={{-180,-60},{-160,-40}})));
-  Modelica.Blocks.Math.BooleanToReal occPer "Conversion to number of occupants"
     annotation (Placement(transformation(extent={{-180,-90},{-160,-70}})));
-  Modelica.Blocks.Math.Gain ppl(k=2) "Gain for number of occupants"
-    annotation (Placement(transformation(extent={{-154,-86},{-142,-74}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant demLim(final k=0)
+    "Cooling and heating demand imit level"
+    annotation (Placement(transformation(extent={{-180,-50},{-160,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooWarTim(final k=0)
+    "Cooldown and warm-up time"
+    annotation (Placement(transformation(extent={{-180,40},{-160,60}})));
+
 protected
   Modelica.Blocks.Sources.Constant TSetSupChiConst(final k=TSupChi_nominal)
     "Set point for chiller temperature"
-    annotation (Placement(transformation(extent={{-72,-80},{-52,-60}})));
+    annotation (Placement(transformation(extent={{-80,-140},{-60,-120}})));
+
 equation
-  connect(controller.yFan, hvac.uFan) annotation (Line(points={{-78,7.07692},{-62,
-          7.07692},{-62,18},{-42,18}},
-                              color={0,0,127}));
-  connect(controller.yHeaCoi, hvac.uHea) annotation (Line(points={{-78,-9.53846},
-          {-60,-9.53846},{-60,12},{-42,12}},
-                              color={0,0,127}));
-  connect(controller.yOutDamPos, hvac.uEco) annotation (Line(points={{-78,-19.6923},
-          {-56,-19.6923},{-56,-2},{-42,-2}},
-                                 color={0,0,127}));
-  connect(TSetSupChiConst.y, hvac.TSetChi) annotation (Line(points={{-51,-70},{
-          -46,-70},{-46,-16},{-42,-16},{-42,-15}},
+  connect(con.yFan, hvac.uFan) annotation (Line(points={{-78,7.07692},{-62,
+          7.07692},{-62,18},{-42,18}}, color={0,0,127}));
+  connect(con.yHeaCoi, hvac.uHea) annotation (Line(points={{-78,-9.53846},{-60,
+          -9.53846},{-60,12},{-42,12}}, color={0,0,127}));
+  connect(con.yOutDamPos, hvac.uEco) annotation (Line(points={{-78,-19.6923},{-56,
+          -19.6923},{-56,-2},{-42,-2}}, color={0,0,127}));
+  connect(TSetSupChiConst.y, hvac.TSetChi) annotation (Line(points={{-59,-130},
+          {-46,-130},{-46,-18},{-42,-18}},
                                      color={0,0,127}));
-  connect(errTRooCoo.y, hysChiPla.u)
-    annotation (Line(points={{-91,-110},{-74,-110}}, color={0,0,127}));
-  connect(zon.TRooAir, errTRooCoo.u1) annotation (Line(points={{81,0},{110,0},{
-          110,-152},{-134,-152},{-134,-110},{-108,-110}}, color={0,0,127}));
-  connect(hysChiPla.y, hvac.chiOn) annotation (Line(points={{-50,-110},{-48,-110},
-          {-48,-10},{-42,-10}},       color={255,0,255}));
-  connect(weaBus.TDryBul, controller.TOut) annotation (Line(
-      points={{-30,80},{-30,60},{-140,60},{-140,18.1538},{-122,18.1538}},
+  connect(errTRooCoo.y, hysChiPla.u)   annotation (Line(points={{-91,-90},{-82,-90}},   color={0,0,127}));
+  connect(zon.TRooAir, errTRooCoo.u1) annotation (Line(points={{81,0},{110,0},{110,
+          -152},{-134,-152},{-134,-90},{-108,-90}},       color={0,0,127}));
+  connect(hysChiPla.y, hvac.chiOn) annotation (Line(points={{-58,-90},{-50,-90},
+          {-50,-10},{-42,-10}},       color={255,0,255}));
+  connect(weaBus.TDryBul, con.TOut) annotation (Line(
+      points={{-79,80},{-79,60},{-140,60},{-140,19.0769},{-122,19.0769}},
       color={255,204,51},
       thickness=0.5), Text(
       textString="%first",
       index=-1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  connect(zon.TRooAir, controller.TZon) annotation (Line(points={{81,0},{110,0},
-          {110,-152},{-134,-152},{-134,10.7692},{-122,10.7692}},
-                                                       color={0,0,127}));
-  connect(hvac.TSup, controller.TSup) annotation (Line(points={{1,-8},{10,-8},{10,
-          -50},{-130,-50},{-130,-0.307692},{-122,-0.307692}},
-                                                 color={0,0,127}));
-  connect(hvac.TMix, controller.TMix) annotation (Line(points={{1,-4},{14,-4},{
-          14,-46},{-128,-46},{-128,-4},{-122,-4}}, color={0,0,127}));
-  connect(occSch.tNexOcc, controller.tNexOcc) annotation (Line(points={{-159,56},
-          {-150,56},{-150,14.4615},{-122,14.4615}},
-                                          color={0,0,127}));
-  connect(controller.uOcc, occSch.occupied) annotation (Line(points={{-122,7.07692},
-          {-152,7.07692},{-152,44},{-159,44}},
-                                        color={255,0,255}));
-  connect(uWin.y, controller.uWin) annotation (Line(points={{-159,-50},{-148,
-          -50},{-148,-11.3846},{-122,-11.3846}},
-                                       color={255,0,255}));
-  connect(occSch.occupied, occPer.u) annotation (Line(points={{-159,44},{-152,
-          44},{-152,0},{-190,0},{-190,-80},{-182,-80}},   color={255,0,255}));
-  connect(occPer.y, ppl.u)
-    annotation (Line(points={{-159,-80},{-155.2,-80}}, color={0,0,127}));
-  connect(ppl.y, controller.nOcc) annotation (Line(points={{-141.4,-80},{-138,-80},
-          {-138,-7.69231},{-122,-7.69231}},
-                                     color={0,0,127}));
-  connect(controller.TZonCooSet, errTRooCoo.u2) annotation (Line(points={{-78,-4},
-          {-76,-4},{-76,-132},{-100,-132},{-100,-118}},
-        color={0,0,127}));
-  connect(hvac.uCooVal, controller.yCooCoi) annotation (Line(points={{-42,5},{
-          -48,5},{-48,4},{-58,4},{-58,-15.0769},{-78,-15.0769}},
-                                                       color={0,0,127}));
-  connect(hvac.TRet, controller.TCut) annotation (Line(points={{1,-6},{12,-6},{12,
-          -48},{-132,-48},{-132,3.38462},{-122,3.38462}},
-                                                 color={0,0,127}));
+  connect(zon.TRooAir, con.TZon) annotation (Line(points={{81,0},{110,0},{110,-152},
+          {-134,-152},{-134,8},{-122,8}}, color={0,0,127}));
+  connect(hvac.TSup, con.TSup) annotation (Line(points={{1.2,-8},{10,-8},{10,
+          -50},{-130,-50},{-130,-2.15385},{-122,-2.15385}}, color={0,0,127}));
+  connect(hvac.TMix, con.TMix) annotation (Line(points={{1.2,-4},{14,-4},{14,
+          -46},{-128,-46},{-128,-7.69231},{-122,-7.69231}}, color={0,0,127}));
+  connect(occSch.tNexOcc, con.tNexOcc) annotation (Line(points={{-159,16},{-150,
+          16},{-150,10.7692},{-122,10.7692}}, color={0,0,127}));
+  connect(con.uOcc, occSch.occupied) annotation (Line(points={{-122,5.23077},{-152,
+          5.23077},{-152,4},{-159,4}}, color={255,0,255}));
+  connect(uWin.y, con.uWin) annotation (Line(points={{-159,-80},{-136,-80},{
+          -136,-13.2308},{-122,-13.2308}}, color={255,0,255}));
+  connect(con.TZonCooSet, errTRooCoo.u2) annotation (Line(points={{-78,-4},{-74,
+          -4},{-74,-40},{-120,-40},{-120,-110},{-100,-110},{-100,-98}}, color={
+          0,0,127}));
+  connect(hvac.TRet, con.TCut) annotation (Line(points={{1.2,-6},{12,-6},{12,
+          -48},{-132,-48},{-132,-4.92308},{-122,-4.92308}}, color={0,0,127}));
+  connect(demLim.y, con.uCooDemLimLev) annotation (Line(points={{-158,-40},{-138,
+          -40},{-138,2.46154},{-122,2.46154}}, color={255,127,0}));
+  connect(demLim.y, con.uHeaDemLimLev) annotation (Line(points={{-158,-40},{-138,
+          -40},{-138,0.615385},{-122,0.615385}}, color={255,127,0}));
+  connect(cooWarTim.y, con.warUpTim) annotation (Line(points={{-158,50},{-142,
+          50},{-142,16.3077},{-122,16.3077}}, color={0,0,127}));
+  connect(cooWarTim.y, con.cooDowTim) annotation (Line(points={{-158,50},{-142,
+          50},{-142,13.5385},{-122,13.5385}}, color={0,0,127}));
+  connect(con.yCooCoi, hvac.uCooVal) annotation (Line(points={{-78,-15.0769},{
+          -58,-15.0769},{-58,5},{-42,5}}, color={0,0,127}));
+
   annotation (Diagram(coordinateSystem(extent={{-200,-160},{120,100}})),
     experiment(
-      StartTime=0,
       StopTime=864000,
       Interval=3600,
       Tolerance=1e-06),
@@ -121,9 +124,26 @@ with ASHRAE Guideline 36 control sequence.
 </html>", revisions="<html>
 <ul>
 <li>
+July 27, 2020, by Kun Zhang:<br/>
+Changed parameters of PID and design outdoor airflow and damper parameters.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1608\">issue 1608</a>.
+</li>
+<li>
+June 30, 2020, by Jianjun  Hu:<br/>
+Updated AHU controller which applies the sequence of specifying operating mode
+according to G36 official release.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\"># 1893</a>.
+</li>
+<li>
+June 22, 2020, by Michael Wetter:<br/>
+Removed non-used occupant density.
+</li>
+<li>
 July 29, 2019, by David Blum:<br/>
 First implementation.
 </li>
 </ul>
-</html>"));
+</html>"),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
 end Guideline36;
diff --git a/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo b/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo
index 110889c10d5..7a849cb3144 100644
--- a/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo
+++ b/Buildings/Airflow/Multizone/BaseClasses/PowerLawResistance.mo
@@ -2,7 +2,8 @@ within Buildings.Airflow.Multizone.BaseClasses;
 partial model PowerLawResistance "Flow resistance that uses the power law"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
     final allowFlowReversal=true,
-    final m_flow_nominal=rho_default*k*dp_turbulent);
+    final m_flow_nominal=rho_default*k*dp_turbulent,
+    final m_flow_small=1E-4*abs(m_flow_nominal));
   extends Buildings.Airflow.Multizone.BaseClasses.ErrorControl;
 
   constant Boolean homotopyInitialization = true "= true, use homotopy method"
@@ -132,6 +133,12 @@ The model is used as a base for the interzonal air flow models.
 revisions="<html>
 <ul>
 <li>
+May 12, 2020, by Michael Wetter:<br/>
+Changed assignment of <code>m_flow_small</code> to <code>final</code>.
+This quantity are not used in this model and models that extend from it.
+Hence there is no need for the user to change the value.
+</li>
+<li>
 April 14, 2020, by Michael Wetter:<br/>
 Changed <code>homotopyInitialization</code> to a constant.<br/>
 This is for
diff --git a/Buildings/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo b/Buildings/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo
index 2daaf9537c3..31ca70c242b 100644
--- a/Buildings/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo
+++ b/Buildings/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo
@@ -6,7 +6,9 @@ partial model TwoWayFlowElement "Flow resistance that uses the power law"
     final allowFlowReversal1=true,
     final allowFlowReversal2=true,
     final m1_flow_nominal=10/3600*1.2,
-    final m2_flow_nominal=m1_flow_nominal);
+    final m2_flow_nominal=m1_flow_nominal,
+    final m1_flow_small=1E-4*abs(m1_flow_nominal),
+    final m2_flow_small=1E-4*abs(m2_flow_nominal));
   extends Buildings.Airflow.Multizone.BaseClasses.ErrorControl;
 
   replaceable package Medium =
@@ -133,6 +135,13 @@ for doors that can be open or closed as a function of an input signal.
 revisions="<html>
 <ul>
 <li>
+May 12, 2020, by Michael Wetter:<br/>
+Changed assignment of <code>m1_flow_small</code> and
+<code>m2_flow_small</code> to <code>final</code>.
+These quantities are not used in this model and models that extend from it.
+Hence there is no need for the user to change the value.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to moist air only.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/Buildings/Airflow/Multizone/BaseClasses/ZonalFlow.mo b/Buildings/Airflow/Multizone/BaseClasses/ZonalFlow.mo
index 39ce558d0c3..3b0999f0644 100644
--- a/Buildings/Airflow/Multizone/BaseClasses/ZonalFlow.mo
+++ b/Buildings/Airflow/Multizone/BaseClasses/ZonalFlow.mo
@@ -1,12 +1,14 @@
 within Buildings.Airflow.Multizone.BaseClasses;
 partial model ZonalFlow "Flow across zonal boundaries of a room"
   extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
-     redeclare final package Medium1 = Medium,
-     redeclare final package Medium2 = Medium,
-     final allowFlowReversal1 = false,
-     final allowFlowReversal2 = false,
-     final m1_flow_nominal = 10/3600*1.2,
-     final m2_flow_nominal = m1_flow_nominal);
+    redeclare final package Medium1 = Medium,
+    redeclare final package Medium2 = Medium,
+    final allowFlowReversal1 = false,
+    final allowFlowReversal2 = false,
+    final m1_flow_nominal = 10/3600*1.2,
+    final m2_flow_nominal = m1_flow_nominal,
+    final m1_flow_small=1E-4*abs(m1_flow_nominal),
+    final m2_flow_small=1E-4*abs(m2_flow_nominal));
 
    replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
     annotation (choices(
@@ -70,6 +72,13 @@ Models that extend this model need to provide an equation for
 revisions="<html>
 <ul>
 <li>
+May 12, 2020, by Michael Wetter:<br/>
+Changed assignment of <code>m1_flow_small</code> and
+<code>m2_flow_small</code> to <code>final</code>.
+These quantities are not used in this model and models that extend from it.
+Hence there is no need for the user to change the value.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to moist air only.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo b/Buildings/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo
index d12030fb2c3..5b44f2c26a1 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Controls/CoolingTowerSpeed.mo
@@ -3,7 +3,7 @@ model CoolingTowerSpeed "Controller for the fan speed in cooling towers"
   extends Modelica.Blocks.Icons.Block;
 
   parameter Modelica.Blocks.Types.SimpleController controllerType=
-    Modelica.Blocks.Types.SimpleController.PID
+    Modelica.Blocks.Types.SimpleController.PI
     "Type of controller"
     annotation(Dialog(tab="Controller"));
   parameter Real k(min=0, unit="1") = 1
@@ -25,7 +25,7 @@ model CoolingTowerSpeed "Controller for the fan speed in cooling towers"
   parameter Real yMin=0
    "Lower limit of output"
     annotation(Dialog(tab="Controller"));
-  parameter Boolean reverseAction = true
+  parameter Boolean reverseActing=false
     "Set to true for throttling the water flow rate through a cooling coil controller"
     annotation(Dialog(tab="Controller"));
   Modelica.Blocks.Interfaces.RealInput TCHWSupSet(
@@ -75,7 +75,7 @@ model CoolingTowerSpeed "Controller for the fan speed in cooling towers"
     Td=Td,
     yMax=yMax,
     yMin=yMin,
-    reverseAction=reverseAction)
+    reverseActing=reverseActing)
     "PID controller"
     annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
   Modelica.Blocks.Math.IntegerToBoolean fmcMod(threshold=3)
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo b/Buildings/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo
index d792915b5b7..e279b4bff5b 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Controls/Validation/CoolingTowerSpeed.mo
@@ -3,30 +3,6 @@ model CoolingTowerSpeed
   "Test the model ChillerWSE.Examples.BaseClasses.CoolingTowerSpeedControl"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.Blocks.Types.SimpleController controllerType=
-    Modelica.Blocks.Types.SimpleController.PID
-    "Type of controller"
-    annotation(Dialog(tab="Controller"));
-  parameter Real k(min=0, unit="1") = 1
-    "Gain of controller"
-    annotation(Dialog(tab="Controller"));
-  parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5
-    "Time constant of integrator block"
-     annotation (Dialog(enable=
-          (controllerType == Modelica.Blocks.Types.SimpleController.PI or
-          controllerType == Modelica.Blocks.Types.SimpleController.PID),tab="Controller"));
-  parameter Modelica.SIunits.Time Td(min=0)=0.1
-    "Time constant of derivative block"
-     annotation (Dialog(enable=
-          (controllerType == Modelica.Blocks.Types.SimpleController.PD or
-          controllerType == Modelica.Blocks.Types.SimpleController.PID),tab="Controller"));
-  parameter Real yMax(start=1)=1
-   "Upper limit of output"
-    annotation(Dialog(tab="Controller"));
-  parameter Real yMin=0
-   "Lower limit of output"
-    annotation(Dialog(tab="Controller"));
-
   Buildings.Applications.DataCenters.ChillerCooled.Controls.CoolingTowerSpeed
     cooTowSpeCon(controllerType=Modelica.Blocks.Types.SimpleController.PI)
     "Cooling tower speed controller"
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo
index 4e20f36c254..da5e550f315 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialChillerWSE.mo
@@ -7,7 +7,7 @@ partial model PartialChillerWSE
      final computeFlowResistance1=true,
      final computeFlowResistance2=true);
   extends Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialControllerInterface(
-     final reverseAction=true);
+     final reverseActing=false);
   extends Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.ValvesParameters(
      numVal=4,
      final deltaM=deltaM1);
@@ -239,7 +239,7 @@ partial model PartialChillerWSE
     final yValWSE_start=yValWSE_start,
     final tauThrWayVal=tauWSE,
     final use_controller=use_controller,
-    final reverseAction=reverseAction,
+    final reverseActing=reverseActing,
     final show_T=show_T,
     final portFlowDirection_1=portFlowDirection_1,
     final portFlowDirection_2=portFlowDirection_2,
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo
index 44a98b82f12..7fc3386fc84 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialControllerInterface.mo
@@ -71,7 +71,7 @@ partial model PartialControllerInterface
     "Initial value of output from the controller"
     annotation(Dialog(enable=(initType ==Modelica.Blocks.Types.InitPID.InitialOutput
               and use_controller),group="Initialization",tab="Controller"));
-  parameter Boolean reverseAction = true
+  parameter Boolean reverseActing=false
     "Set to true for throttling the water flow rate through a cooling coil controller"
     annotation(Dialog(tab="Controller",enable=use_controller));
   parameter Buildings.Types.Reset reset = Buildings.Types.Reset.Disabled
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/HeatExchanger_TSet.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/HeatExchanger_TSet.mo
index 752ece5cf7a..2d6d327560e 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/HeatExchanger_TSet.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/HeatExchanger_TSet.mo
@@ -27,7 +27,7 @@ model HeatExchanger_TSet "Heat exchanger"
     final xi_start=xi_start,
     final xd_start=xd_start,
     final y_start=yCon_start,
-    final reverseAction=reverseAction,
+    final reverseActing=reverseActing,
     final reset=reset,
     final y_reset=y_reset) if use_controller
     "Controller for temperature at port_b2"
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo
index 8dada3f5309..4baa08e481f 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/Validation/CoolingCoilHumidifyingHeating_ClosedLoop.mo
@@ -51,9 +51,8 @@ model CoolingCoilHumidifyingHeating_ClosedLoop
     annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
   Buildings.Controls.Continuous.LimPID PID(
     yMax=1,
-    reverseAction=true,
+    reverseActing=false,
     Td=120,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMin=yValMin,
     k=0.5,
     Ti=60)
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo
index d5120fe8e4b..11c9b3b9bcf 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/WatersideEconomizer.mo
@@ -97,7 +97,7 @@ model WatersideEconomizer "Waterside economizer"
     final portFlowDirection_2=portFlowDirection_2,
     final portFlowDirection_3=portFlowDirection_3,
     final rhoStd=rhoStd[2],
-    final reverseAction=reverseAction)
+    final reverseActing=reverseActing)
     "Water-to-water heat exchanger"
     annotation (Placement(transformation(extent={{-10,-12},{10,4}})));
 
diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo
index 20ccaf143d4..bcc0dd90865 100644
--- a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo
+++ b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo
@@ -186,7 +186,8 @@ partial model PartialDataCenter
   Buildings.Fluid.Actuators.Valves.TwoWayLinear val[numChi](
     redeclare each package Medium = MediumW,
     each m_flow_nominal=m1_flow_chi_nominal,
-    each dpValve_nominal=6000)
+    each dpValve_nominal=6000,
+    each use_inputFilter=false)
     "Shutoff valves"
     annotation (Placement(transformation(extent={{70,130},{50,150}})));
 
@@ -220,7 +221,6 @@ partial model PartialDataCenter
     each k=m1_flow_chi_nominal) "Gain effect"
     annotation (Placement(transformation(extent={{-130,60},{-110,80}})));
   Buildings.Applications.DataCenters.ChillerCooled.Controls.CoolingTowerSpeed cooTowSpeCon(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMin=0,
     Ti=60,
     k=0.1)
@@ -245,7 +245,6 @@ partial model PartialDataCenter
     "Mass flowrate of variable speed pumps"
     annotation (Placement(transformation(extent={{-220,-6},{-200,14}})));
   Buildings.Controls.Continuous.LimPID pumSpe(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     Ti=40,
     yMin=0.2,
     k=0.1)
@@ -258,9 +257,8 @@ partial model PartialDataCenter
     "Pump speed signal"
     annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
   Buildings.Controls.Continuous.LimPID ahuValSig(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    Ti=40,
-    reverseAction=true,
+        Ti=40,
+    reverseActing=false,
     yMin=yValMinAHU,
     k=0.01)          "Valve position signal for the AHU"
     annotation (Placement(transformation(extent={{-82,-90},{-62,-70}})));
@@ -269,9 +267,8 @@ partial model PartialDataCenter
     annotation (Placement(transformation(extent={{-60,166},{-44,182}})));
 
   Buildings.Controls.Continuous.LimPID ahuFanSpeCon(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    k=0.1,
-    reverseAction=true,
+        k=0.1,
+    reverseActing=false,
     yMin=0.2,
     Ti=240)   "Fan speed controller "
     annotation (Placement(transformation(extent={{-120,-170},{-100,-150}})));
@@ -313,8 +310,8 @@ equation
         points={{-50,110},{-50,140},{-42,140}},
         color={0,127,255},
         thickness=0.5));
-    connect(TCWRet.port_b, val[i].port_a) annotation (Line(points={{102,60},{
-            110,60},{110,140},{70,140}},
+    connect(TCWRet.port_b, val[i].port_a) annotation (Line(points={{102,60},{110,
+            60},{110,140},{70,140}},
             color={0,127,255},
             thickness=0.5));
   end for;
@@ -538,6 +535,11 @@ Taylor, S. T. (2014). How to design &amp; control waterside economizers. ASHRAE
 </html>", revisions="<html>
 <ul>
 <li>
+October 6, 2020, by Michael Wetter:<br/>
+Set <code>val.use_inputFilter=false</code> because pump worked against closed valve at <i>t=60</i> seconds,
+leading to negative pressure at pump inlet (because pump forces the mass flow rate).
+</li>
+<li>
 January 12, 2019, by Michael Wetter:<br/>
 Removed wrong <code>each</code>.
 </li>
diff --git a/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo b/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo
index 29fbb1e0f06..c3f58220bf3 100644
--- a/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo
+++ b/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo
@@ -30,7 +30,7 @@ model AirsideEconomizer "Controller for airside economizer"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
   Buildings.Controls.Continuous.LimPID con(
-    reverseAction=true,
+    reverseActing=false,
     k=gai,
     yMin=minOAFra,
     final controllerType=Modelica.Blocks.Types.SimpleController.PI,
diff --git a/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo b/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo
index 73173990f62..5186c6452b1 100644
--- a/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo
+++ b/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo
@@ -5,7 +5,7 @@ model Compressor "Controller for compressor speed"
   parameter Modelica.SIunits.Time Ti=240 "Time constant of integrator block";
   parameter Real yMax=1 "Upper limit of output";
   parameter Real yMin=0 "Lower limit of output";
-  parameter Boolean reverseAction=true
+  parameter Boolean reverseActing=false
     "Set to true for throttling the water flow rate through a cooling coil controller";
 
   Buildings.Controls.Continuous.LimPID dxSpe(
@@ -15,7 +15,7 @@ model Compressor "Controller for compressor speed"
     final Ti=Ti,
     final yMax=yMax,
     final yMin=yMin,
-    reverseAction=reverseAction,
+    reverseActing=reverseActing,
     reset=Buildings.Types.Reset.Parameter,
     y_reset=yMin) "Controller for variable speed DX coil"
     annotation (Placement(transformation(extent={{-40,50},{-20,70}})));
diff --git a/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo b/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo
index e26c44b506d..60f220681e2 100644
--- a/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo
+++ b/Buildings/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mo
@@ -201,8 +201,7 @@ model DXCooledAirsideEconomizer
     yMin=minSpeFan,
     Ti=240,
     k=0.5,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    reverseAction=true)
+    reverseActing=false)
     "Fan speed controller"
     annotation (Placement(transformation(extent={{80,-42},{100,-22}})));
   Buildings.Applications.DataCenters.DXCooled.Controls.Compressor speCon(
diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo
index f71da6f9765..af6076a6749 100644
--- a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo
+++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo
@@ -30,28 +30,16 @@ protected
 equation
   tmp = (Modelica.Math.sin(lat)*Modelica.Math.cos(zen) - Modelica.Math.sin(
     decAng))/(Modelica.Math.cos(lat)*Modelica.Math.sin(zen));
-
   arg = min(1.0, max(-1.0, tmp));
 
   solAziTem =  Modelica.Math.acos(arg); // Solar azimuth (A4.9a and b) as a positive number
 
-  if outsidePolarCircle then
-    // Outside the polar circle, the only non-differentiability is at night when the sun is set.
-    // Hence, we use noEvent.
-    if noEvent(solTim - integer(solTim/day)*day < 43200) then
-      solAzi =-solAziTem;
-    else
-      solAzi = solAziTem;
-    end if;
-  else
-    // Inside the polar circle, there is a jump at (solar-)midnight when the sun can
-    // be above the horizon. Hence, we do not use noEvent(...)
-    if solTim - integer(solTim/day)*day < 43200 then
-      solAzi =-solAziTem;
-    else
-      solAzi = solAziTem;
-    end if;
-  end if;
+  // If outside the polar circle, the only non-differentiability is at night when the sun is set.
+  // Hence, we use noEvent.
+  // If inside the polar circle, there is a jump at (solar-)midnight when the sun can
+  // be above the horizon. Hence, we do not use noEvent(...)
+  // Written as one line with functions so that lat does not become structural parameter with JModelica.org
+  solAzi = if outsidePolarCircle then solarAzimuthNoEvent(solAziTem, solTim, day) else solarAzimuthWithEvent(solAziTem, solTim, day);
 
   annotation (
     defaultComponentName="solAzi",
@@ -62,6 +50,12 @@ This component computes the solar azimuth angle.
 </html>", revisions="<html>
 <ul>
 <li>
+June 9, 2020, by David Blum:<br/>
+Reformulated to use one-line if-statements.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1373\">issue 1373</a>.
+</li>
+<li>
 October 13, 2017, by Michael Wetter:<br/>
 Reformulated to use equation rather than algorithm section.<br/>
 This is for
diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.order b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.order
index 5ff36e3792e..7e4f7b1a6ff 100644
--- a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.order
+++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/package.order
@@ -5,4 +5,6 @@ SolarAzimuth
 SolarHourAngle
 WallSolarAzimuth
 ZenithAngle
+solarAzimuthNoEvent
+solarAzimuthWithEvent
 Examples
diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthNoEvent.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthNoEvent.mo
new file mode 100644
index 00000000000..647e8c27ca8
--- /dev/null
+++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthNoEvent.mo
@@ -0,0 +1,32 @@
+within Buildings.BoundaryConditions.SolarGeometry.BaseClasses;
+function solarAzimuthNoEvent "Determines solar azimuth with no event"
+  input Real solAziTem(quantity="Angle",unit="rad",displayUnit="deg") "Temporary solar azimuth";
+  input Real solTim(quantity="Time", unit="s") "Solar time";
+  input Real day(quantity="Time", unit="s") "Number of seconds in day";
+  output Real solAzi(quantity="Angle",unit="rad",displayUnit="deg") "Solar azimuth";
+algorithm
+  if noEvent(solTim - integer(solTim/day)*day<43200) then
+    solAzi := -solAziTem;
+  else
+    solAzi := solAziTem;
+  end if;
+
+  annotation (
+    Documentation(info="<html>
+<p>
+This function is used within
+<a href=\"modelica://Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth\">
+Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth</a> 
+to calculate solar azimuth with no events.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 9, 2020 by David Blum:<br/>
+Initial implementation.
+This is for issue
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1373\">#1373</a>. 
+</li>
+</ul>
+</html>"));
+end solarAzimuthNoEvent;
diff --git a/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthWithEvent.mo b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthWithEvent.mo
new file mode 100644
index 00000000000..ca5bf6d19db
--- /dev/null
+++ b/Buildings/BoundaryConditions/SolarGeometry/BaseClasses/solarAzimuthWithEvent.mo
@@ -0,0 +1,31 @@
+within Buildings.BoundaryConditions.SolarGeometry.BaseClasses;
+function solarAzimuthWithEvent "Determines solar azimuth with event"
+  input Real solAziTem(quantity="Angle",unit="rad",displayUnit="deg") "Temporary solar azimuth";
+  input Real solTim(quantity="Time", unit="s") "Solar time";
+  input Real day(quantity="Time", unit="s") "Number of seconds in day";
+  output Real solAzi(quantity="Angle",unit="rad",displayUnit="deg") "Solar azimuth";
+algorithm
+  if (solTim - integer(solTim/day)*day<43200) then
+    solAzi := -solAziTem;
+  else
+    solAzi := solAziTem;
+  end if;
+  annotation (
+    Documentation(info="<html>
+<p>
+This function is used within
+<a href=\"modelica://Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth\">
+Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth</a> 
+to calculate solar azimuth with events.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 9, 2020 by David Blum:<br/>
+Initial implementation.
+This is for issue
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1373\">#1373</a>. 
+</li>
+</ul>
+</html>"));
+end solarAzimuthWithEvent;
diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo
index 35126d7d41c..4119c22da2b 100644
--- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo
+++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo
@@ -28,7 +28,7 @@ equation
   when {initial(), canRepeatWeatherFile and modTim > pre(tNext)} then
     // simulation time stamp went over the end time of the weather file
     //(last time stamp of the weather file + average increment)
-    tNext = if canRepeatWeatherFile then noEvent(integer(modTim/lenWea))*lenWea + lenWea else time;
+    tNext = if canRepeatWeatherFile then integer(modTim/lenWea)*lenWea + lenWea else time;
   end when;
   calTim = if canRepeatWeatherFile then modTim - tNext + lenWea else modTim;
 
@@ -59,7 +59,7 @@ Added <code>noEvent</code> to assertion to remove zero crossing function in OPTI
 </li>
 <li>
 January 29, 2020, by Filip Jorissen:<br/>
-Revised end time assert and added assert that verifies whether the time is before the 
+Revised end time assert and added assert that verifies whether the time is before the
 start time of the weather file.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1281\">#1281</a>.
 </li>
diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mo
index 59350ebfb59..47868a37c0f 100644
--- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mo
+++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mo
@@ -50,7 +50,7 @@ First implementation.
 </li>
 </ul>
 </html>"),
-  experiment(Tolerance=1e-6, StartTime=0, StopTime=8640000),
+  experiment(Tolerance=1e-6, StartTime=0, StopTime=432000),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mos"
         "Simulate and plot"));
 end LimitMin;
diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterCeilingHeight.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterCeilingHeight.mo
index 0941a10455c..367125f863f 100644
--- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterCeilingHeight.mo
+++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterCeilingHeight.mo
@@ -3,17 +3,14 @@ block LimiterCeilingHeight "Block that limits the relative humidity"
   extends PartialLimiterMin;
 
   Modelica.Blocks.Interfaces.RealOutput ceiHei(
-    final unit="m") "Cloud cover ceiling height"
+    final unit="m") = max(0, u) "Cloud cover ceiling height"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
-equation
-  ceiHei = max(0, u);
-
 annotation (
 defaultComponentName="limMin",
 Documentation(info="<html>
 <p>
-Block that limits the cloud cover ceiling height to be non-zero.
+Block that limits the cloud cover ceiling height to be positive.
 </p>
 <p>
 This block is used because interpolation of weather data can lead to slightly
diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterHorizontalInfraredIrradiation.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterHorizontalInfraredIrradiation.mo
index d276b7abce3..04dd6c39449 100644
--- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterHorizontalInfraredIrradiation.mo
+++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterHorizontalInfraredIrradiation.mo
@@ -4,17 +4,14 @@ block LimiterHorizontalInfraredIrradiation
   extends PartialLimiterMin;
 
   Modelica.Blocks.Interfaces.RealOutput HHorIR(
-    final unit="W/m2") "Horizontal infrared irradiation"
+    final unit="W/m2") = max(0, u) "Horizontal infrared irradiation"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
-equation
-  HHorIR = max(0, u);
-
   annotation (
 defaultComponentName="limMin",
 Documentation(info="<html>
 <p>
-Block that limits the horizontal infrared irradiation to be non-zero.
+Block that limits the horizontal infrared irradiation to be positive.
 </p>
 <p>
 This block is used because interpolation of weather data can lead to slightly
diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterWindSpeed.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterWindSpeed.mo
index f2985536f42..adbe2620049 100644
--- a/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterWindSpeed.mo
+++ b/Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterWindSpeed.mo
@@ -3,17 +3,14 @@ block LimiterWindSpeed "Block that limits the wind speed"
   extends PartialLimiterMin;
 
   Modelica.Blocks.Interfaces.RealOutput winSpe(
-    final unit="m/s") "Wind speed"
+    final unit="m/s") = max(0, u) "Wind speed"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
-equation
-  winSpe = max(0, u);
-
   annotation (
 defaultComponentName="limMin",
 Documentation(info="<html>
 <p>
-Block that limits the wind speed to be non-zero.
+Block that limits the wind speed to be positive.
 </p>
 <p>
 This block is used because interpolation of weather data can lead to slightly
diff --git a/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo b/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo
index 7a7ce9735a8..19f2f25c805 100644
--- a/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo
+++ b/Buildings/BoundaryConditions/WeatherData/ReaderTMY3.mo
@@ -1219,6 +1219,10 @@ for which you have write permission).
 On a console window, type<pre>
   cd Buildings/Resources/weatherdata
   java -jar ../bin/ConvertWeatherData.jar inputFile.epw
+</pre>
+  if inputFile contains space in the name:
+<pre>
+  java -jar ../bin/ConvertWeatherData.jar \"inputFile .epw\"
 </pre>
 This will generate the weather data file <code>inputFile.mos</code>, which can be read
 by the model
@@ -1539,6 +1543,12 @@ Technical Report, NREL/TP-581-43156, revised May 2008.
 </html>", revisions="<html>
 <ul>
 <li>
+October 4, 2020, by Ettore Zanetti:<br/>
+Updated documentation for Java weather file generator.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1396\">#1396</a>.
+</li>
+<li>
 August 20, 2019, by Filip Jorissen:<br/>
 Better clarified the meaning of <code>time</code> in the documentation.<br/>
 This is for
diff --git a/Buildings/Controls/Continuous/Examples/LimPID.mo b/Buildings/Controls/Continuous/Examples/LimPID.mo
index 0a9180fb388..b9ba83a600c 100644
--- a/Buildings/Controls/Continuous/Examples/LimPID.mo
+++ b/Buildings/Controls/Continuous/Examples/LimPID.mo
@@ -14,7 +14,7 @@ model LimPID "Test model for PID controller with optional reverse action"
           annotation (Placement(transformation(extent={{-20,30},{0,50}})));
   Buildings.Controls.Continuous.LimPID limPIDRev(
     controllerType=Modelica.Blocks.Types.SimpleController.PID,
-    reverseAction=true,
+    reverseActing=false,
     Ti=1,
     Td=1,
     yMax=1,
diff --git a/Buildings/Controls/Continuous/Examples/LimPIDWithReset.mo b/Buildings/Controls/Continuous/Examples/LimPIDWithReset.mo
index 3ba097c44e5..608fd4387b8 100644
--- a/Buildings/Controls/Continuous/Examples/LimPIDWithReset.mo
+++ b/Buildings/Controls/Continuous/Examples/LimPIDWithReset.mo
@@ -130,7 +130,6 @@ First implementation.
       final reset=reset,
       yMax=1,
       yMin=0,
-      controllerType=Modelica.Blocks.Types.SimpleController.PI,
       Ti=1,
       k=10) "PI controller"
       annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
diff --git a/Buildings/Controls/Continuous/Examples/PIDHysteresis.mo b/Buildings/Controls/Continuous/Examples/PIDHysteresis.mo
index 6fc2cf04303..73bde9bc0b1 100644
--- a/Buildings/Controls/Continuous/Examples/PIDHysteresis.mo
+++ b/Buildings/Controls/Continuous/Examples/PIDHysteresis.mo
@@ -4,7 +4,6 @@ model PIDHysteresis "Example model for PID controller with hysteresis"
 
   Buildings.Controls.Continuous.PIDHysteresis con(
     pre_y_start=false,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMin=0.3,
     Ti=600,
     Td=60)
diff --git a/Buildings/Controls/Continuous/Examples/PIDHysteresisTimer.mo b/Buildings/Controls/Continuous/Examples/PIDHysteresisTimer.mo
index e95164427e8..b1534ccd59a 100644
--- a/Buildings/Controls/Continuous/Examples/PIDHysteresisTimer.mo
+++ b/Buildings/Controls/Continuous/Examples/PIDHysteresisTimer.mo
@@ -6,7 +6,6 @@ model PIDHysteresisTimer
   Buildings.Controls.Continuous.PIDHysteresisTimer con(
     yMin=0.3,
     minOffTime=10000,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     Ti=60,
     Td=10)
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
diff --git a/Buildings/Controls/Continuous/LimPID.mo b/Buildings/Controls/Continuous/LimPID.mo
index 1f19a3d0f52..41fb5b376ba 100644
--- a/Buildings/Controls/Continuous/LimPID.mo
+++ b/Buildings/Controls/Continuous/LimPID.mo
@@ -7,7 +7,7 @@ block LimPID
     "Control error (set point - measurement)";
 
   parameter Modelica.Blocks.Types.SimpleController controllerType=
-         Modelica.Blocks.Types.SimpleController.PID "Type of controller";
+         Modelica.Blocks.Types.SimpleController.PI "Type of controller";
   parameter Real k(min=0) = 1 "Gain of controller";
   parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5
     "Time constant of Integrator block" annotation (Dialog(enable=
@@ -55,8 +55,8 @@ block LimPID
   parameter Boolean strict=true "= true, if strict limits with noEvent(..)"
     annotation (Evaluate=true, choices(checkBox=true), Dialog(tab="Advanced"));
 
-  parameter Boolean reverseAction = false
-    "Set to true for throttling the water flow rate through a cooling coil controller";
+  parameter Boolean reverseActing = true
+    "Set to true for reverse acting, or false for direct acting control action";
 
   parameter Buildings.Types.Reset reset = Buildings.Types.Reset.Disabled
     "Type of controller output reset"
@@ -127,8 +127,8 @@ block LimPID
 protected
   constant Modelica.SIunits.Time unitTime=1 annotation (HideResult=true);
 
-  final parameter Real revAct = if reverseAction then -1 else 1
-    "Switch for sign for reverse action";
+  final parameter Real revAct = if reverseActing then 1 else -1
+    "Switch for sign for reverse or direct acting controller";
 
   parameter Boolean with_I = controllerType==Modelica.Blocks.Types.SimpleController.PI or
                              controllerType==Modelica.Blocks.Types.SimpleController.PID
@@ -353,29 +353,57 @@ equation
 defaultComponentName="conPID",
 Documentation(info="<html>
 <p>
-This model is similar to
-<a href=\"modelica://Modelica.Blocks.Continuous.LimPID\">Modelica.Blocks.Continuous.LimPID</a>,
-except for the following changes:
+PID controller in the standard form
 </p>
-
-<ol>
-<li>
+<p align=\"center\" style=\"font-style:italic;\">
+y = k &nbsp; ( e(t) + 1 &frasl; T<sub>i</sub> &nbsp; &int; e(s) ds + T<sub>d</sub> de(t)&frasl;dt ),
+</p>
+<p>
+where
+<i>y</i> is the control signal,
+<i>e(t) = u<sub>s</sub> - u<sub>m</sub></i> is the control error,
+with <i>u<sub>s</sub></i> being the set point and <i>u<sub>m</sub></i> being
+the measured quantity,
+<i>k</i> is the gain,
+<i>T<sub>i</sub></i> is the time constant of the integral term and
+<i>T<sub>d</sub></i> is the time constant of the derivative term.
+</p>
+<p>
+Note that the units of <i>k</i> are the inverse of the units of the control error,
+while the units of <i>T<sub>i</sub></i> and <i>T<sub>d</sub></i> are seconds.
+</p>
+<p>
+For detailed treatment of integrator anti-windup, set-point weights and output limitation, see
+<a href=\"modelica://Modelica.Blocks.Continuous.LimPID\">Modelica.Blocks.Continuous.LimPID</a>.
+</p>
+<h4>Options</h4>
+This controller can be configured as follows.
+<h5>P, PI, PD, or PID action</h5>
 <p>
-It can be configured to have a reverse action.
+Through the parameter <code>controllerType</code>, the controller can be configured
+as P, PI, PD or PID controller. The default configuration is PI.
 </p>
-<p>If the parameter <code>reverseAction=false</code> (the default), then
-<code>u_m &lt; u_s</code> increases the controller output,
-otherwise the controller output is decreased. Thus,
+<h5>Direct or reverse acting</h5>
+<p>
+Through the parameter <code>reverseActing</code>, the controller can be configured to
+be reverse or direct acting.
+The above standard form is reverse acting, which is the default configuration.
+For a reverse acting controller, for a constant set point,
+an increase in measurement signal <code>u_m</code> decreases the control output signal <code>y</code>
+(Montgomery and McDowall, 2008).
+Thus,
 </p>
 <ul>
-  <li>for a heating coil with a two-way valve, set <code>reverseAction = false</code>, </li>
-  <li>for a cooling coils with a two-way valve, set <code>reverseAction = true</code>. </li>
+  <li>
+  for a heating coil with a two-way valve, leave <code>reverseActing = true</code>, but
+  </li>
+  <li>
+  for a cooling coil with a two-way valve, set <code>reverseActing = false</code>.
+  </li>
 </ul>
-</li>
-
-<li>
+<h5>Reset of the controller output</h5>
 <p>
-It can be configured to enable an input port that allows resetting the controller
+The controller can be configured to enable an input port that allows resetting the controller
 output. The controller output can be reset as follows:
 </p>
 <ul>
@@ -392,36 +420,42 @@ output. The controller output can be reset as follows:
   </li>
   <li>
   If <code>reset = Buildings.Types.Reset.Input</code>, then a boolean
-  input signal <code>trigger</code> is enabled. Whenever the value of
-  this input changes from <code>false</code> to <code>true</code>,
-  the controller output is reset by setting <code>y</code>
-  to the value of the input signal <code>y_reset_in</code>.
+  input signal <code>trigger</code> and a real input signal <code>y_reset_in</code>
+  are enabled. Whenever the value of
+  <code>trigger</code> changes from <code>false</code> to <code>true</code>,
+  the controller output is reset by setting the value of <code>y</code>
+  to <code>y_reset_in</code>.
   </li>
 </ul>
 <p>
 Note that this controller implements an integrator anti-windup. Therefore,
 for most applications, keeping the default setting of
 <code>reset = Buildings.Types.Reset.Disabled</code> is sufficient.
-Examples where it may be beneficial to reset the controller output are situations
+However, if the controller is used in conjuction with equipment that is being
+switched on, better control performance may be achieved by resetting the controller
+output when the equipment is switched on.
+This is in particular the case in situations
 where the equipment control input should continuously increase as the equipment is
-switched on, such as as a light dimmer that may slowly increase the luminance, or
+switched on, such as a light dimmer that may slowly increase the luminance, or
 a variable speed drive of a motor that should continuously increase the speed.
 </p>
-</li>
-
-<li>
-The parameter <code>limitsAtInit</code> has been removed.
-</li>
-
-<li>
-Some parameters assignments in the instances have been made final.
-</li>
+<h4>References</h4>
+<p>
+R. Montgomery and R. McDowall (2008).
+\"Fundamentals of HVAC Control Systems.\"
+American Society of Heating Refrigerating and Air-Conditioning Engineers Inc. Atlanta, GA.
+</p>
 
-</ol>
 </html>",
 revisions="<html>
 <ul>
 <li>
+June 1, 2020, by Michael Wetter:<br/>
+Corrected wrong convention of reverse and direct action.<br/>
+Changed default configuration from PID to PI.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">issue 1365</a>.
+</li>
+<li>
 March 9, 2020, by Michael Wetter:<br/>
 Corrected wrong unit declaration for parameter <code>k</code>.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1316\">issue 1316</a>.
diff --git a/Buildings/Controls/Continuous/PIDHysteresis.mo b/Buildings/Controls/Continuous/PIDHysteresis.mo
index fc69ef7bd36..a5bea5d0b95 100644
--- a/Buildings/Controls/Continuous/PIDHysteresis.mo
+++ b/Buildings/Controls/Continuous/PIDHysteresis.mo
@@ -12,7 +12,7 @@ model PIDHysteresis
     "Value of hysteresis output at initial time"
     annotation (Dialog(group="Hysteresis"));
 
-  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PID
+  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
     "Type of controller"
     annotation (Dialog(group="Set point tracking"));
   parameter Real k=1 "Gain of controller"
@@ -33,9 +33,9 @@ model PIDHysteresis
     annotation (Dialog(group="Set point tracking"));
   parameter Real Nd=10 "The higher Nd, the more ideal the derivative block"
     annotation (Dialog(group="Set point tracking"));
-  parameter Boolean reverseAction = false
-    "Set to true to enable reverse action (such as for a cooling coil controller)"
-     annotation (Dialog(group="Set point tracking"));
+  parameter Boolean reverseActing = true
+    "Set to true for reverse acting, or false for direct acting control action"
+    annotation (Dialog(group="Set point tracking"));
 
   parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState
     "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
@@ -67,7 +67,7 @@ model PIDHysteresis
     final xd_start=xd_start,
     final y_start=y_start,
     final Td=Td,
-    final reverseAction=reverseAction,
+    final reverseActing=reverseActing,
     final strict=strict) "Controller for room temperature"
     annotation (Placement(transformation(extent={{-30,-2},{-10,18}})));
   Modelica.Blocks.Logical.Hysteresis hys(
@@ -125,7 +125,8 @@ equation
   connect(swi1.y, PID.u_s) annotation (Line(
       points={{61,60},{70,60},{70,30},{-50,30},{-50,8},{-32,8}},
       color={0,0,127}));
-  annotation ( Icon(graphics={
+     annotation (Dialog(group="Set point tracking"),
+               Icon(graphics={
         Polygon(
           points={{-80,94},{-88,72},{-72,72},{-80,94}},
           lineColor={192,192,192},
@@ -168,6 +169,12 @@ is small enough.
 </html>", revisions="<html>
 <ul>
 <li>
+June 1, 2020, by Michael Wetter:<br/>
+Corrected wrong convention of reverse and direct action.<br/>
+Changed default configuration from PID to PI.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">issue 1365</a>.
+</li>
+<li>
 September 29, 2016, by Michael Wetter:<br/>
 Removed parameter <code>limitsAtInit</code> because it is no longer
 used in the PID controller.
diff --git a/Buildings/Controls/Continuous/PIDHysteresisTimer.mo b/Buildings/Controls/Continuous/PIDHysteresisTimer.mo
index 45f0656524f..e34641521f3 100644
--- a/Buildings/Controls/Continuous/PIDHysteresisTimer.mo
+++ b/Buildings/Controls/Continuous/PIDHysteresisTimer.mo
@@ -15,7 +15,7 @@ model PIDHysteresisTimer
     "Value of hysteresis output at initial time"
     annotation (Dialog(group="On/off controller"));
 
-  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PID
+  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
     "Type of controller"
       annotation (Dialog(group="Set point tracking"));
   parameter Real k=1 "Gain of controller"
@@ -37,8 +37,8 @@ model PIDHysteresisTimer
       annotation (Dialog(group="Set point tracking"));
   parameter Real Nd=10 "The higher Nd, the more ideal the derivative block"
       annotation (Dialog(group="Set point tracking"));
-  parameter Boolean reverseAction = false
-    "Set to true to enable reverse action (such as for a cooling coil controller)"
+  parameter Boolean reverseActing = true
+    "Set to true for reverse acting, or false for direct acting control action"
      annotation (Dialog(group="Set point tracking"));
 
   parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState
@@ -76,7 +76,7 @@ model PIDHysteresisTimer
     final y_start=y_start,
     final yMin=yMin,
     final yMax=yMax,
-    final reverseAction=reverseAction,
+    final reverseActing=reverseActing,
     final strict=strict) "Controller to track setpoint"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
   OffTimer offHys
@@ -217,6 +217,12 @@ avoids the controller from switching on until <code>minOffTime</code> seconds el
 </html>", revisions="<html>
 <ul>
 <li>
+June 1, 2020, by Michael Wetter:<br/>
+Corrected wrong convention of reverse and direct action.<br/>
+Changed default configuration from PID to PI.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">issue 1365</a>.
+</li>
+<li>
 September 29, 2016, by Michael Wetter:<br/>
 Removed parameter <code>limitsAtInit</code> because it is no longer
 used in the PID controller.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo
index d056354481a..edb989dcb04 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Controller.mo
@@ -82,7 +82,7 @@ block Controller
 
   parameter Real TiMinOut(
     final unit="s",
-    final quantity="Time")=1200
+    final quantity="Time")=120
     "Time constant of controller for minimum outdoor air intake"
     annotation (Dialog(group="Economizer PID controller",
       enable=controllerTypeMinOut == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
@@ -117,7 +117,7 @@ block Controller
     final unit="s",
     final quantity="Time",
     final max=TiMinOut)=120
-    "Time constant of controller for mixed air temperature tracking for freeze protection. Require TiFre < TiMinOut"
+    "Time constant of controller for mixed air temperature tracking for freeze protection. Require TiFre <= TiMinOut"
      annotation(Dialog(group="Economizer freeze protection",
        enable=use_TMix
          and (controllerTypeFre == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
@@ -139,14 +139,6 @@ block Controller
     "Lower limit for mixed air temperature for freeze protection, used if use_TMix=true"
      annotation(Dialog(group="Economizer freeze protection", enable=use_TMix));
 
-  parameter Real yMinDamLim=0
-    "Lower limit of damper position limits control signal output"
-    annotation (Dialog(tab="Economizer", group="Damper limits"));
-
-  parameter Real yMaxDamLim=1
-    "Upper limit of damper position limits control signal output"
-    annotation (Dialog(tab="Economizer", group="Damper limits"));
-
   parameter Real retDamFulOpeTim(
     final unit="s",
     final quantity="Time")=180
@@ -292,21 +284,21 @@ block Controller
   parameter Real iniSetSupTem(
     final unit="K",
     final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=supTemSetPoi.maxSet
+    final quantity="ThermodynamicTemperature")=TSupSetMax
     "Initial setpoint for supply temperature control"
     annotation (Dialog(tab="Supply air temperature", group="Trim and respond for reseting TSup setpoint"));
 
   parameter Real maxSetSupTem(
     final unit="K",
     final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=supTemSetPoi.TSupSetMax
+    final quantity="ThermodynamicTemperature")=TSupSetMax
     "Maximum setpoint for supply temperature control"
     annotation (Dialog(tab="Supply air temperature", group="Trim and respond for reseting TSup setpoint"));
 
   parameter Real minSetSupTem(
     final unit="K",
     final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=supTemSetPoi.TSupSetDes
+    final quantity="ThermodynamicTemperature")=TSupSetDes
     "Minimum setpoint for supply temperature control"
     annotation (Dialog(tab="Supply air temperature", group="Trim and respond for reseting TSup setpoint"));
 
@@ -1006,6 +998,12 @@ Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.SupplySignals
 revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed default value of integral time for minimum outdoor air control.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>.
+</li>
+<li>
 March 16, 2020, by Jianjun Hu:<br/>
 Reimplemented to add new block for specifying the minimum outdoor airfow setpoint.
 This new block avoids vector-valued calculations.<br/>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo
index 59db6251e29..0b79638e1d2 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Controller.mo
@@ -38,7 +38,7 @@ block Controller "Multi zone VAV AHU economizer control sequence"
     annotation (Dialog(group="Minimum outdoor air"));
   parameter Real TiMinOut(
     final unit="s",
-    final quantity="Time")=1200
+    final quantity="Time")=120
     "Time constant of controller for minimum outdoor air intake"
     annotation (Dialog(group="Minimum outdoor air",
       enable=controllerTypeMinOut == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
@@ -70,7 +70,7 @@ block Controller "Multi zone VAV AHU economizer control sequence"
     final unit="s",
     final quantity="Time",
     final max=TiMinOut)=120
-    "Time constant of controller for mixed air temperature tracking for freeze protection. Require TiFre < TiMinOut"
+    "Time constant of controller for mixed air temperature tracking for freeze protection. Require TiFre <= TiMinOut"
     annotation(Dialog(group="Freeze protection",
       enable=use_TMix
         and (controllerTypeFre == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
@@ -91,23 +91,30 @@ block Controller "Multi zone VAV AHU economizer control sequence"
     "Time horizon over which the outdoor air flow measurment is averaged";
   parameter Real uHeaMax=-0.25
     "Lower limit of controller input when outdoor damper opens for modulation control. Require -1 < uHeaMax < uCooMin < 1."
-    annotation (Dialog(tab="Commissioning", group="Controller"));
+    annotation (Dialog(tab="Commissioning", group="Supply air temperature control"));
   parameter Real uCooMin=+0.25
     "Upper limit of controller input when return damper is closed for modulation control. Require -1 < uHeaMax < uCooMin < 1."
-    annotation (Dialog(tab="Commissioning", group="Controller"));
+    annotation (Dialog(tab="Commissioning", group="Supply air temperature control"));
 
   parameter Real uOutDamMax(
     final min=-1,
     final max=1,
     final unit="1") = (uHeaMax + uCooMin)/2
     "Maximum loop signal for the OA damper to be fully open. Require -1 < uHeaMax < uOutDamMax <= uRetDamMin < uCooMin < 1."
-    annotation (Dialog(tab="Commissioning", group="Controller"));
+    annotation (Dialog(tab="Commissioning", group="Supply air temperature control"));
   parameter Real uRetDamMin(
     final min=-1,
     final max=1,
     final unit="1") = (uHeaMax + uCooMin)/2
     "Minimum loop signal for the RA damper to be fully open. Require -1 < uHeaMax < uOutDamMax <= uRetDamMin < uCooMin < 1."
-    annotation (Dialog(tab="Commissioning", group="Controller"));
+    annotation (Dialog(tab="Commissioning", group="Supply air temperature control"));
+
+  parameter Real uRetDamMinLim(
+    final min=0,
+    final max=1,
+    final unit="1") = 0.5
+    "Loop signal value to start decreasing the maximum return air damper position"
+  annotation (Dialog(tab="Commissioning", group="Minimum outdoor air control"));
 
   parameter Real retDamPhyPosMax(
     final min=0,
@@ -131,7 +138,7 @@ block Controller "Multi zone VAV AHU economizer control sequence"
     final min=0,
     final max=1,
     final unit="1") = 0
-    "Physically fixed minimum position of the outdoor air damper" 
+    "Physically fixed minimum position of the outdoor air damper"
     annotation (Dialog(tab="Commissioning", group="Physical damper position limits"));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput uTSup(final unit="1")
@@ -208,7 +215,7 @@ block Controller "Multi zone VAV AHU economizer control sequence"
     final k=kMinOut,
     final Ti=TiMinOut,
     final Td=TdMinOut,
-    final uRetDamMin=uRetDamMin,
+    final uRetDamMin=uRetDamMinLim,
     final controllerType=controllerTypeMinOut)
     "Multi zone VAV AHU economizer minimum outdoor air requirement damper limit sequence"
     annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
@@ -412,6 +419,12 @@ which may be revised in future versions, set
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed default value of integral time for minimum outdoor air control.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>.
+</li>
+<li>
 October 11, 2017, by Michael Wetter:<br/>
 Corrected implementation to use control loop signal as input.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo
index 066a244e889..10cc4cefdac 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits.mo
@@ -2,15 +2,11 @@ within Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Economizers.Subs
 block Limits
   "Multi zone VAV AHU minimum outdoor air control - damper position limits"
 
-  constant Real yMin=-1 "Lower limit of control loop signal"
-    annotation (Dialog(tab="Commissioning", group="Controller"));
-  constant Real yMax=1 "Upper limit of control loop signal"
-    annotation (Dialog(tab="Commissioning", group="Controller"));
   parameter Real uRetDamMin(
     final min=yMin,
     final max=yMax,
     final unit="1") = 0.5
-    "Minimum control signal for the return air damper position limit"
+    "Loop signal value to start decreasing the maximum return air damper position"
     annotation (Dialog(tab="Commissioning", group="Controller"));
 
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=
@@ -24,7 +20,7 @@ block Limits
 
   parameter Real Ti(
     final unit="s",
-    final quantity="Time")=1200
+    final quantity="Time")=120
     "Time constant of damper limit controller integrator block"
     annotation (Dialog(group="Controller",
     enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
@@ -116,18 +112,19 @@ block Limits
     annotation (Placement(transformation(extent={{180,-110},{220,-70}}),
         iconTransformation(extent={{100,-100},{140,-60}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID damLimCon(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset damLimCon(
     final controllerType=controllerType,
     final k=k,
     final Ti=Ti,
     final Td=Td,
     final yMax=yMax,
-    final yMin=yMin,
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter)
+    final yMin=yMin)
     "Damper position limit controller"
     annotation (Placement(transformation(extent={{-140,180},{-120,200}})));
 
 protected
+  parameter Real yMin=0 "Lower limit of control loop signal";
+  parameter Real yMax=1 "Upper limit of control loop signal";
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMinSig(
     final k=outDamPhyPosMin)
     "Physically fixed minimum position of the outdoor air damper. This is the initial position of the economizer damper"
@@ -251,7 +248,7 @@ equation
   connect(uFreProSta, intLesEqu.u1)
     annotation (Line(points={{-200,-140},{-122,-140}}, color={255,127,0}));
   connect(damLimCon.trigger, uSupFan)
-    annotation (Line(points={{-138,178},{-138,166},{-100,166},{-100,-100},{-200,
+    annotation (Line(points={{-136,178},{-136,166},{-100,166},{-100,-100},{-200,
           -100}},               color={255,0,255}));
   connect(uSupFan, and2.u1) annotation (Line(points={{-200,-100},{-140,-100},{-140,
           -100},{-82,-100}}, color={255,0,255}));
@@ -381,6 +378,13 @@ src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/AHUs/Mul
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Changed default value of integral time for minimum outdoor air control.
+Set <code>yMin</code> to 0.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2019\">#2019</a>.
+</li>
+<li>
 March 14, 2020, by Jianjun Hu:<br/>
 Replaced mulAnd by logic and block to avoid vector-valued calculation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1829\">#1829</a>.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo
index 4660798f06d..bc82eea0eb2 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulation.mo
@@ -214,19 +214,6 @@ positions. Return and outdoor damper are not interlocked. When the economizer is
 the damper positions are set to the minimum outdoor air damper position limits.
 </p>
 <p>
-<<<<<<< HEAD
-The time rate of change of the damper signals is limited by a first order hold,
-using the sample time <code>samplePeriod</code>.
-This prevents a quick opening of the outdoor air damper, for example when the
-outdoor airflow setpoint has a step change.
-Slowing down the opening of the outdoor air damper allows the freeze protection
-to componensate with its dynamics that is faster than the opening of the outdoor air damper.
-To avoid that all dampers are closed, the return air damper has the same
-time rate of change limitation.
-</p>
-<p>
-=======
->>>>>>> master
 The control charts below show the input-output structure and an economizer damper
 modulation sequence assuming a well configured controller. Control diagram:
 </p>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo
index 814e693d570..f3f6207a8d4 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo
@@ -20,7 +20,7 @@ model Enable_FreProSta
     "Outdoor air temperature is slightly below the cutoff"
     annotation (Placement(transformation(extent={{-80,140},{-60,160}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut(
-    final k=TOutCutoff)
+    final k=TOutCutoff) "OA temperature high limit cutoff"
     annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff(
     final k=hOutCutoff - 1000)
@@ -46,14 +46,16 @@ model Enable_FreProSta
     final k=0) "Minimal allowed economizer damper position"
     annotation (Placement(transformation(extent={{-110,-90},{-90,-70}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant supFanSta(k=true)
+    "Supply fan status"
     annotation (Placement(transformation(extent={{-140,-40},{-120,-20}})));
 
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(period=1800)
+    "Boolean pulse for generating freeze protection stage"
     annotation (Placement(transformation(extent={{-20,-160},{0,-140}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger freProSta1(
     integerTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.FreezeProtectionStages.stage0,
     integerFalse=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.FreezeProtectionStages.stage1)
-    "Freese protection stage changes from stage 0 to stage 1"
+    "Freeze protection stage changes from stage 0 to stage 1"
     annotation (Placement(transformation(extent={{20,-160},{40,-140}})));
 
 equation
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo
index 86a076f678c..4e902b16d0b 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo
@@ -80,19 +80,11 @@ protected
     final k=true) "Supply fan status signal"
       annotation (Placement(transformation(extent={{-200,-42},{-180,-22}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
-<<<<<<< HEAD
-    final startTime=10,
-    final period=2000) "Boolean pulse signal"
-    annotation (Placement(transformation(extent={{-200,150},{-180,170}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
-    final startTime=10,
-=======
     final shift=10,
     final period=2000) "Boolean pulse signal"
     annotation (Placement(transformation(extent={{-200,150},{-180,170}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
     final shift=10,
->>>>>>> master
     final period=2000) "Boolean pulse signal"
     annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
 
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo
index 84c1946ba31..f90ed2e8bc0 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo
@@ -13,13 +13,16 @@ model Modulation_TSup
     "Control signal for supply air temperature loop"
     annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMin(
-    final k=0.1)
+    final k=0.1) "Outdoor air damper minimum position"
     annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMax(final k=0.8)
+    "Outdoor air damper maximum position"
     annotation (Placement(transformation(extent={{-80,16},{-60,36}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPosMin(final k=0.2)
+    "Return air damper minimum position"
     annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPosMax(final k=0.6)
+    "Return air damper maximum position"
     annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
 
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Economizers.Subsequences.Modulation
@@ -35,25 +38,26 @@ model Modulation_TSup
 
 equation
   connect(retDamPosMax.y, mod.uRetDamPosMax)
-    annotation (Line(points={{-59,-40},{-20,-40},{-20,38},{39,38}},color={0,0,127}));
+    annotation (Line(points={{-58,-40},{-20,-40},{-20,39},{38,39}},color={0,0,127}));
   connect(retDamPosMin.y, mod.uRetDamPosMin)
-    annotation (Line(points={{-59,-70},{-10,-70},{-10,34},{39,34}},color={0,0,127}));
+    annotation (Line(points={{-58,-70},{-10,-70},{-10,35},{38,35}},color={0,0,127}));
   connect(outDamPosMax.y, mod.uOutDamPosMax)
-    annotation (Line(points={{-59,26},{39,26}},color={0,0,127}));
+    annotation (Line(points={{-58,26},{-10,26},{-10,25},{38,25}},
+                                               color={0,0,127}));
   connect(outDamPosMin.y, mod.uOutDamPosMin)
-    annotation (Line(points={{-59,-10},{-34,-10},{-24,-10},{-24,22},{39,22}}, color={0,0,127}));
+    annotation (Line(points={{-58,-10},{-58,-10},{-24,-10},{-24,21},{38,21}}, color={0,0,127}));
   connect(uTSup.y, mod.uTSup)
-    annotation (Line(points={{-39,70},{0,70},{0,30},{39,30}}, color={0,0,127}));
+    annotation (Line(points={{-38,70},{0,70},{0,30},{38,30}}, color={0,0,127}));
   connect(retDamPosMax.y, modFre.uRetDamPosMax)
-    annotation (Line(points={{-59,-40},{-20,-40},{-20,-22},{39,-22}}, color={0,0,127}));
+    annotation (Line(points={{-58,-40},{-20,-40},{-20,-21},{38,-21}}, color={0,0,127}));
   connect(outDamPosMin.y, modFre.uOutDamPosMin)
-    annotation (Line(points={{-59,-10},{-34,-10},{-34,-38},{39,-38}}, color={0,0,127}));
+    annotation (Line(points={{-58,-10},{-34,-10},{-34,-39},{38,-39}}, color={0,0,127}));
   connect(uTSup.y, modFre.uTSup)
-    annotation (Line(points={{-39,70},{0,70},{0,-30},{39,-30}}, color={0,0,127}));
+    annotation (Line(points={{-38,70},{0,70},{0,-30},{38,-30}}, color={0,0,127}));
   connect(outDamPosMaxFre.y, modFre.uOutDamPosMax)
-    annotation (Line(points={{21,-70},{30,-70},{30,-34},{39,-34}}, color={0,0,127}));
+    annotation (Line(points={{22,-70},{30,-70},{30,-35},{38,-35}}, color={0,0,127}));
   connect(retDamPosMinFre.y, modFre.uRetDamPosMin)
-    annotation (Line(points={{25,0},{32,0},{32,-26},{39,-26}}, color={0,0,127}));
+    annotation (Line(points={{26,0},{32,0},{32,-25},{38,-25}}, color={0,0,127}));
   annotation (
   experiment(StopTime=900.0, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mos"
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo
index b442089085f..3118f4fe5c6 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo
@@ -102,7 +102,7 @@ protected
     amplitude=20,
     freqHz=1/1800,
     offset=272.15,
-    startTime=0)
+    startTime=0) "Mixed air temerature"
     annotation (Placement(transformation(extent={{90,-98},{110,-80}})));
 
 equation
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo
index 29b52b53906..2cff4b74a66 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo
@@ -60,7 +60,7 @@ protected
     final k=TOutCutoff - 5) "Outdoor air temperature is slightly below the cutoff"
     annotation (Placement(transformation(extent={{-120,100},{-100,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut1(
-    final k=TOutCutoff)
+    final k=TOutCutoff) "OA temperature high limit cutoff"
     annotation (Placement(transformation(extent={{-120,60},{-100,80}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TMixMea(
     final k=303.15)
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo
index 6509b9b767b..e3a967b82bd 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ExhaustDamper.mo
@@ -38,12 +38,12 @@ block ExhaustDamper
     y(final unit="Pa", displayUnit="Pa"))
     "Control error"
     annotation (Placement(transformation(extent={{-30,50},{-10,70}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conP(
+  Buildings.Controls.OBC.CDL.Continuous.PID conP(
     final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
     final k=k,
-    yMax=1,
-    yMin=0) "Building static pressure controller"
-    annotation (Placement(transformation(extent={{40,50},{60,70}})));
+    final r=dpBuiSet)
+               "Building static pressure controller"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi
     "Check if exhaust damper should be activated"
     annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
@@ -57,10 +57,6 @@ protected
     final k=dpBuiSet)
     "Building pressure setpoint"
     annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Gain gaiNor(
-    final k=1/dpBuiSet)
-    "Gain to normalize the control error"
-    annotation (Placement(transformation(extent={{0,50},{20,70}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer1(
     final k=0)
     "Zero constant"
@@ -79,18 +75,16 @@ equation
     annotation (Line(points={{-100,60},{-62,60}}, color={0,0,127}));
   connect(movMea.y, conErr.u1)
     annotation (Line(points={{-38,60},{-32,60}}, color={0,0,127}));
-  connect(conErr.y, gaiNor.u)
-    annotation (Line(points={{-8,60},{-2,60}},color={0,0,127}));
-  connect(gaiNor.y, conP.u_s)
-    annotation (Line(points={{22,60},{38,60}}, color={0,0,127}));
   connect(dpBuiSetPoi1.y, conErr.u2)
     annotation (Line(points={{-38,20},{-20,20},{-20,48}}, color={0,0,127}));
   connect(zer1.y, conP.u_m)
-    annotation (Line(points={{22,20},{50,20},{50,48}}, color={0,0,127}));
+    annotation (Line(points={{22,20},{30,20},{30,48}}, color={0,0,127}));
   connect(conP.y, swi.u1)
-    annotation (Line(points={{62,60},{66,60},{66,0},{20,0},{20,-22},{38,-22}},
+    annotation (Line(points={{42,60},{66,60},{66,0},{20,0},{20,-22},{38,-22}},
       color={0,0,127}));
 
+  connect(conErr.y, conP.u_s)
+    annotation (Line(points={{-8,60},{18,60}}, color={0,0,127}));
 annotation (
   defaultComponentName = "exhDam",
   Icon(graphics={
@@ -155,6 +149,12 @@ When <code>uSupFan = false</code>, the damper is closed.
 </html>", revisions="<html>
 <ul>
 <li>
+October 15, 2020, by Michael Wetter:<br/>
+Moved normalization of control error to PID controller.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\">#2182</a>.
+</li>
+<li>
 October 17, 2017, by Jianjun Hu:<br/>
 Changed model name.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo
index 8b53d7e529f..c96d9e33334 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo
@@ -52,12 +52,11 @@ block ReturnFanDirectPressure
     "Average building static pressure measurement"
     annotation (Placement(transformation(extent={{-130,70},{-110,90}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conP(
+  Buildings.Controls.OBC.CDL.Continuous.PID conP(
     final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
     final k=k,
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "Building static pressure controller"
+    r=dpBuiSet,
+    reverseActing=false) "Building static pressure controller"
     annotation (Placement(transformation(extent={{-40,100},{-20,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Line linExhAirDam
     "Exhaust air damper position"
@@ -71,13 +70,11 @@ block ReturnFanDirectPressure
   Buildings.Controls.OBC.CDL.Logical.Switch swi
     "Return fan discharge static pressure setpoint"
     annotation (Placement(transformation(extent={{80,-100},{100,-80}})));
-  Buildings.Controls.OBC.CDL.Continuous.Division div "Normalized the control error"
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
 
 protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dpBuiSetPoi(
     final k=dpBuiSet) "Building pressure setpoint"
-    annotation (Placement(transformation(extent={{-130,40},{-110,60}})));
+    annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retFanDisPreMin(
     final k=dpDisMin) "Return fan discharge static pressure minimum setpoint"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
@@ -96,9 +93,6 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(final k=1)
     "Constant one"
     annotation (Placement(transformation(extent={{0,26},{20,46}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne(final k=1)
-    "Constant one"
-    annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
 
 equation
   connect(movMea.u, dpBui)
@@ -146,15 +140,11 @@ equation
     annotation (Line(points={{-18,110},{58,110}}, color={0,0,127}));
   connect(conP.y, linRetFanStaPre.u)
     annotation (Line(points={{-18,110},{-10,110},{-10,-40},{58,-40}}, color={0,0,127}));
-  connect(dpBuiSetPoi.y, div.u2) annotation (Line(points={{-108,50},{-90,50},{-90,
-          74},{-82,74}}, color={0,0,127}));
-  connect(movMea.y, div.u1) annotation (Line(points={{-108,80},{-100,80},{-100,86},
-          {-82,86}}, color={0,0,127}));
-  connect(conOne.y, conP.u_s)
-    annotation (Line(points={{-58,110},{-42,110}}, color={0,0,127}));
-  connect(div.y, conP.u_m)
-    annotation (Line(points={{-58,80},{-30,80},{-30,98}}, color={0,0,127}));
 
+  connect(dpBuiSetPoi.y, conP.u_s) annotation (Line(points={{-58,110},{-50,110},
+          {-50,110},{-42,110}}, color={0,0,127}));
+  connect(movMea.y, conP.u_m)
+    annotation (Line(points={{-108,80},{-30,80},{-30,98}}, color={0,0,127}));
 annotation (
   defaultComponentName="buiPreCon",
   Icon(graphics={
@@ -265,6 +255,12 @@ src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/AHUs/Mul
 </html>", revisions="<html>
 <ul>
 <li>
+October 15, 2020, by Michael Wetter:<br/>
+Moved normalization of control error to PID controller.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\">#2182</a>.
+</li>
+<li>
 October 16, 2017, by Michael Wetter:<br/>
 Revised implementation, normalized control input
 and updated documentation.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo
index c6c46ae4f5b..4a3dd328ddd 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo
@@ -116,16 +116,16 @@ block SupplyFan  "Block to control multi zone VAV AHU supply fan"
     final resAmo=resAmo,
     final maxRes=maxRes) "Static pressure setpoint reset using trim and respond logic"
     annotation (Placement(transformation(extent={{-130,-60},{-110,-40}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conSpe(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conSpe(
     final controllerType=controllerType,
     final k=k,
     final Ti=Ti,
     final Td=Td,
+    r=maxSet,
     final yMax=yFanMax,
     final yMin=yFanMin,
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
     y_reset=yFanMin) "Supply fan speed control"
-    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
+    annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
 
 protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerSpe(k=0)
@@ -182,16 +182,6 @@ protected
   Buildings.Controls.OBC.CDL.Integers.Equal intEqu4
     "Check if current operation mode is warmup mode"
     annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant gaiNor(
-    final k=maxSet)
-    "Gain for normalization of controller input"
-    annotation (Placement(transformation(extent={{-130,-100},{-110,-80}})));
-  Buildings.Controls.OBC.CDL.Continuous.Division norPSet
-    "Normalization for pressure set point"
-    annotation (Placement(transformation(extent={{-70,-80},{-50,-60}})));
-  Buildings.Controls.OBC.CDL.Continuous.Division norPMea
-    "Normalization of pressure measurement"
-    annotation (Placement(transformation(extent={{-70,-120},{-50,-100}})));
   Buildings.Controls.OBC.CDL.Discrete.FirstOrderHold firOrdHol(
     final samplePeriod=samplePeriod)
     "Extrapolation through the values of the last two sampled input signals"
@@ -211,7 +201,7 @@ equation
     annotation (Line(points={{102,70},{120,70},{120,-8},{0,-8},{0,-100},{78,-100}},
       color={255,0,255}));
   connect(conSpe.y, swi.u1)
-    annotation (Line(points={{-18,-70},{-4,-70},{-4,-108},{78,-108}},
+    annotation (Line(points={{-18,-50},{-4,-50},{-4,-108},{78,-108}},
       color={0,0,127}));
   connect(zerSpe.y, swi.u3)
     annotation (Line(points={{42,-80},{60,-80},{60,-92},{78,-92}},
@@ -271,24 +261,16 @@ equation
   connect(intEqu4.y, or2.u2)
     annotation (Line(points={{-38,10},{0,10},{0,32},{18,32}},
       color={255,0,255}));
-  connect(norPSet.y, conSpe.u_s)
-    annotation (Line(points={{-48,-70},{-42,-70}}, color={0,0,127}));
-  connect(norPMea.y, conSpe.u_m)
-    annotation (Line(points={{-48,-110},{-30,-110},{-30,-82}}, color={0,0,127}));
   connect(staPreSetRes.y, firOrdHol.u)
     annotation (Line(points={{-108,-50},{-102,-50}}, color={0,0,127}));
   connect(conSpe.trigger, or1.y)
-    annotation (Line(points={{-38,-82},{-38,-100},{0,-100},{0,-8},{120,-8},{120,
+    annotation (Line(points={{-36,-62},{-36,-100},{0,-100},{0,-8},{120,-8},{120,
           70},{102,70}},  color={255,0,255}));
-  connect(gaiNor.y, norPSet.u2) annotation (Line(points={{-108,-90},{-92,-90},{-92,
-          -76},{-72,-76}}, color={0,0,127}));
-  connect(ducStaPre, norPMea.u1) annotation (Line(points={{-180,-110},{-80,-110},
-          {-80,-104},{-72,-104}}, color={0,0,127}));
-  connect(gaiNor.y, norPMea.u2) annotation (Line(points={{-108,-90},{-92,-90},{-92,
-          -116},{-72,-116}}, color={0,0,127}));
-  connect(firOrdHol.y, norPSet.u1) annotation (Line(points={{-78,-50},{-76,-50},
-          {-76,-64},{-72,-64}}, color={0,0,127}));
 
+  connect(ducStaPre, conSpe.u_m) annotation (Line(points={{-180,-110},{-30,-110},
+          {-30,-62}}, color={0,0,127}));
+  connect(firOrdHol.y, conSpe.u_s)
+    annotation (Line(points={{-78,-50},{-42,-50}}, color={0,0,127}));
 annotation (
   defaultComponentName="conSupFan",
   Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,-140},{140,160}}),
@@ -415,6 +397,12 @@ that are occupied, etc.).
 </html>", revisions="<html>
 <ul>
 <li>
+October 15, 2020, by Michael Wetter:<br/>
+Moved normalization of control error to PID controller.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\">#2182</a>.
+</li>
+<li>
 March 12, 2020, by Jianjun Hu:<br/>
 Removed the sum of flow rate as it is not used in any other sequences.<br/>
 This is for
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo
index f7be96913d4..45a93499643 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo
@@ -71,7 +71,7 @@ block SupplySignals "Multizone VAV AHU coil valve positions"
         iconTransformation(extent={{100,20},{140,60}})));
 
 protected
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conTSup(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conTSup(
     final controllerType=controllerType,
     final k=kTSup,
     final Ti=TiTSup,
@@ -79,8 +79,7 @@ protected
     final yMax=1,
     final yMin=-1,
     final y_reset=0,
-    final reverseAction=true,
-    final reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter)
+    final reverseActing=false)
     "Controller for supply air temperature control signal (to be used by heating coil, cooling coil and economizer)"
     annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi
@@ -166,7 +165,7 @@ equation
     annotation (Line(points={{-38,30},{-28,30},{-28,68},{-2,68}},
       color={0,0,127}));
   connect(uSupFan, conTSup.trigger)
-    annotation (Line(points={{-120,80},{-80,80},{-80,8},{-58,8},{-58,18}},
+    annotation (Line(points={{-120,80},{-80,80},{-80,8},{-56,8},{-56,18}},
       color={255,0,255}));
 
 annotation (
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo
index 511300c8e83..85417a3a0f6 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo
@@ -174,20 +174,16 @@ protected
   Buildings.Controls.OBC.CDL.Logical.Switch swi3
     "Check output regarding supply fan status"
     annotation (Placement(transformation(extent={{80,-10},{100,10}})));
-  Buildings.Controls.OBC.CDL.Integers.LessThreshold intLesThr(
-    threshold=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.warmUp)
+  Buildings.Controls.OBC.CDL.Integers.LessThreshold intLesThr(t=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.warmUp)
     "Check if operation mode index is less than warm-up mode index (4)"
     annotation (Placement(transformation(extent={{-100,-60},{-80,-40}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr(
-    threshold=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.occupied)
+  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr(t=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.occupied)
     "Check if operation mode index is greater than occupied mode index (1)"
     annotation (Placement(transformation(extent={{-100,-90},{-80,-70}})));
-  Buildings.Controls.OBC.CDL.Integers.LessThreshold intLesThr1(
-    threshold=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.unoccupied)
+  Buildings.Controls.OBC.CDL.Integers.LessThreshold intLesThr1(t=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.unoccupied)
     "Check if operation mode index is less than unoccupied mode index (7)"
     annotation (Placement(transformation(extent={{-40,-100},{-20,-80}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr1(
-    threshold=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.setUp)
+  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr1(t=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.setUp)
     "Check if operation mode index is greater than set up mode index (3)"
     annotation (Placement(transformation(extent={{-40,-130},{-20,-110}})));
 
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo
index a6cf64ff7bd..5a9080fbae4 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Controller.mo
@@ -1,105 +1,104 @@
 within Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV;
 block Controller
   "Single Zone AHU controller that composes subsequences for controlling fan speed, economizer, and supply air temperature"
+
+  parameter Boolean have_winSen "Check if the zone has window status sensor";
+  parameter Boolean have_occSen  "Set to true if zones have occupancy sensor";
   parameter Real TZonHeaOn(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=293.15
     "Heating setpoint during on"
     annotation (Dialog(group="Zone setpoints"));
   parameter Real TZonHeaOff(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=285.15
     "Heating setpoint during off"
     annotation (Dialog(group="Zone setpoints"));
   parameter Real TZonCooOn(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=297.15
     "Cooling setpoint during on"
     annotation (Dialog(group="Zone setpoints"));
   parameter Real TZonCooOff(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=303.15
     "Cooling setpoint during off"
     annotation (Dialog(group="Zone setpoints"));
-
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeCoo=
      Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller"
-    annotation (Dialog(group="Cooling loop signal"));
+    annotation (Dialog(group="Cooling loop control"));
   parameter Real kCoo(final unit="1/K") = 0.1
     "Gain for cooling control loop signal"
-    annotation(Dialog(group="Cooling loop signal"));
+    annotation(Dialog(group="Cooling loop control"));
   parameter Real TiCoo(
     final unit="s",
     final quantity="Time")=900
     "Time constant of integrator block for cooling control loop signal"
-    annotation(Dialog(group="Cooling loop signal",
+    annotation(Dialog(group="Cooling loop control",
       enable=controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
           or controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   parameter Real TdCoo(
     final unit="s",
     final quantity="Time")=0.1
     "Time constant of derivative block for cooling control loop signal"
-    annotation (Dialog(group="Cooling loop signal",
+    annotation (Dialog(group="Cooling loop control",
       enable=controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
           or controllerTypeCoo == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeHea=
     Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller"
-    annotation(Dialog(group="Heating loop signal"));
+    annotation(Dialog(group="Heating loop control"));
   parameter Real kHea(final unit="1/K")=0.1
     "Gain for heating control loop signal"
-    annotation(Dialog(group="Heating loop signal"));
+    annotation(Dialog(group="Heating loop control"));
   parameter Real TiHea(
     final unit="s",
     final quantity="Time")=900
     "Time constant of integrator block for heating control loop signal"
-    annotation(Dialog(group="Heating loop signal",
+    annotation(Dialog(group="Heating loop control",
     enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
         or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   parameter Real TdHea(
     final unit="s",
     final quantity="Time")=0.1
     "Time constant of derivative block for heating control loop signal"
-    annotation (Dialog(group="Heating loop signal",
+    annotation (Dialog(group="Heating loop control",
       enable=controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
           or controllerTypeHea == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeCooCoi=
-    Buildings.Controls.OBC.CDL.Types.SimpleController.P
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller"
-    annotation(Dialog(group="Cooling coil loop signal"));
-  parameter Real kCooCoi(final unit="1/K")=1.0
-    "Gain for cooling coil control loop signal"
-    annotation(Dialog(group="Cooling coil loop signal"));
+    annotation(Dialog(group="Cooling coil control"));
+  parameter Real kCooCoi(final unit="1/K")=0.1
+    "Gain for cooling coil control signal"
+    annotation(Dialog(group="Cooling coil control"));
   parameter Real TiCooCoil(
     final unit="s",
     final quantity="Time")=900
-    "Time constant of integrator block for cooling coil control loop signal"
-    annotation(Dialog(group="Cooling coil loop signal",
+    "Time constant of integrator block for cooling coil control signal"
+    annotation(Dialog(group="Cooling coil control",
     enable=controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
         or controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   parameter Real TdCooCoil(
     final unit="s",
     final quantity="Time")=0.1
-    "Time constant of derivative block for cooling coil control loop signal"
-    annotation (Dialog(group="Cooling coil loop signal",
+    "Time constant of derivative block for cooling coil control signal"
+    annotation (Dialog(group="Cooling coil control",
       enable=controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
           or controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-
   parameter Real TSupSetMax(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Maximum supply air temperature for heating"
     annotation (Dialog(tab="VAV Setpoints",group="Temperature limits"));
   parameter Real TSupSetMin(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Minimum supply air temperature for cooling"
     annotation (Dialog(tab="VAV Setpoints",group="Temperature limits"));
@@ -112,7 +111,6 @@ block Controller
   parameter Real yCooMax(min=0, max=1, unit="1") = 1
     "Maximum fan speed for cooling"
     annotation (Dialog(tab="VAV Setpoints",group="Speed"));
-
   parameter Real VOutPerAre_flow(final unit="m3/(s.m2)") = 3e-4
     "Outdoor air rate per unit area"
     annotation(Dialog(tab="Outside Air Flow", group="Nominal condition"));
@@ -124,9 +122,6 @@ block Controller
   parameter Real AFlo(final unit="m2", final quantity="Area")
     "Floor area"
     annotation(Dialog(tab="Outside Air Flow", group="Nominal condition"));
-  parameter Boolean have_occSen
-    "Set to true if zones have occupancy sensor"
-    annotation(Dialog(tab="Outside Air Flow", group="Occupancy"));
   parameter Real occDen(final unit="1/m2") = 0.05
     "Default number of person in unit area"
     annotation(Dialog(tab="Outside Air Flow", group="Occupancy"));
@@ -136,10 +131,10 @@ block Controller
   parameter Real zonDisEffCoo(final unit="1") = 1.0
     "Zone air distribution effectiveness during cooling"
     annotation(Dialog(tab="Outside Air Flow", group="Occupancy"));
-  parameter Boolean use_enthalpy = false
+  parameter Boolean use_enthalpy=false
     "Set to true if enthalpy measurement is used in addition to temperature measurement"
     annotation(Dialog(tab="Economizer", group="General", enable=not use_fixed_plus_differential_drybulb));
-  parameter Boolean use_fixed_plus_differential_drybulb = false
+  parameter Boolean use_fixed_plus_differential_drybulb=false
     "Set to true to only evaluate fixed plus differential dry bulb temperature high limit cutoff;
     shall not be used with enthalpy"
     annotation(Dialog(tab="Economizer", group="General", enable=not use_enthalpy));
@@ -149,12 +144,6 @@ block Controller
   parameter Boolean use_G36FrePro=false
     "Set to true if G36 freeze protection is implemented"
     annotation(Dialog(tab="Economizer", group="General"));
-  parameter Real delTOutHis(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=1
-    "Delta between the temperature hysteresis high and low limit"
-    annotation(Dialog(tab="Economizer", group="Advanced"));
   parameter Real delEntHis(
     final unit="J/kg",
     final quantity="SpecificEnergy")=1000
@@ -192,7 +181,6 @@ block Controller
     final unit="1") = 0.9
     "Upper limit of controller output uTSup at which the dampers are at their limits"
     annotation(Dialog(tab="Economizer", group="General"));
-
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeFre=
     Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller"
@@ -218,11 +206,10 @@ block Controller
            or controllerTypeFre == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)));
   parameter Real TFreSet(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=277.15
     "Lower limit for mixed air temperature for freeze protection, used if use_TMix=true"
      annotation(Dialog(tab="Economizer", group="Freeze protection", enable=use_TMix));
-
   parameter Real VOutMin_flow(
     final unit="m3/s",
     final quantity="VolumeFlowRate")=1.0
@@ -261,7 +248,7 @@ block Controller
     final min=0,
     final max=1,
     final unit="1") = 1
-    "Physically fixed maximum position of the outdoor air (OA) damper"
+    "Physically fixed maximum position of the outdoor air damper"
     annotation(Dialog(tab="Economizer", group="Commissioning"));
   parameter Real outDamPhyPosMin(
     final min=0,
@@ -281,142 +268,257 @@ block Controller
     final unit="1") = 0
     "Physically fixed minimum position of the return air damper"
     annotation(Dialog(tab="Economizer", group="Commissioning"));
+  parameter Boolean cooAdj=false
+    "Flag, set to true if both cooling and heating setpoint are adjustable separately"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="General"));
+  parameter Boolean heaAdj=false
+    "Flag, set to true if heating setpoint is adjustable"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="General"));
+  parameter Boolean sinAdj=false
+    "Flag, set to true if both cooling and heating setpoint are adjustable through a single common knob"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="General"));
+  parameter Boolean ignDemLim=false
+    "Flag, set to true to exempt individual zone from demand limit setpoint adjustment"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="General"));
+  parameter Real TZonCooOnMax(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=300.15 "Maximum cooling setpoint during on"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Limits"));
+  parameter Real TZonCooOnMin(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=295.15 "Minimum cooling setpoint during on"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Limits"));
+  parameter Real TZonHeaOnMax(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=295.15 "Maximum heating setpoint during on"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Limits"));
+  parameter Real TZonHeaOnMin(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=291.15 "Minimum heating setpoint during on"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Limits"));
+  parameter Real TZonCooSetWinOpe(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=322.15 "Cooling setpoint when window is open"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Limits"));
+  parameter Real TZonHeaSetWinOpe(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=277.15 "Heating setpoint when window is open"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Limits"));
+  parameter Real incTSetDem_1=0.56
+    "Cooling setpoint increase value (degC) when cooling demand limit level 1 is imposed"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Demand control adjustment"));
+  parameter Real incTSetDem_2=1.1
+    "Cooling setpoint increase value (degC) when cooling demand limit level 2 is imposed"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Demand control adjustment"));
+  parameter Real incTSetDem_3=2.2
+    "Cooling setpoint increase value (degC) when cooling demand limit level 3 is imposed"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Demand control adjustment"));
+  parameter Real decTSetDem_1=0.56
+    "Heating setpoint decrease value (degC) when heating demand limit level 1 is imposed"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Demand control adjustment"));
+  parameter Real decTSetDem_2=1.1
+    "Heating setpoint decrease value (degC) when heating demand limit level 2 is imposed"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Demand control adjustment"));
+  parameter Real decTSetDem_3=2.2
+    "Heating setpoint decrease value (degC) when heating demand limit level 3 is imposed"
+    annotation (Dialog(tab="Adjust temperature setpoint", group="Demand control adjustment"));
+  parameter Real uLow=-0.1
+    "Low limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real uHigh=0.1
+    "High limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TOut(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity = "ThermodynamicTemperature")
     "Outside air temperature"
-    annotation (Placement(transformation(extent={{-240,220},{-200,260}}),
-        iconTransformation(extent={{-240,220},{-200,260}})));
+    annotation (Placement(transformation(extent={{-240,230},{-200,270}}),
+        iconTransformation(extent={{-240,230},{-200,270}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput warUpTim(
+    final unit="s",
+    final quantity="Time")
+    "Warm-up time retrieved from optimal warm-up block"
+    annotation (Placement(transformation(extent={{-240,170},{-200,210}}),
+        iconTransformation(extent={{-240,200},{-200,240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput cooDowTim(
+    final unit="s",
+    final quantity="Time")
+    "Cool-down time retrieved from optimal cool-down block"
+    annotation (Placement(transformation(extent={{-240,200},{-200,240}}),
+        iconTransformation(extent={{-240,170},{-200,210}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput tNexOcc
     "Time to next occupied period"
-    annotation (Placement(transformation(extent={{-240,180},{-200,220}}),
-        iconTransformation(extent={{-240,180},{-200,220}})));
+    annotation (Placement(transformation(extent={{-240,140},{-200,180}}),
+        iconTransformation(extent={{-240,140},{-200,180}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity = "ThermodynamicTemperature")
     "Measured zone temperatures"
-    annotation (Placement(transformation(extent={{-240,140},{-200,180}}),
-        iconTransformation(extent={{-240,140},{-200,180}})));
+    annotation (Placement(transformation(extent={{-240,110},{-200,150}}),
+        iconTransformation(extent={{-240,110},{-200,150}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc
     "Current occupancy period, true if it is in occupant period"
-    annotation (Placement(transformation(extent={{-240,100},{-200,140}}),
-        iconTransformation(extent={{-240,100},{-200,140}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TCut(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Economizer high limit cutoff. Fixed dry bulb or differential dry bulb temeprature"
-    annotation (Placement(transformation(extent={{-240,60},{-200,100}}),
-        iconTransformation(extent={{-240,60},{-200,100}})));
+    annotation (Placement(transformation(extent={{-240,80},{-200,120}}),
+        iconTransformation(extent={{-240,80},{-200,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uCooDemLimLev
+    "Cooling demand limit level"
+    annotation (Placement(transformation(extent={{-240,50},{-200,90}}),
+        iconTransformation(extent={{-240,50},{-200,90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uHeaDemLimLev
+    "Heating demand limit level"
+    annotation (Placement(transformation(extent={{-240,20},{-200,60}}),
+        iconTransformation(extent={{-240,30},{-200,70}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSup(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity = "ThermodynamicTemperature")
     "Measured supply air temperature"
-    annotation (Placement(transformation(extent={{-240,20},{-200,60}}),
-        iconTransformation(extent={{-240,20},{-200,60}})));
+    annotation (Placement(transformation(extent={{-240,-10},{-200,30}}),
+        iconTransformation(extent={{-240,0},{-200,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TCut(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Economizer high limit cutoff. Fixed dry bulb or differential dry bulb temeprature"
+    annotation (Placement(transformation(extent={{-240,-40},{-200,0}}),
+        iconTransformation(extent={{-240,-30},{-200,10}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TMix(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity = "ThermodynamicTemperature") if use_TMix
     "Measured mixed air temperature, used for freeze protection if use_TMix is true"
-    annotation (Placement(transformation(extent={{-240,-20},{-200,20}}),
-        iconTransformation(extent={{-240,-20},{-200,20}})));
+    annotation (Placement(transformation(extent={{-240,-70},{-200,-30}}),
+        iconTransformation(extent={{-240,-60},{-200,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput nOcc(final unit="1") if
        have_occSen "Number of occupants"
-    annotation (Placement(transformation(extent={{-240,-60},{-200,-20}}),
-        iconTransformation(extent={{-240,-60},{-200,-20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWin
-    "Window status, true if open, false if closed"
     annotation (Placement(transformation(extent={{-240,-100},{-200,-60}}),
-        iconTransformation(extent={{-240,-100},{-200,-60}})));
+        iconTransformation(extent={{-240,-90},{-200,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWin if have_winSen
+    "Window status, true if open, false if closed"
+    annotation (Placement(transformation(extent={{-240,-130},{-200,-90}}),
+        iconTransformation(extent={{-240,-120},{-200,-80}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput hOut(
     final unit="J/kg",
     final quantity="SpecificEnergy") if use_enthalpy "Outdoor air enthalpy"
-    annotation (Placement(transformation(extent={{-240,-140},{-200,-100}}),
-        iconTransformation(extent={{-240,-140},{-200,-100}})));
+    annotation (Placement(transformation(extent={{-240,-170},{-200,-130}}),
+        iconTransformation(extent={{-240,-150},{-200,-110}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput hCut(
     final unit="J/kg",
     final quantity="SpecificEnergy") if use_enthalpy
     "Economizer enthalpy high limit cutoff. Fixed enthalpy or differential enthalpy"
-    annotation (Placement(transformation(extent={{-240,-180},{-200,-140}}),
-        iconTransformation(extent={{-240,-180},{-200,-140}})));
+    annotation (Placement(transformation(extent={{-240,-200},{-200,-160}}),
+        iconTransformation(extent={{-240,-190},{-200,-150}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TRet(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature") if
        use_fixed_plus_differential_drybulb
     "Used only for fixed plus differential dry bulb temperature high limit cutoff"
-    annotation (Placement(transformation(extent={{-240,-220},{-200,-180}}),
-        iconTransformation(extent={{-240,-220},{-200,-180}})));
+    annotation (Placement(transformation(extent={{-240,-230},{-200,-190}}),
+        iconTransformation(extent={{-240,-230},{-200,-190}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uFreProSta if
        use_G36FrePro
     "Freeze protection status, used if use_G36FrePro=true"
     annotation (Placement(transformation(extent={{-240,-260},{-200,-220}}),
-        iconTransformation(extent={{-240,-260},{-200,-220}})));
+        iconTransformation(extent={{-240,-270},{-200,-230}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupHeaEco(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity = "ThermodynamicTemperature")
     "Temperature setpoint for heating coil and for economizer"
-    annotation (Placement(transformation(extent={{200,230},{220,250}}),
+    annotation (Placement(transformation(extent={{200,230},{240,270}}),
         iconTransformation(extent={{200,200},{240,240}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupCoo(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity = "ThermodynamicTemperature")
     "Cooling supply air temperature setpoint"
-    annotation (Placement(transformation(extent={{200,170},{220,190}}),
+    annotation (Placement(transformation(extent={{200,170},{240,210}}),
         iconTransformation(extent={{200,150},{240,190}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yFan(
     final min=0,
     final max=1,
     final unit="1") "Fan speed"
-    annotation (Placement(transformation(extent={{200,110},{220,130}}),
+    annotation (Placement(transformation(extent={{200,140},{240,180}}),
         iconTransformation(extent={{200,100},{240,140}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonHeaSet(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity = "ThermodynamicTemperature")
-    "Zone heating setpoint temperature"
-    annotation (Placement(transformation(extent={{200,50},{220,70}}),
-        iconTransformation(extent={{200,40},{240,80}})));
+    "Heating setpoint temperature"
+    annotation (Placement(transformation(extent={{200,90},{240,130}}),
+      iconTransformation(extent={{200,40},{240,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonCooSet(
     final unit="K",
-    final displayUnit="degC",
-    final quantity = "ThermodynamicTemperature")  "Zone cooling setpoint temperature"
-    annotation (Placement(transformation(extent={{200,-10},{220,10}}),
-        iconTransformation(extent={{200,-20},{240,20}})));
+    displayUnit="degC",
+    final quantity = "ThermodynamicTemperature")
+    "Cooling setpoint temperature"
+    annotation (Placement(transformation(extent={{200,40},{240,80}}),
+      iconTransformation(extent={{200,-20},{240,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHeaCoi(
     final min=0,
     final max=1,
     final unit="1") "Heating coil control signal"
-    annotation (Placement(transformation(extent={{200,-70},{220,-50}}),
+    annotation (Placement(transformation(extent={{200,-70},{240,-30}}),
         iconTransformation(extent={{200,-80},{240,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCooCoi(
     final min=0,
     final max=1,
     final unit="1") "Cooling coil control signal"
-    annotation (Placement(transformation(extent={{200,-130},{220,-110}}),
+    annotation (Placement(transformation(extent={{200,-130},{240,-90}}),
         iconTransformation(extent={{200,-140},{240,-100}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yOutDamPos(
     final min=0,
     final max=1,
     final unit="1")
     "Outdoor air damper position"
-    annotation (Placement(transformation(extent={{200,-190},{220,-170}}),
+    annotation (Placement(transformation(extent={{200,-190},{240,-150}}),
         iconTransformation(extent={{200,-190},{240,-150}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yRetDamPos(
     final min=0,
     final max=1,
     final unit="1")
     "Return air damper position"
-    annotation (Placement(transformation(extent={{200,-250},{220,-230}}),
+    annotation (Placement(transformation(extent={{200,-250},{240,-210}}),
         iconTransformation(extent={{200,-240},{240,-200}})));
 
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints
+    modSetPoi(
+    final have_winSen=have_winSen,
+    final have_occSen=have_occSen,
+    final THeaSetOcc=TZonHeaOn,
+    final THeaSetUno=TZonHeaOff,
+    final TCooSetOcc=TZonCooOn,
+    final TCooSetUno=TZonCooOff,
+    final cooAdj=cooAdj,
+    final heaAdj=heaAdj,
+    final sinAdj=sinAdj,
+    final ignDemLim=ignDemLim,
+    final TZonCooOnMax=TZonCooOnMax,
+    final TZonCooOnMin=TZonCooOnMin,
+    final TZonHeaOnMax=TZonHeaOnMax,
+    final TZonHeaOnMin=TZonHeaOnMin,
+    final TZonCooSetWinOpe=TZonCooSetWinOpe,
+    final TZonHeaSetWinOpe=TZonHeaSetWinOpe,
+    final incTSetDem_1=incTSetDem_1,
+    final incTSetDem_2=incTSetDem_2,
+    final incTSetDem_3=incTSetDem_3,
+    final decTSetDem_1=decTSetDem_1,
+    final decTSetDem_2=decTSetDem_2,
+    final decTSetDem_3=decTSetDem_3,
+    final uLow=uLow,
+    final uHigh=uHigh)
+    "Zone setpoint and operation mode"
+    annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Supply
     setPoiVAV(
     final TSupSetMax=TSupSetMax,
@@ -426,34 +528,29 @@ block Controller
     final yCooMax=yCooMax)
     "Supply air set point and fan signal for single zone VAV system"
     annotation (Placement(transformation(extent={{40,180},{60,200}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID cooPI(
-    final reverseAction=true,
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset cooPI(
+    final reverseActing=false,
     final controllerType=controllerTypeCoo,
     final k=kCoo,
     final Ti=TiCoo,
-    final Td=TdCoo,
-    final yMax=1,
-    final yMin=0,
-    final reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter)
+    final Td=TdCoo)
     "Zone cooling control signal"
     annotation (Placement(transformation(extent={{-50,150},{-30,170}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID heaPI(
-    final reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset heaPI(
     final controllerType=controllerTypeHea,
     final k=kHea,
     final Ti=TiHea,
-    final Td=TdHea,
-    final yMax=1,
-    final yMin=0) "Zone heating control signal"
-    annotation (Placement(transformation(extent={{-50,210},{-30,230}})));
+    final Td=TdHea)
+    "Zone heating control signal"
+    annotation (Placement(transformation(extent={{-80,210},{-60,230}})));
   Buildings.Controls.OBC.CDL.Continuous.Average ave
     "Average of zone heating and cooling setpoint"
-    annotation (Placement(transformation(extent={{-100,190},{-80,210}})));
+    annotation (Placement(transformation(extent={{-40,190},{-20,210}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Economizers.Controller
     conEco(
     final use_TMix=use_TMix,
     final use_G36FrePro=use_G36FrePro,
-    final delTOutHis=delTOutHis,
+    final delTOutHis=uHigh - uLow,
     final delEntHis=delEntHis,
     final controllerTypeMod=controllerTypeMod,
     final kMod=kMod,
@@ -478,7 +575,8 @@ block Controller
     final use_enthalpy=use_enthalpy,
     final use_fixed_plus_differential_drybulb=use_fixed_plus_differential_drybulb,
     final yFanMin=0,
-    final yFanMax=1) "Economizer control sequence"
+    final yFanMax=1)
+    "Economizer control sequence"
     annotation (Placement(transformation(extent={{120,-50},{140,-30}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.OutsideAirFlow
     outAirSetPoi(
@@ -488,9 +586,11 @@ block Controller
     final VOutPerPer_flow=VOutPerPer_flow,
     final occDen=occDen,
     final zonDisEffHea=zonDisEffHea,
-    final zonDisEffCoo=zonDisEffCoo)
+    final zonDisEffCoo=zonDisEffCoo,
+    final uLow=uLow,
+    final uHigh=uHigh)
     "Output the minimum outdoor airflow rate setpoint "
-    annotation (Placement(transformation(extent={{40,50},{60,70}})));
+    annotation (Placement(transformation(extent={{40,20},{60,40}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.ZoneState zonSta "Zone state"
     annotation (Placement(transformation(extent={{40,130},{60,150}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt(
@@ -499,265 +599,275 @@ block Controller
     annotation (Placement(transformation(extent={{-160,-240},{-140,-220}})));
   Buildings.Controls.OBC.CDL.Integers.Equal intEqu
     "Check if current operation mode is unoccupied mode"
-    annotation (Placement(transformation(extent={{-110,-240},{-90,-220}})));
-  Buildings.Controls.OBC.CDL.Logical.Not switch "If in unoccupied mode, switch off"
-    annotation (Placement(transformation(extent={{-80,-240},{-60,-220}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints modSetPoi(
-    final TZonHeaOn=TZonHeaOn,
-    final TZonHeaOff=TZonHeaOff,
-    final TZonCooOn=TZonCooOn,
-    final TZonCooOff=TZonCooOff)
-    "Output zone setpoint with operation mode selection"
-    annotation (Placement(transformation(extent={{-180,180},{-160,200}})));
+    annotation (Placement(transformation(extent={{-100,-240},{-80,-220}})));
+  Buildings.Controls.OBC.CDL.Logical.Not switch
+    "If in unoccupied mode, switch off"
+    annotation (Placement(transformation(extent={{-70,-240},{-50,-220}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.CoolingCoil cooCoi(
     final controllerTypeCooCoi=controllerTypeCooCoi, kCooCoi=kCooCoi)
     "Controller for cooling coil valve"
     annotation (Placement(transformation(extent={{120,-130},{140,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant win(
+    final k=false) if not have_winSen
+    "Window status"
+    annotation (Placement(transformation(extent={{-180,-140},{-160,-120}})));
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold havOcc(
+    final t=0.5) if have_occSen "Check if there is occupant"
+    annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
 
 equation
-  connect(modSetPoi.tNexOcc, tNexOcc) annotation (Line(points={{-182,199},{-192,
-          199},{-192,200},{-220,200}},      color={0,0,127}));
-  connect(ave.y, setPoiVAV.TZonSet) annotation (Line(points={{-78,200},{-10,200},
+  connect(ave.y, setPoiVAV.TZonSet) annotation (Line(points={{-18,200},{-10,200},
           {-10,191.667},{38,191.667}}, color={0,0,127}));
-  connect(TCut, conEco.TCut) annotation (Line(points={{-220,80},{-90,80},{-90,-32.2},
-          {119,-32.2}}, color={0,0,127}));
+  connect(TCut, conEco.TCut) annotation (Line(points={{-220,-20},{-180,-20},{-180,
+          -32.2},{119,-32.2}}, color={0,0,127}));
   connect(conEco.TSup, TSup) annotation (Line(points={{119,-38.6},{-4,-38.6},{-4,
-          40},{-220,40}}, color={0,0,127}));
+          10},{-220,10}}, color={0,0,127}));
   connect(setPoiVAV.TSupHeaEco, conEco.THeaSupSet) annotation (Line(points={{62,195},
           {92,195},{92,-40.2},{119,-40.2}},   color={0,0,127}));
   connect(setPoiVAV.y, conEco.uSupFanSpe) annotation (Line(points={{62,185},{86,
           185},{86,-43},{119,-43}}, color={0,0,127}));
-  connect(TMix, conEco.TMix) annotation (Line(points={{-220,0},{0,0},{0,-44.4},{
-          119,-44.4}}, color={0,0,127}));
-  connect(setPoiVAV.TSupHeaEco, TSupHeaEco) annotation (Line(points={{62,195},{
-          160,195},{160,240},{210,240}},  color={0,0,127}));
-  connect(setPoiVAV.TSupCoo, TSupCoo) annotation (Line(points={{62,190},{140,190},
-          {140,180},{210,180}}, color={0,0,127}));
-  connect(setPoiVAV.y, yFan) annotation (Line(points={{62,185},{120,185},{120,
-          120},{210,120}}, color={0,0,127}));
+  connect(TMix, conEco.TMix) annotation (Line(points={{-220,-50},{-180,-50},{-180,
+          -44.4},{119,-44.4}}, color={0,0,127}));
+  connect(setPoiVAV.TSupHeaEco, TSupHeaEco) annotation (Line(points={{62,195},{160,
+          195},{160,250},{220,250}}, color={0,0,127}));
+  connect(setPoiVAV.TSupCoo, TSupCoo) annotation (Line(points={{62,190},{220,190}},
+          color={0,0,127}));
+  connect(setPoiVAV.y, yFan) annotation (Line(points={{62,185},{120,185},{120,160},
+          {220,160}}, color={0,0,127}));
   connect(conEco.yRetDamPos, yRetDamPos) annotation (Line(points={{141,-40},{168,
-          -40},{168,-240},{210,-240}},   color={0,0,127}));
+          -40},{168,-230},{220,-230}}, color={0,0,127}));
   connect(conEco.yOutDamPos, yOutDamPos) annotation (Line(points={{141,-44},{160,
-          -44},{160,-180},{210,-180}}, color={0,0,127}));
-  connect(outAirSetPoi.TDis, TSup) annotation (Line(points={{38,57},{-4,57},{-4,
-          40},{-220,40}},      color={0,0,127}));
+          -44},{160,-170},{220,-170}}, color={0,0,127}));
+  connect(outAirSetPoi.TDis, TSup) annotation (Line(points={{38,27},{-4,27},{-4,
+          10},{-220,10}}, color={0,0,127}));
   connect(conEco.VOutMinSet_flow, outAirSetPoi.VOutMinSet_flow) annotation (
-      Line(points={{119,-41.6},{108,-41.6},{108,60},{62,60}},
-                                                       color={0,0,127}));
-  connect(TOut, setPoiVAV.TOut) annotation (Line(points={{-220,240},{10,240},{
-          10,185},{38,185}}, color={0,0,127}));
+      Line(points={{119,-41.6},{108,-41.6},{108,30},{62,30}}, color={0,0,127}));
+  connect(TOut, setPoiVAV.TOut) annotation (Line(points={{-220,250},{10,250},{10,
+          185},{38,185}},    color={0,0,127}));
   connect(conEco.TOut, setPoiVAV.TOut) annotation (Line(points={{119,-30.6},{10,
-          -30.6},{10,185},{38,185}},
-                                   color={0,0,127}));
-  connect(zonSta.yZonSta, conEco.uZonSta) annotation (Line(points={{61,140},{80,
-          140},{80,-48.2},{119,-48.2}},
-                                    color={255,127,0}));
-  connect(conInt.y, intEqu.u2) annotation (Line(points={{-138,-230},{-130,-230},
-          {-130,-238},{-112,-238}},color={255,127,0}));
-  connect(intEqu.y, switch.u) annotation (Line(points={{-88,-230},{-82,-230}}, color={255,0,255}));
-  connect(modSetPoi.TZonHeaSet, ave.u2) annotation (Line(points={{-158,190},{-130,
-          190},{-130,194},{-102,194}},     color={0,0,127}));
-  connect(modSetPoi.TZonHeaSet, heaPI.u_s) annotation (Line(points={{-158,190},{
-          -130,190},{-130,220},{-52,220}},  color={0,0,127}));
-  connect(modSetPoi.TZonCooSet, cooPI.u_s) annotation (Line(points={{-158,197},{
-          -114,197},{-114,160},{-52,160}},color={0,0,127}));
-  connect(outAirSetPoi.uWin, uWin) annotation (Line(points={{38,64},{8,64},{8,-80},
-          {-220,-80}},      color={255,0,255}));
-  connect(modSetPoi.uOcc, uOcc) annotation (Line(points={{-182,196.025},{-186,196.025},
-          {-186,120},{-220,120}},          color={255,0,255}));
-  connect(TZon, modSetPoi.TZon) annotation (Line(points={{-220,160},{-192,160},{
-          -192,193},{-182,193}},  color={0,0,127}));
-  connect(TZon, cooPI.u_m) annotation (Line(points={{-220,160},{-120,160},{-120,
-          140},{-40,140},{-40,148}}, color={0,0,127}));
-  connect(nOcc, outAirSetPoi.nOcc) annotation (Line(points={{-220,-40},{4,-40},{
-          4,68},{38,68}},  color={0,0,127}));
+          -30.6},{10,185},{38,185}}, color={0,0,127}));
+  connect(zonSta.yZonSta, conEco.uZonSta) annotation (Line(points={{61,140},{74,
+          140},{74,-48.2},{119,-48.2}}, color={255,127,0}));
+  connect(conInt.y, intEqu.u2) annotation (Line(points={{-138,-230},{-120,-230},
+          {-120,-238},{-102,-238}},color={255,127,0}));
+  connect(intEqu.y, switch.u) annotation (Line(points={{-78,-230},{-72,-230}}, color={255,0,255}));
+  connect(outAirSetPoi.uWin, uWin) annotation (Line(points={{38,34},{8,34},{8,-110},
+          {-220,-110}},color={255,0,255}));
+  connect(TZon, cooPI.u_m) annotation (Line(points={{-220,130},{-30,130},{-30,148}},
+          color={0,0,127}));
+  connect(nOcc, outAirSetPoi.nOcc) annotation (Line(points={{-220,-80},{-60,-80},
+          {-60,38},{38,38}}, color={0,0,127}));
   connect(uFreProSta, conEco.uFreProSta) annotation (Line(points={{-220,-240},{-180,
-          -240},{-180,-180},{40,-180},{40,-49.6},{119,-49.6}},
-                                   color={255,127,0}));
+          -240},{-180,-200},{40,-200},{40,-49.6},{119,-49.6}}, color={255,127,0}));
   connect(conEco.hOut, hOut) annotation (Line(points={{119,-35.4},{100,-35.4},{100,
-          -120},{-220,-120}},
-                        color={0,0,127}));
-  connect(conEco.hCut, hCut) annotation (Line(points={{119,-37},{102,-37},{102,-160},
-          {-220,-160}}, color={0,0,127}));
-  connect(conEco.TRet, TRet) annotation (Line(points={{119,-33.8},{102,-33.8},{102,
-          -200},{-220,-200}},
-                        color={0,0,127}));
+          -150},{-220,-150}}, color={0,0,127}));
+  connect(conEco.hCut, hCut) annotation (Line(points={{119,-37},{96,-37},{96,-180},
+          {-220,-180}}, color={0,0,127}));
+  connect(conEco.TRet, TRet) annotation (Line(points={{119,-33.8},{104,-33.8},{104,
+          -210},{-220,-210}}, color={0,0,127}));
   connect(conEco.yHeaCoi, yHeaCoi) annotation (Line(points={{141,-36},{174,-36},
-          {174,-60},{210,-60}}, color={0,0,127}));
-  connect(modSetPoi.yOpeMod, conEco.uOpeMod) annotation (Line(points={{-158,183},
-          {-152,183},{-152,-47},{119,-47}}, color={255,127,0}));
-  connect(modSetPoi.TZonHeaSet, TZonHeaSet) annotation (Line(points={{-158,190},
-          {-130,190},{-130,100},{160,100},{160,60},{210,60}}, color={0,0,127}));
-  connect(cooCoi.yCooCoi, yCooCoi)
-    annotation (Line(points={{142,-120},{210,-120}}, color={0,0,127}));
-  connect(switch.y, cooCoi.uSupFan) annotation (Line(points={{-58,-230},{110,-230},
-          {110,-128},{118,-128}}, color={255,0,255}));
+          {174,-50},{220,-50}}, color={0,0,127}));
+  connect(cooCoi.yCooCoi, yCooCoi)   annotation (Line(points={{142,-120},{178,-120},{178,-110},{220,-110}},
+          color={0,0,127}));
+  connect(switch.y, cooCoi.uSupFan) annotation (Line(points={{-48,-230},{60,-230},
+          {60,-128},{118,-128}},  color={255,0,255}));
   connect(zonSta.yZonSta, cooCoi.uZonSta) annotation (Line(points={{61,140},{74,
           140},{74,-124},{118,-124}}, color={255,127,0}));
-  connect(cooCoi.TSup, TSup) annotation (Line(points={{118,-116},{-4,-116},{-4,
-          40},{-220,40}},
-                      color={0,0,127}));
-  connect(switch.y, outAirSetPoi.uSupFan) annotation (Line(points={{-58,-230},{-20,
-          -230},{-20,54},{38,54}}, color={255,0,255}));
-  connect(switch.y, conEco.uSupFan) annotation (Line(points={{-58,-230},{60,-230},
-          {60,-45.6},{119,-45.6}},
-                               color={255,0,255}));
-  connect(switch.y, setPoiVAV.uFan) annotation (Line(points={{-58,-230},{28,
+  connect(cooCoi.TSup, TSup) annotation (Line(points={{118,-116},{-4,-116},{-4,10},
+          {-220,10}}, color={0,0,127}));
+  connect(switch.y, outAirSetPoi.uSupFan) annotation (Line(points={{-48,-230},{-36,
+          -230},{-36,24},{38,24}}, color={255,0,255}));
+  connect(switch.y, conEco.uSupFan) annotation (Line(points={{-48,-230},{60,-230},
+          {60,-45.6},{119,-45.6}}, color={255,0,255}));
+  connect(switch.y, setPoiVAV.uFan) annotation (Line(points={{-48,-230},{28,
           -230},{28,181.667},{38,181.667}},
-                              color={255,0,255}));
-  connect(heaPI.y, setPoiVAV.uHea) annotation (Line(points={{-28,220},{0,220},{
+                                      color={255,0,255}));
+  connect(heaPI.y, setPoiVAV.uHea) annotation (Line(points={{-58,220},{0,220},{
           0,198.333},{38,198.333}},
-                               color={0,0,127}));
-  connect(heaPI.y, zonSta.uHea) annotation (Line(points={{-28,220},{0,220},{0,144},
-          {38,144}},      color={0,0,127}));
-  connect(cooPI.y, setPoiVAV.uCoo) annotation (Line(points={{-28,160},{-20,160},
-          {-20,195},{38,195}}, color={0,0,127}));
-  connect(cooPI.y, zonSta.uCoo) annotation (Line(points={{-28,160},{-20,160},{-20,
+                                  color={0,0,127}));
+  connect(heaPI.y, zonSta.uHea) annotation (Line(points={{-58,220},{0,220},{0,144},
+          {38,144}}, color={0,0,127}));
+  connect(cooPI.y, setPoiVAV.uCoo) annotation (Line(points={{-18,160},{20,160},{
+          20,195},{38,195}}, color={0,0,127}));
+  connect(cooPI.y, zonSta.uCoo) annotation (Line(points={{-18,160},{20,160},{20,
           136},{38,136}}, color={0,0,127}));
-  connect(switch.y, heaPI.trigger) annotation (Line(points={{-58,-230},{-48,-230},
-          {-48,80},{-60,80},{-60,190},{-46,190},{-46,208}}, color={255,0,255}));
-  connect(switch.y, cooPI.trigger) annotation (Line(points={{-58,-230},{-46,-230},
-          {-46,148}}, color={255,0,255}));
-  connect(modSetPoi.TZonCooSet, TZonCooSet) annotation (Line(points={{-158,197},
-          {-114,197},{-114,108},{120,108},{120,0},{210,0}}, color={0,0,127}));
-  connect(TZon, heaPI.u_m) annotation (Line(points={{-220,160},{-120,160},{-120,
-          180},{-40,180},{-40,208}}, color={0,0,127}));
-  connect(intEqu.u1, modSetPoi.yOpeMod) annotation (Line(points={{-112,-230},{-120,
-          -230},{-120,-60},{-152,-60},{-152,183},{-158,183}},      color={255,
-          127,0}));
+  connect(switch.y, heaPI.trigger) annotation (Line(points={{-48,-230},{-36,-230},
+          {-36,84},{-76,84},{-76,208}}, color={255,0,255}));
+  connect(switch.y, cooPI.trigger) annotation (Line(points={{-48,-230},{-36,-230},
+          {-36,148}}, color={255,0,255}));
+  connect(TZon, heaPI.u_m) annotation (Line(points={{-220,130},{-70,130},{-70,208}},
+          color={0,0,127}));
   connect(setPoiVAV.TSupCoo, cooCoi.TSupCoo) annotation (Line(points={{62,190},{
           80,190},{80,-112},{118,-112}}, color={0,0,127}));
-  connect(modSetPoi.TZonCooSet, ave.u1) annotation (Line(points={{-158,197},{-114,
-          197},{-114,206},{-102,206}}, color={0,0,127}));
-  connect(TZon, setPoiVAV.TZon) annotation (Line(points={{-220,160},{-120,160},
-          {-120,180},{-40,180},{-40,188.333},{38,188.333}},color={0,0,127}));
-  connect(TZon, outAirSetPoi.TZon) annotation (Line(points={{-220,160},{-120,160},
-          {-120,140},{-40,140},{-40,60},{38,60}}, color={0,0,127}));
-  connect(modSetPoi.yOpeMod, outAirSetPoi.uOpeMod) annotation (Line(points={{-158,
-          183},{-152,183},{-152,51},{38,51}}, color={255,127,0}));
+  connect(TZon, setPoiVAV.TZon) annotation (Line(points={{-220,130},{-70,130},{
+          -70,180},{-10,180},{-10,188.333},{38,188.333}},  color={0,0,127}));
+  connect(TZon, outAirSetPoi.TZon) annotation (Line(points={{-220,130},{-70,130},
+          {-70,30},{38,30}}, color={0,0,127}));
+  connect(modSetPoi.TZonHeaSet, heaPI.u_s) annotation (Line(points={{-118,152},{
+          -100,152},{-100,220},{-82,220}}, color={0,0,127}));
+  connect(modSetPoi.TZonHeaSet, ave.u2) annotation (Line(points={{-118,152},{-100,
+          152},{-100,194},{-42,194}}, color={0,0,127}));
+  connect(modSetPoi.TZonHeaSet, TZonHeaSet) annotation (Line(points={{-118,152},
+          {-100,152},{-100,110},{220,110}}, color={0,0,127}));
+  connect(modSetPoi.TZonCooSet, ave.u1) annotation (Line(points={{-118,160},{-50,
+          160},{-50,206},{-42,206}}, color={0,0,127}));
+  connect(modSetPoi.TZonCooSet, cooPI.u_s) annotation (Line(points={{-118,160},{
+          -42,160}}, color={0,0,127}));
+  connect(modSetPoi.TZonCooSet, TZonCooSet) annotation (Line(points={{-118,160},
+          {-50,160},{-50,60},{220,60}}, color={0,0,127}));
+  connect(TZon, modSetPoi.TZon) annotation (Line(points={{-220,130},{-168,130},{
+          -168,164},{-142,164}}, color={0,0,127}));
+  connect(tNexOcc, modSetPoi.tNexOcc) annotation (Line(points={{-220,160},{-142,
+          160}}, color={0,0,127}));
+  connect(uOcc, modSetPoi.uOcc) annotation (Line(points={{-220,100},{-174,100},{
+          -174,162},{-142,162}}, color={255,0,255}));
+  connect(modSetPoi.yOpeMod, outAirSetPoi.uOpeMod) annotation (Line(points={{-118,
+          168},{-110,168},{-110,21},{38,21}}, color={255,127,0}));
+  connect(modSetPoi.yOpeMod, conEco.uOpeMod) annotation (Line(points={{-118,168},
+          {-110,168},{-110,-47},{119,-47}}, color={255,127,0}));
+  connect(modSetPoi.yOpeMod, intEqu.u1) annotation (Line(points={{-118,168},{-110,
+          168},{-110,-230},{-102,-230}}, color={255,127,0}));
+  connect(win.y, modSetPoi.uWin) annotation (Line(points={{-158,-130},{-150,-130},
+          {-150,166},{-142,166}}, color={255,0,255}));
+  connect(uWin, modSetPoi.uWin) annotation (Line(points={{-220,-110},{-150,-110},
+          {-150,166},{-142,166}},color={255,0,255}));
+  connect(win.y, outAirSetPoi.uWin) annotation (Line(points={{-158,-130},{8,-130},
+          {8,34},{38,34}}, color={255,0,255}));
+  connect(nOcc, havOcc.u) annotation (Line(points={{-220,-80},{-120,-80},{-120,60},
+          {-102,60}}, color={0,0,127}));
+  connect(havOcc.y, modSetPoi.uOccSen) annotation (Line(points={{-78,60},{-60,60},
+          {-60,120},{-180,120},{-180,154},{-142,154}}, color={255,0,255}));
+  connect(modSetPoi.warUpTim, warUpTim) annotation (Line(points={{-142,168},{-180,
+          168},{-180,190},{-220,190}}, color={0,0,127}));
+  connect(modSetPoi.cooDowTim, cooDowTim) annotation (Line(points={{-142,170},{-174,
+          170},{-174,220},{-220,220}}, color={0,0,127}));
+  connect(modSetPoi.uCooDemLimLev, uCooDemLimLev) annotation (Line(points={{-142,
+          152},{-162,152},{-162,70},{-220,70}}, color={255,127,0}));
+  connect(modSetPoi.uHeaDemLimLev, uHeaDemLimLev) annotation (Line(points={{-142,
+          150},{-156,150},{-156,40},{-220,40}}, color={255,127,0}));
 
 annotation (defaultComponentName="conVAV",
-    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-260},{200,
-            260}}),
+    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-260},{200,260}}),
         graphics={Rectangle(
         extent={{-200,-260},{200,260}},
         lineColor={0,0,127},
         fillColor={255,255,255},
         fillPattern=FillPattern.Solid),
         Text(
-          extent={{-148,312},{152,272}},
+          extent={{-204,354},{216,274}},
           textString="%name",
           lineColor={0,0,255}),
         Text(
-          extent={{-192,262},{-138,224}},
+          extent={{-200,260},{-154,242}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TOut"),
         Text(
-          extent={{-194,218},{-140,180}},
+          extent={{-194,178},{-132,150}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="tNexOcc"),
         Text(
-          extent={{-192,180},{-138,142}},
+          extent={{-200,142},{-156,122}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TZon"),
         Text(
-          extent={{-192,140},{-138,102}},
-          lineColor={0,0,127},
+          extent={{-198,116},{-152,96}},
+          lineColor={255,0,255},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="uOcc"),
         Text(
-          extent={{-192,102},{-138,64}},
+          extent={{-200,0},{-152,-20}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TCut"),
         Text(
-          extent={{-192,62},{-138,24}},
+          extent={{-200,32},{-152,10}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TSup"),
         Text(
           visible=use_TMix,
-          extent={{-192,20},{-138,-18}},
+          extent={{-200,-30},{-156,-50}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TMix"),
         Text(
           visible=have_occSen,
-          extent={{-192,-56},{-138,-18}},
+          extent={{-196,-82},{-150,-54}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="nOcc"),
         Text(
-          extent={{-192,-58},{-138,-96}},
-          lineColor={0,0,127},
+          visible=have_winSen,
+          extent={{-196,-86},{-152,-108}},
+          lineColor={255,0,255},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="uWin"),
         Text(
           visible=use_enthalpy,
-          extent={{-192,-136},{-138,-174}},
+          extent={{-192,-152},{-138,-190}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="hCut"),
         Text(
           visible=use_enthalpy,
-          extent={{-192,-98},{-138,-136}},
+          extent={{-192,-114},{-138,-152}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="hOut"),
         Text(
           visible=use_fixed_plus_differential_drybulb,
-          extent={{-192,-180},{-138,-218}},
+          extent={{-192,-190},{-138,-228}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TRet"),
         Text(
           visible=use_G36FrePro,
-          extent={{-192,-218},{-138,-256}},
-          lineColor={0,0,127},
+          extent={{-196,-230},{-112,-262}},
+          lineColor={255,127,0},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="uFreProSta"),
         Text(
-          extent={{132,242},{186,204}},
+          extent={{104,238},{190,204}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TSupHeaEco"),
         Text(
-          extent={{136,190},{190,152}},
+          extent={{124,186},{190,152}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TSupCoo"),
         Text(
-          extent={{136,140},{190,102}},
+          extent={{146,134},{194,110}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="yFan"),
         Text(
-          extent={{136,82},{190,44}},
+          extent={{112,78},{190,44}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="TZonHeaSet"),
         Text(
-          extent={{140,22},{194,-16}},
+          extent={{114,22},{194,-16}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
@@ -775,17 +885,41 @@ annotation (defaultComponentName="conVAV",
           fillPattern=FillPattern.Solid,
           textString="yCooCoi"),
         Text(
-          extent={{138,-150},{192,-188}},
+          extent={{108,-156},{192,-188}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
           textString="yOutDamPos"),
         Text(
-          extent={{140,-200},{194,-238}},
+          extent={{106,-200},{194,-238}},
           lineColor={0,0,127},
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-          textString="yRetDamPos")}),
+          textString="yRetDamPos"),
+        Text(
+          extent={{-196,238},{-122,206}},
+          lineColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="warUpTim"),
+        Text(
+          extent={{-196,208},{-116,176}},
+          lineColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="cooDowTim"),
+        Text(
+          extent={{-196,84},{-84,62}},
+          lineColor={255,127,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="uCooDemLimLev"),
+        Text(
+          extent={{-196,62},{-84,40}},
+          lineColor={255,127,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="uHeaDemLimLev")}),
           Diagram(coordinateSystem(
           preserveAspectRatio=false, extent={{-200,-260},{200,260}})),
 Documentation(info="<html>
@@ -840,13 +974,18 @@ Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.OutsideAirFl
 <h4>Zone air heating and cooling setpoints</h4>
 <p>
 Zone air heating and cooling setpoints as well as system operation modes are detailed at
-<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints\">
-Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints</a>.
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints\">
+Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints</a>.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+June 20, 2020, by Jianjun Hu:<br/>
+Updated the block of specifying operating mode and setpoints.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">#1893</a>.
+</li>
+<li>
 March 10, 2020, by Jianjun Hu:<br/>
 Replaced the block for calculating the operation mode and setpoint temperature with the one
 from the terminal unit package. The new block does not have vector-valued calculations.<br/>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo
index 19c76503197..d02147ab10f 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/CoolingCoil.mo
@@ -55,19 +55,6 @@ protected
     final k=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.ZoneStates.cooling)
     "Cooling state value"
     annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
-<<<<<<< HEAD
-  Buildings.Controls.OBC.CDL.Continuous.LimPID cooCoiPI(
-    reverseAction=true,
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
-    yMax=1,
-    yMin=0,
-    controllerType=controllerTypeCooCoi,
-    k=kCooCoi,
-    Ti=TiCooCoi,
-    Td=TdCooCoi) "Cooling coil control signal"
-    annotation (Placement(transformation(extent={{-10,70},{10,90}})));
-=======
->>>>>>> master
   Buildings.Controls.OBC.CDL.Logical.Switch switch "Switch to assign cooling coil control signal"
     annotation (Placement(transformation(extent={{72,-10},{92,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(k=0) "Cooling off mode"
@@ -78,8 +65,8 @@ protected
 equation
   connect(const.y, switch.u3) annotation (Line(points={{62,-20},{66,-20},{66,-8},
           {70,-8}}, color={0,0,127}));
-  connect(cooCoiPI.trigger, uSupFan) annotation (Line(points={{-8,68},{-8,-80},
-          {-120,-80}},                     color={255,0,255}));
+  connect(cooCoiPI.trigger, uSupFan) annotation (Line(points={{-6,68},{-6,-80},{
+          -120,-80}},                      color={255,0,255}));
   connect(cooCoiPI.u_s, TSupCoo) annotation (Line(points={{-12,80},{-120,80}},
                       color={0,0,127}));
   connect(cooCoiPI.u_m, TSup)
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo
index 9001bf60e4b..a8c1377b5a2 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo
@@ -179,12 +179,14 @@ protected
     annotation (Placement(transformation(extent={{4,100},{24,120}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt(
     final k=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.FreezeProtectionStages.stage0)
+    "Freeze protection stage 0"
     annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
   Buildings.Controls.OBC.CDL.Integers.Equal intEqu
     "Logical block to check if the freeze protection is deactivated"
     annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt1(
     final k=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.ZoneStates.heating)
+    "Heating zone state"
     annotation (Placement(transformation(extent={{-120,-30},{-100,-10}})));
   Buildings.Controls.OBC.CDL.Integers.Equal intEqu1
     "Logical block to check if the freeze protection is deactivated"
@@ -293,8 +295,10 @@ equation
   connect(xor.y, truFalHol.u) annotation (Line(points={{96,252},{106,252},{106,
           224},{122,224}},
                       color={255,0,255}));
-    annotation (
-    Icon(graphics={
+
+annotation (
+  defaultComponentName = "enaDis",
+  Icon(graphics={
         Rectangle(
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo
index 447f62f9026..c63b72062b6 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo
@@ -48,7 +48,7 @@ block Limits "Single zone VAV AHU minimum outdoor air control - damper position
     final min=0,
     final max=1,
     final unit="1") = 1
-    "Physically fixed maximum position of the outdoor air (OA) damper"
+    "Physically fixed maximum position of the outdoor air damper"
     annotation(Dialog(tab="Commissioning", group="Physical damper position limits"));
   parameter Real outDamPhyPosMin(
     final min=0,
@@ -106,11 +106,11 @@ protected
     annotation (Placement(transformation(extent={{-140,50},{-120,70}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMinSig(
     final k=outDamPhyPosMin)
-    "Physically fixed minimum position of the outdoor air (OA) damper"
+    "Physically fixed minimum position of the outdoor air damper"
     annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMaxSig(
     final k=outDamPhyPosMax)
-    "Physically fixed maximum position of the outdoor air (OA) damper"
+    "Physically fixed maximum position of the outdoor air damper"
     annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yFanMaxSig(
     final k=yFanMax) "Maximum supply fan speed"
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo
index b34be2d3f4d..5c62ebb7dd6 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo
@@ -95,12 +95,11 @@ block Modulation "Outdoor and return air damper position modulation sequence for
     annotation (Placement(transformation(extent={{120,-10},{140,10}}),
       iconTransformation(extent={{100,-10},{120,10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID uTSup(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset uTSup(
     final controllerType=controllerType,
     final k=k,
     final Ti=Ti,
     final Td=Td,
-    final reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
     final yMax=1,
     final yMin=0)
     "Contoller that outputs a signal based on the error between the measured SAT and SAT heating setpoint"
@@ -138,10 +137,12 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant uMaxHeaCoi(final k=1)
     "Maximal control loop signal for the heating coil"
     annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
-  CDL.Logical.Switch enaDis "Enable or disable the heating coil"
+  Buildings.Controls.OBC.CDL.Logical.Switch enaDis "Enable or disable the heating coil"
     annotation (Placement(transformation(extent={{76,30},{96,50}})));
-  CDL.Continuous.Sources.Constant Off(final k=0) "Off signal for heating coil"
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant Off(
+    final k=0) "Off signal for heating coil"
     annotation (Placement(transformation(extent={{6,-90},{26,-70}})));
+
 equation
   connect(retDamMaxLimSig.y,retDamPos. x2)
     annotation (Line(points={{-38,-24},{-12,-24},{-12,-4},{20,-4}},                 color={0,0,127}));
@@ -195,8 +196,8 @@ equation
     annotation (Line(points={{44,0},{130,0}}, color={0,0,127}));
   connect(outDamPos.y, yOutDamPos)
     annotation (Line(points={{46,-40},{130,-40}}, color={0,0,127}));
-  connect(uSupFan, uTSup.trigger) annotation (Line(points={{-140,-110},{-98,
-          -110},{-98,68}}, color={255,0,255}));
+  connect(uSupFan, uTSup.trigger) annotation (Line(points={{-140,-110},{-96,-110},
+          {-96,68}},       color={255,0,255}));
   annotation (
     defaultComponentName = "mod",
     Icon(graphics={
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo
index 7c750a6ea93..98521c176a1 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo
@@ -60,7 +60,7 @@ protected
     "Minimal allowed economizer damper position"
     annotation (Placement(transformation(extent={{-60,-160},{-40,-140}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant supFanSta(
-    final k=true)
+    final k=true) "Supply fan status"
     annotation (Placement(transformation(extent={{-160,-40},{-140,-20}})));
 
 equation
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo
index f5e840d0f1f..ccd1c1d1726 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo
@@ -88,17 +88,6 @@ protected
     final k=true) "Supply fan status signal"
       annotation (Placement(transformation(extent={{-200,-80},{-180,-60}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
-<<<<<<< HEAD
-    final startTime=10,
-    final period=2000) "Boolean pulse signal"
-    annotation (Placement(transformation(extent={{-200,80},{-180,100}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
-    final startTime=10,
-    final period=2000) "Boolean pulse signal"
-    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
-  CDL.Logical.Sources.Pulse booPul2(
-    final startTime=10,
-=======
     final shift=10,
     final period=2000) "Boolean pulse signal"
     annotation (Placement(transformation(extent={{-200,80},{-180,100}})));
@@ -108,7 +97,6 @@ protected
     annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
   CDL.Logical.Sources.Pulse booPul2(
     final shift=10,
->>>>>>> master
     final period=2000) "Boolean pulse signal"
     annotation (Placement(transformation(extent={{-90,106},{-70,126}})));
 equation
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo
index 6b16753b684..38edaeeed7d 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo
@@ -96,7 +96,7 @@ protected
     "Outdoor air temperature is below the cutoff"
     annotation (Placement(transformation(extent={{-120,100},{-100,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut1(
-    final k=TOutCutoff)
+    final k=TOutCutoff) "Outdoor temperature high limit cutoff"
     annotation (Placement(transformation(extent={{-120,60},{-100,80}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup(
     final height=4,
@@ -118,7 +118,7 @@ protected
     amplitude=20,
     freqHz=1/1800,
     offset=272.15,
-    startTime=0)
+    startTime=0) "Mixed air temperature"
     annotation (Placement(transformation(extent={{140,-78},{160,-60}})));
 
 equation
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo
index 172870dabc8..dc01f656862 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo
@@ -85,7 +85,7 @@ protected
     "Outdoor air temperature is slightly below the cutoff"
     annotation (Placement(transformation(extent={{-120,100},{-100,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut1(
-    final k=TOutCutoff)
+    final k=TOutCutoff) "Outdoor temperature high limit cutoff"
     annotation (Placement(transformation(extent={{-120,60},{-100,80}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSetSig(
     final k=TSupSet) "Heating supply air temperature setpoint"
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ModeAndSetPoints.mo
new file mode 100644
index 00000000000..220fedc3d49
--- /dev/null
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ModeAndSetPoints.mo
@@ -0,0 +1,452 @@
+within Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints;
+block ModeAndSetPoints "Output zone setpoint with operation mode selection"
+
+  parameter Boolean have_winSen "Check if the zone has window status sensor";
+  parameter Boolean have_occSen "Check if the zone has occupancy sensor";
+  parameter Real THeaSetOcc(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=293.15
+    "Occupied heating setpoint"
+    annotation (Dialog(group="Setpoints"));
+  parameter Real THeaSetUno(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=285.15
+    "Unoccupied heating setpoint"
+    annotation (Dialog(group="Setpoints"));
+  parameter Real TCooSetOcc(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=297.15
+    "Occupied cooling setpoint"
+    annotation (Dialog(group="Setpoints"));
+  parameter Real TCooSetUno(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=303.15
+    "Unoccupied cooling setpoint"
+    annotation (Dialog(group="Setpoints"));
+  parameter Boolean cooAdj=false
+    "Flag, set to true if both cooling and heating setpoint are adjustable separately"
+    annotation (Dialog(tab="Setpoints adjustment", group="Adjustable settings"));
+  parameter Boolean heaAdj=false
+    "Flag, set to true if heating setpoint is adjustable"
+    annotation (Dialog(tab="Setpoints adjustment", group="Adjustable settings"));
+  parameter Boolean sinAdj=false
+    "Flag, set to true if both cooling and heating setpoint are adjustable through a single common knob"
+    annotation (Dialog(tab="Setpoints adjustment", group="Adjustable settings", enable=not (cooAdj or heaAdj)));
+  parameter Boolean ignDemLim=false
+    "Flag, set to true to exempt individual zone from demand limit setpoint adjustment"
+    annotation (Dialog(tab="Setpoints adjustment", group="Adjustable settings"));
+  parameter Real TZonCooOnMax(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=300.15
+    "Maximum cooling setpoint during on"
+    annotation (Dialog(tab="Setpoints adjustment", group="Limits"));
+  parameter Real TZonCooOnMin(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=295.15
+    "Minimum cooling setpoint during on"
+    annotation (Dialog(tab="Setpoints adjustment", group="Limits"));
+  parameter Real TZonHeaOnMax(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=295.15
+    "Maximum heating setpoint during on"
+    annotation (Dialog(tab="Setpoints adjustment", group="Limits"));
+  parameter Real TZonHeaOnMin(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=291.15
+    "Minimum heating setpoint during on"
+    annotation (Dialog(tab="Setpoints adjustment", group="Limits"));
+  parameter Real TZonCooSetWinOpe(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=322.15 "Cooling setpoint when window is open"
+    annotation (Dialog(tab="Setpoints adjustment", group="Limits"));
+  parameter Real TZonHeaSetWinOpe(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=277.15  "Heating setpoint when window is open"
+    annotation (Dialog(tab="Setpoints adjustment", group="Limits"));
+  parameter Real incTSetDem_1=0.56
+    "Cooling setpoint increase value (degC) when cooling demand limit level 1 is imposed"
+    annotation (Dialog(tab="Setpoints adjustment", group="Demand control adjustment"));
+  parameter Real incTSetDem_2=1.1
+    "Cooling setpoint increase value (degC) when cooling demand limit level 2 is imposed"
+    annotation (Dialog(tab="Setpoints adjustment", group="Demand control adjustment"));
+  parameter Real incTSetDem_3=2.2
+    "Cooling setpoint increase value (degC) when cooling demand limit level 3 is imposed"
+    annotation (Dialog(tab="Setpoints adjustment", group="Demand control adjustment"));
+  parameter Real decTSetDem_1=0.56
+    "Heating setpoint decrease value (degC) when heating demand limit level 1 is imposed"
+    annotation (Dialog(tab="Setpoints adjustment", group="Demand control adjustment"));
+  parameter Real decTSetDem_2=1.1
+    "Heating setpoint decrease value (degC) when heating demand limit level 2 is imposed"
+    annotation (Dialog(tab="Setpoints adjustment", group="Demand control adjustment"));
+  parameter Real decTSetDem_3=2.2
+    "Heating setpoint decrease value (degC) when heating demand limit level 3 is imposed"
+    annotation (Dialog(tab="Setpoints adjustment", group="Demand control adjustment"));
+  parameter Real bouLim=1
+    "Threshold of temperature difference for indicating the end of setback or setup mode"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real uLow=-0.1
+    "Low limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real uHigh=0.1
+    "High limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real preWarCooTim(
+    final unit="s",
+    final quantity="Time")=10800 "Maximum cool-down or warm-up time"
+    annotation (Dialog(tab="Advanced", group="Operation mode"));
+  parameter Real TZonFreProOn(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=277.15
+    "Threshold temperature to activate the freeze protection mode"
+    annotation (Dialog(tab="Advanced", group="Operation mode"));
+  parameter Real TZonFreProOff(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=280.15
+    "Threshold temperature to end the freeze protection mode"
+    annotation (Dialog(tab="Advanced", group="Operation mode"));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput cooDowTim(
+    final unit="s",
+    final quantity="Time")
+    "Cool-down time retrieved from optimal cool-down block"
+    annotation (Placement(transformation(extent={{-200,180},{-160,220}}),
+      iconTransformation(extent={{-140,80},{-100,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput warUpTim(
+    final unit="s",
+    final quantity="Time") "Warm-up time retrieved from optimal warm-up block"
+    annotation (Placement(transformation(extent={{-200,150},{-160,190}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWin if have_winSen
+    "Window status: true=open, false=close"
+    annotation (Placement(transformation(extent={{-200,120},{-160,160}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Zone temperature"
+    annotation (Placement(transformation(extent={{-200,90},{-160,130}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc
+    "Zone occupancy status according to the schedule: true=occupied, false=unoccupied"
+    annotation (Placement(transformation(extent={{-200,40},{-160,80}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput tNexOcc(
+    final unit="s",
+    final quantity="Time") "Time to next occupied period"
+    annotation (Placement(transformation(extent={{-200,0},{-160,40}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput setAdj if cooAdj or sinAdj
+    "Setpoint adjustment value"
+    annotation (Placement(transformation(extent={{-200,-60},{-160,-20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput heaSetAdj if heaAdj
+    "Heating setpoint adjustment value"
+    annotation (Placement(transformation(extent={{-200,-100},{-160,-60}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOccSen if have_occSen
+    "Occupancy sensor (occupied=true, unoccupied=false)"
+    annotation (Placement(transformation(extent={{-200,-140},{-160,-100}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uCooDemLimLev
+    "Cooling demand limit level"
+    annotation (Placement(transformation(extent={{-200,-180},{-160,-140}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uHeaDemLimLev
+    "Heating demand limit level"
+    annotation (Placement(transformation(extent={{-200,-220},{-160,-180}}),
+      iconTransformation(extent={{-140,-120},{-100,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yOpeMod "Operation mode"
+    annotation (Placement(transformation(extent={{160,0},{200,40}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonCooSet(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Cooling setpoint temperature"
+    annotation (Placement(transformation(extent={{160,-80},{200,-40}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonHeaSet(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Heating setpoint temperature"
+    annotation (Placement(transformation(extent={{160,-180},{200,-140}}),
+      iconTransformation(extent={{100,-100},{140,-60}})));
+
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+    opeModSel(
+    final numZon=1,
+    final preWarCooTim=preWarCooTim,
+    final TZonFreProOn=TZonFreProOn,
+    final TZonFreProOff=TZonFreProOff) "Operation mode"
+    annotation (Placement(transformation(extent={{60,4},{80,36}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures TZonSet(
+    final have_occSen=have_occSen,
+    final have_winSen=have_winSen,
+    final cooAdj=cooAdj,
+    final heaAdj=heaAdj,
+    final sinAdj=sinAdj,
+    final ignDemLim=ignDemLim,
+    final TZonCooOnMax=TZonCooOnMax,
+    final TZonCooOnMin=TZonCooOnMin,
+    final TZonHeaOnMax=TZonHeaOnMax,
+    final TZonHeaOnMin=TZonHeaOnMin,
+    final TZonCooSetWinOpe=TZonCooSetWinOpe,
+    final TZonHeaSetWinOpe=TZonHeaSetWinOpe,
+    final incTSetDem_1=incTSetDem_1,
+    final incTSetDem_2=incTSetDem_2,
+    final incTSetDem_3=incTSetDem_3,
+    final decTSetDem_1=decTSetDem_1,
+    final decTSetDem_2=decTSetDem_2,
+    final decTSetDem_3=decTSetDem_3) "Adjust setpoint temperature"
+    annotation (Placement(transformation(extent={{100,-134},{120,-106}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus zonSta(
+    final THeaSetOcc=THeaSetOcc,
+    final THeaSetUno=THeaSetUno,
+    final TCooSetOcc=TCooSetOcc,
+    final TCooSetUno=TCooSetUno,
+    final bouLim=bouLim,
+    final have_winSen=have_winSen,
+    final uLow=uLow,
+    final uHigh=uHigh) "Zone temperature status"
+    annotation (Placement(transformation(extent={{-80,80},{-60,108}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger colZon
+    "Check if the zone is cold"
+    annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger hotZon
+    "Check if the zone is hot"
+    annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant winSta(
+    final k=false) if not have_winSen
+    "Assume window is closed when there is no windows status sensor"
+    annotation (Placement(transformation(extent={{-120,-30},{-100,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant occSta(
+    final k=true) if not have_occSen
+    "Assume the zone is occupied when there is no occupancy sensor"
+    annotation (Placement(transformation(extent={{-120,-190},{-100,-170}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt
+    "Boolean to integer"
+    annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
+
+equation
+  connect(zonSta.cooDowTim, cooDowTim) annotation (Line(points={{-82,102},{-110,
+          102},{-110,200},{-180,200}}, color={0,0,127}));
+  connect(zonSta.warUpTim, warUpTim) annotation (Line(points={{-82,98},{-120,98},
+          {-120,170},{-180,170}}, color={0,0,127}));
+  connect(zonSta.uWin, uWin) annotation (Line(points={{-82,90},{-130,90},{-130,140},
+          {-180,140}}, color={255,0,255}));
+  connect(zonSta.TZon, TZon) annotation (Line(points={{-82,86},{-140,86},{-140,110},
+          {-180,110}}, color={0,0,127}));
+  connect(zonSta.yCooTim, opeModSel.maxCooDowTim) annotation (Line(points={{-58,
+          107},{40,107},{40,30},{58,30}}, color={0,0,127}));
+  connect(zonSta.yWarTim, opeModSel.maxWarUpTim) annotation (Line(points={{-58,105},
+          {38,105},{38,26},{58,26}}, color={0,0,127}));
+  connect(zonSta.yHigOccCoo, opeModSel.uHigOccCoo) annotation (Line(points={{-58,
+          95},{34,95},{34,28},{58,28}}, color={255,0,255}));
+  connect(zonSta.yOccHeaHig, opeModSel.uOccHeaHig) annotation (Line(points={{-58,
+          100},{36,100},{36,24},{58,24}}, color={255,0,255}));
+  connect(zonSta.yUnoHeaHig, colZon.u) annotation (Line(points={{-58,90},{-48,90},
+          {-48,-50},{-42,-50}}, color={255,0,255}));
+  connect(colZon.y, opeModSel.totColZon) annotation (Line(points={{-18,-50},{26,
+          -50},{26,20},{58,20}}, color={255,127,0}));
+  connect(zonSta.yHigUnoCoo, hotZon.u) annotation (Line(points={{-58,83},{-52,83},
+          {-52,-80},{-42,-80}}, color={255,0,255}));
+  connect(hotZon.y, opeModSel.totHotZon) annotation (Line(points={{-18,-80},{28,
+          -80},{28,10},{58,10}}, color={255,127,0}));
+  connect(zonSta.yUnoHeaHig, opeModSel.uSetBac) annotation (Line(points={{-58,90},
+          {-28,90},{-28,18},{58,18}}, color={255,0,255}));
+  connect(zonSta.yEndSetBac, opeModSel.uEndSetBac) annotation (Line(points={{-58,
+          88},{32,88},{32,16},{58,16}}, color={255,0,255}));
+  connect(TZon, opeModSel.TZonMax) annotation (Line(points={{-180,110},{-140,110},
+          {-140,14},{58,14}}, color={0,0,127}));
+  connect(TZon, opeModSel.TZonMin) annotation (Line(points={{-180,110},{-140,110},
+          {-140,12},{58,12}}, color={0,0,127}));
+  connect(zonSta.yHigUnoCoo, opeModSel.uSetUp) annotation (Line(points={{-58,83},
+          {-32,83},{-32,8},{58,8}}, color={255,0,255}));
+  connect(zonSta.yEndSetUp, opeModSel.uEndSetUp) annotation (Line(points={{-58,81},
+          {30,81},{30,6},{58,6}}, color={255,0,255}));
+  connect(opeModSel.uOcc, uOcc) annotation (Line(points={{58,34},{-80,34},{-80,60},
+          {-180,60}}, color={255,0,255}));
+  connect(opeModSel.tNexOcc, tNexOcc) annotation (Line(points={{58,32},{-80,32},
+          {-80,20},{-180,20}}, color={0,0,127}));
+  connect(zonSta.TCooSetOn, TZonSet.TZonCooSetOcc) annotation (Line(points={{-58,
+          97},{14,97},{14,-111},{98,-111}}, color={0,0,127}));
+  connect(zonSta.TCooSetOff, TZonSet.TZonCooSetUno) annotation (Line(points={{-58,
+          85},{12,85},{12,-113},{98,-113}}, color={0,0,127}));
+  connect(zonSta.THeaSetOn, TZonSet.TZonHeaSetOcc) annotation (Line(points={{-58,
+          102},{20,102},{20,-116},{98,-116}}, color={0,0,127}));
+  connect(zonSta.THeaSetOff, TZonSet.TZonHeaSetUno) annotation (Line(points={{-58,
+          92},{18,92},{18,-118},{98,-118}}, color={0,0,127}));
+  connect(opeModSel.yOpeMod, TZonSet.uOpeMod) annotation (Line(points={{82,20},{
+          92,20},{92,-107},{98,-107}}, color={255,127,0}));
+  connect(TZonSet.uCooDemLimLev, uCooDemLimLev) annotation (Line(points={{98,-126},
+          {-4,-126},{-4,-160},{-180,-160}}, color={255,127,0}));
+  connect(TZonSet.uHeaDemLimLev, uHeaDemLimLev) annotation (Line(points={{98,-128},
+          {0,-128},{0,-200},{-180,-200}}, color={255,127,0}));
+  connect(uWin, TZonSet.uWinSta) annotation (Line(points={{-180,140},{-130,140},
+          {-130,-133},{98,-133}}, color={255,0,255}));
+  connect(winSta.y, TZonSet.uWinSta) annotation (Line(points={{-98,-20},{-60,-20},
+          {-60,-133},{98,-133}},color={255,0,255}));
+  connect(TZonSet.uOccSen, uOccSen) annotation (Line(points={{98,-131},{-80,-131},
+          {-80,-120},{-180,-120}},  color={255,0,255}));
+  connect(occSta.y, TZonSet.uOccSen) annotation (Line(points={{-98,-180},{-80,-180},
+          {-80,-131},{98,-131}},color={255,0,255}));
+  connect(opeModSel.yOpeMod, yOpeMod)
+    annotation (Line(points={{82,20},{180,20}}, color={255,127,0}));
+  connect(TZonSet.TZonCooSet, TZonCooSet) annotation (Line(points={{122,-112},{140,
+          -112},{140,-60},{180,-60}}, color={0,0,127}));
+  connect(TZonSet.TZonHeaSet, TZonHeaSet) annotation (Line(points={{122,-120},{140,
+          -120},{140,-160},{180,-160}}, color={0,0,127}));
+  connect(winSta.y, booToInt.u)
+    annotation (Line(points={{-98,-20},{-42,-20}}, color={255,0,255}));
+  connect(uWin, booToInt.u) annotation (Line(points={{-180,140},{-130,140},{-130,
+          40},{-60,40},{-60,-20},{-42,-20}}, color={255,0,255}));
+  connect(booToInt.y, opeModSel.uOpeWin) annotation (Line(points={{-18,-20},{24,
+          -20},{24,22},{58,22}}, color={255,127,0}));
+  connect(TZonSet.setAdj, setAdj) annotation (Line(points={{98,-121},{-64,-121},
+          {-64,-40},{-180,-40}}, color={0,0,127}));
+  connect(TZonSet.heaSetAdj, heaSetAdj) annotation (Line(points={{98,-123},{-68,
+          -123},{-68,-80},{-180,-80}}, color={0,0,127}));
+
+annotation (defaultComponentName="modSetPoi",
+  Diagram(coordinateSystem(extent={{-160,-220},{160,220}})),
+  Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+       graphics={Text(
+        extent={{-120,140},{100,100}},
+        textString="%name",
+        lineColor={0,0,255}),
+      Rectangle(
+        extent={{-100,-100},{100,100}},
+        lineColor={0,0,127},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-98,8},{-58,-6}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="tNexOcc"),
+        Text(
+          extent={{-100,26},{-76,16}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uOcc"),
+        Text(
+          extent={{-100,46},{-74,34}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TZon"),
+        Text(
+          visible=cooAdj or sinAdj,
+          extent={{-100,-12},{-66,-24}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="setAdj"),
+        Text(
+          visible=heaAdj,
+          extent={{-98,-32},{-52,-46}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="heaSetAdj"),
+        Text(
+          visible=have_occSen,
+          extent={{-98,-52},{-58,-64}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uOccSen"),
+        Text(
+          visible=have_winSen,
+          extent={{-100,66},{-74,54}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uWin"),
+        Text(
+          extent={{46,8},{96,-6}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TZonCooSet"),
+        Text(
+          extent={{44,-72},{96,-88}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TZonHeaSet"),
+        Text(
+          extent={{52,88},{100,76}},
+          lineColor={255,127,0},
+          pattern=LinePattern.Dash,
+          textString="yOpeMod"),
+        Text(
+          extent={{-98,104},{-50,90}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="cooDowTim"),
+        Text(
+          extent={{-98,88},{-50,74}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="warUpTim"),
+        Text(
+          extent={{-98,-70},{-30,-84}},
+          lineColor={255,127,0},
+          pattern=LinePattern.Dash,
+          textString="uCooDemLimLev"),
+        Text(
+          extent={{-100,-90},{-30,-100}},
+          lineColor={255,127,0},
+          pattern=LinePattern.Dash,
+          textString="uHeaDemLimLev")}),
+Documentation(info="<html>
+<p>
+Block that outputs the zone setpoint temperature (<code>TZonCooSet</code>,
+<code>TZonHeaSet</code>) and system operation mode (<code>yOpeMod</code>).
+</p>
+<p>The sequence consists of the following two subsequences.</p>
+<h4>Operation mode selector</h4>
+<p>
+The subsequence outputs one of seven types of system operation mode (occupied, warm-up,
+cooldown, setback, freeze protection setback, setup, unoccupied) according
+to current time, the time to next occupied hours <code>tNexOcc</code> and
+current zone temperature <code>TZon</code>.
+See
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode\">
+Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode</a>.
+</p>
+<h4>Zone setpoint temperature reset</h4>
+<p>
+It sets the zone temperature setpoint according to the globally specified setpoints,
+the local setpoint adjustments, the demand limits adjustment, the window status
+and the occupancy status. See
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures\">
+Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures</a>.
+</p>
+<h4>Usage</h4>
+<p>
+This version is for a single zone only to be used in the Single Zone VAV sequence.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 16, 2020, by Jianjun Hu:<br/>
+Moved from TerminalUnits.ModeAndSetPoints,
+reimplemented to use the operating mode specified according to ASHRAE G36 official
+release and changed the heating and cooling demand limit level to be inputs.
+</li>
+<li>
+October 24, 2018, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ModeAndSetPoints;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo
index a654f4b1473..f1fef63c331 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/OutsideAirFlow.mo
@@ -30,7 +30,7 @@ block OutsideAirFlow
     "If zone space temperature minus supply air temperature is less than uLow,
      then it should use heating supply air distribution effectiveness"
     annotation (Dialog(tab="Advanced"));
-  parameter Real uHig(
+  parameter Real uHigh(
     final unit="K",
     final displayUnit="K",
     final quantity="TemperatureDifference") = 0.5
@@ -100,9 +100,9 @@ protected
     "If supply fan is off, then outdoor airflow rate should be zero."
     annotation (Placement(transformation(extent={{140,0},{160,20}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
-    uLow=uLow,
-    uHigh=uHig,
-    pre_y_start=true)
+    final uLow=uLow,
+    final uHigh=uHigh,
+    final pre_y_start=true)
     "Check if cooling or heating air distribution effectiveness should be applied, with 1 degC deadband"
     annotation (Placement(transformation(extent={{-100,-70},{-80,-50}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant occSen(
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo
new file mode 100644
index 00000000000..814730f559d
--- /dev/null
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo
@@ -0,0 +1,225 @@
+within Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Validation;
+model ModeAndSetPoints
+  "Validation models of reseting the zone setpoint temperature"
+
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints
+    setPoi(
+    final have_winSen=false,
+    final have_occSen=false,
+    final cooAdj=true,
+    final heaAdj=true)
+    "Output resetted zone setpoint remperature"
+    annotation (Placement(transformation(extent={{20,68},{40,88}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints
+    setPoi1(
+    final have_occSen=true,
+    final have_winSen=true)
+    "Output resetted zone setpoint remperature"
+    annotation (Placement(transformation(extent={{20,28},{40,48}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints
+    setPoi2(
+    final have_winSen=false,
+    final have_occSen=false,
+    final cooAdj=true,
+    final heaAdj=true)
+    "Output resetted zone setpoint remperature"
+    annotation (Placement(transformation(extent={{20,-22},{40,-2}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints
+    setPoi3(
+    final have_occSen=true,
+    final have_winSen=true)
+    "Output resetted zone setpoint remperature"
+    annotation (Placement(transformation(extent={{20,-62},{40,-42}})));
+
+  Buildings.Controls.SetPoints.OccupancySchedule occSch "Occupancy schedule"
+    annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine heaSetAdj(
+    final freqHz=1/28800,
+    final amplitude=0.5) "Heating setpoint adjustment"
+    annotation (Placement(transformation(extent={{-46,-2},{-26,18}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine cooSetAdj(
+    final freqHz=1/28800) "Cooling setpoint adjustment"
+    annotation (Placement(transformation(extent={{-46,38},{-26,58}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine TZon1(
+    final amplitude=5,
+    final offset=18 + 273.15,
+    final freqHz=1/86400) "Zone 1 temperature"
+    annotation (Placement(transformation(extent={{-88,38},{-68,58}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine TZon2(
+    final offset=18 + 273.15,
+    final freqHz=1/86400,
+    final amplitude=7.5) "Zone 2 temperature"
+    annotation (Placement(transformation(extent={{-88,-2},{-68,18}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant winSta1(
+    final k=false)
+    "Window status"
+    annotation (Placement(transformation(extent={{-88,-82},{-68,-62}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant winSta2(
+    final k=true)
+    "Window status"
+    annotation (Placement(transformation(extent={{-46,-82},{-26,-62}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant occSen1(
+    final k=false)
+    "Occupancy sensor"
+    annotation (Placement(transformation(extent={{-88,-42},{-68,-22}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant occSen2(
+    final k=true)
+    "Occupancy sensor"
+    annotation (Placement(transformation(extent={{-46,-42},{-26,-22}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant demLimLev(
+    final k=0) "Demand limit level"
+    annotation (Placement(transformation(extent={{-66,-110},{-46,-90}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warCooTim(
+    final k=1800)
+    "Warm-up or cooldown time"
+    annotation (Placement(transformation(extent={{-48,94},{-28,114}})));
+
+equation
+  connect(cooSetAdj.y, setPoi.setAdj)
+    annotation (Line(points={{-24,48},{-20,48},{-20,76},{18,76}},
+      color={0,0,127}));
+  connect(heaSetAdj.y, setPoi.heaSetAdj)
+    annotation (Line(points={{-24,8},{-16,8},{-16,74},{18,74}},
+      color={0,0,127}));
+  connect(occSen2.y, setPoi3.uOccSen) annotation (Line(points={{-24,-32},{-2,-32},
+          {-2,-58},{18,-58}}, color={255,0,255}));
+  connect(setPoi3.TZon, TZon2.y) annotation (Line(points={{18,-48},{-20,-48},{-20,
+          -10},{-60,-10},{-60,8},{-66,8}}, color={0,0,127}));
+  connect(setPoi2.TZon, TZon2.y) annotation (Line(points={{18,-8},{-20,-8},{-20,
+          -10},{-60,-10},{-60,8},{-66,8}}, color={0,0,127}));
+  connect(cooSetAdj.y, setPoi2.setAdj) annotation (Line(points={{-24,48},{-20,48},
+          {-20,-2},{-4,-2},{-4,-14},{18,-14}}, color={0,0,127}));
+  connect(heaSetAdj.y, setPoi2.heaSetAdj) annotation (Line(points={{-24,8},{-2,8},
+          {-2,-16},{18,-16}}, color={0,0,127}));
+  connect(TZon1.y, setPoi.TZon) annotation (Line(points={{-66,48},{-60,48},{-60,
+          82},{18,82}}, color={0,0,127}));
+  connect(setPoi1.TZon, setPoi.TZon) annotation (Line(points={{18,42},{-12,42},{
+          -12,30},{-60,30},{-60,82},{18,82}}, color={0,0,127}));
+  connect(occSch.tNexOcc, setPoi.tNexOcc)
+    annotation (Line(points={{-69,86},{0,86},{0,78},{18,78}}, color={0,0,127}));
+  connect(occSch.tNexOcc, setPoi1.tNexOcc) annotation (Line(points={{-69,86},{0,
+          86},{0,38},{18,38}}, color={0,0,127}));
+  connect(occSch.occupied, setPoi.uOcc) annotation (Line(points={{-69,74},{-6,74},
+          {-6,80},{18,80}}, color={255,0,255}));
+  connect(occSch.occupied, setPoi1.uOcc) annotation (Line(points={{-69,74},{-6,74},
+          {-6,40},{18,40}}, color={255,0,255}));
+  connect(occSch.occupied, setPoi2.uOcc) annotation (Line(points={{-69,74},{-6,74},
+          {-6,-10},{18,-10}}, color={255,0,255}));
+  connect(occSch.occupied, setPoi3.uOcc) annotation (Line(points={{-69,74},{-6,74},
+          {-6,-50},{18,-50}}, color={255,0,255}));
+  connect(occSen1.y, setPoi1.uOccSen) annotation (Line(points={{-66,-32},{-60,-32},
+          {-60,-16},{-10,-16},{-10,32},{18,32}}, color={255,0,255}));
+  connect(winSta1.y, setPoi1.uWin) annotation (Line(points={{-66,-72},{-60,-72},
+          {-60,-52},{-8,-52},{-8,44},{18,44}}, color={255,0,255}));
+  connect(winSta2.y, setPoi3.uWin) annotation (Line(points={{-24,-72},{-4,-72},{
+          -4,-46},{18,-46}}, color={255,0,255}));
+  connect(occSch.tNexOcc, setPoi2.tNexOcc) annotation (Line(points={{-69,86},{0,
+          86},{0,-12},{18,-12}}, color={0,0,127}));
+  connect(occSch.tNexOcc, setPoi3.tNexOcc) annotation (Line(points={{-69,86},{0,
+          86},{0,-52},{18,-52}}, color={0,0,127}));
+  connect(demLimLev.y, setPoi.uCooDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,70},{18,70}}, color={255,127,0}));
+  connect(demLimLev.y, setPoi.uHeaDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,68},{18,68}}, color={255,127,0}));
+  connect(demLimLev.y, setPoi1.uCooDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,30},{18,30}}, color={255,127,0}));
+  connect(demLimLev.y, setPoi1.uHeaDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,28},{18,28}}, color={255,127,0}));
+  connect(demLimLev.y, setPoi2.uCooDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,-20},{18,-20}}, color={255,127,0}));
+  connect(demLimLev.y, setPoi2.uHeaDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,-22},{18,-22}}, color={255,127,0}));
+  connect(demLimLev.y, setPoi3.uCooDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,-60},{18,-60}}, color={255,127,0}));
+  connect(demLimLev.y, setPoi3.uHeaDemLimLev) annotation (Line(points={{-44,-100},
+          {2,-100},{2,-62},{18,-62}}, color={255,127,0}));
+  connect(warCooTim.y, setPoi.cooDowTim) annotation (Line(points={{-26,104},{4,104},
+          {4,88},{18,88}}, color={0,0,127}));
+  connect(warCooTim.y, setPoi.warUpTim) annotation (Line(points={{-26,104},{6,104},
+          {6,86},{18,86}}, color={0,0,127}));
+  connect(warCooTim.y, setPoi1.warUpTim) annotation (Line(points={{-26,104},{6,104},
+          {6,46},{18,46}}, color={0,0,127}));
+  connect(warCooTim.y, setPoi2.warUpTim) annotation (Line(points={{-26,104},{6,104},
+          {6,-4},{18,-4}}, color={0,0,127}));
+  connect(warCooTim.y, setPoi3.warUpTim) annotation (Line(points={{-26,104},{6,104},
+          {6,-44},{18,-44}}, color={0,0,127}));
+  connect(warCooTim.y, setPoi1.cooDowTim) annotation (Line(points={{-26,104},{4,
+          104},{4,48},{18,48}}, color={0,0,127}));
+  connect(warCooTim.y, setPoi2.cooDowTim) annotation (Line(points={{-26,104},{4,
+          104},{4,-2},{18,-2}}, color={0,0,127}));
+  connect(warCooTim.y, setPoi3.cooDowTim) annotation (Line(points={{-26,104},{4,
+          104},{4,-42},{18,-42}}, color={0,0,127}));
+
+annotation (experiment(StopTime=86400.0, Tolerance=1e-06),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mos"
+    "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints\">
+Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 16, 2020, by Jianjun Hu:<br/>
+Moved from TerminalUnits.Validation.ModeAndSetPoints to here.
+</li>
+<li>
+October 30, 2017, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+ Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-100,-120},{100,120}}),
+        graphics={
+        Text(
+          extent={{50,84},{126,74}},
+          lineColor={85,0,255},
+          horizontalAlignment=TextAlignment.Left,
+          textString="No window status sensor
+No occupancy sensor
+Zone 1"),
+        Text(
+          extent={{48,42},{102,34}},
+          lineColor={85,0,255},
+          horizontalAlignment=TextAlignment.Left,
+          textString="No local setpoint adjustment
+          Zone 1"),
+        Text(
+          extent={{46,-48},{100,-56}},
+          lineColor={85,0,255},
+          horizontalAlignment=TextAlignment.Left,
+          textString="No local setpoint adjustment
+          Zone 2"),
+        Text(
+          extent={{48,-6},{124,-16}},
+          lineColor={85,0,255},
+          horizontalAlignment=TextAlignment.Left,
+          textString="No window status sensor
+No occupancy sensor
+Zone 2")}),
+ Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+         graphics={
+        Ellipse(lineColor = {75,138,73},
+                fillColor={255,255,255},
+                fillPattern = FillPattern.Solid,
+                extent = {{-100,-100},{100,100}}),
+        Polygon(lineColor = {0,0,255},
+                fillColor = {75,138,73},
+                pattern = LinePattern.None,
+                fillPattern = FillPattern.Solid,
+                points = {{-36,60},{64,0},{-36,-60},{-36,60}}),
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,58},{64,-2},{-36,-62},{-36,58}})}));
+end ModeAndSetPoints;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/package.order b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/package.order
index ee40b6bba0a..0e006bd58f3 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/package.order
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/package.order
@@ -1,4 +1,5 @@
 ExhaustDamper
+ModeAndSetPoints
 OutsideAirFlow
 Supply_T
 Supply_u
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.order b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.order
index 2cda675dfee..927abe0a38d 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.order
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/package.order
@@ -1,4 +1,5 @@
 ExhaustDamper
+ModeAndSetPoints
 OutsideAirFlow
 Supply
 Validation
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/Controller.mo
index ab28de0dd93..0a10505f513 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/Controller.mo
@@ -1,233 +1,267 @@
 within Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Validation;
 model Controller "Validation of the top-level controller"
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller conVAV(
-    kHea=1,
-    yHeaMax=1,
-    yMin=0.1,
-    AFlo=50,
-    controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    have_occSen=true,
-    TSupSetMax=297.15,
-    TSupSetMin=285.15,
-    use_TMix=false,
-    controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    kMod=1,
-    VOutMin_flow=6e-3,
-    VOutDes_flow=0.25) "Validate the heating case"
+    final have_winSen=false,
+    final kHea=1,
+    final yHeaMax=1,
+    final yMin=0.1,
+    final AFlo=50,
+    final controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final have_occSen=true,
+    final TSupSetMax=297.15,
+    final TSupSetMin=285.15,
+    final use_TMix=false,
+    final controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final kMod=1,
+    final VOutMin_flow=6e-3,
+    final VOutDes_flow=0.25) "Validate the heating case"
     annotation (Placement(transformation(extent={{20,74},{60,122}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller conVAV1(
+    final have_winSen=true,
+    final kCoo=1,
+    final kHea=1,
+    final yHeaMax=1,
+    final yMin=0.1,
+    final AFlo=50,
+    final controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final have_occSen=false,
+    final TSupSetMax=297.15,
+    final TSupSetMin=285.15,
+    final use_TMix=false,
+    final controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final kMod=1,
+    final VOutMin_flow=6e-3,
+    final VOutDes_flow=0.25) "Validate the cooling case"
+    annotation (Placement(transformation(extent={{20,12},{60,60}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller conVAV2(
+    final have_winSen=false,
+    final kCoo=1,
+    final kHea=1,
+    final yHeaMax=1,
+    final yMin=0.1,
+    final AFlo=50,
+    final controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final have_occSen=true,
+    final TSupSetMax=297.15,
+    final TSupSetMin=285.15,
+    final use_TMix=false,
+    final controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final kMod=1,
+    final VOutMin_flow=6e-3,
+    final VOutDes_flow=0.25) "Validate the cooling case"
+    annotation (Placement(transformation(extent={{20,-48},{60,0}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller conVAV3(
+    final have_winSen=true,
+    final kCoo=1,
+    final kHea=1,
+    final yHeaMax=1,
+    final yMin=0.1,
+    final AFlo=50,
+    final controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final have_occSen=false,
+    final TSupSetMax=297.15,
+    final TSupSetMin=285.15,
+    final use_TMix=false,
+    final controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
+    final kMod=1,
+    final VOutMin_flow=6e-3,
+    final VOutDes_flow=0.25) "Validate the cooling case"
+    annotation (Placement(transformation(extent={{20,-108},{60,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TZon(
-    duration=86400,
-    height=6,
-    offset=273.15 + 16)  "Measured zone temperature"
-    annotation (Placement(transformation(extent={{-180,68},{-160,88}})));
-  Buildings.Controls.SetPoints.OccupancySchedule occSch(occupancy=3600*{4,20})
+    final duration=86400,
+    final height=6,
+    final offset=273.15 + 16)  "Measured zone temperature"
+    annotation (Placement(transformation(extent={{-180,70},{-160,90}})));
+  Buildings.Controls.SetPoints.OccupancySchedule occSch(
+    final occupancy=3600*{4,20})
     "Occupancy schedule"
     annotation (Placement(transformation(extent={{-120,44},{-100,64}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCut(final k=273.15
-         + 16) "Fixed dry bulb temperature high limit cutoff for economizer"
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCut(
+    final k=289.15)
+    "Fixed dry bulb temperature high limit cutoff for economizer"
     annotation (Placement(transformation(extent={{-120,14},{-100,34}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant nOcc(final k=2)
     "Number of occupants"
     annotation (Placement(transformation(extent={{-120,-34},{-100,-14}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant win(k=false)
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant win(final k=false)
     "Window status"
     annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut(final k=273.15 +
-        17) "Outdoor air dry bulb temperature"
-    annotation (Placement(transformation(extent={{-180,112},{-160,132}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller conVAV1(
-    kCoo=1,
-    kHea=1,
-    yHeaMax=1,
-    yMin=0.1,
-    AFlo=50,
-    controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    have_occSen=true,
-    TSupSetMax=297.15,
-    TSupSetMin=285.15,
-    use_TMix=false,
-    controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    kMod=1,
-    VOutMin_flow=6e-3,
-    VOutDes_flow=0.25) "Validate the cooling case"
-    annotation (Placement(transformation(extent={{20,12},{60,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut1(final k=273.15
-         + 28) "Outdoor air dry bulb temperature"
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut(final k=290.15)
+    "Outdoor air dry bulb temperature"
+    annotation (Placement(transformation(extent={{-180,110},{-160,130}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut1(
+    final k=301.15)
+    "Outdoor air dry bulb temperature"
     annotation (Placement(transformation(extent={{-180,-6},{-160,14}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TZon1(
-    duration=86400,
-    height=-3,
-    offset=273.15 + 26)  "Measured zone temperature"
+    final duration=86400,
+    final height=-3,
+    final offset=273.15 + 26)  "Measured zone temperature"
     annotation (Placement(transformation(extent={{-180,-50},{-160,-30}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller conVAV2(
-    kCoo=1,
-    kHea=1,
-    yHeaMax=1,
-    yMin=0.1,
-    AFlo=50,
-    controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    have_occSen=true,
-    TSupSetMax=297.15,
-    TSupSetMin=285.15,
-    use_TMix=false,
-    controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    kMod=1,
-    VOutMin_flow=6e-3,
-    VOutDes_flow=0.25) "Validate the cooling case"
-    annotation (Placement(transformation(extent={{20,-48},{60,0}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut2(
-    final k=273.15 + 22) "Outdoor air dry bulb temperature"
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut2(final k=295.15)
+    "Outdoor air dry bulb temperature"
     annotation (Placement(transformation(extent={{-180,-110},{-160,-90}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller conVAV3(
-    kCoo=1,
-    kHea=1,
-    yHeaMax=1,
-    yMin=0.1,
-    AFlo=50,
-    controllerTypeCoo=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    controllerTypeHea=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    have_occSen=true,
-    TSupSetMax=297.15,
-    TSupSetMin=285.15,
-    use_TMix=false,
-    controllerTypeMod=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
-    kMod=1,
-    VOutMin_flow=6e-3,
-    VOutDes_flow=0.25) "Validate the cooling case"
-    annotation (Placement(transformation(extent={{20,-108},{60,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut3(
-    final k=273.15 + 16)
+    final k=289.15)
     "Outdoor air dry bulb temperature"
-    annotation (Placement(transformation(extent={{-180,-148},{-160,-128}})));
-protected
+    annotation (Placement(transformation(extent={{-180,-150},{-160,-130}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup(
-    height=2,
-    duration=86400,
-    offset=273.15 + 22.5) "Terminal unit discharge air temperature"
+    final height=2,
+    final duration=86400,
+    final offset=273.15 + 22.5) "Terminal unit discharge air temperature"
     annotation (Placement(transformation(extent={{-180,30},{-160,50}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup1(
-    height=-3,
-    duration=86400,
-    offset=273.15 + 24) "Terminal unit discharge air temperature"
+    final height=-3,
+    final duration=86400,
+    final offset=273.15 + 24) "Terminal unit discharge air temperature"
     annotation (Placement(transformation(extent={{-180,-80},{-160,-60}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant demLim(
+    final k=0)
+    "Cooling and heating demand imit level"
+    annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooWarTim(
+    final k=0)
+    "Cooldown and warm-up time"
+    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
+
 equation
-  connect(TZon.y, conVAV.TZon) annotation (Line(points={{-158,78},{-30,78},{-30,
-          112.769},{18,112.769}},
-                          color={0,0,127}));
+  connect(TZon.y, conVAV.TZon) annotation (Line(points={{-158,80},{-20,80},{-20,
+          110},{18,110}}, color={0,0,127}));
   connect(occSch.occupied, conVAV.uOcc) annotation (Line(points={{-99,48},{-74,
-          48},{-74,109.077},{18,109.077}},
-                               color={255,0,255}));
+          48},{-74,107.231},{18,107.231}},
+                                       color={255,0,255}));
   connect(occSch.tNexOcc, conVAV.tNexOcc) annotation (Line(points={{-99,60},{
-          -78,60},{-78,116.462},{18,116.462}},
-                                   color={0,0,127}));
+          -80,60},{-80,112.769},{18,112.769}},
+                                           color={0,0,127}));
   connect(TCut.y, conVAV.TCut) annotation (Line(points={{-98,24},{-52,24},{-52,
-          105.385},{18,105.385}},
-                     color={0,0,127}));
-  connect(win.y, conVAV.uWin) annotation (Line(points={{-98,-120},{0,-120},{0,
-          90.6154},{18,90.6154}},
-                    color={255,0,255}));
-  connect(nOcc.y, conVAV.nOcc) annotation (Line(points={{-98,-24},{-8,-24},{-8,94.3077},
-          {18,94.3077}},
-                    color={0,0,127}));
+          97.0769},{18,97.0769}},
+                         color={0,0,127}));
+  connect(nOcc.y, conVAV.nOcc) annotation (Line(points={{-98,-24},{-8,-24},{-8,
+          91.5385},{18,91.5385}},
+                         color={0,0,127}));
   connect(TOut.y, conVAV.TOut)
-    annotation (Line(points={{-158,122},{-70,122},{-70,120.154},{18,120.154}},
-                                                   color={0,0,127}));
+    annotation (Line(points={{-158,120},{-20,120},{-20,121.077},{18,121.077}},
+          color={0,0,127}));
   connect(TSup.y, conVAV.TSup) annotation (Line(points={{-158,40},{-140,40},{
-          -140,101.692},{18,101.692}},
-                          color={0,0,127}));
+          -140,99.8462},{18,99.8462}},
+                                  color={0,0,127}));
   connect(win.y, conVAV1.uWin) annotation (Line(points={{-98,-120},{0,-120},{0,
-          28.6154},{18,28.6154}},
-                    color={255,0,255}));
-  connect(nOcc.y, conVAV1.nOcc) annotation (Line(points={{-98,-24},{-8,-24},{-8,
-          32},{6,32},{6,32.3077},{18,32.3077}},
-                        color={0,0,127}));
+          26.7692},{18,26.7692}},
+                         color={255,0,255}));
   connect(occSch.tNexOcc, conVAV1.tNexOcc) annotation (Line(points={{-99,60},{
-          -20,60},{-20,54.4615},{18,54.4615}},
-                                 color={0,0,127}));
+          -20,60},{-20,50.7692},{18,50.7692}},
+                                           color={0,0,127}));
   connect(occSch.occupied, conVAV1.uOcc)
-    annotation (Line(points={{-99,48},{-40,48},{-40,47.0769},{18,47.0769}},
-                                                color={255,0,255}));
+    annotation (Line(points={{-99,48},{-40,48},{-40,45.2308},{18,45.2308}},
+          color={255,0,255}));
   connect(TOut1.y, conVAV1.TOut)
-    annotation (Line(points={{-158,4},{6,4},{6,58.1538},{18,58.1538}},
-                                                             color={0,0,127}));
-  connect(TZon1.y, conVAV1.TZon) annotation (Line(points={{-158,-40},{-70,-40},
-          {-70,50.7692},{18,50.7692}},
-                            color={0,0,127}));
-  connect(TSup1.y, conVAV1.TSup) annotation (Line(points={{-158,-70},{-84,-70},{
-          -84,39.6923},{18,39.6923}},
-                            color={0,0,127}));
+    annotation (Line(points={{-158,4},{6,4},{6,59.0769},{18,59.0769}}, color={0,0,127}));
+  connect(TZon1.y, conVAV1.TZon) annotation (Line(points={{-158,-40},{-70,-40},{
+          -70,48},{18,48}}, color={0,0,127}));
+  connect(TSup1.y, conVAV1.TSup) annotation (Line(points={{-158,-70},{-84,-70},
+          {-84,37.8462},{18,37.8462}},color={0,0,127}));
   connect(TCut.y, conVAV1.TCut) annotation (Line(points={{-98,24},{-52,24},{-52,
-          43.3846},{18,43.3846}},
-                        color={0,0,127}));
-  connect(win.y,conVAV2. uWin) annotation (Line(points={{-98,-120},{0,-120},{0,
-          -31.3846},{18,-31.3846}},
-                               color={255,0,255}));
-  connect(TSup1.y,conVAV2. TSup) annotation (Line(points={{-158,-70},{-84,-70},{
-          -84,-20.3077},{18,-20.3077}},
-                              color={0,0,127}));
+          35.0769},{18,35.0769}}, color={0,0,127}));
+  connect(TSup1.y,conVAV2. TSup) annotation (Line(points={{-158,-70},{-84,-70},
+          {-84,-22.1538},{18,-22.1538}},color={0,0,127}));
   connect(occSch.occupied,conVAV2. uOcc) annotation (Line(points={{-99,48},{-74,
-          48},{-74,-12.9231},{18,-12.9231}},           color={255,0,255}));
-  connect(occSch.tNexOcc,conVAV2. tNexOcc) annotation (Line(points={{-99,60},{-78,
-          60},{-78,-5.53846},{18,-5.53846}},
-                                       color={0,0,127}));
+          48},{-74,-14.7692},{18,-14.7692}}, color={255,0,255}));
+  connect(occSch.tNexOcc,conVAV2. tNexOcc) annotation (Line(points={{-99,60},{-80,
+          60},{-80,-9.23077},{18,-9.23077}}, color={0,0,127}));
   connect(TCut.y,conVAV2. TCut) annotation (Line(points={{-98,24},{-52,24},{-52,
-          -16.6154},{18,-16.6154}},           color={0,0,127}));
-  connect(nOcc.y,conVAV2. nOcc) annotation (Line(points={{-98,-24},{-8,-24},{-8,
-          -28},{6,-28},{6,-27.6923},{18,-27.6923}}, color={0,0,127}));
+          -24.9231},{18,-24.9231}}, color={0,0,127}));
   connect(TZon1.y, conVAV2.TZon) annotation (Line(points={{-158,-40},{-70,-40},{
-          -70,-9.23077},{18,-9.23077}},
-                            color={0,0,127}));
-  connect(TOut2.y, conVAV2.TOut) annotation (Line(points={{-158,-100},{-40,-100},
-          {-40,-1.84615},{18,-1.84615}},
-                           color={0,0,127}));
+          -70,-12},{18,-12}}, color={0,0,127}));
+  connect(TOut2.y, conVAV2.TOut) annotation (Line(points={{-158,-100},{-64,-100},
+          {-64,-0.923077},{18,-0.923077}}, color={0,0,127}));
   connect(win.y, conVAV3.uWin) annotation (Line(points={{-98,-120},{0,-120},{0,
-          -91.3846},{18,-91.3846}},
-                     color={255,0,255}));
+          -93.2308},{18,-93.2308}},
+                          color={255,0,255}));
   connect(occSch.occupied, conVAV3.uOcc) annotation (Line(points={{-99,48},{-74,
-          48},{-74,-72.9231},{18,-72.9231}},
-                                   color={255,0,255}));
+          48},{-74,-74.7692},{18,-74.7692}}, color={255,0,255}));
   connect(TCut.y, conVAV3.TCut) annotation (Line(points={{-98,24},{-52,24},{-52,
-          -76.6154},{18,-76.6154}},
-                          color={0,0,127}));
-  connect(TSup1.y, conVAV3.TSup) annotation (Line(points={{-158,-70},{-84,-70},{
-          -84,-80.3077},{18,-80.3077}},
-                              color={0,0,127}));
-  connect(nOcc.y, conVAV3.nOcc) annotation (Line(points={{-98,-24},{-8,-24},{-8,
-          -87.6923},{18,-87.6923}},
-                          color={0,0,127}));
-  connect(TZon1.y, conVAV3.TZon) annotation (Line(points={{-158,-40},{-70,-40},
-          {-70,-69.2308},{18,-69.2308}},
-                              color={0,0,127}));
+          -84.9231},{18,-84.9231}}, color={0,0,127}));
+  connect(TSup1.y, conVAV3.TSup) annotation (Line(points={{-158,-70},{-84,-70},
+          {-84,-82.1538},{18,-82.1538}},color={0,0,127}));
+  connect(TZon1.y, conVAV3.TZon) annotation (Line(points={{-158,-40},{-70,-40},{
+          -70,-72},{18,-72}}, color={0,0,127}));
   connect(occSch.tNexOcc, conVAV3.tNexOcc) annotation (Line(points={{-99,60},{
-          -78,60},{-78,-65.5385},{18,-65.5385}},
-                                   color={0,0,127}));
-  connect(TOut3.y, conVAV3.TOut) annotation (Line(points={{-158,-138},{8,-138},
-          {8,-61.8462},{18,-61.8462}},
-                            color={0,0,127}));
-  annotation (experiment(StopTime=86400, Interval=300, Tolerance=1e-06),
+          -80,60},{-80,-69.2308},{18,-69.2308}},
+                                             color={0,0,127}));
+  connect(TOut3.y, conVAV3.TOut) annotation (Line(points={{-158,-140},{8,-140},
+          {8,-60.9231},{18,-60.9231}},color={0,0,127}));
+  connect(nOcc.y, conVAV2.nOcc) annotation (Line(points={{-98,-24},{-8,-24},{-8,
+          -30.4615},{18,-30.4615}}, color={0,0,127}));
+  connect(cooWarTim.y, conVAV.warUpTim) annotation (Line(points={{-18,20},{-14,
+          20},{-14,118.308},{18,118.308}},
+                                       color={0,0,127}));
+  connect(cooWarTim.y, conVAV.cooDowTim) annotation (Line(points={{-18,20},{-14,
+          20},{-14,115.538},{18,115.538}}, color={0,0,127}));
+  connect(cooWarTim.y, conVAV1.warUpTim) annotation (Line(points={{-18,20},{-14,
+          20},{-14,56.3077},{18,56.3077}}, color={0,0,127}));
+  connect(cooWarTim.y, conVAV1.cooDowTim) annotation (Line(points={{-18,20},{
+          -14,20},{-14,53.5385},{18,53.5385}},
+                                           color={0,0,127}));
+  connect(cooWarTim.y, conVAV2.warUpTim) annotation (Line(points={{-18,20},{-14,
+          20},{-14,-3.69231},{18,-3.69231}}, color={0,0,127}));
+  connect(cooWarTim.y, conVAV2.cooDowTim) annotation (Line(points={{-18,20},{-14,
+          20},{-14,-6.46154},{18,-6.46154}}, color={0,0,127}));
+  connect(cooWarTim.y, conVAV3.warUpTim) annotation (Line(points={{-18,20},{-14,
+          20},{-14,-63.6923},{18,-63.6923}}, color={0,0,127}));
+  connect(cooWarTim.y, conVAV3.cooDowTim) annotation (Line(points={{-18,20},{
+          -14,20},{-14,-66.4615},{18,-66.4615}},
+                                             color={0,0,127}));
+  connect(demLim.y, conVAV3.uHeaDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,-79.3846},{18,-79.3846}},
+                                             color={255,127,0}));
+  connect(demLim.y, conVAV3.uCooDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,-77.5385},{18,-77.5385}},
+                                             color={255,127,0}));
+  connect(demLim.y, conVAV2.uHeaDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,-19.3846},{18,-19.3846}},
+                                             color={255,127,0}));
+  connect(demLim.y, conVAV2.uCooDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,-17.5385},{18,-17.5385}},
+                                             color={255,127,0}));
+  connect(demLim.y, conVAV1.uHeaDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,40.6154},{18,40.6154}},
+                                           color={255,127,0}));
+  connect(demLim.y, conVAV1.uCooDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,42.4615},{18,42.4615}},
+                                           color={255,127,0}));
+  connect(demLim.y, conVAV.uCooDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,104.462},{18,104.462}},
+                                           color={255,127,0}));
+  connect(demLim.y, conVAV.uHeaDemLimLev) annotation (Line(points={{-18,-50},{
+          -4,-50},{-4,102.615},{18,102.615}},
+                                           color={255,127,0}));
+
+annotation (experiment(StopTime=86400, Interval=300, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/Controller.mos"
     "Simulate and plot"),
   Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-                                           Polygon(
+       Polygon(
           lineColor={0,0,255},
           fillColor={75,138,73},
           pattern=LinePattern.None,
           fillPattern=FillPattern.Solid,
           points={{-36,58},{64,-2},{-36,-62},{-36,58}}),
-                   Ellipse(
+       Ellipse(
           lineColor={75,138,73},
           fillColor={255,255,255},
           fillPattern=FillPattern.Solid,
-          extent={{-100,-100},{100,100}}), Polygon(
+          extent={{-100,-100},{100,100}}),
+       Polygon(
           lineColor={0,0,255},
           fillColor={75,138,73},
           pattern=LinePattern.None,
           fillPattern=FillPattern.Solid,
-          points={{-36,58},{64,-2},{-36,-62},{-36,58}})}),        Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-200,-160},{80,140}})),
+          points={{-36,58},{64,-2},{-36,-62},{-36,58}})}),
+  Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-200,-160},{80,140}})),
 Documentation(info="<html>
 <p>
 This example validates
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/ZoneState.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/ZoneState.mo
index 8e8704558b4..ef842434321 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/ZoneState.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/ZoneState.mo
@@ -3,23 +3,20 @@ model ZoneState "Validation models of determining zone state"
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.ZoneState zonSta
     "Zone state"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse uCoo(
-    period=2,
-    offset=0,
-    startTime=1,
-    amplitude=1) "Cooling control signal"
-    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse uHea(
-    period=2,
-    offset=0,
-    amplitude=1,
-    startTime=2) "Heating control signal"
-    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  CDL.Continuous.Sources.TimeTable uHeaCoo(
+    table=[
+      0,0,0;
+      1,0,1;
+      2,1,0],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments,
+    extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.HoldLastPoint)
+    "Control signal for heating and cooling"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
 equation
-  connect(uHea.y, zonSta.uHea) annotation (Line(points={{-58,30},{-50,30},{-50,
-          4},{-2,4}},     color={0,0,127}));
-  connect(uCoo.y, zonSta.uCoo) annotation (Line(points={{-58,-30},{-50,-30},{
-          -50,-4},{-2,-4}}, color={0,0,127}));
+  connect(zonSta.uHea, uHeaCoo.y[1]) annotation (Line(points={{-2,4},{-38,4},{-38,
+          0},{-58,0}}, color={0,0,127}));
+  connect(zonSta.uCoo, uHeaCoo.y[2]) annotation (Line(points={{-2,-4},{-38,-4},{
+          -38,0},{-58,0}}, color={0,0,127}));
   annotation (experiment(StopTime=3, Interval=300, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/Validation/ZoneState.mos"
     "Simulate and plot"),
@@ -44,6 +41,12 @@ Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.ZoneState</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+October 19, 2020, by Michael Wetter:<br/>
+Refactored implementation, avoided state events.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
+</li>
+<li>
 October 24, 2018, by David Blum:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo
index 1ff3b46fb98..2b7ece064a1 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/FreezeProtectionMixedAir.mo
@@ -42,7 +42,7 @@ block FreezeProtectionMixedAir "Freeze protection based on mixed air temperature
     final max=1) "Inverse freeze protection control signal, 1 if no frost, 0 if TMix below TFreSet"
     annotation (Placement(transformation(extent={{100,10},{140,50}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID con(
+  Buildings.Controls.OBC.CDL.Continuous.PID con(
     final controllerType=controllerType,
     final k=k,
     final Ti=Ti,
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/GroupStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/GroupStatus.mo
new file mode 100644
index 00000000000..2f59b0593ba
--- /dev/null
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/GroupStatus.mo
@@ -0,0 +1,664 @@
+within Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints;
+block GroupStatus "Block that outputs the zone group status"
+
+  parameter Integer numZon(
+    final min=1)=5 "number of zones in the zone group";
+  parameter Real uLow=-0.1
+    "Low limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real uHigh=0.1
+    "High limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput zonOcc[numZon]
+    "True when the zone is set to be occupied due to the override"
+    annotation (Placement(transformation(extent={{-140,280},{-100,320}}),
+      iconTransformation(extent={{-140,170},{-100,210}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc[numZon]
+    "True when the zone is occupied according to the occupancy schedule"
+    annotation (Placement(transformation(extent={{-140,240},{-100,280}}),
+        iconTransformation(extent={{-140,150},{-100,190}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput tNexOcc[numZon](
+    final unit=fill("s", numZon),
+    final quantity=fill("Time", numZon)) "Time to next occupied period"
+    annotation (Placement(transformation(extent={{-140,200},{-100,240}}),
+      iconTransformation(extent={{-140,130},{-100,170}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput uCooTim[numZon](
+    final unit=fill("s", numZon),
+    final quantity=fill("Time", numZon)) "Cool down time"
+    annotation (Placement(transformation(extent={{-140,160},{-100,200}}),
+      iconTransformation(extent={{-140,90},{-100,130}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput uWarTim[numZon](
+    final unit=fill("s", numZon),
+    final quantity=fill("Time", numZon)) "Warm-up time"
+    annotation (Placement(transformation(extent={{-140,120},{-100,160}}),
+      iconTransformation(extent={{-140,70},{-100,110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOccHeaHig[numZon]
+    "True when the zone temperature is lower than the occupied heating setpoint"
+    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
+      iconTransformation(extent={{-140,30},{-100,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHigOccCoo[numZon]
+    "True when the zone temperature is higher than the occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+      iconTransformation(extent={{-140,10},{-100,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uUnoHeaHig[numZon]
+    "True when the zone temperature is lower than the unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-140,0},{-100,40}}),
+      iconTransformation(extent={{-140,-30},{-100,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaSetOff[numZon](
+    final unit=fill("K", numZon),
+    displayUnit=fill("degC", numZon),
+    final quantity=fill("ThermodynamicTemperature", numZon))
+    "Zone unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-140,-40},{-100,0}}),
+      iconTransformation(extent={{-140,-50},{-100,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEndSetBac[numZon]
+    "True when the zone could end the setback mode"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-70},{-100,-30}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHigUnoCoo[numZon]
+    "True when the zone temperature is higher than its unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-140,-110},{-100,-70}}),
+      iconTransformation(extent={{-140,-110},{-100,-70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TCooSetOff[numZon](
+    final unit=fill("K", numZon),
+    displayUnit=fill("degC", numZon),
+    final quantity=fill("ThermodynamicTemperature", numZon))
+    "Zone unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-140,-170},{-100,-130}}),
+      iconTransformation(extent={{-140,-130},{-100,-90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEndSetUp[numZon]
+    "True when the zone could end the setup mode"
+    annotation (Placement(transformation(extent={{-140,-200},{-100,-160}}),
+      iconTransformation(extent={{-140,-150},{-100,-110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon[numZon](
+    final unit=fill("K", numZon),
+    displayUnit=fill("degC", numZon),
+    final quantity=fill("ThermodynamicTemperature", numZon)) "Zone temperature"
+    annotation (Placement(transformation(extent={{-140,-240},{-100,-200}}),
+      iconTransformation(extent={{-140,-190},{-100,-150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWin[numZon]
+    "True when the window is open, false when the window is close or the zone does not have window status sensor"
+    annotation (Placement(transformation(extent={{-140,-320},{-100,-280}}),
+      iconTransformation(extent={{-140,-210},{-100,-170}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput uGroOcc
+    "True when the zone group is in occupied mode"
+    annotation (Placement(transformation(extent={{100,260},{140,300}}),
+      iconTransformation(extent={{100,170},{140,210}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput nexOcc(
+    final quantity="Time",
+    final unit="s") "Time to next occupied period"
+    annotation (Placement(transformation(extent={{100,200},{140,240}}),
+      iconTransformation(extent={{100,150},{140,190}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCooTim(
+    final unit="s",
+    final quantity="Time") "Cool down time"
+    annotation (Placement(transformation(extent={{100,160},{140,200}}),
+      iconTransformation(extent={{100,110},{140,150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yWarTim(
+    final unit="s",
+    final quantity="Time") "Warm-up time"
+    annotation (Placement(transformation(extent={{100,120},{140,160}}),
+      iconTransformation(extent={{100,90},{140,130}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yOccHeaHig
+    "True when there is zone with temperature being lower than the occupied heating setpoint"
+    annotation (Placement(transformation(extent={{100,80},{140,120}}),
+      iconTransformation(extent={{100,50},{140,90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yHigOccCoo
+    "True when there is zone with temperature being higher than the occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{100,40},{140,80}}),
+      iconTransformation(extent={{100,30},{140,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yColZon
+    "Total number of cold zones"
+    annotation (Placement(transformation(extent={{100,0},{140,40}}),
+      iconTransformation(extent={{100,0},{140,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput ySetBac
+    "Run setback mode"
+    annotation (Placement(transformation(extent={{100,-40},{140,0}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yEndSetBac
+    "True when the group should end setback mode"
+    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+      iconTransformation(extent={{100,-40},{140,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yHotZon
+    "Total number of hot zones"
+    annotation (Placement(transformation(extent={{100,-110},{140,-70}}),
+      iconTransformation(extent={{100,-70},{140,-30}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput ySetUp
+    "Run setup mode"
+    annotation (Placement(transformation(extent={{100,-150},{140,-110}}),
+      iconTransformation(extent={{100,-90},{140,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yEndSetUp
+    "True when the group should end setup mode"
+    annotation (Placement(transformation(extent={{100,-200},{140,-160}}),
+      iconTransformation(extent={{100,-110},{140,-70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonMax(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Maximum zone temperature in the zone group"
+    annotation (Placement(transformation(extent={{100,-240},{140,-200}}),
+      iconTransformation(extent={{100,-150},{140,-110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonMin(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Minimum zone temperature in the zone group"
+    annotation (Placement(transformation(extent={{100,-280},{140,-240}}),
+      iconTransformation(extent={{100,-170},{140,-130}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yOpeWin
+    "Total number of open windows"
+    annotation (Placement(transformation(extent={{100,-320},{140,-280}}),
+      iconTransformation(extent={{100,-210},{140,-170}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Continuous.MultiMax cooDowTim(
+    final nin=numZon)
+    "Longest cooldown time"
+    annotation (Placement(transformation(extent={{40,170},{60,190}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiMax warUpTim(
+    final nin=numZon)
+    "Longest warm up time"
+    annotation (Placement(transformation(extent={{40,130},{60,150}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(
+    final nu=numZon)
+    "Check if there is any zone that the zone temperature is lower than its occupied heating setpoint"
+    annotation (Placement(transformation(extent={{40,90},{60,110}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr1(
+    final nu=numZon)
+    "Check if there is any zone that the zone temperature is higher than its occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{40,50},{60,70}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiMax maxTem(
+    final nin=numZon) "Maximum zone temperature in the zone group"
+    annotation (Placement(transformation(extent={{0,-230},{20,-210}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiMin minTem(
+    final nin=numZon) "Minimum zone temperature in the zone group"
+    annotation (Placement(transformation(extent={{0,-270},{20,-250}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[numZon]
+    "Convert boolean to integer"
+    annotation (Placement(transformation(extent={{-80,10},{-60,30}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum totColZon(
+    final nin=numZon) "Total number of cold zone"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd endSetBac(
+   final nu=numZon)
+    "Check if all zones have ended the setback mode"
+    annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1[numZon]
+    "Convert boolean to integer"
+    annotation (Placement(transformation(extent={{-80,-100},{-60,-80}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum totHotZon(
+    final nin=numZon) "Total number of hot zones"
+    annotation (Placement(transformation(extent={{40,-100},{60,-80}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd endSetUp(
+    final nu=numZon)
+    "Check if all zones have ended the setup mode"
+    annotation (Placement(transformation(extent={{-2,-190},{18,-170}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiSum sumUnoHea(
+    final nin=numZon)
+    "Sum of all zones unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Feedback difUnoHea
+    "Difference between unoccupied heating setpoint and zone temperature"
+    annotation (Placement(transformation(extent={{-50,-30},{-30,-10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Division div1 "Average difference"
+    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant totZon(
+    final k=numZon) "Total number of zones"
+    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
+  Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea "Convert integer to real"
+    annotation (Placement(transformation(extent={{-40,110},{-20,130}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiSum sumUnoCoo(
+    final nin=numZon)
+    "Sum of all zones unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-80,-160},{-60,-140}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiSum sumTem(
+    final nin=numZon) "Sum of all zones temperature"
+    annotation (Placement(transformation(extent={{-80,-210},{-60,-190}})));
+  Buildings.Controls.OBC.CDL.Continuous.Feedback difUnoCoo
+    "Difference between unoccupied cooling setpoint and zone temperature"
+    annotation (Placement(transformation(extent={{-30,-130},{-10,-110}})));
+  Buildings.Controls.OBC.CDL.Continuous.Division div2 "Average difference"
+    annotation (Placement(transformation(extent={{20,-140},{40,-120}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
+    final uLow=uLow,
+    final uHigh=uHigh)
+    "Hysteresis that outputs if the group should run in setback mode"
+    annotation (Placement(transformation(extent={{60,-30},{80,-10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1(
+    final uLow=uLow,
+    final uHigh=uHigh)
+    "Hysteresis that outputs if the group should run in setup mode"
+    annotation (Placement(transformation(extent={{60,-140},{80,-120}})));
+  Buildings.Controls.OBC.CDL.Continuous.MultiMin minToNexOcc(
+    final nin=numZon)
+    "Minimum time to next occupied period"
+    annotation (Placement(transformation(extent={{-60,210},{-40,230}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr schOcc(
+    final nu=numZon)
+    "Check if the group should be in occupied mode according to the schedule"
+    annotation (Placement(transformation(extent={{-60,250},{-40,270}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr oveRidOcc(
+    final nu=numZon)
+    "Check if the group should be in occupied mode according to the zone override"
+    annotation (Placement(transformation(extent={{-60,290},{-40,310}})));
+  Buildings.Controls.OBC.CDL.Logical.Or groOcc
+    "Check if the group should be in occupied mode according to the schedule or the zone override"
+    annotation (Placement(transformation(extent={{40,270},{60,290}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt2[numZon]
+    "Convert boolean to integer"
+    annotation (Placement(transformation(extent={{-60,-310},{-40,-290}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum totOpeWin(
+    final nin=numZon)
+    "Total number of opening windows"
+    annotation (Placement(transformation(extent={{40,-310},{60,-290}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
+    final realTrue=0,
+    final realFalse=1)
+    "When any zone becomes occpuied, output zero"
+    annotation (Placement(transformation(extent={{0,230},{20,250}})));
+  Buildings.Controls.OBC.CDL.Continuous.Product pro
+    "When it is occupied, output zero"
+    annotation (Placement(transformation(extent={{60,210},{80,230}})));
+
+equation
+  connect(maxTem.y, TZonMax)
+    annotation (Line(points={{22,-220},{120,-220}}, color={0,0,127}));
+  connect(minTem.y, TZonMin)
+    annotation (Line(points={{22,-260},{120,-260}},color={0,0,127}));
+  connect(cooDowTim.y, yCooTim)
+    annotation (Line(points={{62,180},{120,180}}, color={0,0,127}));
+  connect(warUpTim.y, yWarTim)
+    annotation (Line(points={{62,140},{120,140}}, color={0,0,127}));
+  connect(mulOr.y, yOccHeaHig)
+    annotation (Line(points={{62,100},{120,100}}, color={255,0,255}));
+  connect(mulOr1.y, yHigOccCoo)
+    annotation (Line(points={{62,60},{120,60}},   color={255,0,255}));
+  connect(uCooTim, cooDowTim.u)
+    annotation (Line(points={{-120,180},{38,180}}, color={0,0,127}));
+  connect(uOccHeaHig, mulOr.u)
+    annotation (Line(points={{-120,100},{38,100}},color={255,0,255}));
+  connect(TZon,maxTem. u)
+    annotation (Line(points={{-120,-220},{-2,-220}},color={0,0,127}));
+  connect(TZon,minTem. u)
+    annotation (Line(points={{-120,-220},{-80,-220},{-80,-260},{-2,-260}},
+      color={0,0,127}));
+  connect(uHigOccCoo, mulOr1.u)
+    annotation (Line(points={{-120,60},{38,60}},  color={255,0,255}));
+  connect(uWarTim, warUpTim.u)
+    annotation (Line(points={{-120,140},{38,140}}, color={0,0,127}));
+  connect(uUnoHeaHig, booToInt.u)
+    annotation (Line(points={{-120,20},{-82,20}}, color={255,0,255}));
+  connect(totColZon.y, yColZon)
+    annotation (Line(points={{62,20},{120,20}}, color={255,127,0}));
+  connect(endSetBac.y, yEndSetBac)
+    annotation (Line(points={{62,-60},{120,-60}}, color={255,0,255}));
+  connect(uHigUnoCoo, booToInt1.u)
+    annotation (Line(points={{-120,-90},{-82,-90}},   color={255,0,255}));
+  connect(totHotZon.y, yHotZon)
+    annotation (Line(points={{62,-90},{120,-90}},   color={255,127,0}));
+  connect(endSetUp.y, yEndSetUp)
+    annotation (Line(points={{20,-180},{120,-180}}, color={255,0,255}));
+  connect(uEndSetUp, endSetUp.u)
+    annotation (Line(points={{-120,-180},{-4,-180}}, color={255,0,255}));
+  connect(uEndSetBac, endSetBac.u)
+    annotation (Line(points={{-120,-60},{38,-60}},  color={255,0,255}));
+  connect(booToInt.y, totColZon.u)
+    annotation (Line(points={{-58,20},{38,20}}, color={255,0,255}));
+  connect(booToInt1.y, totHotZon.u)
+    annotation (Line(points={{-58,-90},{38,-90}}, color={255,0,255}));
+  connect(totZon.y, intToRea.u)
+    annotation (Line(points={{-58,120},{-42,120}}, color={255,127,0}));
+  connect(sumTem.y, difUnoHea.u2)
+    annotation (Line(points={{-58,-200},{-40,-200},{-40,-32}}, color={0,0,127}));
+  connect(sumTem.y, difUnoCoo.u1) annotation (Line(points={{-58,-200},{-40,-200},
+          {-40,-120},{-32,-120}}, color={0,0,127}));
+  connect(sumUnoCoo.y, difUnoCoo.u2) annotation (Line(points={{-58,-150},{-20,-150},
+          {-20,-132}},color={0,0,127}));
+  connect(sumUnoHea.y, difUnoHea.u1)
+    annotation (Line(points={{-58,-20},{-52,-20}}, color={0,0,127}));
+  connect(intToRea.y, div1.u2) annotation (Line(points={{-18,120},{0,120},{0,-26},
+          {18,-26}},color={0,0,127}));
+  connect(intToRea.y, div2.u2) annotation (Line(points={{-18,120},{0,120},{0,-136},
+          {18,-136}},color={0,0,127}));
+  connect(difUnoHea.y, div1.u1) annotation (Line(points={{-28,-20},{-10,-20},{-10,
+          -14},{18,-14}}, color={0,0,127}));
+  connect(difUnoCoo.y, div2.u1) annotation (Line(points={{-8,-120},{8,-120},{8,-124},
+          {18,-124}},color={0,0,127}));
+  connect(div1.y, hys.u)
+    annotation (Line(points={{42,-20},{58,-20}}, color={0,0,127}));
+  connect(hys.y, ySetBac)
+    annotation (Line(points={{82,-20},{120,-20}}, color={255,0,255}));
+  connect(div2.y, hys1.u)
+    annotation (Line(points={{42,-130},{58,-130}}, color={0,0,127}));
+  connect(hys1.y, ySetUp)
+    annotation (Line(points={{82,-130},{120,-130}},
+      color={255,0,255}));
+  connect(TCooSetOff, sumUnoCoo.u)
+    annotation (Line(points={{-120,-150},{-82,-150}}, color={0,0,127}));
+  connect(TZon, sumTem.u)
+    annotation (Line(points={{-120,-220},{-90,-220},{-90,-200},{-82,-200}},
+      color={0,0,127}));
+  connect(THeaSetOff, sumUnoHea.u)
+    annotation (Line(points={{-120,-20},{-82,-20}}, color={0,0,127}));
+  connect(groOcc.y, uGroOcc) annotation (Line(points={{62,280},{120,280}},
+          color={255,0,255}));
+  connect(oveRidOcc.y, groOcc.u1) annotation (Line(points={{-38,300},{-20,300},{
+          -20,280},{38,280}}, color={255,0,255}));
+  connect(schOcc.y, groOcc.u2) annotation (Line(points={{-38,260},{-20,260},{-20,
+          272},{38,272}}, color={255,0,255}));
+  connect(uOcc, schOcc.u) annotation (Line(points={{-120,260},{-62,260}},
+          color={255,0,255}));
+  connect(zonOcc, oveRidOcc.u) annotation (Line(points={{-120,300},{-62,300}},
+          color={255,0,255}));
+  connect(tNexOcc, minToNexOcc.u)
+    annotation (Line(points={{-120,220},{-62,220}}, color={0,0,127}));
+  connect(uWin, booToInt2.u) annotation (Line(points={{-120,-300},{-62,-300}},
+          color={255,0,255}));
+  connect(totOpeWin.y, yOpeWin)
+    annotation (Line(points={{62,-300},{120,-300}}, color={255,127,0}));
+  connect(booToInt2.y, totOpeWin.u)
+    annotation (Line(points={{-38,-300},{38,-300}}, color={255,127,0}));
+  connect(schOcc.y, booToRea.u) annotation (Line(points={{-38,260},{-20,260},{-20,
+          240},{-2,240}}, color={255,0,255}));
+  connect(minToNexOcc.y, pro.u2) annotation (Line(points={{-38,220},{-20,220},{-20,
+          214},{58,214}}, color={0,0,127}));
+  connect(booToRea.y, pro.u1) annotation (Line(points={{22,240},{40,240},{40,226},
+          {58,226}}, color={0,0,127}));
+  connect(pro.y, nexOcc) annotation (Line(points={{82,220},{94,220},{94,220},{120,
+          220}}, color={0,0,127}));
+
+annotation (
+  defaultComponentName = "groSta",
+  Icon(coordinateSystem(extent={{-100,-200},{100,200}}),
+       graphics={
+        Rectangle(extent={{-100,-200},{100,200}},
+                  lineColor={0,0,127},
+                  fillColor={255,255,255},
+                  fillPattern=FillPattern.Solid),
+        Text(extent={{-120,250},{100,212}},
+             lineColor={0,0,255},
+             textString="%name"),
+        Text(
+          extent={{-98,116},{-56,102}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="uCooTim"),
+        Text(
+          extent={{62,28},{98,16}},
+          lineColor={255,127,0},
+          pattern=LinePattern.Dash,
+          textString="yColZon"),
+        Text(
+          extent={{-98,96},{-58,84}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="uWarTim"),
+        Text(
+          extent={{-96,58},{-46,42}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uOccHeaHig"),
+        Text(
+          extent={{-96,38},{-46,24}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uHigOccCoo"),
+        Text(
+          extent={{-96,-82},{-44,-98}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uHigUnoCoo"),
+        Text(
+          extent={{-96,-42},{-46,-56}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uEndSetBac"),
+        Text(
+          extent={{-96,-124},{-48,-138}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uEndSetUp"),
+        Text(
+          extent={{-96,-4},{-46,-18}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uUnoHeaHig"),
+        Text(
+          extent={{-96,-164},{-74,-176}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TZon"),
+        Text(
+          extent={{64,-142},{98,-156}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TZonMin"),
+        Text(
+          extent={{62,-122},{98,-136}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TZonMax"),
+        Text(
+          extent={{54,-82},{98,-98}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="yEndSetUp"),
+        Text(
+          extent={{46,-10},{98,-26}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="yEndSetBac"),
+        Text(
+          extent={{46,60},{98,44}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="yHigOccCoo"),
+        Text(
+          extent={{46,78},{98,64}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="yOccHeaHig"),
+        Text(
+          extent={{64,138},{98,126}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="yCooTim"),
+        Text(
+          extent={{62,116},{98,106}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="yWarTim"),
+        Text(
+          extent={{64,-42},{98,-56}},
+          lineColor={255,127,0},
+          pattern=LinePattern.Dash,
+          textString="yHotZon"),
+        Text(
+          extent={{-98,-104},{-48,-120}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TCooSetOff"),
+        Text(
+          extent={{-98,-24},{-50,-38}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="THeaSetOff"),
+        Text(
+          extent={{58,8},{100,-4}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="ySetBac"),
+        Text(
+          extent={{62,-66},{102,-76}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="ySetUp"),
+        Text(
+          extent={{-98,156},{-56,142}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="tNexOcc"),
+        Text(
+          extent={{-98,198},{-62,186}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="ZonOcc"),
+        Text(
+          extent={{-98,178},{-72,164}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uOcc"),
+        Text(
+          extent={{64,178},{98,166}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="nexOcc"),
+        Text(
+          extent={{58,200},{98,186}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uGroOcc"),
+        Text(
+          extent={{-100,-184},{-70,-196}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uWin"),
+        Text(
+          extent={{64,-182},{98,-196}},
+          lineColor={255,127,0},
+          pattern=LinePattern.Dash,
+          textString="yOpeWin")}),
+  Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-320},{100,320}})),
+Documentation(info="<html>
+<p>
+This sequence sums up the zone level status calculation to find the outputs that are
+needed to define the zone group operation mode.
+</p>
+<p>
+It requires following inputs from zone lelvel calculation:
+</p>
+<ul>
+<li>
+<code>zonOcc</code>: if the zone-level local override switch indicates the zone is
+occupied,
+</li>
+<li>
+<code>uOcc</code>: if the zone is occupied according to its occupancy schedule,
+</li>
+<li>
+<code>tNexOcc</code>: time to next occupied period,
+</li>
+<li>
+<code>uCooTim</code>: required cooldown time,
+</li>
+<li>
+<code>uWarTim</code>: required warm-up time,
+</li>
+<li>
+<code>uOccHeaHig</code>: if the zone temperature is lower than the occupied
+heating setpoint,
+</li>
+<li>
+<code>uHigOccCoo</code>: if the zone temperature is higher than the occupied
+cooling setpoint,
+</li>
+<li>
+<code>uUnoHeaHig</code>: if the zone temperature is lower than the unoccupied
+heating setpoint,
+</li>
+<li>
+<code>THeaSetOff</code>: zone unoccupied heating setpoint,
+</li>
+<li>
+<code>uEndSetBac</code>: if the zone could end the setback mode,
+</li>
+<li>
+<code>uHigUnoCoo</code>: if the zone temperature is higher than its unoccupied 
+cooling setpoint,
+</li>
+<li>
+<code>TCooSetOff</code>: zone unoccupied cooling setpoint,
+</li>
+<li>
+<code>uEndSetUp</code>: if the zone could end the setup mode,
+</li>
+<li>
+<code>TZon</code>: zone temperature,
+</li>
+<li>
+<code>uWin</code>: True when the window is open, false when the window is close
+or the zone does not have window status sensor.
+</li>
+</ul>
+<p>
+The sequence gives following outputs for zone group level calculation:
+</p>
+<ul>
+<li>
+<code>uGroOcc</code>: the zone group should be in occupied mode when there is any
+zone becoming occupied according its schedule or due to the local override,
+</li>
+<li>
+<code>nexOcc</code>: the shortest time to the next occupied period among all the
+zones in the group,
+</li>
+<li>
+<code>yCooTim</code>: longest cooldown time,
+</li>
+<li>
+<code>yWarTim</code>: longest warm-up time,
+</li>
+<li>
+<code>yOccHeaHig</code>: if there is zone with temperature being lower than the
+occupied heating setpoint, so the group could be in the warm-up mode,
+</li>
+<li>
+<code>yHigOccCoo</code>: if there is zone with temperature being higher than the
+occupied cooling setpoint, so the group could be in the cooldown mode,
+</li>
+<li>
+<code>yColZon</code>: total number of zones that the temperature is lower than the
+unoccupied heating setpoint,
+</li>
+<li>
+<code>ySetBac</code>: check if the group could be into setback mode due to that
+the average zone temperature is lower than the average unoccupied heating setpoint,
+</li>
+<li>
+<code>yEndSetBac</code>: check if the group should end setback mode due to that
+all the zone temperature are above their unoccupied heating setpoint by a limited
+value,
+</li>
+<li>
+<code>yHotZon</code>: total number of zones that the temperature is higher than the
+unoccupied cooling setpoint,
+</li>
+<li>
+<code>ySetUp</code>: check if the group could be into setup mode due to that
+the average zone temperature is higher than the average unoccupied cooling setpoint,
+</li>
+<li>
+<code>yEndSetUp</code>: check if the group should end setup mode due to that
+all the zone temperature are below their unoccupied cooling setpoint by a limited
+value,
+</li>
+<li>
+<code>TZonMax</code>: maximum zone temperature in the zone group,
+</li>
+<li>
+<code>TZonMin</code>: minimum zone temperature in the zone group,
+</li>
+<li>
+<code>yOpeWin</code>: total number of opening windows.
+</li>
+</ul>
+</html>",revisions="<html>
+<ul>
+<li>
+June 10 15, 2020, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end GroupStatus;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo
index d7b5848f7db..3fe76b8f6c1 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/OperationMode.mo
@@ -1,660 +1,747 @@
 within Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints;
 block OperationMode "Block that outputs the operation mode"
 
-  parameter Boolean have_winSen
-    "Check if the zone has window status sensor"
-    annotation(Dialog(group="Sensors"));
   parameter Integer numZon(min=1) "Number of zones";
-  parameter Real preWarCooTim(unit="s") = 10800
+  parameter Real preWarCooTim(
+    final unit="s",
+    final quantity="Time") = 10800
     "Maximum cool-down or warm-up time";
   parameter Real TZonFreProOn(
     final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature") = 277.55
-    "Threshold zone temperature value to activate freeze protection mode";
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=277.15
+    "Threshold temperature to activate the freeze protection mode";
   parameter Real TZonFreProOff(
     final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature") = 280.35
-    "Threshold zone temperature value to finish the freeze protection mode";
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=280.15
+    "Threshold temperature to end the freeze protection mode";
 
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc
     "Zone occupancy status: true=occupied, false=unoccupied"
-    annotation (Placement(transformation(extent={{-300,310},{-260,350}}),
-        iconTransformation(extent={{-140,100},{-100,140}})));
+    annotation (Placement(transformation(extent={{-400,350},{-360,390}}),
+      iconTransformation(extent={{-140,120},{-100,160}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput tNexOcc(
     final unit="s",
     final quantity="Time")
     "Time to next occupied period"
-    annotation (Placement(transformation(extent={{-300,270},{-260,310}}),
-        iconTransformation(extent={{-140,80},{-100,120}})));
+    annotation (Placement(transformation(extent={{-400,310},{-360,350}}),
+      iconTransformation(extent={{-140,100},{-100,140}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput maxCooDowTim(
     final unit="s",
     final quantity="Time") "Maximum cool-down time among all the zones"
-    annotation (Placement(transformation(extent={{-300,210},{-260,250}}),
-        iconTransformation(extent={{-140,60},{-100,100}})));
+    annotation (Placement(transformation(extent={{-400,260},{-360,300}}),
+      iconTransformation(extent={{-140,80},{-100,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHigOccCoo
+    "True when there is zone with the temperature being higher than the occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-400,210},{-360,250}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput maxWarUpTim(
     final unit="s",
     final quantity="Time") "Maximum warm-up time among all the zones"
-    annotation (Placement(transformation(extent={{-300,130},{-260,170}}),
-        iconTransformation(extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput occHeaHigMin
-    "True when the occupied heating setpoint temperature is higher than the minimum zone temperature"
-    annotation (Placement(transformation(extent={{-300,90},{-260,130}}),
-        iconTransformation(extent={{-140,20},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput maxHigOccCoo
-    "True when the maximum zone temperature is higher than the occupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-300,60},{-260,100}}),
-        iconTransformation(extent={{-140,0},{-100,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWinSta if have_winSen
-    "Window status: true=open, false=close"
-    annotation (Placement(transformation(extent={{-300,30},{-260,70}}),
-        iconTransformation(extent={{-140,-20},{-100,20}})));
+    annotation (Placement(transformation(extent={{-400,160},{-360,200}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOccHeaHig
+    "True when there is zone with the temperature being lower than the occupied heating setpoint"
+    annotation (Placement(transformation(extent={{-400,110},{-360,150}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uOpeWin
+    "Total number of zones with opening window"
+    annotation (Placement(transformation(extent={{-400,70},{-360,110}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput totColZon
     "Total number of cold zone"
-    annotation (Placement(transformation(extent={{-300,-30},{-260,10}}),
-        iconTransformation(extent={{-140,-40},{-100,0}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput unoHeaHigMin
-    "True when the unoccupied heating setpoint is higher than minimum zone temperature"
-    annotation (Placement(transformation(extent={{-300,-90},{-260,-50}}),
-        iconTransformation(extent={{-140,-60},{-100,-20}})));
+    annotation (Placement(transformation(extent={{-400,10},{-360,50}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uSetBac
+    "True when the average zone temperature falls below the average unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-400,-40},{-360,0}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEndSetBac
+    "True when the setback mode could end"
+    annotation (Placement(transformation(extent={{-400,-70},{-360,-30}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonMax(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Maximum zone temperature"
-    annotation (Placement(transformation(extent={{-300,-130},{-260,-90}}),
-        iconTransformation(extent={{-140,-80},{-100,-40}})));
+    annotation (Placement(transformation(extent={{-400,-100},{-360,-60}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonMin(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Minimum zone temperature"
-    annotation (Placement(transformation(extent={{-300,-170},{-260,-130}}),
-        iconTransformation(extent={{-140,-100},{-100,-60}})));
+    annotation (Placement(transformation(extent={{-400,-140},{-360,-100}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput totHotZon
     "Total number of hot zone"
-    annotation (Placement(transformation(extent={{-300,-230},{-260,-190}}),
-        iconTransformation(extent={{-140,-120},{-100,-80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput maxHigUnoCoo
-    "True when the maximum zone temperature is higher than unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-300,-290},{-260,-250}}),
-        iconTransformation(extent={{-140,-140},{-100,-100}})));
+    annotation (Placement(transformation(extent={{-400,-210},{-360,-170}}),
+      iconTransformation(extent={{-140,-120},{-100,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uSetUp
+    "True when the average zone temperature rises above the average unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-400,-260},{-360,-220}}),
+      iconTransformation(extent={{-140,-140},{-100,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEndSetUp
+    "True when the setup mode could end"
+    annotation (Placement(transformation(extent={{-400,-290},{-360,-250}}),
+      iconTransformation(extent={{-140,-160},{-100,-120}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yOpeMod
     "Operation mode"
-    annotation (Placement(transformation(extent={{460,-40},{500,0}}),
-        iconTransformation(extent={{100,-20},{140,20}})));
+    annotation (Placement(transformation(extent={{360,-18},{400,22}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
 
 protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant occModInd(
     final k=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.occupied)
     "Occupied mode "
-    annotation (Placement(transformation(extent={{200,300},{220,320}})));
+    annotation (Placement(transformation(extent={{100,340},{120,360}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant unoPerInd(
     final k=0)
     "Index to indicate unoccupied period"
-    annotation (Placement(transformation(extent={{100,250},{120,270}})));
+    annotation (Placement(transformation(extent={{0,340},{20,360}})));
   Buildings.Controls.OBC.CDL.Logical.Switch corCooDowTim "Corrected cool down period"
-    annotation (Placement(transformation(extent={{-20,200},{0,220}})));
+    annotation (Placement(transformation(extent={{-220,240},{-200,260}})));
   Buildings.Controls.OBC.CDL.Logical.Switch corWarUpTim "Corrected warm-up period"
-    annotation (Placement(transformation(extent={{-20,160},{0,180}})));
+    annotation (Placement(transformation(extent={{-200,140},{-180,160}})));
   Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr(
-    final threshold=4) "Check if the number of cold zones is not less than than 5"
-    annotation (Placement(transformation(extent={{-180,-20},{-160,0}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr1(
-    final threshold=numZon - 1)
-    "Check if all zones are cold zone"
-    annotation (Placement(transformation(extent={{-180,-50},{-160,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.FallingEdge falEdg
-    "Check if the unoccupied heating setpoint becomes lower than minimum zone temperature: true to false"
-    annotation (Placement(transformation(extent={{-100,-60},{-80,-40}})));
+    final t=4) "Check if the number of cold zones is not less than than 5"
+    annotation (Placement(transformation(extent={{-280,20},{-260,40}})));
   Buildings.Controls.OBC.CDL.Logical.Latch lat
     "If all zone temperature are higher than unoccupied heating setpoint by a given limit, then the setback mode should be off"
-    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
+    annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
   Buildings.Controls.OBC.CDL.Logical.Latch lat1
     "If all zone temperature are higher than threshold temperature of ending freeze protection, then freeze protection setback mode should be off"
-    annotation (Placement(transformation(extent={{-40,-120},{-20,-100}})));
+    annotation (Placement(transformation(extent={{-100,-100},{-80,-80}})));
   Buildings.Controls.OBC.CDL.Logical.Latch lat2
     "If all zone temperature are lower than unoccupied cooling setpoint by a given limit, then the setup mode should be off"
-    annotation (Placement(transformation(extent={{-40,-220},{-20,-200}})));
-  Buildings.Controls.OBC.CDL.Logical.FallingEdge falEdg1
-    "Check if the unoccupied cooling setpoint becomes higher than maximum zone temperature: true to false"
-    annotation (Placement(transformation(extent={{-100,-260},{-80,-240}})));
+    annotation (Placement(transformation(extent={{-100,-200},{-80,-180}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys2(
     final pre_y_start=true,
     final uHigh=0,
     final uLow=-60)
     "Hysteresis that outputs if the maximum cool-down time is more than the allowed cool-down time"
-    annotation (Placement(transformation(extent={{-100,200},{-80,220}})));
+    annotation (Placement(transformation(extent={{-260,240},{-240,260}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys3(
     final pre_y_start=true,
     final uHigh=0,
     final uLow=-60)
     "Hysteresis that outputs if the maximum warm-up time is more than allowed warm-up time"
-    annotation (Placement(transformation(extent={{-100,160},{-80,180}})));
+    annotation (Placement(transformation(extent={{-260,140},{-240,160}})));
   Buildings.Controls.OBC.CDL.Continuous.Add add5(
     final k1=-1)
     "Calculate differential between time-to-next-occupancy and the cool-down time"
-    annotation (Placement(transformation(extent={{40,210},{60,230}})));
+    annotation (Placement(transformation(extent={{-160,240},{-140,260}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys4(
     final pre_y_start=false,
     final uHigh=0,
     final uLow=-60)
-    "Hysteresis to activate the cool-down model"
-    annotation (Placement(transformation(extent={{80,210},{100,230}})));
+    "Hysteresis to check if the cooldown mode could be activated"
+    annotation (Placement(transformation(extent={{-120,240},{-100,260}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys5(
     final pre_y_start=false,
     final uHigh=0,
     final uLow=-60)
     "Hysteresis to activate the warm-up model"
-    annotation (Placement(transformation(extent={{80,170},{100,190}})));
+    annotation (Placement(transformation(extent={{-120,150},{-100,170}})));
   Buildings.Controls.OBC.CDL.Continuous.Add add6(
     final k1=-1)
     "Calculate differential between time-to-next-occupancy and the warm-up time"
-    annotation (Placement(transformation(extent={{40,170},{60,190}})));
+    annotation (Placement(transformation(extent={{-160,150},{-140,170}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys9(
     final pre_y_start=false,
     final uLow=-0.1,
     final uHigh=0.1)
     "Hysteresis that outputs if any zone temperature is lower than freeze protection threshold temperature"
-    annotation (Placement(transformation(extent={{-140,-120},{-120,-100}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    final p=TZonFreProOn,
-    final k=-1)
-    "Calculate differential between minimum zone temperature and freeze protection threshold temperature"
-    annotation (Placement(transformation(extent={{-180,-120},{-160,-100}})));
+    annotation (Placement(transformation(extent={{-180,-100},{-160,-80}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys10(
     final pre_y_start=false,
     final uLow=-0.1,
     final uHigh=0.1)
     "Hysteresis that outputs if all zone temperature are higher than threshold temperature of ending freeze protection"
-    annotation (Placement(transformation(extent={{-140,-160},{-120,-140}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    final k=1,
-    final p=(-1)*TZonFreProOff)
-    "Calculate differential between maximum zone temperature and threshold temperature of ending freeze protection"
-    annotation (Placement(transformation(extent={{-180,-160},{-160,-140}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2(
-    final p=preWarCooTim,
-    final k=-1)
-    "Calculate the differential between maximum cool down time and the allowed maximum cool down time"
-    annotation (Placement(transformation(extent={{-140,200},{-120,220}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar3(
-    final p=preWarCooTim,
-    final k=-1)
-    "Calculate the differential between maximum warm-up time and the allowed maximum warm-up time"
-    annotation (Placement(transformation(extent={{-140,160},{-120,180}})));
+    annotation (Placement(transformation(extent={{-180,-140},{-160,-120}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxWarCooTime(
     final k=preWarCooTim)
     "Allowed maximum warm-up or cool-down time"
-    annotation (Placement(transformation(extent={{-200,180},{-180,200}})));
-  Buildings.Controls.OBC.CDL.Logical.Latch lat3
-    "Hold true when it should be in warm-up mode"
-    annotation (Placement(transformation(extent={{-100,100},{-80,120}})));
-  Buildings.Controls.OBC.CDL.Logical.Latch lat4
-    "Hold true when it should be in cool-down mode"
-    annotation (Placement(transformation(extent={{-100,70},{-80,90}})));
+    annotation (Placement(transformation(extent={{-340,190},{-320,210}})));
   Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr2(
-    final threshold=4) "Check if the number of hot zones is not less than than 5"
-    annotation (Placement(transformation(extent={{-180,-220},{-160,-200}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr3(
-    final threshold=numZon - 1) "Check if all zones are hot zone"
-    annotation (Placement(transformation(extent={{-180,-250},{-160,-230}})));
+    final t=4) "Check if the number of hot zones is not less than than 5"
+    annotation (Placement(transformation(extent={{-280,-200},{-260,-180}})));
   Buildings.Controls.OBC.CDL.Integers.Add addInt "Sum of two integer inputs"
-    annotation (Placement(transformation(extent={{300,190},{320,210}})));
+    annotation (Placement(transformation(extent={{240,280},{260,300}})));
   Buildings.Controls.OBC.CDL.Integers.Add addInt1 "Sum of two integer inputs"
-    annotation (Placement(transformation(extent={{360,240},{380,260}})));
+    annotation (Placement(transformation(extent={{276,304},{296,324}})));
   Buildings.Controls.OBC.CDL.Integers.Add addInt2 "Sum of two integer inputs"
-    annotation (Placement(transformation(extent={{240,-90},{260,-70}})));
+    annotation (Placement(transformation(extent={{140,-50},{160,-30}})));
   Buildings.Controls.OBC.CDL.Integers.Add addInt3 "Sum of two integer inputs"
-    annotation (Placement(transformation(extent={{280,-200},{300,-180}})));
+    annotation (Placement(transformation(extent={{200,-180},{220,-160}})));
   Buildings.Controls.OBC.CDL.Integers.Add addInt4 "Sum of two integer inputs"
-    annotation (Placement(transformation(extent={{320,-290},{340,-270}})));
+    annotation (Placement(transformation(extent={{260,-320},{280,-300}})));
   Buildings.Controls.OBC.CDL.Integers.Add addInt5 "Sum of two integer inputs"
-    annotation (Placement(transformation(extent={{420,-30},{440,-10}})));
+    annotation (Placement(transformation(extent={{320,-8},{340,12}})));
   Buildings.Controls.OBC.CDL.Conversions.RealToInteger occMod
     "Convert Real number to Integer number"
-    annotation (Placement(transformation(extent={{300,270},{320,290}})));
+    annotation (Placement(transformation(extent={{200,310},{220,330}})));
   Buildings.Controls.OBC.CDL.Conversions.RealToInteger setBacMod
     "Convert Real number to Integer number"
-    annotation (Placement(transformation(extent={{200,-20},{220,0}})));
+    annotation (Placement(transformation(extent={{100,20},{120,40}})));
   Buildings.Controls.OBC.CDL.Conversions.RealToInteger freProSetBacMod
     "Convert Real number to Integer number"
-    annotation (Placement(transformation(extent={{200,-120},{220,-100}})));
+    annotation (Placement(transformation(extent={{100,-100},{120,-80}})));
   Buildings.Controls.OBC.CDL.Conversions.RealToInteger setUpMod
     "Convert Real number to Integer number"
-    annotation (Placement(transformation(extent={{200,-220},{220,-200}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1(
-    final integerTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.warmUp)
+    annotation (Placement(transformation(extent={{100,-200},{120,-180}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edg
+    "Get the moment when the warm up time starts "
+    annotation (Placement(transformation(extent={{-50,150},{-30,170}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol(
+    final trueHoldDuration=preWarCooTim)
+    "Hold the start time true signal"
+    annotation (Placement(transformation(extent={{-20,240},{0,260}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edg1
+    "Get the moment when cool down time starts"
+    annotation (Placement(transformation(extent={{-48,240},{-28,260}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol1(
+    final trueHoldDuration=preWarCooTim)
+    "Hold the start time true signal"
+    annotation (Placement(transformation(extent={{-20,150},{0,170}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1(
+    final realTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.warmUp)
     "Convert Boolean to Integer number"
-    annotation (Placement(transformation(extent={{260,170},{280,190}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt(
-    final integerTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.coolDown)
+    annotation (Placement(transformation(extent={{80,170},{100,190}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
+    final realTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.coolDown)
     "Convert Boolean to Integer number"
-    annotation (Placement(transformation(extent={{260,210},{280,230}})));
+    annotation (Placement(transformation(extent={{80,260},{100,280}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt3(
     final integerTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.unoccupied)
     "Convert Boolean to Integer "
-    annotation (Placement(transformation(extent={{220,-340},{240,-320}})));
+    annotation (Placement(transformation(extent={{120,-370},{140,-350}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea6(
     final realTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.setUp)
     "Convert Boolean to Real "
-    annotation (Placement(transformation(extent={{60,-220},{80,-200}})));
+    annotation (Placement(transformation(extent={{-20,-200},{0,-180}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea4(
     final realTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.freezeProtection)
     "Convert Boolean to Real "
-    annotation (Placement(transformation(extent={{60,-120},{80,-100}})));
+    annotation (Placement(transformation(extent={{-20,-100},{0,-80}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea3(
     final realTrue=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.setBack)
     "Convert Boolean to Real "
-    annotation (Placement(transformation(extent={{60,-20},{80,0}})));
+    annotation (Placement(transformation(extent={{-20,20},{0,40}})));
   Buildings.Controls.OBC.CDL.Utilities.Assert assMes(
     final message="Level 3 alarm: freeze protection setback")
     "Generate alarm message"
-    annotation (Placement(transformation(extent={{100,-160},{120,-140}})));
+    annotation (Placement(transformation(extent={{100,-140},{120,-120}})));
   Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not"
-   annotation (Placement(transformation(extent={{180,-340},{200,-320}})));
-  Buildings.Controls.OBC.CDL.Logical.And and1 "Check if the warm-up time should be activated"
-    annotation (Placement(transformation(extent={{200,170},{220,190}})));
-  Buildings.Controls.OBC.CDL.Logical.And and2 "Check if the cool-down time should be activated"
-    annotation (Placement(transformation(extent={{200,210},{220,230}})));
+   annotation (Placement(transformation(extent={{80,-370},{100,-350}})));
+  Buildings.Controls.OBC.CDL.Logical.And and1 "Warm-up period"
+    annotation (Placement(transformation(extent={{20,170},{40,190}})));
+  Buildings.Controls.OBC.CDL.Logical.And and2
+    "Get the start of the cool-down time"
+    annotation (Placement(transformation(extent={{-80,240},{-60,260}})));
   Buildings.Controls.OBC.CDL.Logical.Or or1
     "Check if the number of cold zone is more than 5 or all zones are cold"
-    annotation (Placement(transformation(extent={{-100,-20},{-80,0}})));
+    annotation (Placement(transformation(extent={{-220,20},{-200,40}})));
   Buildings.Controls.OBC.CDL.Logical.Or3 or3
-    "Check if it is in Occupied, Cool-down, or Warm-up mode"
-    annotation (Placement(transformation(extent={{0,20},{20,40}})));
+    "Check if it is in occupied, cooldown, or warm-up mode"
+    annotation (Placement(transformation(extent={{-140,60},{-120,80}})));
   Buildings.Controls.OBC.CDL.Logical.Or or4
-    "Check if the number of hot zone is more than 5 or all zones are cold"
-    annotation (Placement(transformation(extent={{-100,-220},{-80,-200}})));
+    "Check if the number of hot zone is more than 5 or all zones are hot"
+    annotation (Placement(transformation(extent={{-220,-200},{-200,-180}})));
   Buildings.Controls.OBC.CDL.Logical.Or3 or5
     "Check if it is in Setback, Setback_freezeProtection, or Setup mode"
-    annotation (Placement(transformation(extent={{60,-320},{80,-300}})));
+    annotation (Placement(transformation(extent={{-20,-350},{0,-330}})));
   Buildings.Controls.OBC.CDL.Logical.Or or6
     "Check if it is in any of the 6 modes except unoccupied mode"
-    annotation (Placement(transformation(extent={{120,-340},{140,-320}})));
+    annotation (Placement(transformation(extent={{40,-370},{60,-350}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi
     "Switch between occupied mode index and unoccupied period index"
-    annotation (Placement(transformation(extent={{260,270},{280,290}})));
+    annotation (Placement(transformation(extent={{160,310},{180,330}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi3
     "If the Cool-down, warm-up, or Occupied mode is on, then setback mode should not be activated."
-    annotation (Placement(transformation(extent={{160,-20},{180,0}})));
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi4
     "If the Cool-down, warm-up, or Occupied mode is on, then freeze protection setback mode should not be activated."
-    annotation (Placement(transformation(extent={{160,-120},{180,-100}})));
+    annotation (Placement(transformation(extent={{60,-100},{80,-80}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi5
     "If the Cool-down, warm-up, or Occupied mode is on, then setup mode should not be activated."
-    annotation (Placement(transformation(extent={{160,-220},{180,-200}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not3 "Logical not"
-    annotation (Placement(transformation(extent={{120,190},{140,210}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not4 "Logical not"
-    annotation (Placement(transformation(extent={{120,150},{140,170}})));
+    annotation (Placement(transformation(extent={{60,-200},{80,-180}})));
   Buildings.Controls.OBC.CDL.Logical.Not not5 "Logical not"
-    annotation (Placement(transformation(extent={{60,-160},{80,-140}})));
+    annotation (Placement(transformation(extent={{-20,-140},{0,-120}})));
   Buildings.Controls.OBC.CDL.Integers.GreaterThreshold notOcc(
-    final threshold=1) if have_winSen
+    final t=1)
     "Check if the operation mode is other than occupied mode"
-    annotation (Placement(transformation(extent={{200,20},{220,40}})));
-  Buildings.Controls.OBC.CDL.Logical.And and3 if have_winSen
+    annotation (Placement(transformation(extent={{100,60},{120,80}})));
+  Buildings.Controls.OBC.CDL.Logical.And and3
     "True if window open during modes other than occupied mode"
-    annotation (Placement(transformation(extent={{260,40},{280,60}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not1 if have_winSen "Logical not"
-    annotation (Placement(transformation(extent={{300,40},{320,60}})));
+    annotation (Placement(transformation(extent={{160,80},{180,100}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not"
+    annotation (Placement(transformation(extent={{200,80},{220,100}})));
   Buildings.Controls.OBC.CDL.Utilities.Assert winOpe(
-    final message="Level 4 alarm: window open during modes other than occupied mode") if
-       have_winSen
+    final message="Level 4 alarm: window open during modes other than occupied mode")
     "Generate alarm message when window open during modes other than occupied mode"
-    annotation (Placement(transformation(extent={{340,40},{360,60}})));
+    annotation (Placement(transformation(extent={{240,80},{260,100}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch swi1
+    "If occupied mode is on, then cool down mode should not be activated"
+    annotation (Placement(transformation(extent={{140,270},{160,290}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger setBacMod1
+    "Convert Real number to Integer number"
+    annotation (Placement(transformation(extent={{180,270},{200,290}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch swi2
+    "If occupied mode is on, then warm-up mode should not be activated."
+    annotation (Placement(transformation(extent={{140,180},{160,200}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger setBacMod2
+    "Convert Real number to Integer number"
+    annotation (Placement(transformation(extent={{180,180},{200,200}})));
+  Buildings.Controls.OBC.CDL.Logical.And and4 "Cool-down period"
+    annotation (Placement(transformation(extent={{20,260},{40,280}})));
+  Buildings.Controls.OBC.CDL.Logical.And and5
+    "Get the start of the warm-up time"
+    annotation (Placement(transformation(extent={{-80,150},{-60,170}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant totZon(
+    final k=numZon) "Total number of zones"
+    annotation (Placement(transformation(extent={{-340,-340},{-320,-320}})));
+  Buildings.Controls.OBC.CDL.Integers.Equal allCol
+    "Check if all zones are cold zone"
+    annotation (Placement(transformation(extent={{-280,-10},{-260,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Equal allHot
+    "Check if all zones are hot zone"
+    annotation (Placement(transformation(extent={{-280,-230},{-260,-210}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant actFreProTem(
+    final k=TZonFreProOn)
+    "Threshold temperature to activate the freeze protection mode"
+    annotation (Placement(transformation(extent={{-280,-110},{-260,-90}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant endFreProTem(
+    final k=TZonFreProOff)
+    "Threshold temperature to end the freeze protection mode"
+    annotation (Placement(transformation(extent={{-280,-150},{-260,-130}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add2(
+    final k1=-1)
+    "Calculate differential between minimum zone temperature and freeze protection threshold temperature"
+    annotation (Placement(transformation(extent={{-220,-100},{-200,-80}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add1(
+    final k2=-1)
+    "Calculate differential between maximum zone temperature and threshold temperature of ending freeze protection"
+    annotation (Placement(transformation(extent={{-220,-140},{-200,-120}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or2
+    "Enough cold zone or the low average zone temperature"
+    annotation (Placement(transformation(extent={{-160,20},{-140,40}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or7
+    "Enough hot zone or the high average zone temperature"
+    annotation (Placement(transformation(extent={{-160,-200},{-140,-180}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add3(
+    final k1=-1)
+    "Calculate the difference between maximum cool down time and the allowed maximum cool down time"
+    annotation (Placement(transformation(extent={{-300,240},{-280,260}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add4(
+    final k2=-1)
+    "Calculate the differential between maximum warm-up time and the allowed maximum warm-up time"
+    annotation (Placement(transformation(extent={{-300,140},{-280,160}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge endSetBac
+    "End setback mode when the input becomes true"
+    annotation (Placement(transformation(extent={{-160,-60},{-140,-40}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge endSetUp
+    "End setup mode when the input becomes true"
+    annotation (Placement(transformation(extent={{-160,-280},{-140,-260}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr1(
+    final  t=1) "Check if there is any zone with opening window"
+    annotation (Placement(transformation(extent={{-260,80},{-240,100}})));
+  Buildings.Controls.OBC.CDL.Integers.Add addInt6
+    "Total cold zone and zones with opening window"
+    annotation (Placement(transformation(extent={{-330,-10},{-310,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Add addInt7
+    "Total hot zone and zones with opening window"
+    annotation (Placement(transformation(extent={{-330,-230},{-310,-210}})));
 
 equation
   connect(swi.y, occMod.u)
-    annotation (Line(points={{282,280},{298,280}},
+    annotation (Line(points={{182,320},{198,320}},
       color={0,0,127}));
   connect(occModInd.y, swi.u1)
-    annotation (Line(points={{222,310},{240,310},{240,288},{258,288}},
+    annotation (Line(points={{122,350},{140,350},{140,328},{158,328}},
       color={0,0,127}, pattern=LinePattern.Dash));
   connect(unoPerInd.y, swi.u3)
-    annotation (Line(points={{122,260},{150,260},{150,272},{258,272}},
+    annotation (Line(points={{22,350},{50,350},{50,312},{158,312}},
       color={0,0,127}, pattern=LinePattern.Dash));
   connect(intGreThr.y, or1.u1)
-    annotation (Line(points={{-158,-10},{-102,-10}},
-      color={255,0,255}));
-  connect(intGreThr1.y, or1.u2)
-    annotation (Line(points={{-158,-40},{-120,-40},{-120,-18},{-102,-18}},
+    annotation (Line(points={{-258,30},{-222,30}},
       color={255,0,255}));
-  connect(or1.y, lat.u)
-    annotation (Line(points={{-78,-10},{-42,-10}},
-      color={255,0,255}));
-  connect(falEdg.y, lat.clr)
-    annotation (Line(points={{-78,-50},{-60,-50},{-60,-16},{-42,-16}},
-                  color={255,0,255}));
   connect(lat.y, booToRea3.u)
-    annotation (Line(points={{-18,-10},{58,-10}},
+    annotation (Line(points={{-78,30},{-22,30}},
       color={255,0,255}));
   connect(unoPerInd.y, swi3.u1)
-    annotation (Line(points={{122,260},{150,260},{150,-2},{158,-2}},
+    annotation (Line(points={{22,350},{50,350},{50,38},{58,38}},
       color={0,0,127}, pattern=LinePattern.Dash));
   connect(or3.y, swi3.u2)
-    annotation (Line(points={{22,30},{140,30},{140,-10},{158,-10}},
+    annotation (Line(points={{-118,70},{40,70},{40,30},{58,30}},
       color={255,0,255}));
   connect(lat1.y, booToRea4.u)
-    annotation (Line(points={{-18,-110},{58,-110}},  color={255,0,255}));
+    annotation (Line(points={{-78,-90},{-22,-90}},   color={255,0,255}));
   connect(or3.y, swi4.u2)
-    annotation (Line(points={{22,30},{140,30},{140,-110},{158,-110}},
-                     color={255,0,255}));
+    annotation (Line(points={{-118,70},{40,70},{40,-90},{58,-90}},
+      color={255,0,255}));
   connect(unoPerInd.y, swi4.u1)
-    annotation (Line(points={{122,260},{150,260},{150,-102},{158,-102}},
+    annotation (Line(points={{22,350},{50,350},{50,-82},{58,-82}},
       color={0,0,127}, pattern=LinePattern.Dash));
-  connect(or4.y, lat2.u)
-    annotation (Line(points={{-78,-210},{-42,-210}}, color={255,0,255}));
-  connect(falEdg1.y, lat2.clr)
-    annotation (Line(points={{-78,-250},{-60,-250},{-60,-216},{-42,-216}},
-                              color={255,0,255}));
   connect(lat2.y, booToRea6.u)
-    annotation (Line(points={{-18,-210},{58,-210}},
+    annotation (Line(points={{-78,-190},{-22,-190}},
       color={255,0,255}));
   connect(or3.y, swi5.u2)
-    annotation (Line(points={{22,30},{140,30},{140,-210},{158,-210}},
-                              color={255,0,255}));
+    annotation (Line(points={{-118,70},{40,70},{40,-190},{58,-190}},
+      color={255,0,255}));
   connect(unoPerInd.y, swi5.u1)
-    annotation (Line(points={{122,260},{150,260},{150,-202},{158,-202}},
+    annotation (Line(points={{22,350},{50,350},{50,-182},{58,-182}},
       color={0,0,127},  pattern=LinePattern.Dash));
   connect(swi3.y, setBacMod.u)
-    annotation (Line(points={{182,-10},{198,-10}},
+    annotation (Line(points={{82,30},{98,30}},
       color={0,0,127}));
   connect(swi4.y, freProSetBacMod.u)
-    annotation (Line(points={{182,-110},{198,-110}}, color={0,0,127}));
+    annotation (Line(points={{82,-90},{98,-90}}, color={0,0,127}));
   connect(swi5.y, setUpMod.u)
-    annotation (Line(points={{182,-210},{198,-210}},
+    annotation (Line(points={{82,-190},{98,-190}},
       color={0,0,127}));
-  connect(lat.y, or5.u1)
-    annotation (Line(points={{-18,-10},{10,-10},{10,-302},{58,-302}},
-                   color={255,0,255}));
-  connect(lat1.y, or5.u2)
-    annotation (Line(points={{-18,-110},{0,-110},{0,-310},{58,-310}},
-                              color={255,0,255}));
-  connect(lat2.y, or5.u3)
-    annotation (Line(points={{-18,-210},{20,-210},{20,-318},{58,-318}},
-                              color={255,0,255}));
   connect(or5.y, or6.u1)
-    annotation (Line(points={{82,-310},{100,-310},{100,-330},{118,-330}},
-      color={255,0,255}));
-  connect(or3.y, or6.u2)
-    annotation (Line(points={{22,30},{40,30},{40,-338},{118,-338}},
+    annotation (Line(points={{2,-340},{20,-340},{20,-360},{38,-360}},
       color={255,0,255}));
   connect(or6.y, not2.u)
-    annotation (Line(points={{142,-330},{178,-330}},
+    annotation (Line(points={{62,-360},{78,-360}},
       color={255,0,255}));
   connect(not2.y,booToInt3. u)
-    annotation (Line(points={{202,-330},{218,-330}},
-      color={255,0,255}));
-  connect(and2.y, booToInt.u)
-    annotation (Line(points={{222,220},{258,220}}, color={255,0,255}));
-  connect(and1.y, booToInt1.u)
-    annotation (Line(points={{222,180},{258,180}}, color={255,0,255}));
-  connect(and2.y, or3.u2)
-    annotation (Line(points={{222,220},{230,220},{230,100},{-20,100},{-20,30},{-2,
-          30}},
+    annotation (Line(points={{102,-360},{118,-360}},
       color={255,0,255}));
+  connect(and1.y,booToRea1. u)
+    annotation (Line(points={{42,180},{78,180}}, color={255,0,255}));
   connect(and1.y, or3.u1)
-    annotation (Line(points={{222,180},{240,180},{240,90},{-10,90},{-10,38},{-2,
-          38}},
-      color={255,0,255}));
+    annotation (Line(points={{42,180},{68,180},{68,112},{-190,112},{-190,78},
+      {-142,78}}, color={255,0,255}));
   connect(uOcc, swi.u2)
-    annotation (Line(points={{-280,330},{-220,330},{-220,280},{258,280}},
+    annotation (Line(points={{-380,370},{-350,370},{-350,320},{158,320}},
       color={255,0,255}));
   connect(uOcc, or3.u3)
-    annotation (Line(points={{-280,330},{-220,330},{-220,22},{-2,22}},
+    annotation (Line(points={{-380,370},{-350,370},{-350,62},{-142,62}},
       color={255,0,255}));
   connect(hys2.y, corCooDowTim.u2)
-    annotation (Line(points={{-78,210},{-22,210}},          color={255,0,255}));
+    annotation (Line(points={{-238,250},{-222,250}}, color={255,0,255}));
   connect(hys3.y, corWarUpTim.u2)
-    annotation (Line(points={{-78,170},{-22,170}},          color={255,0,255}));
+    annotation (Line(points={{-238,150},{-202,150}}, color={255,0,255}));
   connect(add5.y, hys4.u)
-    annotation (Line(points={{62,220},{78,220}},            color={0,0,127}));
-  connect(hys4.y, and2.u1)
-    annotation (Line(points={{102,220},{198,220}},
-      color={255,0,255}));
+    annotation (Line(points={{-138,250},{-122,250}}, color={0,0,127}));
   connect(tNexOcc, add5.u1)
-    annotation (Line(points={{-280,290},{20,290},{20,226},{38,226}},
+    annotation (Line(points={{-380,330},{-170,330},{-170,256},{-162,256}},
       color={0,0,127}));
   connect(corCooDowTim.y, add5.u2)
-    annotation (Line(points={{2,210},{30,210},{30,214},{38,214}},
+    annotation (Line(points={{-198,250},{-180,250},{-180,244},{-162,244}},
       color={0,0,127}));
   connect(tNexOcc, add6.u1)
-    annotation (Line(points={{-280,290},{20,290},{20,186},{38,186}},
+    annotation (Line(points={{-380,330},{-170,330},{-170,166},{-162,166}},
       color={0,0,127}));
   connect(corWarUpTim.y, add6.u2)
-    annotation (Line(points={{2,170},{20,170},{20,174},{38,174}},
+    annotation (Line(points={{-178,150},{-170,150},{-170,154},{-162,154}},
       color={0,0,127}));
   connect(add6.y, hys5.u)
-    annotation (Line(points={{62,180},{78,180}},            color={0,0,127}));
-  connect(hys5.y, and1.u1)
-    annotation (Line(points={{102,180},{198,180}}, color={255,0,255}));
-  connect(addPar.y, hys9.u)
-    annotation (Line(points={{-158,-110},{-142,-110}},       color={0,0,127}));
+    annotation (Line(points={{-138,160},{-122,160}}, color={0,0,127}));
   connect(hys9.y, lat1.u)
-    annotation (Line(points={{-118,-110},{-42,-110}},
-                                                    color={255,0,255}));
-  connect(addPar1.y, hys10.u)
-    annotation (Line(points={{-158,-150},{-142,-150}},
-                                                   color={0,0,127}));
+    annotation (Line(points={{-158,-90},{-102,-90}},  color={255,0,255}));
   connect(hys10.y, lat1.clr)
-    annotation (Line(points={{-118,-150},{-80,-150},{-80,-116},{-42,-116}},
+    annotation (Line(points={{-158,-130},{-120,-130},{-120,-96},{-102,-96}},
       color={255,0,255}));
-  connect(addPar2.y, hys2.u)
-    annotation (Line(points={{-118,210},{-102,210}},
-                                                   color={0,0,127}));
-  connect(addPar3.y, hys3.u)
-    annotation (Line(points={{-118,170},{-102,170}},
-                                                   color={0,0,127}));
   connect(maxWarCooTime.y, corCooDowTim.u3)
-    annotation (Line(points={{-178,190},{-60,190},{-60,202},{-22,202}},
+    annotation (Line(points={{-318,200},{-230,200},{-230,242},{-222,242}},
       color={0,0,127}));
   connect(maxWarCooTime.y, corWarUpTim.u3)
-    annotation (Line(points={{-178,190},{-60,190},{-60,162},{-22,162}},
+    annotation (Line(points={{-318,200},{-230,200},{-230,142},{-202,142}},
       color={0,0,127}));
   connect(booToRea3.y, swi3.u3)
-    annotation (Line(points={{82,-10},{100,-10},{100,-18},{158,-18}},
+    annotation (Line(points={{2,30},{30,30},{30,22},{58,22}},
       color={0,0,127}));
   connect(booToRea4.y, swi4.u3)
-    annotation (Line(points={{82,-110},{100,-110},{100,-118},{158,-118}},
+    annotation (Line(points={{2,-90},{20,-90},{20,-98},{58,-98}},
       color={0,0,127}));
   connect(booToRea6.y, swi5.u3)
-    annotation (Line(points={{82,-210},{100,-210},{100,-218},{158,-218}},
+    annotation (Line(points={{2,-190},{20,-190},{20,-198},{58,-198}},
       color={0,0,127}));
-  connect(lat3.y, and1.u2)
-    annotation (Line(points={{-78,110},{188,110},{188,172},{198,172}},
-      color={255,0,255}));
-  connect(lat4.y, and2.u2)
-    annotation (Line(points={{-78,80},{-30,80},{-30,120},{180,120},{180,212},{198,
-          212}},
-      color={255,0,255}));
-  connect(hys4.y, not3.u)
-    annotation (Line(points={{102,220},{110,220},{110,200},{118,200}},
-      color={255,0,255}));
-  connect(hys5.y, not4.u)
-    annotation (Line(points={{102,180},{110,180},{110,160},{118,160}},
-      color={255,0,255}));
-  connect(not4.y, lat3.clr)
-    annotation (Line(points={{142,160},{160,160},{160,140},{-140,140},{-140,104},
-          {-102,104}},
-                color={255,0,255}));
-  connect(not3.y, lat4.clr)
-    annotation (Line(points={{142,200},{170,200},{170,130},{-160,130},{-160,74},
-          {-102,74}},
-                color={255,0,255}));
   connect(lat1.y, not5.u)
-    annotation (Line(points={{-18,-110},{0,-110},{0,-150},{58,-150}},
+    annotation (Line(points={{-78,-90},{-50,-90},{-50,-130},{-22,-130}},
       color={255,0,255}));
   connect(not5.y, assMes.u)
-    annotation (Line(points={{82,-150},{98,-150}},   color={255,0,255}));
-  connect(maxCooDowTim, addPar2.u) annotation (Line(points={{-280,230},{-160,230},
-          {-160,210},{-142,210}}, color={0,0,127}));
-  connect(maxCooDowTim, corCooDowTim.u1) annotation (Line(points={{-280,230},{-60,
-          230},{-60,218},{-22,218}}, color={0,0,127}));
-  connect(maxWarUpTim, addPar3.u) annotation (Line(points={{-280,150},{-160,150},
-          {-160,170},{-142,170}}, color={0,0,127}));
-  connect(maxWarUpTim, corWarUpTim.u1) annotation (Line(points={{-280,150},{-40,
-          150},{-40,178},{-22,178}}, color={0,0,127}));
-  connect(occHeaHigMin, lat3.u)
-    annotation (Line(points={{-280,110},{-102,110}}, color={255,0,255}));
-  connect(maxHigOccCoo, lat4.u)
-    annotation (Line(points={{-280,80},{-102,80}}, color={255,0,255}));
-  connect(unoHeaHigMin, falEdg.u) annotation (Line(points={{-280,-70},{-120,-70},
-          {-120,-50},{-102,-50}}, color={255,0,255}));
-  connect(TZonMax, addPar.u)
-    annotation (Line(points={{-280,-110},{-182,-110}}, color={0,0,127}));
-  connect(TZonMin, addPar1.u)
-    annotation (Line(points={{-280,-150},{-182,-150}}, color={0,0,127}));
-  connect(maxHigUnoCoo, falEdg1.u) annotation (Line(points={{-280,-270},{-120,-270},
-          {-120,-250},{-102,-250}}, color={255,0,255}));
+    annotation (Line(points={{2,-130},{98,-130}},  color={255,0,255}));
+  connect(maxCooDowTim, corCooDowTim.u1) annotation (Line(points={{-380,280},{
+          -230,280},{-230,258},{-222,258}}, color={0,0,127}));
+  connect(maxWarUpTim, corWarUpTim.u1) annotation (Line(points={{-380,180},{
+          -220,180},{-220,158},{-202,158}}, color={0,0,127}));
   connect(totColZon, intGreThr.u)
-    annotation (Line(points={{-280,-10},{-182,-10}}, color={255,127,0}));
-  connect(totColZon, intGreThr1.u) annotation (Line(points={{-280,-10},{-220,-10},
-          {-220,-40},{-182,-40}}, color={255,127,0}));
+    annotation (Line(points={{-380,30},{-282,30}},   color={255,127,0}));
   connect(totHotZon, intGreThr2.u)
-    annotation (Line(points={{-280,-210},{-182,-210}}, color={255,127,0}));
-  connect(totHotZon, intGreThr3.u) annotation (Line(points={{-280,-210},{-220,
-          -210},{-220,-240},{-182,-240}},
-                                    color={255,127,0}));
+    annotation (Line(points={{-380,-190},{-282,-190}}, color={255,127,0}));
   connect(intGreThr2.y, or4.u1)
-    annotation (Line(points={{-158,-210},{-102,-210}}, color={255,0,255}));
-  connect(intGreThr3.y, or4.u2) annotation (Line(points={{-158,-240},{-120,-240},
-          {-120,-218},{-102,-218}}, color={255,0,255}));
-  connect(booToInt.y, addInt.u1) annotation (Line(points={{282,220},{290,220},{290,
-          206},{298,206}}, color={255,127,0}));
-  connect(booToInt1.y, addInt.u2) annotation (Line(points={{282,180},{290,180},{
-          290,194},{298,194}}, color={255,127,0}));
-  connect(occMod.y, addInt1.u1) annotation (Line(points={{322,280},{340,280},{340,
-          256},{358,256}}, color={255,127,0}));
-  connect(addInt.y, addInt1.u2) annotation (Line(points={{322,200},{340,200},{340,
-          244},{358,244}}, color={255,127,0}));
-  connect(setBacMod.y, addInt2.u1) annotation (Line(points={{222,-10},{230,-10},
-          {230,-74},{238,-74}}, color={255,127,0}));
-  connect(freProSetBacMod.y, addInt2.u2) annotation (Line(points={{222,-110},{230,
-          -110},{230,-86},{238,-86}}, color={255,127,0}));
-  connect(setUpMod.y, addInt3.u2) annotation (Line(points={{222,-210},{260,-210},
-          {260,-196},{278,-196}}, color={255,127,0}));
-  connect(addInt2.y, addInt3.u1) annotation (Line(points={{262,-80},{270,-80},{270,
-          -184},{278,-184}}, color={255,127,0}));
-  connect(addInt3.y, addInt4.u1) annotation (Line(points={{302,-190},{310,-190},
-          {310,-274},{318,-274}}, color={255,127,0}));
-  connect(booToInt3.y, addInt4.u2) annotation (Line(points={{242,-330},{300,-330},
-          {300,-286},{318,-286}}, color={255,127,0}));
-  connect(addInt1.y, addInt5.u1) annotation (Line(points={{382,250},{400,250},{400,
-          -14},{418,-14}}, color={255,127,0}));
-  connect(addInt4.y, addInt5.u2) annotation (Line(points={{342,-280},{400,-280},
-          {400,-26},{418,-26}}, color={255,127,0}));
+    annotation (Line(points={{-258,-190},{-222,-190}}, color={255,0,255}));
+  connect(setBacMod.y, addInt2.u1) annotation (Line(points={{122,30},{130,30},{
+          130,-34},{138,-34}},  color={255,127,0}));
+  connect(freProSetBacMod.y, addInt2.u2) annotation (Line(points={{122,-90},{
+          130,-90},{130,-46},{138,-46}}, color={255,127,0}));
+  connect(setUpMod.y, addInt3.u2) annotation (Line(points={{122,-190},{180,-190},
+          {180,-176},{198,-176}}, color={255,127,0}));
+  connect(addInt2.y, addInt3.u1) annotation (Line(points={{162,-40},{180,-40},{
+          180,-164},{198,-164}}, color={255,127,0}));
+  connect(addInt3.y, addInt4.u1) annotation (Line(points={{222,-170},{240,-170},
+          {240,-304},{258,-304}}, color={255,127,0}));
+  connect(booToInt3.y, addInt4.u2) annotation (Line(points={{142,-360},{200,
+          -360},{200,-316},{258,-316}}, color={255,127,0}));
   connect(addInt5.y, yOpeMod)
-    annotation (Line(points={{442,-20},{480,-20}}, color={255,127,0}));
-  connect(uWinSta, and3.u1)
-    annotation (Line(points={{-280,50},{258,50}}, color={255,0,255}));
-  connect(notOcc.y, and3.u2) annotation (Line(points={{222,30},{240,30},{240,42},
-          {258,42}}, color={255,0,255}));
+    annotation (Line(points={{342,2},{380,2}}, color={255,127,0}));
+  connect(notOcc.y, and3.u2) annotation (Line(points={{122,70},{140,70},{140,82},
+          {158,82}}, color={255,0,255}));
   connect(and3.y, not1.u)
-    annotation (Line(points={{282,50},{298,50}}, color={255,0,255}));
-  connect(addInt5.y, notOcc.u) annotation (Line(points={{442,-20},{450,-20},{450,
-          10},{180,10},{180,30},{198,30}}, color={255,127,0}));
+    annotation (Line(points={{182,90},{198,90}}, color={255,0,255}));
+  connect(addInt5.y, notOcc.u) annotation (Line(points={{342,2},{350,2},{350,50},
+          {80,50},{80,70},{98,70}},        color={255,127,0}));
   connect(not1.y, winOpe.u)
-    annotation (Line(points={{322,50},{338,50}}, color={255,0,255}));
+    annotation (Line(points={{222,90},{238,90}}, color={255,0,255}));
+  connect(booToRea.y, swi1.u3) annotation (Line(points={{102,270},{110,270},{
+          110,272},{138,272}}, color={0,0,127}));
+  connect(uOcc, swi1.u2) annotation (Line(points={{-380,370},{-350,370},{-350,
+          320},{120,320},{120,280},{138,280}}, color={255,0,255}));
+  connect(swi1.y, setBacMod1.u)
+    annotation (Line(points={{162,280},{178,280}}, color={0,0,127}));
+  connect(setBacMod1.y, addInt.u1) annotation (Line(points={{202,280},{220,280},
+          {220,296},{238,296}}, color={255,127,0}));
+  connect(addInt.y, addInt1.u2) annotation (Line(points={{262,290},{268,290},{
+          268,308},{274,308}}, color={255,127,0}));
+  connect(occMod.y, addInt1.u1)
+    annotation (Line(points={{222,320},{274,320}}, color={255,127,0}));
+  connect(addInt1.y, addInt5.u1) annotation (Line(points={{298,314},{306,314},{
+          306,8},{318,8}}, color={255,127,0}));
+  connect(addInt4.y, addInt5.u2) annotation (Line(points={{282,-310},{306,-310},
+          {306,-4},{318,-4}}, color={255,127,0}));
+  connect(booToRea1.y, swi2.u3) annotation (Line(points={{102,180},{110,180},{
+          110,182},{138,182}}, color={0,0,127}));
+  connect(unoPerInd.y, swi1.u1)
+    annotation (Line( points={{22,350},{50,350},{50,288},{138,288}},
+      color={0,0,127}, pattern=LinePattern.Dash));
+  connect(unoPerInd.y, swi2.u1)
+    annotation (Line(points={{22,350},{50,350},{50,198},{138,198}},
+      color={0,0,127}, pattern=LinePattern.Dash));
+  connect(swi2.y, setBacMod2.u)
+    annotation (Line(points={{162,190},{178,190}}, color={0,0,127}));
+  connect(setBacMod2.y, addInt.u2) annotation (Line(points={{202,190},{230,190},
+          {230,284},{238,284}}, color={255,127,0}));
+  connect(and4.y, booToRea.u)
+    annotation (Line(points={{42,270},{78,270}},   color={255,0,255}));
+  connect(and4.y, or3.u2) annotation (Line(points={{42,270},{60,270},{60,120},{
+          -200,120},{-200,70},{-142,70}},color={255,0,255}));
+  connect(hys4.y, and2.u1)
+    annotation (Line(points={{-98,250},{-82,250}}, color={255,0,255}));
+  connect(uOccHeaHig, and5.u2) annotation (Line(points={{-380,130},{-90,130},{
+          -90,152},{-82,152}}, color={255,0,255}));
+  connect(hys5.y, and5.u1)
+    annotation (Line(points={{-98,160},{-82,160}}, color={255,0,255}));
+  connect(truFalHol1.u, edg.y)
+    annotation (Line(points={{-22,160},{-28,160}}, color={255,0,255}));
+  connect(and5.y, edg.u)
+    annotation (Line(points={{-58,160},{-52,160}}, color={255,0,255}));
+  connect(and2.y, edg1.u)
+    annotation (Line(points={{-58,250},{-50,250}}, color={255,0,255}));
+  connect(edg1.y, truFalHol.u)
+    annotation (Line(points={{-26,250},{-22,250}},color={255,0,255}));
+  connect(lat2.y, or5.u1) annotation (Line(points={{-78,-190},{-40,-190},{-40,
+          -332},{-22,-332}}, color={255,0,255}));
+  connect(lat1.y, or5.u2) annotation (Line(points={{-78,-90},{-50,-90},{-50,
+          -340},{-22,-340}}, color={255,0,255}));
+  connect(lat.y, or5.u3) annotation (Line(points={{-78,30},{-60,30},{-60,-348},
+          {-22,-348}}, color={255,0,255}));
+  connect(or3.y, or6.u2) annotation (Line(points={{-118,70},{-70,70},{-70,-368},
+          {38,-368}}, color={255,0,255}));
+  connect(allCol.y, or1.u2) annotation (Line(points={{-258,0},{-240,0},{-240,22},
+          {-222,22}}, color={255,0,255}));
+  connect(allHot.y, or4.u2) annotation (Line(points={{-258,-220},{-240,-220},{
+          -240,-198},{-222,-198}}, color={255,0,255}));
+  connect(totZon.y, allCol.u2) annotation (Line(points={{-318,-330},{-300,-330},
+          {-300,-8},{-282,-8}},   color={255,127,0}));
+  connect(totZon.y, allHot.u2) annotation (Line(points={{-318,-330},{-300,-330},
+          {-300,-228},{-282,-228}}, color={255,127,0}));
+  connect(add2.y, hys9.u)
+    annotation (Line(points={{-198,-90},{-182,-90}},   color={0,0,127}));
+  connect(add1.y, hys10.u)
+    annotation (Line(points={{-198,-130},{-182,-130}}, color={0,0,127}));
+  connect(actFreProTem.y, add2.u2) annotation (Line(points={{-258,-100},{-240,-100},
+          {-240,-96},{-222,-96}},       color={0,0,127}));
+  connect(TZonMax, add2.u1) annotation (Line(points={{-380,-80},{-240,-80},{
+          -240,-84},{-222,-84}}, color={0,0,127}));
+  connect(TZonMin, add1.u1) annotation (Line(points={{-380,-120},{-240,-120},{
+          -240,-124},{-222,-124}}, color={0,0,127}));
+  connect(endFreProTem.y, add1.u2) annotation (Line(points={{-258,-140},{-240,-140},
+          {-240,-136},{-222,-136}},       color={0,0,127}));
+  connect(or1.y, or2.u1)
+    annotation (Line(points={{-198,30},{-162,30}}, color={255,0,255}));
+  connect(or2.y, lat.u)
+    annotation (Line(points={{-138,30},{-102,30}}, color={255,0,255}));
+  connect(uSetBac, or2.u2)
+    annotation (Line(points={{-380,-20},{-180,-20},{-180,22},{-162,22}},
+      color={255,0,255}));
+  connect(or4.y, or7.u1)
+    annotation (Line(points={{-198,-190},{-162,-190}}, color={255,0,255}));
+  connect(or7.y, lat2.u)
+    annotation (Line(points={{-138,-190},{-102,-190}}, color={255,0,255}));
+  connect(uSetUp, or7.u2)
+    annotation (Line(points={{-380,-240},{-180,-240},{-180,-198},{-162,-198}},
+      color={255,0,255}));
+  connect(uOcc, swi2.u2)
+    annotation (Line(points={{-380,370},{-350,370},{-350,320},{120,320},{120,190},
+      {138,190}}, color={255,0,255}));
+  connect(truFalHol.y, and4.u2)
+    annotation (Line(points={{2,250},{10,250},{10,262},{18,262}}, color={255,0,255}));
+  connect(hys4.y, and4.u1)
+    annotation (Line(points={{-98,250},{-90,250},{-90,270},{18,270}},
+      color={255,0,255}));
+  connect(truFalHol1.y, and1.u2)
+    annotation (Line(points={{2,160},{10,160},{10,172},{18,172}}, color={255,0,255}));
+  connect(hys5.y, and1.u1)
+    annotation (Line(points={{-98,160},{-90,160},{-90,180},{18,180}},
+      color={255,0,255}));
+  connect(uHigOccCoo, and2.u2)
+    annotation (Line(points={{-380,230},{-90,230},{-90,242},{-82,242}},
+      color={255,0,255}));
+  connect(maxWarCooTime.y, add3.u2)
+    annotation (Line(points={{-318,200},{-310,200},{-310,244},{-302,244}},
+      color={0,0,127}));
+  connect(maxWarCooTime.y, add4.u1)
+    annotation (Line(points={{-318,200},{-310,200},{-310,156},{-302,156}},
+      color={0,0,127}));
+  connect(maxWarUpTim, add4.u2)
+    annotation (Line(points={{-380,180},{-340,180},{-340,144},{-302,144}},
+      color={0,0,127}));
+  connect(maxCooDowTim, add3.u1)
+    annotation (Line(points={{-380,280},{-340,280},{-340,256},{-302,256}},
+      color={0,0,127}));
+  connect(add3.y, hys2.u)
+    annotation (Line(points={{-278,250},{-262,250}}, color={0,0,127}));
+  connect(add4.y, hys3.u)
+    annotation (Line(points={{-278,150},{-262,150}}, color={0,0,127}));
+  connect(uEndSetBac, endSetBac.u)
+    annotation (Line(points={{-380,-50},{-162,-50}}, color={255,0,255}));
+  connect(endSetBac.y, lat.clr)
+    annotation (Line(points={{-138,-50},{-120,-50},{-120,24},{-102,24}},
+      color={255,0,255}));
+  connect(uEndSetUp, endSetUp.u)
+    annotation (Line(points={{-380,-270},{-162,-270}}, color={255,0,255}));
+  connect(endSetUp.y, lat2.clr)
+    annotation (Line(points={{-138,-270},{-120,-270},{-120,-196},{-102,-196}},
+      color={255,0,255}));
+  connect(uOpeWin, intGreThr1.u)
+    annotation (Line(points={{-380,90},{-262,90}}, color={255,127,0}));
+  connect(intGreThr1.y, and3.u1)
+    annotation (Line(points={{-238,90},{158,90}}, color={255,0,255}));
+  connect(totColZon, addInt6.u2)
+    annotation (Line(points={{-380,30},{-350,30},{-350,-6},{-332,-6}}, color={255,127,0}));
+  connect(uOpeWin, addInt6.u1)
+    annotation (Line(points={{-380,90},{-340,90},{-340,6},{-332,6}}, color={255,127,0}));
+  connect(addInt6.y, allCol.u1)
+    annotation (Line(points={{-308,0},{-282,0}}, color={255,127,0}));
+  connect(totHotZon, addInt7.u2)
+    annotation (Line(points={{-380,-190},{-350,-190},{-350,-226},{-332,-226}}, color={255,127,0}));
+  connect(uOpeWin, addInt7.u1)
+    annotation (Line(points={{-380,90},{-340,90},{-340,-214},{-332,-214}}, color={255,127,0}));
+  connect(addInt7.y, allHot.u1)
+    annotation (Line(points={{-308,-220},{-282,-220}}, color={255,127,0}));
 
 annotation (
   defaultComponentName = "opeModSel",
   Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-260,-360},{460,360}}),
+        coordinateSystem(preserveAspectRatio=false, extent={{-360,-380},{360,380}}),
         graphics={
         Rectangle(
-          extent={{-258,-282},{458,-358}},
+          extent={{-358,-282},{358,-378}},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-258,-202},{458,-278}},
+          extent={{-358,-182},{358,-278}},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-258,-82},{458,-158}},
+          extent={{-358,-82},{358,-158}},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-258,-2},{458,-78}},
+          extent={{-358,38},{358,-58}},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-258,188},{458,112}},
+          extent={{-358,198},{358,122}},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-258,268},{458,192}},
+          extent={{-358,298},{358,222}},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-258,348},{458,272}},
+          extent={{-358,378},{358,312}},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Text(
-          extent={{336,332},{426,314}},
+          extent={{236,372},{326,354}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           textString="Occupied mode"),
         Text(
-          extent={{296,-32},{380,-54}},
+          extent={{158,10},{242,-12}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           textString="Setback mode"),
         Text(
-          extent={{324,-224},{396,-246}},
+          extent={{150,-226},{222,-248}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           textString="Setup mode"),
         Text(
-          extent={{314,-308},{418,-338}},
+          extent={{214,-338},{318,-368}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           textString="Unoccupied mode"),
         Text(
-          extent={{280,-114},{452,-142}},
+          extent={{180,-94},{352,-122}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           textString="Freeze protection setback mode"),
         Text(
-          extent={{250,170},{338,146}},
+          extent={{164,174},{252,150}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           textString="Warm-up mode"),
         Text(
-          extent={{188,262},{276,234}},
+          extent={{248,258},{336,230}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           textString="Cool-down mode")}),
-   Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+   Icon(coordinateSystem(extent={{-100,-160},{100,160}}),
         graphics={
         Rectangle(
-        extent={{-100,-100},{100,100}},
+        extent={{-100,-160},{100,160}},
         lineColor={0,0,127},
         fillColor={255,255,255},
         fillPattern=FillPattern.Solid),
         Text(
-          extent={{-98,80},{-52,68}},
+          extent={{-98,108},{-44,96}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="maxCooDowTim"),
         Text(
-          extent={{-98,64},{-56,54}},
+          extent={{-98,66},{-50,56}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="maxWarUpTim"),
@@ -664,145 +751,195 @@ annotation (
           pattern=LinePattern.Dash,
           textString="yOpeMod"),
         Text(
-          extent={{-120,144},{100,106}},
+          extent={{-120,200},{100,160}},
           lineColor={0,0,255},
           textString="%name"),
         Text(
-          extent={{-98,94},{-74,82}},
+          extent={{-100,128},{-68,112}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="tNexOcc"),
         Text(
-          extent={{-100,104},{-82,96}},
+          extent={{-100,144},{-82,136}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="uOcc"),
         Text(
-          extent={{-98,42},{-50,30}},
+          extent={{-98,88},{-50,76}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="occHeaHigMin"),
+          textString="uHigOccCoo"),
         Text(
-          extent={{-98,24},{-48,12}},
+          extent={{-98,46},{-48,34}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="maxHigOccCoo"),
+          textString="uOccHeaHig"),
         Text(
-          extent={{-98,-14},{-60,-24}},
+          extent={{-98,6},{-60,-4}},
           lineColor={255,127,0},
           pattern=LinePattern.Dash,
           textString="totColZon"),
         Text(
-          extent={{-98,-32},{-48,-44}},
+          extent={{-98,-34},{-52,-46}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="unoHeaHigMin"),
+          textString="uEndSetBac"),
         Text(
-          extent={{-98,-56},{-70,-64}},
+          extent={{-98,-54},{-64,-64}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonMax"),
         Text(
-          extent={{-100,-76},{-70,-84}},
+          extent={{-98,-74},{-64,-84}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonMin"),
         Text(
-          extent={{-98,-96},{-66,-104}},
+          extent={{-98,-94},{-62,-104}},
           lineColor={255,127,0},
           pattern=LinePattern.Dash,
           textString="totHotZon"),
         Text(
-          extent={{-98,-112},{-48,-124}},
+          extent={{-98,-134},{-52,-146}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="maxHigUnoCoo"),
+          textString="uEndSetUp"),
         Text(
-          visible=have_winSen,
-          extent={{-98,8},{-68,-4}},
+          extent={{-98,-14},{-66,-26}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="uWinSta")}),
+          textString="uSetBac"),
+        Text(
+          extent={{-98,-114},{-66,-126}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="uSetUp"),
+        Text(
+          extent={{-100,26},{-62,16}},
+          lineColor={255,127,0},
+          pattern=LinePattern.Dash,
+          textString="uOpeWin")}),
    Documentation(info="<html>
 <p>
-This block outputs VAV system operation mode. It is implemented according to
-ASHRAE guideline G36, PART 5.C.6 (zone group operating modes).
-The block has the modes listed below.
+This block outputs VAV system operating mode. It is implemented according to
+ASHRAE guideline G36, section 5.4.3, section 5.4.4, section 5.4.5 and section 5.4.6.
+</p>
+<p>
+Note that, from the user's point of view, schedules can be a set for individual zones,
+or they can be set for an entire zone group, depending on how the user interface is
+implemented. From the point of view of the BAS, individual zone schedules are
+superimposed to create a zone-group schedule, which then drives system behavior.
 </p>
-<h4>Occupied Mode</h4>
+<ol>
+<li>
+All zones in each zone group shall be in the same zone-group operating mode. If one
+zone in a zone group is placed in any zone-group operating mode other than unoccupied
+mode (due to override, sequence logic, or scheduled occupancy), all zones in that
+group shall enter that mode.
+</li>
+<li>
+A zone group may be in only one mode at a given time.
+</li>
+</ol>
 <p>
-A Zone Group is in the <i>occupied mode</i> when
+Each zone group shall have the operating modes shown below.
+</p>
+<h5>Occupied Mode</h5>
+<p>
+A zone group is in the <i>occupied mode</i> when
 occupancy input <code>uOcc</code> is true. This input shall be retrieved from
 other sequences that specifies occupancy variation and time remaining to the
-next occupied period <code>tNexOcc</code>.
+next occupied period <code>tNexOcc</code>. A zone group could be in the occupied
+mode when any of the following is true:
 </p>
-<h4>Warmup Mode</h4>
+<ul>
+<li>
+The time of day is between the zone group's scheduled occupied start and stop times.
+</li>
+<li>
+The schedules have been overriden by the occupant override system.
+</li>
+<li>
+Any zone local override timer is nonzero.
+</li>
+</ul>
+<h5>Warm-up Mode</h5>
 <p>
-Warmup mode shall start based on the zone with the longest calculated warm up
-time <code>warUpTim</code> requirement, but no earlier than 3 hours before
-the start of the scheduled occupied period, and shall end at the scheduled
-occupied start time. Zones where the window switch indicates that a window
-is open shall be ignored. Note that for each zone, the optimal warm-up time
-<code>warUpTim</code> shall be obtained from an <i>Optimal Start</i>
-sequences, computed in a separate block.
-The figure below shows the sequence.
+Warm-up mode shall start based on the zone with the longest calculated warm-up
+time <code>maxWarUpTim</code> requirement, but no earlier than 3 hours
+(<code>preWarCooTim</code>) before the start of the scheduled occupied period,
+and shall end at the scheduled occupied start time. Zones where the window switch
+indicates that a window is open shall be ignored. Note that for each zone, 
+the optimal warm-up time shall be obtained from an <i>Optimal Start</i> sequences,
+computed in a separate block. The figure below shows the sequence.
 </p>
 <p align=\"center\">
 <img alt=\"Image of warm-up mode definition\"
 src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Warm-upModeDefinition.png\"/>
 </p>
-<h4>Cool-Down Mode</h4>
+<h5>Cooldown Mode</h5>
 <p>
-Cool-down mode shall start based on the zone with the longest calculated
-cool-down time <code>cooDowTim</code> requirement, but no earlier than 3 hours
-before the start of the scheduled occupied period, and shall end at the
-scheduled occupied start time. Zones where the window switch indicates that a
-window is open shall be ignored. Note that the each zone <code>cooDowTim</code>
-shall be obtained from an <i>Optimal Start</i> sequences, computed in a
-separate block.
+Cooldown mode shall start based on the zone with the longest calculated
+cooldown time <code>maxCooDowTim</code> requirement, but no earlier than 3 hours
+(<code>preWarCooTim</code>) before the start of the scheduled occupied period,
+and shall end at the scheduled occupied start time. Zones where the window switch
+indicates that a window is open shall be ignored. Note that for each zone,
+the optimal cooldown time shall be obtained from an <i>Optimal Start</i> sequences,
+computed in a separate block.
 </p>
 <p align=\"center\">
 <img alt=\"Image of cool-down mode definition\"
 src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.png\"/>
 </p>
-<h4>Setback Mode</h4>
+<h5>Setback Mode</h5>
 <p>
 During <i>unoccupied mode</i>, if any 5 zones (or all zones, if fewer than 5)
-in the zone group fall below their unoccupied heating setpoints
-<code>TZonHeaSetUno</code>, the zone group shall enter <i>setback mode</i> until
-all spaces in the zone group are <i>1.1</i> &deg;C (<i>2</i> &deg;F) above their
-unoccupied setpoints.
+in the zone group fall below their unoccupied heating setpoints, or if the average
+zone temperature of the zone group falls below the average unoccupied heating setpoint
+(<code>uSetBac</code> becomes true), the zone group shall enter <i>setback mode</i> until
+all spaces in the zone group are <i>1</i> &deg;C (<i>2</i> &deg;F) above their
+unoccupied setpoints (<code>uEndSetBac</code> becomes true).
 </p>
 <p align=\"center\">
 <img alt=\"Image of setback mode definition\"
 src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.png\"/>
 </p>
-<h4>Freeze Protection Setback Mode</h4>
+<h5>Freeze Protection Setback Mode</h5>
 <p>
-During <i>unoccupied Mode</i>, if any single zone falls below <i>4.4</i> &deg;C
+During <i>unoccupied Mode</i>, if any single zone falls below <i>4</i> &deg;C
 (<i>40</i> &deg;F), the zone group shall enter <i>setback mode</i> until all zones
-are above <i>7.2</i> &deg;C (<i>45</i> &deg;F), and a Level 3 alarm
-<code>yFreProSta</code> shall be set.
+are above <i>7</i> &deg;C (<i>45</i> &deg;F), and a Level 3 alarm shall be set.
 </p>
-<h4>Setup Mode</h4>
+<h5>Setup Mode</h5>
 <p>
 During <i>unoccupied mode</i>, if any 5 zones (or all zones, if fewer than 5)
-in the zone group rise above their unoccupied cooling setpoints <code>TZonCooSetUno</code>,
-the zone group shall enter <i>setup mode</i> until all spaces in the zone group
-are <i>1.1</i> &deg;C (<i>2</i> &deg;F) below their unoccupied setpoints. Zones
-where the window switch indicates that a window is open shall be ignored.
+in the zone group rise above their unoccupied cooling setpoints, or if the average
+zone temperature of the zone group rises above the average unoccupied cooling setpoint
+(<code>uSetUp</code> becomes true), the zone group shall enter <i>setup mode</i> until
+all spaces in the zone group are <i>1</i> &deg;C (<i>2</i> &deg;F) below their
+unoccupied setpoints. Zones where the window switch indicates that a window is
+open shall be ignored.
 </p>
 <p align=\"center\">
 <img alt=\"Image of setup mode definition\"
 src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.png\"/>
 </p>
-<h4>Unoccupied Mode</h4>
+<h5>Unoccupied Mode</h5>
 <p>
 <i>Unoccupied mode</i> shall be active if the zone group is not in any other mode.
 </p>
 </html>",revisions="<html>
 <ul>
 <li>
+June 15, 2020, by Jianjun Hu:<br/>
+Upgraded the sequence according to ASHRAE Guideline 36, May 2020 version.
+</li>
+<li>
+April 29, 2020, by Kun Zhang:<br/>
+Fixed bug related to activation of warm-up and cool down mode.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">#1893</a>.
+</li>
+<li>
 March 09, 2020, by Jianjun Hu:<br/>
 Reimplemented to remove the vector-valued calculations.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo
index 42a2f16f91b..2d2f868dac3 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/TrimAndRespond.mo
@@ -36,7 +36,7 @@ block TrimAndRespond "Block to inplement trim and respond logic"
     final delayOnInit=true)
     "Send an on signal after some delay time"
     annotation (Placement(transformation(extent={{-200,160},{-180,180}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greThr
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr
     "Check if the real requests is more than ignored requests setting"
     annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
   Buildings.Controls.OBC.CDL.Logical.Switch netRes "Net setpoint reset value"
@@ -72,13 +72,13 @@ block TrimAndRespond "Block to inplement trim and respond logic"
     final samplePeriod=samplePeriod)
     "Sample number of requests"
     annotation (Placement(transformation(extent={{-160,-60},{-140,-40}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold lesEquThr1
+  Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1
     "Check if trim and response amount have same sign"
     annotation (Placement(transformation(extent={{-120,-110},{-100,-90}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2
     "Check if trim and response amount have opposite sign"
     annotation (Placement(transformation(extent={{-120,-180},{-100,-160}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr1
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1
     "Check if response amount have positive sign"
     annotation (Placement(transformation(extent={{20,-160},{40,-140}})));
   Buildings.Controls.OBC.CDL.Continuous.Gain gai(
@@ -237,9 +237,9 @@ equation
   connect(resAmoCon.y, pro1.u2)
     annotation (Line(points={{-178,-130},{-170,-130},{-170,-106},{-162,-106}},
       color={0,0,127}));
-  connect(pro1.y, lesEquThr1.u)
+  connect(pro1.y, lesThr1.u)
     annotation (Line(points={{-138,-100},{-122,-100}}, color={0,0,127}));
-  connect(lesEquThr1.y, assMes.u)
+  connect(lesThr1.y, assMes.u)
     annotation (Line(points={{-98,-100},{-82,-100}}, color={255,0,255}));
   connect(resAmoCon.y, pro2.u1)
     annotation (Line(points={{-178,-130},{-170,-130},{-170,-164},{-162,-164}},
@@ -247,9 +247,9 @@ equation
   connect(maxResCon.y, pro2.u2)
     annotation (Line(points={{-178,-200},{-170,-200},{-170,-176},{-162,-176}},
       color={0,0,127}));
-  connect(pro2.y, greEquThr.u)
+  connect(pro2.y, greThr2.u)
     annotation (Line(points={{-138,-170},{-122,-170}}, color={0,0,127}));
-  connect(greEquThr.y, assMes2.u)
+  connect(greThr2.y, assMes2.u)
     annotation (Line(points={{-98,-170},{-82,-170}}, color={255,0,255}));
   connect(resAmoCon.y, abs.u)
     annotation (Line(points={{-178,-130},{-122,-130}}, color={0,0,127}));
@@ -264,10 +264,9 @@ equation
   connect(minInp.y, swi3.u1)
     annotation (Line(points={{42,-120},{60,-120},{60,-142},{118,-142}},
       color={0,0,127}));
-  connect(resAmoCon.y, greEquThr1.u)
-    annotation (Line(points={{-178,-130},{-170,-130},{-170,-150},{18,-150}},
-      color={0,0,127}));
-  connect(greEquThr1.y, swi3.u2)
+  connect(resAmoCon.y, greThr1.u) annotation (Line(points={{-178,-130},{-170,-130},
+          {-170,-150},{18,-150}}, color={0,0,127}));
+  connect(greThr1.y, swi3.u2)
     annotation (Line(points={{42,-150},{118,-150}}, color={255,0,255}));
   connect(netRes.y, add1.u2)
     annotation (Line(points={{182,-30},{200,-30},{200,36},{-60,36},{-60,94},{-42,
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo
index a3f89733dfb..2d85976c23b 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mo
@@ -1,236 +1,154 @@
 within Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation;
 model OperationMode "Validate block for selecting operation mode"
 
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+    opeModSel(final numZon=1)
+    "Operation mode selection"
+    annotation (Placement(transformation(extent={{120,84},{140,116}})));
+
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
-    final offset=0,
     final height=6.2831852,
-    final duration=24*3600) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-100,-80},{-80,-60}})));
+    final duration=172800)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-140,40},{-120,60}})));
   Buildings.Controls.OBC.CDL.Continuous.Sin sin1
     "Block that outputs the sine of the input"
-    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(
-    final k=12.5, final p=273.15 + 22.5) "Zone temperarure"
-    annotation (Placement(transformation(extent={{-20,-80},{0,-60}})));
+    annotation (Placement(transformation(extent={{-100,40},{-80,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem(
+    final k=14.5,
+    final p=295.65) "Zone temperarure"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetUno(
-    final k=273.15 + 12)  "Unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{-60,-170},{-40,-150}})));
+    final k=285.15)  "Unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-100,-40},{-80,-20}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetUno(
-    final k=273.15 + 30)  "Unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-60,-210},{-40,-190}})));
+    final k=303.15)  "Unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc(
-    final k=273.15 + 20)  "Occupied heating setpoint"
-    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
+    final k=293.15)  "Occupied heating setpoint"
+    annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc(
-    final k=273.15 + 24)  "Occupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
+    final k=297.15)  "Occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim(
     final k=1800) "Warm-up time"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+    annotation (Placement(transformation(extent={{-100,100},{-80,120}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim(
     final k=1800) "Cooling down time"
-    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant uWinSta(final k=false)
-    "Window on/off status"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={-50,-130})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable occTim(
-    final table=[0,0; occSta,1; occEnd,0; 24*3600,0],
-    final smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
-    annotation (Placement(transformation(extent={{-140,50},{-120,70}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.ModelTime modTim
-    annotation (Placement(transformation(extent={{-160,230},{-140,250}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(
-    final k=24*3600) "One day in second"
-    annotation (Placement(transformation(extent={{-160,130},{-140,150}})));
-  Buildings.Controls.OBC.CDL.Continuous.Division div
-    "Output first input divided by second input"
-    annotation (Placement(transformation(extent={{-120,210},{-100,230}})));
-  Buildings.Controls.OBC.CDL.Continuous.Round rou(final n=0)
-    "Round real number to 0 digit"
-    annotation (Placement(transformation(extent={{-80,210},{-60,230}})));
-  Buildings.Controls.OBC.CDL.Continuous.Gain gai(k=24*3600)
-    "Begin time of each day"
-    annotation (Placement(transformation(extent={{-40,210},{-20,230}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessEqual lesEqu
-    "Check if it is beginning of next day"
-    annotation (Placement(transformation(extent={{0,210},{20,230}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(
-    final p=-1, final k=1) "Add parameter"
-    annotation (Placement(transformation(extent={{-40,180},{-20,200}})));
-  Buildings.Controls.OBC.CDL.Continuous.Gain gai1(final k=24*3600) "Begin of day"
-    annotation (Placement(transformation(extent={{0,180},{20,200}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swi "Beginning of current day"
-    annotation (Placement(transformation(extent={{40,210},{60,230}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add curTim(final k2=-1) "Current time "
-    annotation (Placement(transformation(extent={{80,230},{100,250}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add2(final k2=-1)
-    "Left time to beginning of current day occupancy "
-    annotation (Placement(transformation(extent={{80,150},{100,170}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant occStaTim(
-    final k=occSta) "Occupancy start"
-    annotation (Placement(transformation(extent={{-140,90},{-120,110}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add1(final k2=-1)
-    "Left time to the end of current day"
-    annotation (Placement(transformation(extent={{0,130},{20,150}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2(
-    final p=occSta, final k=1)
-    "Left time to next occupancy"
-    annotation (Placement(transformation(extent={{40,130},{60,150}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessEqual lesEqu1
-    "Check if current time has already passed occupancy start time"
-    annotation (Placement(transformation(extent={{0,90},{20,110}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swi1 "Time to next occupancy"
-    annotation (Placement(transformation(extent={{120,90},{140,110}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold occ(
-    final threshold=0.5) "Occupied status"
-    annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode opeModSel(final
-      have_winSen=true, final numZon=1) "Operation mode selection"
-    annotation (Placement(transformation(extent={{130,0},{150,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu
-    "True when zone occupied heating setpoint temperature is larger than zone temperature"
-    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu1
-    "True when zone occupied heating setpoint temperature is larger than zone temperature"
-    annotation (Placement(transformation(extent={{40,-100},{60,-80}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu2
+    annotation (Placement(transformation(extent={{-140,120},{-120,140}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant cloWin(
+    final k=0) "No window is open"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-130,0})));
+  Buildings.Controls.OBC.CDL.Continuous.Greater lowThaHeaSet
+    "True when the zone temperature is lower than the occupied heating setpoint"
+    annotation (Placement(transformation(extent={{0,70},{20,90}})));
+  Buildings.Controls.OBC.CDL.Continuous.Greater higThaCooSet
+    "True when the zone temperature is higher than the occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{0,20},{20,40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Greater greEqu2
     "True when the zone temperature is lower than unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{40,-170},{60,-150}})));
+    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt "Convert boolean to integer"
-    annotation (Placement(transformation(extent={{80,-170},{100,-150}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu3
+    annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Greater greEqu3
     "True when the zone temperature is lower than unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{40,-210},{60,-190}})));
+    annotation (Placement(transformation(extent={{0,-110},{20,-90}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer"
-    annotation (Placement(transformation(extent={{80,-210},{100,-190}})));
-
-protected
-  final parameter Real occSta(
-    final unit="s",
-    final quantity="Time") = 7*3600 "Occupancy start time";
-  final parameter Real occEnd(
-    final unit="s",
-    final quantity="Time") =  19*3600 "Occupancy end time";
+    annotation (Placement(transformation(extent={{40,-110},{60,-90}})));
+  Buildings.Controls.SetPoints.OccupancySchedule occSch "Occupancy schedule"
+    annotation (Placement(transformation(extent={{-100,140},{-80,160}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add3(
+    final k2=-1)
+    "Calculate zone temperature difference to unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{0,-70},{20,-50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys3(
+    final uLow=-0.5,
+    final uHigh=0.5)
+    "Hysteresis that outputs if the zone temperature is higher than its unoccupied heating setpoint by a given limit"
+    annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add1(
+    final k1=-1)
+    "Calculate zone temperature difference to unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{0,-150},{20,-130}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1(
+    final uLow=-0.5,
+    final uHigh=0.5)
+    "Hysteresis that outputs if the zone temperature is lower than its unoccupied cooling setpoint by a given limit"
+    annotation (Placement(transformation(extent={{40,-150},{60,-130}})));
 
 equation
   connect(ramp1.y, sin1.u)
-    annotation (Line(points={{-78,-70},{-62,-70}}, color={0,0,127}));
-  connect(sin1.y, addPar.u)
-    annotation (Line(points={{-38,-70},{-22,-70}},color={0,0,127}));
-  connect(modTim.y, div.u1)
-    annotation (Line(points={{-138,240},{-130,240},{-130,226},{-122,226}},
-      color={0,0,127}));
-  connect(con.y, div.u2)
-    annotation (Line(points={{-138,140},{-130,140},{-130,214},{-122,214}}, color={0,0,127}));
-  connect(div.y, rou.u)
-    annotation (Line(points={{-98,220},{-82,220}}, color={0,0,127}));
-  connect(rou.y, gai.u)
-    annotation (Line(points={{-58,220},{-42,220}}, color={0,0,127}));
-  connect(gai.y, lesEqu.u1)
-    annotation (Line(points={{-18,220},{-2,220}}, color={0,0,127}));
-  connect(modTim.y, lesEqu.u2)
-    annotation (Line(points={{-138,240},{-10,240},{-10,212},{-2,212}}, color={0,0,127}));
-  connect(rou.y, addPar1.u)
-    annotation (Line(points={{-58,220},{-50,220},{-50,190},{-42,190}}, color={0,0,127}));
-  connect(addPar1.y, gai1.u)
-    annotation (Line(points={{-18,190},{-2,190}}, color={0,0,127}));
-  connect(lesEqu.y, swi.u2)
-    annotation (Line(points={{22,220},{38,220}}, color={255,0,255}));
-  connect(gai.y, swi.u1)
-    annotation (Line(points={{-18,220},{-14,220},{-14,250},{30,250},{30,228},{38,
-          228}}, color={0,0,127}));
-  connect(gai1.y, swi.u3)
-    annotation (Line(points={{22,190},{30,190},{30,212},{38,212}}, color={0,0,127}));
-  connect(modTim.y, curTim.u1)
-    annotation (Line(points={{-138,240},{-10,240},{-10,246},{78,246}}, color={0,0,127}));
-  connect(swi.y, curTim.u2)
-    annotation (Line(points={{62,220},{70,220},{70,234},{78,234}}, color={0,0,127}));
-  connect(occStaTim.y, add2.u1)
-    annotation (Line(points={{-118,100},{-100,100},{-100,166},{78,166}},
-                                                                     color={0,0,127}));
-  connect(con.y, add1.u1)
-    annotation (Line(points={{-138,140},{-130,140},{-130,146},{-2,146}},
-                                                                     color={0,0,127}));
-  connect(add1.y, addPar2.u)
-    annotation (Line(points={{22,140},{38,140}},
-                                               color={0,0,127}));
-  connect(occStaTim.y, lesEqu1.u2)
-    annotation (Line(points={{-118,100},{-100,100},{-100,92},{-2,92}},
-                                                                     color={0,0,127}));
-  connect(curTim.y, lesEqu1.u1)
-    annotation (Line(points={{102,240},{140,240},{140,120},{-20,120},{-20,100},{
-          -2,100}},
-                color={0,0,127}));
-  connect(lesEqu1.y, swi1.u2)
-    annotation (Line(points={{22,100},{118,100}},
-                                                color={255,0,255}));
-  connect(add2.y, swi1.u1)
-    annotation (Line(points={{102,160},{110,160},{110,108},{118,108}},
-                                                                   color={0,0,127}));
-  connect(addPar2.y, swi1.u3)
-    annotation (Line(points={{62,140},{100,140},{100,92},{118,92}},
-                                                                  color={0,0,127}));
-  connect(occTim.y[1], occ.u)
-    annotation (Line(points={{-118,60},{-102,60}},   color={0,0,127}));
-  connect(curTim.y, add2.u2)
-    annotation (Line(points={{102,240},{140,240},{140,180},{60,180},{60,154},{78,
-          154}},color={0,0,127}));
-  connect(curTim.y, add1.u2)
-    annotation (Line(points={{102,240},{140,240},{140,120},{-20,120},{-20,134},{
-          -2,134}},
-                color={0,0,127}));
-  connect(occ.y, opeModSel.uOcc) annotation (Line(points={{-78,60},{80,60},{80,
-          22},{128,22}}, color={255,0,255}));
-  connect(swi1.y, opeModSel.tNexOcc) annotation (Line(points={{142,100},{150,
-          100},{150,40},{72,40},{72,20},{128,20}}, color={0,0,127}));
-  connect(cooDowTim.y, opeModSel.maxCooDowTim) annotation (Line(points={{-38,30},
-          {64,30},{64,18},{128,18}}, color={0,0,127}));
-  connect(warUpTim.y, opeModSel.maxWarUpTim) annotation (Line(points={{-38,0},{
-          -20,0},{-20,16},{128,16}}, color={0,0,127}));
-  connect(TZonHeaSetOcc.y, greEqu.u1)
-    annotation (Line(points={{-38,-40},{38,-40}}, color={0,0,127}));
-  connect(addPar.y, greEqu.u2) annotation (Line(points={{2,-70},{20,-70},{20,-48},
-          {38,-48}}, color={0,0,127}));
-  connect(greEqu.y, opeModSel.occHeaHigMin) annotation (Line(points={{62,-40},{
-          70,-40},{70,14},{128,14}}, color={255,0,255}));
-  connect(addPar.y, greEqu1.u1) annotation (Line(points={{2,-70},{20,-70},{20,-90},
-          {38,-90}}, color={0,0,127}));
-  connect(TZonCooSetOcc.y, greEqu1.u2) annotation (Line(points={{-38,-100},{0,-100},
-          {0,-98},{38,-98}}, color={0,0,127}));
-  connect(greEqu1.y, opeModSel.maxHigOccCoo) annotation (Line(points={{62,-90},
-          {74,-90},{74,12},{128,12}}, color={255,0,255}));
-  connect(uWinSta.y, opeModSel.uWinSta) annotation (Line(points={{-38,-130},{78,
-          -130},{78,10},{128,10}}, color={255,0,255}));
+    annotation (Line(points={{-118,50},{-102,50}}, color={0,0,127}));
+  connect(sin1.y,zonTem. u)
+    annotation (Line(points={{-78,50},{-62,50}},  color={0,0,127}));
+  connect(cooDowTim.y, opeModSel.maxCooDowTim) annotation (Line(points={{-118,130},
+          {30,130},{30,110},{118,110}}, color={0,0,127}));
+  connect(warUpTim.y, opeModSel.maxWarUpTim) annotation (Line(points={{-78,110},
+          {-60,110},{-60,106},{118,106}}, color={0,0,127}));
+  connect(TZonHeaSetOcc.y, lowThaHeaSet.u1)
+    annotation (Line(points={{-118,80},{-2,80}}, color={0,0,127}));
+  connect(zonTem.y, lowThaHeaSet.u2) annotation (Line(points={{-38,50},{-20,50},
+          {-20,72},{-2,72}}, color={0,0,127}));
+  connect(zonTem.y, higThaCooSet.u1) annotation (Line(points={{-38,50},{-20,50},
+          {-20,30},{-2,30}}, color={0,0,127}));
+  connect(TZonCooSetOcc.y, higThaCooSet.u2) annotation (Line(points={{-78,20},{-40,
+          20},{-40,22},{-2,22}}, color={0,0,127}));
   connect(TZonHeaSetUno.y, greEqu2.u1)
-    annotation (Line(points={{-38,-160},{38,-160}}, color={0,0,127}));
-  connect(addPar.y, greEqu2.u2) annotation (Line(points={{2,-70},{20,-70},{20,-168},
-          {38,-168}}, color={0,0,127}));
+    annotation (Line(points={{-78,-30},{-2,-30}},   color={0,0,127}));
+  connect(zonTem.y, greEqu2.u2) annotation (Line(points={{-38,50},{-20,50},{-20,
+          -38},{-2,-38}}, color={0,0,127}));
   connect(greEqu2.y, booToInt.u)
-    annotation (Line(points={{62,-160},{78,-160}}, color={255,0,255}));
-  connect(booToInt.y, opeModSel.totColZon) annotation (Line(points={{102,-160},
-          {108,-160},{108,8},{128,8}}, color={255,127,0}));
-  connect(greEqu2.y, opeModSel.unoHeaHigMin) annotation (Line(points={{62,-160},
-          {70,-160},{70,-140},{100,-140},{100,6},{128,6}}, color={255,0,255}));
-  connect(addPar.y, opeModSel.TZonMax) annotation (Line(points={{2,-70},{82,-70},
-          {82,4},{128,4}}, color={0,0,127}));
-  connect(addPar.y, opeModSel.TZonMin) annotation (Line(points={{2,-70},{82,-70},
-          {82,2},{128,2}}, color={0,0,127}));
-  connect(addPar.y, greEqu3.u1) annotation (Line(points={{2,-70},{20,-70},{20,-200},
-          {38,-200}}, color={0,0,127}));
-  connect(TZonCooSetUno.y, greEqu3.u2) annotation (Line(points={{-38,-200},{0,-200},
-          {0,-208},{38,-208}}, color={0,0,127}));
+    annotation (Line(points={{22,-30},{38,-30}},   color={255,0,255}));
+  connect(booToInt.y, opeModSel.totColZon) annotation (Line(points={{62,-30},{76,
+          -30},{76,100},{118,100}}, color={255,127,0}));
+  connect(zonTem.y, opeModSel.TZonMax) annotation (Line(points={{-38,50},{58,50},
+          {58,94},{118,94}}, color={0,0,127}));
+  connect(zonTem.y, opeModSel.TZonMin) annotation (Line(points={{-38,50},{64,50},
+          {64,92},{118,92}}, color={0,0,127}));
+  connect(zonTem.y, greEqu3.u1) annotation (Line(points={{-38,50},{-20,50},{-20,
+          -100},{-2,-100}}, color={0,0,127}));
+  connect(TZonCooSetUno.y, greEqu3.u2) annotation (Line(points={{-78,-100},{-40,
+          -100},{-40,-108},{-2,-108}}, color={0,0,127}));
   connect(greEqu3.y, booToInt1.u)
-    annotation (Line(points={{62,-200},{78,-200}}, color={255,0,255}));
-  connect(greEqu3.y, opeModSel.maxHigUnoCoo) annotation (Line(points={{62,-200},
-          {70,-200},{70,-180},{120,-180},{120,-2},{128,-2}}, color={255,0,255}));
-  connect(booToInt1.y, opeModSel.totHotZon) annotation (Line(points={{102,-200},
-          {114,-200},{114,0},{128,0}}, color={255,127,0}));
+    annotation (Line(points={{22,-100},{38,-100}}, color={255,0,255}));
+  connect(booToInt1.y, opeModSel.totHotZon) annotation (Line(points={{62,-100},{
+          88,-100},{88,90},{118,90}},  color={255,127,0}));
+  connect(occSch.occupied, opeModSel.uOcc) annotation (Line(points={{-79,144},{100,
+          144},{100,114},{118,114}}, color={255,0,255}));
+  connect(occSch.tNexOcc, opeModSel.tNexOcc) annotation (Line(points={{-79,156},
+          {96,156},{96,112},{118,112}}, color={0,0,127}));
+  connect(higThaCooSet.y, opeModSel.uHigOccCoo) annotation (Line(points={{22,30},
+          {50,30},{50,108},{118,108}}, color={255,0,255}));
+  connect(lowThaHeaSet.y, opeModSel.uOccHeaHig) annotation (Line(points={{22,80},
+          {46,80},{46,104},{118,104}}, color={255,0,255}));
+  connect(cloWin.y, opeModSel.uOpeWin) annotation (Line(points={{-118,0},{54,0},
+          {54,102},{118,102}}, color={255,127,0}));
+  connect(greEqu2.y, opeModSel.uSetBac) annotation (Line(points={{22,-30},{30,-30},
+          {30,-10},{70,-10},{70,98},{118,98}}, color={255,0,255}));
+  connect(greEqu3.y, opeModSel.uSetUp) annotation (Line(points={{22,-100},{30,-100},
+          {30,-80},{94,-80},{94,88},{118,88}}, color={255,0,255}));
+  connect(zonTem.y, add3.u1) annotation (Line(points={{-38,50},{-20,50},{-20,-54},
+          {-2,-54}}, color={0,0,127}));
+  connect(TZonHeaSetUno.y, add3.u2) annotation (Line(points={{-78,-30},{-40,-30},
+          {-40,-66},{-2,-66}}, color={0,0,127}));
+  connect(add3.y, hys3.u)
+    annotation (Line(points={{22,-60},{38,-60}}, color={0,0,127}));
+  connect(hys3.y, opeModSel.uEndSetBac) annotation (Line(points={{62,-60},{82,-60},
+          {82,96},{118,96}}, color={255,0,255}));
+  connect(zonTem.y, add1.u1) annotation (Line(points={{-38,50},{-20,50},{-20,-134},
+          {-2,-134}}, color={0,0,127}));
+  connect(TZonCooSetUno.y, add1.u2) annotation (Line(points={{-78,-100},{-40,-100},
+          {-40,-146},{-2,-146}}, color={0,0,127}));
+  connect(add1.y, hys1.u)
+    annotation (Line(points={{22,-140},{38,-140}}, color={0,0,127}));
+  connect(hys1.y, opeModSel.uEndSetUp) annotation (Line(points={{62,-140},{100,-140},
+          {100,86},{118,86}}, color={255,0,255}));
 
 annotation (
-  experiment(StopTime=86400, Tolerance=1e-6),
+  experiment(StopTime=172800, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos"
         "Simulate and plot"),
-    Documentation(info="<html>
+  Documentation(info="<html>
 <p>
 This example validates
 <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode\">
@@ -240,6 +158,11 @@ for a change of zone temperature and occupancy schedule.
 </html>", revisions="<html>
 <ul>
 <li>
+April 29, 2020, by Kun Zhang:<br/>
+Changed zone temperature profile to showcase warm-up and cool down mode.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">#1893</a>.
+</li>
+<li>
 March 21, 2019, by Jianjun Hu:<br/>
 Reimplemented occupancy schedule block to avoid use block that is not in CDL. 
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1389\">issue 1389</a>.
@@ -250,8 +173,8 @@ First implementation.
 </li>
 </ul>
 </html>"),
-    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
-         graphics={
+  Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+     graphics={
         Ellipse(lineColor = {75,138,73},
                 fillColor={255,255,255},
                 fillPattern = FillPattern.Solid,
@@ -261,5 +184,5 @@ First implementation.
                 pattern = LinePattern.None,
                 fillPattern = FillPattern.Solid,
                 points = {{-36,60},{64,0},{-36,-60},{-36,60}})}),
-    Diagram(coordinateSystem(extent={{-160,-280},{160,280}})));
+  Diagram(coordinateSystem(extent={{-160,-160},{160,180}})));
 end OperationMode;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo
index ab5439c2a66..ad939a829e2 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mo
@@ -2,133 +2,59 @@ within Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation;
 model ZoneStatus
   "Validate block for checking temperatures in the zone"
 
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus noWinZonSta
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus noWinZonSta(
+    final have_winSen=false)
     "Status of zone when there is no window operation sensor"
-    annotation (Placement(transformation(extent={{120,120},{140,140}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus
-    witWinZonSta(final have_winSen=true)
+    annotation (Placement(transformation(extent={{60,60},{80,88}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus witWinZonSta(
+    final have_winSen=true)
     "Status of zone when there is window operation sensor"
-    annotation (Placement(transformation(extent={{120,40},{140,60}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
-    final offset=0,
-    final height=6.2831852,
-    final duration=24*3600) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sin sin1
-    "Block that outputs the sine of the input"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter maxZonTem(final k=13.5,
-      final p=273.15 + 22.5) "Maximum zone temperature in the group"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetUno(
-    final k=273.15 + 12)  "Unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{0,-120},{20,-100}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetUno(
-    final k=273.15 + 30)  "Unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{0,-160},{20,-140}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc(
-    final k=273.15 + 20)  "Occupied heating setpoint"
-    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc(
-    final k=273.15 + 24)  "Occupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+    annotation (Placement(transformation(extent={{60,-20},{80,8}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim(
     final k=1800) "Warm-up time"
-    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
+    annotation (Placement(transformation(extent={{-80,10},{-60,30}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim(
     final k=1800) "Cooling down time"
-    annotation (Placement(transformation(extent={{-80,120},{-60,140}})));
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse uWinSta(
-<<<<<<< HEAD
-    width=0.3,
-    period=43200,
-    startTime=1800)
-=======
     final width=0.3,
     final period=43200,
     final shift=1800)
->>>>>>> master
     "Window on/off status"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={-110,20})));
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={-10,-80})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
     final offset=0,
     final height=6.2831852,
     final duration=24*3600) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.Sin sin2
     "Block that outputs the sine of the input"
-    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem(
     final k=12.5,
     final p=273.15 + 22.5)
     "Current zone temperature"
-    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp3(
-    final offset=0,
-    final height=6.2831852,
-    final duration=24*3600) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sin sin3
-    "Block that outputs the sine of the input"
-    annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
-  Buildings.Controls.OBC.CDL.Continuous.AddParameter minZonTem(
-    final k=12,
-    final p=273.15 + 22.5)
-    "Minimum zone temperature in the group"
-    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
+    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
 
 equation
-  connect(ramp1.y, sin1.u)
-    annotation (Line(points={{-58,0},{-42,0}},     color={0,0,127}));
-  connect(sin1.y, maxZonTem.u)
-    annotation (Line(points={{-18,0},{-2,0}},     color={0,0,127}));
-  connect(cooDowTim.y, noWinZonSta.cooDowTim) annotation (Line(points={{-58,130},
-          {-20,130},{-20,139},{118,139}}, color={0,0,127}));
-  connect(warUpTim.y, noWinZonSta.warUpTim) annotation (Line(points={{-58,100},{
-          -14,100},{-14,137},{118,137}}, color={0,0,127}));
-  connect(TZonHeaSetOcc.y, noWinZonSta.TZonHeaSetOcc) annotation (Line(points={{-58,70},
-          {-8,70},{-8,133},{118,133}},       color={0,0,127}));
-  connect(TZonCooSetOcc.y, noWinZonSta.TZonCooSetOcc) annotation (Line(points={{-58,40},
-          {-2,40},{-2,131},{118,131}},     color={0,0,127}));
+  connect(cooDowTim.y, noWinZonSta.cooDowTim) annotation (Line(points={{-58,60},
+          {-20,60},{-20,82},{58,82}}, color={0,0,127}));
+  connect(warUpTim.y, noWinZonSta.warUpTim) annotation (Line(points={{-58,20},{-14,
+          20},{-14,78},{58,78}}, color={0,0,127}));
   connect(ramp2.y,sin2. u)
-    annotation (Line(points={{-58,-40},{-42,-40}}, color={0,0,127}));
+    annotation (Line(points={{-78,-40},{-62,-40}}, color={0,0,127}));
   connect(sin2.y, zonTem.u)
-    annotation (Line(points={{-18,-40},{-2,-40}}, color={0,0,127}));
-  connect(maxZonTem.y, noWinZonSta.TZonMax) annotation (Line(points={{22,0},{40,
-          0},{40,129},{118,129}}, color={0,0,127}));
-  connect(zonTem.y, noWinZonSta.TZon) annotation (Line(points={{22,-40},{46,-40},
-          {46,127},{118,127}}, color={0,0,127}));
-  connect(ramp3.y,sin3. u)
-    annotation (Line(points={{-58,-80},{-42,-80}}, color={0,0,127}));
-  connect(sin3.y, minZonTem.u)
-    annotation (Line(points={{-18,-80},{-2,-80}},   color={0,0,127}));
-  connect(minZonTem.y, noWinZonSta.TZonMin) annotation (Line(points={{22,-80},{52,
-          -80},{52,125},{118,125}},   color={0,0,127}));
-  connect(TZonHeaSetUno.y, noWinZonSta.TZonHeaSetUno) annotation (Line(points={{22,-110},
-          {58,-110},{58,123},{118,123}},        color={0,0,127}));
-  connect(TZonCooSetUno.y, noWinZonSta.TZonCooSetUno) annotation (Line(points={{22,-150},
-          {64,-150},{64,121},{118,121}},        color={0,0,127}));
-  connect(cooDowTim.y, witWinZonSta.cooDowTim) annotation (Line(points={{-58,130},
-          {-20,130},{-20,59},{118,59}},color={0,0,127}));
-  connect(warUpTim.y, witWinZonSta.warUpTim) annotation (Line(points={{-58,100},
-          {-14,100},{-14,57},{118,57}}, color={0,0,127}));
-  connect(uWinSta.y, witWinZonSta.uWinSta) annotation (Line(points={{-98,20},{-20,
-          20},{-20,55},{118,55}},  color={255,0,255}));
-  connect(TZonHeaSetOcc.y, witWinZonSta.TZonHeaSetOcc) annotation (Line(points={{-58,70},
-          {-8,70},{-8,53},{118,53}},          color={0,0,127}));
-  connect(TZonCooSetOcc.y, witWinZonSta.TZonCooSetOcc) annotation (Line(points={{-58,40},
-          {-2,40},{-2,51},{118,51}},        color={0,0,127}));
-  connect(maxZonTem.y, witWinZonSta.TZonMax) annotation (Line(points={{22,0},{40,
-          0},{40,49},{118,49}},    color={0,0,127}));
-  connect(zonTem.y, witWinZonSta.TZon) annotation (Line(points={{22,-40},{46,-40},
-          {46,47},{118,47}}, color={0,0,127}));
-  connect(minZonTem.y, witWinZonSta.TZonMin) annotation (Line(points={{22,-80},{
-          52,-80},{52,45},{118,45}}, color={0,0,127}));
-  connect(TZonHeaSetUno.y, witWinZonSta.TZonHeaSetUno) annotation (Line(points={{22,-110},
-          {58,-110},{58,43},{118,43}},         color={0,0,127}));
-  connect(TZonCooSetUno.y, witWinZonSta.TZonCooSetUno) annotation (Line(points={{22,-150},
-          {64,-150},{64,41},{118,41}},         color={0,0,127}));
+    annotation (Line(points={{-38,-40},{-22,-40}},color={0,0,127}));
+  connect(zonTem.y, noWinZonSta.TZon) annotation (Line(points={{2,-40},{20,-40},
+          {20,66},{58,66}},    color={0,0,127}));
+  connect(cooDowTim.y, witWinZonSta.cooDowTim) annotation (Line(points={{-58,60},
+          {-20,60},{-20,2},{58,2}},    color={0,0,127}));
+  connect(warUpTim.y, witWinZonSta.warUpTim) annotation (Line(points={{-58,20},{
+          -14,20},{-14,-2},{58,-2}},    color={0,0,127}));
+  connect(zonTem.y, witWinZonSta.TZon) annotation (Line(points={{2,-40},{20,-40},
+          {20,-14},{58,-14}},color={0,0,127}));
+  connect(uWinSta.y, witWinZonSta.uWin) annotation (Line(points={{2,-80},{40,-80},
+          {40,-10},{58,-10}}, color={255,0,255}));
 
 annotation (
   experiment(StopTime=86400, Tolerance=1e-6),
@@ -160,5 +86,5 @@ First implementation.
                 pattern = LinePattern.None,
                 fillPattern = FillPattern.Solid,
                 points = {{-36,60},{64,0},{-36,-60},{-36,60}})}),
-    Diagram(coordinateSystem(extent={{-160,-180},{160,160}})));
+    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})));
 end ZoneStatus;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/package.order b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/package.order
index d380b7a54db..d1f99568247 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/package.order
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/package.order
@@ -1,3 +1,4 @@
+GroupStatus
 OperationMode
 TrimAndRespond
 ZoneStatus
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo
index 5dbabb07ecb..fa08a75d5c6 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/ZoneStatus.mo
@@ -1,380 +1,426 @@
 within Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints;
 block ZoneStatus "Block that outputs zone temperature status"
 
+  parameter Real THeaSetOcc(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=293.15
+    "Occupied heating setpoint";
+  parameter Real THeaSetUno(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=285.15
+    "Unoccupied heating setpoint";
+  parameter Real TCooSetOcc(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=297.15
+    "Occupied cooling setpoint";
+  parameter Real TCooSetUno(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")=303.15
+    "Unoccupied cooling setpoint";
   parameter Real bouLim(
     final unit="K",
-    final displayUnit="K",
+    displayUnit="K",
     final quantity="TemperatureDifference",
-    final min=0.5) = 1.1
-    "Value limit to indicate the end of setback or setup mode";
+    final min=0.5) = 1
+    "Threshold of temperature difference for indicating the end of setback or setup mode";
   parameter Boolean have_winSen=false
     "Check if the zone has window status sensor";
+  parameter Real uLow=-0.1
+    "Low limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real uHigh=0.1
+    "High limit of the hysteresis for checking temperature difference"
+    annotation (Dialog(tab="Advanced"));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput cooDowTim(
     final unit="s",
     final quantity="Time")
     "Cool-down time retrieved from optimal cool-down block"
-    annotation (Placement(transformation(extent={{-180,200},{-140,240}}),
-        iconTransformation(extent={{-140,70},{-100,110}})));
+    annotation (Placement(transformation(extent={{-200,200},{-160,240}}),
+        iconTransformation(extent={{-140,60},{-100,100}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput warUpTim(
     final unit="s",
     final quantity="Time")
     "Warm-up time retrieved from optimal warm-up block"
-    annotation (Placement(transformation(extent={{-180,140},{-140,180}}),
-        iconTransformation(extent={{-140,50},{-100,90}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWinSta if have_winSen
+    annotation (Placement(transformation(extent={{-200,160},{-160,200}}),
+        iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWin if have_winSen
     "Window status: true=open, false=close"
-    annotation (Placement(transformation(extent={{-180,100},{-140,140}}),
-        iconTransformation(extent={{-140,30},{-100,70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonHeaSetOcc(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Occupied heating setpoint temperature"
-    annotation (Placement(transformation(extent={{-180,50},{-140,90}}),
-        iconTransformation(extent={{-140,10},{-100,50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonCooSetOcc(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Occupied cooling setpoint temperature"
-    annotation (Placement(transformation(extent={{-180,0},{-140,40}}),
-      iconTransformation(extent={{-140,-10},{-100,30}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonMax(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Maximum zone temperature in the zone group"
-    annotation (Placement(transformation(extent={{-180,-40},{-140,0}}),
-        iconTransformation(extent={{-140,-30},{-100,10}})));
+    annotation (Placement(transformation(extent={{-200,130},{-160,170}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
     final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Single zone temperature"
-    annotation (Placement(transformation(extent={{-180,-80},{-140,-40}}),
-        iconTransformation(extent={{-140,-50},{-100,-10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonMin(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Minimum zone temperature in the zone group"
-    annotation (Placement(transformation(extent={{-180,-130},{-140,-90}}),
-        iconTransformation(extent={{-140,-70},{-100,-30}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonHeaSetUno(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Unoccupied heating setpoint temperature"
-    annotation (Placement(transformation(extent={{-180,-170},{-140,-130}}),
-        iconTransformation(extent={{-140,-90},{-100,-50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonCooSetUno(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    "Unoccupied cooling setpoint temperature"
-    annotation (Placement(transformation(extent={{-180,-260},{-140,-220}}),
-        iconTransformation(extent={{-140,-110},{-100,-70}})));
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature") "Single zone temperature"
+    annotation (Placement(transformation(extent={{-200,-70},{-160,-30}}),
+        iconTransformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCooTim(
     final unit="s",
     final quantity="Time") "Cool-down time"
-    annotation (Placement(transformation(extent={{140,200},{180,240}}),
-        iconTransformation(extent={{100,70},{140,110}})));
+    annotation (Placement(transformation(extent={{160,200},{200,240}}),
+        iconTransformation(extent={{100,110},{140,150}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yWarTim(
     final unit="s",
     final quantity="Time") "Warm-up time"
-    annotation (Placement(transformation(extent={{140,140},{180,180}}),
-        iconTransformation(extent={{100,50},{140,90}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yOccHeaHigMin
-    "True when the occupied heating setpoint temperature is higher than the minimum zone temperature"
-    annotation (Placement(transformation(extent={{140,50},{180,90}}),
+    annotation (Placement(transformation(extent={{160,160},{200,200}}),
+        iconTransformation(extent={{100,90},{140,130}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput THeaSetOn(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature") "Occupied heating setpoint"
+    annotation (Placement(transformation(extent={{160,110},{200,150}}),
+        iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yOccHeaHig
+    "True when the zone temperature is lower than the occupied heating setpoint"
+    annotation (Placement(transformation(extent={{160,70},{200,110}}),
+        iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TCooSetOn(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature")
+    "Occupied cooling setpoint temperature"
+    annotation (Placement(transformation(extent={{160,30},{200,70}}),
         iconTransformation(extent={{100,10},{140,50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yMaxHigOccCoo
-    "True when the maximum zone temperature is higher than the occupied cooling setpoint"
-    annotation (Placement(transformation(extent={{140,0},{180,40}}),
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yHigOccCoo
+    "True when the zone temperature is higher than the occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{160,-10},{200,30}}),
         iconTransformation(extent={{100,-10},{140,30}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yLowUnoHea
-    "True when zone temperature is lower than unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{140,-80},{180,-40}}),
-        iconTransformation(extent={{100,-30},{140,10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yUnoHeaHigMin
-    "True when the unoccupied heating setpoint is higher than minimum zone temperature"
-    annotation (Placement(transformation(extent={{140,-130},{180,-90}}),
-        iconTransformation(extent={{100,-70},{140,-30}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yMaxHigUnoCoo
-    "True when the maximum zone temperature is higher than unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{140,-190},{180,-150}}),
-        iconTransformation(extent={{100,-90},{140,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput THeaSetOff(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature") "Unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{160,-60},{200,-20}}),
+        iconTransformation(extent={{100,-40},{140,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yUnoHeaHig
+    "True when the zone temperature is lower than the unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{160,-100},{200,-60}}),
+        iconTransformation(extent={{100,-60},{140,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yEndSetBac
+    "True when the zone could end setback mode"
+    annotation (Placement(transformation(extent={{160,-140},{200,-100}}),
+        iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TCooSetOff(
+    final unit="K",
+    displayUnit="degC",
+    final quantity="ThermodynamicTemperature") "Unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{160,-180},{200,-140}}),
+        iconTransformation(extent={{100,-110},{140,-70}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yHigUnoCoo
     "True when the zone temperature is higher than the unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{140,-240},{180,-200}}),
-        iconTransformation(extent={{100,-110},{140,-70}})));
+    annotation (Placement(transformation(extent={{160,-220},{200,-180}}),
+        iconTransformation(extent={{100,-130},{140,-90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yEndSetUp
+    "True when the zone could end setup mode"
+    annotation (Placement(transformation(extent={{160,-260},{200,-220}}),
+        iconTransformation(extent={{100,-150},{140,-110}})));
 
 protected
   Buildings.Controls.OBC.CDL.Continuous.Product pro
-    "Decide if the cool down time of one zone should be ignored: if window is open, then output zero, otherwise, output cool-down time from optimal cool-down block"
-    annotation (Placement(transformation(extent={{80,210},{100,230}})));
+    "Decide if the cool down time of one zone should be ignored: if window is open, 
+    then output zero, otherwise, output cool-down time from optimal cool-down block"
+    annotation (Placement(transformation(extent={{120,210},{140,230}})));
   Buildings.Controls.OBC.CDL.Continuous.Product pro1
-    "Decide if the warm-up time of one zone should be ignored: if window is open, then output zero, otherwise, output warm-up time from optimal warm-up block"
-    annotation (Placement(transformation(extent={{80,150},{100,170}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add(final k2=-1)
-    "Calculate differential between minimum zone temperature and the heating setpoint"
-    annotation (Placement(transformation(extent={{-20,60},{0,80}})));
+    "Decide if the warm-up time of one zone should be ignored: if window is open, 
+    then output zero, otherwise, output warm-up time from optimal warm-up block"
+    annotation (Placement(transformation(extent={{120,170},{140,190}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add(
+    final k2=-1)
+    "Calculate difference between zone temperature and the occupied heating setpoint"
+    annotation (Placement(transformation(extent={{-40,80},{-20,100}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
-    final pre_y_start=false,
-    final uLow=-0.1,
-    final uHigh=0.1)
+    final uLow=uLow,
+    final uHigh=uHigh)
     "Hysteresis that outputs if the system should run in warm-up mode"
-    annotation (Placement(transformation(extent={{20,60},{40,80}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add1(final k1=-1)
-    "Calculate differential between maximum zone temperature and the cooling setpoint"
-    annotation (Placement(transformation(extent={{-20,10},{0,30}})));
+    annotation (Placement(transformation(extent={{0,80},{20,100}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add1(
+    final k1=-1)
+    "Calculate difference between zone temperature and the occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1(
-    final pre_y_start=false,
-    final uLow=-0.1,
-    final uHigh=0.1)
+    final uLow=uLow,
+    final uHigh=uHigh)
     "Hysteresis that outputs if the system should run in cool-down mode"
-    annotation (Placement(transformation(extent={{20,10},{40,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add2(final k1=-1)
-    "Calculate zone temperature difference to setpoint"
-    annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add2(
+    final k2=-1)
+    "Calculate zone temperature difference to unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys2(
-    final pre_y_start=false,
-    final uLow=-0.1,
-    final uHigh=0.1)
-    "Hysteresis that outputs if the zone temperature is lower then setpoint"
-    annotation (Placement(transformation(extent={{80,-70},{100,-50}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add3(final k2=-1)
-    "Calculate the difference between minimum zone temperature and unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{40,-120},{60,-100}})));
-  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys3(
-    final uLow=-0.5*bouLim,
-    final uHigh=0.5*bouLim,
-    final pre_y_start=false)
-    "Hysteresis that outputs if the unoccupied heating setpoint is higher than minimum zone temperature by a given limit"
-    annotation (Placement(transformation(extent={{80,-120},{100,-100}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add5(final k2=-1)
-    "Calculate zone temperature difference to setpoint"
-    annotation (Placement(transformation(extent={{40,-230},{60,-210}})));
+    final uLow=uLow,
+    final uHigh=uHigh)
+    "Hysteresis that outputs if the zone temperature is lower than unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{0,-80},{20,-60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add5(
+    final k1=-1)
+    "Calculate zone temperature difference to unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-40,-200},{-20,-180}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys5(
-    final pre_y_start=false,
-    final uLow=-0.1,
-    final uHigh=0.1)
-    "Hysteresis that outputs if the zone temperature is higher than setpoint"
-    annotation (Placement(transformation(extent={{80,-230},{100,-210}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add4(final k2=-1)
-    "Calculate the difference between maximum zone temperature and unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{40,-180},{60,-160}})));
-  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys4(
-    final pre_y_start=false,
-    final uLow=-0.5*bouLim,
-    final uHigh=0.5*bouLim)
-    "Hysteresis that outputs if the maximum zone temperature is higher than unoccupied cooling setpoint by a given limit"
-    annotation (Placement(transformation(extent={{80,-180},{100,-160}})));
+    final uLow=uLow,
+    final uHigh=uHigh)
+    "Hysteresis that outputs if the zone temperature is higher than unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{0,-200},{20,-180}})));
   Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not"
-    annotation (Placement(transformation(extent={{-20,110},{0,130}})));
+    annotation (Placement(transformation(extent={{-40,140},{-20,160}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert Boolean to Real number"
-    annotation (Placement(transformation(extent={{20,110},{40,130}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swi
-    "Decide if the temperature difference to setpoint should be ignored: if the zone window is open, then output setpoint temperature, otherwise, output zone temperature"
-    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swi1
-    "Decide if the temperature difference to setpoint should be ignored: if the zone window is open, then output setpoint temperature, otherwise, output zone temperature"
-    annotation (Placement(transformation(extent={{-20,-230},{0,-210}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant con(final k=false) if not have_winSen
+    annotation (Placement(transformation(extent={{60,140},{80,160}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant con(
+    final k=false) if not have_winSen
     "Constant false"
-    annotation (Placement(transformation(extent={{-128,130},{-108,150}})));
+    annotation (Placement(transformation(extent={{-140,190},{-120,210}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant occHeaSet(
+    final k=THeaSetOcc)
+    "Occupied heating setpoint"
+    annotation (Placement(transformation(extent={{-120,120},{-100,140}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant unoHeaSet(
+    final k=THeaSetUno)
+    "Unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-120,-50},{-100,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant occCooSet(
+    final k=TCooSetOcc)
+    "Occupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant unoCooSet(
+    final k=TCooSetUno)
+    "Unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-120,-170},{-100,-150}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add3(
+    final k2=-1)
+    "Calculate zone temperature difference to unoccupied heating setpoint"
+    annotation (Placement(transformation(extent={{-40,-120},{-20,-100}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys3(
+    final uLow=0,
+    final uHigh=bouLim)
+    "Hysteresis that outputs if the zone temperature is higher than its unoccupied heating setpoint by a given limit"
+    annotation (Placement(transformation(extent={{0,-120},{20,-100}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add4(
+    final k1=-1)
+    "Calculate zone temperature difference to unoccupied cooling setpoint"
+    annotation (Placement(transformation(extent={{-40,-240},{-20,-220}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys4(
+    final uLow=0,
+    final uHigh=bouLim)
+    "Hysteresis that outputs if the zone temperature is lower than its unoccupied cooling setpoint by a given limit"
+    annotation (Placement(transformation(extent={{0,-240},{20,-220}})));
+  Buildings.Controls.OBC.CDL.Logical.And and2
+    "When window is open, it should output false"
+    annotation (Placement(transformation(extent={{120,80},{140,100}})));
+  Buildings.Controls.OBC.CDL.Logical.And and1
+    "When window is open, it should output false"
+    annotation (Placement(transformation(extent={{120,0},{140,20}})));
+  Buildings.Controls.OBC.CDL.Logical.And and3
+    "When window is open, it should output false"
+    annotation (Placement(transformation(extent={{120,-90},{140,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or2
+    "When window is open, it should output true"
+    annotation (Placement(transformation(extent={{120,-130},{140,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.And and5
+    "When window is open, it should output false"
+    annotation (Placement(transformation(extent={{120,-210},{140,-190}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or1
+    "When window is open, it should output true"
+    annotation (Placement(transformation(extent={{120,-250},{140,-230}})));
 
 equation
-  connect(cooDowTim, pro.u1) annotation (Line(points={{-160,220},{-60,220},{-60,
-          226},{78,226}}, color={0,0,127}));
-  connect(warUpTim, pro1.u1) annotation (Line(points={{-160,160},{-60,160},{-60,
-          166},{78,166}}, color={0,0,127}));
-  connect(booToRea.y, pro.u2) annotation (Line(points={{42,120},{60,120},{60,214},
-          {78,214}}, color={0,0,127}));
-  connect(booToRea.y, pro1.u2) annotation (Line(points={{42,120},{60,120},{60,154},
-          {78,154}}, color={0,0,127}));
-  connect(TZonHeaSetOcc, add.u1) annotation (Line(points={{-160,70},{-60,70},{-60,
-          76},{-22,76}}, color={0,0,127}));
-  connect(TZonMin, add.u2) annotation (Line(points={{-160,-110},{-60,-110},{-60,
-          64},{-22,64}}, color={0,0,127}));
+  connect(cooDowTim, pro.u1) annotation (Line(points={{-180,220},{60,220},{60,226},
+          {118,226}},     color={0,0,127}));
+  connect(warUpTim, pro1.u1) annotation (Line(points={{-180,180},{60,180},{60,186},
+          {118,186}},     color={0,0,127}));
+  connect(booToRea.y, pro.u2) annotation (Line(points={{82,150},{100,150},{100,214},
+          {118,214}},color={0,0,127}));
+  connect(booToRea.y, pro1.u2) annotation (Line(points={{82,150},{100,150},{100,
+          174},{118,174}}, color={0,0,127}));
   connect(add.y, hys.u)
-    annotation (Line(points={{2,70},{18,70}}, color={0,0,127}));
-  connect(TZonCooSetOcc, add1.u1) annotation (Line(points={{-160,20},{-80,20},{-80,
-          26},{-22,26}}, color={0,0,127}));
-  connect(TZonMax, add1.u2) annotation (Line(points={{-160,-20},{-80,-20},{-80,14},
-          {-22,14}}, color={0,0,127}));
+    annotation (Line(points={{-18,90},{-2,90}},color={0,0,127}));
   connect(add1.y, hys1.u)
-    annotation (Line(points={{2,20},{18,20}}, color={0,0,127}));
-  connect(uWinSta, not1.u)
-    annotation (Line(points={{-160,120},{-22,120}}, color={255,0,255}));
-  connect(uWinSta, swi.u2) annotation (Line(points={{-160,120},{-100,120},{-100,
-          -60},{-22,-60}}, color={255,0,255}));
-  connect(TZonHeaSetUno, swi.u1) annotation (Line(points={{-160,-150},{-40,-150},
-          {-40,-52},{-22,-52}}, color={0,0,127}));
-  connect(TZon, swi.u3) annotation (Line(points={{-160,-60},{-120,-60},{-120,-68},
-          {-22,-68}}, color={0,0,127}));
-  connect(swi.y, add2.u1) annotation (Line(points={{2,-60},{20,-60},{20,-54},{38,
-          -54}}, color={0,0,127}));
-  connect(TZonHeaSetUno, add2.u2) annotation (Line(points={{-160,-150},{20,-150},
-          {20,-66},{38,-66}}, color={0,0,127}));
+    annotation (Line(points={{-18,10},{-2,10}}, color={0,0,127}));
+  connect(uWin, not1.u)
+    annotation (Line(points={{-180,150},{-42,150}},color={255,0,255}));
   connect(add2.y, hys2.u)
-    annotation (Line(points={{62,-60},{78,-60}}, color={0,0,127}));
-  connect(TZonMin, add3.u2) annotation (Line(points={{-160,-110},{-60,-110},{-60,
-          -116},{38,-116}}, color={0,0,127}));
-  connect(TZonHeaSetUno, add3.u1) annotation (Line(points={{-160,-150},{20,-150},
-          {20,-104},{38,-104}}, color={0,0,127}));
-  connect(add3.y, hys3.u)
-    annotation (Line(points={{62,-110},{78,-110}}, color={0,0,127}));
-  connect(uWinSta, swi1.u2) annotation (Line(points={{-160,120},{-100,120},{-100,
-          -220},{-22,-220}}, color={255,0,255}));
-  connect(TZonCooSetUno, swi1.u1) annotation (Line(points={{-160,-240},{-60,-240},
-          {-60,-212},{-22,-212}}, color={0,0,127}));
-  connect(TZon, swi1.u3) annotation (Line(points={{-160,-60},{-120,-60},{-120,-228},
-          {-22,-228}}, color={0,0,127}));
-  connect(swi1.y, add5.u1) annotation (Line(points={{2,-220},{20,-220},{20,-214},
-          {38,-214}}, color={0,0,127}));
-  connect(TZonCooSetUno, add5.u2) annotation (Line(points={{-160,-240},{20,-240},
-          {20,-226},{38,-226}}, color={0,0,127}));
+    annotation (Line(points={{-18,-70},{-2,-70}},  color={0,0,127}));
   connect(add5.y, hys5.u)
-    annotation (Line(points={{62,-220},{78,-220}}, color={0,0,127}));
-  connect(TZonMax, add4.u1) annotation (Line(points={{-160,-20},{-80,-20},{-80,-164},
-          {38,-164}}, color={0,0,127}));
-  connect(TZonCooSetUno, add4.u2) annotation (Line(points={{-160,-240},{-60,-240},
-          {-60,-176},{38,-176}}, color={0,0,127}));
-  connect(add4.y, hys4.u)
-    annotation (Line(points={{62,-170},{78,-170}}, color={0,0,127}));
+    annotation (Line(points={{-18,-190},{-2,-190}},  color={0,0,127}));
   connect(not1.y, booToRea.u)
-    annotation (Line(points={{2,120},{18,120}}, color={255,0,255}));
-  connect(hys.y, yOccHeaHigMin)
-    annotation (Line(points={{42,70},{160,70}}, color={255,0,255}));
-  connect(hys1.y, yMaxHigOccCoo)
-    annotation (Line(points={{42,20},{160,20}}, color={255,0,255}));
+    annotation (Line(points={{-18,150},{58,150}}, color={255,0,255}));
   connect(pro.y, yCooTim)
-    annotation (Line(points={{102,220},{160,220}}, color={0,0,127}));
+    annotation (Line(points={{142,220},{180,220}}, color={0,0,127}));
   connect(pro1.y, yWarTim)
-    annotation (Line(points={{102,160},{160,160}}, color={0,0,127}));
-  connect(hys2.y, yLowUnoHea)
-    annotation (Line(points={{102,-60},{160,-60}}, color={255,0,255}));
-  connect(hys3.y,yUnoHeaHigMin)
-    annotation (Line(points={{102,-110},{160,-110}}, color={255,0,255}));
-  connect(hys4.y, yMaxHigUnoCoo)
-    annotation (Line(points={{102,-170},{160,-170}}, color={255,0,255}));
-  connect(hys5.y, yHigUnoCoo)
-    annotation (Line(points={{102,-220},{160,-220}}, color={255,0,255}));
-  connect(con.y, not1.u) annotation (Line(points={{-106,140},{-100,140},{-100,120},
-          {-22,120}}, color={255,0,255}));
-  connect(con.y, swi.u2) annotation (Line(points={{-106,140},{-100,140},{-100,-60},
-          {-22,-60}}, color={255,0,255}));
-  connect(con.y, swi1.u2) annotation (Line(points={{-106,140},{-100,140},{-100,-220},
-          {-22,-220}}, color={255,0,255}));
+    annotation (Line(points={{142,180},{180,180}}, color={0,0,127}));
+  connect(con.y, not1.u) annotation (Line(points={{-118,200},{-80,200},{-80,150},
+          {-42,150}},color={255,0,255}));
+  connect(TZon, add1.u2) annotation (Line(points={{-180,-50},{-140,-50},{-140,4},
+          {-42,4}}, color={0,0,127}));
+  connect(TZon, add.u2) annotation (Line(points={{-180,-50},{-140,-50},{-140,84},
+          {-42,84}},color={0,0,127}));
+  connect(unoCooSet.y, TCooSetOff)
+    annotation (Line(points={{-98,-160},{180,-160}}, color={0,0,127}));
+  connect(unoHeaSet.y, THeaSetOff)
+    annotation (Line(points={{-98,-40},{180,-40}}, color={0,0,127}));
+  connect(occHeaSet.y, THeaSetOn)
+    annotation (Line(points={{-98,130},{180,130}}, color={0,0,127}));
+  connect(occCooSet.y, TCooSetOn)
+    annotation (Line(points={{-98,50},{180,50}}, color={0,0,127}));
+  connect(unoHeaSet.y, add2.u1) annotation (Line(points={{-98,-40},{-60,-40},{-60,
+          -64},{-42,-64}},color={0,0,127}));
+  connect(unoCooSet.y, add5.u1) annotation (Line(points={{-98,-160},{-60,-160},{
+          -60,-184},{-42,-184}},color={0,0,127}));
+  connect(unoHeaSet.y, add3.u2) annotation (Line(points={{-98,-40},{-60,-40},{-60,
+          -116},{-42,-116}},color={0,0,127}));
+  connect(add3.y, hys3.u)
+    annotation (Line(points={{-18,-110},{-2,-110}},  color={0,0,127}));
+  connect(unoCooSet.y, add4.u2) annotation (Line(points={{-98,-160},{-60,-160},{
+          -60,-236},{-42,-236}},color={0,0,127}));
+  connect(add4.y, hys4.u)
+    annotation (Line(points={{-18,-230},{-2,-230}},  color={0,0,127}));
+  connect(occHeaSet.y, add.u1) annotation (Line(points={{-98,130},{-60,130},{-60,
+          96},{-42,96}}, color={0,0,127}));
+  connect(occCooSet.y, add1.u1) annotation (Line(points={{-98,50},{-60,50},{-60,
+          16},{-42,16}}, color={0,0,127}));
+  connect(TZon, add2.u2) annotation (Line(points={{-180,-50},{-140,-50},{-140,-76},
+          {-42,-76}}, color={0,0,127}));
+  connect(TZon, add3.u1) annotation (Line(points={{-180,-50},{-140,-50},{-140,-104},
+          {-42,-104}}, color={0,0,127}));
+  connect(TZon, add5.u2) annotation (Line(points={{-180,-50},{-140,-50},{-140,-196},
+          {-42,-196}}, color={0,0,127}));
+  connect(TZon, add4.u1) annotation (Line(points={{-180,-50},{-140,-50},{-140,-224},
+          {-42,-224}}, color={0,0,127}));
+  connect(and2.y, yOccHeaHig)
+    annotation (Line(points={{142,90},{180,90}}, color={255,0,255}));
+  connect(hys.y, and2.u1)
+    annotation (Line(points={{22,90},{118,90}}, color={255,0,255}));
+  connect(hys1.y, and1.u1)
+    annotation (Line(points={{22,10},{118,10}}, color={255,0,255}));
+  connect(hys2.y, and3.u1) annotation (Line(points={{22,-70},{100,-70},{100,-80},
+          {118,-80}}, color={255,0,255}));
+  connect(hys3.y, or2.u1) annotation (Line(points={{22,-110},{100,-110},{100,-120},
+          {118,-120}}, color={255,0,255}));
+  connect(hys5.y, and5.u1) annotation (Line(points={{22,-190},{100,-190},{100,-200},
+          {118,-200}}, color={255,0,255}));
+  connect(hys4.y, or1.u1) annotation (Line(points={{22,-230},{100,-230},{100,-240},
+          {118,-240}}, color={255,0,255}));
+  connect(not1.y, and2.u2) annotation (Line(points={{-18,150},{40,150},{40,82},
+          {118,82}},color={255,0,255}));
+  connect(not1.y, and1.u2) annotation (Line(points={{-18,150},{40,150},{40,2},{118,
+          2}}, color={255,0,255}));
+  connect(and1.y, yHigOccCoo) annotation (Line(points={{142,10},{152,10},{152,10},
+          {180,10}}, color={255,0,255}));
+  connect(and3.y, yUnoHeaHig)
+    annotation (Line(points={{142,-80},{180,-80}}, color={255,0,255}));
+  connect(or2.y, yEndSetBac) annotation (Line(points={{142,-120},{154,-120},{
+          154,-120},{180,-120}}, color={255,0,255}));
+  connect(and5.y, yHigUnoCoo)
+    annotation (Line(points={{142,-200},{180,-200}}, color={255,0,255}));
+  connect(or1.y, yEndSetUp)
+    annotation (Line(points={{142,-240},{180,-240}}, color={255,0,255}));
+  connect(uWin, or2.u2) annotation (Line(points={{-180,150},{-80,150},{-80,-128},
+          {118,-128}}, color={255,0,255}));
+  connect(uWin, or1.u2) annotation (Line(points={{-180,150},{-80,150},{-80,-248},
+          {118,-248}}, color={255,0,255}));
+  connect(con.y, or2.u2) annotation (Line(points={{-118,200},{-80,200},{-80,-128},
+          {118,-128}}, color={255,0,255}));
+  connect(con.y, or1.u2) annotation (Line(points={{-118,200},{-80,200},{-80,-248},
+          {118,-248}}, color={255,0,255}));
+  connect(not1.y, and3.u2) annotation (Line(points={{-18,150},{40,150},{40,-88},
+          {118,-88}}, color={255,0,255}));
+  connect(not1.y, and5.u2) annotation (Line(points={{-18,150},{40,150},{40,-208},
+          {118,-208}}, color={255,0,255}));
 
 annotation (
   defaultComponentName = "zonSta",
-  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-140,-260},{140,260}})),
-   Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+   Icon(coordinateSystem(extent={{-100,-140},{100,140}}),
         graphics={
         Rectangle(
-        extent={{-100,-100},{100,100}},
+        extent={{-100,-140},{100,140}},
         lineColor={0,0,127},
         fillColor={255,255,255},
         fillPattern=FillPattern.Solid),
         Text(
-          extent={{-96,98},{-46,82}},
+          extent={{-96,88},{-46,72}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="cooDowTim"),
         Text(
-          extent={{-98,76},{-50,64}},
+          extent={{-98,46},{-50,34}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="warUpTim"),
         Text(
-          extent={{-96,-84},{-32,-98}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonCooSetUno"),
-        Text(
-          extent={{-96,38},{-30,20}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonHeaSetOcc"),
-        Text(
-          extent={{-96,16},{-28,4}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonCooSetOcc"),
-        Text(
-          extent={{-120,144},{100,106}},
+          extent={{-120,180},{100,140}},
           lineColor={0,0,255},
           textString="%name"),
         Text(
-          extent={{-100,-4},{-58,-14}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonMax"),
-        Text(
-          extent={{-100,-24},{-74,-34}},
+          extent={{-100,-74},{-74,-84}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZon"),
         Text(
-          extent={{-100,-44},{-58,-54}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonMin"),
-        Text(
-          extent={{-96,-64},{-32,-78}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonHeaSetUno"),
-        Text(
-          visible=have_winSen,
-          extent={{-98,56},{-60,46}},
-          lineColor={0,0,127},
+          extent={{-100,-32},{-62,-42}},
+          lineColor={255,0,255},
           pattern=LinePattern.Dash,
           textString="uWinSta"),
         Text(
-          extent={{60,100},{98,84}},
+          extent={{60,140},{98,124}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="yCooTim"),
         Text(
-          extent={{60,80},{98,64}},
+          extent={{60,120},{98,104}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="yWarTim"),
         Text(
-          extent={{30,40},{96,22}},
+          extent={{38,70},{96,54}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="yOccHeaHigMin"),
+          textString="yOccHeaHig"),
         Text(
-          extent={{30,20},{96,2}},
+          extent={{42,20},{98,2}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="yMaxHigOccCoo"),
+          textString="yHigOccCoo"),
         Text(
-          extent={{46,0},{96,-16}},
+          extent={{40,-30},{96,-46}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="yLowUnoHea"),
+          textString="yUnoHeaHig"),
         Text(
-          extent={{30,-38},{96,-56}},
+          extent={{42,-102},{98,-118}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="yUnoHeaHigMin"),
+          textString="yHigUnoCoo"),
         Text(
-          extent={{30,-58},{96,-76}},
-          lineColor={255,0,255},
+          extent={{46,90},{96,74}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="THeaSetOn"),
+        Text(
+          extent={{46,40},{96,24}},
+          lineColor={0,0,127},
           pattern=LinePattern.Dash,
-          textString="yMaxHigUnoCoo"),
+          textString="TCooSetOn"),
+        Text(
+          extent={{46,-10},{96,-26}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="THeaSetOff"),
         Text(
           extent={{46,-80},{96,-96}},
+          lineColor={0,0,127},
+          pattern=LinePattern.Dash,
+          textString="TCooSetOff"),
+        Text(
+          extent={{42,-50},{98,-66}},
           lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="yHigUnoCoo")}),
+          textString="yEndSetBac"),
+        Text(
+          extent={{46,-124},{98,-138}},
+          lineColor={255,0,255},
+          pattern=LinePattern.Dash,
+          textString="yEndSetUp")}),
    Documentation(info="<html>
 <p>
 This block outputs single zone status. It includes outputs as following:
@@ -384,44 +430,56 @@ This block outputs single zone status. It includes outputs as following:
 the times for cooling-down (<code>yCooTim</code>) and warm-up (<code>yWarTim</code>) the zone,
 </li>
 <li>
-<code>yOccHeaHigMin</code>: if the zone occupied heating setpoint <code>TZonHeaSetOcc</code> 
-is higher than the minimum zone temperature <code>TZonMin</code> of the zone group (if the 
-zone is in a multiple zone system), or the zone temperature 
-(<code>TZonMin</code> = <code>TZon</code>) (if it is in a single zone system),
+<code>THeaSetOn</code>: the zone occupied heating setpoint,
 </li>
 <li>
-<code>yMaxHigOccCoo</code>: if the maximum zone temperature <code>TZonMax</code> of the zone 
-group (if the zone is in a multiple zone system), or the zone temperature 
-(<code>TZonMax</code> = <code>TZon</code>) (if it is in a single zone system), is higher 
-than the zone occupied cooling setpoint <code>TZonCooSetOcc</code>,
+<code>yOccHeaHig</code>: if the zone temperature is lower than the occupied heating
+setpoint,
 </li>
 <li>
-<code>yLowUnoHea</code>: if the zone temperature <code>TZon</code> is lower than
-the unoccupied heating setpoint <code>TZonHeaSetUno</code>,
+<code>TCooSetOn</code>: the zone occupied cooling setpoint,
 </li>
 <li>
-<code>yUnoHeaHigMin</code>: if the zone unoccupied heating setpoint <code>TZonHeaSetUno</code> 
-is higher than the minimum zone temperature <code>TZonMin</code> of the zone group (if the 
-zone is in a multiple zone system), or the zone temperature 
-(<code>TZonMin</code> = <code>TZon</code>) (if it is in a single zone system), 
+<code>yHigOccCoo</code>: if the zone temperature is higher than the occupied cooling
+setpoint,
 </li>
 <li>
-<code>yMaxHigUnoCoo</code>: if the maximum zone temperature <code>TZonMax</code> of the zone 
-group (if the zone is in a multiple zone system), or the zone temperature 
-(<code>TZonMax</code> = <code>TZon</code>) (if it is in a single zone system), is higher 
-than the zone unoccupied cooling setpoint <code>TZonCooSetUno</code>,
+<code>THeaSetOff</code>: the zone unoccupied heating setpoint,
 </li>
 <li>
-<code>yHigUnoCoo</code>: if the zone temperature <code>TZon</code> is higher than
-the unoccupied cooling setpoint <code>TZonCooSetUno</code>,
+<code>yUnoHeaHig</code>: if the zone temperature is lower than the unoccupied heating
+setpoint,
+</li>
+<li>
+<code>yEndSetBac</code>: if the zone temperature is higher than the unoccupied heating
+setpoint with the given limit <code>bouLim</code>, then the zone should be out of the
+setback mode,
+</li>
+<li>
+<code>TCooSetOff</code>: the zone unoccupied cooling setpoint,
+</li>
+<li>
+<code>yHigUnoCoo</code>: if the zone temperature is higher than the unoccupied cooling
+setpoint,
+</li>
+<li>
+<code>yEndSetUp</code>: if the zone temperature is lower than the unoccupied cooling
+setpoint with the given limit <code>bouLim</code>, then the zone should be out of the
+setup mode.
 </li>
 </ul>
 </html>",revisions="<html>
 <ul>
 <li>
+June 10 15, 2020, by Jianjun Hu:<br/>
+Simplified implementation.
+</li>
+<li>
 January 15, 2020, by Jianjun Hu:<br/>
 First implementation.
 </li>
 </ul>
-</html>"));
+</html>"),
+    Diagram(coordinateSystem(extent={{-160,-260},{160,240}},
+          preserveAspectRatio=false)));
 end ZoneStatus;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/package.order b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/package.order
index a37cac201dd..b298cb2e937 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/package.order
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/package.order
@@ -1,3 +1,4 @@
+GroupStatus
 OperationMode
 TrimAndRespond
 ZoneStatus
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/Validation/FreezeProtectionMixedAir.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/Validation/FreezeProtectionMixedAir.mo
index 7c84299aa7c..4d4e1f20cb8 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/Validation/FreezeProtectionMixedAir.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/Generic/Validation/FreezeProtectionMixedAir.mo
@@ -9,6 +9,7 @@ model FreezeProtectionMixedAir
     "Freeze protection set point temperature";
 
   Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.FreezeProtectionMixedAir freProTMix(final TFreSet = TFreSet)
+    "Freeze protection signal based on mixed air temperature"
   annotation (Placement(transformation(extent={{0,0},{20,20}})));
 
   CDL.Continuous.Sources.Sine sin1(
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo
index 69d8729f0a3..ed49cd6b296 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo
@@ -132,7 +132,7 @@ block Controller "Controller for room VAV box"
     annotation (Dialog(tab="Airflow setpoint", group="Nominal conditions"));
   parameter Real VDisHeaSetMax_flow(
     final unit="m3/s",
-    final quantity="VolumeFlowRate")=V_flow_nominal
+    final quantity="VolumeFlowRate")=0.3*V_flow_nominal
     "Zone maximum heating airflow setpoint"
     annotation (Dialog(tab="Airflow setpoint", group="Nominal conditions"));
   parameter Real VDisConMin_flow(
@@ -152,14 +152,14 @@ block Controller "Controller for room VAV box"
     annotation (Dialog(tab="Airflow setpoint", group="Nominal conditions"));
   parameter Real dTDisZonSetMax(
     final unit="K",
-    final displayUnit="K",
+    displayUnit="K",
     final quantity="TemperatureDifference")=11
     "Zone maximum discharge air temperature above heating setpoint"
     annotation (Dialog(tab="Damper and valve", group="Parameters"));
   parameter Real TDisMin(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=283.15
+    final quantity="ThermodynamicTemperature",
+    final unit = "K",
+    displayUnit = "degC")=283.15
     "Lowest discharge air temperature"
     annotation (Dialog(tab="Damper and valve", group="Parameters"));
   parameter Boolean have_heaWatCoi=true
@@ -170,28 +170,28 @@ block Controller "Controller for room VAV box"
     annotation (Dialog(tab="System requests", group="Parameters"));
   parameter Real errTZonCoo_1(
     final unit="K",
-    final displayUnit="K",
+    displayUnit="K",
     final quantity="TemperatureDifference")=2.8
     "Limit value of difference between zone temperature and cooling setpoint
     for generating 3 cooling SAT reset requests"
     annotation (Dialog(tab="System requests", group="Parameters"));
   parameter Real errTZonCoo_2(
     final unit="K",
-    final displayUnit="K",
+    displayUnit="K",
     final quantity="TemperatureDifference")=1.7
     "Limit value of difference between zone temperature and cooling setpoint
     for generating 2 cooling SAT reset requests"
     annotation (Dialog(tab="System requests", group="Parameters"));
   parameter Real errTDis_1(
     final unit="K",
-    final displayUnit="K",
+    displayUnit="K",
     final quantity="TemperatureDifference")=17
     "Limit value of difference between discharge air temperature and its setpoint
     for generating 3 hot water reset requests"
     annotation (Dialog(tab="System requests", group="Parameters"));
   parameter Real errTDis_2(
     final unit="K",
-    final displayUnit="K",
+    displayUnit="K",
     final quantity="TemperatureDifference")=8.3
     "Limit value of difference between discharge air temperature and its setpoint
     for generating 2 hot water reset requests"
@@ -215,60 +215,64 @@ block Controller "Controller for room VAV box"
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonHeaSet(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    final displayUnit = "degC")
+    displayUnit = "degC")
     "Setpoint temperature for room for heating"
     annotation (Placement(transformation(extent={{-180,140},{-140,180}}),
-        iconTransformation(extent={{-140,70},{-100,110}})));
+        iconTransformation(extent={{-140,80},{-100,120}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonCooSet(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    final displayUnit = "degC")
+    displayUnit = "degC")
     "Setpoint temperature for room for cooling"
     annotation (Placement(transformation(extent={{-180,100},{-140,140}}),
-        iconTransformation(extent={{-140,50},{-100,90}})));
+        iconTransformation(extent={{-140,60},{-100,100}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    final displayUnit = "degC")
+    displayUnit = "degC")
     "Measured room temperature"
-    annotation (Placement(transformation(extent={{-180,-40},{-140,0}}),
-        iconTransformation(extent={{-140,-30},{-100,10}})));
+    annotation (Placement(transformation(extent={{-180,-34},{-140,6}}),
+        iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TDis(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    final displayUnit = "degC")
+    displayUnit = "degC")
     "Measured supply air temperature after heating coil"
-    annotation (Placement(transformation(extent={{-180,-120},{-140,-80}}),
-        iconTransformation(extent={{-140,-70},{-100,-30}})));
+    annotation (Placement(transformation(extent={{-180,-130},{-140,-90}}),
+        iconTransformation(extent={{-140,-80},{-100,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput VDis_flow(
     final unit="m3/s",
     final quantity="VolumeFlowRate")
     "Measured discharge airflow rate"
-    annotation (Placement(transformation(extent={{-180,-80},{-140,-40}}),
-        iconTransformation(extent={{-140,-50},{-100,-10}})));
+    annotation (Placement(transformation(extent={{-180,-70},{-140,-30}}),
+        iconTransformation(extent={{-140,-40},{-100,0}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TSupAHU(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    final displayUnit = "degC")
+    displayUnit = "degC")
     "AHU supply air temperature"
-    annotation (Placement(transformation(extent={{-180,-150},{-140,-110}}),
-        iconTransformation(extent={{-140,-90},{-100,-50}})));
+    annotation (Placement(transformation(extent={{-180,-160},{-140,-120}}),
+        iconTransformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput ppmCO2 if have_CO2Sen
     "Measured CO2 concentration"
     annotation (Placement(transformation(extent={{-180,60},{-140,100}}),
-        iconTransformation(extent={{-140,30},{-100,70}})));
+        iconTransformation(extent={{-140,40},{-100,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput nOcc if have_occSen
     "Number of occupants"
-    annotation (Placement(transformation(extent={{-180,20},{-140,60}}),
-        iconTransformation(extent={{-140,10},{-100,50}})));
+    annotation (Placement(transformation(extent={{-180,30},{-140,70}}),
+        iconTransformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWin if have_winSen
     "Window status, true if open, false if closed"
-    annotation (Placement(transformation(extent={{-180,-10},{-140,30}}),
-        iconTransformation(extent={{-140,-10},{-100,30}})));
+    annotation (Placement(transformation(extent={{-180,0},{-140,40}}),
+        iconTransformation(extent={{-140,0},{-100,40}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uOpeMod
     "Zone operation mode"
     annotation (Placement(transformation(extent={{-180,-190},{-140,-150}}),
-        iconTransformation(extent={{-140,-110},{-100,-70}})));
+        iconTransformation(extent={{-140,-120},{-100,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yDam_actual
+    "Actual VAV damper position"
+    annotation (Placement(transformation(extent={{-180,-100},{-140,-60}}),
+        iconTransformation(extent={{-140,-60},{-100,-20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yVal(
     final min=0,
     final max=1,
@@ -334,52 +338,48 @@ block Controller "Controller for room VAV box"
     final durTimDisAir=durTimDisAir)
     "Number of system requests"
     annotation (Placement(transformation(extent={{80,-100},{100,-80}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conHeaLoo(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conHeaLoo(
     final controllerType=controllerTypeHea,
     final k=kHea,
     final Ti=TiHea,
     final Td=TdHea,
     final yMax=1,
-    final yMin=0,
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter)
-                  "Heating loop signal"
+    final yMin=0) "Heating loop signal"
     annotation (Placement(transformation(extent={{-110,150},{-90,170}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conCooLoo(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCooLoo(
     final controllerType=controllerTypeCoo,
     final k=kCoo,
     final Ti=TiCoo,
     final Td=TdCoo,
     final yMax=1,
     final yMin=0,
-    reverseAction=true,
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter)
-                        "Cooling loop signal"
+    reverseActing=false) "Cooling loop signal"
     annotation (Placement(transformation(extent={{-110,110},{-90,130}})));
 
 protected
   Buildings.Controls.OBC.CDL.Integers.Equal isUnOcc
     "Output true if unoccupied"
-    annotation (Placement(transformation(extent={{-38,-160},{-18,-140}})));
+    annotation (Placement(transformation(extent={{-18,-160},{2,-140}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant conIntUn(
     final k=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.unoccupied)
     "Constant signal for unoccupied mode"
-    annotation (Placement(transformation(extent={{-80,-160},{-60,-140}})));
+    annotation (Placement(transformation(extent={{-60,-160},{-40,-140}})));
   Buildings.Controls.OBC.CDL.Logical.Not isNotUn
   "Output true if not unoccupied"
-    annotation (Placement(transformation(extent={{0,-160},{20,-140}})));
+    annotation (Placement(transformation(extent={{20,-160},{40,-140}})));
 
 equation
   connect(sysReq.TZonCooSet, TZonCooSet)
     annotation (Line(points={{78,-82},{-120,-82},{-120,120},{-160,120}},
       color={0,0,127}));
   connect(sysReq.TZon, TZon)
-    annotation (Line(points={{78,-84},{0,-84},{0,-20},{-160,-20}},
+    annotation (Line(points={{78,-84},{0,-84},{0,-14},{-160,-14}},
       color={0,0,127}));
   connect(sysReq.VDisSet_flow, damVal.VDisSet_flow)
     annotation (Line(points={{78,-88},{64,-88},{64,-2},{42,-2}},
       color={0,0,127}));
   connect(sysReq.VDis_flow, VDis_flow)
-    annotation (Line(points={{78,-90},{34,-90},{34,-60},{-160,-60}},
+    annotation (Line(points={{78,-90},{34,-90},{34,-50},{-160,-50}},
       color={0,0,127}));
   connect(sysReq.TDisHeaSet, damVal.TDisHeaSet)
     annotation (Line(points={{78,-94},{58,-94},{58,-18},{42,-18}},
@@ -391,24 +391,20 @@ equation
     annotation (Line(points={{42,-14},{120,-14},{120,-20},{160,-20}},
       color={0,0,127}));
   connect(damVal.VDis_flow, VDis_flow)
-    annotation (Line(points={{34,-22},{34,-60},{-160,-60}},color={0,0,127}));
+    annotation (Line(points={{34,-22},{34,-50},{-160,-50}},color={0,0,127}));
   connect(damVal.TDis, TDis)
-    annotation (Line(points={{26,-22},{26,-100},{-160,-100}},
+    annotation (Line(points={{26,-22},{26,-110},{-160,-110}},
                                                            color={0,0,127}));
   connect(sysReq.TDis, TDis)
-    annotation (Line(points={{78,-96},{26,-96},{26,-100},{-160,-100}},
-      color={0,0,127}));
-  connect(sysReq.uDam, damVal.yDam)
-    annotation (Line(points={{78,-92},{62,-92},{62,-6},{42,-6}},
+    annotation (Line(points={{78,-96},{26,-96},{26,-110},{-160,-110}},
       color={0,0,127}));
   connect(damVal.yHeaVal, sysReq.uHeaVal)
     annotation (Line(points={{42,-14},{50,-14},{50,-98},{78,-98}},
                                                              color={0,0,127}));
-  connect(TZon, damVal.TZon) annotation (Line(points={{-160,-20},{-40,-20},{-40,
-          -14},{18,-14}},
+  connect(TZon, damVal.TZon) annotation (Line(points={{-160,-14},{18,-14}},
                    color={0,0,127}));
-  connect(damVal.TSup, TSupAHU) annotation (Line(points={{18,-8},{-80,-8},{-80,-130},
-          {-160,-130}},color={0,0,127}));
+  connect(damVal.TSup, TSupAHU) annotation (Line(points={{18,-8},{-80,-8},{-80,-140},
+          {-160,-140}},color={0,0,127}));
   connect(actAirSet.VActCooMax_flow, damVal.VActCooMax_flow) annotation (Line(points={{-18,78},
           {0,78},{0,-4},{18,-4}},      color={0,0,127}));
   connect(actAirSet.VActCooMin_flow, damVal.VActCooMin_flow) annotation (Line(points={{-18,75},
@@ -450,21 +446,21 @@ equation
     annotation (Line(points={{-42,74},{-60,74},{-60,80},{-160,80}},
       color={0,0,127}));
   connect(actAirSet.nOcc, nOcc)
-    annotation (Line(points={{-42,66},{-60,66},{-60,40},{-160,40}},
+    annotation (Line(points={{-42,66},{-60,66},{-60,50},{-160,50}},
       color={0,0,127}));
   connect(actAirSet.uWin, uWin)
-    annotation (Line(points={{-42,62},{-56,62},{-56,10},{-160,10}},
+    annotation (Line(points={{-42,62},{-56,62},{-56,20},{-160,20}},
       color={255,0,255}));
   connect(TZonHeaSet, conHeaLoo.u_s)
     annotation (Line(points={{-160,160},{-112,160}}, color={0,0,127}));
   connect(TZonCooSet, conCooLoo.u_s)
     annotation (Line(points={{-160,120},{-112,120}}, color={0,0,127}));
   connect(TZon, conHeaLoo.u_m)
-    annotation (Line(points={{-160,-20},{-122,-20},{-122,140},{-100,140},{-100,148}},
+    annotation (Line(points={{-160,-14},{-122,-14},{-122,140},{-100,140},{-100,148}},
                    color={0,0,127}));
   connect(TZon, conCooLoo.u_m)
-    annotation (Line(points={{-160,-20},{-122,-20},{-122,100},{-100,100},
-      {-100,108}}, color={0,0,127}));
+    annotation (Line(points={{-160,-14},{-122,-14},{-122,100},{-100,100},{-100,108}},
+                   color={0,0,127}));
   connect(conCooLoo.y, damVal.uCoo)
     annotation (Line(points={{-88,120},{8,120},{8,0},{18,0}},
       color={0,0,127}));
@@ -474,22 +470,23 @@ equation
   connect(conCooLoo.y, sysReq.uCoo)
     annotation (Line(points={{-88,120},{8,120},{8,-86},{78,-86}},
       color={0,0,127}));
-
   connect(damVal.uOpeMod, uOpeMod) annotation (Line(points={{18,-20},{-112,-20},
           {-112,-170},{-160,-170}},
                                   color={255,127,0}));
   connect(conIntUn.y, isUnOcc.u1)
-    annotation (Line(points={{-58,-150},{-40,-150}}, color={255,127,0}));
-  connect(uOpeMod, isUnOcc.u2) annotation (Line(points={{-160,-170},{-52,-170},{
-          -52,-158},{-40,-158}}, color={255,127,0}));
+    annotation (Line(points={{-38,-150},{-20,-150}}, color={255,127,0}));
+  connect(uOpeMod, isUnOcc.u2) annotation (Line(points={{-160,-170},{-32,-170},{
+          -32,-158},{-20,-158}}, color={255,127,0}));
   connect(isUnOcc.y, isNotUn.u)
-    annotation (Line(points={{-16,-150},{-2,-150}}, color={255,0,255}));
-  connect(isNotUn.y, conCooLoo.trigger) annotation (Line(points={{22,-150},{40,-150},
-          {40,-120},{-116,-120},{-116,104},{-108,104},{-108,108}}, color={255,0,
+    annotation (Line(points={{4,-150},{18,-150}},   color={255,0,255}));
+  connect(isNotUn.y, conCooLoo.trigger) annotation (Line(points={{42,-150},{60,-150},
+          {60,-120},{-116,-120},{-116,104},{-106,104},{-106,108}}, color={255,0,
           255}));
-  connect(isNotUn.y, conHeaLoo.trigger) annotation (Line(points={{22,-150},{40,-150},
-          {40,-120},{-116,-120},{-116,142},{-108,142},{-108,148}}, color={255,0,
+  connect(isNotUn.y, conHeaLoo.trigger) annotation (Line(points={{42,-150},{60,-150},
+          {60,-120},{-116,-120},{-116,142},{-106,142},{-106,148}}, color={255,0,
           255}));
+  connect(sysReq.yDam_actual,yDam_actual)  annotation (Line(points={{78,-92},{-124,
+          -92},{-124,-80},{-160,-80}}, color={0,0,127}));
 
 annotation (defaultComponentName="terUniCon",
   Icon(graphics={Rectangle(
@@ -498,11 +495,11 @@ annotation (defaultComponentName="terUniCon",
         fillColor={255,255,255},
         fillPattern=FillPattern.Solid),
         Text(
-          extent={{-100,-46},{-78,-56}},
+          extent={{-100,-54},{-78,-64}},
           lineColor={0,0,127},
           textString="TDis"),
         Text(
-          extent={{-100,-64},{-70,-76}},
+          extent={{-100,-70},{-70,-82}},
           lineColor={0,0,127},
           textString="TSup"),
         Text(
@@ -514,26 +511,27 @@ annotation (defaultComponentName="terUniCon",
           lineColor={0,0,127},
           textString="yDam"),
         Text(
-          extent={{-98,96},{-46,84}},
+          extent={{-98,100},{-46,88}},
           lineColor={0,0,127},
           textString="TZonHeaSet"),
         Text(
-          extent={{-98,-24},{-68,-36}},
+          extent={{-98,-14},{-68,-26}},
           lineColor={0,0,127},
-          textString="VDis_flow"),        Text(
-        extent={{-120,160},{114,108}},
-        textString="%name",
-        lineColor={0,0,255}),
+          textString="VDis_flow"),
+        Text(
+          extent={{-120,160},{114,108}},
+          textString="%name",
+          lineColor={0,0,255}),
         Text(
-          extent={{-96,-4},{-74,-18}},
+          extent={{-96,6},{-74,-8}},
           lineColor={0,0,127},
           textString="TZon"),
         Text(
-          extent={{-100,74},{-46,64}},
+          extent={{-100,84},{-46,74}},
           lineColor={0,0,127},
           textString="TZonCooSet"),
         Text(
-          extent={{-100,-82},{-52,-94}},
+          extent={{-100,-86},{-52,-98}},
           lineColor={0,0,127},
           textString="uOpeMod"),
         Text(
@@ -558,7 +556,11 @@ annotation (defaultComponentName="terUniCon",
         Text(
           extent={{24,-62},{96,-96}},
           lineColor={0,0,127},
-          textString="yZonPreResReq")}),
+          textString="yZonPreResReq"),
+        Text(
+          extent={{-98,-34},{-50,-44}},
+          lineColor={0,0,127},
+          textString="uDam_actual")}),
     Diagram(coordinateSystem(extent={{-140,-180},{140,180}})),
 Documentation(info="<html>
 <p>
@@ -573,8 +575,8 @@ reset request <code>yZonPreResReq</code>.
 <p>
 The subsequence is implementd according to Part 5.B.5. The measured zone
 temperature <code>TZon</code>, zone setpoints temperatures <code>TZonHeaSet</code> and
-<code>TZonCooSet</code> are inputs to the block <code>conHeaLoo</code> and 
-<code>conCooLoo</code> to generate the control loop signal. 
+<code>TZonCooSet</code> are inputs to the block <code>conHeaLoo</code> and
+<code>conCooLoo</code> to generate the control loop signal.
 </p>
 <h4>b. Active airflow setpoint calculation</h4>
 <p>
@@ -608,6 +610,18 @@ Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.SystemRequests</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+October 9, 2020, by Jianjun Hu:<br/>
+Changed the default heating maximum airflow setpoint to 30% of the zone nominal airflow.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2172\">issue 2172</a>.
+</li>
+<li>
+April 18, 2020, by Jianjun Hu:<br/>
+Added actual VAV damper position as the input for generating system request.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">issue 1873</a>.
+</li>
+<li>
 March 06, 2020, by Jianjun Hu:<br/>
 Added default component name.<br/>
 This is for
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo
deleted file mode 100644
index 00a87ad2117..00000000000
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/ModeAndSetPoints.mo
+++ /dev/null
@@ -1,473 +0,0 @@
-within Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits;
-block ModeAndSetPoints
-  "Output zone setpoint with operation mode selection"
-
-  parameter Real TZonHeaOn(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=293.15
-    "Heating setpoint during on";
-  parameter Real TZonHeaOff(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=285.15
-    "Heating setpoint during off";
-  parameter Real TZonCooOn(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=297.15
-    "Cooling setpoint during on";
-  parameter Real TZonCooOff(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=303.15
-    "Cooling setpoint during off";
-  parameter Real preWarCooTim(
-    final unit="s",
-    final quantity="Time")=10800
-    "Maximum cool-down/warm-up time"
-    annotation (Dialog(tab="Operation mode", group="Parameters"));
-  parameter Real bouLim(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=1.1
-    "Value limit to indicate the end of setback/setup mode"
-    annotation (Dialog(tab="Operation mode", group="Parameters"));
-  parameter Real TZonFreProOn(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=277.55
-    "Threshold zone temperature value to activate freeze protection mode"
-    annotation (Dialog(tab="Operation mode", group="Parameters"));
-  parameter Real TZonFreProOff(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=280.35
-    "Threshold zone temperature value to finish the freeze protection mode"
-    annotation (Dialog(tab="Operation mode", group="Parameters"));
-  parameter Real warCooTim(
-    final unit="s",
-    final quantity="Time")=1800
-    "Defined cool-down/warm-up time"
-    annotation (Dialog(tab="Operation mode", group="Test setting"));
-  parameter Boolean have_occSen=false
-    "Check if the zone has occupancy sensor"
-    annotation (Dialog(tab="Setpoint adjust", group="Sensors"));
-  parameter Boolean have_winSen=false
-    "Check if the zone has window status sensor"
-    annotation (Dialog(tab="Setpoint adjust", group="Sensors"));
-  parameter Boolean cooAdj=false
-    "Flag, set to true if both cooling and heating setpoint are adjustable separately"
-    annotation (Dialog(tab="Setpoint adjust", group="Adjustable settings"));
-  parameter Boolean heaAdj=false
-    "Flag, set to true if heating setpoint is adjustable"
-    annotation (Dialog(tab="Setpoint adjust", group="Adjustable settings"));
-  parameter Boolean sinAdj=false
-    "Flag, set to true if both cooling and heating setpoint are adjustable through a single common knob"
-    annotation (Dialog(tab="Setpoint adjust", group="Adjustable settings"));
-  parameter Boolean ignDemLim=true
-    "Flag, set to true to exempt individual zone from demand limit setpoint adjustment"
-    annotation (Dialog(tab="Setpoint adjust", group="Adjustable settings"));
-  parameter Real TZonCooOnMax(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=300.15
-    "Maximum cooling setpoint during on"
-    annotation (Dialog(tab="Setpoint adjust", group="Limits"));
-  parameter Real TZonCooOnMin(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=295.15
-    "Minimum cooling setpoint during on"
-    annotation (Dialog(tab="Setpoint adjust", group="Limits"));
-  parameter Real TZonHeaOnMax(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=295.15
-    "Maximum heating setpoint during on"
-    annotation (Dialog(tab="Setpoint adjust", group="Limits"));
-  parameter Real TZonHeaOnMin(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=291.15
-    "Minimum heating setpoint during on"
-    annotation (Dialog(tab="Setpoint adjust", group="Limits"));
-  parameter Real TZonCooSetWinOpe(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=322.15
-    "Cooling setpoint when window is open"
-    annotation (Dialog(tab="Setpoint adjust", group="Limits"));
-  parameter Real TZonHeaSetWinOpe(
-    final unit="K",
-    final displayUnit="degC",
-    final quantity="ThermodynamicTemperature")=277.15
-    "Heating setpoint when window is open"
-    annotation (Dialog(tab="Setpoint adjust", group="Limits"));
-  parameter Real incTSetDem_1(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=0.56
-    "Cooling setpoint increase value when cooling demand limit level 1 is imposed"
-    annotation (Dialog(tab="Setpoint adjust", group="Demands settings"));
-  parameter Real incTSetDem_2(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=1.1
-    "Cooling setpoint increase value when cooling demand limit level 2 is imposed"
-    annotation (Dialog(tab="Setpoint adjust", group="Demands settings"));
-  parameter Real incTSetDem_3(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=2.2
-    "Cooling setpoint increase value when cooling demand limit level 3 is imposed"
-    annotation (Dialog(tab="Setpoint adjust", group="Demands settings"));
-  parameter Real decTSetDem_1(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=0.56
-    "Heating setpoint decrease value when heating demand limit level 1 is imposed"
-    annotation (Dialog(tab="Setpoint adjust", group="Demands settings"));
-  parameter Real decTSetDem_2(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=1.1
-    "Heating setpoint decrease value when heating demand limit level 2 is imposed"
-    annotation (Dialog(tab="Setpoint adjust", group="Demands settings"));
-  parameter Real decTSetDem_3(
-    final unit="K",
-    final displayUnit="K",
-    final quantity="TemperatureDifference")=2.2
-    "Heating setpoint decrease value when heating demand limit level 3 is imposed"
-    annotation (Dialog(tab="Setpoint adjust", group="Demands settings"));
-  parameter Integer cooDemLimLevCon=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.DemandLimitLevels.cooling0
-    "Cooling demand limit level"
-    annotation (Dialog(tab="Setpoint adjust"));
-  parameter Integer heaDemLimLevCon=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.DemandLimitLevels.heating0
-    "Heating demand limit level"
-    annotation (Dialog(tab="Setpoint adjust"));
-  parameter Boolean winStaCon=false
-    "Window status, set to true if window is open"
-    annotation (Dialog(tab="Setpoint adjust"));
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput tNexOcc(
-    final unit="s",
-    quantity="Time")
-    "Time to next occupied period"
-    annotation (Placement(transformation(extent={{-200,120},{-160,160}}),
-      iconTransformation(extent={{-140,70},{-100,110}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc
-    "Current occupancy period, true if it is in occupant period"
-    annotation (Placement(transformation(extent={{-200,-10},{-160,30.5}}),
-      iconTransformation(extent={{-140,40},{-100,80.5}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
-    final unit="K",
-    quantity="ThermodynamicTemperature")
-    "Measured zone temperatures"
-    annotation (Placement(transformation(extent={{-200,-70},{-160,-30}}),
-      iconTransformation(extent={{-140,10},{-100,50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput setAdj(
-    final unit="K",
-    quantity="ThermodynamicTemperature") if (cooAdj or sinAdj)
-    "Setpoint adjustment value"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-180,-80}),
-      iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput heaSetAdj(
-    final unit="K",
-    quantity="ThermodynamicTemperature") if heaAdj
-    "Heating setpoint adjustment value"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},origin={-180,-120}),
-      iconTransformation(extent={{-140,-50},{-100,-10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOccSen if have_occSen
-    "Occupancy sensor (occupied=true, unoccupied=false)"
-    annotation (Placement(transformation(extent={{-200,-180},{-160,-140}}),
-      iconTransformation(extent={{-140,-80},{-100,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWinSta if have_winSen
-    "Window status (open=true, close=false)"
-    annotation (Placement(transformation(extent={{-200,-220},{-160,-180}}),
-      iconTransformation(extent={{-140,-110},{-100,-70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonCooSet(
-    final unit="K",
-    quantity="ThermodynamicTemperature") "Cooling setpoint temperature"
-    annotation (Placement(transformation(extent={{160,90},{200,130}}),
-      iconTransformation(extent={{100,50},{140,90}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonHeaSet(
-    final unit="K",
-    quantity="ThermodynamicTemperature") "Heating setpoint temperature"
-    annotation (Placement(transformation(extent={{160,40},{200,80}}),
-      iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yOpeMod
-    "Operation mode"
-    annotation (Placement(transformation(extent={{160,-30},{200,10}}),
-      iconTransformation(extent={{100,-90},{140,-50}})));
-
-protected
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures
-    TZonSet(
-    final have_occSen=have_occSen,
-    final have_winSen=have_winSen,
-    final cooAdj=cooAdj,
-    final heaAdj=heaAdj,
-    final sinAdj=sinAdj,
-    final ignDemLim=ignDemLim,
-    final TZonCooOnMax=TZonCooOnMax,
-    final TZonCooOnMin=TZonCooOnMin,
-    final TZonHeaOnMax=TZonHeaOnMax,
-    final TZonHeaOnMin=TZonHeaOnMin,
-    final TZonCooSetWinOpe=TZonCooSetWinOpe,
-    final TZonHeaSetWinOpe=TZonHeaSetWinOpe,
-    final incTSetDem_1=incTSetDem_1,
-    final incTSetDem_2=incTSetDem_2,
-    final incTSetDem_3=incTSetDem_3,
-    final decTSetDem_1=decTSetDem_1,
-    final decTSetDem_2=decTSetDem_2,
-    final decTSetDem_3=decTSetDem_3) "Zone set point temperature"
-    annotation (Placement(transformation(extent={{80,-100},{120,-60}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant cooDemLimLev(
-    final k=cooDemLimLevCon)
-    "Cooling demand limit level"
-    annotation (Placement(transformation(extent={{0,-150},{20,-130}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant heaDemLimLev(
-    final k=heaDemLimLevCon) "Heating demand limit level"
-    annotation (Placement(transformation(extent={{0,-210},{20,-190}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetRooHeaOn(
-    final k=TZonHeaOn)
-    "Heating on setpoint"
-    annotation (Placement(transformation(extent={{-120,140},{-100,160}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetRooHeaOff(
-    final k=TZonHeaOff)
-    "Heating off set point"
-    annotation (Placement(transformation(extent={{-120,60},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetRooCooOn(
-    final k=TZonCooOn)
-    "Cooling on setpoint"
-    annotation (Placement(transformation(extent={{-120,100},{-100,120}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetRooCooOff(
-    final k=TZonCooOff)
-    "Cooling off set point"
-    annotation (Placement(transformation(extent={{-120,20},{-100,40}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
-    opeModSel(
-    final have_winSen=have_winSen,
-    final numZon=1,
-    final preWarCooTim=preWarCooTim,
-    final TZonFreProOn=TZonFreProOn,
-    final TZonFreProOff=TZonFreProOff) "Operation mode selector"
-    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant tCooDowHeaUp(
-    final k=warCooTim) "Cool down and heat up time (simplified as constant)"
-    annotation (Placement(transformation(extent={{-120,180},{-100,200}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus zonSta(
-    final have_winSen=have_winSen) "Check zone temperature status"
-    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger colZon
-    "Check if the zone is cold zone"
-    annotation (Placement(transformation(extent={{-20,10},{0,30}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger hotZon
-    "Check if the zone is hot zone"
-    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
-
-equation
-  connect(TZonSet.uCooDemLimLev,cooDemLimLev. y)
-    annotation (Line(points={{78,-94},{36,-94},{36,-140},{22,-140}},
-      color={255,127,0}));
-  connect(heaDemLimLev.y,TZonSet. uHeaDemLimLev)
-    annotation (Line(points={{22,-200},{40,-200},{40,-98},{78,-98}},
-      color={255,127,0}));
-  connect(TZonSet.TZonCooSet, TZonCooSet)
-    annotation (Line(points={{122,-72},{132,-72},{132,110},{180,110}},
-      color={0,0,127}));
-  connect(TZonSet.TZonHeaSet, TZonHeaSet)
-    annotation (Line(points={{122,-80},{140,-80},{140,60},{180,60}},
-      color={0,0,127}));
-  connect(setAdj, TZonSet.setAdj)
-    annotation (Line(points={{-180,-80},{-100,-80},{-100,-83},{78,-83}},
-      color={0,0,127}));
-  connect(heaSetAdj, TZonSet.heaSetAdj)
-    annotation (Line(points={{-180,-120},{-100,-120},{-100,-87},{78,-87}},
-      color={0,0,127}));
-  connect(TZonSet.uOccSen, uOccSen)
-    annotation (Line(points={{94,-102},{94,-160},{-180,-160}},
-      color={255,0,255}));
-  connect(TZonSet.uWinSta, uWinSta)
-    annotation (Line(points={{106,-102},{106,-170},{-72,-170},{-72,-200},{-180,-200}},
-      color={255,0,255}));
-  connect(tCooDowHeaUp.y, zonSta.cooDowTim) annotation (Line(points={{-98,190},{
-          -74,190},{-74,59},{-62,59}}, color={0,0,127}));
-  connect(tCooDowHeaUp.y, zonSta.warUpTim) annotation (Line(points={{-98,190},{-74,
-          190},{-74,57},{-62,57}}, color={0,0,127}));
-  connect(uWinSta, zonSta.uWinSta) annotation (Line(points={{-180,-200},{-72,-200},
-          {-72,55},{-62,55}}, color={255,0,255}));
-  connect(TSetRooHeaOn.y, zonSta.TZonHeaSetOcc) annotation (Line(points={{-98,150},
-          {-76,150},{-76,53},{-62,53}}, color={0,0,127}));
-  connect(TSetRooCooOn.y, zonSta.TZonCooSetOcc) annotation (Line(points={{-98,110},
-          {-78,110},{-78,51},{-62,51}}, color={0,0,127}));
-  connect(TZon, zonSta.TZonMax) annotation (Line(points={{-180,-50},{-68,-50},{-68,
-          49},{-62,49}}, color={0,0,127}));
-  connect(TZon, zonSta.TZon) annotation (Line(points={{-180,-50},{-68,-50},{-68,
-          47},{-62,47}}, color={0,0,127}));
-  connect(TZon, zonSta.TZonMin) annotation (Line(points={{-180,-50},{-68,-50},{-68,
-          45},{-62,45}}, color={0,0,127}));
-  connect(TSetRooHeaOff.y, zonSta.TZonHeaSetUno) annotation (Line(points={{-98,70},
-          {-80,70},{-80,43},{-62,43}}, color={0,0,127}));
-  connect(TSetRooCooOff.y, zonSta.TZonCooSetUno) annotation (Line(points={{-98,30},
-          {-66,30},{-66,41},{-62,41}}, color={0,0,127}));
-  connect(uOcc, opeModSel.uOcc) annotation (Line(points={{-180,10.25},{-136,10.25},
-          {-136,2},{38,2}}, color={255,0,255}));
-  connect(tNexOcc, opeModSel.tNexOcc) annotation (Line(points={{-180,140},{-140,
-          140},{-140,0},{38,0}},   color={0,0,127}));
-  connect(zonSta.yCooTim, opeModSel.maxCooDowTim) annotation (Line(points={{-38,59},
-          {30,59},{30,-2},{38,-2}},     color={0,0,127}));
-  connect(zonSta.yWarTim, opeModSel.maxWarUpTim) annotation (Line(points={{-38,57},
-          {28,57},{28,-4},{38,-4}}, color={0,0,127}));
-  connect(zonSta.yOccHeaHigMin, opeModSel.occHeaHigMin) annotation (Line(points={{-38,53},
-          {26,53},{26,-6},{38,-6}},          color={255,0,255}));
-  connect(zonSta.yMaxHigOccCoo, opeModSel.maxHigOccCoo) annotation (Line(points={{-38,51},
-          {24,51},{24,-8},{38,-8}},          color={255,0,255}));
-  connect(zonSta.yUnoHeaHigMin, opeModSel.unoHeaHigMin) annotation (Line(points={{-38,45},
-          {22,45},{22,-14},{38,-14}},          color={255,0,255}));
-  connect(TZon, opeModSel.TZonMax) annotation (Line(points={{-180,-50},{-68,-50},
-          {-68,-16},{38,-16}}, color={0,0,127}));
-  connect(TZon, opeModSel.TZonMin) annotation (Line(points={{-180,-50},{-68,-50},
-          {-68,-18},{38,-18}}, color={0,0,127}));
-  connect(zonSta.yMaxHigUnoCoo, opeModSel.maxHigUnoCoo) annotation (Line(points={{-38,43},
-          {20,43},{20,-22},{38,-22}},          color={255,0,255}));
-  connect(zonSta.yLowUnoHea, colZon.u) annotation (Line(points={{-38,49},{-26,49},
-          {-26,20},{-22,20}}, color={255,0,255}));
-  connect(zonSta.yHigUnoCoo, hotZon.u) annotation (Line(points={{-38,41},{-28,41},
-          {-28,-40},{-22,-40}}, color={255,0,255}));
-  connect(colZon.y, opeModSel.totColZon) annotation (Line(points={{2,20},{18,20},
-          {18,-12},{38,-12}}, color={255,127,0}));
-  connect(hotZon.y, opeModSel.totHotZon) annotation (Line(points={{2,-40},{18,-40},
-          {18,-20},{38,-20}}, color={255,127,0}));
-  connect(opeModSel.yOpeMod, TZonSet.uOpeMod) annotation (Line(points={{62,-10},
-          {70,-10},{70,-62},{78,-62}}, color={255,127,0}));
-  connect(opeModSel.yOpeMod, yOpeMod)
-    annotation (Line(points={{62,-10},{180,-10}}, color={255,127,0}));
-  connect(TSetRooCooOn.y, TZonSet.TZonCooSetOcc) annotation (Line(points={{-98,110},
-          {-78,110},{-78,-67},{78,-67}}, color={0,0,127}));
-  connect(TSetRooCooOff.y, TZonSet.TZonCooSetUno) annotation (Line(points={{-98,30},
-          {-74,30},{-74,-71.2},{78,-71.2}},     color={0,0,127}));
-  connect(TSetRooHeaOn.y, TZonSet.TZonHeaSetOcc) annotation (Line(points={{-98,150},
-          {-76,150},{-76,-75.2},{78,-75.2}}, color={0,0,127}));
-  connect(TSetRooHeaOff.y, TZonSet.TZonHeaSetUno) annotation (Line(points={{-98,70},
-          {-80,70},{-80,-79},{78,-79}},     color={0,0,127}));
-
-  connect(uWinSta, opeModSel.uWinSta) annotation (Line(points={{-180,-200},{-72,
-          -200},{-72,-10},{38,-10}}, color={255,0,255}));
-annotation (defaultComponentName="modSetPoi",
-  Diagram(coordinateSystem(extent={{-160,-220},{160,220}})),
-  Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
-       graphics={Text(
-        extent={{-100,140},{98,102}},
-        textString="%name",
-        lineColor={0,0,255}),
-      Rectangle(
-        extent={{-100,-100},{100,100}},
-        lineColor={0,0,127},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid),
-        Text(
-          extent={{-98,98},{-48,82}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="tNexOcc"),
-        Text(
-          extent={{-100,70},{-68,56}},
-          lineColor={255,0,255},
-          pattern=LinePattern.Dash,
-          textString="uOcc"),
-        Text(
-          extent={{-100,40},{-62,24}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZon"),
-        Text(
-          visible=cooAdj or sinAdj,
-          extent={{-100,12},{-56,-8}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="setAdj"),
-        Text(
-          visible=heaAdj,
-          extent={{-98,-20},{-34,-40}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="heaSetAdj"),
-        Text(
-          visible=have_occSen,
-          extent={{-98,-50},{-50,-68}},
-          lineColor={255,0,255},
-          pattern=LinePattern.Dash,
-          textString="uOccSen"),
-        Text(
-          visible=have_winSen,
-          extent={{-98,-80},{-56,-98}},
-          lineColor={255,0,255},
-          pattern=LinePattern.Dash,
-          textString="uWinSta"),
-        Text(
-          extent={{34,80},{98,64}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonCooSet"),
-        Text(
-          extent={{34,10},{98,-6}},
-          lineColor={0,0,127},
-          pattern=LinePattern.Dash,
-          textString="TZonHeaSet"),
-        Text(
-          extent={{36,-60},{100,-76}},
-          lineColor={255,127,0},
-          pattern=LinePattern.Dash,
-          textString="yOpeMod")}),
-Documentation(info="<html>
-<p>
-Block that outputs the zone setpoint temperature (<code>TZonCooSet</code>, <code>TZonHeaSet</code>)
-and system operation mode (<code>yOpeMod</code>). When operation mode is in freeze
-protection setback mode, it also outputs a level 3 freeze protection alarm
-<code>yFreProSta</code>. The sequences are implemented according to ASHRAE
-Guideline 36, Part 5.B.3 and 5.C.6.
-</p>
-<p>The sequence consists of the following two subsequences.</p>
-<h4>Operation mode selector</h4>
-<p>
-The subsequence outputs one of seven types of system operation mode (occupied, warmup,
-cool-down, setback, freeze protection setback, setup, unoccupied) according
-to current time, the time to next occupied hours <code>tNexOcc</code> and
-current zone temperature <code>TZon</code>.
-See
-<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode\">
-Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode</a>.
-</p>
-<h4>Zone setpoint temperature reset</h4>
-<p>
-This sequence is implemented according to Part 5.B.3. It sets the zone temperature setpoint
-according to the globally specified setpoints, the local setpoint adjustments, the demand
-limits adjustment, the window status and the occupancy status.
-See
-<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures\">
-Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures</a>.
-</p>
-<h4>Usage</h4>
-<p>
-This version is for a single zone only to be used in the Single Zone VAV sequence.
-For multizone systems, use
-<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints\">
-Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 11, 2020, by Jianjun Hu:<br/>
-Reimplemented to avoid vector-valued calculations.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">issue 1709</a>.
-</li>
-<li>
-October 24, 2018, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ModeAndSetPoints;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
index 31492ae0d73..86265bbaa64 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
@@ -38,6 +38,10 @@ block DamperValves
       enable=controllerTypeVal == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
           or controllerTypeVal == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
 
+  parameter Boolean have_pressureIndependentDamper = true
+    "True: the VAV damper is pressure independent (with built-in flow controller)"
+    annotation(Dialog(group="Damper"));
+
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeDam=
     Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller"
@@ -122,7 +126,7 @@ block DamperValves
   Buildings.Controls.OBC.CDL.Interfaces.RealInput VDis_flow(
     final min=0,
     final unit="m3/s",
-    final quantity="VolumeFlowRate")
+    final quantity="VolumeFlowRate") if not have_pressureIndependentDamper
     "Measured discharge airflow rate airflow rate"
     annotation (Placement(transformation(extent={{-360,320},{-320,360}}),
       iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={40,-120})));
@@ -161,8 +165,7 @@ block DamperValves
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yDam(
     final min=0,
     final max=1,
-    final unit="1")
-    "Damper position"
+    final unit="1") "Signal for VAV damper"
     annotation (Placement(transformation(extent={{320,20},{360,60}}),
         iconTransformation(extent={{100,20},{140,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yHeaVal(
@@ -176,7 +179,7 @@ block DamperValves
     final min=0,
     final unit="m3/s",
     final quantity="VolumeFlowRate") "Discharge airflow setpoint"
-    annotation (Placement(transformation(extent={{320,210},{360,250}}),
+    annotation (Placement(transformation(extent={{320,240},{360,280}}),
         iconTransformation(extent={{100,60},{140,100}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TDisHeaSet(
     final unit="K",
@@ -206,7 +209,7 @@ block DamperValves
   Buildings.Controls.OBC.CDL.Continuous.Line lin3
     "Active airflow setpoint for heating"
     annotation (Placement(transformation(extent={{-80,-310},{-60,-290}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conVal(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conVal(
     final controllerType=controllerTypeVal,
     final k=kVal,
     final Ti=TiVal,
@@ -214,20 +217,19 @@ block DamperValves
     final yMax=1,
     final yMin=0,
     u_s(final unit="K", displayUnit="degC"),
-    u_m(final unit="K", displayUnit="degC"),
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter)
+    u_m(final unit="K", displayUnit="degC"))
     "Hot water valve controller"
     annotation (Placement(transformation(extent={{34,-90},{54,-70}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conDam(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conDam(
     final controllerType=controllerTypeDam,
     final k=kDam,
     final Ti=TiDam,
     final Td=TdDam,
     final yMax=1,
     final yMin=0,
-    final reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
-    final y_reset=0) "Damper position controller"
-    annotation (Placement(transformation(extent={{280,180},{300,200}})));
+    final y_reset=0) if not have_pressureIndependentDamper
+    "Damper position controller"
+    annotation (Placement(transformation(extent={{280,220},{300,240}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi
     "Output active cooling airflow according to cooling control signal"
     annotation (Placement(transformation(extent={{140,260},{160,280}})));
@@ -338,7 +340,7 @@ protected
   Buildings.Controls.OBC.CDL.Logical.Switch swi6
     "Output hot water valve position in case of low discharge air temperature"
     annotation (Placement(transformation(extent={{-30,-90},{-10,-70}})));
-  Buildings.Controls.OBC.CDL.Logical.Or or2
+  Buildings.Controls.OBC.CDL.Logical.Or or2 "Logical not"
     annotation (Placement(transformation(extent={{-68,-64},{-48,-44}})));
   Buildings.Controls.OBC.CDL.Logical.Not not3 "Logical not"
     annotation (Placement(transformation(extent={{-120,120},{-100,140}})));
@@ -348,21 +350,27 @@ protected
   Buildings.Controls.OBC.CDL.Logical.Not not6 "Negation of input signal"
     annotation (Placement(transformation(extent={{-40,-192},{-20,-172}})));
   Buildings.Controls.OBC.CDL.Logical.And and1
+    "Check if it is not in heating mode and the discharge temperature is not too low"
     annotation (Placement(transformation(extent={{20,-56},{40,-36}})));
   Buildings.Controls.OBC.CDL.Continuous.Add add3 "Active airflow setpoint"
-    annotation (Placement(transformation(extent={{200,220},{220,240}})));
+    annotation (Placement(transformation(extent={{200,250},{220,270}})));
   Buildings.Controls.OBC.CDL.Continuous.Add add4 "Active airflow set point"
     annotation (Placement(transformation(extent={{180,40},{200,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.Division VDis_flowNor
+  Buildings.Controls.OBC.CDL.Continuous.Division VDis_flowNor if
+       not have_pressureIndependentDamper
     "Normalized discharge volume flow rate"
-    annotation (Placement(transformation(extent={{260,140},{280,160}})));
+    annotation (Placement(transformation(extent={{240,150},{260,170}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant nomFlow(
     final k=V_flow_nominal)
     "Nominal volume flow rate"
-    annotation (Placement(transformation(extent={{200,110},{220,130}})));
+    annotation (Placement(transformation(extent={{200,200},{220,220}})));
   Buildings.Controls.OBC.CDL.Continuous.Division VDisSet_flowNor
     "Normalized setpoint for discharge volume flow rate"
-    annotation (Placement(transformation(extent={{240,180},{260,200}})));
+    annotation (Placement(transformation(extent={{240,220},{260,240}})));
+  Buildings.Controls.OBC.CDL.Continuous.Gain gai(
+    final k=1) if have_pressureIndependentDamper
+    "Block that can be disabled so remove the connection"
+    annotation (Placement(transformation(extent={{240,120},{260,140}})));
 
 equation
   connect(uCoo, lin.u)
@@ -496,10 +504,10 @@ equation
       color={255,0,255}));
   connect(truHol2.y, not2.u)
     annotation (Line(points={{-200,-210},{-180,-210},{-180,-128},{-280,-128},{-280,
-          10},{-222,10}},     color={255,0,255}));
+          10},{-222,10}}, color={255,0,255}));
   connect(truDel4.y, not1.u)
     annotation (Line(points={{-218,230},{-200,230},{-200,184},{-304,184},{-304,50},
-          {-222,50}},       color={255,0,255}));
+          {-222,50}}, color={255,0,255}));
   connect(not1.y, and2.u1)
     annotation (Line(points={{-198,50},{-82,50}}, color={255,0,255}));
   connect(not2.y, and2.u2)
@@ -521,8 +529,8 @@ equation
     annotation (Line(points={{302,-20},{340,-20}}, color={0,0,127}));
   connect(conZer2.y, damPosUno.u1) annotation (Line(points={{-58,8},{-20,8},{-20,
           -12},{250,-12},{250,78},{278,78}}, color={0,0,127}));
-  connect(conDam.y, damPosUno.u3) annotation (Line(points={{302,190},{310,190},{
-          310,96},{272,96},{272,62},{278,62}}, color={0,0,127}));
+  connect(conDam.y, damPosUno.u3) annotation (Line(points={{302,230},{310,230},{
+          310,100},{272,100},{272,62},{278,62}}, color={0,0,127}));
   connect(damPosUno.y, yDam) annotation (Line(points={{302,70},{308,70},{308,40},
           {340,40}}, color={0,0,127}));
   connect(isUno.y, damPosUno.u2) annotation (Line(points={{242,-312},{266,-312},
@@ -530,7 +538,7 @@ equation
   connect(isUno.y, not5.u) annotation (Line(points={{242,-312},{266,-312},{266,-280},
           {180,-280},{180,-250},{198,-250}}, color={255,0,255}));
   connect(not5.y, conDam.trigger) annotation (Line(points={{222,-250},{232,-250},
-          {232,170},{282,170},{282,178}}, color={255,0,255}));
+          {232,176},{284,176},{284,218}}, color={255,0,255}));
   connect(truHol2.y, or2.u2) annotation (Line(points={{-200,-210},{-88,-210},{-88,
           -62},{-70,-62}},     color={255,0,255}));
   connect(truDel3.y, not3.u)
@@ -560,31 +568,36 @@ equation
   connect(not4.y, truDel3.u)
     annotation (Line(points={{-180,130},{-162,130}}, color={255,0,255}));
   connect(not5.y, conVal.trigger) annotation (Line(points={{222,-250},{232,-250},
-          {232,-132},{36,-132},{36,-92}},  color={255,0,255}));
+          {232,-132},{38,-132},{38,-92}},  color={255,0,255}));
   connect(swi6.y, conVal.u_s)
     annotation (Line(points={{-8,-80},{32,-80}},   color={0,0,127}));
   connect(swi1.y, add4.u1) annotation (Line(points={{154,50},{168,50},{168,56},{
           178,56}}, color={0,0,127}));
   connect(swi4.y, add4.u2) annotation (Line(points={{162,-250},{170,-250},{170,44},
           {178,44}}, color={0,0,127}));
-  connect(swi.y, add3.u1) annotation (Line(points={{162,270},{180,270},{180,236},
-          {198,236}}, color={0,0,127}));
+  connect(swi.y, add3.u1) annotation (Line(points={{162,270},{180,270},{180,266},
+          {198,266}}, color={0,0,127}));
   connect(add4.y, add3.u2) annotation (Line(points={{202,50},{220,50},{220,80},{
-          180,80},{180,224},{198,224}}, color={0,0,127}));
+          180,80},{180,254},{198,254}}, color={0,0,127}));
   connect(add3.y, VDisSet_flow)
-    annotation (Line(points={{222,230},{340,230}}, color={0,0,127}));
+    annotation (Line(points={{222,260},{340,260}}, color={0,0,127}));
   connect(VDis_flow, VDis_flowNor.u1) annotation (Line(points={{-340,340},{190,340},
-          {190,156},{258,156}}, color={0,0,127}));
-  connect(nomFlow.y, VDis_flowNor.u2) annotation (Line(points={{222,120},{240,120},
-          {240,144},{258,144}}, color={0,0,127}));
+          {190,166},{238,166}}, color={0,0,127}));
+  connect(nomFlow.y, VDis_flowNor.u2) annotation (Line(points={{222,210},{230,210},
+          {230,154},{238,154}}, color={0,0,127}));
   connect(VDis_flowNor.y, conDam.u_m)
-    annotation (Line(points={{282,150},{290,150},{290,178}}, color={0,0,127}));
-  connect(nomFlow.y, VDisSet_flowNor.u2) annotation (Line(points={{222,120},{240,
-          120},{240,144},{220,144},{220,184},{238,184}}, color={0,0,127}));
-  connect(add3.y, VDisSet_flowNor.u1) annotation (Line(points={{222,230},{230,230},
-          {230,196},{238,196}}, color={0,0,127}));
+    annotation (Line(points={{262,160},{290,160},{290,218}}, color={0,0,127}));
+  connect(nomFlow.y, VDisSet_flowNor.u2) annotation (Line(points={{222,210},{230,
+          210},{230,224},{238,224}},                     color={0,0,127}));
+  connect(add3.y, VDisSet_flowNor.u1) annotation (Line(points={{222,260},{230,260},
+          {230,236},{238,236}}, color={0,0,127}));
   connect(VDisSet_flowNor.y, conDam.u_s)
-    annotation (Line(points={{262,190},{278,190}}, color={0,0,127}));
+    annotation (Line(points={{262,230},{278,230}}, color={0,0,127}));
+  connect(VDisSet_flowNor.y, gai.u) annotation (Line(points={{262,230},{270,230},
+          {270,180},{210,180},{210,130},{238,130}}, color={0,0,127}));
+  connect(gai.y, damPosUno.u3) annotation (Line(points={{262,130},{272,130},{
+          272,62},{278,62}},
+                         color={0,0,127}));
 
 annotation (
   defaultComponentName="damVal",
@@ -728,6 +741,7 @@ in heating state")}),
           pattern=LinePattern.Dash,
           textString="TZon"),
         Text(
+          visible=not have_pressureIndependentDamper,
           extent={{-11.5,4.5},{11.5,-4.5}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
@@ -865,6 +879,12 @@ src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Terminal
 </html>", revisions="<html>
 <ul>
 <li>
+April 18, 2020, by Jianjun Hu:<br/>
+Added option to check if the VAV damper is pressure independent.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>.
+</li>
+<li>
 March 11, 2020, by Jianjun Hu:<br/>
 Replaced multisum block with add blocks, replaced gain block used for normalization
 with division block.<br/>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo
index f0492917edc..20fe13cc72f 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/ActiveAirFlow.mo
@@ -137,8 +137,7 @@ block ActiveAirFlow
     annotation (Placement(transformation(extent={{80,-410},{100,-390}})));
   Buildings.Controls.OBC.CDL.Logical.Not not2 if have_winSen "Logical not"
     annotation (Placement(transformation(extent={{-240,-510},{-220,-490}})));
-  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
-    final uLow=0.25, final uHigh=0.75) if have_occSen
+  CDL.Continuous.GreaterThreshold greThr(t=0.75, h=0.5) if have_occSen
     "Check if the zone becomes unpopulated"
     annotation (Placement(transformation(extent={{-140,-290},{-120,-270}})));
 
@@ -547,9 +546,9 @@ equation
   connect(swi1.y, maxInp.u1)
     annotation (Line(points={{222,-500},{240,-500},{240,-28},{-128,-28},{-128,-4},
           {-102,-4}}, color={0,0,127}));
-  connect(nOcc, hys.u)
+  connect(nOcc, greThr.u)
     annotation (Line(points={{-300,-280},{-142,-280}}, color={0,0,127}));
-  connect(hys.y, swi.u2)
+  connect(greThr.y, swi.u2)
     annotation (Line(points={{-118,-280},{78,-280}}, color={255,0,255}));
   connect(add2.y, actCooMaxAir.u1) annotation (Line(points={{222,180},{230,180},
           {230,176},{238,176}}, color={0,0,127}));
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/Validation/ActiveAirFlow.mo
index 0a30415203e..a1edde1f675 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/Validation/ActiveAirFlow.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SetPoints/Validation/ActiveAirFlow.mo
@@ -36,11 +36,7 @@ model ActiveAirFlow
     offset=2) "occNum"
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse winSta(
-<<<<<<< HEAD
-    startTime=0,
-=======
     shift=0,
->>>>>>> master
     width=0.2,
     period=90000)
     "Generate signal indicating window status"
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
index 4b2fb77932b..ab8607d5409 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
@@ -86,10 +86,10 @@ block SystemRequests
     "Discharge airflow rate setpoint"
     annotation (Placement(transformation(extent={{-220,10},{-180,50}}),
         iconTransformation(extent={{-140,0},{-100,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput uDam(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yDam_actual(
     final min=0,
     final max=1,
-    final unit="1") "Damper position"
+    final unit="1") "Actual damper position"
     annotation (Placement(transformation(extent={{-220,-170},{-180,-130}}),
         iconTransformation(extent={{-140,-40},{-100,0}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TDisHeaSet(
@@ -196,10 +196,7 @@ protected
     annotation (Placement(transformation(extent={{60,260},{80,280}})));
   Buildings.Controls.OBC.CDL.Logical.Timer tim "Calculate time"
     annotation (Placement(transformation(extent={{0,330},{20,350}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual gre
-    "Check if the suppression time has passed"
-    annotation (Placement(transformation(extent={{60,330},{80,350}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual gre1
+  Buildings.Controls.OBC.CDL.Continuous.Greater gre1
     "Check if current model time is greater than the sample period"
     annotation (Placement(transformation(extent={{-80,400},{-60,420}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys2(
@@ -351,6 +348,7 @@ protected
     "Output 0 or 1 request "
     annotation (Placement(transformation(extent={{100,-440},{120,-420}})));
   Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(duration=samplePeriod)
+    "Hold true signal for sample period of time"
     annotation (Placement(transformation(extent={{120,330},{140,350}})));
   Buildings.Controls.OBC.CDL.Logical.LogicalSwitch logSwi "Logical switch"
     annotation (Placement(transformation(extent={{120,300},{140,280}})));
@@ -385,13 +383,17 @@ protected
     final samplePeriod=samplePeriod)
     "Sample input signal, as the output signal will go to the trim and respond which also samples at samplePeriod"
     annotation (Placement(transformation(extent={{-160,80},{-140,100}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu
+  Buildings.Controls.OBC.CDL.Continuous.Greater greVDis50
     "Check if discharge airflow is less than 50% of setpoint"
     annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu1
+  Buildings.Controls.OBC.CDL.Continuous.Greater greVDis70
     "Check if discharge airflow is less than 70% of setpoint"
     annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
 
+  CDL.Continuous.Less les "Check if the suppression time has not yet passed"
+    annotation (Placement(transformation(extent={{38,330},{58,350}})));
+  CDL.Logical.Not notLes "Inversion of output signal"
+    annotation (Placement(transformation(extent={{76,330},{96,350}})));
 equation
   connect(add2.y, hys.u)
     annotation (Line(points={{-78,200},{-62,200}},   color={0,0,127}));
@@ -406,15 +408,12 @@ equation
     annotation (Line(points={{-98,340},{-62,340}}, color={255,0,255}));
   connect(lat.y, tim.u)
     annotation (Line(points={{-38,340},{-2,340}}, color={255,0,255}));
-  connect(tim.y, gre.u1)
-    annotation (Line(points={{22,340},{58,340}}, color={0,0,127}));
   connect(edg.y, triSam.trigger)
     annotation (Line(points={{-38,300},{-20,300},{-20,264},{-110,264},{-110,268.2}},
       color={255,0,255}));
   connect(lat.y, edg.u)
-    annotation (Line(points={{-38,340},{-20,340},{-20,318},{-80,318},{-80,300},{
-          -62,300}},
-      color={255,0,255}));
+    annotation (Line(points={{-38,340},{-20,340},{-20,318},{-80,318},{-80,300},
+      {-62,300}}, color={255,0,255}));
   connect(edg.y, lat1.clr)
     annotation (Line(points={{-38,300},{-20,300},{-20,264},{58,264}}, color={255,0,255}));
   connect(modTim.y, gre1.u1)
@@ -440,12 +439,10 @@ equation
       color={0,0,127}));
   connect(abs.y, triSam.u)
     annotation (Line(points={{122,410},{140,410},{140,360},{-140,360},{-140,280},
-          {-122,280}},
-                   color={0,0,127}));
+          {-122,280}}, color={0,0,127}));
   connect(abs.y, hys2.u)
     annotation (Line(points={{122,410},{140,410},{140,360},{-140,360},{-140,340},
-          {-122,340}},
-                   color={0,0,127}));
+          {-122,340}}, color={0,0,127}));
   connect(and2.y, swi1.u2)
     annotation (Line(points={{62,200},{98,200}}, color={255,0,255}));
   connect(thrCooResReq.y, swi1.u1)
@@ -572,15 +569,9 @@ equation
     annotation (Line(points={{122,-430},{138,-430}}, color={0,0,127}));
   connect(reaToInt3.y,yHeaPlaReq)
     annotation (Line(points={{162,-430},{200,-430}}, color={255,127,0}));
-  connect(gre.y, truHol.u)
-    annotation (Line(points={{82,340},{118,340}}, color={255,0,255}));
   connect(truHol.y, lat.clr)
     annotation (Line(points={{142,340},{160,340},{160,320},{-80,320},{-80,334},{
           -62,334}},        color={255,0,255}));
-  connect(gre.y, lat1.u)
-    annotation (Line(points={{82,340},{100,340},{100,322},{44,322},{44,270},{58,
-          270}},
-      color={255,0,255}));
   connect(lat.y, logSwi.u2)
     annotation (Line(points={{-38,340},{-20,340},{-20,318},{100,318},{100,290},{
           118,290}},
@@ -603,8 +594,6 @@ equation
   connect(maxSupTim.y, supTim.u2)
     annotation (Line(points={{-58,250},{-40,250},{-40,274},{-2,274}},
       color={0,0,127}));
-  connect(supTim.y, gre.u2)
-    annotation (Line(points={{22,280},{40,280},{40,332},{58,332}}, color={0,0,127}));
   connect(tim5.y, swi8.u2)
     annotation (Line(points={{22,-300},{98,-300}}, color={255,0,255}));
   connect(hys8.y, tim4.u)
@@ -639,7 +628,7 @@ equation
       color={0,0,127}));
   connect(sampler1.u, VDis_flow)
     annotation (Line(points={{-162,-70},{-200,-70}}, color={0,0,127}));
-  connect(uDam, sampler2.u)
+  connect(yDam_actual, sampler2.u)
     annotation (Line(points={{-200,-150},{-162,-150}}, color={0,0,127}));
   connect(sampler2.y, hys4.u)
     annotation (Line(points={{-138,-150},{-62,-150}},  color={0,0,127}));
@@ -661,24 +650,29 @@ equation
   connect(add3.u2, TZon)
     annotation (Line(points={{-102,134},{-150,134},{-150,170},{-200,170}},
       color={0,0,127}));
-  connect(greEqu.u1, gai1.y)
+  connect(greVDis50.u1, gai1.y)
     annotation (Line(points={{-62,-40},{-78,-40}}, color={0,0,127}));
-  connect(greEqu.u2, sampler1.y)
-    annotation (Line(points={{-62,-48},{-72,-48},{-72,-70},{-138,-70}},
-      color={0,0,127}));
-  connect(greEqu.y, and3.u2)
-    annotation (Line(points={{-38,-40},{0,-40},{0,-48},{38,-48}},
-      color={255,0,255}));
-  connect(gai2.y, greEqu1.u1)
-    annotation (Line(points={{-78,-88},{-76,-88},{-76,-100},{-62,-100}},
-      color={0,0,127}));
-  connect(sampler1.y, greEqu1.u2)
-    annotation (Line(points={{-138,-70},{-132,-70},{-132,-108},{-62,-108}},
-      color={0,0,127}));
-  connect(greEqu1.y, and4.u2)
-    annotation (Line(points={{-38,-100},{0,-100},{0,-108},{38,-108}},
-      color={255,0,255}));
+  connect(greVDis50.u2, sampler1.y) annotation (Line(points={{-62,-48},{-72,-48},
+          {-72,-70},{-138,-70}}, color={0,0,127}));
+  connect(greVDis50.y, and3.u2) annotation (Line(points={{-38,-40},{0,-40},{0,-48},
+          {38,-48}}, color={255,0,255}));
+  connect(gai2.y, greVDis70.u1) annotation (Line(points={{-78,-88},{-76,-88},{-76,
+          -100},{-62,-100}}, color={0,0,127}));
+  connect(sampler1.y, greVDis70.u2) annotation (Line(points={{-138,-70},{-132,-70},
+          {-132,-108},{-62,-108}}, color={0,0,127}));
+  connect(greVDis70.y, and4.u2) annotation (Line(points={{-38,-100},{0,-100},{0,
+          -108},{38,-108}}, color={255,0,255}));
 
+  connect(tim.y, les.u1)
+    annotation (Line(points={{22,340},{36,340}}, color={0,0,127}));
+  connect(supTim.y, les.u2) annotation (Line(points={{22,280},{32,280},{32,332},
+          {36,332}}, color={0,0,127}));
+  connect(notLes.y, truHol.u)
+    annotation (Line(points={{98,340},{118,340}}, color={255,0,255}));
+  connect(lat1.u, notLes.y) annotation (Line(points={{58,270},{46,270},{46,326},
+          {108,326},{108,340},{98,340}}, color={255,0,255}));
+  connect(les.y, notLes.u)
+    annotation (Line(points={{60,340},{74,340}}, color={255,0,255}));
 annotation (
   defaultComponentName="sysReqRehBox",
   Diagram(coordinateSystem(preserveAspectRatio=
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mo
index 2a058ba7ceb..bbfd228ec78 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mo
@@ -61,32 +61,31 @@ model SystemRequests
 
 equation
   connect(sine.y, TZonCooSet.u)
-    annotation (Line(points={{-39,90},{-22,90}}, color={0,0,127}));
-  connect(TZonCooSet.y, sysReq_RehBox.TZonCooSet) annotation (Line(points={{1,90},
-          {46,90},{46,79},{59,79}}, color={0,0,127}));
+    annotation (Line(points={{-38,90},{-22,90}}, color={0,0,127}));
+  connect(TZonCooSet.y, sysReq_RehBox.TZonCooSet) annotation (Line(points={{2,90},{
+          46,90},{46,78},{58,78}},  color={0,0,127}));
   connect(TZon.y, sysReq_RehBox.TZon)
-    annotation (Line(points={{-39,60},{16,60},{16,77},{59,77}},
+    annotation (Line(points={{-38,60},{16,60},{16,76},{58,76}},
       color={0,0,127}));
   connect(uCoo.y, sysReq_RehBox.uCoo)
-    annotation (Line(points={{1,40},{18,40},{18,75},{59,75}},
+    annotation (Line(points={{2,40},{18,40},{18,74},{58,74}},
       color={0,0,127}));
-  connect(disAirSet.y, sysReq_RehBox.VDisSet_flow) annotation (Line(points={{-39,
-          20},{20,20},{20,72},{59,72}}, color={0,0,127}));
+  connect(disAirSet.y, sysReq_RehBox.VDisSet_flow) annotation (Line(points={{-38,20},
+          {20,20},{20,72},{58,72}},     color={0,0,127}));
   connect(disAirRate.y, sysReq_RehBox.VDis_flow)
-    annotation (Line(points={{1,0},{22,0},{22,70},{59,70}}, color={0,0,127}));
-  connect(damPos.y, sysReq_RehBox.uDam)
-    annotation (Line(points={{-39,-20},{24,-20},{24,68},{59,68}},
-      color={0,0,127}));
+    annotation (Line(points={{2,0},{22,0},{22,70},{58,70}}, color={0,0,127}));
+  connect(damPos.y,sysReq_RehBox.yDam_actual)  annotation (Line(points={{-38,
+          -20},{24,-20},{24,68},{58,68}}, color={0,0,127}));
   connect(sine1.y, TDisHeaSet.u)
-    annotation (Line(points={{-69,-40},{-22,-40}}, color={0,0,127}));
+    annotation (Line(points={{-68,-40},{-22,-40}}, color={0,0,127}));
   connect(TDisHeaSet.y, sysReq_RehBox.TDisHeaSet)
-    annotation (Line(points={{1,-40},{26,-40},{26,65},{59,65}},
+    annotation (Line(points={{2,-40},{26,-40},{26,66},{58,66}},
       color={0,0,127}));
   connect(TDis.y, sysReq_RehBox.TDis)
-    annotation (Line(points={{-39,-60},{28,-60},{28,63},{59,63}},
+    annotation (Line(points={{-38,-60},{28,-60},{28,64},{58,64}},
       color={0,0,127}));
   connect(valPos.y,sysReq_RehBox.uHeaVal)
-    annotation (Line(points={{1,-80},{30,-80},{30,61},{59,61}},
+    annotation (Line(points={{2,-80},{30,-80},{30,62},{58,62}},
       color={0,0,127}));
 
 annotation (
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/Validation/ZoneTemperatures.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/Validation/ZoneTemperatures.mo
index cf415f62fc5..cb6df4f6d5c 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/Validation/ZoneTemperatures.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/Validation/ZoneTemperatures.mo
@@ -2,128 +2,136 @@ within Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.Validation;
 model ZoneTemperatures "Validate block for zone set point"
   Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures
     TZonSet(
-    have_occSen=true,
-    sinAdj=false,
-    cooAdj=true,
-    have_winSen=true,
-    heaAdj=true) "Block that determines the thermal zone setpoints"
-    annotation (Placement(transformation(extent={{60,40},{100,80}})));
+    final have_occSen=true,
+    final sinAdj=false,
+    final cooAdj=true,
+    final have_winSen=true,
+    final heaAdj=true) "Block that determines the thermal zone setpoints"
+    annotation (Placement(transformation(extent={{100,52},{120,80}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc(k=297.15)
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc(
+    final k=297.15)
     "Occupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc(k=293.15)
+    annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc(
+    final k=293.15)
     "Occupied heating setpoint"
-    annotation (Placement(transformation(extent={{-60,80},{-40,100}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetUno(k=303.15)
+    annotation (Placement(transformation(extent={{-40,80},{-20,100}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetUno(
+    final k=303.15)
     "Unoccupied cooling setpoint"
-    annotation (Placement(transformation(extent={{-100,40},{-80,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetUno(k=287.15)
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetUno(
+    final k=287.15)
     "Unoccupied heating setpoint"
-    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine cooSetAdj(freqHz=1/28800)
+    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine cooSetAdj(
+    final freqHz=1/28800)
     "Cooling setpoint adjustment"
-    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine heaSetAdj(freqHz=1/28800, amplitude=0.5)
+    annotation (Placement(transformation(extent={{-80,10},{-60,30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine heaSetAdj(
+    final freqHz=1/28800,
+    final amplitude=0.5)
     "Heating setpoint adjustment"
-    annotation (Placement(transformation(extent={{-100,-30},{-80,-10}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant cooDemLimLev(k=0)
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant cooDemLimLev(
+    final k=0)
     "Cooling demand limit level"
-    annotation (Placement(transformation(extent={{-140,-70},{-120,-50}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant heaDemLimLev(k=0)
+    annotation (Placement(transformation(extent={{-120,-70},{-100,-50}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant heaDemLimLev(
+    final k=0)
     "Heating demand limit level"
-    annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram(duration=28800)
+    annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram(
+    final duration=28800)
     "Generate ramp output"
-    annotation (Placement(transformation(extent={{-140,-100},{-120,-80}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(threshold=0.75)
+    annotation (Placement(transformation(extent={{-120,-100},{-100,-80}})));
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(
+    final t=0.75)
     "Check if input is greater than 0.75"
-    annotation (Placement(transformation(extent={{-100,-100},{-80,-80}})));
+    annotation (Placement(transformation(extent={{-80,-100},{-60,-80}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt(
-    integerTrue=1,
-    integerFalse=7)
+    final integerTrue=1,
+    final integerFalse=7)
     "Convert boolean input to integer output"
-    annotation (Placement(transformation(extent={{-20,-100},{0,-80}})));
+    annotation (Placement(transformation(extent={{0,-100},{20,-80}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse winSta(
-<<<<<<< HEAD
-    period=14400,
-    startTime=1200)
-=======
     final period=14400,
     final shift=1200)
->>>>>>> master
     "Generate signal indicating window status"
-    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+    annotation (Placement(transformation(extent={{60,-30},{80,-10}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse occSta(
-    period=14400,
-    width=0.95)
+    final period=14400,
+    final width=0.95)
     "Generate signal indicating occupancy status"
-    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+    annotation (Placement(transformation(extent={{60,10},{80,30}})));
   Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not"
-    annotation (Placement(transformation(extent={{-60,-100},{-40,-80}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerAdj(k=0) "Zero adjustment"
-    annotation (Placement(transformation(extent={{-140,-10},{-120,10}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swi1 "Switch to zero adjustment when window is open"
-    annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swi2 "Switch to zero adjustment when window is open"
-    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
+    annotation (Placement(transformation(extent={{-40,-100},{-20,-80}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerAdj(
+    final k=0)
+    "Zero adjustment"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch swi1
+    "Switch to zero adjustment when window is open"
+    annotation (Placement(transformation(extent={{-20,-30},{0,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch swi2
+    "Switch to zero adjustment when window is open"
+    annotation (Placement(transformation(extent={{-20,10},{0,30}})));
 
 equation
   connect(ram.y, greThr.u)
-    annotation (Line(points={{-118,-90},{-102,-90}}, color={0,0,127}));
+    annotation (Line(points={{-98,-90},{-82,-90}},   color={0,0,127}));
   connect(greThr.y, not1.u)
-    annotation (Line(points={{-78,-90},{-62,-90}}, color={255,0,255}));
+    annotation (Line(points={{-58,-90},{-42,-90}}, color={255,0,255}));
   connect(not1.y, booToInt.u)
-    annotation (Line(points={{-38,-90},{-22,-90}}, color={255,0,255}));
-  connect(TZonCooSetOcc.y, TZonSet.TZonCooSetOcc) annotation (Line(points={{-78,90},
-          {-72,90},{-72,108},{30,108},{30,73},{58,73}}, color={0,0,127}));
-  connect(TZonHeaSetOcc.y, TZonSet.TZonHeaSetOcc) annotation (Line(points={{-38,90},
-          {26,90},{26,64.8},{58,64.8}},
-                                    color={0,0,127}));
-  connect(TZonCooSetUno.y, TZonSet.TZonCooSetUno) annotation (Line(points={{-78,50},
-          {-72,50},{-72,68.8},{58,68.8}},
-                                      color={0,0,127}));
-  connect(TZonHeaSetUno.y, TZonSet.TZonHeaSetUno) annotation (Line(points={{-38,50},
-          {-32,50},{-32,61},{58,61}}, color={0,0,127}));
+    annotation (Line(points={{-18,-90},{-2,-90}},  color={255,0,255}));
+  connect(TZonCooSetOcc.y, TZonSet.TZonCooSetOcc) annotation (Line(points={{-58,90},
+          {-52,90},{-52,108},{50,108},{50,75},{98,75}}, color={0,0,127}));
+  connect(TZonHeaSetOcc.y, TZonSet.TZonHeaSetOcc) annotation (Line(points={{-18,90},
+          {46,90},{46,70},{98,70}}, color={0,0,127}));
+  connect(TZonCooSetUno.y, TZonSet.TZonCooSetUno) annotation (Line(points={{-58,50},
+          {-52,50},{-52,73},{98,73}}, color={0,0,127}));
+  connect(TZonHeaSetUno.y, TZonSet.TZonHeaSetUno) annotation (Line(points={{-18,50},
+          {-12,50},{-12,68},{98,68}}, color={0,0,127}));
   connect(cooDemLimLev.y, TZonSet.uCooDemLimLev)
-    annotation (Line(points={{-118,-60},{-100,-60},{-100,-40},{22,-40},{22,46},
-          {58,46}},     color={255,127,0}));
+    annotation (Line(points={{-98,-60},{-80,-60},{-80,-40},{42,-40},{42,60},
+      {98,60}}, color={255,127,0}));
   connect(heaDemLimLev.y, TZonSet.uHeaDemLimLev)
-    annotation (Line(points={{-38,-60},{26,-60},{26,42},{58,42}},
+    annotation (Line(points={{-18,-60},{46,-60},{46,58},{98,58}},
       color={255,127,0}));
   connect(booToInt.y, TZonSet.uOpeMod)
-    annotation (Line(points={{2,-90},{18,-90},{18,78},{58,78}},
+    annotation (Line(points={{22,-90},{38,-90},{38,79},{98,79}},
       color={255,127,0}));
-  connect(occSta.y, TZonSet.uOccSen)
-    annotation (Line(points={{62,20},{74,20},{74,38}},
-      color={255,0,255}));
-  connect(winSta.y, TZonSet.uWinSta)
-    annotation (Line(points={{62,-20},{86,-20},{86,38}}, color={255,0,255}));
   connect(winSta.y, swi2.u2)
-    annotation (Line(points={{62,-20},{86,-20},{86,0},{-60,0},{-60,20},{-42,20}},
-                 color={255,0,255}));
+    annotation (Line(points={{82,-20},{92,-20},{92,0},{-40,0},{-40,20},{-22,20}},
+      color={255,0,255}));
   connect(winSta.y, swi1.u2)
-    annotation (Line(points={{62,-20},{86,-20},{86,0},{-60,0},{-60,-20},{-42,
-          -20}},  color={255,0,255}));
+    annotation (Line(points={{82,-20},{92,-20},{92,0},{-40,0},{-40,-20},{-22,-20}},
+      color={255,0,255}));
   connect(zerAdj.y, swi2.u1)
-    annotation (Line(points={{-118,0},{-64,0},{-64,28},{-42,28}},
+    annotation (Line(points={{-98,0},{-44,0},{-44,28},{-22,28}},
       color={0,0,127}));
   connect(zerAdj.y, swi1.u1)
-    annotation (Line(points={{-118,0},{-64,0},{-64,-12},{-42,-12}},
+    annotation (Line(points={{-98,0},{-44,0},{-44,-12},{-22,-12}},
       color={0,0,127}));
   connect(cooSetAdj.y, swi2.u3)
-    annotation (Line(points={{-78,20},{-68,20},{-68,12},{-42,12}},
+    annotation (Line(points={{-58,20},{-48,20},{-48,12},{-22,12}},
       color={0,0,127}));
   connect(heaSetAdj.y, swi1.u3)
-    annotation (Line(points={{-78,-20},{-68,-20},{-68,-28},{-42,-28}},
+    annotation (Line(points={{-58,-20},{-48,-20},{-48,-28},{-22,-28}},
       color={0,0,127}));
   connect(swi2.y, TZonSet.setAdj)
-    annotation (Line(points={{-18,20},{-2,20},{-2,57},{58,57}},
+    annotation (Line(points={{2,20},{18,20},{18,65},{98,65}},
       color={0,0,127}));
   connect(swi1.y, TZonSet.heaSetAdj)
-    annotation (Line(points={{-18,-20},{2,-20},{2,53},{58,53}},
+    annotation (Line(points={{2,-20},{22,-20},{22,63},{98,63}},
       color={0,0,127}));
-  annotation (
+  connect(occSta.y, TZonSet.uOccSen)
+    annotation (Line(points={{82,20},{86,20},{86,55},{98,55}}, color={255,0,255}));
+  connect(winSta.y, TZonSet.uWinSta)
+    annotation (Line(points={{82,-20},{92,-20},{92,53},{98,53}}, color={255,0,255}));
+
+annotation (
   experiment(StopTime=28800, Tolerance=1e-6),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/Validation/ZoneTemperatures.mos"
         "Simulate and plot"),
@@ -142,8 +150,9 @@ First implementation.
 </li>
 </ul>
 </html>"),
-    Diagram(coordinateSystem(extent={{-140,-120},{120,120}})),
-    Icon(graphics={
+    Diagram(coordinateSystem(extent={{-140,-120},{140,120}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+         graphics={
         Ellipse(lineColor = {75,138,73},
                 fillColor={255,255,255},
                 fillPattern = FillPattern.Solid,
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
index 7a6597fe2cb..289b00e66da 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
@@ -8,10 +8,10 @@ block ZoneTemperatures
     "Check if the zone has window status sensor"
     annotation(Dialog(group="Sensors"));
 
-  parameter Boolean cooAdj = false
+  parameter Boolean cooAdj=false
     "Flag, set to true if both cooling and heating setpoint are adjustable separately"
     annotation(Dialog(group="Setpoint adjustable setting"));
-  parameter Boolean heaAdj = false
+  parameter Boolean heaAdj=false
     "Flag, set to true if heating setpoint is adjustable"
     annotation(Dialog(group="Setpoint adjustable setting"));
   parameter Boolean sinAdj = false
@@ -23,37 +23,37 @@ block ZoneTemperatures
 
   parameter Real TZonCooOnMax(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=300.15
     "Maximum cooling setpoint during on"
     annotation(Dialog(group="Setpoints limits setting"));
   parameter Real TZonCooOnMin(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=295.15
     "Minimum cooling setpoint during on"
     annotation(Dialog(group="Setpoints limits setting"));
   parameter Real TZonHeaOnMax(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=295.15
     "Maximum heating setpoint during on"
     annotation(Dialog(group="Setpoints limits setting"));
   parameter Real TZonHeaOnMin(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=291.15
     "Minimum heating setpoint during on"
     annotation(Dialog(group="Setpoints limits setting"));
   parameter Real TZonCooSetWinOpe(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=322.15
     "Cooling setpoint when window is open"
     annotation(Dialog(group="Setpoints limits setting", enable=have_winSen));
   parameter Real TZonHeaSetWinOpe(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")=277.15
     "Heating setpoint when window is open"
     annotation(Dialog(group="Setpoints limits setting", enable=have_winSen));
@@ -79,83 +79,82 @@ block ZoneTemperatures
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonCooSetOcc(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Occupied zone cooling setpoint"
     annotation (Placement(transformation(extent={{-460,510},{-420,550}}),
-        iconTransformation(extent={{-240,110},{-200,150}})));
+        iconTransformation(extent={{-140,70},{-100,110}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonHeaSetOcc(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Occupied zone heating setpoint"
     annotation (Placement(transformation(extent={{-460,430},{-420,470}}),
-        iconTransformation(extent={{-240,28},{-200,68}})));
+        iconTransformation(extent={{-140,20},{-100,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonCooSetUno(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Unoccupied zone cooling setpoint"
     annotation (Placement(transformation(extent={{-460,470},{-420,510}}),
-        iconTransformation(extent={{-240,68},{-200,108}})));
+        iconTransformation(extent={{-140,50},{-100,90}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TZonHeaSetUno(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")
     "Unoccupied zone heating setpoint"
     annotation (Placement(transformation(extent={{-460,390},{-420,430}}),
-        iconTransformation(extent={{-240,-10},{-200,30}})));
+        iconTransformation(extent={{-140,0},{-100,40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput setAdj(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature") if (cooAdj or sinAdj)
     "Setpoint adjustment value"
     annotation (Placement(transformation(extent={{-460,330},{-420,370}}),
-        iconTransformation(extent={{-240,-50},{-200,-10}})));
+        iconTransformation(extent={{-140,-30},{-100,10}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput heaSetAdj(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature") if heaAdj
     "Heating setpoint adjustment value"
     annotation (Placement(transformation(extent={{-460,250},{-420,290}}),
-        iconTransformation(extent={{-240,-90},{-200,-50}})));
+        iconTransformation(extent={{-140,-50},{-100,-10}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uOpeMod
     "AHU operation mode status signal"
     annotation (Placement(transformation(extent={{-460,610},{-420,650}}),
-        iconTransformation(extent={{-240,160},{-200,200}})));
+        iconTransformation(extent={{-140,110},{-100,150}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uCooDemLimLev
     "Cooling demand limit level"
     annotation (Placement(transformation(extent={{-460,110},{-420,150}}),
-        iconTransformation(extent={{-240,-160},{-200,-120}})));
+        iconTransformation(extent={{-140,-80},{-100,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uHeaDemLimLev
     "Heating demand limit level"
     annotation (Placement(transformation(extent={{-460,-110},{-420,-70}}),
-        iconTransformation(extent={{-240,-200},{-200,-160}})));
+        iconTransformation(extent={{-140,-100},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOccSen if have_occSen
     "Occupancy sensor (occupied=true, unoccupied=false)"
     annotation (Placement(transformation(extent={{-20,-20},{20,20}},
       origin={-440,-270}),iconTransformation(
-      extent={{-20,-20},{20,20}},origin={-60,-220},rotation=90)));
+      extent={{-20,-20},{20,20}},origin={-120,-110})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uWinSta if have_winSen
     "Window status (open=true, close=false)"
     annotation (Placement(transformation(extent={{-460,-430},{-420,-390}}),
-      iconTransformation(extent={{-20,-20},{20,20}},rotation=90,
-      origin={60,-220})));
+      iconTransformation(extent={{-20,-20},{20,20}},origin={-120,-130})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonCooSet(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")  "Cooling setpoint temperature"
     annotation (Placement(transformation(extent={{340,-20},{380,20}}),
-        iconTransformation(extent={{200,60},{240,100}})));
+        iconTransformation(extent={{100,60},{140,100}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput TZonHeaSet(
     final unit="K",
-    final displayUnit="degC",
+    displayUnit="degC",
     final quantity="ThermodynamicTemperature")  "Heating setpoint temperature"
     annotation (Placement(transformation(extent={{340,-120},{380,-80}}),
-        iconTransformation(extent={{200,-20},{240,20}})));
+        iconTransformation(extent={{100,-20},{140,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yAla "Alarm level"
     annotation (Placement(transformation(extent={{340,-410},{380,-370}}),
-        iconTransformation(extent={{200,-100},{240,-60}})));
+        iconTransformation(extent={{100,-100},{140,-60}})));
 
   Buildings.Controls.OBC.CDL.Logical.Or or2
     "Check if there is cooling/heating demand limit being imposed"
@@ -236,8 +235,8 @@ block ZoneTemperatures
   Buildings.Controls.OBC.CDL.Continuous.Product pro3
     "Output product of the two inputs"
     annotation (Placement(transformation(extent={{80,-120},{100,-100}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer tim
-    "Measure unpopulated time when the zone is in occupied mode"
+  Buildings.Controls.OBC.CDL.Logical.Timer tim(final t=300)
+    "Check whether the zone has been unpopulated for 5 minutes continuously during occupied mode"
     annotation (Placement(transformation(extent={{-220,-280},{-200,-260}})));
   Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(duration=60)
     "When the zone is unpopulated by more than 5 minute and then becomes populated, hold the change by 1 minute"
@@ -261,9 +260,6 @@ block ZoneTemperatures
   Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler heaSetSam
     "Sample current heating setpoint when zone becomes unpopulated by 5 minutes"
     annotation (Placement(transformation(extent={{40,-320},{60,-300}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greThr(threshold=300)
-    "Check whether the zone has been unpopulated for 5 minutes continuously during occupied mode"
-    annotation (Placement(transformation(extent={{-160,-280},{-140,-260}})));
   Buildings.Controls.OBC.CDL.Continuous.Add add1 "Adjust heating setpoint"
     annotation (Placement(transformation(extent={{140,240},{160,260}})));
   Buildings.Controls.OBC.CDL.Continuous.Add add2 "Adjust cooling setpoint"
@@ -379,13 +375,13 @@ protected
     annotation (Placement(transformation(extent={{-220,-420},{-200,-400}})));
   Buildings.Controls.OBC.CDL.Logical.Not not5  "Other than occupied mode"
     annotation (Placement(transformation(extent={{-280,-400},{-260,-380}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessEqual lesEqu
+  Buildings.Controls.OBC.CDL.Continuous.Less les
     "Check if occupied cooling setpoint is less than unoccupied one"
     annotation (Placement(transformation(extent={{20,-550},{40,-530}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu1
+  Buildings.Controls.OBC.CDL.Continuous.Greater gre
     "Check if occupied heating setpoint is greater than unoccupied one"
     annotation (Placement(transformation(extent={{20,-610},{40,-590}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu2
+  Buildings.Controls.OBC.CDL.Continuous.Greater gre2
     "Check whether heating setpoint exceeds cooling setpoint minus 0.56 degC"
     annotation (Placement(transformation(extent={{220,-590},{240,-570}})));
   Buildings.Controls.OBC.CDL.Logical.Switch swi
@@ -846,10 +842,6 @@ equation
       color={255,0,255}));
   connect(and10.y, tim.u)
     annotation (Line(points={{-258,-270},{-222,-270}}, color={255,0,255}));
-  connect(tim.y, greThr.u)
-    annotation (Line(points={{-198,-270},{-162,-270}}, color={0,0,127}));
-  connect(greThr.y, truHol.u)
-    annotation (Line(points={{-138,-270},{-102,-270}}, color={255,0,255}));
   connect(truHol.y, edg1.u)
     annotation (Line(points={{-78,-270},{-42,-270}}, color={255,0,255}));
   connect(edg1.y, cooSetSam.trigger)
@@ -1022,13 +1014,13 @@ equation
     annotation (Line(points={{-76,610},{-60,610},{-60,380},{280,380},{280,-220},
           {-300,-220},{-300,-600},{-182,-600}},
                                             color={255,0,255}));
-  connect(swi17.y,lesEqu. u1)
+  connect(swi17.y, les.u1)
     annotation (Line(points={{-158,-540},{18,-540}}, color={0,0,127}));
-  connect(lesEqu.y, swi9.u2)
+  connect(les.y, swi9.u2)
     annotation (Line(points={{42,-540},{98,-540}}, color={255,0,255}));
-  connect(swi18.y, greEqu1.u1)
+  connect(swi18.y, gre.u1)
     annotation (Line(points={{-158,-600},{18,-600}}, color={0,0,127}));
-  connect(greEqu1.y, swi8.u2)
+  connect(gre.y, swi8.u2)
     annotation (Line(points={{42,-600},{98,-600}}, color={255,0,255}));
   connect(swi17.y, swi9.u1)
     annotation (Line(points={{-158,-540},{-100,-540},{-100,-520},{80,-520},{80,-532},
@@ -1036,29 +1028,25 @@ equation
   connect(swi18.y, swi8.u1)
     annotation (Line(points={{-158,-600},{-100,-600},{-100,-580},{80,-580},{80,-592},
           {98,-592}},       color={0,0,127}));
-  connect(TZonCooSetUno,lesEqu. u2)
-    annotation (Line(points={{-440,490},{-400,490},{-400,-560},{0,-560},
-      {0,-548},{18,-548}}, color={0,0,127}));
+  connect(TZonCooSetUno, les.u2) annotation (Line(points={{-440,490},{-400,490},
+          {-400,-560},{0,-560},{0,-548},{18,-548}}, color={0,0,127}));
   connect(TZonCooSetUno, swi9.u3)
     annotation (Line(points={{-440,490},{-400,490},{-400,-560},{80,-560},
       {80,-548},{98,-548}}, color={0,0,127}));
-  connect(TZonHeaSetUno, greEqu1.u2)
-    annotation (Line(points={{-440,410},{-406,410},{-406,-620},{0,-620},
-      {0,-608},{18,-608}}, color={0,0,127}));
+  connect(TZonHeaSetUno, gre.u2) annotation (Line(points={{-440,410},{-406,410},
+          {-406,-620},{0,-620},{0,-608},{18,-608}}, color={0,0,127}));
   connect(TZonHeaSetUno, swi8.u3)
     annotation (Line(points={{-440,410},{-406,410},{-406,-620},{80,-620},
       {80,-608},{98,-608}}, color={0,0,127}));
   connect(swi9.y, addPar.u)
     annotation (Line(points={{122,-540},{140,-540},{140,-580},{158,-580}},
       color={0,0,127}));
-  connect(greEqu2.y, swi7.u2)
+  connect(gre2.y, swi7.u2)
     annotation (Line(points={{242,-580},{278,-580}}, color={255,0,255}));
-  connect(swi8.y, greEqu2.u1)
-    annotation (Line(points={{122,-600},{206,-600},{206,-580},{218,-580}},
-      color={0,0,127}));
-  connect(addPar.y, greEqu2.u2)
-    annotation (Line(points={{182,-580},{200,-580},{200,-588},{218,-588}},
-      color={0,0,127}));
+  connect(swi8.y, gre2.u1) annotation (Line(points={{122,-600},{206,-600},{206,
+          -580},{218,-580}}, color={0,0,127}));
+  connect(addPar.y, gre2.u2) annotation (Line(points={{182,-580},{200,-580},{
+          200,-588},{218,-588}}, color={0,0,127}));
   connect(swi8.y, swi7.u3)
     annotation (Line(points={{122,-600},{260,-600},{260,-588},{278,-588}},
       color={0,0,127}));
@@ -1073,7 +1061,6 @@ equation
       color={0,0,127}));
   connect(reaToInt.y, yAla)
     annotation (Line(points={{182,-390},{360,-390}}, color={255,127,0}));
-
   connect(pro6.y, add3.u1) annotation (Line(points={{102,150},{110,150},{110,
           134},{118,134}}, color={0,0,127}));
   connect(pro.y, add3.u2) annotation (Line(points={{102,110},{110,110},{110,122},
@@ -1102,95 +1089,93 @@ equation
           -136},{158,-136}}, color={0,0,127}));
   connect(add8.y, swi11.u3) annotation (Line(points={{182,-130},{190,-130},{190,
           -138},{218,-138}}, color={0,0,127}));
+  connect(tim.passed, truHol.u) annotation (Line(points={{-198,-278},{-150,-278},
+          {-150,-270},{-102,-270}}, color={255,0,255}));
 annotation (
   defaultComponentName="TZonSet",
-  Icon(coordinateSystem(extent={{-200,-200},{200,200}}),
+  Icon(coordinateSystem(extent={{-100,-140},{100,140}}),
        graphics={
         Rectangle(
-        extent={{-200,-200},{200,200}},
+        extent={{-100,-140},{100,140}},
         lineColor={0,0,127},
         fillColor={255,255,255},
         fillPattern=FillPattern.Solid),
         Text(
-          extent={{-196,146},{-118,116}},
+          extent={{-96,100},{-30,82}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonCooSetOcc"),
         Text(
-          extent={{-194,62},{-112,38}},
+          extent={{-96,52},{-28,32}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonHeaSetOcc"),
         Text(
-          extent={{-194,22},{-114,0}},
+          extent={{-96,28},{-30,12}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonHeaSetUno"),
         Text(
-          extent={{-192,106},{-112,74}},
+          extent={{-96,76},{-30,62}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonCooSetUno"),
         Text(
           visible=heaAdj,
-          extent={{-196,-58},{-126,-78}},
+          extent={{-100,-24},{-48,-36}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="heaSetAdj"),
         Text(
           visible=cooAdj or sinAdj,
-          extent={{-194,-16},{-152,-34}},
+          extent={{-100,0},{-66,-14}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="setAdj"),
         Text(
-          extent={{-194,190},{-130,172}},
-          lineColor={0,0,127},
+          extent={{-100,138},{-50,126}},
+          lineColor={255,127,0},
           pattern=LinePattern.Dash,
           textString="uOpeMod"),
         Text(
-          extent={{-190,-122},{-88,-156}},
-          lineColor={0,0,127},
+          extent={{-96,-50},{-20,-68}},
+          lineColor={255,127,0},
           pattern=LinePattern.Dash,
           textString="uCooDemLimLev"),
         Text(
-          extent={{-192,-170},{-92,-190}},
-          lineColor={0,0,127},
+          extent={{-96,-72},{-24,-88}},
+          lineColor={255,127,0},
           pattern=LinePattern.Dash,
           textString="uHeaDemLimLev"),
         Text(
-          extent={{-28.5,8.5},{28.5,-8.5}},
-          lineColor={0,0,127},
+          extent={{-19.5,6},{19.5,-6}},
+          lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="uOccSen",
-          visible = have_occSen,
-          origin={-60.5,-164.5},
-          rotation=90),
+          origin={-77.5,-110},
+          textString="uOccSen"),
         Text(
-          extent={{-26.5,9.5},{26.5,-9.5}},
-          lineColor={0,0,127},
+          extent={{-19,8.5},{19,-8.5}},
+          lineColor={255,0,255},
           pattern=LinePattern.Dash,
-          textString="uWinSta",
-          visible = have_winSen,
-          origin={60.5,-164.5},
-          rotation=90),
+          origin={-79,-129.5},
+          textString="uWinSta"),
         Text(
-          extent={{158,-68},{200,-86}},
-          lineColor={0,0,127},
+          extent={{72,-74},{100,-86}},
+          lineColor={255,127,0},
           pattern=LinePattern.Dash,
           textString="yAla"),
         Text(
-          extent={{142,86},{194,70}},
+          extent={{50,88},{98,72}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonCooSet"),
         Text(
-          extent={{142,10},{196,-8}},
+          extent={{46,10},{96,-8}},
           lineColor={0,0,127},
           pattern=LinePattern.Dash,
           textString="TZonHeaSet"),
         Text(
-          extent={{-156,286},{124,208}},
+          extent={{-120,180},{100,140}},
           lineColor={0,0,255},
           textString="%name")}),
   Diagram(coordinateSystem(
@@ -1221,7 +1206,7 @@ annotation (
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-412,-228},{330,-366}},
+          extent={{-412,-224},{330,-362}},
           lineColor={0,0,0},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
@@ -1257,7 +1242,7 @@ annotation (
           fillPattern=FillPattern.Solid,
           textString="Local setpoints adjustment"),
         Text(
-          extent={{-288,-264},{-36,-358}},
+          extent={{-254,-290},{-2,-384}},
           lineColor={0,0,255},
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo
index de48bf5c100..012ea139367 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mo
@@ -7,7 +7,7 @@ model Controller "Validate model for controlling VAV terminal box with reheat"
     samplePeriod=120,
     V_flow_nominal=(50*3/3600)*6)
     "Controller for VAV terminal unit with reheat"
-    annotation (Placement(transformation(extent={{60,54},{80,84}})));
+    annotation (Placement(transformation(extent={{40,60},{60,80}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller
     con1(
     AFlo=50,
@@ -17,107 +17,121 @@ model Controller "Validate model for controlling VAV terminal box with reheat"
     have_winSen=true,
     have_CO2Sen=true)
     "Controller for VAV terminal unit with reheat"
-    annotation (Placement(transformation(extent={{60,-6},{80,24}})));
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetRooCoo(k=273.15 + 24)
     "Room cooling setpoint "
-    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirFlo(
     offset=0.02,
     height=0.0168,
     duration=3600) "Discharge airflow rate"
-    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+    annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TZon(
     height=6,
     offset=273.15 + 17,
     duration=3600) "Measured room temperature"
-    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis(
     height=4,
     duration=3600,
     offset=273.15 + 18) "Terminal unit discharge air temperature"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+    annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup(
     height=4,
     duration=3600,
     offset=273.15 + 14) "AHU supply air temperature"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant opeMod(
     final k=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.occupied)
     "AHU operation mode is Occupied"
-    annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetRooHea(k=273.15 + 20)
     "Room heating setpoint"
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ppmCO2(
     duration=3600,
     height=800,
     offset=200) "CO2 concentration"
-    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
+    annotation (Placement(transformation(extent={{-20,-100},{0,-80}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse winSta(period=3600)
     "WIndow status"
-    annotation (Placement(transformation(extent={{50,-90},{70,-70}})));
+    annotation (Placement(transformation(extent={{40,-100},{60,-80}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp nOcc(
     height=5,
     duration=4800,
     offset=0) "Number of occupants"
-    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+    annotation (Placement(transformation(extent={{-100,-80},{-80,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.Round rou(n=0) "Round the input"
-    annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
+    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol(
+    final samplePeriod=2) "Mimic damper position"
+    annotation (Placement(transformation(extent={{80,58},{100,78}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol1(
+    final samplePeriod=2) "Mimic damper position"
+    annotation (Placement(transformation(extent={{80,0},{100,20}})));
 
 equation
   connect(TSetRooHea.y,con.TZonHeaSet)
-    annotation (Line(points={{-59,80},{-50,80},{-50,60},{6,60},{6,76.5},
-      {59,76.5}}, color={0,0,127}));
+    annotation (Line(points={{-78,100},{-70,100},{-70,74},{-14,74},{-14,80},{38,
+          80}},   color={0,0,127}));
   connect(TSetRooCoo.y, con.TZonCooSet)
-    annotation (Line(points={{-19,80},{-8,80},{-8,73.5},{59,73.5}},
+    annotation (Line(points={{-38,100},{-28,100},{-28,78},{38,78}},
       color={0,0,127}));
   connect(disAirFlo.y, con.VDis_flow)
-    annotation (Line(points={{-59,40},{-50,40},{-50,56},{12,56},{12,70.5},
-      {59,70.5}}, color={0,0,127}));
+    annotation (Line(points={{-78,60},{-8,60},{-8,68},{38,68}},
+                  color={0,0,127}));
   connect(TZon.y, con.TZon)
-    annotation (Line(points={{-19,40},{18,40},{18,67.5},{59,67.5}},
+    annotation (Line(points={{-38,30},{-2,30},{-2,70},{38,70}},
       color={0,0,127}));
   connect(TDis.y, con.TDis)
-    annotation (Line(points={{-59,0},{-50,0},{-50,20},{0,20},{0,64.5},{59,64.5}},
+    annotation (Line(points={{-78,0},{-20,0},{-20,64},{38,64}},
       color={0,0,127}));
   connect(TSup.y, con.TSupAHU)
-    annotation (Line(points={{-19,0},{24,0},{24,61.5},{59,61.5}},
+    annotation (Line(points={{-38,-20},{4,-20},{4,62},{38,62}},
       color={0,0,127}));
   connect(opeMod.y, con.uOpeMod)
-    annotation (Line(points={{-19,-30},{30,-30},{30,58.5},{59,58.5}},
+    annotation (Line(points={{2,-50},{10,-50},{10,60},{38,60}},
       color={255,127,0}));
   connect(nOcc.y, rou.u)
-    annotation (Line(points={{-59,-60},{-42,-60}}, color={0,0,127}));
+    annotation (Line(points={{-78,-70},{-62,-70}}, color={0,0,127}));
   connect(rou.y, con1.nOcc)
-    annotation (Line(points={{-19,-60},{36,-60},{36,22.5},{59,22.5}},
+    annotation (Line(points={{-38,-70},{16,-70},{16,14},{38,14}},
       color={0,0,127}));
   connect(ppmCO2.y, con1.ppmCO2)
-    annotation (Line(points={{21,-80},{40,-80},{40,19.5},{59,19.5}},
+    annotation (Line(points={{2,-90},{20,-90},{20,16},{38,16}},
       color={0,0,127}));
   connect(winSta.y, con1.uWin)
-    annotation (Line(points={{71,-80},{80,-80},{80,-60},{44,-60},{44,-4.5},
-      {59,-4.5}}, color={255,0,255}));
+    annotation (Line(points={{62,-90},{80,-90},{80,-50},{26,-50},{26,12},{38,12}},
+                  color={255,0,255}));
   connect(TSetRooHea.y,con1.TZonHeaSet)
-    annotation (Line(points={{-59,80},{-50,80},{-50,60},{6,60},{6,16.5},
-      {59,16.5}}, color={0,0,127}));
+    annotation (Line(points={{-78,100},{-70,100},{-70,74},{-14,74},{-14,20},{38,
+          20}},   color={0,0,127}));
   connect(TSetRooCoo.y, con1.TZonCooSet)
-    annotation (Line(points={{-19,80},{-8,80},{-8,13.5},{59,13.5}},
+    annotation (Line(points={{-38,100},{-28,100},{-28,18},{38,18}},
       color={0,0,127}));
   connect(disAirFlo.y, con1.VDis_flow)
-    annotation (Line(points={{-59,40},{-50,40},{-50,56},{12,56},{12,10.5},
-      {59,10.5}}, color={0,0,127}));
+    annotation (Line(points={{-78,60},{-8,60},{-8,8},{38,8}},
+                  color={0,0,127}));
   connect(TZon.y, con1.TZon)
-    annotation (Line(points={{-19,40},{18,40},{18,7.5},{59,7.5}},
+    annotation (Line(points={{-38,30},{-2,30},{-2,10},{38,10}},
       color={0,0,127}));
   connect(TDis.y, con1.TDis)
-    annotation (Line(points={{-59,0},{-50,0},{-50,20},{0,20},{0,4.5},{59,4.5}},
+    annotation (Line(points={{-78,0},{-20,0},{-20,4},{38,4}},
       color={0,0,127}));
   connect(TSup.y, con1.TSupAHU)
-    annotation (Line(points={{-19,0},{20,0},{20,1.5},{59,1.5}},
+    annotation (Line(points={{-38,-20},{4,-20},{4,2},{38,2}},
       color={0,0,127}));
   connect(opeMod.y, con1.uOpeMod)
-    annotation (Line(points={{-19,-30},{30,-30},{30,-1.5},{59,-1.5}},
+    annotation (Line(points={{2,-50},{10,-50},{10,0},{38,0}},
       color={255,127,0}));
+  connect(con.yDam, zerOrdHol.u) annotation (Line(points={{62,76},{70,76},{70,68},
+          {78,68}}, color={0,0,127}));
+  connect(con1.yDam, zerOrdHol1.u) annotation (Line(points={{62,16},{70,16},{70,
+          10},{78,10}}, color={0,0,127}));
+  connect(zerOrdHol.y,con.yDam_actual)  annotation (Line(points={{102,68},{110,
+          68},{110,100},{20,100},{20,66},{38,66}}, color={0,0,127}));
+  connect(zerOrdHol1.y,con1.yDam_actual)  annotation (Line(points={{102,10},{
+          110,10},{110,40},{30,40},{30,6},{38,6}}, color={0,0,127}));
 
 annotation (experiment(StopTime=3600.0, Tolerance=1e-06),
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mos"
@@ -136,7 +150,8 @@ First implementation.
 </li>
 </ul>
 </html>"),
-    Icon(graphics={
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+         graphics={
         Ellipse(lineColor = {75,138,73},
                 fillColor={255,255,255},
                 fillPattern = FillPattern.Solid,
@@ -155,5 +170,6 @@ First implementation.
           fillColor={75,138,73},
           pattern=LinePattern.None,
           fillPattern=FillPattern.Solid,
-          points={{-36,58},{64,-2},{-36,-62},{-36,58}})}));
+          points={{-36,58},{64,-2},{-36,-62},{-36,58}})}),
+    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})));
 end Controller;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo
deleted file mode 100644
index 856c905477d..00000000000
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mo
+++ /dev/null
@@ -1,158 +0,0 @@
-within Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation;
-model ModeAndSetPoints
-  "Validation models of reseting the zone setpoint temperature"
-
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints setPoi(
-      cooAdj=true, heaAdj=true) "Output resetted zone setpoint remperature"
-    annotation (Placement(transformation(extent={{20,70},{40,90}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints setPoi1(
-      have_occSen=true, have_winSen=true)
-    "Output resetted zone setpoint remperature"
-    annotation (Placement(transformation(extent={{20,30},{40,50}})));
-
-  Buildings.Controls.SetPoints.OccupancySchedule occSch "Occupancy schedule"
-    annotation (Placement(transformation(extent={{-90,72},{-70,92}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine heaSetAdj(
-   freqHz=1/28800,
-   amplitude=0.5) "Heating setpoint adjustment"
-    annotation (Placement(transformation(extent={{-46,0},{-26,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine cooSetAdj(
-    freqHz=1/28800) "Cooling setpoint adjustment"
-    annotation (Placement(transformation(extent={{-46,40},{-26,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine TZon1(
-    amplitude=5,
-    offset=18 + 273.15,
-    freqHz=1/86400) "Zone 1 temperature"
-    annotation (Placement(transformation(extent={{-88,40},{-68,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine TZon2(
-    offset=18 + 273.15,
-    freqHz=1/86400,
-    amplitude=7.5) "Zone 2 temperature"
-    annotation (Placement(transformation(extent={{-88,0},{-68,20}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant winSta1(k=false)
-    "Window status"
-    annotation (Placement(transformation(extent={{-88,-80},{-68,-60}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant winSta2(k=true)
-    "Window status"
-    annotation (Placement(transformation(extent={{-46,-80},{-26,-60}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant occSen1(k=false)
-    "Occupancy sensor"
-    annotation (Placement(transformation(extent={{-88,-40},{-68,-20}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant occSen2(k=true)
-    "Occupancy sensor"
-    annotation (Placement(transformation(extent={{-46,-40},{-26,-20}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints setPoi3(
-      have_occSen=true, have_winSen=true)
-    "Output resetted zone setpoint remperature"
-    annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints setPoi2(
-      cooAdj=true, heaAdj=true) "Output resetted zone setpoint remperature"
-    annotation (Placement(transformation(extent={{20,-20},{40,0}})));
-
-equation
-  connect(cooSetAdj.y, setPoi.setAdj)
-    annotation (Line(points={{-24,50},{-20,50},{-20,80},{18,80}},
-      color={0,0,127}));
-  connect(heaSetAdj.y, setPoi.heaSetAdj)
-    annotation (Line(points={{-24,10},{-16,10},{-16,77},{18,77}},
-      color={0,0,127}));
-
-  connect(occSen2.y, setPoi3.uOccSen) annotation (Line(points={{-24,-30},{-2,-30},
-          {-2,-56},{18,-56}},      color={255,0,255}));
-  connect(winSta2.y, setPoi3.uWinSta) annotation (Line(points={{-24,-70},{-2,-70},
-          {-2,-59},{18,-59}},      color={255,0,255}));
-  connect(setPoi3.TZon, TZon2.y) annotation (Line(points={{18,-47},{6,-47},{6,-6},
-          {-20,-6},{-20,-8},{-60,-8},{-60,10},{-66,10}},     color={0,0,127}));
-  connect(setPoi2.TZon, TZon2.y) annotation (Line(points={{18,-7},{6,-7},{6,-6},
-          {-20,-6},{-20,-8},{-60,-8},{-60,10},{-66,10}},     color={0,0,127}));
-  connect(cooSetAdj.y, setPoi2.setAdj) annotation (Line(points={{-24,50},{-20,50},
-          {-20,0},{10,0},{10,-10},{18,-10}},   color={0,0,127}));
-  connect(heaSetAdj.y, setPoi2.heaSetAdj) annotation (Line(points={{-24,10},{12,
-          10},{12,-13},{18,-13}},    color={0,0,127}));
-  connect(TZon1.y, setPoi.TZon) annotation (Line(points={{-66,50},{-60,50},{-60,
-          83},{18,83}},     color={0,0,127}));
-  connect(setPoi1.TZon, setPoi.TZon) annotation (Line(points={{18,43},{-12,43},{
-          -12,32},{-60,32},{-60,83},{18,83}},  color={0,0,127}));
-  connect(occSch.tNexOcc, setPoi.tNexOcc)
-    annotation (Line(points={{-69,88},{-26,88},{-26,89},{18,89}},
-                                                color={0,0,127}));
-  connect(occSch.tNexOcc, setPoi1.tNexOcc) annotation (Line(points={{-69,88},{4,
-          88},{4,49},{18,49}},    color={0,0,127}));
-  connect(setPoi2.tNexOcc, setPoi1.tNexOcc) annotation (Line(points={{18,-1},{4,
-          -1},{4,49},{18,49}},    color={0,0,127}));
-  connect(setPoi3.tNexOcc, setPoi1.tNexOcc) annotation (Line(points={{18,-41},{4,
-          -41},{4,49},{18,49}},    color={0,0,127}));
-  connect(occSch.occupied, setPoi.uOcc) annotation (Line(points={{-69,76},{-26,76},
-          {-26,86.025},{18,86.025}},         color={255,0,255}));
-  connect(occSch.occupied, setPoi1.uOcc) annotation (Line(points={{-69,76},{-6,76},
-          {-6,46.025},{18,46.025}},        color={255,0,255}));
-  connect(occSch.occupied, setPoi2.uOcc) annotation (Line(points={{-69,76},{-6,76},
-          {-6,-3.975},{18,-3.975}},          color={255,0,255}));
-  connect(occSch.occupied, setPoi3.uOcc) annotation (Line(points={{-69,76},{-6,76},
-          {-6,-43.975},{18,-43.975}},        color={255,0,255}));
-  connect(occSen1.y, setPoi1.uOccSen) annotation (Line(points={{-66,-30},{-58,-30},
-          {-58,-14},{-10,-14},{-10,34},{18,34}},      color={255,0,255}));
-  connect(winSta1.y, setPoi1.uWinSta) annotation (Line(points={{-66,-70},{-60,-70},
-          {-60,-48},{0,-48},{0,31},{18,31}},      color={255,0,255}));
-annotation (experiment(StopTime=86400.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mos"
-    "Simulate and plot"),
-    Documentation(info="<html>
-<p>
-This example validates
-<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints\">
-Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-October 30, 2017, by Jianjun Hu:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
- Diagram(
-        coordinateSystem(preserveAspectRatio=false), graphics={Text(
-          extent={{50,86},{126,76}},
-          lineColor={85,0,255},
-          horizontalAlignment=TextAlignment.Left,
-          textString="No window status sensor
-No occupancy sensor
-Zone 1"),              Text(
-          extent={{48,44},{102,36}},
-          lineColor={85,0,255},
-          horizontalAlignment=TextAlignment.Left,
-          textString="No local setpoint adjustment
-Zone 1"),              Text(
-          extent={{46,-46},{100,-54}},
-          lineColor={85,0,255},
-          horizontalAlignment=TextAlignment.Left,
-          textString="No local setpoint adjustment
-Zone 2"),                                                      Text(
-          extent={{48,-4},{124,-14}},
-          lineColor={85,0,255},
-          horizontalAlignment=TextAlignment.Left,
-          textString="No window status sensor
-No occupancy sensor
-Zone 2")}),
-    Icon(graphics={
-        Ellipse(lineColor = {75,138,73},
-                fillColor={255,255,255},
-                fillPattern = FillPattern.Solid,
-                extent = {{-100,-100},{100,100}}),
-        Polygon(lineColor = {0,0,255},
-                fillColor = {75,138,73},
-                pattern = LinePattern.None,
-                fillPattern = FillPattern.Solid,
-                points = {{-36,60},{64,0},{-36,-60},{-36,60}}),
-                   Ellipse(
-          lineColor={75,138,73},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          extent={{-100,-100},{100,100}}), Polygon(
-          lineColor={0,0,255},
-          fillColor={75,138,73},
-          pattern=LinePattern.None,
-          fillPattern=FillPattern.Solid,
-          points={{-36,58},{64,-2},{-36,-62},{-36,58}})}));
-end ModeAndSetPoints;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/package.order b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/package.order
index 1ce23910062..8cba75e31a7 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/package.order
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/package.order
@@ -1,2 +1 @@
 Controller
-ModeAndSetPoints
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/package.order b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/package.order
index 17c111fde29..4c189293e29 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/package.order
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/package.order
@@ -1,5 +1,4 @@
 Controller
-ModeAndSetPoints
 Reheat
 SetPoints
 Validation
diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/package.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/package.mo
index d476774f69e..19d58d41342 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/package.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/package.mo
@@ -39,8 +39,8 @@ actuator signals for the terminal unit dampers.
 <h4>Implementation of PID controllers</h4>
 <p>
 For the PID controllers, the implementation in
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.PID\">
+Buildings.Controls.OBC.CDL.Continuous.PID</a>
 is used.
 Hence, the PID controllers are in the standard form
 </p>
diff --git a/Buildings/Controls/OBC/CDL/Constants.mo b/Buildings/Controls/OBC/CDL/Constants.mo
index 492a211d14d..52356344852 100644
--- a/Buildings/Controls/OBC/CDL/Constants.mo
+++ b/Buildings/Controls/OBC/CDL/Constants.mo
@@ -6,14 +6,9 @@ package Constants
     "Biggest number such that 1.0 + eps = 1.0";
   final constant Real small=1E-60
     "Smallest number such that small and -small are representable on the machine";
-<<<<<<< HEAD
-  final constant Real pi=2*Modelica.Math.asin(1.0); // 3.14159265358979;
-
-=======
   final constant Real pi=2*Modelica.Math.asin(
     1.0)
     "Constant number pi, 3.14159265358979";
->>>>>>> master
   annotation (
     Documentation(
       info="<html>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Greater.mo b/Buildings/Controls/OBC/CDL/Continuous/Greater.mo
index 5e59e2f1f4b..791ce360f53 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Greater.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Greater.mo
@@ -1,24 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous;
-<<<<<<< HEAD
-block Greater "Output y is true, if input u1 is greater than input u2"
-
-  Interfaces.RealInput u1 "Connector of first Real input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-
-  Interfaces.RealInput u2 "Connector of second Real input signal"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-equation
-  y = u1 > u2;
-
-annotation (
-  defaultComponentName="gre",
-  Icon(coordinateSystem(preserveAspectRatio=false,extent={{-100,
-            -100},{100,100}}), graphics={
-=======
 block Greater
   "Output y is true, if input u1 is greater than input u2"
   parameter Real h(
@@ -146,7 +126,6 @@ equation
         preserveAspectRatio=false,
         extent={{-100,-100},{100,100}}),
       graphics={
->>>>>>> master
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
@@ -167,28 +146,15 @@ equation
             else
               {235,235,235}),
           fillPattern=FillPattern.Solid),
-<<<<<<< HEAD
-        Ellipse(extent={{32,10},{52,-10}}, lineColor={0,0,127}),
-        Line(points={{-100,-80},{42,-80},{42,0}}, color={0,0,127}),
-=======
         Line(
           points={{-100,-80},{42,-80},{42,-62}},
           color={0,0,127}),
->>>>>>> master
         Line(
-          points={{-54,22},{-8,2},{-54,-18}},
+          points={{-12,14},{18,2},{-12,-8}},
           thickness=0.5),
         Text(
           extent={{-150,150},{150,110}},
           textString="%name",
-<<<<<<< HEAD
-          lineColor={0,0,255})}),
-  Documentation(info="<html>
-<p>
-Block that outputs <code>true</code> if the Real input <code>u1</code>
-is greater than the Real input <code>u2</code>.
-Otherwise the output is <code>false</code>.
-=======
           lineColor={0,0,255}),
         Text(
           extent={{-64,62},{62,92}},
@@ -258,14 +224,11 @@ in simulation to guard against numerical noise. Numerical noise can be present i
 an input depends on a state variable or a quantity that requires an iterative solution, such as
 a temperature or a mass flow rate of an HVAC system.
 To disable hysteresis, set <code>h=0</code>.
->>>>>>> master
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 February 3, 2021, by Antoine Gautier:<br/>
 Corrected documentation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2246\">issue 2246</a>.
@@ -276,7 +239,6 @@ Added hysteresis.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
 </li>
 <li>
->>>>>>> master
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo
index 9afa41bf215..973b10fa000 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo
@@ -1,24 +1,6 @@
 within Buildings.Controls.OBC.CDL.Continuous;
 block GreaterThreshold
   "Output y is true, if input u is greater than threshold"
-<<<<<<< HEAD
-
-  parameter Real threshold=0 "Comparison with respect to threshold";
-
-  Interfaces.RealInput u "Connector of Real input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-equation
-  y = u > threshold;
-
-annotation (
-  defaultComponentName="greThr",
-  Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
-            {100,100}}), graphics={
-=======
   parameter Real t=0
     "Threshold for comparison";
   parameter Real h(
@@ -139,7 +121,6 @@ equation
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
->>>>>>> master
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
@@ -148,13 +129,6 @@ equation
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Ellipse(
-<<<<<<< HEAD
-          extent={{71,7},{85,-7}},
-          lineColor=DynamicSelect({235,235,235}, if y then {0,255,0}
-               else {235,235,235}),
-          fillColor=DynamicSelect({235,235,235}, if y then {0,255,0}
-               else {235,235,235}),
-=======
           extent={{73,7},{87,-7}},
           lineColor=DynamicSelect({235,235,235},
             if y then
@@ -166,26 +140,11 @@ equation
               {0,255,0}
             else
               {235,235,235}),
->>>>>>> master
           fillPattern=FillPattern.Solid),
-        Text(
-<<<<<<< HEAD
-          extent={{-150,-140},{150,-110}},
-          lineColor={0,0,0},
-          textString="%threshold"),
-        Text(
-          extent={{-150,150},{150,110}},
-          lineColor={0,0,255},
-          textString="%name"),
         Line(
-          points={{-54,22},{-8,2},{-54,-18}},
-          thickness=0.5)}),
-  Documentation(info="<html>
-<p>
-Block that outputs <code>true</code> if the Real input is greater than
-the parameter <code>threshold</code>.
-Otherwise the output is <code>false</code>.
-=======
+          points={{-16,10},{2,2},{-16,-8}},
+          thickness=0.5),
+        Text(
           extent={{-150,150},{150,110}},
           textString="%name",
           lineColor={0,0,255}),
@@ -246,14 +205,11 @@ in simulation to guard against numerical noise. Numerical noise can be present i
 an input depends on a state variable or a quantity that requires an iterative solution, such as
 a temperature or a mass flow rate of an HVAC system.
 To disable hysteresis, set <code>h=0</code>.
->>>>>>> master
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 February 3, 2021, by Antoine Gautier:<br/>
 Corrected documentation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2246\">issue 2246</a>.
@@ -264,7 +220,6 @@ Added hysteresis.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
 </li>
 <li>
->>>>>>> master
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo b/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo
index 558bb260814..501b2780e50 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo
@@ -1,56 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous;
-<<<<<<< HEAD
-block IntegratorWithReset "Output the integral of the input signal"
-
-  Interfaces.RealInput u "Connector of Real input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y "Connector of Real output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-  parameter Real k(unit="1")=1 "Integrator gain";
-
-  parameter Real y_start=0 "Initial or guess value of output (= state)"
-    annotation (Dialog(group="Initialization"));
-
-  parameter Buildings.Controls.OBC.CDL.Types.Reset reset=
-    Buildings.Controls.OBC.CDL.Types.Reset.Disabled
-    "Type of integrator reset"
-    annotation(Evaluate=true);
-
-  parameter Real y_reset = 0
-    "Value to which integrator is reset, used if reset = Types.Reset.Parameter"
-    annotation(Dialog(
-                 enable=reset == Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
-                 group="Integrator reset"));
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput y_reset_in if
-       reset == Buildings.Controls.OBC.CDL.Types.Reset.Input
-    "Input signal for state to which integrator is reset, enabled if reset = Types.Reset.Input"
-    annotation (Placement(
-      transformation(
-        extent={{-140,-100},{-100,-60}}),
-        visible=reset == Buildings.Controls.OBC.CDL.Types.Reset.Input));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger if
-       reset <> Buildings.Controls.OBC.CDL.Types.Reset.Disabled
-    "Resets the integrator output when trigger becomes true"
-    annotation (Placement(
-      transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={0,-120}),
-        visible=reset <> Buildings.Controls.OBC.CDL.Types.Reset.Disabled,
-        iconTransformation(
-          extent={{-20,-20},{20,20}},
-          rotation=90,
-          origin={0,-120})));
-protected
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput y_reset_internal
-   "Internal connector for integrator reset";
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger_internal
-    "Needed to use conditional connector trigger";
-=======
 block IntegratorWithReset
   "Output the integral of the input signal"
   parameter Real k(
@@ -71,38 +19,11 @@ block IntegratorWithReset
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
->>>>>>> master
 
 initial equation
   y=y_start;
 
 equation
-<<<<<<< HEAD
-  der(y) = k*u;
-
-  // Equations for integrator reset
-  connect(trigger, trigger_internal);
-  connect(y_reset_in, y_reset_internal);
-
-  if reset <> Buildings.Controls.OBC.CDL.Types.Reset.Input then
-    y_reset_internal = y_reset;
-  end if;
-
-  if reset == Buildings.Controls.OBC.CDL.Types.Reset.Disabled then
-    trigger_internal = false;
-  else
-    when trigger_internal then
-      reinit(y, y_reset_internal);
-    end when;
-  end if;
-
-  annotation (
-defaultComponentName="intWitRes",
-Icon(coordinateSystem(
-          preserveAspectRatio=true,
-          extent={{-100.0,-100.0},{100.0,100.0}}),
-        graphics={
-=======
   der(y)=k*u;
   when trigger then
     reinit(
@@ -116,7 +37,6 @@ Icon(coordinateSystem(
         preserveAspectRatio=true,
         extent={{-100.0,-100.0},{100.0,100.0}}),
       graphics={
->>>>>>> master
         Rectangle(
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
@@ -162,7 +82,7 @@ Icon(coordinateSystem(
 This model is similar to
 <a href=\"modelica://Modelica.Blocks.Continuous.Integrator\">
 Modelica.Blocks.Continuous.Integrator</a>
-except that it optionally allows to reset the output <code>y</code>
+except that it allows to reset the output <code>y</code>
 of the integrator.
 </p>
 <p>
@@ -170,20 +90,8 @@ The output of the integrator can be reset as follows:
 </p>
 <ul>
 <li>
-If <code>reset = Types.Reset.Disabled</code>, which is the default,
-then the integrator is never reset.
-</li>
-<li>
-If <code>reset = Types.Reset.Parameter</code>, then a boolean
-input signal <code>trigger</code> is enabled. Whenever the value of
-this input changes from <code>false</code> to <code>true</code>,
-the integrator is reset by setting <code>y</code>
-to the value of the parameter <code>y_reset</code>.
-</li>
-<li>
-If <code>reset = Types.Reset.Input</code>, then a boolean
-input signal <code>trigger</code> is enabled. Whenever the value of
-this input changes from <code>false</code> to <code>true</code>,
+Whenever the input signal <code>trigger</code> changes from <code>false</code>
+to <code>true</code>,
 the integrator is reset by setting <code>y</code>
 to the value of the input signal <code>y_reset_in</code>.
 </li>
@@ -199,6 +107,13 @@ has been copied into this model rather than extended.
       revisions="<html>
 <ul>
 <li>
+August 3, 2020, by Jianjun:<br/>
+Fixed the input <code>y_reset_in</code>.
+<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\">issue 2056</a>.
+</li>
+<li>
 April 21, 2020, by Michael Wetter:<br/>
 Removed parameter <code>initType</code>.
 <br/>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Less.mo b/Buildings/Controls/OBC/CDL/Continuous/Less.mo
index bf1cae945e9..c09c0acf583 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Less.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Less.mo
@@ -1,23 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous;
-<<<<<<< HEAD
-block Less "Output y is true, if input u1 is less than input u2"
-
-  Interfaces.RealInput u1 "Connector of first Real input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-
-  Interfaces.RealInput u2 "Connector of second Real input signal"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-equation
-  y = u1 < u2;
-  annotation (
-        defaultComponentName="les",
-        Icon(coordinateSystem(preserveAspectRatio=false,extent={{-100,
-            -100},{100,100}}), graphics={
-=======
 block Less
   "Output y is true, if input u1 is less than input u2"
   parameter Real h(
@@ -145,7 +126,6 @@ equation
         preserveAspectRatio=false,
         extent={{-100,-100},{100,100}}),
       graphics={
->>>>>>> master
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
@@ -166,28 +146,14 @@ equation
             else
               {235,235,235}),
           fillPattern=FillPattern.Solid),
-<<<<<<< HEAD
-        Ellipse(extent={{32,10},{52,-10}}, lineColor={0,0,127}),
-        Line(points={{-100,-80},{42,-80},{42,0}}, color={0,0,127}),
-=======
         Line(
           points={{-100,-80},{42,-80},{42,-62}},
           color={0,0,127}),
->>>>>>> master
         Line(
-          points={{-6,18},{-50,-2},{-6,-20}},
+          points={{18,14},{-12,2},{18,-8}},
           thickness=0.5),
         Text(
           extent={{-150,150},{150,110}},
-<<<<<<< HEAD
-          lineColor={0,0,255},
-          textString="%name")}),
-                            Documentation(info="<html>
-<p>
-Block that outputs <code>true</code> if the Real input <code>u1</code>
-is less than the Real input <code>u2</code>.
-Otherwise the output is <code>false</code>.
-=======
           textString="%name",
           lineColor={0,0,255}),
         Text(
@@ -258,14 +224,11 @@ in simulation to guard against numerical noise. Numerical noise can be present i
 an input depends on a state variable or a quantity that requires an iterative solution, such as
 a temperature or a mass flow rate of an HVAC system.
 To disable hysteresis, set <i>h=0</i>.
->>>>>>> master
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 February 3, 2021, by Antoine Gautier:<br/>
 Corrected documentation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2246\">issue 2246</a>.
@@ -276,7 +239,6 @@ Added hysteresis.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
 </li>
 <li>
->>>>>>> master
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo
index 3809e0c2590..471e0e526c8 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo
@@ -1,22 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous;
-<<<<<<< HEAD
-block LessThreshold "Output y is true, if input u is less than threshold"
-
-  parameter Real threshold=0 "Comparison with respect to threshold";
-
-  Interfaces.RealInput u "Connector of Real input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-equation
-  y = u < threshold;
-  annotation (
-        defaultComponentName="lesThr",
-        Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
-            {100,100}}), graphics={
-=======
 block LessThreshold
   "Output y is true, if input u is less than threshold"
   parameter Real t=0
@@ -139,7 +121,6 @@ equation
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
->>>>>>> master
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
@@ -148,13 +129,6 @@ equation
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Ellipse(
-<<<<<<< HEAD
-          extent={{71,7},{85,-7}},
-          lineColor=DynamicSelect({235,235,235}, if y then {0,255,0}
-               else {235,235,235}),
-          fillColor=DynamicSelect({235,235,235}, if y then {0,255,0}
-               else {235,235,235}),
-=======
           extent={{73,7},{87,-7}},
           lineColor=DynamicSelect({235,235,235},
             if y then
@@ -166,26 +140,11 @@ equation
               {0,255,0}
             else
               {235,235,235}),
->>>>>>> master
           fillPattern=FillPattern.Solid),
-        Text(
-<<<<<<< HEAD
-          extent={{-150,-140},{150,-110}},
-          lineColor={0,0,0},
-          textString="%threshold"),
-        Text(
-          extent={{-150,150},{150,110}},
-          lineColor={0,0,255},
-          textString="%name"),
         Line(
-          points={{-10,20},{-54,0},{-10,-18}},
-          thickness=0.5)}),
-Documentation(info="<html>
-<p>
-Block that outputs <code>true</code> if the Real input is less than
-the parameter <code>threshold</code>.
-Otherwise the output is <code>false</code>.
-=======
+          points={{2,10},{-16,2},{2,-8}},
+          thickness=0.5),
+        Text(
           extent={{-150,150},{150,110}},
           textString="%name",
           lineColor={0,0,255}),
@@ -247,14 +206,11 @@ in simulation to guard against numerical noise. Numerical noise can be present i
 an input depends on a state variable or a quantity that requires an iterative solution, such as
 a temperature or a mass flow rate of an HVAC system.
 To disable hysteresis, set <i>h=0</i>.
->>>>>>> master
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 February 3, 2021, by Antoine Gautier:<br/>
 Corrected documentation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2246\">issue 2246</a>.
@@ -265,7 +221,6 @@ Added hysteresis.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
 </li>
 <li>
->>>>>>> master
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo b/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo
index d7189bbb7fa..efe40e99765 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo
@@ -28,13 +28,8 @@ equation
   if rowMax then
     y={max(u[i,:]) for i in 1:size(u,1)};
   else
-<<<<<<< HEAD
-    y = {max(u[:,i]) for i in 1:size(u, 2)};
-  end if
-=======
     y={max(u[:,i]) for i in 1:size(u,2)};
   end if;
->>>>>>> master
   annotation (
     defaultComponentName="matMax",
     Documentation(
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo b/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo
index 11acc044fed..adb3562c8ee 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo
@@ -28,13 +28,8 @@ equation
   if rowMin then
     y={min(u[i,:]) for i in 1:size(u,1)};
   else
-<<<<<<< HEAD
-    y = {min(u[:,i]) for i in 1:size(u, 2)};
-  end if
-=======
     y={min(u[:,i]) for i in 1:size(u,2)};
   end if;
->>>>>>> master
   annotation (
     defaultComponentName="matMin",
     Documentation(
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo b/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo
index 6aa60b3b127..09bb7dc0434 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo
@@ -13,17 +13,11 @@ block MultiMax
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
-<<<<<<< HEAD
-  y = max(u);
-
-annotation (Icon(coordinateSystem(
-=======
   y=max(u);
   annotation (
     defaultComponentName="mulMax",
     Icon(
       coordinateSystem(
->>>>>>> master
         preserveAspectRatio=false,
         extent={{-100,-100},{100,100}}),
       graphics={
diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo b/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo
index d79509a4015..eaf5296bb38 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo
@@ -13,16 +13,11 @@ block MultiMin
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
-<<<<<<< HEAD
-  y = min(u);
-  annotation (Icon(coordinateSystem(
-=======
   y=min(u);
   annotation (
     defaultComponentName="mulMin",
     Icon(
       coordinateSystem(
->>>>>>> master
         preserveAspectRatio=false,
         extent={{-100,-100},{100,100}}),
       graphics={
diff --git a/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo b/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo
index 2e476391cf3..5653cf20b44 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/SlewRateLimiter.mo
@@ -2,16 +2,6 @@ within Buildings.Controls.OBC.CDL.Continuous;
 block SlewRateLimiter
   "Limit the increase or decrease rate of input"
   parameter Real raisingSlewRate(
-<<<<<<< HEAD
-    min = Constants.small,
-    final unit = "1/s") "Speed with which to increase the output";
-
-  parameter Real fallingSlewRate(
-    max = -Constants.small,
-    final unit = "1/s") = -raisingSlewRate "Speed with which to decrease the output";
-
-  parameter Modelica.SIunits.Time Td(min=Constants.eps) = raisingSlewRate*10
-=======
     min=Constants.small,
     unit="1/s")
     "Speed with which to increase the output";
@@ -23,7 +13,6 @@ block SlewRateLimiter
     final quantity="Time",
     final unit="s",
     min=Constants.eps)=raisingSlewRate*10
->>>>>>> master
     "Derivative time constant";
   parameter Boolean enable=true
     "Set to false to disable rate limiter";
@@ -84,8 +73,6 @@ Smaller time constant <code>Td</code> means nearer ideal derivative.
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -97,7 +84,6 @@ Removed final attribute on unit because if the input quantity is power,
 then the rate limit is units of power per units of time.
 </li>
 <li>
->>>>>>> master
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo
index b40a47e400a..b8cb4de93f4 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo
@@ -6,34 +6,6 @@ block Pulse
   parameter Real width(
     final min=Constants.small,
     final max=1,
-<<<<<<< HEAD
-    final unit = "1") = 0.5 "Width of pulse in fraction of period";
-  parameter Modelica.SIunits.Time period(final min=Constants.small)
-   "Time for one period";
-  parameter Integer nperiod=-1
-    "Number of periods (< 0 means infinite number of periods)";
-  parameter Real offset=0 "Offset of output signals";
-  parameter Modelica.SIunits.Time startTime=0
-    "Output = offset for time < startTime";
-  Interfaces.RealOutput y "Connector of Pulse output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-protected
-  Modelica.SIunits.Time T_width=period*width "Pulse duration time";
-  Modelica.SIunits.Time T_start "Start time of current period";
-  Integer count "Period count";
-initial equation
-  count = integer((time - startTime)/period);
-  T_start = startTime + count*period;
-equation
-  when integer((time - startTime)/period) > pre(count) then
-    count = pre(count) + 1;
-    T_start = time;
-  end when;
-  y = offset + (if (time < startTime or nperiod == 0 or (nperiod > 0 and
-    count >= nperiod)) then 0 else if time < T_start + T_width then amplitude
-     else 0);
-=======
     final unit="1")=0.5
     "Width of pulse in fraction of period";
   parameter Real period(
@@ -69,7 +41,6 @@ equation
     annotation (Line(points={{-18,0},{18,0}},color={255,0,255}));
   connect(y,booToRea.y)
     annotation (Line(points={{120,0},{42,0}},color={0,0,127}));
->>>>>>> master
   annotation (
     defaultComponentName="pul",
     Icon(
@@ -90,20 +61,9 @@ equation
           lineColor={192,192,192},
           fillColor={192,192,192},
           fillPattern=FillPattern.Solid),
-<<<<<<< HEAD
-        Line(points={{-90,-70},{82,-70}}, color={192,192,192}),
-        Polygon(
-          points={{90,-70},{68,-62},{68,-78},{90,-70}},
-          lineColor={192,192,192},
-          fillColor={192,192,192},
-          fillPattern=FillPattern.Solid),
-        Line(points={{-80,-70},{-40,-70},{-40,44},{0,44},{0,-70},{40,-70},{40,
-              44},{79,44}}),
-=======
         Line(
           points={{-90,-70},{82,-70}},
           color={192,192,192}),
->>>>>>> master
         Text(
           extent={{-147,-152},{153,-112}},
           lineColor={0,0,0},
@@ -115,10 +75,6 @@ equation
         Text(
           extent={{226,60},{106,10}},
           lineColor={0,0,0},
-<<<<<<< HEAD
-          textString=DynamicSelect("", String(y, leftjustified=false, significantDigits=3)))}),
-    Documentation(info="<html>
-=======
           textString=DynamicSelect("",String(y,
             leftjustified=false,
             significantDigits=3))),
@@ -163,27 +119,20 @@ equation
           fillPattern=FillPattern.Solid)}),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
-The Real output y is a pulse signal:
+Block that outputs a pulse signal as shown below.
 </p>
-
 <p align=\"center\">
 <img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.png\"
      alt=\"Pulse.png\" />
-<<<<<<< HEAD
-=======
      </p>
 <p>
 The pulse signal is generated an infinite number of times, and aligned with <code>time=shift</code>.
->>>>>>> master
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 December 03, 2020, by Milica Grahovac:<br/>
 Renamed <code>delay</code> parameter to <code>shift</code>.<br/>
 This is for
@@ -202,7 +151,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
 </li>
 <li>
->>>>>>> master
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo
index 539f73ec751..08ced6a86d6 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo
@@ -7,17 +7,12 @@ block TimeTable
     "Smoothness of table interpolation";
   parameter CDL.Types.Extrapolation extrapolation=CDL.Types.Extrapolation.Periodic
     "Extrapolation of data outside the definition range";
-<<<<<<< HEAD
-  parameter Real offset[:]={0} "Offsets of output signals";
-  parameter Modelica.SIunits.Time timeScale=1
-=======
   parameter Real offset[:]=fill(
     0,
     nout)
     "Offsets of output signals as a vector with length equal to number of table matrix columns less one";
   parameter Real timeScale(
     final unit="1")=1
->>>>>>> master
     "Time scale of first table column. Set to 3600 if time in table is in hours";
   Interfaces.RealOutput y[nout]
     "Output of the table"
@@ -33,9 +28,6 @@ protected
     final unit="s",
     fixed=false)
     "First sample time instant";
-<<<<<<< HEAD
-
-=======
   parameter Real timeRange(
     final quantity="Time",
     final unit="s")=timeScale*(table[end,1]-table[1,1])
@@ -44,7 +36,6 @@ protected
     table,
     1)
     "Number of time stamps";
->>>>>>> master
   // CDL uses different enumerations for smoothness and for extrapolation
   // than the Modelica Standard Library. Hence, we cast the CDL
   // enumeration to the MSL enumaration.
@@ -67,20 +58,6 @@ protected
       else
         Modelica.Blocks.Types.Extrapolation.Periodic,
     final offset=offset,
-<<<<<<< HEAD
-    final startTime=if (extrapolation == Types.Extrapolation.Periodic) then integer(t0/86400)*86400 else 0,
-    final timeScale=timeScale) "Time table"
-    annotation (Placement(transformation(extent={{-12,-10},{8,10}})));
-
-initial equation
-  t0=time;
-
-equation
-  connect(tab.y, y) annotation (Line(points={{9,0},{120,0}}, color={0,0,127}));
-
-annotation (
-Documentation(info="<html>
-=======
     final startTime=
       if(extrapolation == Types.Extrapolation.Periodic) then
         t0
@@ -108,12 +85,11 @@ equation
     defaultComponentName="timTab",
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Block that outputs values of a time table.
 </p>
 <p>
-The block takes as a parameter a time table of the format
+The block takes as a parameter a time table of a format:
 </p>
 <pre>
 table = [ 0*3600, 0;
@@ -280,8 +256,6 @@ of <i>0.5</i> seconds outputs
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -297,7 +271,6 @@ October 7, 2020, by Michael Wetter:<br/>
 Revised implementation to add <code>timeSpan</code>.
 </li>
 <li>
->>>>>>> master
 March 13, 2020, by Michael Wetter:<br/>
 Corrected implementation so that the table also works if the simulation
 starts at a negative time.<br/>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/Greater.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/Greater.mo
index 76cf86e7e50..75c1e13c2f7 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/Greater.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/Greater.mo
@@ -1,32 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous.Validation;
-<<<<<<< HEAD
-model Greater "Validation model for the Greater block"
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
-    duration=1,
-    offset=-2,
-    height=4)  "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-26,10},{-6,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
-    duration=1,
-    offset=-1,
-    height=2) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-26,-32},{-6,-12}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.Greater greater1
-    annotation (Placement(transformation(extent={{26,-10},{46,10}})));
-
-equation
-  connect(ramp1.y, greater1.u1)
-    annotation (Line(points={{-5,20},{8,20},{8,0},{24,0}}, color={0,0,127}));
-  connect(ramp2.y, greater1.u2) annotation (Line(points={{-5,-22},{10,-22},{10,
-          -8},{24,-8}},
-                    color={0,0,127}));
-  annotation (
-  experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Greater.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
 model Greater
   "Validation model for the Greater block"
   Buildings.Controls.OBC.CDL.Continuous.Greater gre
@@ -68,16 +40,21 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Greater.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Greater\">
 Buildings.Controls.OBC.CDL.Continuous.Greater</a>.
+The instance <code>gre</code> has no hysteresis, and the
+instance <code>greHys</code> has a hysteresis.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+August 5, 2020, by Michael Wetter:<br/>
+Updated model to add a test case with hysteresis.
+</li>
+<li>
 April 1, 2017, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mo
index e3986c9da95..2bc301f1d03 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mo
@@ -1,24 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous.Validation;
-<<<<<<< HEAD
-model GreaterThreshold  "Validation model for the GreaterThreshold block"
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
-    duration=1,
-    offset=-1,
-    height=2) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-26,-8},{-6,12}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr
-    annotation (Placement(transformation(extent={{26,-8},{46,12}})));
-
-equation
-  connect(ramp2.y, greThr.u)
-    annotation (Line(points={{-5,2},{8,2},{24,2}}, color={0,0,127}));
-  annotation (
-  experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
 model GreaterThreshold
   "Validation model for the GreaterThreshold block"
   Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold gre(
@@ -54,16 +34,21 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold\">
 Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold</a>.
+The instance <code>gre</code> has no hysteresis, and the
+instance <code>greHys</code> has a hysteresis.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+August 5, 2020, by Michael Wetter:<br/>
+Updated model to add a test case with hysteresis.
+</li>
+<li>
 April 1, 2017, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mo
index 087e3778ddf..1e27d8b4866 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mo
@@ -1,63 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous.Validation;
-<<<<<<< HEAD
-model IntegratorWithReset "Test model for integrator with reset"
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cons(k=10) "Constant as source term"
-    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes1(
-    y_start=5, reset=Types.Reset.Parameter,
-    k=0.5,
-    y_reset=2)   "Integrator with reset"
-    annotation (Placement(transformation(extent={{-10,20},{10,40}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes2(
-    y_reset=10,
-    y_start=-5,
-    reset=Types.Reset.Input,
-    k=0.5)     "Integrator with reset and y_reset = 2"
-    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse
-    booleanPulse(width=0.5, period=0.2) "Boolean pulse"
-    annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intNoReset(
-    reset=Types.Reset.Disabled,
-    k=0.5,
-    y_start=1)
-    "Integrator without reset"
-    annotation (Placement(transformation(extent={{-10,60},{10,80}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger
-    sampleTrigger(period=0.2) "Sample trigger"
-    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp(
-    height=-1,
-    duration=1,
-    offset=-2) "Ramp as a source term"
-    annotation (Placement(transformation(extent={{-60,-38},{-40,-18}})));
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intDef
-    "Integrator with default values"
-    annotation (Placement(transformation(extent={{-12,-90},{8,-70}})));
-equation
-  connect(cons.y, intWitRes1.u) annotation (Line(points={{-39,70},{-26,70},{-26,
-          30},{-12,30}}, color={0,0,127}));
-  connect(intNoReset.u, cons.y) annotation (Line(points={{-12,70},{-12,70},{-28,
-          70},{-39,70}}, color={0,0,127}));
-  connect(cons.y, intWitRes2.u) annotation (Line(points={{-39,70},{-39,70},{-26,
-          70},{-26,-20},{-12,-20}}, color={0,0,127}));
-  connect(sampleTrigger.y, intWitRes1.trigger) annotation (Line(points={{-39,10},
-          {0,10},{0,18}},             color={255,0,255}));
-  connect(booleanPulse.y, intWitRes2.trigger)
-    annotation (Line(points={{-39,-60},{0,-60},{0,-32}},   color={255,0,255}));
-  connect(ramp.y, intWitRes2.y_reset_in) annotation (Line(points={{-39,-28},{
-          -39,-28},{-34,-28},{-12,-28}},
-                                     color={0,0,127}));
-  connect(cons.y, intDef.u) annotation (Line(points={{-39,70},{-26,70},{-26,-80},
-          {-14,-80}}, color={0,0,127}));
-          annotation (
-  experiment(StopTime=1.0, Tolerance=1e-06),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
 model IntegratorWithReset
   "Test model for integrator with reset"
   Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intDef
@@ -120,7 +61,6 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 This model tests the implementation of
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset\">
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/Less.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/Less.mo
index 1f86cd3f9db..326adebe521 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/Less.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/Less.mo
@@ -1,31 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous.Validation;
-<<<<<<< HEAD
-model Less "Validation model for the Less block"
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
-    duration=1,
-    offset=-2,
-    height=4)  "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-26,12},{-6,32}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
-    duration=1,
-    offset=-1,
-    height=2) "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-26,-30},{-6,-10}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.Less less1
-    annotation (Placement(transformation(extent={{26,-8},{46,12}})));
-
-equation
-  connect(ramp1.y, less1.u1)
-    annotation (Line(points={{-5,22},{8,22},{8,2},{24,2}}, color={0,0,127}));
-  connect(ramp2.y, less1.u2) annotation (Line(points={{-5,-20},{10,-20},{10,-6},
-          {24,-6}}, color={0,0,127}));
-  annotation (
-  experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Less.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
 model Less
   "Validation model for the Less block"
   Buildings.Controls.OBC.CDL.Continuous.Less les
@@ -67,16 +40,21 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Less.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Less\">
 Buildings.Controls.OBC.CDL.Continuous.Less</a>.
+The instance <code>les</code> has no hysteresis, and the
+instance <code>lesHys</code> has a hysteresis.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+August 5, 2020, by Michael Wetter:<br/>
+Updated model to add a test case with hysteresis.
+</li>
+<li>
 April 1, 2017, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mo
index 5be35a143e5..3696a4ae891 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mo
@@ -1,24 +1,4 @@
 within Buildings.Controls.OBC.CDL.Continuous.Validation;
-<<<<<<< HEAD
-model LessThreshold "Validation model for the LessThreshold block"
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
-    duration=1,
-    offset=-2,
-    height=4)  "Block that generates ramp signal"
-    annotation (Placement(transformation(extent={{-36,-10},{-16,10}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold lesThr
-    annotation (Placement(transformation(extent={{16,-10},{36,10}})));
-
-equation
-  connect(ramp1.y, lesThr.u)
-    annotation (Line(points={{-15,0},{0,0},{14,0}}, color={0,0,127}));
-  annotation (
-  experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
 model LessThreshold
   "Validation model for the LessThreshold block"
   Buildings.Controls.OBC.CDL.Continuous.LessThreshold les(
@@ -54,16 +34,21 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LessThreshold\">
 Buildings.Controls.OBC.CDL.Continuous.LessThreshold</a>.
+The instance <code>les</code> has no hysteresis, and the
+instance <code>lesHys</code> has a hysteresis.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+August 5, 2020, by Michael Wetter:<br/>
+Updated model to add a test case with hysteresis.
+</li>
+<li>
 April 1, 2017, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mo
similarity index 60%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
rename to Buildings/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mo
index dad1e404105..7e4508a76ad 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mo
@@ -1,5 +1,5 @@
 within Buildings.Controls.OBC.CDL.Continuous.Validation;
-model LimPIDInitialState
+model PIDInitialState
   "Test model for LimPID controller with initial state specified"
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant ySet(
     k=0.75)
@@ -9,33 +9,17 @@ model LimPIDInitialState
     k=0.5)
     "Measured value"
     annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
-
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPID(
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
-    k=3,
-    yMax=1,
-    yMin=0,
-    xi_start=0.25) "PID controller"
-=======
   Buildings.Controls.OBC.CDL.Continuous.PID limPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
     k=3,
     xi_start=0.25)
     "PID controller"
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mo
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPI(
+  Buildings.Controls.OBC.CDL.Continuous.PID limPI(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=3,
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
-    yMax=1,
-    yMin=0,
-    xi_start=0.25) "PI controller"
-=======
     xi_start=0.25)
     "PI controller"
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mo
     annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
 
 equation
@@ -51,20 +35,14 @@ equation
     experiment(
       StopTime=1,
       Tolerance=1e-06),
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
     __Dymola_Commands(
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mo
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>.
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.PID\">
+Buildings.Controls.OBC.CDL.Continuous.PID</a>.
 </p>
 <p>
 This model validates setting the initial state of the controller to a specified value.
@@ -89,21 +67,6 @@ First implementation.
 </li>
 </ul>
 </html>"),
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
-    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
-         graphics={
-        Ellipse(lineColor = {75,138,73},
-                fillColor={255,255,255},
-                fillPattern = FillPattern.Solid,
-                extent = {{-100,-100},{100,100}}),
-        Polygon(lineColor = {0,0,255},
-                fillColor = {75,138,73},
-                pattern = LinePattern.None,
-                fillPattern = FillPattern.Solid,
-                points = {{-36,60},{64,0},{-36,-60},{-36,60}})}),
-    Diagram(coordinateSystem(extent={{-100,-100},{100,100}})));
-end LimPIDInitialState;
-=======
     Icon(
       coordinateSystem(
         extent={{-100,-100},{100,100}}),
@@ -123,4 +86,3 @@ end LimPIDInitialState;
       coordinateSystem(
         extent={{-100,-100},{100,100}})));
 end PIDInitialState;
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mo
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo b/Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
similarity index 51%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
rename to Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
index 78fe6ceb760..41b31a7f19d 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
@@ -1,18 +1,9 @@
 within Buildings.Controls.OBC.CDL.Continuous.Validation;
-model LimPIDWithReset
+model PIDWithReset
   "Test model for LimPID controller with reset trigger"
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal setPoi
     "Set point"
     annotation (Placement(transformation(extent={{-20,-40},{0,-20}})));
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-  Buildings.Controls.OBC.CDL.Continuous.Sources.ModelTime modTim "Model time"
-    annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr(
-      threshold=1) "Outputs true after t=1"
-    annotation (Placement(transformation(extent={{-52,-70},{-32,-50}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPIDPar(
-=======
   Buildings.Controls.OBC.CDL.Continuous.Sources.ModelTime modTim
     "Model time"
     annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
@@ -21,145 +12,57 @@ model LimPIDWithReset
     "Outputs true after t=1"
     annotation (Placement(transformation(extent={{-52,-70},{-32,-50}})));
   Buildings.Controls.OBC.CDL.Continuous.PIDWithReset limPIDPar(
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
     k=1,
     Ti=1,
     Td=1,
-    yMax=1,
     yMin=-1,
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
-    y_reset=0.5) "Controller, reset to parameter value"
-=======
     y_reset=0.5)
     "Controller, reset to parameter value"
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
     annotation (Placement(transformation(extent={{20,60},{40,80}})));
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes1(
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Disabled)
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes1
     "Integrator whose output should be brought to the set point"
     annotation (Placement(transformation(extent={{60,60},{80,80}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPIDInp(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset limPIDInp(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
     k=1,
     Ti=1,
     Td=1,
-    yMax=1,
     yMin=-1,
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Input,
-    y_reset=0.5) "Controller, reset to input value"
-=======
     y_reset=0.75)
     "Controller, reset to input value"
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes2(
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Disabled)
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes2
     "Integrator whose output should be brought to the set point"
     annotation (Placement(transformation(extent={{60,20},{80,40}})));
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant resVal(k=0.75)
-=======
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant resVal(
     k=0)
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
     "Reset value"
-    annotation (Placement(transformation(extent={{-40,12},{-20,32}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPIPar(
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset limPIPar(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=1,
     Ti=1,
     Td=1,
-    yMax=1,
     yMin=-1,
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter,
-    y_reset=0.5) "Controller, reset to parameter value"
-=======
     y_reset=0.5)
     "Controller, reset to parameter value"
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
     annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes3(
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Disabled)
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes3
     "Integrator whose output should be brought to the set point"
     annotation (Placement(transformation(extent={{60,-40},{80,-20}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPIInp(
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset limPIInp(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=1,
     Ti=1,
     Td=1,
-    yMax=1,
     yMin=-1,
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Input,
-    y_reset=0.5) "Controller, reset to input value"
-=======
     y_reset=0.75)
     "Controller, reset to input value"
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
     annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
-  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes4(
-    reset=Buildings.Controls.OBC.CDL.Types.Reset.Disabled)
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes4
     "Integrator whose output should be brought to the set point"
     annotation (Placement(transformation(extent={{60,-80},{80,-60}})));
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-equation
-  connect(limPIDPar.u_s, setPoi.y) annotation (Line(points={{18,70},{6,70},{6,
-          -30},{2,-30}}, color={0,0,127}));
-  connect(intWitRes1.u, limPIDPar.y)
-    annotation (Line(points={{58,70},{42,70}}, color={0,0,127}));
-  connect(intWitRes1.y, limPIDPar.u_m) annotation (Line(points={{82,70},{90,70},
-          {90,50},{30,50},{30,58}}, color={0,0,127}));
-  connect(modTim.y, greEquThr.u)
-    annotation (Line(points={{-68,-60},{-54,-60}},   color={0,0,127}));
-  connect(greEquThr.y, setPoi.u) annotation (Line(points={{-30,-60},{-28,-60},{
-          -28,-30},{-22,-30}},    color={255,0,255}));
-  connect(greEquThr.y, limPIDPar.trigger) annotation (Line(points={{-30,-60},{8,
-          -60},{8,50},{24,50},{24,58}},  color={255,0,255}));
-  connect(intWitRes2.u, limPIDInp.y)
-    annotation (Line(points={{58,30},{42,30}}, color={0,0,127}));
-  connect(intWitRes2.y, limPIDInp.u_m) annotation (Line(points={{82,30},{90,30},
-          {90,10},{30,10},{30,18}}, color={0,0,127}));
-  connect(limPIDInp.u_s, setPoi.y) annotation (Line(points={{18,30},{6,30},{6,
-          -30},{2,-30}},
-                     color={0,0,127}));
-  connect(limPIDInp.y_reset_in, resVal.y)
-    annotation (Line(points={{18,22},{-18,22}},
-                                              color={0,0,127}));
-  connect(limPIPar.u_s, setPoi.y) annotation (Line(points={{18,-30},{2,-30}},
-                     color={0,0,127}));
-  connect(intWitRes3.u, limPIPar.y)
-    annotation (Line(points={{58,-30},{42,-30}}, color={0,0,127}));
-  connect(intWitRes3.y, limPIPar.u_m) annotation (Line(points={{82,-30},{90,-30},
-          {90,-50},{30,-50},{30,-42}}, color={0,0,127}));
-  connect(greEquThr.y, limPIPar.trigger) annotation (Line(points={{-30,-60},{8,
-          -60},{8,-50},{24,-50},{24,-42}},  color={255,0,255}));
-  connect(intWitRes4.u, limPIInp.y)
-    annotation (Line(points={{58,-70},{42,-70}}, color={0,0,127}));
-  connect(intWitRes4.y, limPIInp.u_m) annotation (Line(points={{82,-70},{90,-70},
-          {90,-90},{30,-90},{30,-82}}, color={0,0,127}));
-  connect(limPIInp.u_s, setPoi.y) annotation (Line(points={{18,-70},{6,-70},{6,
-          -30},{2,-30}},
-                     color={0,0,127}));
-  connect(limPIInp.y_reset_in, resVal.y) annotation (Line(points={{18,-78},{14,
-          -78},{14,22},{-18,22}},
-                                color={0,0,127}));
-  connect(greEquThr.y, limPIInp.trigger) annotation (Line(points={{-30,-60},{8,
-          -60},{8,-90},{24,-90},{24,-82}},  color={255,0,255}));
-  connect(limPIDInp.trigger, greEquThr.y) annotation (Line(points={{24,18},{24,
-          10},{8,10},{8,-60},{-30,-60}},
-                                       color={255,0,255}));
- annotation (
- experiment(
-      StopTime=10,
-      Tolerance=1e-06),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant con(
     final k=false)
     "Constant false"
@@ -226,11 +129,10 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>.
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.PID\">
+Buildings.Controls.OBC.CDL.Continuous.PID</a>.
 </p>
 <p>
 This model validates the controller for different settings of the control output reset.
@@ -244,21 +146,6 @@ First implementation.
 </li>
 </ul>
 </html>"),
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
-    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
-         graphics={
-        Ellipse(lineColor = {75,138,73},
-                fillColor={255,255,255},
-                fillPattern = FillPattern.Solid,
-                extent = {{-100,-100},{100,100}}),
-        Polygon(lineColor = {0,0,255},
-                fillColor = {75,138,73},
-                pattern = LinePattern.None,
-                fillPattern = FillPattern.Solid,
-                points = {{-36,60},{64,0},{-36,-60},{-36,60}})}),
-    Diagram(coordinateSystem(extent={{-100,-100},{100,100}})));
-end LimPIDWithReset;
-=======
     Icon(
       coordinateSystem(
         extent={{-100,-100},{100,100}}),
@@ -278,4 +165,3 @@ end LimPIDWithReset;
       coordinateSystem(
         extent={{-100,-100},{100,100}})));
 end PIDWithReset;
->>>>>>> master:Buildings/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mo
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/package.order b/Buildings/Controls/OBC/CDL/Continuous/Validation/package.order
index 1721027fadb..3b1ba466789 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Continuous/Validation/package.order
@@ -4,28 +4,17 @@ AddParameter
 Atan
 Atan2
 Average
-ChangeSign
 Cos
-Derivative
 Division
 Exp
 Feedback
 Gain
 Greater
-GreaterEqual
-GreaterEqualThreshold
 GreaterThreshold
 Hysteresis
-HysteresisWithHold
 IntegratorWithReset
 Less
-LessEqual
-LessEqualThreshold
 LessThreshold
-LimPID
-LimPIDInitialDerivativeOutput
-LimPIDInitialState
-LimPIDWithReset
 Limiter
 Line
 Log
@@ -41,7 +30,12 @@ MovingMean_nonZeroStart
 MultiMax
 MultiMin
 MultiSum
-NumberOfRequests
+PID
+PIDInitialDerivativeOutput
+PIDInitialState
+PIDScale
+PIDWithReset
+PIDWithResetScale
 Product
 Round
 Sin
diff --git a/Buildings/Controls/OBC/CDL/Continuous/package.order b/Buildings/Controls/OBC/CDL/Continuous/package.order
index ccfac5a5b2c..d1a4d630e22 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/package.order
+++ b/Buildings/Controls/OBC/CDL/Continuous/package.order
@@ -4,25 +4,17 @@ AddParameter
 Atan
 Atan2
 Average
-ChangeSign
 Cos
-Derivative
 Division
 Exp
 Feedback
 Gain
 Greater
-GreaterEqual
-GreaterEqualThreshold
 GreaterThreshold
 Hysteresis
-HysteresisWithHold
 IntegratorWithReset
 Less
-LessEqual
-LessEqualThreshold
 LessThreshold
-LimPID
 Limiter
 Line
 Log
@@ -37,7 +29,8 @@ MovingMean
 MultiMax
 MultiMin
 MultiSum
-NumberOfRequests
+PID
+PIDWithReset
 Product
 Round
 Sin
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
index 0233b104aa8..f367c9477ed 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
@@ -44,10 +44,6 @@ Modelica Standard Library.
 </li>
 </ul>
 </html>"),
-<<<<<<< HEAD
-         Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
-            {100,100}}), graphics={
-=======
     Icon(
       coordinateSystem(
         preserveAspectRatio=true,
@@ -59,32 +55,20 @@ Modelica Standard Library.
           lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
->>>>>>> master
         Text(
-          extent={{-86,92},{-6,10}},
+          extent={{-86,78},{-34,26}},
           lineColor={255,0,255},
           textString="B"),
         Polygon(
-          points={{-12,-46},{-32,-26},{-32,-36},{-64,-36},{-64,-56},{-32,-56},
-              {-32,-66},{-12,-46}},
+          points={{28,48},{8,68},{8,58},{-24,58},{-24,38},{8,38},{8,28},{28,48}},
           lineColor={255,170,85},
           fillColor={255,170,85},
           fillPattern=FillPattern.Solid),
         Text(
-          extent={{8,-4},{92,-94}},
+          extent={{34,82},{86,24}},
           lineColor={255,170,85},
-<<<<<<< HEAD
-          textString="I"),               Rectangle(
-          extent={{-100,100},{100,-100}},
-          fillColor={210,210,210},
-          lineThickness=5.0,
-          fillPattern=FillPattern.Solid,
-          borderPattern=BorderPattern.Raised),
-                                   Ellipse(
-=======
           textString="I"),
         Ellipse(
->>>>>>> master
           extent={{-71,7},{-85,-7}},
           lineColor=DynamicSelect({235,235,235},
             if u then
@@ -100,9 +84,6 @@ Modelica Standard Library.
         Text(
           extent={{-150,150},{150,110}},
           textString="%name",
-<<<<<<< HEAD
-          lineColor={0,0,255})}));
-=======
           lineColor={0,0,255}),
         Text(
           extent={{-74,-28},{64,20}},
@@ -112,5 +93,4 @@ Modelica Standard Library.
           extent={{-74,-90},{64,-42}},
           lineColor={0,0,0},
           textString="%integerFalse")}));
->>>>>>> master
 end BooleanToInteger;
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
index e36d1142a28..4e726573930 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
@@ -44,31 +44,12 @@ Modelica Standard Library.
 </li>
 </ul>
 </html>"),
-<<<<<<< HEAD
-         Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
-            {100,100}}), graphics={
-        Text(
-          extent={{-86,92},{-6,10}},
-          lineColor={255,0,255},
-          textString="B"),
-        Polygon(
-          points={{-12,-46},{-32,-26},{-32,-36},{-64,-36},{-64,-56},{-32,-56},
-              {-32,-66},{-12,-46}},
-          lineColor={255,170,85},
-          fillColor={255,170,85},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{8,-4},{92,-94}},
-          lineColor={255,170,85},
-          textString="I"),               Rectangle(
-=======
     Icon(
       coordinateSystem(
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
         Rectangle(
->>>>>>> master
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
           lineThickness=5.0,
@@ -90,9 +71,6 @@ Modelica Standard Library.
         Text(
           extent={{-150,150},{150,110}},
           textString="%name",
-<<<<<<< HEAD
-          lineColor={0,0,255})}));
-=======
           lineColor={0,0,255}),
         Text(
           extent={{-68,-86},{70,-38}},
@@ -115,5 +93,4 @@ Modelica Standard Library.
           extent={{34,82},{86,24}},
           lineColor={0,0,127},
           textString="R")}));
->>>>>>> master
 end BooleanToReal;
diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo
index 234de17bbbf..513936a48ea 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo
@@ -10,12 +10,8 @@ model TriggeredMovingMean
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
     width=0.5,
     period=1,
-<<<<<<< HEAD
-    startTime=-0.5) "Block that outputs trigger signals"
-=======
     shift=-0.5)
     "Block that outputs trigger signals"
->>>>>>> master
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
   Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean triMovMea(
     n=3)
@@ -31,13 +27,8 @@ model TriggeredMovingMean
     annotation (Placement(transformation(extent={{0,-60},{20,-40}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
     width=0.5,
-<<<<<<< HEAD
-    period=1,
-    startTime=0) "Block that outputs trigger signals"
-=======
     period=1)
     "Block that outputs trigger signals"
->>>>>>> master
     annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
 
 equation
diff --git a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo
index 34cec06e9bf..3869bdab399 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo
@@ -37,13 +37,6 @@ protected
     "Slope";
 
 initial equation
-<<<<<<< HEAD
-  t0 = time;
-  pre(tSample) = time;
-  pre(uSample) = u;
-  pre(pre_uSample) = u;
-  pre(c) = 0.0;
-=======
   t0=Buildings.Utilities.Math.Functions.round(
     x=integer(time/samplePeriod)*samplePeriod,
     n=6);
@@ -51,7 +44,6 @@ initial equation
   pre(uSample)=u;
   pre(pre_uSample)=u;
   pre(c)=0.0;
->>>>>>> master
 
 equation
   // Declarations that are used for all discrete blocks
@@ -59,17 +51,6 @@ equation
     t0,
     samplePeriod);
   when sampleTrigger then
-<<<<<<< HEAD
-    firstTrigger = time <= t0 + samplePeriod/2;
-  end when;
-
-  // Declarations specific to this type of discrete block
-  when sampleTrigger then
-    tSample = time;
-    uSample = u;
-    pre_uSample = pre(uSample);
-    c = if firstTrigger then 0 else (uSample - pre_uSample)/samplePeriod;
-=======
     firstTrigger=time <= t0+samplePeriod/2;
     tSample=time;
     uSample=u;
@@ -79,7 +60,6 @@ equation
         0
       else
         (uSample-pre_uSample)/samplePeriod;
->>>>>>> master
   end when;
   /* Use pre_uSample and pre(c) to break potential algebraic loops by an
        infinitesimal delay if both the continuous and the discrete part
@@ -125,8 +105,6 @@ values of the last two sampled input signals.
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -139,7 +117,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
 </li>
 <li>
->>>>>>> master
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
index f64d65c915b..9a4c22eb8ed 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
@@ -27,13 +27,9 @@ protected
     "Rising edge signals first sample instant";
 
 initial equation
-<<<<<<< HEAD
-  t0 = time;
-=======
   t0=Buildings.Utilities.Math.Functions.round(
     x=integer(time/samplePeriod)*samplePeriod,
     n=6);
->>>>>>> master
 
 equation
   // Declarations that are used for all discrete blocks
@@ -124,8 +120,6 @@ via parameter <code>samplePeriod</code>.
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -138,7 +132,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
 </li>
 <li>
->>>>>>> master
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
index 8a53ca834ae..0ceb2edb161 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
@@ -15,13 +15,6 @@ block TriggeredMovingMean
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 protected
-<<<<<<< HEAD
-  parameter Modelica.SIunits.Time t0(fixed=false) "First sample time instant";
-  Integer iSample(start=0, fixed=true) "Sample numbering in the calculation";
-  Integer counter(start=0, fixed=true)
-      "Number of samples used for averaging calculation";
-  Integer index(start=0, fixed=true) "Index of the vector ySample";
-=======
   Integer iSample(
     start=0,
     fixed=true)
@@ -34,15 +27,11 @@ protected
     start=0,
     fixed=true)
     "Index of the vector ySample";
->>>>>>> master
   Real ySample[n](
     start=zeros(n),
     each fixed=true)
     "Vector of samples to be averaged";
 
-initial equation
-  t0 = time;
-
 equation
   when {initial(),trigger} then
     index=mod(
@@ -184,6 +173,10 @@ and produces this value at its output <code>y</code>.
       revisions="<html>
 <ul>
 <li>
+October 19, 2020, by Michael Wetter:<br/>
+Removed non-needed protected parameter <code>t0</code>.
+</li>
+<li>
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo
index e7647a24613..7e010c64199 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo
@@ -24,19 +24,11 @@ protected
   output Boolean sampleTrigger
     "True, if sample time instant";
 
-  output Boolean firstTrigger(start=false, fixed=true)
-    "Rising edge signals first sample instant";
-
 initial equation
-<<<<<<< HEAD
-  t0 = time;
-  y = y_start;
-=======
   t0=Buildings.Utilities.Math.Functions.round(
     x=integer(time/samplePeriod)*samplePeriod,
     n=6);
   y=y_start;
->>>>>>> master
 
 equation
   // Declarations that are used for all discrete blocks
@@ -44,20 +36,8 @@ equation
     t0,
     samplePeriod);
   when sampleTrigger then
-<<<<<<< HEAD
-    firstTrigger = time <= t0 + samplePeriod/2;
-  end when;
-
-  // Declarations specific to this type of discrete block
-  when sampleTrigger then
-    y = pre(u);
-  end when;
-
-
-=======
     y=pre(u);
   end when;
->>>>>>> master
   annotation (
     defaultComponentName="uniDel",
     Documentation(
@@ -80,8 +60,6 @@ the output <code>y</code> is identical to parameter <code>y_start</code>.
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -94,7 +72,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
 </li>
 <li>
->>>>>>> master
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
index 06edc255f2d..b25e0deeb8a 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
@@ -31,13 +31,9 @@ protected
     "Rising edge signals first sample instant";
 
 initial equation
-<<<<<<< HEAD
-  t0 = time;
-=======
   t0=Buildings.Utilities.Math.Functions.round(
     x=integer(time/samplePeriod)*samplePeriod,
     n=6);
->>>>>>> master
 
 equation
   // Declarations that are used for all discrete blocks
@@ -94,8 +90,6 @@ At initial time, the block feeds the input directly to the output.
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -108,7 +102,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
 </li>
 <li>
->>>>>>> master
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
index 08c1317b292..c12b6d24a7c 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
@@ -1,31 +1,16 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block GreaterEqualThreshold
   "Output y is true, if input u is greater or equal than threshold"
-<<<<<<< HEAD
-
-  parameter Integer threshold=0 "Comparison with respect to threshold";
-
-  Interfaces.IntegerInput u "Connector of Integer input signal"
-=======
   parameter Integer t=0
     "Comparison with respect to a threshold";
   Interfaces.IntegerInput u
     "Connector of Integer input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
-<<<<<<< HEAD
-  y = u >= threshold;
-
-annotation (
-  defaultComponentName="intGreEquThr",
-  Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
-            {100,100}}), graphics={
-=======
   y=u >= t;
   annotation (
     defaultComponentName="intGreEquThr",
@@ -34,11 +19,10 @@ annotation (
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
->>>>>>> master
         Text(
           extent={{-150,-140},{150,-110}},
           lineColor={0,0,0},
-          textString="%threshold"),
+          textString="%t"),
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
@@ -75,13 +59,18 @@ annotation (
       info="<html>
 <p>
 Block that outputs <code>true</code> if the Integer input is greater than or equal to
-the parameter <code>threshold</code>.
+the parameter <code>t</code>.
 Otherwise the output is <code>false</code>.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+August 6, 2020, by Michael Wetter:<br/>
+Renamed <code>threshold</code> to <code>t</code>.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
+</li>
+<li>
 August 30, 2017, by Jianjun Hu:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
index 2ccecddde2e..432f3d6fe56 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
@@ -1,32 +1,16 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block GreaterThreshold
-<<<<<<< HEAD
-  "Output y is true, if input u is greater than threshold"
-
-  parameter Integer threshold=0 "Comparison with respect to threshold";
-
-  Interfaces.IntegerInput u "Connector of Integer input signal"
-=======
   "Output y is true, if input u is greater than a threshold"
   parameter Integer t=0
     "Threshold for comparison";
   Interfaces.IntegerInput u
     "Connector of Integer input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
-<<<<<<< HEAD
-  y = u > threshold;
-
-annotation (
-  defaultComponentName="intGreThr",
-  Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
-            {100,100}}), graphics={
-=======
   y=u > t;
   annotation (
     defaultComponentName="intGreThr",
@@ -35,7 +19,6 @@ annotation (
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
->>>>>>> master
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
@@ -59,7 +42,7 @@ annotation (
         Text(
           extent={{-150,-140},{150,-110}},
           lineColor={0,0,0},
-          textString="%threshold"),
+          textString="%t"),
         Text(
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
@@ -72,13 +55,18 @@ annotation (
       info="<html>
 <p>
 Block that outputs <code>true</code> if the Integer input is greater than
-the parameter <code>threshold</code>.
+the parameter <code>t</code>.
 Otherwise the output is <code>false</code>.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+August 6, 2020, by Michael Wetter:<br/>
+Renamed <code>threshold</code> to <code>t</code>.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
+</li>
+<li>
 August 30, 2017, by Jianjun Hu:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo
index 91a01b7cd4a..a6dd385f6ed 100644
--- a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo
@@ -1,32 +1,16 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block LessEqualThreshold
-<<<<<<< HEAD
-  "Output y is true, if input u is less or equal than threshold"
-
-  parameter Integer threshold=0 "Comparison with respect to threshold";
-
-  Interfaces.IntegerInput u "Connector of Integer input signal"
-=======
   "Output y is true, if input u is less or equal than a threshold"
   parameter Integer t=0
     "Threshold for comparison";
   Interfaces.IntegerInput u
     "Connector of Integer input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
-<<<<<<< HEAD
-  y = u <= threshold;
-
-annotation (
-  defaultComponentName="intLesEquThr",
-  Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
-            {100,100}}), graphics={
-=======
   y=u <= t;
   annotation (
     defaultComponentName="intLesEquThr",
@@ -35,7 +19,6 @@ annotation (
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}}),
       graphics={
->>>>>>> master
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
@@ -59,7 +42,7 @@ annotation (
         Text(
           extent={{-150,-140},{150,-110}},
           lineColor={0,0,0},
-          textString="%threshold"),
+          textString="%t"),
         Text(
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
@@ -76,13 +59,18 @@ annotation (
       info="<html>
 <p>
 Block that outputs <code>true</code> if the Integer input is less than or equal to
-the parameter <code>threshold</code>.
+the parameter <code>t</code>.
 Otherwise the output is <code>false</code>.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+August 6, 2020, by Michael Wetter:<br/>
+Renamed <code>threshold</code> to <code>t</code>.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
+</li>
+<li>
 August 30, 2017, by Jianjun Hu:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo
index ca3320b3982..bf4c95a4d33 100644
--- a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo
@@ -1,29 +1,17 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block LessThreshold
-<<<<<<< HEAD
-  "Output y is true, if input u is less than threshold"
-
-  parameter Integer threshold=0 "Comparison with respect to threshold";
-
-  Interfaces.IntegerInput u "Connector of Integer input signal"
-=======
   "Output y is true, if input u is less than a threshold"
   parameter Integer t=0
     "Threshold for comparison";
   Interfaces.IntegerInput u
     "Connector of Integer input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
-<<<<<<< HEAD
-  y = u < threshold;
-=======
   y=u < t;
->>>>>>> master
   annotation (
     defaultComponentName="intLesThr",
     Icon(
@@ -54,7 +42,7 @@ equation
         Text(
           extent={{-150,-140},{150,-110}},
           lineColor={0,0,0},
-          textString="%threshold"),
+          textString="%t"),
         Text(
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
@@ -67,7 +55,7 @@ equation
       info="<html>
 <p>
 Block that outputs <code>true</code> if the Integer input is less than
-the parameter <code>threshold</code>.
+the parameter <code>t</code>.
 Otherwise the output is <code>false</code>.
 </p>
 </html>",
diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/Validation/package.order b/Buildings/Controls/OBC/CDL/Integers/Sources/Validation/package.order
index b324db6735c..dd6122382b8 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Sources/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Integers/Sources/Validation/package.order
@@ -1 +1,4 @@
 Constant
+Pulse
+TimeTable
+TimeTableNegativeStartTime
diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/package.order b/Buildings/Controls/OBC/CDL/Integers/Sources/package.order
index 99d83f3a1a7..04261d0db18 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Sources/package.order
+++ b/Buildings/Controls/OBC/CDL/Integers/Sources/package.order
@@ -1,2 +1,4 @@
 Constant
+Pulse
+TimeTable
 Validation
diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo
index fb74fd1a8fa..2c15d8d88ae 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo
@@ -2,6 +2,7 @@ within Buildings.Controls.OBC.CDL.Integers.Validation;
 model Change
   "Validation model for the Change block"
   Buildings.Controls.OBC.CDL.Integers.Change cha
+    "Check if the integer input changes value"
     annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
     offset=0,
@@ -33,34 +34,6 @@ model Change
     annotation (Placement(transformation(extent={{60,-20},{80,0}})));
 
 equation
-<<<<<<< HEAD
-  connect(ramp2.y, changeSampler.u)
-    annotation (Line(points={{-19,30},{58,30}}, color={0,0,127}));
-  connect(timTabLin.y[1], reaToInt.u)
-    annotation (Line(points={{-59,-40},{-42,-40}}, color={0,0,127}));
-  connect(reaToInt.y, cha.u)
-    annotation (Line(points={{-19,-40},{-2,-40}}, color={255,127,0}));
-  connect(ramp2.y, increaseSampler.u)
-    annotation (Line(points={{-19,30},{40,30},{40,70},{58,70}},
-      color={0,0,127}));
-  connect(ramp2.y, decreaseSampler.u)
-    annotation (Line(points={{-19,30},{40,30},{40,-10},{58,-10}},
-      color={0,0,127}));
-  connect(cha.up, increaseSampler.trigger)
-    annotation (Line(points={{21,-34},{30,-34},{30,52},{70,52},{70,58.2}},
-      color={255,0,255}));
-  connect(cha.y, changeSampler.trigger)
-    annotation (Line(points={{21,-40},{46,-40},{46,12},{70,12},{70,18.2}},
-      color={255,0,255}));
-  connect(cha.down, decreaseSampler.trigger)
-    annotation (Line(points={{21,-46},{70,-46},{70,-21.8}}, color={255,0,255}));
-
-annotation (
-experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/Change.mos"
-        "Simulate and plot"),
-Documentation(info="<html>
-=======
   connect(ramp2.y,changeSampler.u)
     annotation (Line(points={{-18,30},{58,30}},color={0,0,127}));
   connect(timTabLin.y[1],reaToInt.u)
@@ -85,7 +58,6 @@ Documentation(info="<html>
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/Change.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Integers.Change\">
diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo
index e95e50bedfa..c7ca7486082 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo
@@ -8,12 +8,8 @@ model GreaterEqualThreshold
     "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold intGreEquThr(
-<<<<<<< HEAD
-    threshold=2) "Block output true if input is greater or equal to threshold value"
-=======
     t=2)
     "Block output true if input is greater or equal to threshold value"
->>>>>>> master
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Round round1(
     n=0)
diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo
index b7fb9f08d6b..788bd5e7e82 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo
@@ -8,11 +8,7 @@ model GreaterThreshold
     "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr(
-<<<<<<< HEAD
-    threshold=2)
-=======
     t=2)
->>>>>>> master
     "Block output true if input is greater than threshold value"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Round round1(
diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo
index c8288b14989..1b02d11e3f1 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo
@@ -8,11 +8,7 @@ model LessEqualThreshold
     "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Buildings.Controls.OBC.CDL.Integers.LessEqualThreshold intLesEquThr(
-<<<<<<< HEAD
-    threshold=2)
-=======
     t=2)
->>>>>>> master
     "Block output true if input is less or equal to threshold value"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Round round1(
diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo
index 8fcc73e3d1c..dfe6762a628 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo
@@ -8,12 +8,8 @@ model LessThreshold
     "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Buildings.Controls.OBC.CDL.Integers.LessThreshold intLesThr(
-<<<<<<< HEAD
-    threshold=2) "Block output true if input is less than threshold value"
-=======
     t=2)
     "Block output true if input is less than threshold value"
->>>>>>> master
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Round round1(
     n=0)
diff --git a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
index d55805729f3..3d64318e37e 100644
--- a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
@@ -11,12 +11,8 @@ block FallingEdge
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 protected
-<<<<<<< HEAD
-  Boolean not_u=not u;
-=======
   Boolean not_u=not u
     "Boolean not of the input";
->>>>>>> master
 
 initial equation
   pre(not_u)=not pre_u_start;
diff --git a/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo b/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo
index d54618e31d0..741b23bae48 100644
--- a/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/IntegerSwitch.mo
@@ -36,6 +36,12 @@ Otherwise, it outputs <code>y = u3</code>.
       revisions="<html>
 <ul>
 <li>
+July 17, 2020, by Jianjun Hu:<br/>
+Changed icon to display dynamically which input signal is being outputted.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2033\"># 2033</a>.
+</li>
+<li>
 July 10, 2019, by Milica Grahovac:<br/>
 First implementation.
 </li>
@@ -62,9 +68,6 @@ First implementation.
           points={{-100,-80},{-40,-80},{-40,-80}},
           color={244,125,35}),
         Line(
-<<<<<<< HEAD
-          points={{-40,80},{8,2}},
-=======
           points={{-40,12},{-40,-10}},
           color={255,0,255}),
         Line(
@@ -76,7 +79,6 @@ First implementation.
               {-40,80}
             else
               {-40,-80}}),
->>>>>>> master
           color={244,125,35},
           thickness=1),
         Ellipse(
@@ -98,8 +100,6 @@ First implementation.
               {235,235,235}),
           fillPattern=FillPattern.Solid),
         Text(
-<<<<<<< HEAD
-=======
           extent={{-90,80},{-46,54}},
           lineColor=DynamicSelect({0,0,0},
             if u2 then
@@ -116,7 +116,6 @@ First implementation.
               {0,0,0}),
           textString="false"),
         Text(
->>>>>>> master
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
           textString="%name")}));
diff --git a/Buildings/Controls/OBC/CDL/Logical/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
index a802e223859..b8fdaf4208b 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Latch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
@@ -1,16 +1,8 @@
 within Buildings.Controls.OBC.CDL.Logical;
-<<<<<<< HEAD
-block Latch "Maintains a true signal until change condition"
-
-  parameter Boolean pre_y_start=false "Start value of pre(y) if clr=false";
-
-  Interfaces.BooleanInput u "Latch input"
-=======
 block Latch
   "Maintains a true signal until change condition"
   Interfaces.BooleanInput u
     "Latch input"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Interfaces.BooleanInput clr
     "Clear input"
@@ -20,30 +12,19 @@ block Latch
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 initial equation
-<<<<<<< HEAD
-  pre(y) = pre_y_start;
-  pre(u) = false;
-  pre(clr) = false;
-=======
   pre(y)=false;
   pre(u)=false;
   pre(clr)=false;
->>>>>>> master
 
 equation
   when initial() then
     //scenario = 1;
-<<<<<<< HEAD
-    y = if clr then false else pre_y_start;
-  elsewhen (not clr) and change(u) and (pre(u) == false) then
-=======
     y=
       if clr then
         false
       else
         u;
   elsewhen(not clr) and change(u) and(pre(u) == false) then
->>>>>>> master
     //scenario = 2;
     y=not clr;
   elsewhen(not clr) and change(u) and(pre(u) == true) then
@@ -150,7 +131,7 @@ regardless of the value of the latch input <code>u</code>.
 </p>
 <p>
 At initial time, if <code>clr = false</code>, then the output will be 
-<code>y = pre_y_start</code>. Otherwise it will be <code>y=false</code> 
+<code>y = u</code>. Otherwise it will be <code>y=false</code> 
 (because the clear input <code>clr</code> is <code>true</code>).
 </p>
 
@@ -163,6 +144,12 @@ At initial time, if <code>clr = false</code>, then the output will be
       revisions="<html>
 <ul>
 <li>
+October 13, 2020, by Jianjun Hu:<br/>
+Removed the parameter <code>pre_y_start</code>, and made the initial output to be
+equal to latch input when the clear input is <code>false</code>.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2177\">issue 2177</a>.
+</li>
+<li>
 March 9, 2020, by Michael Wetter:<br/>
 Simplified implementation, and made model work with OpenModelica.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo b/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo
index 11b32ce2353..8b6c66d50aa 100644
--- a/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/LogicalSwitch.mo
@@ -36,6 +36,12 @@ Otherwise, it outputs <code>y = u3</code>.
       revisions="<html>
 <ul>
 <li>
+July 17, 2020, by Jianjun Hu:<br/>
+Changed icon to display dynamically which input signal is being outputted.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2033\"># 2033</a>.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
@@ -63,9 +69,6 @@ Modelica Standard Library.
           points={{-100,-80},{-40,-80},{-40,-80}},
           color={255,0,255}),
         Line(
-<<<<<<< HEAD
-          points={{-40,80},{8,2}},
-=======
           points={{-40,12},{-40,-10}},
           color={255,0,255}),
         Line(
@@ -77,7 +80,6 @@ Modelica Standard Library.
               {-40,80}
             else
               {-40,-80}}),
->>>>>>> master
           color={255,0,255},
           thickness=1),
         Ellipse(
@@ -138,8 +140,6 @@ Modelica Standard Library.
               {235,235,235}),
           fillPattern=FillPattern.Solid),
         Text(
-<<<<<<< HEAD
-=======
           extent={{-90,76},{-46,50}},
           lineColor=DynamicSelect({0,0,0},
             if u2 then
@@ -156,7 +156,6 @@ Modelica Standard Library.
               {0,0,0}),
           textString="false"),
         Text(
->>>>>>> master
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
           textString="%name")}));
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo
index a939dd0f55a..32cf234a178 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo
@@ -4,27 +4,6 @@ block Pulse
   parameter Real width(
     final min=Constants.small,
     final max=1,
-<<<<<<< HEAD
-    final unit = "1") = 0.5 "Width of pulse in fraction of period";
-  parameter Modelica.SIunits.Time period(
-    final min=Constants.small) "Time for one period";
-  parameter Modelica.SIunits.Time startTime=0 "Time instant of first pulse";
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-protected
-  parameter Modelica.SIunits.Time Twidth=period*width
-    "Width of one pulse";
-  discrete Modelica.SIunits.Time pulseStart "Start time of pulse";
-
-initial equation
-  pulseStart = startTime;
-equation
-  when sample(startTime, period) then
-    pulseStart = time;
-  end when;
-  y = time >= pulseStart and time < pulseStart + Twidth;
-=======
     final unit="1")=0.5
     "Width of pulse in fraction of period";
   parameter Real period(
@@ -92,7 +71,6 @@ equation
     period) then
     y=false;
   end when;
->>>>>>> master
   annotation (
     defaultComponentName="booPul",
     Icon(
@@ -109,14 +87,9 @@ equation
         Text(
           extent={{-150,-140},{150,-110}},
           lineColor={0,0,0},
-<<<<<<< HEAD
-          textString="%period"), Line(points={{-80,-70},{-40,-70},{-40,44},{0,
-              44},{0,-70},{40,-70},{40,44},{79,44}}),
-=======
           textString="%period"),
         Line(
           points={{79,-70},{40,-70},{40,44},{-1,44},{-1,-70},{-41,-70},{-41,44},{-80,44}}),
->>>>>>> master
         Polygon(
           points={{-80,88},{-88,66},{-72,66},{-80,88}},
           lineColor={255,0,255},
@@ -149,10 +122,6 @@ equation
         Text(
           lineColor={0,0,255},
           extent={{-150,110},{150,150}},
-<<<<<<< HEAD
-          textString="%name")}),
-      Documentation(info="<html>
-=======
           textString="%name"),
         Text(
           extent={{-66,80},{-8,56}},
@@ -188,21 +157,13 @@ equation
           textString="%shift")}),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
-The Boolean output y is a pulse signal:
+Block that outputs a pulse signal as shown below.
 </p>
-
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.png\"
+<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/Pulse.png\"
      alt=\"BooleanPulse.png\" />
 </p>
-<<<<<<< HEAD
-
-</html>", revisions="<html>
-<ul>
-<li>
-=======
 <p>
 The pulse signal is generated an infinite number of times, and aligned with <code>time=shift</code>.
 </p>
@@ -238,7 +199,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2110\">#2110</a>.
 </li>
 <li>
->>>>>>> master
 March 23, 2017, by Jianjun Hu:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo
index 476152f2072..cc6979f80cf 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo
@@ -1,16 +1,4 @@
 within Buildings.Controls.OBC.CDL.Logical.Sources;
-<<<<<<< HEAD
-block SampleTrigger "Generate sample trigger signal"
-  parameter Modelica.SIunits.Time period(
-    final min=Constants.small) "Sample period";
-  parameter Modelica.SIunits.Time startTime=0
-    "Time instant of first sample trigger";
-  Interfaces.BooleanOutput y  "Connector of Boolean output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-equation
-  y = sample(startTime, period);
-=======
 block SampleTrigger
   "Generate sample trigger signal"
   parameter Real period(
@@ -42,7 +30,6 @@ equation
   y=sample(
     t0,
     period);
->>>>>>> master
   annotation (
     defaultComponentName="samTri",
     Icon(
@@ -104,7 +91,7 @@ equation
     Documentation(
       info="<html>
 <p>
-The Boolean output y is a trigger signal where the output y is only <code>true</code>
+The Boolean output <code>y</code> is a trigger signal that is only <code>true</code>
 at sample times (defined by parameter <code>period</code>) and is otherwise
 <code>false</code>.
 </p>
@@ -112,12 +99,6 @@ at sample times (defined by parameter <code>period</code>) and is otherwise
 <img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.png\"
      alt=\"SampleTrigger.png\" />
 </p>
-<<<<<<< HEAD
-
-</html>", revisions="<html>
-<ul>
-<li>
-=======
 <p>
 The trigger signal is generated an infinite number of times, and aligned with <code>time=delay</code>.
 </p>
@@ -143,7 +124,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
 </li>
 <li>
->>>>>>> master
 March 23, 2017, by Jianjun Hu:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mo
index 63f155f079f..05a460ed406 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mo
@@ -1,19 +1,4 @@
 within Buildings.Controls.OBC.CDL.Logical.Sources.Validation;
-<<<<<<< HEAD
-model Pulse "Validation model for the Boolean Pulse block"
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
-    width = 0.5,
-    period = 1)
-    "Block that generates pulse signal of type Boolean"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-
-  annotation (
-  experiment(StopTime=5.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
 model Pulse
   "Validation model for the Boolean Pulse block"
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul_a1(
@@ -114,15 +99,11 @@ model Pulse
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.Sources.Pulse\">
 Buildings.Controls.OBC.CDL.Logical.Sources.Pulse</a>.
 </p>
-<<<<<<< HEAD
-</html>", revisions="<html>
-=======
 <p>
 This validates the blocks with a start time of <i>0</i>.
 All blocks with the same letter after the underscore are configured to produce
@@ -130,9 +111,20 @@ the same output.
 </p>
 </html>",
       revisions="<html>
->>>>>>> master
 <ul>
 <li>
+October 19, 2020, by Michael Wetter:<br/>
+Refactored test for systematic testing.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
+</li>
+<li>
+September 1, 2020, by Milica Grahovac:<br/>
+Added test cases for simulation time starting before and after the pulse <code>startTime</code>.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2110\">#2110</a>.
+</li>
+<li>
 July 17, 2017, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/package.order b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/package.order
index ca1accf6826..4b0b7724d32 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/package.order
@@ -1,10 +1,9 @@
 Constant
 Pulse
+PulseNegativeStartTime
+PulsePositiveStartTime
 SampleTrigger
-<<<<<<< HEAD
-=======
 SampleTriggerNegativeStartTime
 SampleTriggerPositiveStartTime
 TimeTable
 TimeTableNegativeStartTime
->>>>>>> master
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/package.order b/Buildings/Controls/OBC/CDL/Logical/Sources/package.order
index 58ddb33d937..67d8b8c91ed 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/package.order
@@ -1,4 +1,5 @@
 Constant
 Pulse
 SampleTrigger
+TimeTable
 Validation
diff --git a/Buildings/Controls/OBC/CDL/Logical/Switch.mo b/Buildings/Controls/OBC/CDL/Logical/Switch.mo
index f4aced45ed0..90bc98e874c 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Switch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Switch.mo
@@ -36,6 +36,12 @@ Otherwise, it outputs <code>y = u3</code>.
       revisions="<html>
 <ul>
 <li>
+July 17, 2020, by Jianjun Hu:<br/>
+Changed icon to display dynamically which input signal is being outputted.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2033\"># 2033</a>.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
@@ -65,11 +71,6 @@ Modelica Standard Library.
         Line(
           points={{-40.0,12.0},{-40.0,-12.0}},
           color={255,0,255}),
-<<<<<<< HEAD
-        Line(points={{-100.0,80.0},{-38.0,80.0}},
-          color={0,0,127}),
-        Line(points={{-38.0,80.0},{6.0,2.0}},
-=======
         Line(
           points={{-100.0,80.0},{-40.0,80.0}},
           color={0,0,127}),
@@ -79,7 +80,6 @@ Modelica Standard Library.
               {-40,80}
             else
               {-40,-80}}),
->>>>>>> master
           color={0,0,127},
           thickness=1.0),
         Ellipse(
@@ -101,8 +101,6 @@ Modelica Standard Library.
               {235,235,235}),
           fillPattern=FillPattern.Solid),
         Text(
-<<<<<<< HEAD
-=======
           extent={{-90,80},{-46,54}},
           lineColor=DynamicSelect({0,0,0},
             if u2 then
@@ -119,7 +117,6 @@ Modelica Standard Library.
               {0,0,0}),
           textString="false"),
         Text(
->>>>>>> master
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
           textString="%name")}));
diff --git a/Buildings/Controls/OBC/CDL/Logical/Timer.mo b/Buildings/Controls/OBC/CDL/Logical/Timer.mo
index 1eaca5d5e7b..18db57c7fbd 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Timer.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Timer.mo
@@ -1,68 +1,15 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Timer
   "Timer measuring the time from the time instant where the Boolean input became true"
-<<<<<<< HEAD
-
-  parameter Boolean accumulate = false
-    "If true, accumulate time until Boolean input 'reset' becomes true, otherwise reset timer whenever u becomes true";
-
-  Interfaces.BooleanInput u "Connector for signal that switches timer on if true, and off if false"
-=======
   parameter Real t(
     final quantity="Time",
     final unit="s")=0
     "Threshold time for comparison";
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Input that switches timer on if true, and off if false"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput reset if accumulate
-    "Connector for signal that sets timer to zero if it switches to true"
-    annotation (Placement(transformation(extent={{-140,-90},{-100,-50}}),
-      iconTransformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.RealOutput y(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(
     final quantity="Time",
-<<<<<<< HEAD
-    final unit="s") "Timer output"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-protected
-  discrete Modelica.SIunits.Time entryTime "Time instant when u became true";
-  discrete Modelica.SIunits.Time yAcc "Accumulated time up to last change to true";
-  Interfaces.BooleanInput reset_internal(
-    final start=false,
-    final fixed=true) "Internal connector";
-
-initial equation
-  pre(entryTime) = 0;
-  yAcc = 0;
-
-equation
-  connect(reset, reset_internal);
-  if not accumulate then
-    reset_internal = false;
-  end if;
-
-  when u and (not edge(reset_internal)) then
-    entryTime = time;
-  elsewhen reset_internal then
-    entryTime = time;
-  end when;
-
-  when reset_internal then
-    yAcc = 0;
-  elsewhen (not u) then
-    yAcc = pre(y);
-  end when;
-
-  if not accumulate then
-    y = if u then time - entryTime else 0.0;
-  else
-    y = if u then yAcc + (time - entryTime) else yAcc;
-  end if;
-
-annotation (
-=======
     final unit="s")
     "Elapsed time"
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),iconTransformation(extent={{100,-20},{140,20}})));
@@ -101,41 +48,18 @@ equation
     else
       0.0;
   annotation (
->>>>>>> master
     defaultComponentName="tim",
     Icon(
       coordinateSystem(
         preserveAspectRatio=true,
         extent={{-100.0,-100.0},{100.0,100.0}}),
-<<<<<<< HEAD
-        graphics={Rectangle(
-=======
       graphics={
         Rectangle(
->>>>>>> master
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
           lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
-<<<<<<< HEAD
-      Line(points={{-66,-60},{82,-60}},
-        color={192,192,192}),
-      Line(points={{-58,68},{-58,-80}},
-        color={192,192,192}),
-      Polygon(lineColor={192,192,192},
-        fillColor={192,192,192},
-        fillPattern=FillPattern.Solid,
-        points={{90,-60},{68,-52},{68,-68},{90,-60}}),
-      Polygon(lineColor={192,192,192},
-        fillColor={192,192,192},
-        fillPattern=FillPattern.Solid,
-        points={{-58,90},{-66,68},{-50,68},{-58,90}}),
-      Line(points={{-56,-60},{-38,-60},{-38,-16},{40,-16},{40,-60},{68,-60}},
-        color={255,0,255}),
-      Line(points={{-58,0},{-40,0},{40,90},{40,0},{68,0}},
-        color={0,0,127}),
-=======
         Line(
           points={{-66,-60},{82,-60}},
           color={192,192,192}),
@@ -158,18 +82,14 @@ equation
         Line(
           points={{-58,0},{-40,0},{40,58},{40,0},{68,0}},
           color={0,0,127}),
->>>>>>> master
         Text(
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
           textString="%name"),
-<<<<<<< HEAD
-=======
         Text(
           extent={{-64,62},{62,92}},
           lineColor={0,0,0},
           textString="t=%t"),
->>>>>>> master
         Ellipse(
           extent={{-83,7},{-69,-7}},
           lineColor=DynamicSelect({235,235,235},
@@ -183,13 +103,6 @@ equation
             else
               {235,235,235}),
           fillPattern=FillPattern.Solid),
-<<<<<<< HEAD
-        Text(
-          extent={{-88,-58},{88,-98}},
-          lineColor={217,67,180},
-          textString="accumulate: %accumulate")}),
-    Documentation(info="<html>
-=======
         Ellipse(
           extent={{71,-73},{85,-87}},
           lineColor=DynamicSelect({235,235,235},
@@ -211,24 +124,23 @@ equation
             significantDigits=3)))}),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
-Timer with option to accumulate time until it is reset by an input signal.
+If the Boolean input <code>u</code> is <code>true</code>,
+the output <code>y</code> is the time that has elapsed since <code>u</code> became <code>true</code>.
+Otherwise, <code>y</code> is <i>0</i>.
+If the output <code>y</code> becomes greater than the threshold time <code>t</code>,
+the output <code>passed</code> is <code>true</code>.
+Otherwise it is <code>false</code>.
 </p>
 <p>
-Each time the Boolean input <code>u</code> becomes true, the timer runs, otherwise
-it is dormant.
-If the parameter <code>accumulate</code> is <code>false</code>, the timer is set to zero each time the
-input <code>u</code> becomes <code>false</code>.
-If <code>accumulate = true</code>, an input <code>reset</code> is enabled, the timer accumulates time,
-and the timer is set to zero only when the value of the input <code>reset</code> becomes <code>true</code>.
+In the limiting case where the timer value reaches the threshold <code>t</code>
+and the input <code>u</code> becomes <code>false</code> simultaneously,
+the output <code>passed</code> remains <code>false</code>.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -254,7 +166,6 @@ Fixed the reset input. This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\">issue 2056</a>.
 </li>
 <li>
->>>>>>> master
 November 8, 2019, by Michael Wetter:<br/>
 Revised implementation. This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1221\">issue 1221</a>.
diff --git a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo
index c858473a153..742c619c4a1 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo
@@ -1,16 +1,8 @@
 within Buildings.Controls.OBC.CDL.Logical;
-<<<<<<< HEAD
-block Toggle "Toggles output value whenever its input turns true"
-
-  parameter Boolean pre_y_start=false "Start value of pre(y) if clr=false";
-
-  Interfaces.BooleanInput u "Toggle input"
-=======
 block Toggle
   "Toggles output value whenever its input turns true"
   Interfaces.BooleanInput u
     "Toggle input"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Interfaces.BooleanInput clr
     "Clear input"
@@ -20,30 +12,19 @@ block Toggle
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 initial equation
-<<<<<<< HEAD
-  pre(y) = pre_y_start;
-  pre(u) = false;
-  pre(clr) = false;
-=======
   pre(y)=false;
   pre(u)=false;
   pre(clr)=false;
->>>>>>> master
 
 equation
   when initial() then
     //scenario = 1
-<<<<<<< HEAD
-    y = if clr then false else pre(y);
-  elsewhen (not clr) and change(u) and (pre(u) == false) and (pre(y) == false) then
-=======
     y=
       if clr then
         false
       else
         u;
   elsewhen(not clr) and change(u) and(pre(u) == false) and(pre(y) == false) then
->>>>>>> master
     //scenario = 2
     y=true;
   elsewhen(not clr) and change(u) and(pre(u) == false) and(pre(y) == true) then
@@ -154,7 +135,7 @@ regardless of the value of the toggle input <code>u</code>.
 
 <p>
 At initial time, if <code>clr = false</code>, then the output will be 
-<code>y = pre_y_start</code>. Otherwise it will be <code>y=false</code> 
+<code>y = u</code>. Otherwise it will be <code>y=false</code> 
 (because the clear input <code>clr</code> is <code>true</code>).
 </p>
 
@@ -167,6 +148,12 @@ At initial time, if <code>clr = false</code>, then the output will be
       revisions="<html>
 <ul>
 <li>
+October 13, 2020, by Jianjun Hu:<br/>
+Removed the parameter <code>pre_y_start</code>, and made the initial output to be
+equal to toggle input when the clear input is <code>false</code>.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2177\">issue 2177</a>.
+</li>
+<li>
 March 9, 2020, by Michael Wetter:<br/>
 Simplified implementation, and made model work with OpenModelica.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo b/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo
index f01c3f22201..4f33b329c85 100644
--- a/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/TriggeredTrapezoid.mo
@@ -110,97 +110,12 @@ equation
           extent={{-150,150},{150,110}},
           lineColor={0,0,255},
           textString="%name")}),
-<<<<<<< HEAD
-    Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
-            100,100}}), graphics={Line(points={{-80,-20},{-60,-20},{-30,40},{
-          8,40},{40,-20},{60,-20}}, color={0,0,255}),Line(points={{-90,-70},{
-          82,-70}}),Line(points={{-80,68},{-80,-80}}, color={0,
-          0,0}),Polygon(
-            points={{90,-70},{68,-62},{68,-78},{90,-70}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{-80,90},{-88,68},{-72,68},{-80,90}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Line(points={{-80,-68},{-60,-68},{
-          -60,-42},{8,-42},{8,-68},{60,-68}}, color={255,0,255}),Line(
-            points={{-60,40},{-60,-42}},
-            pattern=LinePattern.Dot),Line(
-            points={{8,-42},{8,40}},
-            pattern=LinePattern.Dot),Line(points={{-60,40},{-30,40}}, color={
-          0,0,0}),Line(points={{8,-20},{40,-20}}),Line(points=
-          {{-20,40},{-20,-20}}),Line(points={{-20,-20},{-20,-70}}),Text(
-            extent={{-44,50},{-44,40}},
-            lineColor={0,0,0},
-            textString="rising"),Text(
-            extent={{24,-10},{24,-20}},
-            lineColor={0,0,0},
-            textString="falling"),Polygon(
-            points={{-60,40},{-56,42},{-56,38},{-60,40}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{-30,40},{-34,42},{-34,38},{-30,40}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{8,-20},{12,-18},{12,-22},{8,-20}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{40,-20},{36,-18},{36,-22},{40,-20}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{-22,-24},{-20,-20},{-18,-24},{-22,-24}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{-18,-66},{-22,-66},{-20,-70},{-18,-66}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{-22,36},{-20,40},{-18,36},{-22,36}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Polygon(
-            points={{-18,-16},{-22,-16},{-20,-20},{-18,-16}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Rectangle(
-            extent={{-40,6},{0,-4}},
-            lineColor={255,255,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Text(
-            extent={{-20,6},{-20,-4}},
-            lineColor={0,0,0},
-            textString="amplitude"),Rectangle(
-            extent={{-40,-48},{0,-58}},
-            lineColor={255,255,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),Text(
-            extent={{-20,-48},{-20,-58}},
-            lineColor={0,0,0},
-            textString="offset"),Text(
-            extent={{60,-82},{94,-92}},
-            lineColor={0,0,0},
-            textString="time"),Text(
-            extent={{-88,-4},{-54,-14}},
-            lineColor={0,0,0},
-            textString="y"),Text(
-            extent={{-88,-46},{-54,-56}},
-            lineColor={0,0,0},
-            textString="u")}),
-    Documentation(info="<html>
-=======
     Diagram(
       coordinateSystem(
         preserveAspectRatio=true,
         extent={{-100,-100},{100,100}})),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Block that represents a triggered trapezoid.
 </p>
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/And.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/And.mo
index 385c1da45dd..3557697d130 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/And.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/And.mo
@@ -11,17 +11,6 @@ model And
     period=5)
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-26},{-6,-6}})));
-<<<<<<< HEAD
-
-  Buildings.Controls.OBC.CDL.Logical.And and1
-    annotation (Placement(transformation(extent={{26,-8},{46,12}})));
-
-equation
-  connect(booPul2.y, and1.u2) annotation (Line(points={{-5,-16},{8,-16},{8,-6},
-          {24,-6}}, color={255,0,255}));
-  connect(booPul1.y, and1.u1) annotation (Line(points={{-5,18},{10,18},{10,2},{
-          24,2}}, color={255,0,255}));
-=======
   Buildings.Controls.OBC.CDL.Logical.And and1
     "Logical and"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
@@ -31,7 +20,6 @@ equation
     annotation (Line(points={{-4,-16},{8,-16},{8,-6},{24,-6}},color={255,0,255}));
   connect(booPul1.y,and1.u1)
     annotation (Line(points={{-4,18},{10,18},{10,2},{24,2}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=10.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/And3.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/And3.mo
index 4a91a00470f..8fc09b2e657 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/And3.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/And3.mo
@@ -11,13 +11,8 @@ model And3
     period=5)
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-10},{-6,10}})));
-<<<<<<< HEAD
-
-  Buildings.Controls.OBC.CDL.Logical.And3 and1
-=======
   Buildings.Controls.OBC.CDL.Logical.And3 and1
     "Logical and of three inputs"
->>>>>>> master
     annotation (Placement(transformation(extent={{26,-10},{46,10}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul3(
     width=0.5,
@@ -26,21 +21,12 @@ model And3
     annotation (Placement(transformation(extent={{-26,-44},{-6,-24}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul1.y, and1.u1) annotation (Line(points={{-5,34},{8,34},{8,8},{24,
-          8}},  color={255,0,255}));
-  connect(booPul2.y, and1.u2)
-    annotation (Line(points={{-5,0},{10,0},{24,0}}, color={255,0,255}));
-  connect(booPul3.y, and1.u3) annotation (Line(points={{-5,-34},{8,-34},{8,-8},
-          {24,-8}},color={255,0,255}));
-=======
   connect(booPul1.y,and1.u1)
     annotation (Line(points={{-4,34},{8,34},{8,8},{24,8}},color={255,0,255}));
   connect(booPul2.y,and1.u2)
     annotation (Line(points={{-4,0},{-4,0},{24,0}},color={255,0,255}));
   connect(booPul3.y,and1.u3)
     annotation (Line(points={{-4,-34},{8,-34},{8,-8},{24,-8}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=10.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo
index 54b3eeedd8d..496785b2901 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo
@@ -7,6 +7,7 @@ model FallingEdge
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
   Buildings.Controls.OBC.CDL.Logical.FallingEdge falEdg
+    "Output true when input changes from true to false"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
     duration=5,
@@ -15,25 +16,16 @@ model FallingEdge
     "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{0,40},{20,60}})));
   Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triggeredSampler
+    "Trigger sampling of continuous signal"
     annotation (Placement(transformation(extent={{40,40},{60,60}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul.y, falEdg.u)
-    annotation (Line(points={{-19,0},{-10,0},{-2,0}},
-                                                    color={255,0,255}));
-  connect(ramp2.y, triggeredSampler.u)
-    annotation (Line(points={{21,50},{29.5,50},{38,50}}, color={0,0,127}));
-  connect(falEdg.y, triggeredSampler.trigger) annotation (Line(points={{21,0},{
-          36,0},{50,0},{50,38.2}}, color={255,0,255}));
-=======
   connect(booPul.y,falEdg.u)
     annotation (Line(points={{-18,0},{-18,0},{-2,0}},color={255,0,255}));
   connect(ramp2.y,triggeredSampler.u)
     annotation (Line(points={{22,50},{22,50},{38,50}},color={0,0,127}));
   connect(falEdg.y,triggeredSampler.trigger)
     annotation (Line(points={{22,0},{22,0},{50,0},{50,38.2}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=5.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo
index 3f72ec947d8..8a46956e44e 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Latch.mo
@@ -1,24 +1,4 @@
 within Buildings.Controls.OBC.CDL.Logical.Validation;
-<<<<<<< HEAD
-model Latch "Validation model for the Latch block"
-
-  Buildings.Controls.OBC.CDL.Logical.Latch falCle
-    "Latch block with clear input being contantly false"
-    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Latch truCle(pre_y_start=true)
-    "Latch block with clear input being contantly true"
-    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Latch iniFalOut
-    "False clear input, initial false output"
-    annotation (Placement(transformation(extent={{-100,-70},{-80,-50}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Latch iniTruOut(pre_y_start=true)
-    "False clear input, initial true output"
-    annotation (Placement(transformation(extent={{-100,-150},{-80,-130}})));
-
-=======
 model Latch
   "Validation model for the Latch block"
   Buildings.Controls.OBC.CDL.Logical.Latch falCleTruIni
@@ -33,7 +13,6 @@ model Latch
   Buildings.Controls.OBC.CDL.Logical.Latch truCleFalIni
     "Latch block with clear input being contantly true and false initial latch input"
     annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
->>>>>>> master
   Buildings.Controls.OBC.CDL.Logical.Latch swiCleInp
     "Initial false output, with clear input switch between false and true"
     annotation (Placement(transformation(extent={{100,90},{120,110}})));
@@ -42,18 +21,6 @@ model Latch
     annotation (Placement(transformation(extent={{100,-70},{120,-50}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse cleInp(
     final width=0.5,
-<<<<<<< HEAD
-    final period=6) "Block that outputs cyclic on and off"
-    annotation (Placement(transformation(extent={{0,70},{20,90}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Not not1 "Logcal not"
-    annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant fal(final k=false)
-    "False clear input"
-    annotation (Placement(transformation(extent={{-160,70},{-140,90}})));
-
-=======
     final period=6)
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{0,30},{20,50}})));
@@ -64,64 +31,11 @@ model Latch
     final k=false)
     "False clear input"
     annotation (Placement(transformation(extent={{-120,70},{-100,90}})));
->>>>>>> master
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse latInp(
     final width=0.5,
     final period=2)
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-160,150},{-140,170}})));
-<<<<<<< HEAD
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant tru(final k=true)
-    "True clear input"
-    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
-
-equation
-  connect(cleInp.y, swiCleInp.clr)
-    annotation (Line(points={{21,80},{70,80},{70,94},{99,94}}, color={255,0,255}));
-  connect(not1.u, cleInp.y)
-    annotation (Line(points={{38,-60},{30,-60},{30,80},{21,80}},
-      color={255,0,255}));
-  connect(not1.y, swiCleInp1.clr)
-    annotation (Line(points={{61,-60},{72,-60},{72,-66},{99,-66}},
-      color={255,0,255}));
-  connect(fal.y, falCle.clr)
-    annotation (Line(points={{-139,80},{-112,80},{-112,94},{-101,94}},
-      color={255,0,255}));
-  connect(latInp.y, falCle.u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,100},{-101,100}},
-      color={255,0,255}));
-  connect(tru.y, truCle.clr)
-    annotation (Line(points={{-139,0},{-106,0},{-106,14},{-101,14}},
-      color={255,0,255}));
-  connect(latInp.y, truCle.u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,20},{-101,20}},
-      color={255,0,255}));
-  connect(fal.y, iniFalOut.clr)
-    annotation (Line(points={{-139,80},{-112,80},{-112,-66},{-101,-66}},
-      color={255,0,255}));
-  connect(fal.y,iniTruOut. clr)
-    annotation (Line(points={{-139,80},{-112,80},{-112,-146},{-101,-146}},
-      color={255,0,255}));
-  connect(latInp.y, iniFalOut.u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,-60},{-101,-60}},
-      color={255,0,255}));
-  connect(latInp.y,iniTruOut. u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,-140},{-101,-140}},
-      color={255,0,255}));
-  connect(latInp.y, swiCleInp.u)
-    annotation (Line(points={{-139,160},{80,160},{80,100},{99,100}},
-      color={255,0,255}));
-  connect(latInp.y, swiCleInp1.u)
-    annotation (Line(points={{-139,160},{80,160},{80,-60},{99,-60}},
-      color={255,0,255}));
-
-annotation (
-  experiment(StopTime=10.0, Tolerance=1e-06),
-   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Latch.mos"
-         "Simulate and plot"),
-    Documentation(info="<html>
-=======
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant tru(
     final k=true)
     "True clear input"
@@ -167,15 +81,11 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Latch.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.Latch\">
-Buildings.Controls.OBC.CDL.Logical.Latch</a>.
+Buildings.Controls.OBC.CDL.Logical.Latch</a>. Following tests are implemented:
 </p>
-<<<<<<< HEAD
-</html>", revisions="<html>
-=======
 <ul>
 <li>
 When the clear input is <code>false</code>, the initial output should equal to the initial latch input.
@@ -197,7 +107,6 @@ should rise from <code>false</code> to <code>true</code>.
 </ul>
 </html>",
       revisions="<html>
->>>>>>> master
 <ul>
 <li>
 April 4, 2019, by Jianjun Hu:<br/>
@@ -230,33 +139,9 @@ First implementation.
         extent={{-180,-180},{180,180}}),
       graphics={
         Text(
-          extent={{-110,130},{-42,118}},
-          lineColor={28,108,200},
-          textString="Clear input keeps false"),
-        Text(
-          extent={{-108,60},{-40,48}},
-          lineColor={28,108,200},
-          textString="Clear input keeps true"),
-        Text(
-          extent={{-108,-20},{-40,-32}},
+          extent={{-68,140},{-2,130}},
           lineColor={28,108,200},
           textString="Clear input keeps false"),
-        Text(
-          extent={{-108,-26},{0,-48}},
-          lineColor={28,108,200},
-          textString="Start value of y is false (default)"),
-        Text(
-          extent={{-108,-100},{-40,-112}},
-          lineColor={28,108,200},
-          textString="Clear input keeps false"),
-        Text(
-          extent={{-110,-110},{-28,-124}},
-          lineColor={28,108,200},
-          textString="Start value of y is true"),
-        Text(
-          extent={{-108,50},{-28,38}},
-          lineColor={28,108,200},
-          textString="Start value of y is true"),
         Text(
           extent={{76,148},{136,140}},
           lineColor={28,108,200},
@@ -304,5 +189,33 @@ First implementation.
         Text(
           extent={{92,-22},{170,-32}},
           lineColor={28,108,200},
-          textString="Latch input falls: true to false")}));
+          textString="Latch input falls: true to false"),
+        Text(
+          extent={{-68,130},{-24,122}},
+          lineColor={28,108,200},
+          textString="True initial input"),
+        Text(
+          extent={{-68,66},{-24,58}},
+          lineColor={28,108,200},
+          textString="False initial input"),
+        Text(
+          extent={{-68,76},{-2,66}},
+          lineColor={28,108,200},
+          textString="Clear input keeps false"),
+        Text(
+          extent={{-68,-14},{-24,-22}},
+          lineColor={28,108,200},
+          textString="True initial input"),
+        Text(
+          extent={{-68,-4},{-2,-14}},
+          lineColor={28,108,200},
+          textString="Clear input keeps true"),
+        Text(
+          extent={{-66,-74},{-22,-82}},
+          lineColor={28,108,200},
+          textString="False initial input"),
+        Text(
+          extent={{-66,-64},{0,-74}},
+          lineColor={28,108,200},
+          textString="Clear input keeps false")}));
 end Latch;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/LogicalSwitch.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/LogicalSwitch.mo
index 19edea24621..57f04c0bd7c 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/LogicalSwitch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/LogicalSwitch.mo
@@ -17,24 +17,16 @@ model LogicalSwitch
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-46},{-6,-26}})));
   Buildings.Controls.OBC.CDL.Logical.LogicalSwitch logicalSwitch
+    "Switch between two boolean inputs"
     annotation (Placement(transformation(extent={{26,-10},{46,10}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul2.y, logicalSwitch.u2)
-    annotation (Line(points={{-5,0},{10,0},{24,0}}, color={255,0,255}));
-  connect(booPul1.y, logicalSwitch.u1) annotation (Line(points={{-5,34},{10,34},{10,
-          8},{24,8}}, color={255,0,255}));
-  connect(booPul3.y, logicalSwitch.u3) annotation (Line(points={{-5,-36},{10,-36},
-          {10,-8},{24,-8}}, color={255,0,255}));
-=======
   connect(booPul2.y,logicalSwitch.u2)
     annotation (Line(points={{-4,0},{-4,0},{24,0}},color={255,0,255}));
   connect(booPul1.y,logicalSwitch.u1)
     annotation (Line(points={{-4,34},{10,34},{10,8},{24,8}},color={255,0,255}));
   connect(booPul3.y,logicalSwitch.u3)
     annotation (Line(points={{-4,-36},{10,-36},{10,-8},{24,-8}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=5.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/MultiAnd.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/MultiAnd.mo
index 490a7dfb3c3..8c372882eb6 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/MultiAnd.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/MultiAnd.mo
@@ -2,6 +2,7 @@ within Buildings.Controls.OBC.CDL.Logical.Validation;
 model MultiAnd
   "Model to validate the application of MultiAnd block"
   Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd0
+    "Logical and with multiple inputs: 0 input"
     annotation (Placement(transformation(extent={{40,60},{60,80}})));
   Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd1(
     nu=1)
@@ -42,24 +43,6 @@ model MultiAnd
     annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul1.y, mulAnd5.u[1]) annotation (Line(points={{-39,60},{-39,60},{20,
-          60},{20,-24.4},{38,-24.4}}, color={255,0,255}));
-  connect(booPul2.y, mulAnd5.u[2]) annotation (Line(points={{-39,30},{14,30},{14,
-          -27.2},{38,-27.2}}, color={255,0,255}));
-  connect(booPul3.y, mulAnd5.u[3]) annotation (Line(points={{-39,0},{0,0},{0,-30},
-          {38,-30}}, color={255,0,255}));
-  connect(booPul4.y, mulAnd5.u[4]) annotation (Line(points={{-39,-30},{-39,-30},
-          {-4,-30},{-4,-32},{-4,-32},{-4,-32.8},{38,-32.8}}, color={255,0,255}));
-  connect(booPul5.y, mulAnd5.u[5]) annotation (Line(points={{-39,-60},{-39,-60},
-          {20,-60},{20,-35.6},{38,-35.6}}, color={255,0,255}));
-  connect(booPul1.y, mulAnd2.u[1]) annotation (Line(points={{-39,60},{-39,60},{20,
-          60},{20,3.5},{38,3.5}}, color={255,0,255}));
-  connect(booPul2.y, mulAnd2.u[2]) annotation (Line(points={{-39,30},{-39,30},{14,
-          30},{14,-3.5},{38,-3.5}}, color={255,0,255}));
-  connect(booPul1.y, mulAnd1.u[1]) annotation (Line(points={{-39,60},{20,60},{20,
-          30},{38,30}}, color={255,0,255}));
-=======
   connect(booPul1.y,mulAnd5.u[1])
     annotation (Line(points={{-38,60},{-38,60},{20,60},{20,-24.4},{38,-24.4}},color={255,0,255}));
   connect(booPul2.y,mulAnd5.u[2])
@@ -76,7 +59,6 @@ equation
     annotation (Line(points={{-38,30},{-38,30},{14,30},{14,-3.5},{38,-3.5}},color={255,0,255}));
   connect(booPul1.y,mulAnd1.u[1])
     annotation (Line(points={{-38,60},{20,60},{20,30},{38,30}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=10.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Nand.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Nand.mo
index 20c362e35f1..169e63fc049 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Nand.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Nand.mo
@@ -12,20 +12,14 @@ model Nand
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-26},{-6,-6}})));
   Buildings.Controls.OBC.CDL.Logical.Nand nand1
+    "Outputs true if at least one input is false"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul2.y, nand1.u2) annotation (Line(points={{-5,-16},{8,-16},{8,-6},
-          {24,-6}}, color={255,0,255}));
-  connect(booPul1.y, nand1.u1) annotation (Line(points={{-5,18},{10,18},{10,2},{
-          24,2}}, color={255,0,255}));
-=======
   connect(booPul2.y,nand1.u2)
     annotation (Line(points={{-4,-16},{8,-16},{8,-6},{24,-6}},color={255,0,255}));
   connect(booPul1.y,nand1.u1)
     annotation (Line(points={{-4,18},{10,18},{10,2},{24,2}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=5.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Nor.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Nor.mo
index 6973b7fd996..d3c2ed89c86 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Nor.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Nor.mo
@@ -12,20 +12,14 @@ model Nor
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-26},{-6,-6}})));
   Buildings.Controls.OBC.CDL.Logical.Nor nor1
+    "Outputs true if none of the inputs is true, otherwise outputs false"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul2.y, nor1.u2) annotation (Line(points={{-5,-16},{8,-16},{8,-6},
-          {24,-6}}, color={255,0,255}));
-  connect(booPul1.y, nor1.u1) annotation (Line(points={{-5,18},{10,18},{10,2},{
-          24,2}}, color={255,0,255}));
-=======
   connect(booPul2.y,nor1.u2)
     annotation (Line(points={{-4,-16},{8,-16},{8,-6},{24,-6}},color={255,0,255}));
   connect(booPul1.y,nor1.u1)
     annotation (Line(points={{-4,18},{10,18},{10,2},{24,2}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=5.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Not.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Not.mo
index 2856f1bc837..b3f7011d5a1 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Not.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Not.mo
@@ -7,16 +7,12 @@ model Not
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-10},{-6,10}})));
   Buildings.Controls.OBC.CDL.Logical.Not not1
+    "Output true when input is false and output false when input is true"
     annotation (Placement(transformation(extent={{26,-10},{46,10}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul.y, not1.u)
-    annotation (Line(points={{-5,0},{8,0},{24,0}}, color={255,0,255}));
-=======
   connect(booPul.y,not1.u)
     annotation (Line(points={{-4,0},{-4,0},{24,0}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=5.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Or.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Or.mo
index 9a06922bdc2..eae39b41d21 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Or.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Or.mo
@@ -12,20 +12,14 @@ model Or
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-26},{-6,-6}})));
   Buildings.Controls.OBC.CDL.Logical.Or or1
+    "Output true if at least one input is true"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul2.y, or1.u2) annotation (Line(points={{-5,-16},{8,-16},{8,-6},
-          {24,-6}}, color={255,0,255}));
-  connect(booPul1.y, or1.u1) annotation (Line(points={{-5,18},{10,18},{10,2},{
-          24,2}}, color={255,0,255}));
-=======
   connect(booPul2.y,or1.u2)
     annotation (Line(points={{-4,-16},{8,-16},{8,-6},{24,-6}},color={255,0,255}));
   connect(booPul1.y,or1.u1)
     annotation (Line(points={{-4,18},{10,18},{10,2},{24,2}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=10.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Or3.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Or3.mo
index ef17440af21..40b2eac8c03 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Or3.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Or3.mo
@@ -12,6 +12,7 @@ model Or3
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-8},{-6,12}})));
   Buildings.Controls.OBC.CDL.Logical.Or3 or1
+    "Output true if at least one input is true"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul3(
     width=0.5,
@@ -20,21 +21,12 @@ model Or3
     annotation (Placement(transformation(extent={{-26,-42},{-6,-22}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul3.y, or1.u3) annotation (Line(points={{-5,-32},{8,-32},{8,-6},{24,
-          -6}}, color={255,0,255}));
-  connect(booPul2.y, or1.u2)
-    annotation (Line(points={{-5,2},{9.5,2},{24,2}}, color={255,0,255}));
-  connect(booPul1.y, or1.u1) annotation (Line(points={{-5,36},{10,36},{10,10},{24,
-          10}}, color={255,0,255}));
-=======
   connect(booPul3.y,or1.u3)
     annotation (Line(points={{-4,-32},{8,-32},{8,-6},{24,-6}},color={255,0,255}));
   connect(booPul2.y,or1.u2)
     annotation (Line(points={{-4,2},{-4,2},{24,2}},color={255,0,255}));
   connect(booPul1.y,or1.u1)
     annotation (Line(points={{-4,36},{10,36},{10,10},{24,10}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=10.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Switch.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Switch.mo
index 3ee8dd7ff95..93bc68a9dcc 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Switch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Switch.mo
@@ -19,24 +19,16 @@ model Switch
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-10},{-6,10}})));
   Buildings.Controls.OBC.CDL.Logical.Switch switch1
+    "Switch between two real inputs"
     annotation (Placement(transformation(extent={{26,-10},{46,10}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul.y, switch1.u2)
-    annotation (Line(points={{-5,0},{10,0},{24,0}}, color={255,0,255}));
-  connect(ramp2.y, switch1.u3) annotation (Line(points={{-5,-32},{8,-32},{8,-8},
-          {24,-8}}, color={0,0,127}));
-  connect(ramp1.y, switch1.u1)
-    annotation (Line(points={{-5,32},{8,32},{8,8},{24,8}}, color={0,0,127}));
-=======
   connect(booPul.y,switch1.u2)
     annotation (Line(points={{-4,0},{-4,0},{24,0}},color={255,0,255}));
   connect(ramp2.y,switch1.u3)
     annotation (Line(points={{-4,-32},{8,-32},{8,-8},{24,-8}},color={0,0,127}));
   connect(ramp1.y,switch1.u1)
     annotation (Line(points={{-4,32},{8,32},{8,8},{24,8}},color={0,0,127}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=5.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Timer.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Timer.mo
index 6b5e934ec3a..69b40fd1939 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Timer.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Timer.mo
@@ -1,30 +1,4 @@
 within Buildings.Controls.OBC.CDL.Logical.Validation;
-<<<<<<< HEAD
-model Timer "Validation model for the Timer block"
-
-  Buildings.Controls.OBC.CDL.Logical.Timer resetTimer "Timer will reset"
-    annotation (Placement(transformation(extent={{20,70},{40,90}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer accuTimer(
-    final accumulate=true)
-    "Reset timer based on boolean input"
-    annotation (Placement(transformation(extent={{20,30},{40,50}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer accuTimer1(
-    final accumulate=true)
-    "Reset timer based on boolean input"
-    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer accuTimer2(
-    final accumulate=true)
-    "Reset timer based on boolean input"
-    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer accuTimer3(
-    final accumulate=true)
-    "Reset timer based on boolean input"
-    annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
-    final width=0.1,
-    final period=4)
-=======
 model Timer
   "Validation model for the Timer block"
   Buildings.Controls.OBC.CDL.Logical.Timer noThr
@@ -47,59 +21,10 @@ model Timer
     final width=0.7,
     final period=2,
     final shift=-1)
->>>>>>> master
     "Block that outputs cyclic on and off"
-    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr(
-    final threshold=1.5)
-    annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
-  Buildings.Controls.OBC.CDL.Logical.Pre pre
-    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
-    final width=0.5,
-    final period=2) "Block that outputs cyclic on and off"
-    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul2(
-    final width=0.5,
-    final period=2,
-    final startTime=0.5)  "Block that outputs cyclic on and off"
-    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+    annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul.y, resetTimer.u)
-    annotation (Line(points={{-18,80},{18,80}}, color={255,0,255}));
-  connect(booPul.y, accuTimer.u)
-    annotation (Line(points={{-18,80},{0,80},{0,40},{18,40}},
-      color={255,0,255}));
-  connect(booPul1.y, accuTimer.reset)
-    annotation (Line(points={{-18,40},{-10,40},{-10,32},{18,32}},color={255,0,255}));
-  connect(booPul.y,accuTimer3. u)
-    annotation (Line(points={{-18,80},{0,80},{0,-70},{18,-70}},
-      color={255,0,255}));
-  connect(accuTimer3.y, greEquThr.u)
-    annotation (Line(points={{42,-70},{60,-70},{60,-90},{-92,-90},{-92,-70},
-      {-82,-70}}, color={0,0,127}));
-  connect(greEquThr.y, pre.u)
-    annotation (Line(points={{-58,-70},{-42,-70}}, color={255,0,255}));
-  connect(pre.y,accuTimer3. reset)
-    annotation (Line(points={{-18,-70},{-10,-70},{-10,-78},{18,-78}},
-      color={255,0,255}));
-  connect(booPul.y, accuTimer1.u)
-    annotation (Line(points={{-18,80},{0,80},{0,0},{18,0}}, color={255,0,255}));
-  connect(booPul.y, accuTimer1.reset)
-    annotation (Line(points={{-18,80},{0,80},{0,-8},{18,-8}}, color={255,0,255}));
-  connect(booPul.y, accuTimer2.reset)
-    annotation (Line(points={{-18,80},{0,80},{0,-48},{18,-48}}, color={255,0,255}));
-  connect(booPul2.y, accuTimer2.u)
-    annotation (Line(points={{-18,-40},{18,-40}}, color={255,0,255}));
-
-annotation (
-  experiment(StopTime=5.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Timer.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-=======
   connect(booPul.y,noThr.u)
     annotation (Line(points={{-18,20},{18,20}},color={255,0,255}));
   connect(booPul.y,thrTim.u)
@@ -114,7 +39,6 @@ annotation (
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Timer.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.Timer\">
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo
index 2a6dd7aaf07..fa80f258ca1 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Toggle.mo
@@ -1,24 +1,4 @@
 within Buildings.Controls.OBC.CDL.Logical.Validation;
-<<<<<<< HEAD
-model Toggle "Validation model for the Toggle block"
-
-  Buildings.Controls.OBC.CDL.Logical.Toggle falCle
-    "Latch block with clear input being contantly false"
-    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Toggle truCle(pre_y_start=true)
-    "Latch block with clear input being contantly true"
-    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Toggle iniFalOut
-    "False clear input, initial false output"
-    annotation (Placement(transformation(extent={{-100,-70},{-80,-50}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Toggle iniTruOut(pre_y_start=true)
-    "False clear input, initial true output"
-    annotation (Placement(transformation(extent={{-100,-150},{-80,-130}})));
-
-=======
 model Toggle
   "Validation model for the Toggle block"
   Buildings.Controls.OBC.CDL.Logical.Toggle falCleTruIni
@@ -33,7 +13,6 @@ model Toggle
   Buildings.Controls.OBC.CDL.Logical.Toggle truCleFalIni
     "Toggle block with clear input being contantly true and false initial toggle input"
     annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
->>>>>>> master
   Buildings.Controls.OBC.CDL.Logical.Toggle swiCleInp
     "Initial false output, with clear input switch between false and true"
     annotation (Placement(transformation(extent={{100,90},{120,110}})));
@@ -48,71 +27,11 @@ model Toggle
   Buildings.Controls.OBC.CDL.Logical.Not not1
     "Logical not"
     annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
-<<<<<<< HEAD
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant fal(final k=false)
-    "False clear input"
-    annotation (Placement(transformation(extent={{-160,70},{-140,90}})));
-
-=======
->>>>>>> master
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse togInp(
     final width=0.5,
     final period=2)
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-160,150},{-140,170}})));
-<<<<<<< HEAD
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant tru(final k=true)
-    "True clear input"
-    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
-
-equation
-  connect(cleInp.y,swiCleInp. clr)
-    annotation (Line(points={{21,80},{70,80},{70,94},{99,94}}, color={255,0,255}));
-  connect(not1.u,cleInp. y)
-    annotation (Line(points={{38,-60},{30,-60},{30,80},{21,80}},
-      color={255,0,255}));
-  connect(not1.y,swiCleInp1. clr)
-    annotation (Line(points={{61,-60},{72,-60},{72,-66},{99,-66}},
-      color={255,0,255}));
-  connect(fal.y,falCle. clr)
-    annotation (Line(points={{-139,80},{-112,80},{-112,94},{-101,94}},
-      color={255,0,255}));
-  connect(togInp.y,falCle. u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,100},{-101,100}},
-      color={255,0,255}));
-  connect(tru.y,truCle. clr)
-    annotation (Line(points={{-139,0},{-106,0},{-106,14},{-101,14}},
-      color={255,0,255}));
-  connect(togInp.y,truCle. u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,20},{-101,20}},
-      color={255,0,255}));
-  connect(fal.y,iniFalOut. clr)
-    annotation (Line(points={{-139,80},{-112,80},{-112,-66},{-101,-66}},
-      color={255,0,255}));
-  connect(fal.y,iniTruOut. clr)
-    annotation (Line(points={{-139,80},{-112,80},{-112,-146},{-101,-146}},
-      color={255,0,255}));
-  connect(togInp.y,iniFalOut. u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,-60},{-101,-60}},
-      color={255,0,255}));
-  connect(togInp.y,iniTruOut. u)
-    annotation (Line(points={{-139,160},{-120,160},{-120,-140},{-101,-140}},
-      color={255,0,255}));
-  connect(togInp.y,swiCleInp. u)
-    annotation (Line(points={{-139,160},{80,160},{80,100},{99,100}},
-      color={255,0,255}));
-  connect(togInp.y,swiCleInp1. u)
-    annotation (Line(points={{-139,160},{80,160},{80,-60},{99,-60}},
-      color={255,0,255}));
-
-annotation (
-  experiment(StopTime=10.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Toggle.mos"
-          "Simulate and plot"),
-    Documentation(info="<html>
-=======
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant tru(
     final k=true)
     "True clear input"
@@ -162,15 +81,11 @@ equation
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Toggle.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 Validation test for the block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.Toggle\">
-Buildings.Controls.OBC.CDL.Logical.Toggle</a>.
+Buildings.Controls.OBC.CDL.Logical.Toggle</a>. Following tests are implemented:
 </p>
-<<<<<<< HEAD
-</html>", revisions="<html>
-=======
 <ul>
 <li>
 When the clear input is <code>false</code>, the initial output should equal to the initial toggle input.
@@ -192,7 +107,6 @@ should rise from <code>false</code> to <code>true</code>.
 </ul>
 </html>",
       revisions="<html>
->>>>>>> master
 <ul>
 <li>
 April 4, 2019, by Jianjun Hu:<br/>
@@ -224,34 +138,6 @@ First implementation.
       coordinateSystem(
         extent={{-180,-180},{180,180}}),
       graphics={
-        Text(
-          extent={{-110,130},{-42,118}},
-          lineColor={28,108,200},
-          textString="Clear input keeps false"),
-        Text(
-          extent={{-108,60},{-40,48}},
-          lineColor={28,108,200},
-          textString="Clear input keeps true"),
-        Text(
-          extent={{-108,-20},{-40,-32}},
-          lineColor={28,108,200},
-          textString="Clear input keeps false"),
-        Text(
-          extent={{-108,-26},{0,-48}},
-          lineColor={28,108,200},
-          textString="Start value of y is false (default)"),
-        Text(
-          extent={{-108,-100},{-40,-112}},
-          lineColor={28,108,200},
-          textString="Clear input keeps false"),
-        Text(
-          extent={{-110,-110},{-28,-124}},
-          lineColor={28,108,200},
-          textString="Start value of y is true"),
-        Text(
-          extent={{-108,50},{-28,38}},
-          lineColor={28,108,200},
-          textString="Start value of y is true"),
         Text(
           extent={{76,148},{136,140}},
           lineColor={28,108,200},
@@ -299,5 +185,37 @@ First implementation.
         Text(
           extent={{92,-22},{170,-32}},
           lineColor={28,108,200},
-          textString="Toggle input falls: true to false")}));
+          textString="Toggle input falls: true to false"),
+        Text(
+          extent={{-68,130},{-24,122}},
+          lineColor={28,108,200},
+          textString="True initial input"),
+        Text(
+          extent={{-68,140},{-2,130}},
+          lineColor={28,108,200},
+          textString="Clear input keeps false"),
+        Text(
+          extent={{-68,76},{-2,66}},
+          lineColor={28,108,200},
+          textString="Clear input keeps false"),
+        Text(
+          extent={{-68,66},{-24,58}},
+          lineColor={28,108,200},
+          textString="False initial input"),
+        Text(
+          extent={{-68,-4},{-2,-14}},
+          lineColor={28,108,200},
+          textString="Clear input keeps true"),
+        Text(
+          extent={{-68,-14},{-24,-22}},
+          lineColor={28,108,200},
+          textString="True initial input"),
+        Text(
+          extent={{-66,-64},{0,-74}},
+          lineColor={28,108,200},
+          textString="Clear input keeps false"),
+        Text(
+          extent={{-66,-74},{-22,-82}},
+          lineColor={28,108,200},
+          textString="False initial input")}));
 end Toggle;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueFalseHold.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/TrueFalseHold.mo
index b0dd14df7af..fcd896adc46 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueFalseHold.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/TrueFalseHold.mo
@@ -2,24 +2,16 @@ within Buildings.Controls.OBC.CDL.Logical.Validation;
 model TrueFalseHold
   "Validation model for the TrueFalseHold block"
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
-<<<<<<< HEAD
-      startTime=0, period=1500) "Boolean pulse input signal"
-=======
     shift=0,
     period=1500)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,60},{-120,80}})));
   Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol(
     trueHoldDuration=1000)
     "The block introduces a minimal offset between the input signal rising and falling edge"
     annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
-<<<<<<< HEAD
-    startTime=0,
-=======
     shift=0,
->>>>>>> master
     period=1000,
     width=0.25)
     "Boolean pulse input signal"
@@ -29,24 +21,16 @@ model TrueFalseHold
     "The block introduces a minimal offset between the input signal rising and falling edge"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul2(
-<<<<<<< HEAD
-      startTime=0, period=1500) "Boolean pulse input signal"
-=======
     shift=0,
     period=1500)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-120,0}})));
   Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol2(
     trueHoldDuration=1000)
     "The block introduces a minimal offset between the input signal rising and falling edge"
     annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul3(
-<<<<<<< HEAD
-    startTime=0,
-=======
     shift=0,
->>>>>>> master
     period=1000,
     width=0.25)
     "Boolean pulse input signal"
@@ -62,24 +46,16 @@ model TrueFalseHold
     "Negation of input signal"
     annotation (Placement(transformation(extent={{-90,-60},{-70,-40}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul4(
-<<<<<<< HEAD
-      startTime=100, period=1500) "Boolean pulse input signal"
-=======
     shift=100,
     period=1500)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{20,60},{40,80}})));
   Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol4(
     trueHoldDuration=1000)
     "The block introduces a minimal offset between the input signal rising and falling edge"
     annotation (Placement(transformation(extent={{120,60},{140,80}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul5(
-<<<<<<< HEAD
-    startTime=100,
-=======
     shift=100,
->>>>>>> master
     period=1000,
     width=0.25)
     "Boolean pulse input signal"
@@ -89,24 +65,16 @@ model TrueFalseHold
     "The block introduces a minimal offset between the input signal rising and falling edge"
     annotation (Placement(transformation(extent={{120,20},{140,40}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul6(
-<<<<<<< HEAD
-      startTime=100, period=1500) "Boolean pulse input signal"
-=======
     shift=100,
     period=1500)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
   Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol6(
     trueHoldDuration=1000)
     "The block introduces a minimal offset between the input signal rising and falling edge"
     annotation (Placement(transformation(extent={{120,-20},{140,0}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul7(
-<<<<<<< HEAD
-    startTime=100,
-=======
     shift=100,
->>>>>>> master
     period=1000,
     width=0.25)
     "Boolean pulse input signal"
@@ -123,33 +91,6 @@ model TrueFalseHold
     annotation (Placement(transformation(extent={{70,-60},{90,-40}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul.y, truFalHol.u)
-    annotation (Line(points={{-119,70},{-80,70},{-41,70}},
-                                                      color={255,0,255}));
-  connect(booPul1.y, truFalHol1.u)
-    annotation (Line(points={{-119,30},{-41,30}},   color={255,0,255}));
-  connect(booPul2.y, not1.u)
-    annotation (Line(points={{-119,-10},{-92,-10}}, color={255,0,255}));
-  connect(not1.y, truFalHol2.u)
-    annotation (Line(points={{-69,-10},{-41,-10}},   color={255,0,255}));
-  connect(booPul3.y, not3.u)
-    annotation (Line(points={{-119,-50},{-92,-50}}, color={255,0,255}));
-  connect(not3.y, truFalHol3.u)
-    annotation (Line(points={{-69,-50},{-41,-50}},   color={255,0,255}));
-  connect(booPul4.y, truFalHol4.u)
-    annotation (Line(points={{41,70},{119,70}},   color={255,0,255}));
-  connect(booPul5.y, truFalHol5.u)
-    annotation (Line(points={{41,30},{119,30}},   color={255,0,255}));
-  connect(booPul6.y, not2.u)
-    annotation (Line(points={{41,-10},{68,-10}}, color={255,0,255}));
-  connect(not2.y, truFalHol6.u)
-    annotation (Line(points={{91,-10},{119,-10}},   color={255,0,255}));
-  connect(booPul7.y, not4.u)
-    annotation (Line(points={{41,-50},{68,-50}}, color={255,0,255}));
-  connect(not4.y, truFalHol7.u)
-    annotation (Line(points={{91,-50},{119,-50}},   color={255,0,255}));
-=======
   connect(booPul.y,truFalHol.u)
     annotation (Line(points={{-118,70},{-118,70},{-42,70}},color={255,0,255}));
   connect(booPul1.y,truFalHol1.u)
@@ -174,7 +115,6 @@ equation
     annotation (Line(points={{42,-50},{68,-50}},color={255,0,255}));
   connect(not4.y,truFalHol7.u)
     annotation (Line(points={{92,-50},{118,-50}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=7200.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mo
index a0bea3c5073..06527716b60 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mo
@@ -2,50 +2,34 @@ within Buildings.Controls.OBC.CDL.Logical.Validation;
 model TrueHoldWithReset
   "Validation model for the TrueHoldWithReset block"
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
-<<<<<<< HEAD
-      period=9000, startTime=300) "Boolean pulse input signal"
-=======
     period=9000,
     shift=300)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
   Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(
     duration=3600)
     "Block that holds a signal on for a requested time period"
     annotation (Placement(transformation(extent={{20,70},{40,90}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
-<<<<<<< HEAD
-      period=3600) "Boolean pulse input signal"
-=======
     period=3600)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
   Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol1(
     duration=600)
     "Block that holds a signal on for a requested time period"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul2(
-<<<<<<< HEAD
-      period=9000, startTime=300) "Boolean pulse input signal"
-=======
     period=9000,
     shift=300)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
   Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol2(
     duration=3600)
     "Block that holds a signal on for a requested time period"
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul3(
-<<<<<<< HEAD
-      period=3600) "Boolean pulse input signal"
-=======
     period=3600)
     "Boolean pulse input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
   Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol3(
     duration=600)
@@ -59,22 +43,6 @@ model TrueHoldWithReset
     annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul.y, truHol.u)
-    annotation (Line(points={{-19,80},{2,80},{19,80}},
-                                                    color={255,0,255}));
-  connect(booPul1.y, truHol1.u)
-    annotation (Line(points={{-19,30},{19,30}},
-                                              color={255,0,255}));
-  connect(booPul2.y, not2.u)
-    annotation (Line(points={{-19,-10},{-12,-10}}, color={255,0,255}));
-  connect(not2.y, truHol2.u)
-    annotation (Line(points={{11,-10},{19,-10}}, color={255,0,255}));
-  connect(booPul3.y, not3.u)
-    annotation (Line(points={{-19,-60},{-12,-60}}, color={255,0,255}));
-  connect(not3.y, truHol3.u)
-    annotation (Line(points={{11,-60},{19,-60}}, color={255,0,255}));
-=======
   connect(booPul.y,truHol.u)
     annotation (Line(points={{-18,80},{-18,80},{18,80}},color={255,0,255}));
   connect(booPul1.y,truHol1.u)
@@ -87,7 +55,6 @@ equation
     annotation (Line(points={{-18,-60},{-12,-60}},color={255,0,255}));
   connect(not3.y,truHol3.u)
     annotation (Line(points={{12,-60},{18,-60}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=15000.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Xor.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Xor.mo
index 21960756089..5f535b7f8a4 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/Xor.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Xor.mo
@@ -12,20 +12,14 @@ model Xor
     "Block that outputs cyclic on and off"
     annotation (Placement(transformation(extent={{-26,-26},{-6,-6}})));
   Buildings.Controls.OBC.CDL.Logical.Xor xor1
+    "Outputs true if exactly one input is true"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
 
 equation
-<<<<<<< HEAD
-  connect(booPul2.y, xor1.u2) annotation (Line(points={{-5,-16},{8,-16},{8,-6},
-          {24,-6}}, color={255,0,255}));
-  connect(booPul1.y, xor1.u1) annotation (Line(points={{-5,18},{10,18},{10,2},{
-          24,2}}, color={255,0,255}));
-=======
   connect(booPul2.y,xor1.u2)
     annotation (Line(points={{-4,-16},{8,-16},{8,-6},{24,-6}},color={255,0,255}));
   connect(booPul1.y,xor1.u1)
     annotation (Line(points={{-4,18},{10,18},{10,2},{24,2}},color={255,0,255}));
->>>>>>> master
   annotation (
     experiment(
       StopTime=5.0,
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/package.order b/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
index 240a34dba45..110d4ef4031 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
@@ -16,6 +16,9 @@ Or
 Or3
 Switch
 Timer
+TimerAccumulating
+TimerAccumulatingNegativeStartTime
+TimerNegativeStartTime
 Toggle
 TriggeredTrapezoid
 TrueDelay
diff --git a/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo b/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo
index b74de336c3f..c837015d399 100644
--- a/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/ZeroCrossing.mo
@@ -1,14 +1,8 @@
 within Buildings.Controls.OBC.CDL.Logical;
-<<<<<<< HEAD
-block ZeroCrossing "Trigger zero crossing of input u"
-
-  Interfaces.RealInput u
-=======
 block ZeroCrossing
   "Trigger zero crossing of input u"
   Interfaces.RealInput u
     "Connector of Real input signal"
->>>>>>> master
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
   Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
@@ -18,16 +12,11 @@ block ZeroCrossing
     annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90)));
 
 protected
-<<<<<<< HEAD
-  Boolean disable=not enable;
-  Boolean u_pos;
-=======
   Boolean disable=not enable
     "Boolean not of enable input";
   Boolean u_pos
     "Positive real input";
 
->>>>>>> master
 initial equation
   pre(u_pos)=false;
   pre(enable)=false;
diff --git a/Buildings/Controls/OBC/CDL/Logical/package.order b/Buildings/Controls/OBC/CDL/Logical/package.order
index bc5ca9e3f1f..610c579a68b 100644
--- a/Buildings/Controls/OBC/CDL/Logical/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/package.order
@@ -17,6 +17,7 @@ Or3
 Pre
 Switch
 Timer
+TimerAccumulating
 Toggle
 TriggeredTrapezoid
 TrueDelay
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
similarity index 70%
rename from Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
rename to Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
index 33397ec4235..99f675f73cc 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
+++ b/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
@@ -1,23 +1,9 @@
 within Buildings.Controls.OBC.CDL.Psychrometrics;
-block TDewPoi_TDryBulPhi
+block DewPoint_TDryBulPhi
   "Block to compute the dew point temperature based on relative humidity"
   Interfaces.RealInput TDryBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
-    final min=100) "Dry bulb temperature"
-    annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-
-  Interfaces.RealInput phi(final min=0, final max=1, unit="1")
-    "Relative air humidity"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-
-  Interfaces.RealInput p(final quantity="Pressure",
-                         final unit="Pa",
-                         final min = 0) "Pressure"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-
-=======
     final min=100)
     "Dry bulb temperature"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
@@ -27,7 +13,6 @@ block TDewPoi_TDryBulPhi
     unit="1")
     "Relative air humidity"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
->>>>>>> master:Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
   Interfaces.RealOutput TDewPoi(
     final quantity="ThermodynamicTemperature",
     final unit="K",
@@ -36,16 +21,6 @@ block TDewPoi_TDryBulPhi
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 protected
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
-  Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure";
-  constant Real C14=6.54;
-  constant Real C15=14.526;
-  constant Real C16=0.7389;
-  constant Real C17=0.09486;
-  constant Real C18=0.4569;
-  Real alpha;
-
-=======
   Real p_w(
     final quantity="Pressure",
     final unit="Pa",
@@ -63,7 +38,6 @@ protected
     "Constant used in the equation";
   Real alpha
     "Variable used in the equation";
->>>>>>> master:Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
 
 equation
   p_w=phi*Buildings.Utilities.Psychrometrics.Functions.saturationPressure(TDryBul);
@@ -79,15 +53,13 @@ Dew point temperature calculation for moist air above freezing temperature.
 </p>
 <p>
 The correlation used in this model is valid for dew point temperatures between
-<i>0</i>&deg;C and <i>93</i>&deg;C. It is the correlation from 2005
-ASHRAE Handbook Fundamentals, p. 6.9.
+<i>0</i>&deg;C and <i>93</i>&deg;C. It is the correlation from 2009
+ASHRAE Handbook Fundamentals, p. 1.9, equation 39.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
-=======
 November 12, 2020, by Michael Wetter:<br/>
 Reformulated to remove dependency to <code>Modelica.SIunits</code>.<br/>
 This is for
@@ -100,7 +72,6 @@ This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2139\">issue 2139</a>
 </li>
 <li>
->>>>>>> master:Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
 April 7, 2017 by Jianjun Hu:<br/>
 First implementation.
 </li>
@@ -132,17 +103,13 @@ First implementation.
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Text(
-          extent={{-92,14},{-72,-12}},
+          extent={{-90,-46},{-70,-72}},
           lineColor={0,0,127},
           textString="phi"),
         Text(
-          extent={{-92,100},{-62,56}},
+          extent={{-92,82},{-62,38}},
           lineColor={0,0,127},
           textString="TDryBul"),
-        Text(
-          extent={{-90,-72},{-72,-90}},
-          lineColor={0,0,127},
-          textString="p"),
         Polygon(
           points={{86,-74},{76,-72},{76,-76},{86,-74}},
           lineColor={0,0,0},
@@ -173,13 +140,6 @@ First implementation.
           lineColor={255,0,0},
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid),
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
-        Line(points={{66,-44},{-48,-44}}, color={175,175,175}),
-        Line(points={{68,-18},{-10,-18}}, color={175,175,175}),
-        Line(points={{70,6},{12,6}}, color={175,175,175}),
-        Line(points={{68,32},{22,32}}, color={175,175,175})}));
-end TDewPoi_TDryBulPhi;
-=======
         Line(
           points={{66,-44},{-48,-44}},
           color={175,175,175}),
@@ -193,4 +153,3 @@ end TDewPoi_TDryBulPhi;
           points={{68,32},{22,32}},
           color={175,175,175})}));
 end DewPoint_TDryBulPhi;
->>>>>>> master:Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/package.order b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/package.order
index 45eb7d0d855..fc0e58cc8c0 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/package.order
@@ -1,3 +1,3 @@
-TDewPoi_TDryBulPhi
-TWetBul_TDryBulPhi
-h_TDryBulPhi
+DewPoint_TDryBulPhi
+SpecificEnthalpy_TDryBulPhi
+WetBulb_TDryBulPhi
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/package.order b/Buildings/Controls/OBC/CDL/Psychrometrics/package.order
index cbed346465c..b5717e1bfc6 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/package.order
+++ b/Buildings/Controls/OBC/CDL/Psychrometrics/package.order
@@ -1,4 +1,4 @@
-TDewPoi_TDryBulPhi
-TWetBul_TDryBulPhi
-h_TDryBulPhi
+DewPoint_TDryBulPhi
+SpecificEnthalpy_TDryBulPhi
+WetBulb_TDryBulPhi
 Validation
diff --git a/Buildings/Controls/OBC/CDL/Types/Reset.mo b/Buildings/Controls/OBC/CDL/Types/Reset.mo
deleted file mode 100644
index 2d6ab82ca24..00000000000
--- a/Buildings/Controls/OBC/CDL/Types/Reset.mo
+++ /dev/null
@@ -1,35 +0,0 @@
-within Buildings.Controls.OBC.CDL.Types;
-type Reset = enumeration(
-    Disabled "Disabled",
-    Parameter "Use parameter value",
-    Input "Use input signal") "Options for integrator reset" annotation (
-    Documentation(info="<html>
-<p>
-Enumeration to define the choice of integrator reset.
-Possible values are:
-</p>
-<table border=\"1\" summary=\"Explanation of the enumeration\">
-<tr>
-<th>Enumeration</th>
-<th>Description</th></tr>
-<tr><td><code>Disabled</code></td>
-<td>
-Use this setting to disable the integrator reset.
-</td></tr>
-<tr><td><code>Parameter</code></td>
-<td>
-Use this setting to use reset the integrator to the value of the parameter.
-</td></tr>
-<tr><td><code>Input</code></td>
-<td>Use this setting to reset the integrator to the value obtained
-from the input signal.
-</td></tr>
- </table>
-</html>", revisions="<html>
-<ul>
-<li>
-March 23, 2017, by Jianjun Hu:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
diff --git a/Buildings/Controls/OBC/CDL/Types/package.order b/Buildings/Controls/OBC/CDL/Types/package.order
index 15dc1647e63..0f5f6a75e9d 100644
--- a/Buildings/Controls/OBC/CDL/Types/package.order
+++ b/Buildings/Controls/OBC/CDL/Types/package.order
@@ -1,6 +1,5 @@
 Day
 Extrapolation
-Reset
 SimpleController
 Smoothness
 ZeroTime
diff --git a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo
index 2a6bfe24198..92f24d32227 100644
--- a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo
+++ b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo
@@ -285,18 +285,11 @@ equation
       staTim,
       lat);
   end when;
-<<<<<<< HEAD
-
-  sunUp = nextSunSet < nextSunRise
-  annotation (defaultComponentName="sunRiseSet",
-  Documentation(info="<html>
-=======
   sunUp=nextSunSet < nextSunRise;
   annotation (
     defaultComponentName="sunRiseSet",
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 This block outputs the next sunrise and sunset time.
 The sunrise time keeps constant until the model time reaches the next sunrise,
diff --git a/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetNegativeStartTime.mo b/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetNegativeStartTime.mo
index fecc2082368..a11765344c5 100644
--- a/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetNegativeStartTime.mo
+++ b/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetNegativeStartTime.mo
@@ -26,16 +26,6 @@ model SunRiseSetNegativeStartTime
     timZon=36000)
     "Sydney as a test example in the southern hemisphere"
     annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
-<<<<<<< HEAD
-equation
-
-annotation (
-  experiment(StartTime=-43200, StopTime=259200, Tolerance=1e-06),
-  __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Utilities/Validation/SunRiseSetNegativeStartTime.mos"
-        "Simulate and plot"),
-  Documentation(info="<html>
-=======
   annotation (
     experiment(
       StartTime=-43200,
@@ -45,7 +35,6 @@ annotation (
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Utilities/Validation/SunRiseSetNegativeStartTime.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>This example includes 4 tests for the <a href=\"modelica://Buildings.Controls.OBC.CDL.Utilities.SunRiseSet\">
 Buildings.Controls.OBC.CDL.Utilities.SunRiseSet</a> block: 2 normal cases, an arctic and antarctic case.
 The normal cases are represented by San Francisco and Sydney, where there is a sunrise and sunset every day. </p>
diff --git a/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetPositiveStartTime.mo b/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetPositiveStartTime.mo
index 1c9da2a20c6..5ce015468ce 100644
--- a/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetPositiveStartTime.mo
+++ b/Buildings/Controls/OBC/CDL/Utilities/Validation/SunRiseSetPositiveStartTime.mo
@@ -26,16 +26,6 @@ model SunRiseSetPositiveStartTime
     timZon=36000)
     "Sydney as a test example in the southern hemisphere"
     annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
-<<<<<<< HEAD
-equation
-
-annotation (
-  experiment(StartTime=43200, StopTime=345600, Tolerance=1e-06),
-  __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Utilities/Validation/SunRiseSetPositiveStartTime.mos"
-        "Simulate and plot"),
-  Documentation(info="<html>
-=======
   annotation (
     experiment(
       StartTime=43200,
@@ -45,7 +35,6 @@ annotation (
       file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Utilities/Validation/SunRiseSetPositiveStartTime.mos" "Simulate and plot"),
     Documentation(
       info="<html>
->>>>>>> master
 <p>This example includes 4 tests for the <a href=\"modelica://Buildings.Controls.OBC.CDL.Utilities.SunRiseSet\">
 Buildings.Controls.OBC.CDL.Utilities.SunRiseSet</a> block: 2 normal cases, an arctic and antarctic case.
 The normal cases are represented by San Francisco and Sydney, where there is a sunrise and sunset every day. </p>
diff --git a/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo b/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo
index e3b98f68605..8ae3c5dcd67 100644
--- a/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo
+++ b/Buildings/Controls/OBC/OutdoorLights/DaylightControlled.mo
@@ -1,11 +1,4 @@
 within Buildings.Controls.OBC.OutdoorLights;
-<<<<<<< HEAD
-block DaylightControlled "Controlling the outdoor lighting based on whether the sun is up"
-  parameter Modelica.SIunits.Angle lat(displayUnit="deg") "Latitude";
-  parameter Modelica.SIunits.Angle lon(displayUnit="deg") "Longitude";
-  parameter Modelica.SIunits.Time timZon(displayUnit="h") "Time zone of location";
-
-=======
 block DaylightControlled
   "Controlling the outdoor lighting based on whether the sun is up"
   parameter Real lat(
@@ -23,7 +16,6 @@ block DaylightControlled
     final unit="s",
     displayUnit="h")
     "Time zone of location";
->>>>>>> master
   CDL.Interfaces.RealOutput y(
     final min=0,
     final max=1,
diff --git a/Buildings/Controls/OBC/Shade/Shade_H.mo b/Buildings/Controls/OBC/Shade/Shade_H.mo
index 557e6322dcc..bcecf15ee87 100644
--- a/Buildings/Controls/OBC/Shade/Shade_H.mo
+++ b/Buildings/Controls/OBC/Shade/Shade_H.mo
@@ -1,12 +1,4 @@
 within Buildings.Controls.OBC.Shade;
-<<<<<<< HEAD
-block Shade_H "Shade controller with solar irradiation as input"
-
-  parameter Modelica.SIunits.Irradiance HHigh
-    "if y=0 and H>=HHigh, switch to y=1";
-
-  parameter Modelica.SIunits.Irradiance HLow
-=======
 block Shade_H
   "Shade controller with solar irradiation as input"
   parameter Real HHigh(
@@ -16,7 +8,6 @@ block Shade_H
   parameter Real HLow(
     final quantity="Irradiance",
     final unit="W/m2")
->>>>>>> master
     "if y=1 and H<=HLow, switch to y=0";
   CDL.Interfaces.RealInput H(
     final unit="W/m2")
diff --git a/Buildings/Controls/OBC/Shade/Shade_T.mo b/Buildings/Controls/OBC/Shade/Shade_T.mo
index cfe8fe75106..f1585bc1102 100644
--- a/Buildings/Controls/OBC/Shade/Shade_T.mo
+++ b/Buildings/Controls/OBC/Shade/Shade_T.mo
@@ -1,12 +1,4 @@
 within Buildings.Controls.OBC.Shade;
-<<<<<<< HEAD
-block Shade_T "Shade controller with temperature as input"
-
-  parameter Modelica.SIunits.Temperature THigh
-    "if y=0 and T>=THigh, switch to y=1";
-
-  parameter Modelica.SIunits.Temperature TLow
-=======
 block Shade_T
   "Shade controller with temperature as input"
   parameter Real THigh(
@@ -18,7 +10,6 @@ block Shade_T
     final quantity="ThermodynamicTemperature",
     final unit="K",
     displayUnit="degC")
->>>>>>> master
     "if y=1 and T<=TLow, switch to y=0";
   CDL.Interfaces.RealInput T(
     final unit="K")
diff --git a/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo b/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
index 1807f111703..ce6382ba844 100644
--- a/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
+++ b/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
@@ -1,15 +1,6 @@
 within Buildings.Controls.OBC.Utilities.BaseClasses;
 block OptimalStartCalculation
   "Base class for the block OptimalStart"
-<<<<<<< HEAD
-  parameter Modelica.SIunits.Time tOptMax "Maximum optimal start time";
-  parameter Modelica.SIunits.Time thrOptOn
-    "Threshold time for the output optOn to become true";
-  parameter Modelica.SIunits.Time tOptDef
-    "Default optimal start time";
-  parameter Integer nDay "Number of previous days for averaging the temperature slope";
-  parameter Modelica.SIunits.TemperatureDifference uLow
-=======
   parameter Real tOptMax(
     final quantity="Time",
     final unit="s")
@@ -23,10 +14,11 @@ block OptimalStartCalculation
   parameter Real uLow(
     final quantity="TemperatureDifference",
     final unit="K")
->>>>>>> master
     "Threshold to determine if the zone temperature reaches the occupied setpoint,
      should be a non-negative number";
-  parameter Modelica.SIunits.TemperatureDifference uHigh
+  parameter Real uHigh(
+    final quantity="TemperatureDifference",
+    final unit="K")
     "Threshold to determine the need to start the HVAC system before occupancy,
      should be greater than uLow";
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TDif(
@@ -50,17 +42,6 @@ block OptimalStartCalculation
     "Optimal start time of HVAC system"
     annotation (Placement(transformation(extent={{440,40},{480,80}}),iconTransformation(extent={{100,20},{140,60}})));
   Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput optOn
-<<<<<<< HEAD
-    "Optimal start boolean output" annotation (
-      Placement(transformation(extent={{440,-80},{480,-40}}),
-        iconTransformation(extent={{100,-60},{140,-20}})));
-
-protected
-  parameter Modelica.SIunits.TemperatureSlope temSloDef = 1/3600
-    "Default temperature slope in case of zero division";
-
-  Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean triMovMea(
-=======
     "Optimal start boolean output"
     annotation (Placement(transformation(extent={{440,-80},{480,-40}}),iconTransformation(extent={{100,-60},{140,-20}})));
 
@@ -80,7 +61,6 @@ protected
     "Trigger that triggers each midnight"
     annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
   Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean samTemSloAve(
->>>>>>> master
     final n=nDay)
     "Calculate the averaged temperature slope over the past n days"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
@@ -116,22 +96,9 @@ protected
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysOpt(
     final pre_y_start=false,
     final uHigh=0,
-<<<<<<< HEAD
-    final uLow=-60) "Hysteresis to activate the optimal start"
-    annotation (Placement(transformation(extent={{330,-90},{350,-70}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold lesEquThr(
-    final threshold=1E-15)
-    "Avoid zero division"
-    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold lesEquThr1(
-    final threshold=1E-15)
-    "Avoid zero division"
-    annotation (Placement(transformation(extent={{140,-10},{160,10}})));
-=======
     final uLow=-60)
     "Hysteresis to activate the optimal start"
     annotation (Placement(transformation(extent={{320,-90},{340,-70}})));
->>>>>>> master
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxStaTim(
     final k=tOptMax)
     "Maximum optimal start time"
@@ -166,15 +133,9 @@ protected
     "Record the start time when the HVAC system is turned on"
     annotation (Placement(transformation(extent={{-128,-60},{-108,-40}})));
   Buildings.Controls.OBC.CDL.Logical.Latch lat
-<<<<<<< HEAD
-     "Stop calculation when the zone temperature reaches setpoint"
-    annotation (Placement(transformation(extent={{-190,70},{-170,90}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer tim(final reset=true)
-=======
     "Stop calculation when the zone temperature reaches setpoint"
     annotation (Placement(transformation(extent={{-188,70},{-168,90}})));
   Buildings.Controls.OBC.CDL.Logical.Timer tim
->>>>>>> master
     "Record time duration for the zone temperature to reach setpoint"
     annotation (Placement(transformation(extent={{-210,0},{-190,20}})));
   Buildings.Controls.OBC.CDL.Logical.Not not1
@@ -182,132 +143,6 @@ protected
     annotation (Placement(transformation(extent={{-220,64},{-200,84}})));
   Buildings.Controls.OBC.CDL.Continuous.Division tOptCal
     "Calculate optimal start time using the averaged previous temperature slope"
-<<<<<<< HEAD
-    annotation (Placement(transformation(extent={{220,-10},{240,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.ModelTime modTim "Model time"
-    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1(final k=86400)
-  "Daily period"
-    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
-  Buildings.Controls.OBC.CDL.Continuous.Modulo mod "Get the modulo"
-    annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold lesEquThr2(
-    final threshold=1E-06)
-  "Get the instant when the simulation time arrives at midnight"
-    annotation (Placement(transformation(extent={{80,-70},{100,-50}})));
-  Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triSam4
-  "Get the sampled optimal start time at the same time each day"
-    annotation (Placement(transformation(extent={{250,-10},{270,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(
-    final threshold=thrOptOn)
-  "The threshold for optOn signal becomes true"
-    annotation (Placement(transformation(extent={{320,-10},{340,10}})));
-  Buildings.Controls.OBC.CDL.Logical.And and2 "Logical and"
-    annotation (Placement(transformation(extent={{360,-40},{380,-20}})));
-
-equation
-  connect(tim.y, triSam.u)  annotation (Line(points={{-158,10},{-102,10}},
-                                              color={0,0,127}));
-  connect(falEdg.y, triSam.trigger) annotation (Line(points={{-98,-20},{-90,-20},
-          {-90,-1.8}},                                                                     color={255,0,255}));
-  connect(not1.y, lat.clr) annotation (Line(points={{-208,80},{-200,80},{-200,74},
-          {-192,74}}, color={255,0,255}));
-  connect(swi1.y, tOptCal.u2) annotation (Line(points={{202,0},{210,0},{210,-6},
-          {218,-6}}, color={0,0,127}));
-  connect(temSlo.y, triMovMea.u)  annotation (Line(points={{82,0},{98,0}},     color={0,0,127}));
-  connect(lesEquThr.y, swi.u2)   annotation (Line(points={{2,0},{18,0}},      color={255,0,255}));
-  connect(lesEquThr1.y, swi1.u2)    annotation (Line(points={{162,0},{178,0}},     color={255,0,255}));
-  connect(TDif, hys.u) annotation (Line(points={{-300,120},{-272,120},{-272,80},
-          {-262,80}},
-                color={0,0,127}));
-  connect(triMovMea.y, lesEquThr1.u)   annotation (Line(points={{122,0},{138,0}},     color={0,0,127}));
-  connect(staCal, triSam2.trigger) annotation (Line(points={{-300,40},{-120,40},
-          {-120,100},{110,100},{110,108.2}},
-                                    color={255,0,255}));
-  connect(TDif,triSam3. u)   annotation (Line(points={{-300,120},{0,120},{0,80},
-          {18,80}},                                color={0,0,127}));
-  connect(pre.y,triSam3. trigger) annotation (Line(points={{412,-30},{420,-30},
-          {420,30},{30,30},{30,68.2}},
-                                    color={255,0,255}));
-  connect(pre.y, lat.u) annotation (Line(points={{412,-30},{420,-30},{420,-100},
-          {-196,-100},{-196,80},{-192,80}},
-                                       color={255,0,255}));
-  connect(edg.y, triSam1.trigger) annotation (Line(points={{-98,-80},{-90,-80},
-          {-90,-61.8}},color={255,0,255}));
-  connect(triSam1.y, add1.u2) annotation (Line(points={{-78,-50},{-72,-50},{-72,
-          -6},{-62,-6}}, color={0,0,127}));
-  connect(triSam.y, add1.u1) annotation (Line(points={{-78,10},{-72,10},{-72,6},
-          {-62,6}}, color={0,0,127}));
-  connect(swi.y, temSlo.u2)    annotation (Line(points={{42,0},{46,0},{46,-6},{
-          58,-6}},                                                                      color={0,0,127}));
-  connect(add1.y, lesEquThr.u)   annotation (Line(points={{-38,0},{-22,0}},
-                                                                         color={0,0,127}));
-  connect(add1.y, swi.u3) annotation (Line(points={{-38,0},{-30,0},{-30,-18},{8,
-          -18},{8,-8},{18,-8}},
-                            color={0,0,127}));
-  connect(triMovMea.y, swi1.u3) annotation (Line(points={{122,0},{128,0},{128,
-          -18},{164,-18},{164,-8},{178,-8}},
-                                        color={0,0,127}));
-  connect(TDif, triSam2.u)   annotation (Line(points={{-300,120},{98,120}},  color={0,0,127}));
-  connect(tNexOcc, add2.u2) annotation (Line(points={{-300,-140},{290,-140},{290,
-          -86},{298,-86}}, color={0,0,127}));
-  connect(add2.y, hysOpt.u) annotation (Line(points={{322,-80},{328,-80}},
-                     color={0,0,127}));
-  connect(min.y, add2.u1) annotation (Line(points={{308,0},{314,0},{314,-58},{
-          290,-58},{290,-74},{298,-74}},
-                                     color={0,0,127}));
-  connect(con.y, max.u2) annotation (Line(points={{162,100},{170,100},{170,108},
-          {178,108}},color={0,0,127}));
-  connect(triSam2.y, max.u1)    annotation (Line(points={{122,120},{178,120}}, color={0,0,127}));
-  connect(staCal, truHol.u) annotation (Line(points={{-300,40},{-260,40},{-260,
-          10},{-242,10}}, color={255,0,255}));
-  connect(truHol.y, tim.u)    annotation (Line(points={{-218,10},{-182,10}}, color={255,0,255}));
-  connect(tim.y, triSam1.u) annotation (Line(points={{-158,10},{-140,10},{-140,
-          -50},{-102,-50}},
-                      color={0,0,127}));
-  connect(min.y, tOpt) annotation (Line(points={{308,0},{314,0},{314,60},{460,
-          60}},
-        color={0,0,127}));
-  connect(not1.u, hys.y)    annotation (Line(points={{-232,80},{-238,80}}, color={255,0,255}));
-  connect(lat.y, edg.u) annotation (Line(points={{-168,80},{-134,80},{-134,-80},
-          {-122,-80}},
-                     color={255,0,255}));
-  connect(lat.y, falEdg.u) annotation (Line(points={{-168,80},{-134,80},{-134,
-          -20},{-122,-20}},
-                      color={255,0,255}));
-  connect(modTim.y, mod.u1) annotation (Line(points={{22,-40},{28,-40},{28,-54},
-          {38,-54}}, color={0,0,127}));
-  connect(con1.y, mod.u2) annotation (Line(points={{22,-80},{28,-80},{28,-66},{
-          38,-66}}, color={0,0,127}));
-  connect(mod.y, lesEquThr2.u)   annotation (Line(points={{62,-60},{78,-60}}, color={0,0,127}));
-  connect(lesEquThr2.y, triMovMea.trigger) annotation (Line(points={{102,-60},{
-          110,-60},{110,-12}}, color={255,0,255}));
-  connect(tOptCal.y, triSam4.u)   annotation (Line(points={{242,0},{248,0}}, color={0,0,127}));
-  connect(staCal, triSam4.trigger) annotation (Line(points={{-300,40},{-260,40},
-          {-260,-108},{260,-108},{260,-11.8}}, color={255,0,255}));
-  connect(triSam4.y, min.u2) annotation (Line(points={{272,0},{276,0},{276,-6},
-          {284,-6}}, color={0,0,127}));
-  connect(maxStaTim.y, min.u1) annotation (Line(points={{272,50},{278,50},{278,
-          6},{284,6}}, color={0,0,127}));
-  connect(defOptTim.y, swi.u1)  annotation (Line(points={{2,40},{8,40},{8,8},{18,8}}, color={0,0,127}));
-  connect(defTemSlo.y, swi1.u1) annotation (Line(points={{142,50},{170,50},{170,
-          8},{178,8}}, color={0,0,127}));
-  connect(max.y, tOptCal.u1) annotation (Line(points={{202,114},{212,114},{212,
-          6},{218,6}}, color={0,0,127}));
-  connect(triSam3.y, temSlo.u1)   annotation (Line(points={{42,80},{48,80},{48,6},{58,6}}, color={0,0,127}));
-  connect(min.y, greThr.u)  annotation (Line(points={{308,0},{318,0}}, color={0,0,127}));
-  connect(hysOpt.y, and2.u2) annotation (Line(points={{352,-80},{354,-80},{354,
-          -38},{358,-38}}, color={255,0,255}));
-  connect(greThr.y, and2.u1) annotation (Line(points={{342,0},{354,0},{354,-30},
-          {358,-30}}, color={255,0,255}));
-  connect(and2.y, pre.u) annotation (Line(points={{382,-30},{386,-30},{386,-30},
-          {388,-30}}, color={255,0,255}));
-  connect(pre.y, optOn) annotation (Line(points={{412,-30},{428,-30},{428,-60},
-          {460,-60},{460,-60}}, color={255,0,255}));
-   annotation (
-defaultComponentName="optStaCal",
-  Documentation(info="<html>
-=======
     annotation (Placement(transformation(extent={{160,-10},{180,10}})));
   Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler samTimOpt
     "Get the sampled optimal start time at the same time each day"
@@ -436,7 +271,6 @@ equation
     defaultComponentName="optStaCal",
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 This base class contains the algorithm for the optimal start calculation. For the
 description of the algorithm, please refer to the documentation for the block
@@ -447,8 +281,6 @@ Buildings.Controls.OBC.Utilities.OptimalStart</a>.
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 January 30, 2021, by Michael Wetter:<br/>
 Refactored sampling of history of temperature slope to only sample when control error requires optimal start up.
 Refactored guarding against division by zero.<br/>
@@ -460,7 +292,6 @@ October 20, 2020, by Michael Wetter:<br/>
 Reimplemented trigger of the moving average computation.
 </li>
 <li>
->>>>>>> master
 December 15, 2019, by Kun Zhang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/Utilities/OptimalStart.mo b/Buildings/Controls/OBC/Utilities/OptimalStart.mo
index c744ffa9b60..0db6dbd8b06 100644
--- a/Buildings/Controls/OBC/Utilities/OptimalStart.mo
+++ b/Buildings/Controls/OBC/Utilities/OptimalStart.mo
@@ -1,14 +1,12 @@
 within Buildings.Controls.OBC.Utilities;
 block OptimalStart
   "Block that outputs the optimal start time for an HVAC system before occupancy"
-  parameter Modelica.SIunits.Time tOptMax(
+  parameter Real tOptMax(
+    final quantity="Time",
+    final unit="s",
+    displayUnit="h",
     final min=0,
-<<<<<<< HEAD
-    max=21600,
-    displayUnit="h") = 10800
-=======
     max=21600)=10800
->>>>>>> master
     "Maximum optimal start time";
   parameter Integer nDay(
     min=1)=3
@@ -17,12 +15,6 @@ block OptimalStart
     "Set to true to compute optimal start for heating";
   parameter Boolean computeCooling=false
     "Set to true to compute optimal start for cooling";
-<<<<<<< HEAD
-  parameter Modelica.SIunits.TemperatureDifference uLow(final min=0) = 0
-    "Threshold to determine if the zone temperature reaches the occupied setpoint,
-     must be a non-negative number";
-  parameter Modelica.SIunits.TemperatureDifference uHigh(final min=0) = 0.5
-=======
   parameter Real uLow(
     final quantity="TemperatureDifference",
     final unit="K",
@@ -33,10 +25,12 @@ block OptimalStart
     final quantity="TemperatureDifference",
     final unit="K",
     final min=0)=0.5
->>>>>>> master
     "Threshold to determine the need to start the HVAC system before occupancy,
      must be greater than uLow";
-  parameter Modelica.SIunits.Time thrOptOn(
+  parameter Real thrOptOn(
+    final quantity="Time",
+    final unit="s",
+    displayUnit="h",
     final min=0,
     max=10800)=60
     "Threshold time, optimal start on signal becomes true when tOpt larger than thrOptOn";
@@ -92,11 +86,6 @@ block OptimalStart
     final uHigh=uHigh) if computeCooling
     "Optimal start time for cooling system"
     annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
-<<<<<<< HEAD
-protected
-  parameter Modelica.SIunits.Time tOptDef = 3600
-    "Default optimal start time";
-=======
   CDL.Continuous.GreaterThreshold hysSta(
     t=60,
     h=60)
@@ -104,7 +93,6 @@ protected
     annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
 
 protected
->>>>>>> master
   Buildings.Controls.OBC.CDL.Continuous.Max max
     "Get the maximum optimal start time "
     annotation (Placement(transformation(extent={{100,30},{120,50}})));
@@ -113,11 +101,6 @@ protected
     k=1)
     "Maximum optimal start time"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysSta(
-    pre_y_start=false,
-    uHigh=60,
-    uLow=0)   "Hysteresis to activate the optimal start boolean output"
-    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
   Buildings.Controls.OBC.CDL.Logical.Or or2
     "Get the optimal start boolean output"
     annotation (Placement(transformation(extent={{100,-50},{120,-30}})));
@@ -152,55 +135,6 @@ protected
     annotation (Placement(transformation(extent={{60,-94},{80,-74}})));
 
 equation
-<<<<<<< HEAD
-  connect(TSetZonCoo, dTCoo.u2) annotation (Line(points={{-160,30},{-132,30},{-132,
-          -56},{-82,-56}},     color={0,0,127}));
-  connect(TZon, dTCoo.u1) annotation (Line(points={{-160,-30},{-126,-30},{-126,-44},
-          {-82,-44}},color={0,0,127}));
-  connect(TZon, dTHea.u2) annotation (Line(points={{-160,-30},{-126,-30},{-126,74},
-          {-82,74}}, color={0,0,127}));
-  connect(TSetZonHea, dTHea.u1) annotation (Line(points={{-160,80},{-126,80},{-126,
-          86},{-82,86}},  color={0,0,127}));
-  connect(max.y, tOpt) annotation (Line(points={{122,40},{160,40}},
-                color={0,0,127}));
-  connect(con2.y, max.u1) annotation (Line(points={{82,50},{88,50},{88,46},{98,
-          46}},      color={0,0,127}));
-  connect(con1.y, max.u2) annotation (Line(points={{82,20},{88,20},{88,34},{98,
-          34}}, color={0,0,127}));
-  connect(dTCoo.y, optCoo.TDif) annotation (Line(points={{-58,-50},{-22,-50},{-22,
-          -62},{18,-62}}, color={0,0,127}));
-  connect(dTHea.y, optHea.TDif)   annotation (Line(points={{-58,80},{-8,80},{-8,78},{18,78}},
-                                                color={0,0,127}));
-  connect(tNexOcc, addPar.u) annotation (Line(points={{-160,-80},{-120,-80},{-120,
-          0},{-102,0}},     color={0,0,127}));
-  connect(addPar.y, hysSta.u)   annotation (Line(points={{-78,0},{-72,0}}, color={0,0,127}));
-  connect(hysSta.y, falEdg.u) annotation (Line(points={{-48,0},{-32,0}},
-                      color={255,0,255}));
-  connect(tNexOcc, optHea.tNexOcc) annotation (Line(points={{-160,-80},{-120,-80},
-          {-120,62},{18,62}}, color={0,0,127}));
-  connect(optCoo.tOpt, max.u2) annotation (Line(points={{42,-66},{88,-66},{88,
-          34},{98,34}},  color={0,0,127}));
-  connect(optHea.tOpt, max.u1) annotation (Line(points={{42,74},{88,74},{88,46},
-          {98,46}}, color={0,0,127}));
-  connect(tNexOcc, optCoo.tNexOcc) annotation (Line(points={{-160,-80},{-68,-80},
-          {-68,-78},{18,-78}}, color={0,0,127}));
-  connect(falEdg.y, optHea.staCal) annotation (Line(points={{-8,0},{0,0},{0,70},
-          {18,70}},     color={255,0,255}));
-  connect(falEdg.y, optCoo.staCal) annotation (Line(points={{-8,0},{0,0},{0,-70},
-          {18,-70}},      color={255,0,255}));
-  connect(or2.y,optOn)    annotation (Line(points={{122,-40},{160,-40}}, color={255,0,255}));
-  connect(con.y, or2.u1) annotation (Line(points={{82,-20},{92,-20},{92,-40},{98,
-          -40}}, color={255,0,255}));
-  connect(con3.y, or2.u2) annotation (Line(points={{82,-84},{92,-84},{92,-48},{98,
-          -48}}, color={255,0,255}));
-  connect(optCoo.optOn, or2.u2) annotation (Line(points={{42,-74},{50,-74},{50,-48},
-          {98,-48}}, color={255,0,255}));
-  connect(optHea.optOn, or2.u1) annotation (Line(points={{42,66},{92,66},{92,-40},
-          {98,-40}}, color={255,0,255}));
-   annotation (
-defaultComponentName="optSta",
-  Documentation(info="<html>
-=======
   connect(TSetZonCoo,dTCoo.u2)
     annotation (Line(points={{-160,30},{-132,30},{-132,-56},{-82,-56}},color={0,0,127}));
   connect(TZon,dTCoo.u1)
@@ -251,7 +185,6 @@ defaultComponentName="optSta",
     defaultComponentName="optSta",
     Documentation(
       info="<html>
->>>>>>> master
 <p>
 This block predicts the shortest time for an HVAC system to meet the occupied setpoint
 prior to the scheduled occupancy. The block requires inputs of zone temperature,
@@ -364,8 +297,6 @@ Buildings.Controls.OBC.Utilities.Validation</a>.
       revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 January 30, 2021, by Michael Wetter:<br/>
 Refactored sampling of history of temperature slope to only sample when control error requires optimal start up.
 Refactored guarding against division by zero.<br/>
@@ -377,7 +308,6 @@ August 6, 2020, by Michael Wetter:<br/>
 Replaced hysteresis with new inequality block.
 </li>
 <li>
->>>>>>> master
 December 15, 2019, by Kun Zhang:<br/>
 First implementation.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1589\">issue #1589</a>.
diff --git a/Buildings/Controls/OBC/Utilities/SetPoints/Validation/SupplyReturnTemperatureReset.mo b/Buildings/Controls/OBC/Utilities/SetPoints/Validation/SupplyReturnTemperatureReset.mo
index 35864a60d1f..37469a4af69 100644
--- a/Buildings/Controls/OBC/Utilities/SetPoints/Validation/SupplyReturnTemperatureReset.mo
+++ b/Buildings/Controls/OBC/Utilities/SetPoints/Validation/SupplyReturnTemperatureReset.mo
@@ -25,13 +25,8 @@ model SupplyReturnTemperatureReset
     "Compute the supply and return set point of heating systems with changing room setpoint temperature"
     annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse TRoo1(
-<<<<<<< HEAD:Buildings/Controls/OBC/CDL/SetPoints/Validation/SupplyReturnTemperatureReset.mo
-    offset=273.15 + 20,
-    startTime=0.5,
-=======
     offset=273.15+20,
     shift=0.5,
->>>>>>> master:Buildings/Controls/OBC/Utilities/SetPoints/Validation/SupplyReturnTemperatureReset.mo
     amplitude=-5,
     period=1,
     y(
diff --git a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingNegativeStartTime.mo b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingNegativeStartTime.mo
index bda1a2175dc..c8ac8eb9ee6 100644
--- a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingNegativeStartTime.mo
+++ b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingNegativeStartTime.mo
@@ -45,17 +45,11 @@ model OptimalStartCoolingNegativeStartTime
   Buildings.Controls.OBC.CDL.Continuous.Add add
     "Reset setpoint from unoccupied to occupied during optimal start period"
     annotation (Placement(transformation(extent={{120,0},{140,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     Ti=1,
-<<<<<<< HEAD
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "PI control signal for the cooling power"
-=======
     reverseActing=false)
     "PI control signal for the cooling power"
->>>>>>> master
     annotation (Placement(transformation(extent={{160,0},{180,20}})));
   Buildings.Controls.SetPoints.OccupancySchedule occSch(
     occupancy=3600*{7,19},
diff --git a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingPositiveStartTime.mo b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingPositiveStartTime.mo
index 73e045f9f00..6e6481238ac 100644
--- a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingPositiveStartTime.mo
+++ b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartCoolingPositiveStartTime.mo
@@ -45,17 +45,11 @@ model OptimalStartCoolingPositiveStartTime
   Buildings.Controls.OBC.CDL.Continuous.Add add
     "Reset setpoint from unoccupied to occupied during optimal start period"
     annotation (Placement(transformation(extent={{120,0},{140,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     Ti=1,
-<<<<<<< HEAD
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "PI control signal for the cooling power"
-=======
     reverseActing=false)
     "PI control signal for the cooling power"
->>>>>>> master
     annotation (Placement(transformation(extent={{160,0},{180,20}})));
   Buildings.Controls.SetPoints.OccupancySchedule occSch(
     occupancy=3600*{7,19},
diff --git a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeating.mo b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeating.mo
index 749476cce86..0436c1c437b 100644
--- a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeating.mo
+++ b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeating.mo
@@ -48,18 +48,11 @@ model OptimalStartHeating
       displayUnit="d")=-172800)
     "Outdoor dry bulb temperature to test heating system"
     annotation (Placement(transformation(extent={{-192,-20},{-172,0}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-<<<<<<< HEAD
-    Ti=1.5,
-    yMax=1,
-    yMin=0) "PI control for space heating"
-            annotation (Placement(transformation(extent={{160,0},{180,20}})));
-=======
     Ti=1.5)
     "PI control for space heating"
     annotation (Placement(transformation(extent={{160,0},{180,20}})));
->>>>>>> master
   Buildings.Controls.OBC.CDL.Continuous.Add add
     "Reset temperature from unoccupied to occupied for optimal start period"
     annotation (Placement(transformation(extent={{120,0},{140,20}})));
diff --git a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeatingCooling.mo b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeatingCooling.mo
index 356ddbf24da..01832e3b5c8 100644
--- a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeatingCooling.mo
+++ b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartHeatingCooling.mo
@@ -42,17 +42,11 @@ model OptimalStartHeatingCooling
   Buildings.Controls.OBC.CDL.Continuous.Add add1
     "Reset temperature from unoccupied to occupied for optimal start period"
     annotation (Placement(transformation(extent={{140,0},{160,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID1(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID1(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     Ti=3,
-<<<<<<< HEAD
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "PI control for space cooling"
-=======
     reverseActing=false)
     "PI control for space cooling"
->>>>>>> master
     annotation (Placement(transformation(extent={{180,0},{200,20}})));
   Buildings.Controls.SetPoints.OccupancySchedule occSch(
     occupancy=3600*{7,19},
@@ -74,16 +68,10 @@ model OptimalStartHeatingCooling
   Buildings.Controls.OBC.CDL.Continuous.Add add2
     "Reset temperature from unoccupied to occupied for optimal start period"
     annotation (Placement(transformation(extent={{140,40},{160,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-<<<<<<< HEAD
-    Ti=3,
-    yMax=1,
-    yMin=0) "PI control for space heating"
-=======
     Ti=3)
     "PI control for space heating"
->>>>>>> master
     annotation (Placement(transformation(extent={{180,40},{200,60}})));
   Buildings.Controls.OBC.CDL.Continuous.Gain QHea(
     k=2000)
@@ -96,13 +84,8 @@ model OptimalStartHeatingCooling
     shift(
       displayUnit="d")=604800,
     amplitude=15,
-<<<<<<< HEAD
-    period(displayUnit="d") = 1209600,
-    startTime(displayUnit="d") = 604800)
-=======
     period(
       displayUnit="d")=1209600)
->>>>>>> master
     "Range of outdoor dry bulb temperature"
     annotation (Placement(transformation(extent={{-210,-60},{-190,-40}})));
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal TSetHea(
diff --git a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartNoHeatingNoCooling.mo b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartNoHeatingNoCooling.mo
index 7947dd76aea..fb52383772d 100644
--- a/Buildings/Controls/OBC/Utilities/Validation/OptimalStartNoHeatingNoCooling.mo
+++ b/Buildings/Controls/OBC/Utilities/Validation/OptimalStartNoHeatingNoCooling.mo
@@ -1,16 +1,10 @@
 within Buildings.Controls.OBC.Utilities.Validation;
 model OptimalStartNoHeatingNoCooling
   "Validation model for the block OptimalStart for the case with no preheating nor precooling"
-<<<<<<< HEAD
-
-  Buildings.Controls.OBC.Utilities.OptimalStart optSta(computeHeating=false,
-      computeCooling=false) "Optimal start for both heating and cooling system"
-=======
   Buildings.Controls.OBC.Utilities.OptimalStart optSta(
     computeHeating=false,
     computeCooling=false)
     "Optimal start for both heating and cooling system"
->>>>>>> master
     annotation (Placement(transformation(extent={{40,0},{60,20}})));
   Modelica.Blocks.Continuous.Integrator TRoo(
     k=0.0000004,
@@ -44,23 +38,15 @@ model OptimalStartNoHeatingNoCooling
   Buildings.Controls.OBC.CDL.Continuous.Add add1
     "Reset temperature from unoccupied to occupied for optimal start period"
     annotation (Placement(transformation(extent={{140,0},{160,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID1(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID1(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     Ti=3,
-<<<<<<< HEAD
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "PI control for space cooling"
-    annotation (Placement(transformation(extent={{180,0},{200,20}})));
-  Buildings.Controls.SetPoints.OccupancySchedule occSch(occupancy=3600*{7,19},period=24*3600)
-=======
     reverseActing=false)
     "PI control for space cooling"
     annotation (Placement(transformation(extent={{180,0},{200,20}})));
   Buildings.Controls.SetPoints.OccupancySchedule occSch(
     occupancy=3600*{7,19},
     period=24*3600)
->>>>>>> master
     "Daily schedule"
     annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
   Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum(
@@ -74,16 +60,10 @@ model OptimalStartNoHeatingNoCooling
   Buildings.Controls.OBC.CDL.Continuous.Add add2
     "Reset temperature from unoccupied to occupied for optimal start period"
     annotation (Placement(transformation(extent={{140,40},{160,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-<<<<<<< HEAD
-    Ti=3,
-    yMax=1,
-    yMin=0) "PI control for space heating"
-=======
     Ti=3)
     "PI control for space heating"
->>>>>>> master
     annotation (Placement(transformation(extent={{180,40},{200,60}})));
   Buildings.Controls.OBC.CDL.Continuous.Gain QHea(
     k=2000)
@@ -96,22 +76,6 @@ model OptimalStartNoHeatingNoCooling
     shift(
       displayUnit="d")=604800,
     amplitude=15,
-<<<<<<< HEAD
-    period(displayUnit="d") = 1209600,
-    startTime(displayUnit="d") = 604800)
-    "Range of outdoor dry bulb temperature"
-    annotation (Placement(transformation(extent={{-210,-60},{-190,-40}})));
-  CDL.Conversions.BooleanToReal TSetHea(
-    realTrue=273.15 + 21,
-    realFalse=273.15 + 15,
-    y(final unit="K", displayUnit="degC"))
-    "Room temperature set point for heating"
-    annotation (Placement(transformation(extent={{80,-70},{100,-50}})));
-  CDL.Conversions.BooleanToReal TSetCoo(
-    realTrue=273.15 + 24,
-    realFalse=273.15 + 30,
-    y(final unit="K", displayUnit="degC"))
-=======
     period(
       displayUnit="d")=1209600)
     "Range of outdoor dry bulb temperature"
@@ -130,7 +94,6 @@ model OptimalStartNoHeatingNoCooling
     y(
       final unit="K",
       displayUnit="degC"))
->>>>>>> master
     "Room temperature set point for cooling"
     annotation (Placement(transformation(extent={{80,-40},{100,-20}})));
 
diff --git a/Buildings/Electrical/Transmission/Functions/Validation/SelectCable_low.mo b/Buildings/Electrical/Transmission/Functions/Validation/SelectCable_low.mo
new file mode 100644
index 00000000000..a5c0368b20f
--- /dev/null
+++ b/Buildings/Electrical/Transmission/Functions/Validation/SelectCable_low.mo
@@ -0,0 +1,38 @@
+within Buildings.Electrical.Transmission.Functions.Validation;
+model SelectCable_low
+  "Validation model for the function that selects the cable"
+  extends Modelica.Icons.Example;
+
+  parameter Modelica.SIunits.Voltage V_nominal = 480 "Rated voltage";
+
+  parameter Modelica.SIunits.Power[:] P_nominal = I_nominal*V_nominal/safety_factor "Rated power";
+  parameter Modelica.SIunits.Current[:] I_nominal = {65, 95, 110, 130, 170, 220, 230}.-10 "Nominal current";
+
+  parameter Real safety_factor = 1.2 "Safety factor";
+
+  parameter Buildings.Electrical.Transmission.LowVoltageCables.Generic[:] cab = Buildings.Electrical.Transmission.Functions.selectCable_low(
+    P_nominal = P_nominal,
+    V_nominal = V_nominal)
+    "Selected cable";
+
+annotation (
+experiment(Tolerance=1e-6, StopTime=1.0),
+  __Dymola_Commands(
+file="modelica://Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_low.mos"
+"Simulate and plot"),
+Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Electrical.Transmission.Functions.selectCable_low\">
+Buildings.Electrical.Transmission.Functions.selectCable_low</a>
+for a different range of currents.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+August 25, 2020, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SelectCable_low;
diff --git a/Buildings/Electrical/Transmission/Functions/Validation/SelectCable_med.mo b/Buildings/Electrical/Transmission/Functions/Validation/SelectCable_med.mo
new file mode 100644
index 00000000000..b00c28a9c55
--- /dev/null
+++ b/Buildings/Electrical/Transmission/Functions/Validation/SelectCable_med.mo
@@ -0,0 +1,38 @@
+within Buildings.Electrical.Transmission.Functions.Validation;
+model SelectCable_med
+  "Validation model for the function that selects the cable"
+  extends Modelica.Icons.Example;
+
+  parameter Modelica.SIunits.Voltage V_nominal = 25e3 "Rated voltage";
+
+  parameter Modelica.SIunits.Power[:] P_nominal = I_nominal*V_nominal/safety_factor "Rated power";
+  parameter Modelica.SIunits.Current[:] I_nominal = {195, 250, 285, 375, 450, 640, 800}.-10 "Nominal current";
+
+  parameter Real safety_factor = 1.2 "Safety factor";
+
+  parameter Buildings.Electrical.Transmission.MediumVoltageCables.Generic[:] cab = Buildings.Electrical.Transmission.Functions.selectCable_med(
+    P_nominal = P_nominal,
+    V_nominal = V_nominal)
+    "Selected cable";
+
+annotation (
+experiment(Tolerance=1e-6, StopTime=1.0),
+  __Dymola_Commands(
+file="modelica://Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_med.mos"
+"Simulate and plot"),
+Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Electrical.Transmission.Functions.selectCable_med\">
+Buildings.Electrical.Transmission.Functions.selectCable_med</a>
+for a different range of currents.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+August 25, 2020, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SelectCable_med;
diff --git a/Buildings/Electrical/Transmission/Functions/Validation/package.mo b/Buildings/Electrical/Transmission/Functions/Validation/package.mo
new file mode 100644
index 00000000000..83fb74314aa
--- /dev/null
+++ b/Buildings/Electrical/Transmission/Functions/Validation/package.mo
@@ -0,0 +1,18 @@
+within Buildings.Electrical.Transmission.Functions;
+package Validation
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Electrical.Transmission.Functions\">
+Buildings.Electrical.Transmission.Functions</a>.
+</p>
+<p>
+Note that most validation models contain simple input data which may not be realistic,
+but for which the correct output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these solutions.
+These model outputs are stored as reference data and used for continuous validation
+whenever models in the library change.
+</html>"));
+end Validation;
diff --git a/Buildings/Electrical/Transmission/Functions/Validation/package.order b/Buildings/Electrical/Transmission/Functions/Validation/package.order
new file mode 100644
index 00000000000..17fc38e4475
--- /dev/null
+++ b/Buildings/Electrical/Transmission/Functions/Validation/package.order
@@ -0,0 +1,2 @@
+SelectCable_low
+SelectCable_med
diff --git a/Buildings/Electrical/Transmission/Functions/package.order b/Buildings/Electrical/Transmission/Functions/package.order
index bb1f813e48c..d62457d0b85 100644
--- a/Buildings/Electrical/Transmission/Functions/package.order
+++ b/Buildings/Electrical/Transmission/Functions/package.order
@@ -4,3 +4,4 @@ computeGMR
 selectCable_low
 selectCable_med
 selectVoltageLevel
+Validation
diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo
index 19c5c1c3aaa..7724a3c292d 100644
--- a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo
+++ b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo
@@ -65,8 +65,7 @@ model ChillerSetPointControl
         extent={{-10,-10},{10,10}},
         origin={-170,30})));
   Buildings.Controls.Continuous.LimPID limPID(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    reverseAction=true,
+    reverseActing=false,
     y_start=1,
     yMin=0,
     k=10,
diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/TrimAndRespondContinuousTimeApproximation.mo b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/TrimAndRespondContinuousTimeApproximation.mo
index f02d05fcc42..ddc900145f4 100644
--- a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/TrimAndRespondContinuousTimeApproximation.mo
+++ b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/TrimAndRespondContinuousTimeApproximation.mo
@@ -6,8 +6,7 @@ block TrimAndRespondContinuousTimeApproximation "Trim and respond logic"
     Td=1,
     yMax=1,
     yMin=0,
-    reverseAction=true,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    reverseActing=false,
     Ti=120,
     k=0.1)     annotation (Placement(transformation(extent={{-20,40},{0,60}})));
   Modelica.Blocks.Sources.Constant const(k=0)
diff --git a/Buildings/Examples/DualFanDualDuct/ClosedLoop.mo b/Buildings/Examples/DualFanDualDuct/ClosedLoop.mo
index 6fb1a49b7dc..554d6660358 100644
--- a/Buildings/Examples/DualFanDualDuct/ClosedLoop.mo
+++ b/Buildings/Examples/DualFanDualDuct/ClosedLoop.mo
@@ -140,23 +140,8 @@ model ClosedLoop "Closed loop model of a dual-fan dual-duct system"
     annotation (Placement(transformation(extent={{-320,170},{-300,190}})));
   Buildings.Examples.DualFanDualDuct.Controls.HeatingCoilTemperatureSetpoint
     TSupSetHea(TOn=284.15, TOff=279.15)
-<<<<<<< HEAD
-    "Supply air temperature setpoint for heating"
-    annotation (Placement(transformation(extent={{-80,-180},{-60,-160}})));
-  Buildings.Controls.Continuous.LimPID cooCoiCon(
-    reverseAction=true,
-    Td=60,
-    initType=Modelica.Blocks.Types.InitPID.InitialState,
-    yMax=1,
-    yMin=0,
-    Ti=120,
-    controllerType=Modelica.Blocks.Types.SimpleController.P,
-    k=1) "Controller for cooling coil"
-    annotation (Placement(transformation(extent={{340,-200},{360,-180}})));
-=======
     "Set point for preheat coil outlet temperature "
     annotation (Placement(transformation(extent={{-200,-110},{-180,-90}})));
->>>>>>> master
   Buildings.Examples.VAVReheat.Controls.FanVFD conFanSupHot(
     initType=Modelica.Blocks.Types.Init.InitialState,
     y_start=yFan_start,
diff --git a/Buildings/Examples/DualFanDualDuct/Controls/Examples/package.mo b/Buildings/Examples/DualFanDualDuct/Controls/Examples/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo b/Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo
deleted file mode 100644
index 8ac09cb2807..00000000000
--- a/Buildings/Examples/DualFanDualDuct/Controls/FanVFD.mo
+++ /dev/null
@@ -1,101 +0,0 @@
-within Buildings.Examples.DualFanDualDuct.Controls;
-block FanVFD "Controller for fan revolution"
-  extends Modelica.Blocks.Interfaces.SISO;
-  import Buildings.Examples.VAVReheat.Controls.OperationModes;
-  Buildings.Controls.Continuous.LimPID con(
-    yMax=1,
-    yMin=0,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    Td=60,
-    Ti=10) "Controller"
-    annotation (Placement(transformation(extent={{-20,20},{0,40}})));
-  Modelica.Blocks.Math.Gain gaiMea(k=1/xSet_nominal)
-    "Gain to normalize measurement signal"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-  parameter Real xSet_nominal "Nominal setpoint (used for normalization)";
-  VAVReheat.Controls.ControlBus controlBus
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-  Modelica.Blocks.Routing.Extractor extractor(nin=6)
-    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
-  Modelica.Blocks.Sources.Constant off(k=r_N_min) "Off signal"
-    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
-  Modelica.Blocks.Sources.Constant on(k=1) "On signal"
-    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
-  Modelica.Blocks.Math.Gain gaiSet(k=1/xSet_nominal)
-    "Gain to normalize setpoint signal"
-    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
-  Modelica.Blocks.Interfaces.RealInput u_m
-    "Connector of measurement input signal" annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={0,-120})));
-  parameter Real r_N_min=0.01 "Minimum normalized fan speed";
-  Modelica.Blocks.Continuous.FirstOrder firstOrder(
-    initType=Modelica.Blocks.Types.Init.InitialState,
-    y_start=r_N_min,
-    T=60)
-    annotation (Placement(transformation(extent={{60,-40},{80,-20}})));
-equation
-  connect(gaiMea.y, con.u_m) annotation (Line(
-      points={{-39,6.10623e-16},{-10,6.10623e-16},{-10,18}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(con.y, extractor.u[OperationModes.occupied]) annotation (Line(
-      points={{1,30},{20,30},{20,-8},{-20,-8},{-20,-30},{18,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(con.y, extractor.u[OperationModes.unoccupiedWarmUp]) annotation (Line(
-      points={{1,30},{20,30},{20,-8},{-20,-8},{-20,-30},{18,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(con.y, extractor.u[OperationModes.unoccupiedPreCool]) annotation (Line(
-      points={{1,30},{20,30},{20,-8},{-20,-8},{-20,-30},{18,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(off.y, extractor.u[OperationModes.unoccupiedOff])  annotation (Line(
-      points={{-39,-70},{-20,-70},{-20,-30},{18,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(off.y, extractor.u[OperationModes.safety])  annotation (Line(
-      points={{-39,-70},{-20,-70},{-20,-30},{18,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(on.y, extractor.u[OperationModes.unoccupiedNightSetBack]) annotation (Line(
-      points={{-39,-30},{18,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(controlBus.controlMode, extractor.index) annotation (Line(
-      points={{-70,80},{-70,-52},{30,-52},{30,-42}},
-      color={255,204,51},
-      thickness=0.5,
-      smooth=Smooth.None), Text(
-      textString="%first",
-      index=-1,
-      extent={{-6,3},{-6,3}}));
-  connect(gaiSet.y, con.u_s) annotation (Line(
-      points={{-39,30},{-22,30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(u_m, gaiMea.u) annotation (Line(
-      points={{1.11022e-15,-120},{1.11022e-15,-92},{-80,-92},{-80,0},{-62,0},{
-          -62,6.66134e-16}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(gaiSet.u, u) annotation (Line(
-      points={{-62,30},{-90,30},{-90,1.11022e-15},{-120,1.11022e-15}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(extractor.y, firstOrder.u) annotation (Line(
-      points={{41,-30},{58,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(y, extractor.y) annotation (Line(
-      points={{110,5.55112e-16},{80,0},{50,0},{50,-30},{41,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  annotation ( Icon(graphics={Text(
-          extent={{-90,-50},{96,-96}},
-          lineColor={0,0,255},
-          textString="r_N_min=%r_N_min")}));
-end FanVFD;
diff --git a/Buildings/Examples/DualFanDualDuct/Controls/MixedAirTemperatureSetpoint.mo b/Buildings/Examples/DualFanDualDuct/Controls/MixedAirTemperatureSetpoint.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo b/Buildings/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo
index 4d2e7d048f5..bf0a8a25de6 100644
--- a/Buildings/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo
+++ b/Buildings/Examples/DualFanDualDuct/Controls/PreHeatCoil.mo
@@ -9,7 +9,6 @@ model PreHeatCoil "Controller for preheat coil"
     initType=Modelica.Blocks.Types.InitPID.InitialState,
     Ti=120,
     strict=true,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=0.1) "Controller for pre-heating coil"
     annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
   Modelica.Blocks.Sources.Constant zero(k=0) "Zero output signal"
diff --git a/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo b/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo
index 45c7ca6dafa..f42d11b7035 100644
--- a/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo
+++ b/Buildings/Examples/DualFanDualDuct/Controls/RoomMixingBox.mo
@@ -1,26 +1,25 @@
 within Buildings.Examples.DualFanDualDuct.Controls;
 block RoomMixingBox "Controller for room mixing box"
   extends Modelica.Blocks.Icons.Block;
+
   parameter Modelica.SIunits.MassFlowRate m_flow_min "Minimum mass flow rate";
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conHea(
+  Buildings.Controls.OBC.CDL.Continuous.PID conHea(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMax=1,
     Td=60,
-    yMin=0,
     k=0.1,
     Ti=120) "Controller for heating"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conCoo(
+  Buildings.Controls.OBC.CDL.Continuous.PID conCoo(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMax=1,
-    reverseAction=true,
+    reverseActing=false,
     Td=60,
     k=0.1,
-    Ti=120,
-    yMin=0) "Controller for cooling (acts on damper)"
+    Ti=120) "Controller for cooling (acts on damper)"
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Modelica.Blocks.Interfaces.RealInput TRoo(final quantity="ThermodynamicTemperature",
-                                          final unit = "K", displayUnit = "degC", min=0)
+  Modelica.Blocks.Interfaces.RealInput TRoo(
+    final quantity="ThermodynamicTemperature",
+    final unit = "K",
+    displayUnit = "degC", min=0)
     "Measured room temperature"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
   Modelica.Blocks.Interfaces.RealOutput yHot "Signal for hot air damper"
@@ -31,13 +30,12 @@ block RoomMixingBox "Controller for room mixing box"
     "Measured air mass flow rate into the room"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
         iconTransformation(extent={{-140,-60},{-100,-20}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conFloRat(
+  Buildings.Controls.OBC.CDL.Continuous.PID conFloRat(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMax=1,
     Td=60,
-    yMin=0,
     k=0.1,
-    Ti=120) "Controller for mass flow rate"
+    Ti=120,
+    r=m_flow_min)   "Controller for mass flow rate"
     annotation (Placement(transformation(extent={{-42,30},{-22,50}})));
   Modelica.Blocks.Sources.Constant mAirSet(k=m_flow_min)
     "Set point for minimum air flow rate"
@@ -200,5 +198,14 @@ equation
 This controller outputs the control signal for the air damper for the hot deck and the cold deck.
 The control signal for the hot deck is the larger of the two signals needed to track the room heating
 temperature setpoint, and the minimum air flow rate.
+</html>", revisions="<html>
+<ul>
+<li>
+October 15, 2020, by Michael Wetter:<br/>
+Moved normalization of control error to PID controller.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\">#2182</a>.
+</li>
+</ul>
 </html>"));
 end RoomMixingBox;
diff --git a/Buildings/Examples/DualFanDualDuct/Controls/package.mo b/Buildings/Examples/DualFanDualDuct/Controls/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/DualFanDualDuct/package.mo b/Buildings/Examples/DualFanDualDuct/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo b/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo
index 192730d7537..5e1dc0e19bb 100644
--- a/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo
+++ b/Buildings/Examples/HydronicHeating/TwoRoomsWithStorage.mo
@@ -167,7 +167,6 @@ model TwoRoomsWithStorage
     yMax=1,
     Td=60,
     yMin=0.05,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     eOn=0.5,
     k=0.5,
     Ti=15) "Controller for pump"
@@ -245,8 +244,7 @@ model TwoRoomsWithStorage
     xi_start=1,
     Td=60,
     k=0.1,
-    Ti=120,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI)
+    Ti=120)
     "Controller for pump"
     annotation (Placement(transformation(extent={{140,-50},{160,-30}})));
   Buildings.Fluid.Storage.Stratified tan(
diff --git a/Buildings/Examples/HydronicHeating/package.mo b/Buildings/Examples/HydronicHeating/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo
index de81f016ebb..69ea85d7039 100644
--- a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo
+++ b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/BaseClasses/VAVBranch.mo
@@ -47,7 +47,7 @@ model VAVBranch "Supply branch of a VAV system"
     "Fluid connector b (positive design flow direction is from port_a1 to port_b1)"
     annotation (Placement(transformation(extent={{40,190},{60,210}}),
         iconTransformation(extent={{40,190},{60,210}})));
-  Modelica.Blocks.Interfaces.RealOutput yDam "Signal for VAV damper"
+  Modelica.Blocks.Interfaces.RealOutput yDam "Actual VAV damper position"
     annotation (Placement(transformation(extent={{200,-10},{220,10}})));
 
   Fluid.Actuators.Dampers.PressureIndependent vav(
@@ -79,7 +79,8 @@ model VAVBranch "Supply branch of a VAV system"
     nPorts=1) "Sink for terminal box "
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=180,
       origin={132,24})));
-  Buildings.Examples.VAVReheat.Controls.RoomVAV con "Room temperature controller"
+  Buildings.Examples.VAVReheat.Controls.RoomVAV con
+    "Room temperature controller"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
   Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
     redeclare package Medium =  MediumA) "Sensor for mass flow rate"
@@ -96,7 +97,7 @@ model VAVBranch "Supply branch of a VAV system"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},
         rotation=90,  origin={50,74})));
   Modelica.Blocks.Math.Gain ACH(k=1/VRoo/1.2*3600) "Air change per hour"
-    annotation (Placement(transformation(extent={{100,94},{120,114}})));
+    annotation (Placement(transformation(extent={{100,80},{120,100}})));
   Buildings.Fluid.Actuators.Valves.TwoWayLinear valHea(
     redeclare package Medium = MediumW,
     m_flow_nominal=m_flow_nominal*1000*15/4200/10,
@@ -116,9 +117,6 @@ equation
    connect(fraMasFlo.u, senMasFlo.m_flow)
       annotation (Line(points={{100,144},{80,144},{80,134},{61,134}},
         color={0,0,127}, smooth=Smooth.None, pattern=LinePattern.Dash));
-   connect(TSup.T,con.TDis)
-      annotation (Line(points={{39,74},{-20,74},{-20,-8},{-2,-8}},
-        color={0,0,127}));
    connect(con.yDam, vav.y)
       annotation (Line(points={{21,4.8},{32,4.8},{32,104},{38,104}},
         color={0,0,127}, smooth=Smooth.None,  pattern=LinePattern.Dash));
@@ -131,11 +129,8 @@ equation
    connect(vav.port_b, senMasFlo.port_a)
       annotation (Line(points={{50,114},{50,124}},
         color={0,127,255}, smooth=Smooth.None, thickness=0.5));
-   connect(con.yDam, yDam)
-      annotation (Line(points={{21,4.8},{188,4.8},{188,5.55112e-16},{210,5.55112e-16}},
-        color={0,0,127}, smooth=Smooth.None, pattern=LinePattern.Dash));
    connect(ACH.u, senMasFlo.m_flow)
-      annotation (Line(points={{98,104},{80,104},{80,134},{61,134}},
+      annotation (Line(points={{98,90},{80,90},{80,134},{61,134}},
         color={0,0,127}, smooth=Smooth.None, pattern=LinePattern.Dash));
    connect(con.yVal, valHea.y)
       annotation (Line(points={{21,-5},{92,-5},{92,12}},
@@ -156,13 +151,17 @@ equation
       annotation (Line(points={{50,144},{50,200}},
         color={0,127,255}, smooth=Smooth.None, thickness=0.5));
    connect(con.TRoo, TRoo)
-      annotation (Line(points={{-2,-4},{-60,-4},{-60,-40},{-120,-40}},
+      annotation (Line(points={{-1,-7},{-60,-7},{-60,-40},{-120,-40}},
         color={0,0,127}));
 
-  connect(con.TRooHeaSet, TRooHeaSet) annotation (Line(points={{-2,8},{-40,8},{
-          -40,80},{-120,80}}, color={0,0,127}));
-  connect(TRooCooSet, con.TRooCooSet) annotation (Line(points={{-120,40},{-44,
-          40},{-44,4},{-2,4}}, color={0,0,127}));
+  connect(con.TRooHeaSet, TRooHeaSet) annotation (Line(points={{-2,7},{-40,7},{-40,
+          80},{-120,80}},     color={0,0,127}));
+  connect(TRooCooSet, con.TRooCooSet) annotation (Line(points={{-120,40},{-44,40},
+          {-44,0},{-2,0}},     color={0,0,127}));
+  connect(vav.y_actual, yDam) annotation (Line(
+      points={{43,109},{43,120},{180,120},{180,0},{210,0}},
+      color={0,0,127},
+      pattern=LinePattern.Dash));
 annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
             -100},{200,200}})), Icon(coordinateSystem(
           preserveAspectRatio=true, extent={{-100,-100},{200,200}}), graphics={
@@ -256,23 +255,11 @@ annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
           textString="TRooAir")}),
      Documentation(info="<html>
 <p>
-<<<<<<< HEAD
-Model for a VAV branch.
-</p>
-<p>
-The model has been developed based on
-<a href=\"modelica://Buildings.Examples.VAVReheat.ThermalZones.VAVBranch\">
-Buildings.Examples.VAVReheat.ThermalZones.VAVBranch</a>, but using different VAV
-box model
-<a href=\"modelica://Buildings.Fluid.Actuators.Dampers.PressureIndependent\">
-Buildings.Fluid.Actuators.Dampers.PressureIndependent</a>.
-=======
 Model for a VAV supply branch.
 The terminal VAV box has a pressure independent damper and a water reheat coil.
 The pressure independent damper model includes an idealized flow rate controller
 and requires a discharge air flow rate set-point (normalized to the nominal value)
 as a control signal.
->>>>>>> master
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo
index 0a3260abd42..eb7b0e77542 100644
--- a/Buildings/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo
+++ b/Buildings/Examples/ScalableBenchmarks/BuildingVAV/Examples/OneFloor_OneZone.mo
@@ -176,38 +176,6 @@ model OneFloor_OneZone "Closed-loop model with 1 zone in 1 floor"
     redeclare each package Medium = MediumA,
     each m_flow_nominal=m_flow_nominal) "Supply air temperature sensor"
     annotation (Placement(transformation(extent={{4,-38},{20,-22}})));
-<<<<<<< HEAD
-  Modelica.Blocks.Sources.Constant TSupSetHea(
-    y(final quantity="ThermodynamicTemperature",
-      final unit="K",
-      displayUnit="degC",
-      min=0),
-    k=273.15 + 10) "Supply air temperature setpoint for heating"
-    annotation (Placement(transformation(extent={{-270,-66},{-258,-54}})));
-  Buildings.Examples.VAVReheat.Controls.CoolingCoilTemperatureSetpoint TSetCoo[nFlo]
-    "Setpoint for cooling coil"
-    annotation (Placement(transformation(extent={{-238,-94},{-226,-82}})));
-  Buildings.Controls.Continuous.LimPID cooCoiCon[nFlo](
-    each reverseAction=true,
-    each Td=60,
-    each initType=Modelica.Blocks.Types.InitPID.InitialState,
-    each yMax=1,
-    each yMin=0,
-    each controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    each Ti=600,
-    each k=0.1) "Controller for cooling coil"
-    annotation (Placement(transformation(extent={{-192,-94},{-180,-82}})));
-  Buildings.Controls.Continuous.LimPID heaCoiCon[nFlo](
-    each yMax=1,
-    each yMin=0,
-    each Td=60,
-    each initType=Modelica.Blocks.Types.InitPID.InitialState,
-    each controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    each Ti=600,
-    each k=0.1)   "Controller for heating coil"
-    annotation (Placement(transformation(extent={{-192,-66},{-180,-54}})));
-=======
->>>>>>> master
   Buildings.Examples.VAVReheat.Controls.ModeSelector modeSelector[nFlo]
     "Finite State Machine for the operational modes"
     annotation (Placement(transformation(extent={{-180,40},{-164,56}})));
diff --git a/Buildings/Examples/Tutorial/Boiler/System3.mo b/Buildings/Examples/Tutorial/Boiler/System3.mo
index d0d0f9c019d..0da4a497f98 100644
--- a/Buildings/Examples/Tutorial/Boiler/System3.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System3.mo
@@ -438,7 +438,7 @@ condensation in the boiler:
 <pre>
   parameter Modelica.SIunits.Temperature TBoiSup_nominal = 273.15+80
     \"Boiler nominal supply water temperature\";
-  parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+50
+  parameter Modelica.SIunits.Temperature TBoiRet_min = 273.15+60
     \"Boiler minimum return water temperature\";
   parameter Modelica.SIunits.MassFlowRate mBoi_flow_nominal=
     Q_flow_nominal/4200/(TBoiSup_nominal-TBoiRet_min)
diff --git a/Buildings/Examples/Tutorial/Boiler/System5.mo b/Buildings/Examples/Tutorial/Boiler/System5.mo
index 26d1b27abf0..89203f14867 100644
--- a/Buildings/Examples/Tutorial/Boiler/System5.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System5.mo
@@ -254,26 +254,21 @@ model System5
  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetBoiRet(k=TBoiRet_min)
     "Temperature setpoint for boiler return"
     annotation (Placement(transformation(extent={{120,-270},{140,-250}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDBoi(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDBoi(
     Td=1,
     Ti=120,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=0.1,
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "Controller for valve in boiler loop"
+    reverseActing=false) "Controller for valve in boiler loop"
     annotation (Placement(transformation(extent={{160,-270},{180,-250}})));
 //--------------------------------------------------------------------------------//
 
 //----------------------Step 3: Radiator loop valve control-----------------------//
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDRad(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDRad(
     Td=1,
     Ti=120,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    k=0.1,
-    yMax=1,
-    yMin=0)
-           "Controller for valve in radiator loop"
+    k=0.1) "Controller for valve in radiator loop"
     annotation (Placement(transformation(extent={{-180,-20},{-160,0}})));
 //--------------------------------------------------------------------------------//
   Buildings.Controls.OBC.CDL.Continuous.Line TSetSup
@@ -534,19 +529,17 @@ This is implemented using the constant block
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Sources.Constant\">
 Buildings.Controls.OBC.CDL.Continuous.Sources.Constant</a> for the set point,
 the PID controller with output limitation
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>.
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.PID\">
+Buildings.Controls.OBC.CDL.Continuous.PID</a>.
 We configured the controller as
 </p>
 <pre>
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDBoi(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDBoi(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P,
     k=0.1,
     Ti=120,
     Td=1,
-    yMax=1,
-    yMin=0,
-    reverseAction=true) \"Controller for valve in boiler loop\";
+    reverseActing=false) \"Controller for valve in boiler loop\";
 </pre>
 <p>
 We set the proportional band to <i>10</i> Kelvin, hence <code>k=0.1</code>.
@@ -559,9 +552,9 @@ proportional gain, and finally changing it to a PI-controller and tuning the
 integral time constant.
 </p>
 <p>
-Note that we also set <code>reverseAction=true</code> because
-if the control error, e.g., the difference between set point and measured
-temperature, is positive, the valve needs to close (<i>y=0</i>)
+Note that we also set <code>reverseActing=false</code> because
+if, for a constant set point, the measured
+temperature increases, the valve control signal needs to decrease towards <i>y=0</i>,
 because in this condition, the boiler inlet temperature is not yet high enough.
 Once it is high enough, the control error will be negative and the valve
 can open.
@@ -616,7 +609,7 @@ This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/673\"
 <li>
 July 2, 2015, by Michael Wetter:<br/>
 Changed control input for <code>conPIDBoi</code> and set
-<code>reverseAction=true</code>
+<code>reverseActing=false</code>
 to address issue
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/436\">#436</a>.
 </li>
diff --git a/Buildings/Examples/Tutorial/Boiler/System6.mo b/Buildings/Examples/Tutorial/Boiler/System6.mo
index 10f034f6549..5b2859af4b6 100644
--- a/Buildings/Examples/Tutorial/Boiler/System6.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System6.mo
@@ -244,25 +244,20 @@ model System6
     "Temperature setpoint for boiler return"
     annotation (Placement(transformation(extent={{120,-270},{140,-250}})));
 
- Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDBoi(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDBoi(
     Td=1,
     Ti=120,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=0.1,
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "Controller for valve in boiler loop"
+    reverseActing=false) "Controller for valve in boiler loop"
     annotation (Placement(transformation(extent={{160,-270},{180,-250}})));
 //--------------------------------------------------------------------------------//
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDRad(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDRad(
     Td=1,
     Ti=120,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    k=0.1,
-    yMax=1,
-    yMin=0)
-           "Controller for valve in radiator loop"
+    k=0.1) "Controller for valve in radiator loop"
     annotation (Placement(transformation(extent={{-180,-20},{-160,0}})));
 //------------------------------------------------------------------------------//
   Buildings.Controls.OBC.CDL.Continuous.Line TSetSup
@@ -602,7 +597,7 @@ This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/673\"
 <li>
 July 2, 2015, by Michael Wetter:<br/>
 Changed control input for <code>conPIDBoi</code> and set
-<code>reverseAction=true</code>
+<code>reverseActing=false</code>
 to address issue
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/436\">#436</a>.
 </li>
diff --git a/Buildings/Examples/Tutorial/Boiler/System7.mo b/Buildings/Examples/Tutorial/Boiler/System7.mo
index 3a1a412a2da..c3e922602b0 100644
--- a/Buildings/Examples/Tutorial/Boiler/System7.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System7.mo
@@ -213,22 +213,18 @@ model System7
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetBoiRet(k=TBoiRet_min)
     "Temperature setpoint for boiler return"
     annotation (Placement(transformation(extent={{120,-270},{140,-250}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDBoi(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDBoi(
     Td=1,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=0.1,
     Ti=120,
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "Controller for valve in boiler loop"
+    reverseActing=false) "Controller for valve in boiler loop"
     annotation (Placement(transformation(extent={{160,-270},{180,-250}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDRad(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDRad(
     Td=1,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     k=0.1,
-    Ti=120,
-    yMax=1,
-    yMin=0) "Controller for valve in radiator loop"
+    Ti=120) "Controller for valve in radiator loop"
     annotation (Placement(transformation(extent={{-180,-20},{-160,0}})));
   Buildings.Controls.OBC.CDL.Continuous.Line TSetSup
     "Setpoint for supply water temperature"
@@ -272,8 +268,8 @@ model System7
     annotation (Placement(transformation(extent={{-228,-200},{-208,-180}})));
   Modelica.StateGraph.TransitionWithSignal T2 "Transition to boiler on"
     annotation (Placement(transformation(extent={{-258,-200},{-238,-180}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThrBoi(threshold=273.15 + 90)
-    "Threshold for boiler control"
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThrBoi(t=273.15 +
+        90) "Threshold for boiler control"
     annotation (Placement(transformation(extent={{-420,-320},{-400,-300}})));
   Modelica.StateGraph.TransitionWithSignal T3(
     waitTime=10, enableTimer=true) "Transition to switch boiler off"
@@ -284,20 +280,22 @@ model System7
   Modelica.StateGraph.Step pumpsOn(nIn=1, nOut=1) "Pumps are on"
     annotation (Placement(transformation(extent={{-320,-180},{-300,-160}})));
 //--------------------------------------------------------------------------------------//
-  Buildings.Controls.OBC.CDL.Continuous.LessThreshold lessThreshold(threshold=273.15 + 19)
+  Buildings.Controls.OBC.CDL.Continuous.LessThreshold lessThreshold(t=273.15 +
+        19)
     annotation (Placement(transformation(extent={{-420,-210},{-400,-190}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessThreshold lessThreshold1(threshold=273.15 + 16)
+  Buildings.Controls.OBC.CDL.Continuous.LessThreshold lessThreshold1(t=273.15
+         + 16)
     annotation (Placement(transformation(extent={{-420,-240},{-400,-220}})));
   Buildings.Controls.OBC.CDL.Logical.And and3
     annotation (Placement(transformation(extent={{-380,-232},{-360,-212}})));
-  Buildings.Controls.OBC.CDL.Continuous.LessThreshold lessThreshold2(threshold=273.15 + 70)
-    "Threshold for boiler control"
+  Buildings.Controls.OBC.CDL.Continuous.LessThreshold lessThreshold2(t=273.15
+         + 70) "Threshold for boiler control"
     annotation (Placement(transformation(extent={{-420,-290},{-400,-270}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThrTRoo(threshold=273.15 + 21)
-    "Threshold for room temperature"
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThrTRoo(t=273.15 +
+        21) "Threshold for room temperature"
     annotation (Placement(transformation(extent={{-420,-130},{-400,-110}})));
-  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThrTROut(threshold=273.15 + 17)
-    "Threshold for room temperature"
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThrTROut(t=273.15
+         + 17) "Threshold for room temperature"
     annotation (Placement(transformation(extent={{-420,-160},{-400,-140}})));
   Buildings.Controls.OBC.CDL.Logical.And and1
     annotation (Placement(transformation(extent={{-380,-152},{-360,-132}})));
@@ -677,7 +675,7 @@ This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/504\"
 <li>
 July 2, 2015, by Michael Wetter:<br/>
 Changed control input for <code>conPIDBoi</code> and set
-<code>reverseAction=true</code>
+<code>reverseActing=false</code>
 to address issue
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/436\">#436</a>.
 </li>
diff --git a/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo b/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo
index 4b26dd5908b..587f78591c9 100644
--- a/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo
+++ b/Buildings/Examples/Tutorial/CDL/Controls/BoilerReturn.mo
@@ -19,13 +19,10 @@ block BoilerReturn "Control for boiler return"
     final k=TSet)
     "Set point temperature"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
- Buildings.Controls.OBC.CDL.Continuous.LimPID conPID(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     final k=k,
     final Ti=Ti,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMax=1,
-    yMin=0,
-    reverseAction=true) "Controller for valve in boiler loop"
+    reverseActing=false) "Controller for valve in boiler loop"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 equation
   connect(conPID.y, yVal)
diff --git a/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo b/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo
index dbc98a5580c..934f1ab8963 100644
--- a/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo
+++ b/Buildings/Examples/Tutorial/CDL/Controls/RadiatorSupply.mo
@@ -33,7 +33,7 @@ block RadiatorSupply "Controller for mixing valve in radiator loop"
     final unit="1")
     "Valve control signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPIDRad(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPIDRad(
     final k=k,
     final Ti=Ti,
     final yMax=1,
diff --git a/Buildings/Examples/Tutorial/CDL/System3.mo b/Buildings/Examples/Tutorial/CDL/System3.mo
index f1bb6f6f9c4..f87e068f6fb 100644
--- a/Buildings/Examples/Tutorial/CDL/System3.mo
+++ b/Buildings/Examples/Tutorial/CDL/System3.mo
@@ -84,8 +84,8 @@ In this new block, we used a constant output signal
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Sources.Constant\">
 Buildings.Controls.OBC.CDL.Continuous.Sources.Constant</a>
 and a PID controller
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>,
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.PID\">
+Buildings.Controls.OBC.CDL.Continuous.PID</a>,
 which we configured as a PI-controller.
 </p>
 <p>
diff --git a/Buildings/Examples/Tutorial/CDL/System6.mo b/Buildings/Examples/Tutorial/CDL/System6.mo
index 8e4612a6025..0c76a451e15 100644
--- a/Buildings/Examples/Tutorial/CDL/System6.mo
+++ b/Buildings/Examples/Tutorial/CDL/System6.mo
@@ -85,8 +85,8 @@ In this new block, we used
 <a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Line\">
 Buildings.Controls.OBC.CDL.Continuous.Line</a> to compute the set point for the supply water temperature
 based on the room air temperature. This set point is then used in a PI controller
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a> to modulate the mixing valve position
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.PID\">
+Buildings.Controls.OBC.CDL.Continuous.PID</a> to modulate the mixing valve position
 in order to track the supply water temperature set point.
 </p>
 </li>
diff --git a/Buildings/Examples/Tutorial/SpaceCooling/System3.mo b/Buildings/Examples/Tutorial/SpaceCooling/System3.mo
index 95541321742..11e7c64a0fd 100644
--- a/Buildings/Examples/Tutorial/SpaceCooling/System3.mo
+++ b/Buildings/Examples/Tutorial/SpaceCooling/System3.mo
@@ -348,8 +348,8 @@ When simulating the model, the response shown below should be seen.
 <h4>Notes</h4>
 <p>
 To add a continuous controller for the coil water flow rate, we could have used the model
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>.
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.PID\">
+Buildings.Controls.OBC.CDL.Continuous.PID</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Examples/VAVCO2/BaseClasses/DamperControl.mo b/Buildings/Examples/VAVCO2/BaseClasses/DamperControl.mo
index f8df6a3eaa6..188284a7aee 100644
--- a/Buildings/Examples/VAVCO2/BaseClasses/DamperControl.mo
+++ b/Buildings/Examples/VAVCO2/BaseClasses/DamperControl.mo
@@ -11,7 +11,7 @@ block DamperControl "Local loop controller for damper"
     controllerType=Modelica.Blocks.Types.SimpleController.P,
     k=Kp,
     yMax=1,
-    reverseAction=true,
+    reverseActing=false,
     Td=60)
     annotation (Placement(transformation(extent={{20,-10},{40,10}})));
 
diff --git a/Buildings/Examples/VAVCO2/BaseClasses/Occupancy.mo b/Buildings/Examples/VAVCO2/BaseClasses/Occupancy.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/VAVCO2/BaseClasses/RoomVAV.mo b/Buildings/Examples/VAVCO2/BaseClasses/RoomVAV.mo
index f69dd538336..fe1f17b568b 100644
--- a/Buildings/Examples/VAVCO2/BaseClasses/RoomVAV.mo
+++ b/Buildings/Examples/VAVCO2/BaseClasses/RoomVAV.mo
@@ -32,7 +32,8 @@ model RoomVAV "Model for CO2 emitted by people"
     annotation (Placement(
         transformation(extent={{-10,0},{10,20}})));
   Buildings.Fluid.Sensors.TraceSubstances senCO2(
-    redeclare package Medium = Medium) "Sensor at volume"
+    redeclare package Medium = Medium, warnAboutOnePortConnection=false)
+                                       "Sensor at volume"
     annotation (Placement(transformation(extent={{16,20}, {36,40}})));
   Buildings.Fluid.MixingVolumes.MixingVolume ple(
     redeclare package Medium = Medium,
diff --git a/Buildings/Examples/VAVReheat/ASHRAE2006.mo b/Buildings/Examples/VAVReheat/ASHRAE2006.mo
index bece2576443..33723249b9d 100644
--- a/Buildings/Examples/VAVReheat/ASHRAE2006.mo
+++ b/Buildings/Examples/VAVReheat/ASHRAE2006.mo
@@ -8,14 +8,6 @@ model ASHRAE2006
       final sampleModel=sampleModel),
     amb(nPorts=3));
 
-<<<<<<< HEAD
-  Modelica.Blocks.Sources.Constant TSupSetHea(y(
-      final quantity="ThermodynamicTemperature",
-      final unit="K",
-      displayUnit="degC",
-      min=0), k=273.15 + 10) "Supply air temperature setpoint for heating"
-    annotation (Placement(transformation(extent={{-180,-172},{-160,-152}})));
-=======
   parameter Real ratVMinCor_flow(final unit="1")=
     max(1.5*VCorOA_flow_nominal, 0.15*mCor_flow_nominal/1.2) /
     (mCor_flow_nominal/1.2)
@@ -37,7 +29,6 @@ model ASHRAE2006
     (mWes_flow_nominal/1.2)
     "Minimum discharge air flow rate ratio";
 
->>>>>>> master
   Controls.FanVFD conFanSup(xSet_nominal(displayUnit="Pa") = 410, r_N_min=
         yFanMin)
     "Controller for fan"
@@ -48,17 +39,10 @@ model ASHRAE2006
     annotation (Placement(transformation(extent={{-250,-352},{-230,-332}})));
 
   Controls.Economizer conEco(
-<<<<<<< HEAD
-    dT=1,
-    VOut_flow_min=0.3*m_flow_nominal/1.2,
-    Ti=600,
-    k=0.1) "Controller for economizer"
-=======
     have_reset=true,
     have_frePro=true,
     VOut_flow_min=Vot_flow_nominal)
            "Controller for economizer"
->>>>>>> master
     annotation (Placement(transformation(extent={{-80,140},{-60,160}})));
   Controls.RoomTemperatureSetpoint TSetRoo(
     final THeaOn=THeaOn,
@@ -68,52 +52,8 @@ model ASHRAE2006
     annotation (Placement(transformation(extent={{-300,-358},{-280,-338}})));
   Controls.DuctStaticPressureSetpoint pSetDuc(
     nin=5,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     pMin=50) "Duct static pressure setpoint"
     annotation (Placement(transformation(extent={{160,-16},{180,4}})));
-<<<<<<< HEAD
-  Controls.CoolingCoilTemperatureSetpoint TSetCoo "Setpoint for cooling coil"
-    annotation (Placement(transformation(extent={{-130,-212},{-110,-192}})));
-  Controls.RoomVAV conVAVCor "Controller for terminal unit corridor"
-    annotation (Placement(transformation(extent={{530,32},{550,52}})));
-  Controls.RoomVAV conVAVSou "Controller for terminal unit south"
-    annotation (Placement(transformation(extent={{700,30},{720,50}})));
-  Controls.RoomVAV conVAVEas "Controller for terminal unit east"
-    annotation (Placement(transformation(extent={{880,30},{900,50}})));
-  Controls.RoomVAV conVAVNor "Controller for terminal unit north"
-    annotation (Placement(transformation(extent={{1040,30},{1060,50}})));
-  Controls.RoomVAV conVAVWes "Controller for terminal unit west"
-    annotation (Placement(transformation(extent={{1240,28},{1260,48}})));
-  Buildings.Controls.Continuous.LimPID heaCoiCon(
-    yMax=1,
-    yMin=0,
-    Td=60,
-    initType=Modelica.Blocks.Types.InitPID.InitialState,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    k=0.02,
-    Ti=300)
-           "Controller for heating coil"
-    annotation (Placement(transformation(extent={{-80,-212},{-60,-192}})));
-  Buildings.Controls.Continuous.LimPID cooCoiCon(
-    reverseAction=true,
-    Td=60,
-    initType=Modelica.Blocks.Types.InitPID.InitialState,
-    yMax=1,
-    yMin=0,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    Ti=600,
-    k=0.1) "Controller for cooling coil"
-    annotation (Placement(transformation(extent={{-80,-250},{-60,-230}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swiHeaCoi
-    "Switch to switch off heating coil"
-    annotation (Placement(transformation(extent={{60,-220},{80,-200}})));
-  Buildings.Controls.OBC.CDL.Logical.Switch swiCooCoi
-    "Switch to switch off cooling coil"
-    annotation (Placement(transformation(extent={{60,-258},{80,-238}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant coiOff(k=0)
-    "Signal to switch water flow through coils off"
-    annotation (Placement(transformation(extent={{-60,-172},{-40,-152}})));
-=======
   Controls.RoomVAV conVAVCor(ratVFloMin=ratVMinCor_flow, ratVFloHea=ratVFloHea)
     "Controller for terminal unit corridor"
     annotation (Placement(transformation(extent={{456,-124},{476,-104}})));
@@ -129,7 +69,6 @@ model ASHRAE2006
   Controls.RoomVAV conVAVWes(ratVFloMin=ratVMinWes_flow, ratVFloHea=ratVFloHea)
                              "Controller for terminal unit west"
     annotation (Placement(transformation(extent={{1186,-124},{1206,-104}})));
->>>>>>> master
 
   Buildings.Controls.OBC.CDL.Logical.Or or2
     annotation (Placement(transformation(extent={{-10,-250},{10,-230}})));
@@ -194,100 +133,12 @@ equation
       smooth=Smooth.None,
       pattern=LinePattern.Dash));
   connect(conEco.VOut_flow, VOut1.V_flow) annotation (Line(
-<<<<<<< HEAD
-      points={{-81.3333,149.333},{-90,149.333},{-90,80},{-61,80},{-61,-20.9}},
-      color={0,0,127},
-      smooth=Smooth.None,
-      pattern=LinePattern.Dash));
-  connect(conEco.yOA, eco.yOut) annotation (Line(
-      points={{-59.3333,152},{-10,152},{-10,-34}},
-=======
       points={{-81.3333,142.667},{-90,142.667},{-90,80},{-80,80},{-80,-29}},
->>>>>>> master
       color={0,0,127},
       smooth=Smooth.None,
       pattern=LinePattern.Dash));
 
   connect(conVAVCor.TRoo, TRooAir.y5[1]) annotation (Line(
-<<<<<<< HEAD
-      points={{528,38},{520,38},{520,162},{511,162}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(conVAVSou.TRoo, TRooAir.y1[1]) annotation (Line(
-      points={{698,36},{690,36},{690,36},{680,36},{680,178},{511,178}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(TRooAir.y2[1], conVAVEas.TRoo) annotation (Line(
-      points={{511,174},{868,174},{868,36},{878,36}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(TRooAir.y3[1], conVAVNor.TRoo) annotation (Line(
-      points={{511,170},{1028,170},{1028,36},{1038,36}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(TRooAir.y4[1], conVAVWes.TRoo) annotation (Line(
-      points={{511,166},{1220,166},{1220,34},{1238,34}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(conVAVCor.yDam, pSetDuc.u[1]) annotation (Line(points={{551,46.8},{
-          556,46.8},{556,72},{120,72},{120,-7.6},{158,-7.6}}, color={0,0,127}));
-  connect(conVAVSou.yDam, pSetDuc.u[2]) annotation (Line(points={{721,44.8},{
-          730,44.8},{730,72},{120,72},{120,-6.8},{158,-6.8}}, color={0,0,127}));
-  connect(pSetDuc.u[3], conVAVEas.yDam) annotation (Line(points={{158,-6},{120,
-          -6},{120,72},{910,72},{910,44.8},{901,44.8}}, color={0,0,127}));
-  connect(conVAVNor.yDam, pSetDuc.u[4]) annotation (Line(points={{1061,44.8},{
-          1072,44.8},{1072,72},{122,72},{122,-6},{160,-6},{160,-5.2},{158,-5.2}},
-        color={0,0,127}));
-  connect(conVAVCor.TDis, TSupCor.T) annotation (Line(points={{528,34},{522,34},
-          {522,34},{514,34},{514,92},{569,92}}, color={0,0,127}));
-  connect(TSupSou.T, conVAVSou.TDis) annotation (Line(points={{749,92},{688,92},
-          {688,32},{698,32}}, color={0,0,127}));
-  connect(TSupEas.T, conVAVEas.TDis) annotation (Line(points={{929,90},{872,90},
-          {872,32},{878,32}}, color={0,0,127}));
-  connect(TSupNor.T, conVAVNor.TDis) annotation (Line(points={{1089,94},{1032,
-          94},{1032,32},{1038,32}}, color={0,0,127}));
-  connect(TSupWes.T, conVAVWes.TDis) annotation (Line(points={{1289,90},{1228,
-          90},{1228,30},{1238,30}}, color={0,0,127}));
-  connect(conVAVWes.yDam, pSetDuc.u[5]) annotation (Line(points={{1261,42.8},{
-          1270,42.8},{1270,72},{120,72},{120,-4},{134,-4},{134,-4.4},{158,-4.4}},
-        color={0,0,127}));
-  connect(cor.yVAV, conVAVCor.yDam) annotation (Line(points={{566,50},{556,50},
-          {556,46.8},{551,46.8}},color={0,0,127}));
-  connect(cor.yVal, conVAVCor.yVal) annotation (Line(points={{566,34},{560,34},
-          {560,37},{551,37}},color={0,0,127}));
-  connect(conVAVSou.yDam, sou.yVAV) annotation (Line(points={{721,44.8},{730,
-          44.8},{730,48},{746,48}}, color={0,0,127}));
-  connect(conVAVSou.yVal, sou.yVal) annotation (Line(points={{721,35},{732.5,35},
-          {732.5,32},{746,32}}, color={0,0,127}));
-  connect(conVAVEas.yVal, eas.yVal) annotation (Line(points={{901,35},{912.5,35},
-          {912.5,32},{926,32}}, color={0,0,127}));
-  connect(conVAVEas.yDam, eas.yVAV) annotation (Line(points={{901,44.8},{910,
-          44.8},{910,48},{926,48}}, color={0,0,127}));
-  connect(conVAVNor.yDam, nor.yVAV) annotation (Line(points={{1061,44.8},{
-          1072.5,44.8},{1072.5,48},{1086,48}}, color={0,0,127}));
-  connect(conVAVNor.yVal, nor.yVal) annotation (Line(points={{1061,35},{1072.5,
-          35},{1072.5,32},{1086,32}}, color={0,0,127}));
-  connect(conVAVCor.TRooHeaSet, controlBus.TRooSetHea) annotation (Line(points=
-          {{528,50},{480,50},{480,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVCor.TRooCooSet, controlBus.TRooSetCoo) annotation (Line(points=
-          {{528,46},{480,46},{480,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVSou.TRooHeaSet, controlBus.TRooSetHea) annotation (Line(points=
-          {{698,48},{660,48},{660,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVSou.TRooCooSet, controlBus.TRooSetCoo) annotation (Line(points=
-          {{698,44},{660,44},{660,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVEas.TRooHeaSet, controlBus.TRooSetHea) annotation (Line(points=
-          {{878,48},{850,48},{850,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVEas.TRooCooSet, controlBus.TRooSetCoo) annotation (Line(points=
-          {{878,44},{850,44},{850,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVNor.TRooHeaSet, controlBus.TRooSetHea) annotation (Line(points=
-          {{1038,48},{1020,48},{1020,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVNor.TRooCooSet, controlBus.TRooSetCoo) annotation (Line(points=
-          {{1038,44},{1020,44},{1020,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVWes.TRooHeaSet, controlBus.TRooSetHea) annotation (Line(points=
-          {{1238,46},{1202,46},{1202,-342},{-240,-342}},color={0,0,127}));
-  connect(conVAVWes.TRooCooSet, controlBus.TRooSetCoo) annotation (Line(points=
-          {{1238,42},{1202,42},{1202,-342},{-240,-342}},color={0,0,127}));
-=======
       points={{455,-121},{452,-121},{452,-120},{448,-120},{448,275},{480,275}},
       color={0,0,127},
       pattern=LinePattern.Dash));
@@ -339,7 +190,6 @@ equation
           -107},{1142,-107},{1142,-342},{-240,-342}},   color={0,0,127}));
   connect(conVAVWes.TRooCooSet, controlBus.TRooSetCoo) annotation (Line(points={{1184,
           -114},{1142,-114},{1142,-342},{-240,-342}},   color={0,0,127}));
->>>>>>> master
 
   connect(wes.yVAV, conVAVWes.yDam) annotation (Line(points={{1286,52},{1274,52},
           {1274,-109.2},{1207,-109.2}},
@@ -375,45 +225,6 @@ equation
           255}));
   connect(conFanSup.y, fanSup.y) annotation (Line(points={{261,0},{280,0},{280,
           -20},{310,-20},{310,-28}}, color={0,0,127}));
-<<<<<<< HEAD
-  connect(modeSelector.yFan, swiCooCoi.u2) annotation (Line(points={{-179.545,
-          -310},{-20,-310},{-20,-248},{58,-248}},
-                                              color={255,0,255}));
-  connect(swiCooCoi.u1, cooCoiCon.y) annotation (Line(points={{58,-240},{-20,
-          -240},{-59,-240}},      color={0,0,127}));
-  connect(swiHeaCoi.u1, heaCoiCon.y)
-    annotation (Line(points={{58,-202},{-59,-202}}, color={0,0,127}));
-  connect(coiOff.y, swiCooCoi.u3) annotation (Line(points={{-39,-162},{-28,-162},
-          {-28,-256},{58,-256}},
-                              color={0,0,127}));
-  connect(coiOff.y, swiHeaCoi.u3) annotation (Line(points={{-39,-162},{-28,-162},
-          {-28,-218},{58,-218}},
-                              color={0,0,127}));
-  connect(TSup.T, cooCoiCon.u_m) annotation (Line(points={{340,-29},{340,-12},{
-          372,-12},{372,-268},{-70,-268},{-70,-252}}, color={0,0,127}));
-  connect(TSup.T, heaCoiCon.u_m) annotation (Line(points={{340,-29},{340,-12},{
-          372,-12},{372,-268},{-88,-268},{-88,-222},{-70,-222},{-70,-214}},
-        color={0,0,127}));
-  connect(gaiHeaCoi.u, swiHeaCoi.y)
-    annotation (Line(points={{98,-210},{81,-210},{81,-210}}, color={0,0,127}));
-  connect(gaiCooCoi.u, swiCooCoi.y) annotation (Line(points={{98,-248},{88,-248},
-          {88,-248},{81,-248}}, color={0,0,127}));
-  connect(eco.yExh, conEco.yOA) annotation (Line(
-      points={{-3,-34},{-2,-34},{-2,152},{-59.3333,152}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(eco.yRet, conEco.yRet) annotation (Line(
-      points={{-16.8,-34},{-16.8,146.667},{-59.3333,146.667}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(freSta.y, or2.u1) annotation (Line(points={{21,-92},{21,-92},{40,-92},
-          {40,-150},{-20,-150},{-20,-170},{-2,-170}},        color={255,0,255}));
-  connect(or2.u2, modeSelector.yFan) annotation (Line(points={{-2,-178},{-20,
-          -178},{-20,-310},{-179.545,-310}},
-                                     color={255,0,255}));
-  connect(or2.y, swiHeaCoi.u2) annotation (Line(points={{21,-170},{40,-170},{40,
-          -190},{40,-190},{40,-210},{58,-210}}, color={255,0,255}));
-=======
   connect(or2.u2, modeSelector.yFan) annotation (Line(points={{-12,-248},{-30,
           -248},{-30,-305.455},{-179.091,-305.455}},
                                      color={255,0,255}));
@@ -489,7 +300,6 @@ equation
           -10},{-100,-45},{-114,-45}}, color={0,127,255}));
   connect(freSta.y, or2.u1) annotation (Line(points={{-38,-90},{-30,-90},{-30,
           -240},{-12,-240}}, color={255,0,255}));
->>>>>>> master
   annotation (
     Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-380,-400},{1440,
             660}})),
@@ -558,8 +368,6 @@ ASHRAE, Atlanta, GA, 2006.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 May 6, 2021, by David Blum:<br/>
 Change to <code>from_dp=false</code> for exhaust air damper.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2485\">issue #2485</a>.
@@ -604,7 +412,6 @@ This is
 for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>.
 </li>
 <li>
->>>>>>> master
 May 19, 2016, by Michael Wetter:<br/>
 Changed chilled water supply temperature to <i>6&deg;C</i>.
 This is
diff --git a/Buildings/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo b/Buildings/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo
index 29d23ffe574..8c2b646f023 100644
--- a/Buildings/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo
+++ b/Buildings/Examples/VAVReheat/BaseClasses/PartialOpenLoop.mo
@@ -61,6 +61,42 @@ partial model PartialOpenLoop
 
   parameter Modelica.SIunits.Angle lat=41.98*3.14159/180 "Latitude";
 
+  parameter Real ratOAFlo_A(final unit="m3/(s.m2)") = 0.3e-3
+    "Outdoor airflow rate required per unit area";
+  parameter Real ratOAFlo_P = 2.5e-3
+    "Outdoor airflow rate required per person";
+  parameter Real ratP_A = 5e-2
+    "Occupant density";
+  parameter Real effZ(final unit="1") = 0.8
+    "Zone air distribution effectiveness (limiting value)";
+  parameter Real divP(final unit="1") = 0.7
+    "Occupant diversity ratio";
+  parameter Modelica.SIunits.VolumeFlowRate VCorOA_flow_nominal=
+    (ratOAFlo_P * ratP_A + ratOAFlo_A) * AFloCor / effZ
+    "Zone outdoor air flow rate";
+  parameter Modelica.SIunits.VolumeFlowRate VSouOA_flow_nominal=
+    (ratOAFlo_P * ratP_A + ratOAFlo_A) * AFloSou / effZ
+    "Zone outdoor air flow rate";
+  parameter Modelica.SIunits.VolumeFlowRate VEasOA_flow_nominal=
+    (ratOAFlo_P * ratP_A + ratOAFlo_A) * AFloEas / effZ
+    "Zone outdoor air flow rate";
+  parameter Modelica.SIunits.VolumeFlowRate VNorOA_flow_nominal=
+    (ratOAFlo_P * ratP_A + ratOAFlo_A) * AFloNor / effZ
+    "Zone outdoor air flow rate";
+  parameter Modelica.SIunits.VolumeFlowRate VWesOA_flow_nominal=
+    (ratOAFlo_P * ratP_A + ratOAFlo_A) * AFloWes / effZ
+    "Zone outdoor air flow rate";
+  parameter Modelica.SIunits.VolumeFlowRate Vou_flow_nominal=
+    (divP * ratOAFlo_P * ratP_A + ratOAFlo_A) * sum(
+      {AFloCor, AFloSou, AFloNor, AFloEas, AFloWes})
+    "System uncorrected outdoor air flow rate";
+  parameter Real effVen(final unit="1") = if divP < 0.6 then
+    0.88 * divP + 0.22 else 0.75
+    "System ventilation efficiency";
+  parameter Modelica.SIunits.VolumeFlowRate Vot_flow_nominal=
+    Vou_flow_nominal / effVen
+    "System design outdoor air flow rate";
+
   parameter Modelica.SIunits.Temperature THeaOn=293.15
     "Heating setpoint during on";
   parameter Modelica.SIunits.Temperature THeaOff=285.15
@@ -782,14 +818,6 @@ equation
       points={{210,-52},{230,-52},{230,-110}},
       color={28,108,200},
       thickness=0.5));
-<<<<<<< HEAD
-  connect(gaiHeaCoi.y, souHea.m_flow_in) annotation (Line(points={{121,-210},{
-          124,-210},{124,-130}}, color={0,0,127}));
-  connect(gaiCooCoi.y, souCoo.m_flow_in) annotation (Line(points={{121,-248},{
-          222,-248},{222,-130}}, color={0,0,127}));
-  connect(dpDisSupFan.port_b, amb.ports[3]) annotation (Line(
-      points={{320,10},{320,14},{-88,14},{-88,-47.9333},{-114,-47.9333}},
-=======
   connect(gaiHeaCoi.y, souHea.m_flow_in) annotation (Line(points={{124,-160},{
           124,-132}},            color={0,0,127}));
   connect(gaiCooCoi.y, souCoo.m_flow_in) annotation (Line(points={{222,-162},{
@@ -797,21 +825,13 @@ equation
   connect(dpDisSupFan.port_b, amb.ports[2]) annotation (Line(
       points={{320,10},{320,14},{-106,14},{-106,-48},{-110,-48},{-110,-47.2},{-114,
           -47.2}},
->>>>>>> master
       color={0,0,0},
       pattern=LinePattern.Dot));
   connect(senRetFlo.port_b, TRet.port_a) annotation (Line(points={{340,140},{
           226,140},{110,140}}, color={0,127,255}));
-<<<<<<< HEAD
-  connect(freStaTSetPoi.y, freSta.reference)
-    annotation (Line(points={{-19,-86},{-2,-86}}, color={0,0,127}));
-  connect(freSta.u, TMix.T) annotation (Line(points={{-2,-98},{-10,-98},{-10,-70},
-          {20,-70},{20,-20},{40,-20},{40,-29}}, color={0,0,127}));
-=======
   connect(freSta.u, TMix.T) annotation (Line(points={{-62,-90},{-70,-90},{-70,
           -68},{20,-68},{20,-20},{40,-20},{40,-29}},
                                                 color={0,0,127}));
->>>>>>> master
   connect(TMix.port_b, heaCoi.port_a2) annotation (Line(
       points={{50,-40},{98,-40}},
       color={0,127,255},
@@ -934,8 +954,6 @@ shading devices, Technical Report, Oct. 17, 2006.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 June 30, 2021, by Antoine Gautier:<br/>
 Changed cooling coil model. This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2549\">issue #2549</a>.
@@ -980,7 +998,6 @@ November 25, 2019, by Milica Grahovac:<br/>
 Declared the floor model as replaceable.
 </li>
 <li>
->>>>>>> master
 September 26, 2017, by Michael Wetter:<br/>
 Separated physical model from control to facilitate implementation of alternate control
 sequences.
diff --git a/Buildings/Examples/VAVReheat/Controls/ControlBus.mo b/Buildings/Examples/VAVReheat/Controls/ControlBus.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo b/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo
old mode 100755
new mode 100644
index 710571d15da..1a476c2cc0e
--- a/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo
+++ b/Buildings/Examples/VAVReheat/Controls/DuctStaticPressureSetpoint.mo
@@ -8,14 +8,15 @@ model DuctStaticPressureSetpoint "Computes the duct static pressure setpoint"
   parameter Real k=0.1 "Gain of controller";
   parameter Modelica.SIunits.Time Ti=60 "Time constant of integrator block";
   parameter Modelica.SIunits.Time Td=60 "Time constant of derivative block";
-  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PID
+  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
     "Type of controller";
-                           Buildings.Controls.Continuous.LimPID limPID(
+  Buildings.Controls.Continuous.LimPID limPID(
     controllerType=controllerType,
     k=k,
     Ti=Ti,
     Td=Td,
-    initType=Modelica.Blocks.Types.InitPID.InitialState)
+    initType=Modelica.Blocks.Types.InitPID.InitialState,
+    reverseActing=false)
     annotation (Placement(transformation(extent={{-20,40},{0,60}})));
 protected
   Buildings.Utilities.Math.Max max(final nin=nin)
diff --git a/Buildings/Examples/VAVReheat/Controls/Economizer.mo b/Buildings/Examples/VAVReheat/Controls/Economizer.mo
index 9d8bc703937..9135b403976 100644
--- a/Buildings/Examples/VAVReheat/Controls/Economizer.mo
+++ b/Buildings/Examples/VAVReheat/Controls/Economizer.mo
@@ -1,14 +1,11 @@
 within Buildings.Examples.VAVReheat.Controls;
 block Economizer "Controller for economizer"
   import Buildings.Examples.VAVReheat.Controls.OperationModes;
-<<<<<<< HEAD
-=======
   parameter Boolean have_reset = false
     "Set to true to reset the outdoor air damper controllers with the enable signal"
     annotation(Evaluate=true);
   parameter Boolean have_frePro = false
     "Set to true to enable freeze protection (mixed air low temperature control)";
->>>>>>> master
   parameter Modelica.SIunits.Temperature TFreSet=277.15
     "Lower limit of mixed air temperature for freeze protection"
     annotation(Dialog(enable=have_frePro), Evaluate=true);
@@ -16,21 +13,6 @@ block Economizer "Controller for economizer"
     "Temperature difference between return and outdoor air for economizer lockout";
   parameter Modelica.SIunits.VolumeFlowRate VOut_flow_min(min=0)
     "Minimum outside air volume flow rate";
-<<<<<<< HEAD
-
-  Modelica.Blocks.Interfaces.RealInput TSupHeaSet
-    "Supply temperature setpoint for heating" annotation (Placement(
-        transformation(extent={{-140,-40},{-100,0}}), iconTransformation(extent=
-           {{-140,-40},{-100,0}})));
-  Modelica.Blocks.Interfaces.RealInput TSupCooSet
-    "Supply temperature setpoint for cooling"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Modelica.Blocks.Interfaces.RealInput TMix "Measured mixed air temperature"
-    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
-        iconTransformation(extent={{-140,80},{-100,120}})));
-  ControlBus controlBus
-    annotation (Placement(transformation(extent={{-50,50},{-30,70}})));
-=======
   parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
     "Type of controller";
   parameter Real k = 0.05 "Gain of controller";
@@ -52,7 +34,6 @@ block Economizer "Controller for economizer"
     "Measured mixed air temperature"
     annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
       iconTransformation(extent={{-140,0},{-100,40}})));
->>>>>>> master
   Modelica.Blocks.Interfaces.RealInput VOut_flow
     "Measured outside air flow rate" annotation (Placement(transformation(
       extent={{-140,-80},{-100,-40}}),
@@ -72,26 +53,6 @@ block Economizer "Controller for economizer"
   Modelica.Blocks.Math.Gain gain(k=1/VOut_flow_min) "Normalize mass flow rate"
     annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
   Buildings.Controls.Continuous.LimPID conV_flow(
-<<<<<<< HEAD
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    k=k,
-    Ti=Ti,
-    yMax=0.995,
-    yMin=0.005,
-    Td=60) "Controller for outside air flow rate"
-    annotation (Placement(transformation(extent={{-22,-20},{-2,0}})));
-  Modelica.Blocks.Sources.Constant uni(k=1) "Unity signal"
-    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  parameter Real k=1 "Gain of controller";
-  parameter Modelica.SIunits.Time Ti "Time constant of integrator block";
-  Modelica.Blocks.Interfaces.RealOutput yOA
-    "Control signal for outside air damper" annotation (Placement(
-        transformation(extent={{200,70},{220,90}}), iconTransformation(extent={
-            {200,70},{220,90}})));
-  Modelica.Blocks.Routing.Extractor extractor(nin=6, index(start=1, fixed=true))
-    "Extractor for control signal"
-    annotation (Placement(transformation(extent={{120,-10},{140,10}})));
-=======
     controllerType=controllerType,
     k=k,
     Ti=Ti,
@@ -105,32 +66,17 @@ block Economizer "Controller for economizer"
     annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
   Modelica.Blocks.Sources.Constant uni(k=1) "Unity signal"
     annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
->>>>>>> master
   Modelica.Blocks.Sources.Constant closed(k=0) "Signal to close OA damper"
     annotation (Placement(transformation(extent={{30,30},{50,50}})));
   Modelica.Blocks.Math.Max max
     "Takes higher signal (maximum damper opening between cooling and OA requirement)"
     annotation (Placement(transformation(extent={{80,-10},{100,10}})));
-<<<<<<< HEAD
-  MixedAirTemperatureSetpoint TSetMix "Mixed air temperature setpoint"
-    annotation (Placement(transformation(extent={{-20,64},{0,84}})));
-  EconomizerTemperatureControl yOATMix(Ti=Ti, k=k)
-    "Control signal for outdoor damper to track mixed air temperature setpoint"
-    annotation (Placement(transformation(extent={{20,160},{40,180}})));
-=======
->>>>>>> master
   Buildings.Controls.Continuous.LimPID yOATFre(
     controllerType=controllerType,
     k=k,
     Ti=Ti,
     Td=60,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMax=1,
-<<<<<<< HEAD
-    yMin=0)
-    "Control signal for outdoor damper to track freeze temperature setpoint"
-    annotation (Placement(transformation(extent={{20,120},{40,140}})));
-=======
     yMin=0,
     y_reset=1,
     reverseActing=false,
@@ -138,21 +84,12 @@ block Economizer "Controller for economizer"
       Buildings.Types.Reset.Disabled) if have_frePro
     "Controller of outdoor damper to track freeze temperature setpoint"
     annotation (Placement(transformation(extent={{-30,70},{-10,90}})));
->>>>>>> master
   Modelica.Blocks.Math.Min min
     "Takes lower signal (limits damper opening for freeze protection)"
     annotation (Placement(transformation(extent={{30,-10},{50,10}})));
   Modelica.Blocks.Sources.Constant TFre(k=TFreSet)
     "Setpoint for freeze protection"
-<<<<<<< HEAD
-    annotation (Placement(transformation(extent={{-20,100},{0,120}})));
-  Modelica.Blocks.Interfaces.RealOutput yRet
-    "Control signal for return air damper" annotation (Placement(transformation(
-          extent={{200,-10},{220,10}}), iconTransformation(extent={{200,-10},{
-            220,10}})));
-=======
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
->>>>>>> master
   Buildings.Controls.OBC.CDL.Continuous.AddParameter invSig(p=1, k=-1)
     "Invert control signal for interlocked damper"
     annotation (Placement(transformation(extent={{170,-10},{190,10}})));
@@ -180,89 +117,7 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(uni.y, conV_flow.u_s) annotation (Line(
-<<<<<<< HEAD
-      points={{-39,-10},{-24,-10}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(controlBus.controlMode, extractor.index) annotation (Line(
-      points={{-40,60},{-40,30},{60,30},{60,-30},{130,-30},{130,-12}},
-      color={255,204,51},
-      thickness=0.5,
-      smooth=Smooth.None), Text(
-      textString="%first",
-      index=-1,
-      extent={{-6,3},{-6,3}}));
-  connect(max.y, extractor.u[Integer(OperationModes.occupied)]) annotation (
-      Line(
-      points={{101,0},{118,0}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(closed.y, extractor.u[Integer(OperationModes.unoccupiedOff)])
-    annotation (Line(
-      points={{81,-80},{110,-80},{110,0},{118,0}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(closed.y, extractor.u[Integer(OperationModes.unoccupiedNightSetBack)])
-    annotation (Line(
-      points={{81,-80},{110,-80},{110,0},{118,0}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(max.y, extractor.u[Integer(OperationModes.unoccupiedWarmUp)])
-    annotation (Line(
-      points={{101,0},{118,0}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(max.y, extractor.u[Integer(OperationModes.unoccupiedPreCool)])
-    annotation (Line(
-      points={{101,0},{118,0}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(closed.y, extractor.u[Integer(OperationModes.safety)]) annotation (
-      Line(
-      points={{81,-80},{110,-80},{110,0},{118,0}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(TSupHeaSet, TSetMix.TSupHeaSet) annotation (Line(
-      points={{-120,-20},{-80,-20},{-80,80},{-22,80}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(TSupCooSet, TSetMix.TSupCooSet) annotation (Line(
-      points={{-120,-80},{-72,-80},{-72,68},{-22,68}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(controlBus, TSetMix.controlBus) annotation (Line(
-      points={{-40,60},{-13,60},{-13,81}},
-      color={255,204,51},
-      thickness=0.5,
-      smooth=Smooth.None), Text(
-      textString="%first",
-      index=-1,
-      extent={{-6,3},{-6,3}}));
-  connect(yOATMix.TRet, TRet) annotation (Line(
-      points={{18,176},{-90,176},{-90,160},{-120,160}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(controlBus.TOut, yOATMix.TOut) annotation (Line(
-      points={{-40,60},{-40,172},{18,172}},
-      color={255,204,51},
-      thickness=0.5,
-      smooth=Smooth.None), Text(
-      textString="%first",
-      index=-1,
-      extent={{-6,3},{-6,3}}));
-  connect(yOATMix.TMix, TMix) annotation (Line(
-      points={{18,168},{-80,168},{-80,100},{-120,100}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(yOATMix.TMixSet, TSetMix.TSet) annotation (Line(
-      points={{18,164},{6,164},{6,75},{1,75}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(yOATMix.yOA, max.u1) annotation (Line(
-      points={{41,170},{74,170},{74,6},{78,6}},
-=======
       points={{-39,-20},{-12,-20}},
->>>>>>> master
       color={0,0,127},
       smooth=Smooth.None));
   connect(min.u2, conV_flow.y) annotation (Line(
@@ -273,21 +128,6 @@ equation
       points={{51,0},{60,0},{60,-6},{78,-6}},
       color={0,0,127},
       smooth=Smooth.None));
-<<<<<<< HEAD
-  connect(yOATFre.u_s, TMix) annotation (Line(points={{18,130},{-32,130},{-80,
-          130},{-80,100},{-120,100}}, color={0,0,127}));
-  connect(TFre.y, yOATFre.u_m) annotation (Line(points={{1,110},{14,110},{30,
-          110},{30,118}}, color={0,0,127}));
-  connect(yOATFre.y, min.u1) annotation (Line(points={{41,130},{48,130},{48,20},
-          {10,20},{10,-4},{18,-4}}, color={0,0,127}));
-  connect(yRet, invSig.y)
-    annotation (Line(points={{210,0},{191,0}}, color={0,0,127}));
-  connect(extractor.y, invSig.u)
-    annotation (Line(points={{141,0},{168,0}}, color={0,0,127}));
-  connect(extractor.y, yOA) annotation (Line(points={{141,0},{160,0},{160,80},{
-          210,80}}, color={0,0,127}));
-  annotation (
-=======
   connect(yOATFre.y, min.u1) annotation (Line(points={{-9,80},{0,80},{0,6},{28,6}},
                                     color={0,0,127}));
   connect(yRet, invSig.y)
@@ -336,7 +176,6 @@ equation
           120,-8},{128,-8}},
                          color={0,0,127}));
   annotation (defaultComponentName="conEco",
->>>>>>> master
     Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{200,
             200}})),
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{200,200}}),
@@ -351,11 +190,7 @@ equation
           lineColor={0,0,255},
           textString="TRet"),
         Text(
-<<<<<<< HEAD
-          extent={{-86,104},{-46,84}},
-=======
           extent={{-92,32},{-52,12}},
->>>>>>> master
           lineColor={0,0,255},
           textString="TMix"),
         Text(
@@ -401,8 +236,6 @@ than the return air dry bulb, economizer cooling is disabled.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 October 27, 2020, by Antoine Gautier:<br/>
 Refactored for compatibility with new supply air temperature control.<br/>
 This is for
@@ -418,7 +251,6 @@ and
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1995\">#1995</a>.
 </li>
 <li>
->>>>>>> master
 December 20, 2016, by Michael Wetter:<br/>
 Added type conversion for enumeration when used as an array index.<br/>
 This is for
diff --git a/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo b/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo
deleted file mode 100755
index 0d7ce577e1e..00000000000
--- a/Buildings/Examples/VAVReheat/Controls/EconomizerTemperatureControl.mo
+++ /dev/null
@@ -1,136 +0,0 @@
-within Buildings.Examples.VAVReheat.Controls;
-block EconomizerTemperatureControl
-  "Controller for economizer mixed air temperature"
-  extends Modelica.Blocks.Icons.Block;
-  import Buildings.Examples.VAVReheat.Controls.OperationModes;
-  Buildings.Controls.Continuous.LimPID con(
-    k=k,
-    Ti=Ti,
-    yMax=0.995,
-    yMin=0.005,
-    Td=60,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI)
-    "Controller for mixed air temperature"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  parameter Real k=1 "Gain of controller";
-  parameter Modelica.SIunits.Time Ti "Time constant of integrator block";
-  Modelica.Blocks.Logical.Switch swi1
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Modelica.Blocks.Logical.Switch swi2
-    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
-  Modelica.Blocks.Interfaces.RealOutput yOA
-    "Control signal for outside air damper"
-    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
-  Modelica.Blocks.Interfaces.RealInput TRet "Return air temperature"
-    annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Modelica.Blocks.Interfaces.RealInput TOut "Outside air temperature"
-    annotation (Placement(transformation(extent={{-140,0},{-100,40}})));
-  Modelica.Blocks.Interfaces.RealInput TMix "Mixed air temperature"
-    annotation (Placement(transformation(extent={{-140,-40},{-100,0}})));
-  Modelica.Blocks.Interfaces.RealInput TMixSet
-    "Setpoint for mixed air temperature"
-    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Modelica.Blocks.Logical.Hysteresis hysConGai(uLow=-0.1, uHigh=0.1)
-    "Hysteresis for control gain"
-    annotation (Placement(transformation(extent={{-40,50},{-20,70}})));
-  Modelica.Blocks.Math.Feedback feedback
-    annotation (Placement(transformation(extent={{-70,50},{-50,70}})));
-equation
-  connect(swi1.y, con.u_s)    annotation (Line(
-      points={{21,6.10623e-16},{30,0},{40,1.27676e-15},{40,6.66134e-16},{58,
-          6.66134e-16}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(swi2.y, con.u_m)    annotation (Line(
-      points={{21,-40},{70,-40},{70,-12}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(con.y, yOA)    annotation (Line(
-      points={{81,6.10623e-16},{90.5,6.10623e-16},{90.5,5.55112e-16},{110,
-          5.55112e-16}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(swi1.u1, TMix) annotation (Line(
-      points={{-2,8},{-80,8},{-80,-20},{-120,-20}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(swi2.u3, TMix) annotation (Line(
-      points={{-2,-48},{-80,-48},{-80,-20},{-120,-20}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(swi1.u3, TMixSet) annotation (Line(
-      points={{-2,-8},{-60,-8},{-60,-60},{-120,-60}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(swi2.u1, TMixSet) annotation (Line(
-      points={{-2,-32},{-60,-32},{-60,-60},{-120,-60}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(feedback.u1, TRet) annotation (Line(points={{-68,60},{-68,60},{-88,60},
-          {-88,60},{-120,60}}, color={0,0,127}));
-  connect(TOut, feedback.u2)
-    annotation (Line(points={{-120,20},{-60,20},{-60,52}}, color={0,0,127}));
-  connect(feedback.y, hysConGai.u) annotation (Line(points={{-51,60},{-48,60},{
-          -46,60},{-42,60}}, color={0,0,127}));
-  connect(hysConGai.y, swi2.u2) annotation (Line(points={{-19,60},{-12,60},{-12,
-          -40},{-2,-40}}, color={255,0,255}));
-  connect(hysConGai.y, swi1.u2) annotation (Line(points={{-19,60},{-12,60},{-12,
-          0},{-2,0}}, color={255,0,255}));
-  annotation ( Icon(coordinateSystem(
-          preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={
-        Text(
-          extent={{-92,78},{-66,50}},
-          lineColor={0,0,127},
-          textString="TRet"),
-        Text(
-          extent={{-88,34},{-62,6}},
-          lineColor={0,0,127},
-          textString="TOut"),
-        Text(
-          extent={{-86,-6},{-60,-34}},
-          lineColor={0,0,127},
-          textString="TMix"),
-        Text(
-          extent={{-84,-46},{-58,-74}},
-          lineColor={0,0,127},
-          textString="TMixSet"),
-        Text(
-          extent={{64,14},{90,-14}},
-          lineColor={0,0,127},
-          textString="yOA")}), Documentation(info="<html>
-<p>
-This controller outputs the control signal for the outside
-air damper in order to regulate the mixed air temperature
-<code>TMix</code>.
-</p>
-<h4>Implementation</h4>
-<p>
-If the control error <i>T<sub>mix,set</sub> - T<sub>mix</sub> &lt; 0</i>,
-then more outside air is needed provided that <i>T<sub>out</sub> &lt; T<sub>ret</sub></i>,
-where
-<i>T<sub>out</sub></i> is the outside air temperature and
-<i>T<sub>ret</sub></i> is the return air temperature.
-However, if <i>T<sub>out</sub> &ge; T<sub>ret</sub></i>,
-then less outside air is needed.
-Hence, the control gain need to switch sign depending on this difference.
-This is accomplished by taking the difference between these signals,
-and then switching the input of the controller.
-A hysteresis is used to avoid chattering, for example if
-<code>TRet</code> has numerical noise in the simulation, or
-measurement error in a real application.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-April 1, 2016, by Michael Wetter:<br/>
-Added hysteresis to avoid too many events that stall the simulation.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/502\">#502</a>.
-</li>
-<li>
-March 8, 2013, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end EconomizerTemperatureControl;
diff --git a/Buildings/Examples/VAVReheat/Controls/Examples/RoomVAV.mo b/Buildings/Examples/VAVReheat/Controls/Examples/RoomVAV.mo
new file mode 100644
index 00000000000..cca5591a435
--- /dev/null
+++ b/Buildings/Examples/VAVReheat/Controls/Examples/RoomVAV.mo
@@ -0,0 +1,52 @@
+within Buildings.Examples.VAVReheat.Controls.Examples;
+model RoomVAV "Test model for the room VAV controller"
+  extends Modelica.Icons.Example;
+
+  Buildings.Examples.VAVReheat.Controls.RoomVAV vavBoxCon(ratVFloMin=0.15,
+      ratVFloHea=0.3)
+    "VAV terminal unit single maximum controller"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet(k=273.15 + 21)
+    "Heating setpoint"
+    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet(k=273.15 + 22)
+    "Cooling setpoint"
+    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram(
+    height=4,
+    duration=3600,
+    offset=-4) "Ramp source"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Sine sin(
+    amplitude=1,
+    freqHz=1/3600,
+    offset=273.15 + 23.5) "Sine source"
+    annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add rooTem "Room temperature"
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
+
+equation
+  connect(rooTem.y, vavBoxCon.TRoo) annotation (Line(points={{2,-50},{20,-50},{20,
+          -7},{39,-7}}, color={0,0,127}));
+  connect(cooSet.y, vavBoxCon.TRooCooSet)
+    annotation (Line(points={{-18,20},{0,20},{0,0},{38,0}}, color={0,0,127}));
+  connect(heaSet.y, vavBoxCon.TRooHeaSet) annotation (Line(points={{-18,70},{20,
+          70},{20,7},{38,7}}, color={0,0,127}));
+  connect(sin.y, rooTem.u2) annotation (Line(points={{-58,-70},{-40,-70},{-40,-56},
+          {-22,-56}}, color={0,0,127}));
+  connect(ram.y, rooTem.u1) annotation (Line(points={{-58,-30},{-40,-30},{-40,-44},
+          {-22,-44}}, color={0,0,127}));
+
+annotation (
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Controls/Examples/RoomVAV.mos"
+        "Simulate and plot"),
+    experiment(StopTime=3600, Tolerance=1e-6),
+    Documentation(info="<html>
+<p>
+This model tests the VAV box contoller of transition from heating control to cooling
+control.
+</p>
+</html>"),
+Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end RoomVAV;
diff --git a/Buildings/Examples/VAVReheat/Controls/Examples/package.mo b/Buildings/Examples/VAVReheat/Controls/Examples/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/VAVReheat/Controls/Examples/package.order b/Buildings/Examples/VAVReheat/Controls/Examples/package.order
index e9bbdda6549..1148e909051 100755
--- a/Buildings/Examples/VAVReheat/Controls/Examples/package.order
+++ b/Buildings/Examples/VAVReheat/Controls/Examples/package.order
@@ -1,6 +1,3 @@
 OperationModes
-<<<<<<< HEAD
-=======
 RoomVAV
 SupplyAirTemperature
->>>>>>> master
diff --git a/Buildings/Examples/VAVReheat/Controls/FanVFD.mo b/Buildings/Examples/VAVReheat/Controls/FanVFD.mo
index a977e603d29..5790fed9730 100644
--- a/Buildings/Examples/VAVReheat/Controls/FanVFD.mo
+++ b/Buildings/Examples/VAVReheat/Controls/FanVFD.mo
@@ -9,19 +9,9 @@ block FanVFD "Controller for fan revolution"
     yMin=r_N_min,
     k=k,
     Ti=Ti,
-<<<<<<< HEAD
-    controllerType=controllerType,
-    reset=Buildings.Types.Reset.Disabled)
-                                   "Controller"
-    annotation (Placement(transformation(extent={{-20,20},{0,40}})));
-  Modelica.Blocks.Math.Gain gaiMea(k=1/xSet_nominal)
-    "Gain to normalize measurement signal"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-=======
     controllerType=controllerType)
     "Controller"
     annotation (Placement(transformation(extent={{-10,20},{10,40}})));
->>>>>>> master
   parameter Real xSet_nominal "Nominal setpoint (used for normalization)";
   Modelica.Blocks.Sources.Constant off(k=0) "Off signal"
     annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
@@ -37,7 +27,7 @@ block FanVFD "Controller for fan revolution"
   parameter Real y_start=0 "Initial or guess value of output (= state)";
 
   parameter Modelica.Blocks.Types.SimpleController
-    controllerType=.Modelica.Blocks.Types.SimpleController.PI
+    controllerType=Modelica.Blocks.Types.SimpleController.PI
     "Type of controller"
     annotation (Dialog(group="Setpoint tracking"));
   parameter Real k=0.5 "Gain of controller"
diff --git a/Buildings/Examples/VAVReheat/Controls/OperationModes.mo b/Buildings/Examples/VAVReheat/Controls/OperationModes.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/VAVReheat/Controls/PreCoolingStarter.mo b/Buildings/Examples/VAVReheat/Controls/PreCoolingStarter.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/VAVReheat/Controls/RoomVAV.mo b/Buildings/Examples/VAVReheat/Controls/RoomVAV.mo
index 1e47a3de7d9..c8a052abfac 100644
--- a/Buildings/Examples/VAVReheat/Controls/RoomVAV.mo
+++ b/Buildings/Examples/VAVReheat/Controls/RoomVAV.mo
@@ -2,164 +2,259 @@ within Buildings.Examples.VAVReheat.Controls;
 block RoomVAV "Controller for room VAV box"
   extends Modelica.Blocks.Icons.Block;
 
+  parameter Real ratVFloMin(final unit="1") = 0.3
+    "Minimum airflow set point (ratio to nominal)";
+  parameter Real ratVFloHea(final unit="1") = ratVFloMin
+    "Heating airflow set point (ratio to nominal)";
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController cooController=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller"
+    annotation (Dialog(group="Cooling controller"));
+  parameter Real kCoo=0.1 "Gain of controller"
+    annotation (Dialog(group="Cooling controller"));
+  parameter Modelica.SIunits.Time TiCoo=120 "Time constant of integrator block"
+    annotation (Dialog(group="Cooling controller", enable=cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
+                                                          cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.SIunits.Time TdCoo=60 "Time constant of derivative block"
+    annotation (Dialog(group="Cooling controller", enable=cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
+                                                          cooController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController heaController=
+      Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller"
+    annotation (Dialog(group="Heating controller"));
+  parameter Real kHea=0.1 "Gain of controller"
+    annotation (Dialog(group="Heating controller"));
+  parameter Modelica.SIunits.Time TiHea=120 "Time constant of integrator block"
+    annotation (Dialog(group="Heating controller", enable=heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
+                                                          heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.SIunits.Time TdHea=60 "Time constant of derivative block"
+    annotation (Dialog(group="Heating controller", enable=heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
+                                                          heaController==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TRooHeaSet(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    displayUnit = "degC",
-    min=0)
+    displayUnit = "degC")
     "Setpoint temperature for room for heating"
-    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
-        iconTransformation(extent={{-140,60},{-100,100}})));
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+        iconTransformation(extent={{-140,50},{-100,90}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TRooCooSet(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    displayUnit = "degC",
-    min=0)
+    displayUnit = "degC")
     "Setpoint temperature for room for cooling"
-    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
-        iconTransformation(extent={{-140,20},{-100,60}})));
-
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+        iconTransformation(extent={{-140,-20},{-100,20}})));
   Modelica.Blocks.Interfaces.RealInput TRoo(
     final quantity="ThermodynamicTemperature",
     final unit = "K",
-    displayUnit = "degC",
-    min=0)
+    displayUnit = "degC")
     "Measured room temperature"
-    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
-        iconTransformation(extent={{-140,-60},{-100,-20}})));
-
-  Modelica.Blocks.Interfaces.RealInput TDis(
-    final quantity="ThermodynamicTemperature",
-    final unit = "K",
-    displayUnit = "degC",
-    min=0)
-    "Measured supply air temperature after heating coil"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
-        iconTransformation(extent={{-140,-100},{-100,-60}})));
-
-  Modelica.Blocks.Interfaces.RealOutput yVal "Signal for heating coil valve"
-    annotation (Placement(transformation(extent={{100,-60},{120,-40}})));
+    annotation (Placement(transformation(extent={{-140,-90},{-100,-50}}),
+        iconTransformation(extent={{-120,-80},{-100,-60}})));
   Modelica.Blocks.Interfaces.RealOutput yDam "Signal for VAV damper"
-    annotation (Placement(transformation(extent={{100,38},{120,58}})));
-
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conHea(
-    yMax=1,
-    xi_start=0.1,
-    Td=60,
-    yMin=0,
-    k=0.1,
-    Ti=120,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI)
-            "Controller for heating"
-    annotation (Placement(transformation(extent={{-20,50},{0,70}})));
-  Buildings.Controls.Continuous.LimPID conCoo(
-    yMax=1,
-    Td=60,
-    k=0.1,
-    Ti=120,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    reverseAction=true)
-    "Controller for cooling (acts on damper)"
-    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-protected
-  parameter Real kDamHea = 0.5
-    "Gain for VAV damper controller in heating mode";
-
-  Buildings.Controls.OBC.CDL.Continuous.Max maxDam
-    "Limitation of damper signal"
-    annotation (Placement(transformation(extent={{12,-14},{32,6}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(k=1)
-    annotation (Placement(transformation(extent={{-74,-76},{-54,-56}})));
-  Buildings.Controls.OBC.CDL.Continuous.Add add
-    "Addition of cooling and heating signal (one of which being zero due to dual setpoint)"
-    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zero(k=0.1)
-    annotation (Placement(transformation(extent={{-20,10},{0,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.Min minDam
-    "Limitation of damper signal"
-    annotation (Placement(transformation(extent={{70,-26},{90,-6}})));
+    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
+        iconTransformation(extent={{100,38},{120,58}})));
+  Modelica.Blocks.Interfaces.RealOutput yVal "Signal for heating coil valve"
+    annotation (Placement(transformation(extent={{100,-80},{120,-60}}),
+        iconTransformation(extent={{100,-60},{120,-40}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum(
-    final k={1,kDamHea,-kDamHea},
-    nin=3) annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
+  Buildings.Controls.OBC.CDL.Continuous.PID conHea(
+    yMax=yMax,
+    Td=TdHea,
+    yMin=yMin,
+    k=kHea,
+    Ti=TiHea,
+    controllerType=heaController,
+    Ni=10) "Controller for heating"
+    annotation (Placement(transformation(extent={{30,-80},{50,-60}})));
+  Buildings.Controls.OBC.CDL.Continuous.PID conCoo(
+    yMax=yMax,
+    Td=TdCoo,
+    k=kCoo,
+    Ti=TiCoo,
+    controllerType=cooController,
+    yMin=yMin,
+    reverseActing=false) "Controller for cooling (acts on damper)"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Line reqFlo "Required flow rate"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax(k=1)
+    "Cooling maximum flow"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minFloCoo(
+    final k=ratVFloMin)
+    "Minimum flow in cooling mode"
+    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne(k=1)
+    "Constant 1"
+    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer(k=0)
+    "Constant 0"
+    annotation (Placement(transformation(extent={{30,30},{50,50}})));
 
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysWitHol(
+    final uLow=-dTHys,
+    final uHigh=0)
+    "Output true if room temperature below heating set point"
+    annotation (Placement(transformation(extent={{-10,130},{10,150}})));
+  Buildings.Controls.OBC.CDL.Continuous.Feedback dTHea
+    "Heating loop control error"
+    annotation (Placement(transformation(extent={{-50,130},{-30,150}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minFloHea(
+    final k=ratVFloHea)
+    "Minimum flow in heating mode"
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch swi
+    "Switch minimum air flow rate between heating and cooling mode"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMes(message=
+    "The difference between cooling and heating set points must be greater than dTHys")
+    "Assert message"
+    annotation (Placement(transformation(extent={{30,-130},{50,-110}})));
+  Buildings.Controls.OBC.CDL.Continuous.Feedback dTSet
+    "Difference between cooling and heating set points"
+    annotation (Placement(transformation(extent={{-50,-130},{-30,-110}})));
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(t=dTHys)
+    "Test for overlap of heating and cooling set points "
+    annotation (Placement(transformation(extent={{-10,-130},{10,-110}})));
+protected
+  parameter Real yMax=1 "Upper limit of PID control output";
+  parameter Real yMin=0 "Lower limit of PID control output";
+  parameter Modelica.SIunits.TemperatureDifference dTHys(final min=0) = 0.5
+    "Hysteresis width for enabling cooling mode";
 equation
-  connect(conHea.u_m, TRoo) annotation (Line(
-      points={{-10,48},{-10,36},{-80,36},{-80,-40},{-120,-40}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(conCoo.u_m, TRoo) annotation (Line(
-      points={{-10,-62},{-10,-90},{-80,-90},{-80,-40},{-120,-40}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(conCoo.y, add.u2) annotation (Line(
-      points={{1,-50},{20,-50},{20,-16},{38,-16}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(conHea.y,yVal)  annotation (Line(
-      points={{1,60},{34,60},{34,-50},{110,-50}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(zero.y, maxDam.u1)
-    annotation (Line(points={{1,20},{6,20},{6,2},{10,2}}, color={0,0,127}));
-  connect(maxDam.y, add.u1) annotation (Line(points={{33,-4},{38,-4}},
-                    color={0,0,127}));
-  connect(add.y, minDam.u1) annotation (Line(points={{61,-10},{68,-10}},
+  connect(TRooCooSet, conCoo.u_s)
+    annotation (Line(points={{-120,0},{-62,0}}, color={0,0,127}));
+  connect(TRoo, conHea.u_m) annotation (Line(points={{-120,-70},{-80,-70},{-80,-90},
+          {40,-90},{40,-82}},        color={0,0,127}));
+  connect(TRooHeaSet, conHea.u_s) annotation (Line(points={{-120,60},{-70,60},{-70,
+          -70},{28,-70}},      color={0,0,127}));
+  connect(conHea.y, yVal)
+    annotation (Line(points={{52,-70},{110,-70}},  color={0,0,127}));
+  connect(conZer.y, reqFlo.x1)
+    annotation (Line(points={{52,40},{60,40},{60,8},{68,8}},color={0,0,127}));
+  connect(cooMax.y, reqFlo.f2) annotation (Line(points={{52,-40},{60,-40},{60,-8},
+          {68,-8}},color={0,0,127}));
+  connect(conOne.y, reqFlo.x2) annotation (Line(points={{-38,-40},{20,-40},{20,-4},
+          {68,-4}},     color={0,0,127}));
+  connect(conCoo.y, reqFlo.u)
+    annotation (Line(points={{-38,0},{68,0}}, color={0,0,127}));
+  connect(TRoo, conCoo.u_m) annotation (Line(points={{-120,-70},{-80,-70},{-80,-20.6836},
+          {-80,-20},{-50,-20},{-50,-12}},
+                                     color={0,0,127}));
+  connect(reqFlo.y, yDam)
+    annotation (Line(points={{92,0},{110,0}},               color={0,0,127}));
+
+  connect(TRooHeaSet, dTHea.u1) annotation (Line(points={{-120,60},{-70,60},{-70,
+          140},{-52,140}}, color={0,0,127}));
+  connect(dTHea.y, hysWitHol.u)
+    annotation (Line(points={{-28,140},{-12,140}}, color={0,0,127}));
+  connect(TRoo, dTHea.u2) annotation (Line(points={{-120,-70},{-80,-70},{-80,120},
+          {-40,120},{-40,128}}, color={0,0,127}));
+  connect(minFloCoo.y, swi.u3) annotation (Line(points={{-38,40},{-20,40},{-20,52},
+          {-12,52}}, color={0,0,127}));
+  connect(minFloHea.y, swi.u1) annotation (Line(points={{-38,100},{-20,100},{-20,
+          68},{-12,68}},
                      color={0,0,127}));
-  connect(one.y, minDam.u2) annotation (Line(points={{-53,-66},{64,-66},{64,-22},
-          {68,-22}},          color={0,0,127}));
-  connect(minDam.y, yDam)
-    annotation (Line(points={{91,-16},{96,-16},{96,48},{108,48},{108,48},{110,
-          48},{110,48}},                                    color={0,0,127}));
-  connect(one.y, mulSum.u[1]) annotation (Line(points={{-53,-66},{-30,-66},{-30,
-          -5.33333},{-22,-5.33333}}, color={0,0,127}));
-  connect(TDis, mulSum.u[2]) annotation (Line(points={{-120,-80},{-40,-80},{-40,
-          -10},{-22,-10}}, color={0,0,127}));
-  connect(TRoo, mulSum.u[3]) annotation (Line(points={{-120,-40},{-80,-40},{-80,
-          -14.6667},{-22,-14.6667}},                color={0,0,127}));
-  connect(maxDam.u2, mulSum.y)
-    annotation (Line(points={{10,-10},{1.7,-10}}, color={0,0,127}));
-  connect(conHea.u_s, TRooHeaSet) annotation (Line(points={{-22,60},{-80,60},{
-          -80,80},{-120,80}},
-                          color={0,0,127}));
-  connect(TRooCooSet, conCoo.u_s) annotation (Line(points={{-120,40},{-50,40},{
-          -50,-50},{-22,-50}},
-                           color={0,0,127}));
-  annotation ( Icon(graphics={
+  connect(hysWitHol.y, swi.u2) annotation (Line(points={{12,140},{20,140},{20,80},
+          {-16,80},{-16,60},{-12,60}}, color={255,0,255}));
+  connect(swi.y, reqFlo.f1)
+    annotation (Line(points={{12,60},{20,60},{20,4},{68,4}}, color={0,0,127}));
+  connect(TRooCooSet, dTSet.u1) annotation (Line(points={{-120,0},{-90,0},{-90,-120},
+          {-52,-120}}, color={0,0,127}));
+  connect(TRooHeaSet, dTSet.u2) annotation (Line(points={{-120,60},{-70,60},{-70,
+          -140},{-40,-140},{-40,-132}}, color={0,0,127}));
+  connect(dTSet.y, greThr.u)
+    annotation (Line(points={{-28,-120},{-12,-120}}, color={0,0,127}));
+  connect(greThr.y, assMes.u)
+    annotation (Line(points={{12,-120},{28,-120}}, color={255,0,255}));
+annotation (
+  defaultComponentName="terCon",
+  Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+                    graphics={
         Text(
-          extent={{-92,-16},{-44,-40}},
+          extent={{-100,-62},{-66,-76}},
           lineColor={0,0,127},
           textString="TRoo"),
         Text(
-          extent={{-92,-72},{-44,-96}},
+          extent={{64,-38},{92,-58}},
           lineColor={0,0,127},
-          textString="TSup"),
+          textString="yVal"),
         Text(
-          extent={{44,-34},{92,-58}},
-          lineColor={0,0,127},
-          textString="yHea"),
-        Text(
-          extent={{42,64},{90,40}},
+          extent={{56,62},{90,40}},
           lineColor={0,0,127},
           textString="yDam"),
         Text(
-          extent={{-90,100},{-42,76}},
+          extent={{-96,82},{-36,60}},
           lineColor={0,0,127},
           textString="TRooHeaSet"),
         Text(
-          extent={{-90,42},{-42,18}},
+          extent={{-96,10},{-36,-10}},
           lineColor={0,0,127},
           textString="TRooCooSet")}),
-                                Documentation(info="<html>
+ Documentation(info="<html>
+<p>
+Controller for terminal VAV box with hot water reheat and pressure independent damper.
+It is based on the control logic \"dual maximum with constant volume heating\" as
+described in the Advanced VAV System Design Guide (EDR 2007).
+</p>
 <p>
-Controller for terminal box of VAV system with reheat.
+Two separate control loops, the cooling loop and the heating loop, are implemented
+to maintain space temperature within a temperature dead band (with a required minimum
+width of 0.5 K).
+The damper control signal <code>yDam</code> corresponds to the discharge air flow rate
+set point, normalized to the nominal value.
+The control signal for the reheat coil valve <code>yVal</code> corresponds to the
+fractional opening (1 corresponding to the valve fully open).
 </p>
+<ul>
+<li>
+Inside the dead band, <code>yDam</code> is fixed at the minimum value <code>ratVFloMin</code>,
+and  <code>yVal</code> is 0.
+</li>
+<li>
+In heating demand, <code>yDam</code> is fixed at the heating value <code>ratVFloHea</code>,
+and <code>yVal</code> is modulated between 0 and 1.
+</li>
+<li>
+In cooling demand, <code>yDam</code> is modulated between the minimum value 
+<code>ratVFloMin</code> and 1, and <code>yVal</code> is 0.
+</li>
+</ul>
+<p>
+Note that a single maximum control logic can be represented by simply setting
+<code>ratVFloHea</code> equal to <code>ratVFloMin</code> (default setting).
+</p>
+<p>
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.png\" border=\"1\"/>
+</p>
+<h4>References</h4>
+<p>
+EDR (Energy Design Resources).
+<i>Advanced Variable Air Volume System Design Guide</i>.
+Pacific Gas and Electric Company, 2007.
+</p>
+<br/>
 </html>", revisions="<html>
 <ul>
 <li>
+July 10, 2020, by Antoine Gautier:<br/>
+Implemented a dual maximum with constant volume heating control logic.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2028\">#2028</a>.
+</li>
+<li>
+April 24, 2020, by Jianjun Hu:<br/>
+Refactored the model to implement a single maximum control logic.
+The previous implementation led to a maximum air flow rate in heating demand.<br/>
+The input connector <code>TDis</code> is removed. This is non backward compatible.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>.
+</li>
+<li>
 September 20, 2017, by Michael Wetter:<br/>
 Removed blocks with blocks from CDL package.
 </li>
 </ul>
-</html>"));
+</html>"),
+    Diagram(coordinateSystem(extent={{-100,-160},{100,160}})));
 end RoomVAV;
diff --git a/Buildings/Examples/VAVReheat/Controls/State.mo b/Buildings/Examples/VAVReheat/Controls/State.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/VAVReheat/Controls/package.mo b/Buildings/Examples/VAVReheat/Controls/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Examples/VAVReheat/Guideline36.mo b/Buildings/Examples/VAVReheat/Guideline36.mo
index 0aa69579ad9..10f4ab3a3b8 100644
--- a/Buildings/Examples/VAVReheat/Guideline36.mo
+++ b/Buildings/Examples/VAVReheat/Guideline36.mo
@@ -15,8 +15,10 @@ model Guideline36
   parameter Modelica.SIunits.VolumeFlowRate VPriSysMax_flow=m_flow_nominal/1.2
     "Maximum expected system primary airflow rate at design stage";
   parameter Modelica.SIunits.VolumeFlowRate minZonPriFlo[numZon]={
-      mCor_flow_nominal,mSou_flow_nominal,mEas_flow_nominal,mNor_flow_nominal,
-      mWes_flow_nominal}/1.2 "Minimum expected zone primary flow rate";
+    conVAVCor.VDisSetMin_flow, conVAVSou.VDisSetMin_flow,
+    conVAVEas.VDisSetMin_flow, conVAVNor.VDisSetMin_flow,
+    conVAVWes.VDisSetMin_flow}
+    "Minimum expected zone primary flow rate";
   parameter Modelica.SIunits.Time samplePeriod=120
     "Sample period of component, set to the same value as the trim and respond that process yPreSetReq";
   parameter Modelica.SIunits.PressureDifference dpDisRetMax=40
@@ -25,30 +27,6 @@ model Guideline36
   Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller conVAVCor(
     V_flow_nominal=mCor_flow_nominal/1.2,
     AFlo=AFloCor,
-<<<<<<< HEAD
-    final samplePeriod=samplePeriod) "Controller for terminal unit corridor"
-    annotation (Placement(transformation(extent={{530,32},{550,52}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller conVAVSou(
-    V_flow_nominal=mSou_flow_nominal/1.2,
-    AFlo=AFloSou,
-    final samplePeriod=samplePeriod) "Controller for terminal unit south"
-    annotation (Placement(transformation(extent={{700,30},{720,50}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller conVAVEas(
-    V_flow_nominal=mEas_flow_nominal/1.2,
-    AFlo=AFloEas,
-    final samplePeriod=samplePeriod) "Controller for terminal unit east"
-    annotation (Placement(transformation(extent={{880,30},{900,50}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller conVAVNor(
-    V_flow_nominal=mNor_flow_nominal/1.2,
-    AFlo=AFloNor,
-    final samplePeriod=samplePeriod) "Controller for terminal unit north"
-    annotation (Placement(transformation(extent={{1040,30},{1060,50}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller conVAVWes(
-    V_flow_nominal=mWes_flow_nominal/1.2,
-    AFlo=AFloWes,
-    final samplePeriod=samplePeriod) "Controller for terminal unit west"
-    annotation (Placement(transformation(extent={{1240,28},{1260,48}})));
-=======
     final samplePeriod=samplePeriod,
     VDisSetMin_flow=max(1.5*VCorOA_flow_nominal, 0.15*mCor_flow_nominal/1.2),
     VDisHeaSetMax_flow=ratVFloHea*mCor_flow_nominal/1.2)
@@ -86,56 +64,36 @@ model Guideline36
     VDisHeaSetMax_flow=ratVFloHea*mWes_flow_nominal/1.2)
     "Controller for terminal unit west"
     annotation (Placement(transformation(extent={{1240,84},{1260,104}})));
->>>>>>> master
   Modelica.Blocks.Routing.Multiplex5 TDis "Discharge air temperatures"
-    annotation (Placement(transformation(extent={{220,270},{240,290}})));
+    annotation (Placement(transformation(extent={{220,360},{240,380}})));
   Modelica.Blocks.Routing.Multiplex5 VDis_flow
     "Air flow rate at the terminal boxes"
-    annotation (Placement(transformation(extent={{220,230},{240,250}})));
+    annotation (Placement(transformation(extent={{220,320},{240,340}})));
   Buildings.Controls.OBC.CDL.Integers.MultiSum TZonResReq(nin=5)
     "Number of zone temperature requests"
     annotation (Placement(transformation(extent={{300,360},{320,380}})));
   Buildings.Controls.OBC.CDL.Integers.MultiSum PZonResReq(nin=5)
     "Number of zone pressure requests"
-<<<<<<< HEAD
-    annotation (Placement(transformation(extent={{300,330},{320,350}})));
-  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yOutDam(k=1)
-    "Outdoor air damper control signal"
-    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
-=======
     annotation (Placement(transformation(extent={{300,320},{320,340}})));
->>>>>>> master
   Buildings.Controls.OBC.CDL.Logical.Switch swiFreSta "Switch for freeze stat"
     annotation (Placement(transformation(extent={{60,-202},{80,-182}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yFreHeaCoi(final k=1)
     "Flow rate signal for heating coil when freeze stat is on"
     annotation (Placement(transformation(extent={{0,-192},{20,-172}})));
-  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints TZonSet[
-    numZon](
-    final TZonHeaOn=fill(THeaOn, numZon),
-    final TZonHeaOff=fill(THeaOff, numZon),
-    final TZonCooOff=fill(TCooOff, numZon)) "Zone setpoint temperature"
-    annotation (Placement(transformation(extent={{60,300},{80,320}})));
-  Buildings.Controls.OBC.CDL.Routing.BooleanReplicator booRep(
-    final nout=numZon)
-    "Replicate boolean input"
-    annotation (Placement(transformation(extent={{-120,280},{-100,300}})));
-  Buildings.Controls.OBC.CDL.Routing.RealReplicator reaRep(
-    final nout=numZon)
-    "Replicate real input"
-    annotation (Placement(transformation(extent={{-120,320},{-100,340}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Controller conAHU(
+    kMinOut=0.03,
     final pMaxSet=410,
     final yFanMin=yFanMin,
     final VPriSysMax_flow=VPriSysMax_flow,
-    final peaSysPop=1.2*sum({0.05*AFlo[i] for i in 1:numZon})) "AHU controller"
+    final peaSysPop=divP*sum({ratP_A*AFlo[i] for i in 1:numZon}))
+    "AHU controller"
     annotation (Placement(transformation(extent={{340,512},{420,640}})));
   Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.Zone
     zonOutAirSet[numZon](
     final AFlo=AFlo,
     final have_occSen=fill(false, numZon),
     final have_winSen=fill(false, numZon),
-    final desZonPop={0.05*AFlo[i] for i in 1:numZon},
+    final desZonPop={ratP_A*AFlo[i] for i in 1:numZon},
     final minZonPriFlo=minZonPriFlo)
     "Zone level calculation of the minimum outdoor airflow setpoint"
     annotation (Placement(transformation(extent={{220,580},{240,600}})));
@@ -149,61 +107,43 @@ model Guideline36
     "Replicate signal whether the outdoor airflow is required"
     annotation (Placement(transformation(extent={{460,550},{480,570}})));
 
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus zonSta[numZon]
+    "Check zone temperature status"
+    annotation (Placement(transformation(extent={{-220,268},{-200,296}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.GroupStatus zonGroSta(
+    final numZon=numZon) "Check zone group status according to the zones status"
+    annotation (Placement(transformation(extent={{-160,260},{-140,300}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+    opeModSel(final numZon=numZon)
+    annotation (Placement(transformation(extent={{-100,284},{-80,316}})));
+  Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.SetPoints.ZoneTemperatures
+    TZonSet[numZon](
+    final have_occSen=fill(false, numZon),
+    final have_winSen=fill(false, numZon))  "Zone setpoint"
+    annotation (Placement(transformation(extent={{-100,180},{-80,208}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warCooTim[numZon](
+    final k=fill(1800, numZon)) "Warm up and cool down time"
+    annotation (Placement(transformation(extent={{-300,370},{-280,390}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant falSta[numZon](
+    final k=fill(false, numZon))
+    "All windows are closed, no zone has override switch"
+    annotation (Placement(transformation(extent={{-300,330},{-280,350}})));
+  Buildings.Controls.OBC.CDL.Routing.RealReplicator reaRep(nout=numZon)
+    "Assume all zones have same occupancy schedule"
+    annotation (Placement(transformation(extent={{-200,-190},{-180,-170}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanReplicator booRep(nout=numZon)
+    "Assume all zones have same occupancy schedule"
+    annotation (Placement(transformation(extent={{-200,-150},{-180,-130}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant demLimLev[numZon](
+    final  k=fill(0, numZon)) "Demand limit level, assumes to be 0"
+    annotation (Placement(transformation(extent={{-300,230},{-280,250}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerReplicator intRep(
+    final nout=numZon)
+    "All zones in same operation mode"
+    annotation (Placement(transformation(extent={{-140,220},{-120,240}})));
+
 equation
   connect(conVAVCor.TZon, TRooAir.y5[1]) annotation (Line(
-<<<<<<< HEAD
-      points={{528,41},{520,41},{520,162},{511,162}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(conVAVSou.TZon, TRooAir.y1[1]) annotation (Line(
-      points={{698,39},{690,39},{690,40},{680,40},{680,178},{511,178}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(TRooAir.y2[1], conVAVEas.TZon) annotation (Line(
-      points={{511,174},{868,174},{868,39},{878,39}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(TRooAir.y3[1], conVAVNor.TZon) annotation (Line(
-      points={{511,170},{1028,170},{1028,39},{1038,39}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(TRooAir.y4[1], conVAVWes.TZon) annotation (Line(
-      points={{511,166},{1220,166},{1220,37},{1238,37}},
-      color={0,0,127},
-      pattern=LinePattern.Dash));
-  connect(conVAVCor.TDis, TSupCor.T) annotation (Line(points={{528,37},{522,37},
-          {522,40},{514,40},{514,92},{569,92}}, color={0,0,127}));
-  connect(TSupSou.T, conVAVSou.TDis) annotation (Line(points={{749,92},{688,92},
-          {688,35},{698,35}}, color={0,0,127}));
-  connect(TSupEas.T, conVAVEas.TDis) annotation (Line(points={{929,90},{872,90},
-          {872,35},{878,35}}, color={0,0,127}));
-  connect(TSupNor.T, conVAVNor.TDis) annotation (Line(points={{1089,94},{1032,94},
-          {1032,35},{1038,35}},     color={0,0,127}));
-  connect(TSupWes.T, conVAVWes.TDis) annotation (Line(points={{1289,90},{1228,90},
-          {1228,33},{1238,33}},     color={0,0,127}));
-  connect(cor.yVAV, conVAVCor.yDam) annotation (Line(points={{566,50},{556,50},{
-          556,48},{552,48}}, color={0,0,127}));
-  connect(cor.yVal, conVAVCor.yVal) annotation (Line(points={{566,34},{560,34},{
-          560,43},{552,43}}, color={0,0,127}));
-  connect(conVAVSou.yDam, sou.yVAV) annotation (Line(points={{722,46},{730,46},{
-          730,48},{746,48}}, color={0,0,127}));
-  connect(conVAVSou.yVal, sou.yVal) annotation (Line(points={{722,41},{732.5,41},
-          {732.5,32},{746,32}}, color={0,0,127}));
-  connect(conVAVEas.yVal, eas.yVal) annotation (Line(points={{902,41},{912.5,41},
-          {912.5,32},{926,32}}, color={0,0,127}));
-  connect(conVAVEas.yDam, eas.yVAV) annotation (Line(points={{902,46},{910,46},{
-          910,48},{926,48}}, color={0,0,127}));
-  connect(conVAVNor.yDam, nor.yVAV) annotation (Line(points={{1062,46},{1072.5,46},
-          {1072.5,48},{1086,48}},     color={0,0,127}));
-  connect(conVAVNor.yVal, nor.yVal) annotation (Line(points={{1062,41},{1072.5,41},
-          {1072.5,32},{1086,32}},     color={0,0,127}));
-  connect(conVAVWes.yVal, wes.yVal) annotation (Line(points={{1262,39},{1272.5,39},
-          {1272.5,32},{1286,32}},     color={0,0,127}));
-  connect(wes.yVAV, conVAVWes.yDam) annotation (Line(points={{1286,48},{1274,48},
-          {1274,44},{1262,44}}, color={0,0,127}));
-  connect(conVAVCor.yZonTemResReq, TZonResReq.u[1]) annotation (Line(points={{552,38},
-          {554,38},{554,220},{280,220},{280,375.6},{298,375.6}},         color=
-=======
       points={{528,94},{520,94},{520,275},{480,275}},
       color={0,0,127},
       pattern=LinePattern.Dash));
@@ -251,7 +191,6 @@ equation
                                 color={0,0,127}));
   connect(conVAVCor.yZonTemResReq, TZonResReq.u[1]) annotation (Line(points={{552,90},
           {554,90},{554,220},{280,220},{280,375.6},{298,375.6}},         color=
->>>>>>> master
           {255,127,0}));
   connect(conVAVSou.yZonTemResReq, TZonResReq.u[2]) annotation (Line(points={{724,90},
           {726,90},{726,220},{280,220},{280,372.8},{298,372.8}},         color=
@@ -265,71 +204,6 @@ equation
   connect(conVAVWes.yZonTemResReq, TZonResReq.u[5]) annotation (Line(points={{1262,90},
           {1266,90},{1266,220},{280,220},{280,364.4},{298,364.4}},
         color={255,127,0}));
-<<<<<<< HEAD
-  connect(conVAVCor.yZonPreResReq, PZonResReq.u[1]) annotation (Line(points={{552,34},
-          {558,34},{558,214},{288,214},{288,345.6},{298,345.6}},         color=
-          {255,127,0}));
-  connect(conVAVSou.yZonPreResReq, PZonResReq.u[2]) annotation (Line(points={{722,32},
-          {728,32},{728,214},{288,214},{288,342.8},{298,342.8}},         color=
-          {255,127,0}));
-  connect(conVAVEas.yZonPreResReq, PZonResReq.u[3]) annotation (Line(points={{902,32},
-          {906,32},{906,214},{288,214},{288,340},{298,340}},         color={255,
-          127,0}));
-  connect(conVAVNor.yZonPreResReq, PZonResReq.u[4]) annotation (Line(points={{1062,32},
-          {1066,32},{1066,214},{288,214},{288,337.2},{298,337.2}},
-        color={255,127,0}));
-  connect(conVAVWes.yZonPreResReq, PZonResReq.u[5]) annotation (Line(points={{1262,30},
-          {1268,30},{1268,214},{288,214},{288,334.4},{298,334.4}},
-        color={255,127,0}));
-  connect(VSupCor_flow.V_flow, VDis_flow.u1[1]) annotation (Line(points={{569,130},
-          {472,130},{472,206},{180,206},{180,250},{218,250}},      color={0,0,
-          127}));
-  connect(VSupSou_flow.V_flow, VDis_flow.u2[1]) annotation (Line(points={{749,130},
-          {742,130},{742,206},{180,206},{180,245},{218,245}},      color={0,0,
-          127}));
-  connect(VSupEas_flow.V_flow, VDis_flow.u3[1]) annotation (Line(points={{929,128},
-          {914,128},{914,206},{180,206},{180,240},{218,240}},      color={0,0,
-          127}));
-  connect(VSupNor_flow.V_flow, VDis_flow.u4[1]) annotation (Line(points={{1089,132},
-          {1080,132},{1080,206},{180,206},{180,235},{218,235}},      color={0,0,
-          127}));
-  connect(VSupWes_flow.V_flow, VDis_flow.u5[1]) annotation (Line(points={{1289,128},
-          {1284,128},{1284,206},{180,206},{180,230},{218,230}},      color={0,0,
-          127}));
-  connect(TSupCor.T, TDis.u1[1]) annotation (Line(points={{569,92},{466,92},{466,
-          210},{176,210},{176,290},{218,290}},     color={0,0,127}));
-  connect(TSupSou.T, TDis.u2[1]) annotation (Line(points={{749,92},{688,92},{688,
-          210},{176,210},{176,285},{218,285}},                       color={0,0,
-          127}));
-  connect(TSupEas.T, TDis.u3[1]) annotation (Line(points={{929,90},{872,90},{872,
-          210},{176,210},{176,280},{218,280}},     color={0,0,127}));
-  connect(TSupNor.T, TDis.u4[1]) annotation (Line(points={{1089,94},{1032,94},{1032,
-          210},{176,210},{176,275},{218,275}},      color={0,0,127}));
-  connect(TSupWes.T, TDis.u5[1]) annotation (Line(points={{1289,90},{1228,90},{1228,
-          210},{176,210},{176,270},{218,270}},      color={0,0,127}));
-  connect(conVAVCor.VDis_flow, VSupCor_flow.V_flow) annotation (Line(points={{528,39},
-          {522,39},{522,130},{569,130}}, color={0,0,127}));
-  connect(VSupSou_flow.V_flow, conVAVSou.VDis_flow) annotation (Line(points={{749,130},
-          {690,130},{690,37},{698,37}},      color={0,0,127}));
-  connect(VSupEas_flow.V_flow, conVAVEas.VDis_flow) annotation (Line(points={{929,128},
-          {874,128},{874,37},{878,37}},      color={0,0,127}));
-  connect(VSupNor_flow.V_flow, conVAVNor.VDis_flow) annotation (Line(points={{1089,
-          132},{1034,132},{1034,37},{1038,37}}, color={0,0,127}));
-  connect(VSupWes_flow.V_flow, conVAVWes.VDis_flow) annotation (Line(points={{1289,
-          128},{1230,128},{1230,35},{1238,35}}, color={0,0,127}));
-  connect(TSup.T, conVAVCor.TSupAHU) annotation (Line(points={{340,-29},{340,-20},
-          {514,-20},{514,35},{528,35}}, color={0,0,127}));
-  connect(TSup.T, conVAVSou.TSupAHU) annotation (Line(points={{340,-29},{340,-20},
-          {686,-20},{686,33},{698,33}}, color={0,0,127}));
-  connect(TSup.T, conVAVEas.TSupAHU) annotation (Line(points={{340,-29},{340,-20},
-          {864,-20},{864,33},{878,33}}, color={0,0,127}));
-  connect(TSup.T, conVAVNor.TSupAHU) annotation (Line(points={{340,-29},{340,-20},
-          {1028,-20},{1028,33},{1038,33}}, color={0,0,127}));
-  connect(TSup.T, conVAVWes.TSupAHU) annotation (Line(points={{340,-29},{340,-20},
-          {1224,-20},{1224,31},{1238,31}}, color={0,0,127}));
-  connect(yOutDam.y, eco.yExh)
-    annotation (Line(points={{-18,-10},{-3,-10},{-3,-34}}, color={0,0,127}));
-=======
   connect(conVAVCor.yZonPreResReq, PZonResReq.u[1]) annotation (Line(points={{552,86},
           {558,86},{558,214},{288,214},{288,335.6},{298,335.6}},         color=
           {255,127,0}));
@@ -405,56 +279,10 @@ equation
           {986,-20},{986,86},{1036,86}},   color={0,0,127}));
   connect(TSup.T, conVAVWes.TSupAHU) annotation (Line(points={{340,-29},{340,-20},
           {1168,-20},{1168,86},{1238,86}}, color={0,0,127}));
->>>>>>> master
   connect(swiFreSta.y, gaiHeaCoi.u) annotation (Line(points={{82,-192},{88,-192},
           {88,-184},{124,-184}},color={0,0,127}));
   connect(yFreHeaCoi.y, swiFreSta.u1) annotation (Line(points={{22,-182},{40,-182},
           {40,-184},{58,-184}}, color={0,0,127}));
-  connect(TZonSet[1].yOpeMod, conVAVCor.uOpeMod) annotation (Line(points={{82,303},
-          {130,303},{130,180},{420,180},{420,14},{520,14},{520,33},{528,33}},
-        color={255,127,0}));
-  connect(flo.TRooAir, TZonSet.TZon) annotation (Line(points={{1094.14,491.333},
-          {1164,491.333},{1164,662},{46,662},{46,313},{58,313}}, color={0,0,127}));
-  connect(occSch.occupied, booRep.u) annotation (Line(points={{-297,-216},{-160,
-          -216},{-160,290},{-122,290}}, color={255,0,255}));
-  connect(occSch.tNexOcc, reaRep.u) annotation (Line(points={{-297,-204},{-180,-204},
-          {-180,330},{-122,330}}, color={0,0,127}));
-  connect(reaRep.y, TZonSet.tNexOcc) annotation (Line(points={{-98,330},{-20,330},
-          {-20,319},{58,319}}, color={0,0,127}));
-  connect(booRep.y, TZonSet.uOcc) annotation (Line(points={{-98,290},{-20,290},{
-          -20,316.025},{58,316.025}}, color={255,0,255}));
-  connect(TZonSet[1].TZonHeaSet, conVAVCor.TZonHeaSet) annotation (Line(points={
-          {82,310},{524,310},{524,51},{528,51}}, color={0,0,127}));
-  connect(TZonSet[1].TZonCooSet, conVAVCor.TZonCooSet) annotation (Line(points={
-          {82,317},{524,317},{524,49},{528,49}}, color={0,0,127}));
-  connect(TZonSet[2].TZonHeaSet, conVAVSou.TZonHeaSet) annotation (Line(points={
-          {82,310},{694,310},{694,49},{698,49}}, color={0,0,127}));
-  connect(TZonSet[2].TZonCooSet, conVAVSou.TZonCooSet) annotation (Line(points={
-          {82,317},{694,317},{694,47},{698,47}}, color={0,0,127}));
-  connect(TZonSet[3].TZonHeaSet, conVAVEas.TZonHeaSet) annotation (Line(points={
-          {82,310},{860,310},{860,49},{878,49}}, color={0,0,127}));
-  connect(TZonSet[3].TZonCooSet, conVAVEas.TZonCooSet) annotation (Line(points={
-          {82,317},{860,317},{860,47},{878,47}}, color={0,0,127}));
-  connect(TZonSet[4].TZonCooSet, conVAVNor.TZonCooSet) annotation (Line(points={
-          {82,317},{1020,317},{1020,47},{1038,47}}, color={0,0,127}));
-  connect(TZonSet[4].TZonHeaSet, conVAVNor.TZonHeaSet) annotation (Line(points={
-          {82,310},{1020,310},{1020,49},{1038,49}}, color={0,0,127}));
-  connect(TZonSet[5].TZonCooSet, conVAVWes.TZonCooSet) annotation (Line(points={
-          {82,317},{1200,317},{1200,45},{1238,45}}, color={0,0,127}));
-  connect(TZonSet[5].TZonHeaSet, conVAVWes.TZonHeaSet) annotation (Line(points={
-          {82,310},{1200,310},{1200,47},{1238,47}}, color={0,0,127}));
-  connect(TZonSet[1].yOpeMod, conVAVSou.uOpeMod) annotation (Line(points={{82,303},
-          {130,303},{130,180},{420,180},{420,14},{680,14},{680,31},{698,31}},
-        color={255,127,0}));
-  connect(TZonSet[1].yOpeMod, conVAVEas.uOpeMod) annotation (Line(points={{82,303},
-          {130,303},{130,180},{420,180},{420,14},{860,14},{860,31},{878,31}},
-        color={255,127,0}));
-  connect(TZonSet[1].yOpeMod, conVAVNor.uOpeMod) annotation (Line(points={{82,303},
-          {130,303},{130,180},{420,180},{420,14},{1020,14},{1020,31},{1038,31}},
-        color={255,127,0}));
-  connect(TZonSet[1].yOpeMod, conVAVWes.uOpeMod) annotation (Line(points={{82,303},
-          {130,303},{130,180},{420,180},{420,14},{1220,14},{1220,29},{1238,29}},
-        color={255,127,0}));
   connect(zonToSys.ySumDesZonPop, conAHU.sumDesZonPop) annotation (Line(points={{302,589},
           {308,589},{308,609.778},{336,609.778}},           color={0,0,127}));
   connect(zonToSys.VSumDesPopBreZon_flow, conAHU.VSumDesPopBreZon_flow)
@@ -504,17 +332,6 @@ equation
           {444,565.333},{444,560},{458,560}},color={255,0,255}));
   connect(booRep1.y, zonOutAirSet.uReqOutAir) annotation (Line(points={{482,560},
           {496,560},{496,460},{206,460},{206,593},{218,593}}, color={255,0,255}));
-<<<<<<< HEAD
-  connect(flo.TRooAir, zonOutAirSet.TZon) annotation (Line(points={{1094.14,
-          491.333},{1164,491.333},{1164,660},{210,660},{210,590},{218,590}},
-                                                                    color={0,0,127}));
-  connect(TDis.y, zonOutAirSet.TDis) annotation (Line(points={{241,280},{252,280},
-          {252,340},{200,340},{200,587},{218,587}}, color={0,0,127}));
-  connect(VDis_flow.y, zonOutAirSet.VDis_flow) annotation (Line(points={{241,240},
-          {260,240},{260,346},{194,346},{194,584},{218,584}}, color={0,0,127}));
-  connect(TZonSet[1].yOpeMod, conAHU.uOpeMod) annotation (Line(points={{82,303},
-          {140,303},{140,531.556},{336,531.556}}, color={255,127,0}));
-=======
   connect(flo.TRooAir, zonOutAirSet.TZon) annotation (Line(points={{1107.13,506},
           {1164,506},{1164,660},{210,660},{210,590},{218,590}},     color={0,0,127}));
   connect(TDis.y, zonOutAirSet.TDis) annotation (Line(points={{241,370},{252,
@@ -522,15 +339,10 @@ equation
                                                     color={0,0,127}));
   connect(VDis_flow.y, zonOutAirSet.VDis_flow) annotation (Line(points={{241,330},
           {260,330},{260,420},{194,420},{194,584},{218,584}}, color={0,0,127}));
->>>>>>> master
   connect(TZonResReq.y, conAHU.uZonTemResReq) annotation (Line(points={{322,370},
           {330,370},{330,526.222},{336,526.222}}, color={255,127,0}));
-  connect(PZonResReq.y, conAHU.uZonPreResReq) annotation (Line(points={{322,340},
-          {326,340},{326,520.889},{336,520.889}}, color={255,127,0}));
-  connect(TZonSet[1].TZonHeaSet, conAHU.TZonHeaSet) annotation (Line(points={{82,310},
-          {110,310},{110,636.444},{336,636.444}},      color={0,0,127}));
-  connect(TZonSet[1].TZonCooSet, conAHU.TZonCooSet) annotation (Line(points={{82,317},
-          {120,317},{120,631.111},{336,631.111}},      color={0,0,127}));
+  connect(PZonResReq.y, conAHU.uZonPreResReq) annotation (Line(points={{322,330},
+          {326,330},{326,520.889},{336,520.889}}, color={255,127,0}));
   connect(TOut.y, conAHU.TOut) annotation (Line(points={{-279,180},{-260,180},{
           -260,625.778},{336,625.778}},
                                    color={0,0,127}));
@@ -562,8 +374,6 @@ equation
   connect(conAHU.ySupFanSpe, fanSup.y) annotation (Line(points={{424,618.667},{
           432,618.667},{432,-14},{310,-14},{310,-28}},
                                                    color={0,0,127}));
-<<<<<<< HEAD
-=======
   connect(cor.y_actual,conVAVCor.yDam_actual)  annotation (Line(points={{612,42},
           {620,42},{620,74},{518,74},{518,90},{528,90}}, color={0,0,127}));
   connect(sou.y_actual,conVAVSou.yDam_actual)  annotation (Line(points={{792,40},
@@ -721,7 +531,6 @@ equation
           -45},{-100,140},{90,140}}, color={0,127,255}));
   connect(freSta.y, swiFreSta.u2) annotation (Line(points={{-38,-90},{40,-90},{
           40,-192},{58,-192}}, color={255,0,255}));
->>>>>>> master
   annotation (
     Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-380,-320},{1400,
             680}})),
@@ -767,8 +576,6 @@ its input.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 April 30, 2021, by Michael Wetter:<br/>
 Reformulated replaceable class and introduced floor areas in base class
 to avoid access of components that are not in the constraining type.<br/>
@@ -806,7 +613,6 @@ This is
 for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">issue #1873</a>
 </li>
 <li>
->>>>>>> master
 March 20, 2020, by Jianjun Hu:<br/>
 Replaced the AHU controller with reimplemented one. The new controller separates the
 zone level calculation from the system level calculation and does not include
diff --git a/Buildings/Examples/VAVReheat/ThermalZones/package.mo b/Buildings/Examples/VAVReheat/ThermalZones/package.mo
deleted file mode 100755
index e54cfd7b07d..00000000000
--- a/Buildings/Examples/VAVReheat/ThermalZones/package.mo
+++ /dev/null
@@ -1,4 +0,0 @@
-within Buildings.Examples.VAVReheat;
-package ThermalZones "Package with models for the thermal zones"
-extends Modelica.Icons.VariantsPackage;
-end ThermalZones;
diff --git a/Buildings/Examples/VAVReheat/package.mo b/Buildings/Examples/VAVReheat/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Experimental/package.mo b/Buildings/Experimental/package.mo
index 7e54ad177c7..550d706a85b 100644
--- a/Buildings/Experimental/package.mo
+++ b/Buildings/Experimental/package.mo
@@ -5,8 +5,10 @@ package Experimental "Package with experimental models"
   annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains models that are experimental.
-They may be included in the <code>Buildings</code> library
-if they have been shown to be useful.
+The models may change in non-backward compatible ways even
+between minor releases of the <code>Buildings</code> library.
+The models may be moved to other packages of the <code>Buildings</code> library
+if they have been shown to be useful and their development is stable.
 </p>
 </html>"));
 end Experimental;
diff --git a/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
index b44019fd876..5dea608e021 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -25,11 +25,17 @@ model ActuatorSignal
         rotation=270,
         origin={0,120})));
 
-  Modelica.Blocks.Interfaces.RealOutput y_actual "Actual valve position"
+  Modelica.Blocks.Interfaces.RealOutput y_actual
+    "Actual actuator position"
     annotation (Placement(transformation(extent={{40,60},{60,80}})));
 
   // Classes used to implement the filtered opening
 protected
+  parameter Boolean casePreInd = false
+    "In case of PressureIndependent the model I/O is modified"
+    annotation(Evaluate=true);
+  Modelica.Blocks.Interfaces.RealOutput y_internal(unit="1")
+    "Output connector for internal use (= y_actual if not casePreInd)";
   Modelica.Blocks.Interfaces.RealOutput y_filtered if use_inputFilter
     "Filtered valve position in the range 0..1"
     annotation (Placement(transformation(extent={{40,78},{60,98}}),
@@ -56,15 +62,17 @@ equation
   connect(y, filter.u) annotation (Line(
       points={{1.11022e-15,120},{1.11022e-15,88},{4.6,88}},
       color={0,0,127}));
-  connect(filter.y, y_actual) annotation (Line(
+  connect(filter.y, y_internal) annotation (Line(
       points={{20.7,88},{30,88},{30,70},{50,70}},
       color={0,0,127}));
   else
-    connect(y, y_actual) annotation (Line(
+    connect(y, y_internal) annotation (Line(
       points={{1.11022e-15,120},{0,120},{0,70},{50,70}},
       color={0,0,127}));
   end if;
-
+  if not casePreInd then
+    connect(y_internal, y_actual);
+  end if;
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}}), graphics={
         Line(
@@ -116,6 +124,13 @@ for a description of the filter.
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2020, by Antoine Gautier:<br/>
+Add the boolean parameter <code>casePreInd</code>.<br/>
+This is needed for the computation of the damper opening in
+<a href=\"modelica://Buildings.Fluid.Actuators.Dampers.PressureIndependent\">
+Buildings.Fluid.Actuators.Dampers.PressureIndependent</a>.
+</li>
+<li>
 February 21, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Actuators/BaseClasses/Examples/package.order b/Buildings/Fluid/Actuators/BaseClasses/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo
index 37c564954f0..a8b099403c0 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo
@@ -165,11 +165,11 @@ mass flow rate <code>m_flow_nominal</code>, the nominal velocity
 <code>v_nominal</code> and the density of the medium.
 </p>
 <p>
-ASHRAE 825-RP lists the following parameter values as typical (note that the 
+ASHRAE 825-RP lists the following parameter values as typical (note that the
 default values in the model correspond to opposed blades).
 <br/>
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" 
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\"
 style=\"border-collapse:collapse;\">
 <tr>
 <td></td><th>opposed blades</th><th>single blades</th>
diff --git a/Buildings/Fluid/Actuators/BaseClasses/exponentialDamper.mo b/Buildings/Fluid/Actuators/BaseClasses/exponentialDamper.mo
index 604757be45f..cae44bb6cf3 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/exponentialDamper.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/exponentialDamper.mo
@@ -11,7 +11,7 @@ function exponentialDamper
   input Real yL "Lower value for damper curve";
   input Real yU "Upper value for damper curve";
   output Real kThetaSqRt(min=0)
-    "Flow coefficient, kThetaSqRT = =sqrt(kTheta) = sqrt(pressure drop/dynamic pressure)";
+    "Square root of loss coefficient, sqrt(pressure drop/dynamic pressure)";
 protected
   Real yC(min=0, max=1, unit="")
     "y constrained to 0 <= y <= 1 to avoid numerical problems";
diff --git a/Buildings/Fluid/Actuators/BaseClasses/package.order b/Buildings/Fluid/Actuators/BaseClasses/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Actuators/Dampers/Examples/package.order b/Buildings/Fluid/Actuators/Dampers/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Actuators/Dampers/PressureIndependent.mo b/Buildings/Fluid/Actuators/Dampers/PressureIndependent.mo
index 13aa01223d7..10dfbbd8778 100644
--- a/Buildings/Fluid/Actuators/Dampers/PressureIndependent.mo
+++ b/Buildings/Fluid/Actuators/Dampers/PressureIndependent.mo
@@ -3,8 +3,9 @@ model PressureIndependent
   "Model for an air damper whose mass flow is proportional to the input signal"
   extends Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential(
     final linearized=false,
+    final casePreInd=true,
     from_dp=true);
-  input Real phi = l + y_actual*(1 - l)
+  input Real phi = l + y_internal*(1 - l)
     "Ratio actual to nominal mass flow rate of damper, phi=kDam(y)/kDam(y=1)";
   parameter Real l2(unit="1", min=1e-10) = 0.01
     "Gain for mass flow increase if pressure is above nominal pressure"
@@ -12,6 +13,33 @@ model PressureIndependent
   parameter Real deltax(unit="1", min=1E-5) = 0.02 "Transition interval for flow rate"
     annotation(Dialog(tab="Advanced"));
 protected
+  Real kSquInv
+    "Square inverse of flow coefficient (damper plus fixed resistance)";
+  Real kDamSquInv
+    "Square inverse of flow coefficient (damper only)";
+  parameter Real y_min = 2E-2
+    "Minimum value of control signal before zeroing of the opening";
+  parameter Integer sizeSupSplBnd = 5
+    "Number of support points on each quadratic domain for spline interpolation";
+  parameter Integer sizeSupSpl = 2 * sizeSupSplBnd + 3
+    "Total number of support points for spline interpolation";
+  parameter Real[sizeSupSpl] ySupSpl_raw = cat(
+    1,
+    linspace(1, yU, sizeSupSplBnd),
+    {yU-1/3*(yU-yL), (yU+yL)/2, yU-2/3*(yU-yL)},
+    linspace(yL, 0, sizeSupSplBnd))
+    "y values of unsorted support points for spline interpolation";
+  parameter Real[sizeSupSpl] kSupSpl_raw = Buildings.Fluid.Actuators.BaseClasses.exponentialDamper(
+    y=ySupSpl_raw, a=a, b=b, cL=cL, cU=cU, yL=yL, yU=yU) .^ 2
+    "k values of unsorted support points for spline interpolation";
+  parameter Real[sizeSupSpl] ySupSpl(each fixed=false)
+    "y values of sorted support points for spline interpolation";
+  parameter Real[sizeSupSpl] kSupSpl(each fixed=false)
+    "k values of sorted support points for spline interpolation";
+  parameter Integer[sizeSupSpl] idx_sorted(each fixed=false)
+    "Indices of sorted support points";
+  parameter Real[sizeSupSpl] invSplDer(each fixed=false)
+    "Derivatives at support points for spline interpolation";
   parameter Real coeff1 = l2/dpDamper_nominal*m_flow_nominal
     "Parameter for avoiding unnecessary computations";
   parameter Real coeff2 = 1/coeff1
@@ -30,6 +58,72 @@ protected
     "Smooth interpolation result between two flow regimes";
   Modelica.SIunits.PressureDifference dp_smooth
     "Smooth interpolation result between two flow regimes";
+  Real y_actual_smooth(final unit="1")
+    "Fractional opening computed based on m_flow_smooth and dp";
+
+function basicFlowFunction_dp_m_flow
+  "Inverse of flow function that computes that computes the square inverse of flow coefficient"
+  extends Modelica.Icons.Function;
+  input Modelica.SIunits.MassFlowRate m_flow
+    "Mass flow rate in design flow direction";
+  input Modelica.SIunits.PressureDifference dp
+    "Pressure difference between port_a and port_b (= port_a.p - port_b.p)";
+  input Modelica.SIunits.MassFlowRate m_flow_small
+    "Minimum value of mass flow rate guarding against k=(0)/sqrt(dp)";
+  input Modelica.SIunits.PressureDifference dp_small
+    "Minimum value of pressure drop guarding against k=m_flow/(0)";
+  output Real kSquInv
+    "Square inverse of flow coefficient";
+  protected
+  Modelica.SIunits.PressureDifference dpPos=
+    Buildings.Utilities.Math.Functions.smoothMax(dp, -dp, dp_small)
+    "Regularized absolute value of pressure drop";
+  Real mSqu_flow = Buildings.Utilities.Math.Functions.smoothMax(
+    m_flow^2, m_flow_small^2, m_flow_small^2)
+    "Regularized square value of mass flow rate";
+algorithm
+  kSquInv := dpPos / mSqu_flow;
+annotation (smoothOrder=1);
+end basicFlowFunction_dp_m_flow;
+
+function exponentialDamper_inv
+  "Inverse function of the exponential damper characteristics"
+  extends Modelica.Icons.Function;
+  input Real kTheta "Loss coefficient";
+  input Real[:] kSupSpl "k values of support points";
+  input Real[:] ySupSpl "y values of support points";
+  input Real[:] invSplDer "Derivatives at support points";
+  output Real y "Fractional opening";
+  protected
+  parameter Integer sizeSupSpl = size(kSupSpl, 1) "Number of spline support points";
+  Integer i "Integer to select data interval";
+algorithm
+  i := 1;
+  for j in 2:sizeSupSpl loop
+    if kTheta <= kSupSpl[j] then
+      i := j;
+      break;
+    end if;
+  end for;
+  y := Buildings.Utilities.Math.Functions.smoothLimit(
+    Buildings.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
+      x=kTheta,
+      x1=kSupSpl[i - 1],
+      x2=kSupSpl[i],
+      y1=ySupSpl[i - 1],
+      y2=ySupSpl[i],
+      y1d=invSplDer[i - 1],
+      y2d=invSplDer[i]),
+    0,
+    1,
+    1E-3);
+annotation (smoothOrder=1);
+end exponentialDamper_inv;
+
+initial equation
+  (kSupSpl, idx_sorted) = Modelica.Math.Vectors.sort(kSupSpl_raw, ascending=true);
+  ySupSpl = ySupSpl_raw[idx_sorted];
+  invSplDer = Buildings.Utilities.Math.Functions.splineDerivatives(x=kSupSpl, y=ySupSpl);
 equation
   // From TwoWayPressureIndependent valve model
   m_flow_set = m_flow_nominal*phi;
@@ -125,8 +219,22 @@ equation
                                      m_flow_der2=0),
                  y2dd=y2dd)));
   end if;
-
-
+  // Computation of damper opening
+  kSquInv = basicFlowFunction_dp_m_flow(
+    m_flow=m_flow,
+    dp=dp,
+    m_flow_small=1E-3*abs(m_flow_nominal),
+    dp_small=1E-4*dp_nominal_pos);
+  kDamSquInv = if dpFixed_nominal > Modelica.Constants.eps then
+    kSquInv - 1 / kFixed^2 else kSquInv;
+  // Use of regStep might no longer be needed when the leakage flow modeling is updated.
+  y_actual_smooth = Buildings.Utilities.Math.Functions.regStep(
+    x=y_internal - y_min,
+    y1=exponentialDamper_inv(
+      kTheta=kDamSquInv*2*rho*A^2, kSupSpl=kSupSpl, ySupSpl=ySupSpl, invSplDer=invSplDer),
+    y2=0,
+    x_small=1E-3);
+  // Homotopy transformation
   if homotopyInitialization then
     if from_dp then
       m_flow=homotopy(actual=m_flow_smooth,
@@ -135,12 +243,16 @@ equation
       dp=homotopy(actual=dp_smooth,
                   simplified=dp_nominal_pos*m_flow/m_flow_nominal_pos);
     end if;
+    y_actual = homotopy(
+      actual=y_actual_smooth,
+      simplified=y);
   else
     if from_dp then
       m_flow=m_flow_smooth;
     else
       dp=dp_smooth;
     end if;
+    y_actual = y_actual_smooth;
   end if;
 annotation (
   defaultComponentName="damPreInd",
@@ -154,15 +266,60 @@ in which case a <code>kDam = m_flow_nominal/sqrt(dp_nominal)</code> characterist
 <p>
 The model is similar to
 <a href=\"modelica://Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent\">
-Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent</a>, except for adaptations for damper parameters.
+Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent</a>,
+except for adaptations for damper parameters.
 Please see that documentation for more information.
 </p>
+<h4>Computation of the damper opening</h4>
+<p>
+The fractional opening of the damper is computed by
+</p>
+<ul>
+<li>
+inverting the quadratic flow function to compute the flow coefficient
+from the flow rate and the pressure drop values (under the assumption
+of a turbulent flow regime);
+</li>
+<li>
+inverting the exponential characteristics to compute the fractional opening
+from the loss coefficient value (directly derived from the flow coefficient).
+</li>
+</ul>
+<p>
+The quadratic interpolation used outside the exponential domain in the function
+<a href=\"modelica://Buildings.Fluid.Actuators.BaseClasses.exponentialDamper\">
+Buildings.Fluid.Actuators.BaseClasses.exponentialDamper</a>
+yields a local extremum.
+Therefore, the formal inversion of the function is not possible.
+A cubic spline is used instead to fit the inverse of the damper characteristics.
+The central domain of the characteritics having a monotonous exponential profile, its
+inverse can be properly approximated with three equidistant support points.
+However, the quadratic functions used outside of the exponential domain can have
+various profiles depending on the damper coefficients.
+Therefore, five linearly distributed support points are used on each side domain to
+ensure a good fit of the inverse.
+</p>
+<p>
+Note that below a threshold value of the input control signal (fixed at 0.02),
+the fractional opening is forced to zero and no more related to the actual
+flow coefficient of the damper.
+This avoids steep transients of the computed opening while transitioning from reverse flow.
+This is to be considered as a modeling workaround (avoiding the introduction of
+an additional state variable) to prevent control chattering during
+shut off operation where the pressure difference at the damper boundaries
+can vary between slightly positive and negative values due to outdoor pressure
+variations.
+</p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+April 6, 2020, by Antoine Gautier:<br/>
+Added the computation of the damper opening.
+</li>
+<li>
 December 23, 2019 by Antoine Gautier:<br/>
-Refactored as the model can now extend directly 
+Refactored as the model can now extend directly
 <a href=\"modelica://Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential\">
 Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential</a>.<br/>
 This is for
diff --git a/Buildings/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo b/Buildings/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo
new file mode 100644
index 00000000000..3ec9fd7cd33
--- /dev/null
+++ b/Buildings/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo
@@ -0,0 +1,174 @@
+within Buildings.Fluid.Actuators.Dampers.Validation;
+model PressureIndependent
+  "Test model for the pressure independent damper model"
+  extends Modelica.Icons.Example;
+
+  package Medium = Buildings.Media.Air "Medium model for air";
+  parameter Modelica.SIunits.PressureDifference dp_nominal(
+    displayUnit="Pa") = 10
+    "Damper nominal pressure drop";
+  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+    "Damper nominal mass flow rate";
+  Buildings.Fluid.Actuators.Dampers.Exponential damExp(
+    redeclare final package Medium = Medium,
+    use_inputFilter=false,
+    final dpDamper_nominal=dp_nominal,
+    final m_flow_nominal=m_flow_nominal)
+    "Damper with exponential opening characteristics"
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+  Modelica.Blocks.Sources.Ramp yRam(
+    duration=0.3,
+    offset=0,
+    startTime=0.3,
+    height=1) "Ramp up damper control signal"
+    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+  Buildings.Fluid.Sources.Boundary_pT sou(
+    redeclare final package Medium = Medium,
+    use_p_in=true,
+    p(displayUnit="Pa") = 101335,
+    T=293.15,
+    nPorts=4) "Pressure boundary condition"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Fluid.Sources.Boundary_pT sin(
+    redeclare final package Medium = Medium,
+    nPorts=4) "Pressure boundary condition"
+    annotation (Placement(transformation(extent={{102,-10},{82,10}})));
+  Buildings.Fluid.Actuators.Dampers.PressureIndependent damPreInd(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final dpDamper_nominal=dp_nominal,
+    use_inputFilter=false)
+    "Pressure independent damper"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Exponential damExpPI(
+    redeclare final package Medium = Medium,
+    use_inputFilter=false,
+    final dpDamper_nominal=dp_nominal,
+    final m_flow_nominal=m_flow_nominal)
+    "Damper with exponential opening characteristics"
+    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
+  Controls.Continuous.LimPID conPID(k=10,
+    Ti=0.001,
+    controllerType=Modelica.Blocks.Types.SimpleController.PID,
+    initType=Modelica.Blocks.Types.InitPID.InitialState)
+    "Discharge flow rate controller"
+    annotation (Placement(transformation(extent={{-70,-70},{-50,-50}})));
+  Sensors.MassFlowRate senMasFlo(
+    redeclare final package Medium = Medium)
+    "Discharge flow rate sensor"
+    annotation (Placement(transformation(extent={{30,-70},{50,-90}})));
+  Modelica.Blocks.Sources.Ramp yRam1(
+    duration=0.3,
+    offset=Medium.p_default - 20,
+    startTime=0,
+    height=40) "Ram up supply pressure"
+    annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
+  Modelica.Blocks.Sources.Ramp yRam2(
+    duration=0.3,
+    offset=0,
+    startTime=0.7,
+    height=-40) "Ramp down supply pressure"
+    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
+  Modelica.Blocks.Math.Add add
+    annotation (Placement(transformation(extent={{-52,30},{-32,50}})));
+  Sensors.RelativePressure senRelPre(
+    redeclare final package Medium = Medium)
+    "Pressure drop sensor"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Modelica.Blocks.Math.Gain gain(final k=1/m_flow_nominal)
+    "Normalize discharge flow rate"
+    annotation (Placement(transformation(extent={{-20,-110},{-40,-90}})));
+equation
+  connect(damExp.port_a, sou.ports[1]) annotation (Line(points={{0,-40},{-20,-40},
+          {-20,3},{-30,3}}, color={0,127,255}));
+  connect(damExp.port_b, sin.ports[1]) annotation (Line(points={{20,-40},{60,
+          -40},{60,3},{82,3}},
+                          color={0,127,255}));
+  connect(sou.ports[2], damPreInd.port_a) annotation (Line(points={{-30,1},{-20,
+          1},{-20,0},{0,0}}, color={0,127,255}));
+  connect(damPreInd.port_b, sin.ports[2])
+    annotation (Line(points={{20,0},{48,0},{48,1},{82,1}}, color={0,127,255}));
+  connect(yRam.y, damPreInd.y) annotation (Line(points={{1,80},{40,80},{40,20},{
+          10,20},{10,12}}, color={0,0,127}));
+  connect(damPreInd.y_actual, damExp.y) annotation (Line(points={{15,7},{40,7},{
+          40,-20},{10,-20},{10,-28}}, color={0,0,127}));
+  connect(damExpPI.port_b, senMasFlo.port_a)
+    annotation (Line(points={{20,-80},{30,-80}}, color={0,127,255}));
+  connect(senMasFlo.port_b, sin.ports[3]) annotation (Line(points={{50,-80},{68,
+          -80},{68,-1},{82,-1}},             color={0,127,255}));
+  connect(sou.ports[3], damExpPI.port_a) annotation (Line(points={{-30,-1},{-20,
+          -1},{-20,-80},{0,-80}}, color={0,127,255}));
+  connect(conPID.y, damExpPI.y)
+    annotation (Line(points={{-49,-60},{10,-60},{10,-68}}, color={0,0,127}));
+  connect(yRam.y, conPID.u_s) annotation (Line(points={{1,80},{40,80},{40,100},{
+          -100,100},{-100,-60},{-72,-60}},
+                                    color={0,0,127}));
+  connect(yRam1.y, add.u1) annotation (Line(points={{-69,80},{-60,80},{-60,46},
+          {-54,46}}, color={0,0,127}));
+  connect(yRam2.y, add.u2) annotation (Line(points={{-69,40},{-60,40},{-60,34},
+          {-54,34}}, color={0,0,127}));
+  connect(add.y, sou.p_in) annotation (Line(points={{-31,40},{-26,40},{-26,20},{
+          -60,20},{-60,8},{-52,8}},  color={0,0,127}));
+  connect(sou.ports[4], senRelPre.port_a) annotation (Line(points={{-30,-3},{-20,
+          -3},{-20,40},{0,40}}, color={0,127,255}));
+  connect(senRelPre.port_b, sin.ports[4]) annotation (Line(points={{20,40},{60,
+          40},{60,-3},{82,-3}},
+                            color={0,127,255}));
+  connect(senMasFlo.m_flow, gain.u)
+    annotation (Line(points={{40,-91},{40,-100},{-18,-100}}, color={0,0,127}));
+  connect(gain.y, conPID.u_m) annotation (Line(points={{-41,-100},{-60,-100},{-60,
+          -72}}, color={0,0,127}));
+    annotation (experiment(Tolerance=1e-6, StopTime=1.0),
+__Dymola_Commands(
+file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Validation/PressureIndependent.mos"
+"Simulate and plot"),
+Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Fluid.Actuators.Dampers.PressureIndependent\">
+Buildings.Fluid.Actuators.Dampers.PressureIndependent</a>
+by comparing it with
+</p>
+<ul>
+<li>
+an exponential damper model which opening is the one computed by the
+pressure independent model, see <code>damExp</code>,
+</li>
+<li>
+an exponential damper model which opening is computed by a PI controller
+tracking the same discharge mass flow rate, see <code>damExpPI</code>.
+</li>
+</ul>
+<p>
+The simulation consists in exposing these three models to
+<ol>
+<li>
+a first increase in the pressure drop at the damper boundaries, from negative
+to positive values, with a zero input control signal,
+</li>
+<li>
+a consecutive increase of input control signal, from zero to one, with a
+constant pressure drop at the damper boundaries,
+</li>
+<li>
+an eventual decrease in the pressure drop, from positive to negative values,
+with an input control signal equal to one.
+</li>
+</ol>
+<p>
+One can notice a small variation of the computed damper opening in the last
+transient around flow reversal.
+This is because the expression of the flow coefficient as a function of the
+mass flow rate and pressure drop is ill-defined near zero flow rate and
+the damper opening value results from the regularization process.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 5, 2020 by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})));
+end PressureIndependent;
diff --git a/Buildings/Fluid/Actuators/Dampers/Validation/package.mo b/Buildings/Fluid/Actuators/Dampers/Validation/package.mo
new file mode 100644
index 00000000000..cb59d5f21b4
--- /dev/null
+++ b/Buildings/Fluid/Actuators/Dampers/Validation/package.mo
@@ -0,0 +1,18 @@
+within Buildings.Fluid.Actuators.Dampers;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Fluid.Actuators.Dampers\">
+Buildings.Fluid.Actuators.Dampers</a>.
+</p>
+<p>
+Note that most validation models contain simple input data which may not be realistic,
+but for which the correct output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these solutions.
+These model outputs are stored as reference data and used for continuous validation
+whenever models in the library change.
+</html>"));
+end Validation;
diff --git a/Buildings/Fluid/Actuators/Dampers/Validation/package.order b/Buildings/Fluid/Actuators/Dampers/Validation/package.order
new file mode 100644
index 00000000000..e82f69cd961
--- /dev/null
+++ b/Buildings/Fluid/Actuators/Dampers/Validation/package.order
@@ -0,0 +1 @@
+PressureIndependent
diff --git a/Buildings/Fluid/Actuators/Dampers/package.order b/Buildings/Fluid/Actuators/Dampers/package.order
old mode 100755
new mode 100644
index 916a60fe316..aaf4591d745
--- a/Buildings/Fluid/Actuators/Dampers/package.order
+++ b/Buildings/Fluid/Actuators/Dampers/package.order
@@ -3,3 +3,4 @@ MixingBox
 MixingBoxMinimumFlow
 PressureIndependent
 Examples
+Validation
diff --git a/Buildings/Fluid/Actuators/Motors/Examples/package.order b/Buildings/Fluid/Actuators/Motors/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Actuators/Motors/package.order b/Buildings/Fluid/Actuators/Motors/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Actuators/Valves/Examples/package.order b/Buildings/Fluid/Actuators/Valves/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo b/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo
index 218ae2f78ab..f86b87ed645 100644
--- a/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo
+++ b/Buildings/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo
@@ -2,7 +2,7 @@ within Buildings.Fluid.Actuators.Valves;
 model TwoWayEqualPercentage
   "Two way valve with equal percentage flow characteristics"
   extends BaseClasses.PartialTwoWayValveKv(
-    phi=max(0, if homotopyInitialization then
+    phi=max(0.1*l, if homotopyInitialization then
         homotopy(actual=Buildings.Fluid.Actuators.BaseClasses.equalPercentage(
         y_actual,
         R,
@@ -40,6 +40,14 @@ as the regularization near the origin.
 </html>", revisions="<html>
 <ul>
 <li>
+August 7, 2020, by Ettore Zanetti:<br/>
+changed the computation of <code>phi</code> using
+<code>max(0.1*l, . )</code> to avoid
+phi=0.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1376\">
+issue 1376</a>.
+</li>
+<li>
 February 21, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayLinear.mo b/Buildings/Fluid/Actuators/Valves/TwoWayLinear.mo
index ead8b500592..64141ca5ae3 100644
--- a/Buildings/Fluid/Actuators/Valves/TwoWayLinear.mo
+++ b/Buildings/Fluid/Actuators/Valves/TwoWayLinear.mo
@@ -1,6 +1,6 @@
 within Buildings.Fluid.Actuators.Valves;
 model TwoWayLinear "Two way valve with linear flow characteristics"
-  extends BaseClasses.PartialTwoWayValveKv(phi=max(0, l + y_actual*(1 - l)));
+  extends BaseClasses.PartialTwoWayValveKv(phi=max(0.1*l, l + y_actual*(1 - l)));
 
 initial equation
   // Since the flow model Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
@@ -22,6 +22,14 @@ as the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+August 7, 2020, by Ettore Zanetti:<br/>
+changed the computation of <code>phi</code> using
+<code>max(0.1*l, . )</code> to avoid
+phi=0.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1376\">
+issue 1376</a>.
+</li>
+<li>
 November 9, 2019, by Filip Jorissen:<br/>
 Guarded the computation of <code>phi</code> using
 <code>max(0, . )</code> to avoid
diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayPolynomial.mo b/Buildings/Fluid/Actuators/Valves/TwoWayPolynomial.mo
index f703b8369be..679005a93c6 100644
--- a/Buildings/Fluid/Actuators/Valves/TwoWayPolynomial.mo
+++ b/Buildings/Fluid/Actuators/Valves/TwoWayPolynomial.mo
@@ -1,7 +1,7 @@
 within Buildings.Fluid.Actuators.Valves;
 model TwoWayPolynomial "Two way valve with polynomial characteristic"
   extends Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValveKv(
-    phi=max(0, l + pol_y*(1 - l)));
+    phi=max(0.1*l, l + pol_y*(1 - l)));
 
   parameter Real[:] c
     "Polynomial coefficients, starting with fixed offset";
@@ -51,6 +51,14 @@ as the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+August 7, 2020, by Ettore Zanetti:<br/>
+changed the computation of <code>phi</code> using
+<code>max(0.1*l, . )</code> to avoid
+phi=0.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1376\">
+issue 1376</a>.
+</li>
+<li>
 November 9, 2019, by Filip Jorissen:<br/>
 Guarded the computation of <code>phi</code> using
 <code>max(0, . )</code> to avoid
diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo b/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
index 175ac230f67..d53bca03ec8 100644
--- a/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
+++ b/Buildings/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo
@@ -3,7 +3,7 @@ model TwoWayPressureIndependent "Model of a pressure-independent two way valve"
   extends Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
             final linearized = false,
             from_dp=true,
-            phi=max(0, l + y_actual*(1 - l)));
+            phi=max(0.1*l, l + y_actual*(1 - l)));
 
   parameter Real l2(min=1e-10) = 0.01
     "Gain for mass flow increase if pressure is above nominal pressure"
@@ -220,6 +220,14 @@ can serve both puroposes.
 revisions="<html>
 <ul>
 <li>
+August 7, 2020, by Ettore Zanetti:<br/>
+changed the computation of <code>phi</code> using
+<code>max(0.1*l, . )</code> to avoid
+phi=0.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1376\">
+issue 1376</a>.
+</li>
+<li>
 November 9, 2019, by Filip Jorissen:<br/>
 Guarded the computation of <code>phi</code> using
 <code>max(0, . )</code> to avoid
diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayQuickOpening.mo b/Buildings/Fluid/Actuators/Valves/TwoWayQuickOpening.mo
index 30832bd054d..9f4ec1c0755 100644
--- a/Buildings/Fluid/Actuators/Valves/TwoWayQuickOpening.mo
+++ b/Buildings/Fluid/Actuators/Valves/TwoWayQuickOpening.mo
@@ -2,7 +2,7 @@ within Buildings.Fluid.Actuators.Valves;
 model TwoWayQuickOpening
   "Two way valve with quick opening flow characteristics"
   extends BaseClasses.PartialTwoWayValveKv(
-    phi=max(0,
+    phi=max(0.1*l,
          if homotopyInitialization then
            homotopy(
              actual=l + Modelica.Fluid.Utilities.regPow(
@@ -39,6 +39,14 @@ as the regularization near the origin.
 revisions="<html>
 <ul>
 <li>
+August 7, 2020, by Ettore Zanetti:<br/>
+changed the computation of <code>phi</code> using
+<code>max(0.1*l, . )</code> to avoid
+phi=0.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1376\">
+issue 1376</a>.
+</li>
+<li>
 November 9, 2019, by Filip Jorissen:<br/>
 Guarded the computation of <code>phi</code> using
 <code>max(0, . )</code> to avoid
diff --git a/Buildings/Fluid/Actuators/Valves/TwoWayTable.mo b/Buildings/Fluid/Actuators/Valves/TwoWayTable.mo
index 8e445d816a5..1a2ad1bd33d 100644
--- a/Buildings/Fluid/Actuators/Valves/TwoWayTable.mo
+++ b/Buildings/Fluid/Actuators/Valves/TwoWayTable.mo
@@ -1,7 +1,7 @@
 within Buildings.Fluid.Actuators.Valves;
 model TwoWayTable "Two way valve with table-specified flow characteristics"
   extends BaseClasses.PartialTwoWayValveKv(
-    phi=max(0, phiLooUp.y[1]),
+    phi=max(0.1*l, phiLooUp.y[1]),
     final l = phiLooUp.table[1, 2]);
   parameter Data.Generic flowCharacteristics "Table with flow characteristics"
     annotation (choicesAllMatching=true, Placement(transformation(extent={{-80,
@@ -131,6 +131,14 @@ Buildings.Fluid.Actuators.Valves.Examples.TwoWayValveTable</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+August 7, 2020, by Ettore Zanetti:<br/>
+changed the computation of <code>phi</code> using
+<code>max(0.1*l, . )</code> to avoid
+phi=0.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1376\">
+issue 1376</a>.
+</li>
+<li>
 November 9, 2019, by Filip Jorissen:<br/>
 Guarded the computation of <code>phi</code> using
 <code>max(0, . )</code> to avoid
diff --git a/Buildings/Fluid/Actuators/Valves/package.order b/Buildings/Fluid/Actuators/Valves/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Actuators/package.order b/Buildings/Fluid/Actuators/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/BaseClasses/FlowModels/package.order b/Buildings/Fluid/BaseClasses/FlowModels/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo b/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo
index c76f629bce5..97b7803c1cd 100644
--- a/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo
+++ b/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo
@@ -58,7 +58,6 @@ model BoilerPolynomialClosedLoop "Boiler with closed loop control"
   Controls.Continuous.LimPID conPID(
     Td=1,
     k=0.5,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     Ti=100)
           annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
   Modelica.Blocks.Sources.Constant TSetHea(k=273.15 + 40)
diff --git a/Buildings/Fluid/CHPs/BaseClasses/AssertFuelFlow.mo b/Buildings/Fluid/CHPs/BaseClasses/AssertFuelFlow.mo
new file mode 100644
index 00000000000..6455ee1abb7
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/AssertFuelFlow.mo
@@ -0,0 +1,88 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model AssertFuelFlow "Assert whether fuel flow is within boundary"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Real dmFueMax_flow(final unit="kg/s2")
+    "Maximum rate at which fuel mass flow rate can change";
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mFue_flow(
+    final unit="kg/s") "Fuel mass flow rate"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMes(
+    final message="Rate of change in the fuel mass flow rate is outside boundaries!")
+    "Assert function for checking fuel flow rate"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Logical.Not not1
+    "Check if fuel flow rate is changing slowly"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
+    final uLow=0.99*dmFueMax_flow,
+    final uHigh=1.01*dmFueMax_flow + 1e-6)
+    "Check if fuel mass flow rate is changing too much"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Modelica.Blocks.Continuous.Derivative floChaRat(
+    final initType=Modelica.Blocks.Types.Init.InitialOutput)
+    "Rate at which fuel mass flow rate changes"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Abs abs1 "Absolute value"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+
+equation
+  connect(abs1.u, floChaRat.y)
+    annotation (Line(points={{-42,0},{-59,0}}, color={0,0,127}));
+  connect(floChaRat.u, mFue_flow)
+    annotation (Line(points={{-82,0},{-120,0}}, color={0,0,127}));
+  connect(not1.y, assMes.u)
+    annotation (Line(points={{62,0},{68,0}}, color={255,0,255}));
+  connect(abs1.y, hys.u)
+    annotation (Line(points={{-18,0},{-2,0}}, color={0,0,127}));
+  connect(hys.y, not1.u)
+    annotation (Line(points={{22,0},{38,0}}, color={255,0,255}));
+
+annotation (
+  defaultComponentName="assFue",
+  Diagram(coordinateSystem(extent={{-100,-100},{100,100}})), Icon(
+        coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{0,80},{-80,-60},{80,-60},{0,80}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Polygon(
+          points={{0,72},{-72,-56},{72,-56},{0,72}},
+          lineColor={0,0,0},
+          fillColor={255,255,170},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-4,38},{2,-24}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Ellipse(
+          extent={{-6,-32},{4,-42}},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+   Documentation(info="<html>
+<p>
+The model sends a warning message if the rate at which the fuel mass flow rate changes
+is outside the boundaries defined by the manufacturer.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertFuelFlow;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/AssertPower.mo b/Buildings/Fluid/CHPs/BaseClasses/AssertPower.mo
new file mode 100644
index 00000000000..bb39c0a26c7
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/AssertPower.mo
@@ -0,0 +1,126 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model AssertPower "Assert if electric power is outside boundaries"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Modelica.SIunits.Power PEleMax
+    "Maximum power output";
+  parameter Modelica.SIunits.Power PEleMin
+    "Minimum power output";
+  parameter Boolean use_powerRateLimit
+    "If true, the rate at which net power output can change is limited";
+  parameter Real dPEleMax(final unit="W/s")
+    "Maximum rate at which net power output can change";
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEleDem(
+    final unit="W")
+    "Electric power demand"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMesP(
+    final message="Electric power is outside boundaries!")
+    "Generate warning when the electric power demand is out of the range"
+    annotation (Placement(transformation(extent={{70,10},{90,30}})));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMesDP(
+    final message="Rate of change in power output is outside boundaries!") if use_powerRateLimit
+    "Assert function for checking power rate"
+    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Logical.Nor nor
+    "Check if the electric power demand is out of the power production range"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not2 if use_powerRateLimit "Logical Nand"
+    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
+  Modelica.Blocks.Continuous.Derivative demRat(
+    final initType=Modelica.Blocks.Types.Init.InitialOutput) if use_powerRateLimit
+    "Power demand rate"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Abs abs1 if use_powerRateLimit "Absolute value"
+    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold maxRat(final t=
+        dPEleMax) if use_powerRateLimit
+    "Check if demand rate is more than the maximum rate"
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis maxPow(
+    final uLow=0.99*PEleMax,
+    final uHigh=1.01*PEleMax + 1e-6)
+    "Check if the electric power demand is more than the maximum power production"
+    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis minPow(
+    final uLow=0.99*PEleMin - 1e-6,
+    final uHigh=1.01*PEleMin)
+    "Check if the electric power demand is larger than the minimum power production"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not1
+    "Check if the electric power demand is less than the minimum power production"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+
+equation
+  connect(abs1.u, demRat.y) annotation (Line(points={{-42,-40},{-59,-40}},
+          color={0,0,127}));
+  connect(maxRat.u, abs1.y) annotation (Line(points={{-2,-40},{-18,-40}},
+          color={0,0,127}));
+  connect(demRat.u, PEleDem) annotation (Line(points={{-82,-40},{-90,-40},{-90,0},
+          {-120,0}}, color={0,0,127}));
+  connect(nor.y, assMesP.u) annotation (Line(points={{62,20},{68,20}},
+          color={255,0,255}));
+  connect(not2.y, assMesDP.u) annotation (Line(points={{62,-40},{68,-40}},
+          color={255,0,255}));
+  connect(PEleDem, maxPow.u) annotation (Line(points={{-120,0},{-90,0},{-90,40},
+          {-42,40}}, color={0,0,127}));
+  connect(maxPow.y, nor.u1) annotation (Line(points={{-18,40},{0,40},{0,20},{38,
+          20}}, color={255,0,255}));
+  connect(PEleDem, minPow.u) annotation (Line(points={{-120,0},{-82,0}},
+          color={0,0,127}));
+  connect(minPow.y, not1.u) annotation (Line(points={{-58,0},{-42,0}},
+          color={255,0,255}));
+  connect(not1.y, nor.u2) annotation (Line(points={{-18,0},{0,0},{0,12},{38,12}},
+          color={255,0,255}));
+  connect(maxRat.y, not2.u)
+    annotation (Line(points={{22,-40},{38,-40}}, color={255,0,255}));
+
+annotation (
+  defaultComponentName="assPow",
+  Diagram(coordinateSystem(extent={{-100,-80},{100,80}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),   graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{0,80},{-80,-60},{80,-60},{0,80}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Polygon(
+          points={{0,72},{-72,-56},{72,-56},{0,72}},
+          lineColor={0,0,0},
+          fillColor={255,255,170},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-4,38},{2,-24}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Ellipse(
+          extent={{-6,-32},{4,-42}},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+  Documentation(info="<html>
+<p>
+The model sends a warning message if the power demand is outside the boundaries defined by the manufacturer.
+Limits can be specified for the minimal and maximal electric power, and for the maximum rate at
+which the power can change.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertPower;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo b/Buildings/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo
new file mode 100644
index 00000000000..e7ea7834c13
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/AssertWaterFlow.mo
@@ -0,0 +1,89 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model AssertWaterFlow "Assert if water flow is outside boundaries"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Modelica.SIunits.MassFlowRate mWatMin_flow
+    "Minimum cooling water mass flow rate";
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput runSig
+    "True when electricity or heat demand is larger than zero"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mWat_flow(
+    final unit="kg/s")
+    "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMes(
+    final message="Water flow rate is lower than the minimum!")
+    "Assert function for checking water flow rate"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Logical.Nand nand "Logical Nand"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
+    final uLow=0.99*mWatMin_flow - 1e-6,
+    final uHigh=1.01*mWatMin_flow)
+    "Check if water flow rate is larger than minimum rate"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not1
+    "Check if water flow rate is smaller than minimum rate"
+    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+
+equation
+  connect(hys.u, mWat_flow) annotation (Line(points={{-82,-40},{-120,-40}},
+          color={0,0,127}));
+  connect(nand.u1, runSig) annotation (Line(points={{18,0},{0,0},{0,40},{-120,40}},
+          color={255,0,255}));
+  connect(nand.y, assMes.u) annotation (Line(points={{42,0},{58,0}},
+          color={255,0,255}));
+  connect(nand.u2, not1.y) annotation (Line(points={{18,-8},{0,-8},{0,-40},{-18,
+          -40}}, color={255,0,255}));
+  connect(not1.u, hys.y) annotation (Line(points={{-42,-40},{-58,-40}},
+          color={255,0,255}));
+
+annotation (
+  defaultComponentName="assWatMas",
+  Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{0,80},{-80,-60},{80,-60},{0,80}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Polygon(
+          points={{0,72},{-72,-56},{72,-56},{0,72}},
+          lineColor={0,0,0},
+          fillColor={255,255,170},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-4,38},{2,-24}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Ellipse(
+          extent={{-6,-32},{4,-42}},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+  Documentation(info="<html>
+<p>
+The model sends a warning message if the water mass flow rate is lower than the
+minimum defined by the manufacturer.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertWaterFlow;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo b/Buildings/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo
new file mode 100644
index 00000000000..3848166f10a
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/AssertWaterTemperature.mo
@@ -0,0 +1,83 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model AssertWaterTemperature
+  "Assert if water outlet temperature is outside boundaries"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Modelica.SIunits.Temperature TWatMax
+    "Maximum cooling water temperature";
+  parameter Modelica.SIunits.TemperatureDifference THys = 0.5
+    "Hysteresis value to check temperature difference"
+    annotation (Dialog(tab="Advanced"));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TWat(
+    final unit="K",
+    displayUnit="degC") "Water outlet temperature"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMes(
+    final message="Water temperature is higher than the maximum!")
+    "Assert function for checking water temperature"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
+    final uLow=TWatMax -THys,
+    final uHigh=TWatMax + THys)
+    "Check if water temperature is larger than the maximum temperature"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not1
+    "Check if water temperature is lower than the maximum temperature"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+
+equation
+  connect(hys.u, TWat)
+    annotation (Line(points={{-42,0},{-120,0}}, color={0,0,127}));
+  connect(hys.y, not1.u)
+    annotation (Line(points={{-18,0},{18,0}}, color={255,0,255}));
+  connect(not1.y, assMes.u)
+    annotation (Line(points={{42,0},{58,0}}, color={255,0,255}));
+
+annotation (
+  defaultComponentName="assWatTem",
+  Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{0,80},{-80,-60},{80,-60},{0,80}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Polygon(
+          points={{0,72},{-72,-56},{72,-56},{0,72}},
+          lineColor={0,0,0},
+          fillColor={255,255,170},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-4,38},{2,-24}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Ellipse(
+          extent={{-6,-32},{4,-42}},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+  Documentation(info="<html>
+<p>
+The model sends a warning message if the water outlet temperature is higher
+than the maximum defined by the manufacturer.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertWaterTemperature;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Controller.mo b/Buildings/Fluid/CHPs/BaseClasses/Controller.mo
new file mode 100644
index 00000000000..73157fda33f
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Controller.mo
@@ -0,0 +1,430 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model Controller "Define current operation mode"
+  extends Modelica.Blocks.Icons.Block;
+
+  replaceable parameter Buildings.Fluid.CHPs.Data.Generic per
+    "Performance data"
+    annotation (Placement(transformation(extent={{200,158},{220,178}})));
+  parameter Modelica.SIunits.Time waitTime=60
+    "Wait time before transition from pump-on mode fires"
+    annotation (Dialog(tab="Dynamics"));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput avaSig
+    "True when the plant is available"
+    annotation (Placement(transformation(extent={{-300,160},{-260,200}}),
+      iconTransformation(extent={{-140,50},{-100,90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput runSig
+    "True when plant should run"
+    annotation (Placement(transformation(extent={{-300,100},{-260,140}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mWat_flow(
+    final unit="kg/s")
+    "Cooling water mass flow rate"
+    annotation (Placement(transformation(extent={{-300,20},{-260,60}}),
+      iconTransformation(extent={{-140,-10},{-100,30}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEng(
+    final unit="K",
+    final displayUnit="degC") if not per.warmUpByTimeDelay
+    "Engine temperature"
+    annotation (Placement(transformation(extent={{-300,-20},{-260,20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEleNet(final unit="W") if
+    not per.warmUpByTimeDelay
+    "Net power output"
+    annotation (Placement(transformation(extent={{-300,-60},{-260,-20}}),
+      iconTransformation(extent={{-140,-70},{-100,-30}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEle(final unit="W") if
+    not per.warmUpByTimeDelay
+    "Power demand"
+    annotation (Placement(transformation(extent={{-300,-100},{-260,-60}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.Interfaces.ModeTypeOutput opeMod
+    "Type of operating mode"
+    annotation (Placement(transformation(extent={{260,-20},{300,20}}),
+      iconTransformation(extent={{100,-10},{120,10}})));
+  Modelica.StateGraph.Step staBy(nOut=2)
+    "Standby step"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Modelica.StateGraph.Step pumOn(nOut=2)
+    "Pump on step"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Modelica.StateGraph.StepWithSignal warUp(nIn=2, nOut=2)
+    "Warm-up step"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Modelica.StateGraph.StepWithSignal cooDow(nIn=2, nOut=2)
+    "Cool-down step"
+    annotation (Placement(transformation(extent={{160,-90},{180,-70}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minWatFlo(
+    final k=per.mWatMin_flow) "Minimum water mass flow rate"
+    annotation (Placement(transformation(extent={{-220,190},{-200,210}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(
+    final k=0.001) "Constant value"
+    annotation (Placement(transformation(extent={{-220,150},{-200,170}})));
+  Buildings.Controls.OBC.CDL.Continuous.Max max
+    "Maximum between minimum flow rate and 0.001"
+    annotation (Placement(transformation(extent={{-160,170},{-140,190}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add2(
+    final k1=-1)
+    "Mass flow rate difference between actual and minimum value"
+    annotation (Placement(transformation(extent={{-100,170},{-80,190}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
+    final uLow=0.01*per.mWatMin_flow - 1e-6,
+    final uHigh=0.015*per.mWatMin_flow)
+    "Check if actual mass flow rate is larger than the minimum value"
+    annotation (Placement(transformation(extent={{-60,170},{-40,190}})));
+  Buildings.Controls.OBC.CDL.Logical.And goSig
+    "Check if water flow rate is higher than the minimum when runSig = true"
+    annotation (Placement(transformation(extent={{-20,170},{0,190}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notRunSig "Plant is not running"
+    annotation (Placement(transformation(extent={{-220,70},{-200,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notAvaSig "Plant is not available"
+    annotation (Placement(transformation(extent={{-220,-190},{-200,-170}})));
+  Buildings.Controls.OBC.CDL.Logical.And and1
+    "Warm-up mode is done and the plant could run"
+    annotation (Placement(transformation(extent={{120,-30},{140,-10}})));
+  Modelica.StateGraph.TransitionWithSignal transition3 "Plant should be off"
+    annotation (Placement(transformation(extent={{-30,-90},{-10,-70}})));
+  Modelica.StateGraph.TransitionWithSignal transition5 "Plant should be off"
+    annotation (Placement(transformation(extent={{30,-90},{50,-70}})));
+  Modelica.StateGraph.TransitionWithSignal transition9 "Run in cool-down mode"
+    annotation (Placement(transformation(extent={{80,-90},{100,-70}})));
+  Modelica.StateGraph.TransitionWithSignal transition7 "Run in warm-up mode"
+    annotation (Placement(transformation(extent={{210,-90},{230,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.And and3
+    "Plant could run and cool-down mode is optional"
+    annotation (Placement(transformation(extent={{100,-150},{120,-170}})));
+  Modelica.StateGraph.TransitionWithSignal transition10 "Plant should be off"
+    annotation (Placement(transformation(extent={{230,-70},{250,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.And and4
+    "Plant could run and cool-down mode is optional"
+    annotation (Placement(transformation(extent={{208,-210},{228,-190}})));
+  Buildings.Fluid.CHPs.BaseClasses.AssertWaterFlow assWatMas(
+    final mWatMin_flow=per.mWatMin_flow)
+    "Assert if water flow rate is outside boundaries"
+    annotation (Placement(transformation(extent={{40,30},{60,50}})));
+  Buildings.Fluid.CHPs.BaseClasses.Types.Mode actMod "Mode indicator";
+  Modelica.StateGraph.TransitionWithSignal transition1
+    "Plant becomes available"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Modelica.StateGraph.TransitionWithSignal transition2 "Run plant"
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  Modelica.StateGraph.Step nor(final nIn=1, final nOut=1)
+    "Plant is in normal mode"
+    annotation (Placement(transformation(extent={{180,-10},{200,10}})));
+  Modelica.StateGraph.TransitionWithSignal transition8 "Run in cool-down mode"
+    annotation (Placement(transformation(extent={{210,10},{230,-10}})));
+  Buildings.Fluid.CHPs.BaseClasses.WarmUpLeaving warUpCtr(
+    final timeDelayStart=per.timeDelayStart,
+    final TEngNom=per.TEngNom,
+    final PEleMax=per.PEleMax,
+    final warmUpByTimeDelay=per.warmUpByTimeDelay)
+    "Warm-up control sequence"
+    annotation (Placement(transformation(extent={{90,-50},{110,-30}})));
+  Modelica.StateGraph.TransitionWithSignal transition6 "Run in normal mode"
+    annotation (Placement(transformation(extent={{150,-10},{170,10}})));
+  Modelica.StateGraph.InitialStep plaOff(final nIn=3) "Plant is off"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
+  Modelica.StateGraph.TransitionWithSignal transition4(
+    final enableTimer=true,
+    final waitTime=waitTime) "Run in warm-up mode"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant optCooDow(
+    final k=per.coolDownOptional) "Check if cool-down mode is optional"
+    annotation (Placement(transformation(extent={{60,-190},{80,-170}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timer(
+    final t=per.timeDelayCool)
+    "Check if the time of  plant in cool-down mode has been longer than the specified delay time"
+    annotation (Placement(transformation(extent={{152,-190},{172,-170}})));
+  Buildings.Controls.OBC.CDL.Logical.Not noGo "Plant should not run"
+    annotation (Placement(transformation(extent={{40,90},{60,110}})));
+
+equation
+  if plaOff.active then
+    actMod = CHPs.BaseClasses.Types.Mode.Off;
+  elseif staBy.active then
+    actMod = CHPs.BaseClasses.Types.Mode.StandBy;
+  elseif pumOn.active then
+    actMod = CHPs.BaseClasses.Types.Mode.PumpOn;
+  elseif warUp.active then
+    actMod = CHPs.BaseClasses.Types.Mode.WarmUp;
+  elseif nor.active then
+    actMod = CHPs.BaseClasses.Types.Mode.Normal;
+  else
+    actMod = CHPs.BaseClasses.Types.Mode.CoolDown;
+  end if;
+  opeMod = actMod;
+  connect(nor.outPort[1], transition8.inPort)
+    annotation (Line(points={{200.5,0},{216,0}}, color={0,0,0}));
+  connect(TEng, warUpCtr.TEng) annotation (Line(points={{-280,0},{-220,0},{-220,
+          -38},{88,-38}},                  color={0,0,127}));
+  connect(plaOff.outPort[1], transition1.inPort)
+    annotation (Line(points={{-99.5,0},{-84,0}}, color={0,0,0}));
+  connect(transition6.outPort, nor.inPort[1])
+    annotation (Line(points={{161.5,0},{179,0}}, color={0,0,0}));
+  connect(assWatMas.mWat_flow, mWat_flow) annotation (Line(points={{38,36},{-120,
+          36},{-120,40},{-280,40}},color={0,0,127}));
+  connect(minWatFlo.y, max.u1) annotation (Line(points={{-198,200},{-180,200},{-180,
+          186},{-162,186}},
+                      color={0,0,127}));
+  connect(con.y, max.u2) annotation (Line(points={{-198,160},{-180,160},{-180,174},
+          {-162,174}},
+                 color={0,0,127}));
+  connect(max.y, add2.u1) annotation (Line(points={{-138,180},{-120,180},{-120,186},
+          {-102,186}},  color={0,0,127}));
+  connect(add2.y, hys.u) annotation (Line(points={{-78,180},{-62,180}},
+          color={0,0,127}));
+  connect(hys.y, goSig.u1) annotation (Line(points={{-38,180},{-22,180}},
+          color={255,0,255}));
+  connect(mWat_flow, add2.u2) annotation (Line(points={{-280,40},{-120,40},{-120,
+          174},{-102,174}}, color={0,0,127}));
+  connect(runSig, goSig.u2) annotation (Line(points={{-280,120},{-30,120},{-30,172},
+          {-22,172}}, color={255,0,255}));
+  connect(runSig, notRunSig.u) annotation (Line(points={{-280,120},{-240,120},{-240,
+          80},{-222,80}},        color={255,0,255}));
+  connect(runSig, assWatMas.runSig) annotation (Line(points={{-280,120},{-240,120},
+          {-240,44},{38,44}},      color={255,0,255}));
+  connect(avaSig, transition1.condition) annotation (Line(points={{-280,180},{
+          -250,180},{-250,-20},{-80,-20},{-80,-12}},
+                                                color={255,0,255}));
+  connect(runSig, transition2.condition) annotation (Line(points={{-280,120},{-240,
+          120},{-240,-24},{-20,-24},{-20,-12}}, color={255,0,255}));
+  connect(avaSig, notAvaSig.u) annotation (Line(points={{-280,180},{-250,180},{-250,
+          -180},{-222,-180}},      color={255,0,255}));
+  connect(goSig.y, transition4.condition) annotation (Line(points={{2,180},{20,
+          180},{20,56},{-140,56},{-140,-28},{40,-28},{40,-12}}, color={255,0,255}));
+  connect(and1.y, transition6.condition) annotation (Line(points={{142,-20},{
+          160,-20},{160,-12}}, color={255,0,255}));
+  connect(notAvaSig.y, transition3.condition) annotation (Line(points={{-198,-180},
+          {-20,-180},{-20,-92}},       color={255,0,255}));
+  connect(and3.y, transition7.condition) annotation (Line(points={{122,-160},{
+          220,-160},{220,-92}}, color={255,0,255}));
+  connect(and4.y, transition10.condition) annotation (Line(points={{230,-200},{240,
+          -200},{240,-72}}, color={255,0,255}));
+  connect(transition3.outPort, plaOff.inPort[1]) annotation (Line(points={{-18.5,
+          -80},{0,-80},{0,-100},{-130,-100},{-130,0.666667},{-121,0.666667}},
+        color={0,0,0}));
+  connect(transition5.outPort, plaOff.inPort[2]) annotation (Line(points={{41.5,
+          -80},{48,-80},{48,-102},{-132,-102},{-132,0},{-121,0}}, color={0,0,0}));
+  connect(transition10.outPort, plaOff.inPort[3]) annotation (Line(points={{241.5,
+          -60},{250,-60},{250,-104},{-134,-104},{-134,-0.666667},{-121,-0.666667}},
+                       color={0,0,0}));
+  connect(goSig.y, and3.u2) annotation (Line(points={{2,180},{20,180},{20,56},{
+          -140,56},{-140,-152},{98,-152}}, color={255,0,255}));
+  connect(optCooDow.y, and3.u1) annotation (Line(points={{82,-180},{90,-180},{90,
+          -160},{98,-160}}, color={255,0,255}));
+  connect(transition1.outPort, staBy.inPort[1])
+    annotation (Line(points={{-78.5,0},{-61,0}}, color={0,0,0}));
+  connect(staBy.outPort[1], transition2.inPort) annotation (Line(points={{-39.5,
+          0.25},{-32,0.25},{-32,0},{-24,0}}, color={0,0,0}));
+  connect(staBy.outPort[2], transition3.inPort) annotation (Line(points={{-39.5,
+          -0.25},{-32,-0.25},{-32,-80},{-24,-80}}, color={0,0,0}));
+  connect(transition2.outPort, pumOn.inPort[1])
+    annotation (Line(points={{-18.5,0},{-1,0}}, color={0,0,0}));
+  connect(pumOn.outPort[1], transition4.inPort)
+    annotation (Line(points={{20.5,0.25},{28,0},{36,0}}, color={0,0,0}));
+  connect(pumOn.outPort[2], transition5.inPort) annotation (Line(points={{20.5,-0.25},
+          {26,-0.25},{26,-80},{36,-80}}, color={0,0,0}));
+  connect(warUp.outPort[1], transition6.inPort) annotation (Line(points={{90.5,
+          0.25},{110,0.25},{110,0},{156,0}}, color={0,0,0}));
+  connect(warUp.outPort[2], transition9.inPort) annotation (Line(points={{90.5,
+          -0.25},{96,-0.25},{96,-20},{66,-20},{66,-80},{86,-80}}, color={0,0,0}));
+  connect(warUp.active, warUpCtr.actWarUp)
+    annotation (Line(points={{80,-11},{80,-34},{88,-34}}, color={255,0,255}));
+  connect(warUpCtr.y, and1.u2) annotation (Line(points={{112,-40},{114,-40},{
+          114,-28},{118,-28}}, color={255,0,255}));
+  connect(goSig.y, and1.u1) annotation (Line(points={{2,180},{100,180},{100,-20},
+          {118,-20}}, color={255,0,255}));
+  connect(transition4.outPort, warUp.inPort[1]) annotation (Line(points={{41.5,0},
+          {50,0},{50,0.5},{69,0.5}}, color={0,0,0}));
+  connect(transition7.outPort, warUp.inPort[2]) annotation (Line(points={{221.5,
+          -80},{230,-80},{230,-120},{60,-120},{60,0},{69,0},{69,-0.5}}, color=
+         {0,0,0}));
+  connect(transition8.outPort, cooDow.inPort[1]) annotation (Line(points={{221.5,0},
+          {240,0},{240,-40},{140,-40},{140,-79.5},{159,-79.5}},    color={0,0,0}));
+  connect(transition9.outPort, cooDow.inPort[2]) annotation (Line(points={{91.5,
+          -80},{140,-80},{140,-80.5},{159,-80.5}}, color={0,0,0}));
+  connect(cooDow.outPort[1], transition10.inPort) annotation (Line(points={{180.5,
+          -79.75},{200,-79.75},{200,-60},{236,-60}}, color={0,0,0}));
+  connect(cooDow.outPort[2], transition7.inPort) annotation (Line(points={{180.5,
+          -80.25},{182,-80.25},{182,-80},{216,-80}}, color={0,0,0}));
+  connect(cooDow.active, timer.u) annotation (Line(points={{170,-91},{170,-140},
+          {140,-140},{140,-180},{150,-180}}, color={255,0,255}));
+  connect(PEleNet, warUpCtr.PEleNet) annotation (Line(points={{-280,-40},{80,
+          -40},{80,-42},{88,-42}}, color={0,0,127}));
+  connect(PEle, warUpCtr.PEle) annotation (Line(points={{-280,-80},{-40,-80},{
+          -40,-46},{88,-46}}, color={0,0,127}));
+  connect(notRunSig.y, transition5.condition) annotation (Line(points={{-198,80},
+          {-180,80},{-180,-120},{40,-120},{40,-92}},       color={255,0,255}));
+  connect(goSig.y, noGo.u) annotation (Line(points={{2,180},{20,180},{20,100},{38,
+          100}}, color={255,0,255}));
+  connect(noGo.y, transition8.condition)
+    annotation (Line(points={{62,100},{220,100},{220,12}}, color={255,0,255}));
+  connect(noGo.y, and4.u2) annotation (Line(points={{62,100},{80,100},{80,60},{-144,
+          60},{-144,-208},{206,-208}}, color={255,0,255}));
+  connect(noGo.y, transition9.condition) annotation (Line(points={{62,100},{80,100},
+          {80,60},{-144,60},{-144,-140},{90,-140},{90,-92}}, color={255,0,255}));
+
+  connect(timer.passed, and4.u1) annotation (Line(points={{174,-188},{200,-188},
+          {200,-200},{206,-200}}, color={255,0,255}));
+annotation (
+    defaultComponentName="conMai",
+    Diagram(coordinateSystem(extent={{-260,-220},{260,220}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
+        Polygon(
+          points={{50,34},{50,-18},{90,8},{90,8},{50,34}},
+          lineColor={28,108,200},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-50,40},{10,-22}},
+          lineColor={28,108,200},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid),
+        Line(points={{10,8},{30,8}}, color={0,0,0}),
+        Line(points={{-92,6},{-68,6}}, color={0,0,0}),
+        Line(points={{-20,-44},{-20,-70}}, color={0,0,0}),
+        Polygon(
+          points={{-72,20},{-72,-8},{-50,6},{-72,20}},
+          lineColor={0,0,0},
+          fillColor={215,215,215},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{28,22},{28,-6},{50,8},{28,22}},
+          lineColor={0,0,0},
+          fillColor={215,215,215},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-11,14},{-11,-14},{11,0},{-11,14}},
+          lineColor={0,0,0},
+          fillColor={215,215,215},
+          fillPattern=FillPattern.Solid,
+          origin={-21,-34},
+          rotation=90)}),
+    Documentation(info="<html>
+<p>
+The CHP plant switches between six possible operating modes depending on the current mode,
+control signals and plant boundary conditions. The regular transition between them
+is as follows:
+</p>
+<ul>
+<li>
+off
+</li>
+<li>
+stand-by mode
+</li>
+<li>
+pump-on mode
+</li>
+<li>
+warm-up mode
+</li>
+<li>
+normal operation
+</li>
+<li>
+cool-down mode
+</li>
+<li>
+off or stand-by mode
+</li>
+</ul>
+<h4>Switching between operating modes</h4>
+<p>
+From the off mode:
+</p>
+<ul>
+<li>
+The transition from the off to the stand-by mode will occur when the plant availability
+signal <code>avaSig</code> becomes true.
+</li>
+</ul>
+<p>
+From the stand-by mode:
+</p>
+<ul>
+<li>
+The transition from the stand-by to the pump-on mode will occur when the plant
+running signal <code>runSig</code> becomes true.
+</li>
+<li>
+If <code>avaSig</code> becomes false, the CHP will automatically change to the off mode.
+</li>
+</ul>
+<p>
+From the pump-on mode:
+</p>
+<ul>
+<li>
+The transition from the pump-on to stand-by mode will occur after the specified
+time delay and if the water flow rate <code>mWat_flow</code> is greater than
+the minimum <code>mWatMin_flow</code>.
+</li>
+<li>
+If <code>runSig</code> becomes false, the CHP will automatically change to the off mode.
+</li>
+</ul>
+<p>
+From the warm-up mode:
+</p>
+<ul>
+<li>
+The transition from the warm-up mode to the normal operation will occur after the
+specified time delay (if <code>warmUpByTimeDelay</code> is true)
+or when the engine temperature <code>TEng</code> becomes higher than the
+nominal temperature <code>TEngNom</code> (if <code>warmUpByTimeDelay</code>
+is false).
+</li>
+<li>
+If <code>runSig</code> becomes false or if the water flow rate <code>mWat_flow</code>
+becomes less than the minimum <code>mWatMin_flow</code>, the CHP will automatically
+change to the cool-down mode.
+</li>
+</ul>
+<p>
+From the normal mode:
+</p>
+<ul>
+<li>
+The transition from the normal operation to the cool-down mode will occur when
+<code>runSig</code> becomes false or if the water flow rate <code>mWat_flow</code>
+becomes less than the minimum <code>mWatMin_flow</code>.
+</li>
+</ul>
+<p>
+From the cool-down mode:
+</p>
+<ul>
+<li>
+The transition from the cool-down mode will occur after the specified time delay.
+If <code>avaSig</code> is true, the CHP will change to the stand-by mode; else,
+it will change to the off mode.
+</li>
+<li>
+If the CHP has the mandatory cool-down configuration (if <code>coolDownOptional</code>
+is false), the plant has to complete the cool-down period before it can be reactivated.
+If the CHP has the optional cool-down configuration (if <code>coolDownOptional</code>
+is true), the plant may imediatelly change to the warm-up mode if it gets reactivated
+(<code>runSig= true</code>).
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+April 8, 2020, by Antoine Gautier:<br/>
+Refactored implementation.
+</li>
+<li>
+December 03, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+June 18, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Controller;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo b/Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo
new file mode 100644
index 00000000000..c66382d85da
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/EfficiencyCurve.mo
@@ -0,0 +1,109 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+block EfficiencyCurve "Efficiency curve described by a fifth order polynomial,
+  function of three input variables"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Real a[27] "Polynomial coefficients";
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PNet(
+    final unit="W") "Electric power"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mWat_flow(
+    final unit="kg/s") "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TWatIn(
+    final unit="K") "Water inlet temperature"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput eta(
+    final unit="1") "Efficiency"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+
+protected
+  Real y(unit="1") "Efficiency";
+  constant Real etaSma=0.01 "Value for eta if y is zero";
+
+equation
+  y = Buildings.Fluid.CHPs.BaseClasses.Functions.polynomialtrivariate(
+    a=a,
+    x1=PNet,
+    x2=mWat_flow,
+    x3=TWatIn - 273.15)
+    "Efficiency calculated as a function of power, water flow rate and water inlet temperature";
+  eta = Buildings.Utilities.Math.Functions.smoothMax(
+    x1=y,
+    x2=etaSma,
+    deltaX=etaSma/2)
+    "Corrected efficiency, ensuring that efficiency is not zero";
+
+annotation (
+  defaultComponentName="effCur",
+  Documentation(info="<html>
+<p>
+The block computes the efficiency as a polynomial function of three input variables.
+The polynomial has the form
+</p>
+<p style=\"font-style:italic;\">
+y = a<sub>1</sub>
++ a<sub>2</sub> x<sub>1</sub><sup>2</sup>
++ a<sub>3</sub> x<sub>1</sub>
++ a<sub>4</sub> x<sub>2</sub><sup>2</sup>
++ a<sub>5</sub> x<sub>2</sub>
++ a<sub>6</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>7</sub> x<sub>3</sub>
++ a<sub>8</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub><sup>2</sup>
++ a<sub>9</sub> x<sub>1</sub> x<sub>2</sub>
+<br/>
++ a<sub>10</sub> x<sub>1</sub> x<sub>2</sub><sup>2</sup>
++ a<sub>11</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub>
++ a<sub>12</sub> x<sub>1</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>13</sub> x<sub>1</sub> x<sub>3</sub>
++ a<sub>14</sub> x<sub>1</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>15</sub> x<sub>1</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>16</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>17</sub> x<sub>2</sub> x<sub>3</sub>
++ a<sub>18</sub> x<sub>2</sub> x<sub>3</sub><sup>2</sup>
+<br/>
++ a<sub>19</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>20</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>21</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>22</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>23</sub> x<sub>1</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>24</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub> x<sub>3</sub>
++ a<sub>25</sub> x<sub>1</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>26</sub> x<sub>1</sub> x<sub>2</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>27</sub> x<sub>1</sub> x<sub>2</sub> x<sub>3</sub>
+</p>
+<p>
+where
+<i>x<sub>1</sub></i> is the net power output,
+<i>x<sub>2</sub></i> is the water mass flow rate,
+<i>x<sub>3</sub></i> is the water inlet temperature.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>June 1, 2019, by Tea Zakula:<br/>First implementation. </li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
+        Line(points={{-90,-76},{68,-76}},
+                                      color={192,192,192}),
+        Line(points={{-80,-80},{-79.2,-50.6},{-78.4,-37},{-77.6,-28},{-76.8,-21.3},
+              {-75.2,-11.4},{-72.8,-1.31},{-69.5,8.08},{-64.7,17.9},{-57.5,28},
+              {-47,38.1},{-31.8,48.1},{-10.1,58},{22.1,68},{68.7,78.1},{80,80}}),
+        Line(points={{-80,-80},{-80,68}}, color={192,192,192}),
+        Polygon(
+          points={{-80,90},{-88,68},{-72,68},{-80,90}},
+          lineColor={192,192,192},
+          fillColor={192,192,192},
+          fillPattern=FillPattern.Solid)}),
+    Icon(graphics={Text(
+          extent={{-90,38},{90,-34}},
+          lineColor={160,160,164},
+          textString="polynominal()")}));
+end EfficiencyCurve;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/EnergyConversion.mo b/Buildings/Fluid/CHPs/BaseClasses/EnergyConversion.mo
new file mode 100644
index 00000000000..202442316db
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/EnergyConversion.mo
@@ -0,0 +1,220 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model EnergyConversion "Energy conversion control volume"
+  extends Modelica.Blocks.Icons.Block;
+
+  replaceable parameter Buildings.Fluid.CHPs.Data.Generic per
+    "Performance data"
+    annotation (Placement(transformation(extent={{106,100},{126,120}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEle(
+    final unit="W") "Power demand"
+    annotation (Placement(transformation(extent={{-180,100},{-140,140}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Fluid.CHPs.BaseClasses.Interfaces.ModeTypeInput opeMod
+    "Operation mode"
+    annotation (Placement(transformation(extent={{-180,40},{-140,80}}),
+      iconTransformation(extent={{-120,40},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mWat_flow(
+    final unit="kg/s",
+    final quantity="MassFlowRate") "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-180,0},{-140,40}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TWatIn(
+    final unit="K",
+    displayUnit="degC")
+    "Water inlet temperature"
+    annotation (Placement(transformation(extent={{-180,-40},{-140,0}}),
+      iconTransformation(extent={{-140,-30},{-100,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TRoo(
+    final unit="K",
+    displayUnit="degC") "Room temperature"
+    annotation (Placement(transformation(extent={{-180,-80},{-140,-40}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEng(
+    final unit="K",
+    displayUnit="degC") if not per.warmUpByTimeDelay
+    "Engine temperature"
+    annotation (Placement(transformation(extent={{-180,-110},{-140,-70}}),
+      iconTransformation(extent={{-140,-90},{-100,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PEleNet(
+    final unit="W") "Net power output"
+    annotation (Placement(transformation(extent={{140,60},{180,100}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mFue_flow(
+    final unit="kg/s",
+    final quantity="MassFlowRate") "Fuel mass flow rate"
+    annotation (Placement(transformation(extent={{140,0},{180,40}}),
+      iconTransformation(extent={{100,10},{140,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mAir_flow(
+    final unit="kg/s",
+    final quantity="MassFlowRate") "Air mass flow rate"
+    annotation (Placement(transformation(extent={{140,-60},{180,-20}}),
+      iconTransformation(extent={{100,-50},{140,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput QGen_flow(final unit="W")
+    "Heat generation rate"
+    annotation (Placement(transformation(extent={{140,-120},
+      {180,-80}}), iconTransformation(extent={{100,-100},{140,-60}})));
+
+protected
+  Buildings.Fluid.CHPs.BaseClasses.AssertFuelFlow assFue(
+    final dmFueMax_flow=per.dmFueMax_flow) if per.use_fuelRateLimit
+    "Assert if fuel flow rate is outside boundaries"
+    annotation (Placement(transformation(extent={{110,30},{130,50}})));
+  Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal opeModBas(final per=
+        per) "Typical energy conversion mode"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Buildings.Fluid.CHPs.BaseClasses.EnergyConversionWarmUp opeModWarUpEngTem(
+      final per=per) if not per.warmUpByTimeDelay "Warm-up by engine temperature"
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(final k=0)
+    "Zero constant"
+    annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch
+    "Switch to zero power output if not in (normal or warm-up mode)"
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
+  Modelica.Blocks.Sources.BooleanExpression booExp(
+    final y=opeMod ==CHPs.BaseClasses.Types.Mode.WarmUp or
+            opeMod ==CHPs.BaseClasses.Types.Mode.Normal)
+    "True if active mode is (warm-up or normal)"
+    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch2
+    "Switch between warm-up and normal value"
+    annotation (Placement(transformation(extent={{80,70},{100,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch3
+    "Switch between warm-up and normal value"
+    annotation (Placement(transformation(extent={{80,10},{100,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch4
+    "Switch between warm-up and normal value"
+    annotation (Placement(transformation(extent={{80,-50},{100,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch5
+    "Switch between warm-up and normal value"
+    annotation (Placement(transformation(extent={{80,-110},{100,-90}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant PEleTimeDel(final k=0) if
+                  per.warmUpByTimeDelay
+    "Zero power output in case of warm-up by time delay"
+    annotation (Placement(transformation(extent={{-20,90},{0,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant delWarUp(
+    final k=per.warmUpByTimeDelay) "Warm-up by time delay"
+    annotation (Placement(transformation(extent={{-100,-120},{-80,-100}})));
+  Modelica.Blocks.Sources.BooleanExpression wamUpMod(
+    final y=opeMod == CHPs.BaseClasses.Types.Mode.WarmUp)
+    "Check whether warm-up mode is active"
+    annotation (Placement(transformation(extent={{-100,30},{-80,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not engTemWarUp
+    "Warm-up based on engine temperature"
+    annotation (Placement(transformation(extent={{-60,-120},{-40,-100}})));
+  Buildings.Controls.OBC.CDL.Logical.And and1
+    "True if warm-up mode and warm-up based on engine temperature"
+    annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dumTimDel(
+    final k=0) if per.warmUpByTimeDelay
+    "Set dummy value in case of warm-up by time delay"
+    annotation (Placement(transformation(extent={{-20,30},{0,50}})));
+
+equation
+  connect(opeModBas.mWat_flow, mWat_flow) annotation (Line(points={{-22,0},{-120,
+          0},{-120,20},{-160,20}},        color={0,0,127}));
+  connect(opeModBas.TWatIn, TWatIn) annotation (Line(points={{-22,-6},{-100,-6},
+          {-100,-20},{-160,-20}},color={0,0,127}));
+  connect(opeModWarUpEngTem.TEng, TEng) annotation (Line(points={{-22,-58},{-110,
+          -58},{-110,-90},{-160,-90}},  color={0,0,127}));
+  connect(opeModWarUpEngTem.TWatIn, TWatIn) annotation (Line(points={{-22,-47},{
+          -100,-47},{-100,-20},{-160,-20}},
+                                         color={0,0,127}));
+  connect(const.y, switch.u3) annotation (Line(points={{-78,70},{-70,70},{-70,
+          92},{-62,92}},
+                     color={0,0,127}));
+  connect(PEle, switch.u1) annotation (Line(points={{-160,120},{-70,120},{-70,
+          108},{-62,108}},
+                     color={0,0,127}));
+  connect(booExp.y, switch.u2) annotation (Line(points={{-79,100},{-62,100}},
+          color={255,0,255}));
+  connect(switch.y, opeModBas.PEle) annotation (Line(points={{-38,100},{-30,100},
+          {-30,6},{-22,6}},  color={0,0,127}));
+  connect(opeModWarUpEngTem.PEleNet, switch2.u1) annotation (Line(points={{2,-42},
+          {20,-42},{20,88},{78,88}}, color={0,0,127}));
+  connect(switch2.y, PEleNet) annotation (Line(points={{102,80},{160,80}},
+          color={0,0,127}));
+  connect(switch3.y, mFue_flow) annotation (Line(points={{102,20},{160,20}},
+          color={0,0,127}));
+  connect(switch4.y, mAir_flow) annotation (Line(points={{102,-40},{160,-40}},
+          color={0,0,127}));
+  connect(switch5.y, QGen_flow)
+    annotation (Line(points={{102,-100},{160,-100}}, color={0,0,127}));
+  connect(opeModBas.mFue_flow, switch3.u3) annotation (Line(points={{2,6},{60,6},
+          {60,12},{78,12}},     color={0,0,127}));
+  connect(opeModWarUpEngTem.mFue_flow, switch3.u1) annotation (Line(points={{2,-47},
+          {26,-47},{26,28},{78,28}}, color={0,0,127}));
+  connect(opeModBas.mAir_flow, switch4.u3) annotation (Line(points={{2,0},{60,0},
+          {60,-48},{78,-48}},      color={0,0,127}));
+  connect(opeModWarUpEngTem.mAir_flow, switch4.u1) annotation (Line(points={{2,-53},
+          {40,-53},{40,-32},{78,-32}},  color={0,0,127}));
+  connect(opeModWarUpEngTem.QGen_flow, switch5.u1) annotation (Line(points={{2,-58},
+          {32,-58},{32,-92},{78,-92}},      color={0,0,127}));
+  connect(opeModBas.QGen_flow, switch5.u3) annotation (Line(points={{2.2,-6},{54,
+          -6},{54,-108},{78,-108}},     color={0,0,127}));
+  connect(mWat_flow, opeModWarUpEngTem.mWat_flow) annotation (Line(points={{-160,20},
+          {-120,20},{-120,-42},{-22,-42}},     color={0,0,127}));
+  connect(switch3.y, assFue.mFue_flow) annotation (Line(points={{102,20},{104,20},
+          {104,40},{108,40}}, color={0,0,127}));
+  connect(PEleTimeDel.y, switch2.u1) annotation (Line(points={{2,100},{60,100},{
+          60,88},{78,88}}, color={0,0,127}));
+  connect(switch.y, switch2.u3) annotation (Line(points={{-38,100},{-30,100},{-30,
+          72},{78,72}}, color={0,0,127}));
+  connect(TRoo, opeModWarUpEngTem.TRoo) annotation (Line(points={{-160,-60},{-120,
+          -60},{-120,-53},{-22,-53}},    color={0,0,127}));
+  connect(delWarUp.y, engTemWarUp.u)
+    annotation (Line(points={{-78,-110},{-62,-110}}, color={255,0,255}));
+  connect(engTemWarUp.y, and1.u2) annotation (Line(points={{-38,-110},{-30,-110},
+          {-30,-88},{-22,-88}}, color={255,0,255}));
+  connect(wamUpMod.y, and1.u1) annotation (Line(points={{-79,40},{-60,40},{-60,
+          -80},{-22,-80}},
+                      color={255,0,255}));
+  connect(and1.y, switch3.u2) annotation (Line(points={{2,-80},{70,-80},{70,20},
+          {78,20}}, color={255,0,255}));
+  connect(and1.y, switch4.u2) annotation (Line(points={{2,-80},{70,-80},{70,-40},
+          {78,-40}}, color={255,0,255}));
+  connect(and1.y, switch5.u2) annotation (Line(points={{2,-80},{70,-80},{70,-100},
+          {78,-100}}, color={255,0,255}));
+  connect(wamUpMod.y, switch2.u2) annotation (Line(points={{-79,40},{-60,40},{
+          -60,80},{78,80}},
+                        color={255,0,255}));
+  connect(dumTimDel.y, switch3.u1) annotation (Line(points={{2,40},{26,40},{26,28},
+          {78,28}}, color={0,0,127}));
+  connect(dumTimDel.y, switch4.u1) annotation (Line(points={{2,40},{40,40},{40,-32},
+          {78,-32}}, color={0,0,127}));
+  connect(dumTimDel.y, switch5.u1) annotation (Line(points={{2,40},{32,40},{32,-92},
+          {78,-92}}, color={0,0,127}));
+
+annotation (
+  defaultComponentName="eneCon",
+  Diagram(coordinateSystem(extent={{-140,-140},{140,140}})),
+  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+  Documentation(info="<html>
+<p>
+The model defines energy conversion that occurs during the normal mode and warm-up mode.
+The model
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.EnergyConversionWarmUp\">
+Buildings.Fluid.CHPs.BaseClasses.EnergyConversionWarmUp</a>
+is used only for the
+warm-up mode dependent on the engine temperature (case of Stirling engines).
+The model
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal\">
+Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal</a>
+is used for all other cases,
+i.e. the normal mode, and the warm-up mode based on a time delay (case of internal
+combustion engines).
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 8, 2020, by Antoine Gautier:<br/>
+Refactored implementation.
+</li>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EnergyConversion;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/EnergyConversionWarmUp.mo b/Buildings/Fluid/CHPs/BaseClasses/EnergyConversionWarmUp.mo
new file mode 100644
index 00000000000..a8e80d4d192
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/EnergyConversionWarmUp.mo
@@ -0,0 +1,243 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model EnergyConversionWarmUp
+  "Energy conversion during warm-up mode based on engine temperature"
+  extends Modelica.Blocks.Icons.Block;
+
+  replaceable parameter Buildings.Fluid.CHPs.Data.Generic per
+    "Performance data"
+    annotation (Placement(transformation(extent={{-80,340},{-60,360}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mWat_flow(
+    final unit="kg/s",
+    final quantity="MassFlowRate") "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-140,220},{-100,260}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TWatIn(
+    final unit="K",
+    displayUnit="degC") "Water inlet temperature"
+    annotation (Placement(transformation(extent={{-140,180},{-100,220}}),
+      iconTransformation(extent={{-140,10},{-100,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TRoo(
+    final unit="K",
+    displayUnit="degC") "Room temperature"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,-50},{-100,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEng(
+    final unit="K",
+    displayUnit="degC") "Engine temperature"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PEleNet(
+    final unit="W") "Electric power generation"
+    annotation (Placement(transformation(extent={{540,320},{580,360}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mFue_flow(
+    final unit="kg/s",
+    final quantity="MassFlowRate") "Fuel mass flow rate"
+    annotation (Placement(transformation(extent={{540,280},{580,320}}),
+      iconTransformation(extent={{100,10},{140,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mAir_flow(
+    final unit="kg/s",
+    final quantity="MassFlowRate") "Air mass flow rate"
+    annotation (Placement(transformation(extent={{540,220},{580,260}}),
+      iconTransformation(extent={{100,-50},{140,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput QGen_flow(final unit="W")
+    "Heat generation rate within the engine"
+    annotation (Placement(transformation(extent={{540,140},{580,180}}),
+      iconTransformation(extent={{100,-100},{140,-60}})));
+
+protected
+  Buildings.Utilities.Math.SmoothMax smoothMax(
+    final deltaX=0.5)
+    "Prevent negative value if room temperature exceeds engine nominal temperature"
+    annotation (Placement(transformation(extent={{80,50},{100,70}})));
+  Buildings.Utilities.Math.SmoothMax smoothMax2(
+    final deltaX=0.5)
+    "Prevent zero in denominator"
+    annotation (Placement(transformation(extent={{80,-10},{100,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis temChe(
+    final uLow=4.8,
+    final uHigh=5.2)
+    "Check if room temperature is not close to the nominal engine temperature by less than 5 Kelvin"
+    annotation (Placement(transformation(extent={{40,130},{60,150}})));
+  Buildings.Fluid.CHPs.BaseClasses.EfficiencyCurve etaE(
+    final a=per.coeEtaE) "Part load electrical efficiency"
+    annotation (Placement(transformation(extent={{-20,230},{0,250}})));
+  Buildings.Controls.OBC.CDL.Continuous.Division QGroMax
+    "Gross heat input into the system"
+    annotation (Placement(transformation(extent={{40,250},{60,270}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant PEleMax(
+    final k=per.PEleMax) "Maximum power"
+    annotation (Placement(transformation(extent={{-80,290},{-60,310}})));
+  Buildings.Controls.OBC.CDL.Continuous.Gain maxFueFlo(final k=per.rFue)
+    "Maximum fuel mass flow rate"
+    annotation (Placement(transformation(extent={{320,250},{340,270}})));
+  Buildings.Controls.OBC.CDL.Continuous.Min fueFlo "Fuel flow"
+    annotation (Placement(transformation(extent={{380,130},{400,150}})));
+  Buildings.Controls.OBC.CDL.Continuous.Division division
+    "First input divided by second input"
+    annotation (Placement(transformation(extent={{140,30},{160,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TEngNom(
+    y(final unit="K", displayUnit="degC"),
+    final k=per.TEngNom) "Nominal engine temperature"
+    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add1(final k2=-1)
+    "Difference between nominal engine temperature and room temperature"
+    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant min1(final k=1)
+    "Prevent negative value if room temperature exceeds engine nominal temperature"
+    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Gain gain(final k=per.kF)
+    "Gain by factor of warm-up fuel coefficient"
+    annotation (Placement(transformation(extent={{200,30},{220,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs"
+    annotation (Placement(transformation(extent={{260,-10},{280,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Product unlFueFloWarUp
+    "Unlimited fuel mass flow rate during warm-up"
+    annotation (Placement(transformation(extent={{320,30},{340,50}})));
+  Buildings.Fluid.CHPs.BaseClasses.EfficiencyCurve etaQ(
+    final a=per.coeEtaQ) "Part load thermal efficiency"
+    annotation (Placement(transformation(extent={{-20,180},{0,200}})));
+  Buildings.Controls.OBC.CDL.Continuous.Product heaGen
+    "Heat generation within the engine"
+    annotation (Placement(transformation(extent={{500,150},{520,170}})));
+  Buildings.Controls.OBC.CDL.Continuous.Division division1
+    "First input divided by second input"
+    annotation (Placement(transformation(extent={{200,80},{220,100}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant powCoe(
+    final k=per.kP) "Warm-up power coefficient"
+    annotation (Placement(transformation(extent={{140,110},{160,130}})));
+  Buildings.Controls.OBC.CDL.Continuous.Product PEleNet1 "Generated electrical power"
+    annotation (Placement(transformation(extent={{260,330},{280,350}})));
+  Buildings.Utilities.Math.Polynominal masFloAir(final a=per.coeMasAir)
+    "Air mass flow rate"
+    annotation (Placement(transformation(extent={{500,230},{520,250}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant min2(final k=1)
+    "Prevent zero  in denominator"
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMes(
+    final message="Room temperature is too close to the nominal engine temperature, simulation should be aborted")
+    "Assert function for checking room temperature"
+    annotation (Placement(transformation(extent={{80,130},{100,150}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add(final k1=-1)
+    "Difference between room temperature and engine temperature"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Gain masFloFue(final k=1/per.LHVFue)
+    "Fuel mass flow rate computation"
+    annotation (Placement(transformation(extent={{80,250},{100,270}})));
+  Buildings.Controls.OBC.CDL.Continuous.Gain heaGro(final k=per.LHVFue)
+    "Gross heat input into the system"
+    annotation (Placement(transformation(extent={{440,130},{460,150}})));
+
+equation
+  connect(PEleMax.y, etaE.PNet) annotation (Line(points={{-58,300},{-40,300},{-40,
+          246},{-22,246}}, color={0,0,127}));
+  connect(QGroMax.u1,PEleMax. y) annotation (Line(points={{38,266},{-40,266},{-40,
+          300},{-58,300}},      color={0,0,127}));
+  connect(etaE.TWatIn, TWatIn) annotation (Line(points={{-22,234},{-80,234},{-80,
+          200},{-120,200}}, color={0,0,127}));
+  connect(etaE.mWat_flow, mWat_flow) annotation (Line(points={{-22,240},
+          {-120,240}}, color={0,0,127}));
+  connect(etaE.eta, QGroMax.u2) annotation (Line(points={{2,240},{20,240},{20,254},
+          {38,254}}, color={0,0,127}));
+  connect(TEngNom.y, add1.u1) annotation (Line(points={{-58,100},{-40,100},
+          {-40,86},{-22,86}}, color={0,0,127}));
+  connect(add1.u2, TRoo) annotation (Line(points={{-22,74},{-40,74},{-40,40},{-120,
+          40}}, color={0,0,127}));
+  connect(division.y, gain.u) annotation (Line(points={{162,40},{198,40}},
+          color={0,0,127}));
+  connect(gain.y, add2.u1) annotation (Line(points={{222,40},{240,40},{240,6},{258,
+          6}}, color={0,0,127}));
+  connect(add2.y, unlFueFloWarUp.u2) annotation (Line(points={{282,0},{300,0},{300,
+          34},{318,34}}, color={0,0,127}));
+  connect(etaQ.PNet,PEleMax. y) annotation (Line(points={{-22,196},{-40,196},{-40,
+          300},{-58,300}}, color={0,0,127}));
+  connect(etaQ.mWat_flow, mWat_flow) annotation (Line(points={{-22,190},{-60,190},
+          {-60,240},{-120,240}}, color={0,0,127}));
+  connect(etaQ.TWatIn, TWatIn) annotation (Line(points={{-22,184},{-80,184},
+          {-80,200},{-120,200}}, color={0,0,127}));
+  connect(etaQ.eta, heaGen.u1) annotation (Line(points={{2,190},{480,190},{480,166},
+          {498,166}}, color={0,0,127}));
+  connect(maxFueFlo.y, fueFlo.u1) annotation (Line(points={{342,260},{360,260},{
+          360,146},{378,146}}, color={0,0,127}));
+  connect(unlFueFloWarUp.y, fueFlo.u2) annotation (Line(points={{342,40},{360,40},
+          {360,134},{378,134}}, color={0,0,127}));
+  connect(division1.u1,powCoe. y) annotation (Line(points={{198,96},{180,96},
+          {180,120},{162,120}}, color={0,0,127}));
+  connect(division1.u2, division.y) annotation (Line(points={{198,84},{180,84},{
+          180,40},{162,40}},  color={0,0,127}));
+  connect(PEleNet1.u1, PEleMax.y) annotation (Line(points={{258,346},{-40,346},{
+          -40,300},{-58,300}}, color={0,0,127}));
+  connect(PEleNet1.y, PEleNet) annotation (Line(points={{282,340},{560,340}},
+          color={0,0,127}));
+  connect(heaGen.y, QGen_flow)
+    annotation (Line(points={{522,160},{560,160}}, color={0,0,127}));
+  connect(fueFlo.y, mFue_flow) annotation (Line(points={{402,140},{420,140},{420,
+          300},{560,300}}, color={0,0,127}));
+  connect(masFloAir.y, mAir_flow) annotation (Line(points={{521,240},{560,240}},
+          color={0,0,127}));
+  connect(min1.y, smoothMax.u2) annotation (Line(points={{42,40},{60,40},{60,54},
+          {78,54}}, color={0,0,127}));
+  connect(add1.y, smoothMax.u1) annotation (Line(points={{2,80},{20,80},{20,66},
+          {78,66}}, color={0,0,127}));
+  connect(smoothMax.y, division.u1) annotation (Line(points={{101,60},{120,60},{
+          120,46},{138,46}}, color={0,0,127}));
+  connect(min2.y, smoothMax2.u2) annotation (Line(points={{42,-40},{60,-40},{60,
+          -6},{78,-6}}, color={0,0,127}));
+  connect(smoothMax2.y, division.u2) annotation (Line(points={{101,0},{120,0},{120,
+          34},{138,34}}, color={0,0,127}));
+  connect(temChe.u, add1.y) annotation (Line(points={{38,140},{20,140},{20,80},{
+          2,80}}, color={0,0,127}));
+  connect(division1.y, PEleNet1.u2) annotation (Line(points={{222,90},{240,90},{
+          240,334},{258,334}},  color={0,0,127}));
+  connect(temChe.y, assMes.u) annotation (Line(points={{62,140},{78,140}},
+          color={255,0,255}));
+  connect(min2.y, add2.u2) annotation (Line(points={{42,-40},{240,-40},{240,-6},
+          {258,-6}}, color={0,0,127}));
+  connect(fueFlo.y,masFloAir. u) annotation (Line(points={{402,140},{420,140},{420,
+          240},{498,240}}, color={0,0,127}));
+  connect(TEng, add.u2) annotation (Line(points={{-120,-40},{-40,-40},{-40,-6},{
+          -22,-6}}, color={0,0,127}));
+  connect(TRoo, add.u1) annotation (Line(points={{-120,40},{-40,40},{-40,6},{-22,
+          6}}, color={0,0,127}));
+  connect(add.y, smoothMax2.u1) annotation (Line(points={{2,0},{60,0},{60,6},
+          {78,6}}, color={0,0,127}));
+
+  connect(QGroMax.y, masFloFue.u)
+    annotation (Line(points={{62,260},{78,260}}, color={0,0,127}));
+  connect(masFloFue.y, maxFueFlo.u)
+    annotation (Line(points={{102,260},{318,260}}, color={0,0,127}));
+  connect(masFloFue.y, unlFueFloWarUp.u1) annotation (Line(points={{102,260},{300,
+          260},{300,46},{318,46}}, color={0,0,127}));
+  connect(heaGro.y, heaGen.u2) annotation (Line(points={{462,140},{480,140},{480,
+          154},{498,154}}, color={0,0,127}));
+  connect(fueFlo.y, heaGro.u)
+    annotation (Line(points={{402,140},{438,140}}, color={0,0,127}));
+annotation (
+  defaultComponentName="opeModWarUpEngTem",
+  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+  Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{540,380}})),
+  Documentation(info="<html>
+<p>
+The model defines energy conversion for the warm-up mode that is dependent on the
+engine temperature (e.g. CHPs with Stirling engines).
+The engine fuel flow rate is a function of the fuel flow rate at the maximum power
+output, as well as the difference between the nominal engine temperature and the
+actual engine temperature.
+Energy conversion from fuel to the electric power and heat is modeled using
+system's part-load electrical and thermal efficiencies, based on the empirical
+data from the manufacturer.
+The curves are described by a fifth order polynomial, a function of the electric
+power, water flow rate and water inlet temperature.
+The air flow rate is modeled using a second order polynomial, a function of
+the fuel flow rate.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EnergyConversionWarmUp;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/EngineTemperature.mo b/Buildings/Fluid/CHPs/BaseClasses/EngineTemperature.mo
new file mode 100644
index 00000000000..13cb732e127
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/EngineTemperature.mo
@@ -0,0 +1,116 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model EngineTemperature "Heat exchange within the engine control volume"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Modelica.SIunits.ThermalConductance UAHex
+    "Thermal conductance between the engine and cooling water";
+  parameter Modelica.SIunits.ThermalConductance UALos
+    "Thermal conductance between the engine and surroundings";
+  parameter Modelica.SIunits.HeatCapacity capEng
+    "Thermal capacitance of the engine control volume";
+  parameter Modelica.SIunits.Temperature TEngIni
+    "Initial engine temperature";
+
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a TRoo
+    "Heat port for room temperature"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}}),
+      iconTransformation(extent={{-110,48},{-90,68}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput QGen_flow(final unit="W")
+    "Heat generation rate within the engine" annotation (Placement(
+    transformation(extent={{-140,-20},{-100,20}}), iconTransformation(
+      extent={{-140,-20},{-100,20}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a TWat
+    "Heat port for water volume temperature"
+    annotation (Placement(transformation(extent={{-110,-70},{-90,-50}}),
+      iconTransformation(extent={{-110,-70},{-90,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TEng(
+    final unit="K",
+    displayUnit="degC") "Engine temperature"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+
+protected
+  constant Modelica.SIunits.Density rhoWat=1000 "Water density";
+  constant Modelica.SIunits.SpecificHeatCapacity cWat=4180 "Water specific heat";
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor theConHX(
+    final G=UAHex)
+    "Thermal conductance between engine and cooling water volume"
+    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
+  Modelica.Thermal.HeatTransfer.Components.HeatCapacitor capTheEng(
+    final C=capEng, T(fixed=true, start=TEngIni))
+    "Thermal capacitance of the engine control volume"
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor conTheLos(
+    final G=UALos)
+    "Thermal conductance between the engine and surroundings"
+    annotation (Placement(transformation(extent={{-20,50},{0,70}})));
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow QGen1
+    "Heat generation within the engine"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor engTem
+    "Engine temperature"
+    annotation (Placement(visible=true, transformation(origin={80,0},
+      extent={{-10,-10},{10,10}}, rotation=0)));
+equation
+  connect(capTheEng.port, theConHX.port_b)
+    annotation (Line(points={{50,0},{20,0}, {20,-60},{0,-60}}, color={191,0,0}));
+  connect(QGen_flow, QGen1.Q_flow)
+    annotation (Line(points={{-120,0},{-20,0}}, color={0,0,127}));
+  connect(conTheLos.port_b, capTheEng.port)
+    annotation (Line(points={{0,60},{20,60},{20,0},{50,0}}, color={191,0,0}));
+  connect(engTem.port, capTheEng.port)
+    annotation (Line(points={{70,0},{50,0}}, color={191,0,0}));
+  connect(conTheLos.port_a, TRoo)
+    annotation (Line(points={{-20,60},{-100,60}}, color={191,0,0}));
+  connect(theConHX.port_a, TWat)
+    annotation (Line(points={{-20,-60},{-100,-60}}, color={191,0,0}));
+  connect(QGen1.port, capTheEng.port)
+    annotation (Line(points={{0,0},{50,0}}, color={191,0,0}));
+  connect(engTem.T, TEng)
+    annotation (Line(points={{90,0},{120,0}}, color={0,0,127}));
+annotation (
+  defaultComponentName="eng",
+  Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
+  Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
+        Polygon(
+          points={{0,75},{-20,71},{-40,65},{-52,51},{-58,43},{-68,33},{-72,21},{
+              -76,7},{-78,-7},{-76,-23},{-76,-35},{-76,-45},{-70,-57},{-64,-65},
+              {-48,-69},{-30,-75},{-18,-75},{-2,-77},{8,-81},{22,-81},{32,-79},{
+              42,-73},{54,-67},{56,-65},{66,-53},{68,-45},{70,-43},{72,-27},{76,
+              -13},{78,-5},{78,11},{74,23},{66,33},{54,41},{44,49},{36,65},{26,73},
+              {0,75}},
+          lineColor={160,160,164},
+          fillColor={192,192,192},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-58,43},{-68,33},{-72,21},{-76,7},{-78,-7},{-76,-23},{-76,-35},
+              {-76,-45},{-70,-57},{-64,-65},{-48,-69},{-30,-75},{-18,-75},{-2,-77},
+              {8,-81},{22,-81},{32,-79},{42,-73},{54,-67},{42,-69},{40,-69},{30,
+              -71},{20,-73},{18,-73},{10,-73},{2,-69},{-12,-65},{-22,-65},{-30,-63},
+              {-40,-57},{-50,-47},{-56,-35},{-58,-27},{-58,-17},{-60,-5},{-60,3},
+              {-60,15},{-58,25},{-56,27},{-52,35},{-48,43},{-44,53},{-40,65},{-58,
+              43}},
+          fillColor={160,160,164},
+          fillPattern=FillPattern.Solid)}),
+Documentation(info="<html>
+<p>
+The model defines the dynamic behavior of the CHP thermal mass (i.e. engine block,
+encapsulated working fluid, and internal heat exchange equipment) using a single,
+engine control volume.
+The thermal energy stored within this volume is quantified using an aggregate
+thermal capacitance <code>capEng</code> and an equivalent average engine temperature
+<code>TEng</code>.
+The heat transfer between the engine and the cooling water control volume is
+quantified using the overall thermal conductance <code>UAHex</code>,
+while the heat loss to the surroundings is quantified using the overall thermal
+conductance <code>UALos</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EngineTemperature;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo b/Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo
new file mode 100644
index 00000000000..cbf1d4ebafa
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/FilterPower.mo
@@ -0,0 +1,124 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model FilterPower "Constraints for electric power"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Modelica.SIunits.Power PEleMax
+    "Maximum power output";
+  parameter Modelica.SIunits.Power PEleMin
+    "Minimum power output";
+  parameter Boolean use_powerRateLimit
+    "If true, the rate at which net power output can change is limited";
+  parameter Real dPEleMax(final unit="W/s")
+    "Maximum rate at which net power output can change";
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEleDem(final unit="W")
+    "Electric power demand"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PEle(final unit="W")
+    "Electric power demand after applied constraints"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Fluid.CHPs.BaseClasses.AssertPower assPow(
+    final PEleMax=PEleMax,
+    final PEleMin=PEleMin,
+    final use_powerRateLimit=use_powerRateLimit,
+    final dPEleMax=dPEleMax)
+    "Assert if electric power is outside boundaries"
+    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
+
+protected
+  Modelica.Blocks.Nonlinear.VariableLimiter PLim "Power limiter"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant PMax(
+    final k=PEleMax) "Maximum power"
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant PMin(
+    final k=PEleMin) "Minimum power"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+  Buildings.Controls.OBC.CDL.Continuous.SlewRateLimiter dPLim(
+    final raisingSlewRate(unit="W/s")=dPEleMax,
+    final fallingSlewRate(unit="W/s")=-dPEleMax,
+    final Td=1) "Power rate limiter"
+    annotation (Placement(transformation(extent={{0,20},{20,40}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant limDp(
+    final k=use_powerRateLimit)
+    "Check if dP is limited"
+    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
+
+equation
+  connect(PMax.y, PLim.limit1) annotation (Line(points={{-58,30},{-50,30},{-50,
+          8},{-42,8}}, color={0,0,127}));
+  connect(PMin.y, PLim.limit2) annotation (Line(points={{-58,-30},{-50,-30},{
+          -50,-8},{-42,-8}}, color={0,0,127}));
+  connect(PLim.u, PEleDem) annotation (Line(points={{-42,0},{-120,0}},
+          color={0,0,127}));
+  connect(switch.y, PEle) annotation (Line(points={{92,0},{120,0}},
+          color={0,0,127}));
+  connect(PLim.y, dPLim.u) annotation (Line(points={{-19,0},{-10,0},{-10,30},{-2,30}},
+          color={0,0,127}));
+  connect(PLim.y, switch.u3) annotation (Line(points={{-19,0},{-10,0},{-10,-8},{
+          68,-8}},  color={0,0,127}));
+  connect(assPow.PEleDem, PEleDem) annotation (Line(points={{-42,-70},{-90,-70},
+          {-90,0},{-120,0}}, color={0,0,127}));
+  connect(limDp.y, switch.u2) annotation (Line(points={{22,-30},{40,-30},{40,0},
+          {68,0}}, color={255,0,255}));
+
+  connect(dPLim.y, switch.u1)
+    annotation (Line(points={{22,30},{40,30},{40,8},{68,8}}, color={0,0,127}));
+annotation (
+  defaultComponentName="filPow",
+  Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
+  Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={
+        Text(
+          extent={{-86,-64},{-46,-44}},
+          lineColor={128,128,128},
+          textString="uMin"),
+        Text(
+          extent={{-34,76},{-9,56}},
+          lineColor={128,128,128},
+          textString="output"),
+        Text(
+          extent={{50,50},{90,70}},
+          lineColor={128,128,128},
+          textString="uMax"),
+        Text(
+          extent={{52,-8},{74,-20}},
+          lineColor={128,128,128},
+          textString="input"),
+    Line(points={{-90,0},{68,0}}, color={192,192,192}),
+    Line(
+      points={{-50,-70},{50,70}}),
+    Line(points={{0,-90},{0,68}}, color={192,192,192}),
+    Polygon(
+      points={{90,0},{68,-8},{68,8},{90,0}},
+      lineColor={192,192,192},
+      fillColor={192,192,192},
+      fillPattern=FillPattern.Solid),
+    Polygon(
+      points={{0,90},{-8,68},{8,68},{0,90}},
+      lineColor={192,192,192},
+      fillColor={192,192,192},
+      fillPattern=FillPattern.Solid),
+        Line(points={{50,70},{82,70}}, color={0,0,0}),
+        Line(points={{-82,-70},{-50,-70}}, color={0,0,0}),
+        Line(points={{-44,-70}}, color={0,0,0}),
+        Line(points={{-40,-70},{40,70}}, color={0,0,0})}),
+  Documentation(info="<html>
+<p>
+The model checks if the electric power and power rate are within the boundaries
+specified by the manufacturer.
+The constraints are applied and a warning message is sent if the electric power
+is outside the boundaries.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end FilterPower;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Functions/package.mo b/Buildings/Fluid/CHPs/BaseClasses/Functions/package.mo
new file mode 100644
index 00000000000..e92d213f1c1
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Functions/package.mo
@@ -0,0 +1,14 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+package Functions
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains functions for used
+in the blocks. The functions are used in
+the blocks
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses\">
+Buildings.Fluid.CHPs.BaseClasses</a>.
+</p>
+</html>"));
+end Functions;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Functions/package.order b/Buildings/Fluid/CHPs/BaseClasses/Functions/package.order
new file mode 100644
index 00000000000..2c667688704
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Functions/package.order
@@ -0,0 +1 @@
+polynomialtrivariate
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Functions/polynomialtrivariate.mo b/Buildings/Fluid/CHPs/BaseClasses/Functions/polynomialtrivariate.mo
new file mode 100644
index 00000000000..c190eea9ed0
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Functions/polynomialtrivariate.mo
@@ -0,0 +1,73 @@
+within Buildings.Fluid.CHPs.BaseClasses.Functions;
+function polynomialtrivariate
+  "Polynominal function used for efficiency calculation"
+  extends Modelica.Icons.Function;
+
+  input Real x1 "Independent variable";
+  input Real x2 "Independent variable";
+  input Real x3 "Independent variable";
+  input Real a[27] "Coefficients";
+  output Real y "Result";
+
+protected
+ Real x1Sq = x1^2;
+ Real x2Sq = x2^2;
+ Real x3Sq = x3^2;
+
+algorithm
+  y := a[1] + a[2]*x1Sq + a[3]*x1
+            + a[4]*x2Sq + a[5]*x2
+            + a[6]*x3Sq + a[7]*x3
+            + a[8]*x1Sq*x2Sq + a[9]*x1*x2 + a[10]*x1*x2Sq + a[11]*x1Sq*x2
+            + a[12]*x1Sq*x3Sq + a[13]*x1*x3 + a[14]*x1*x3Sq + a[15]*x1Sq*x3
+            + a[16]*x2Sq*x3Sq + a[17]*x2*x3 + a[18]*x2*x3Sq + a[19]*x2Sq*x3
+            + a[20]*x1Sq*x2Sq*x3Sq + a[21]*x1Sq*x2Sq*x3 + a[22]*x1Sq*x2*x3Sq + a[23]*x1*x2Sq*x3Sq
+            + a[24]*x1Sq*x2*x3 + a[25]*x1*x2Sq*x3 + a[26]*x1*x2*x3Sq
+            + a[27]*x1*x2*x3;
+
+annotation (Documentation(info="<html>
+<p>
+This function computes a trivariate fifth order polynomial.
+The polynomial has the form
+</p>
+<p style=\"font-style:italic;\">
+y = a<sub>1</sub>
++ a<sub>2</sub> x<sub>1</sub><sup>2</sup>
++ a<sub>3</sub> x<sub>1</sub>
++ a<sub>4</sub> x<sub>2</sub><sup>2</sup>
++ a<sub>5</sub> x<sub>2</sub>
++ a<sub>6</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>7</sub> x<sub>3</sub>
++ a<sub>8</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub><sup>2</sup>
++ a<sub>9</sub> x<sub>1</sub> x<sub>2</sub>
+<br/>
++ a<sub>10</sub> x<sub>1</sub> x<sub>2</sub><sup>2</sup>
++ a<sub>11</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub>
++ a<sub>12</sub> x<sub>1</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>13</sub> x<sub>1</sub> x<sub>3</sub>
++ a<sub>14</sub> x<sub>1</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>15</sub> x<sub>1</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>16</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>17</sub> x<sub>2</sub> x<sub>3</sub>
++ a<sub>18</sub> x<sub>2</sub> x<sub>3</sub><sup>2</sup>
+<br/>
++ a<sub>19</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>20</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>21</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>22</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>23</sub> x<sub>1</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub><sup>2</sup>
++ a<sub>24</sub> x<sub>1</sub><sup>2</sup> x<sub>2</sub> x<sub>3</sub>
++ a<sub>25</sub> x<sub>1</sub> x<sub>2</sub><sup>2</sup> x<sub>3</sub>
++ a<sub>26</sub> x<sub>1</sub> x<sub>2</sub> x<sub>3</sub><sup>2</sup>
++ a<sub>27</sub> x<sub>1</sub> x<sub>2</sub> x<sub>3</sub>
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+March 10, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end polynomialtrivariate;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo
new file mode 100644
index 00000000000..2c0569d5f77
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeInput.mo
@@ -0,0 +1,42 @@
+within Buildings.Fluid.CHPs.BaseClasses.Interfaces;
+connector ModeTypeInput = input CHPs.BaseClasses.Types.Mode
+  "Input connector for mode type"
+annotation (
+  defaultComponentName="u",
+  Icon(graphics={
+    Polygon(
+      lineColor={0,127,0},
+      fillColor={0,127,0},
+      fillPattern=FillPattern.Solid,
+      points={{-100.0,100.0},{100.0,0.0},{-100.0,-100.0}})},
+    coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}},
+      preserveAspectRatio=true,
+      initialScale=0.2)),
+  Diagram(
+    coordinateSystem(preserveAspectRatio=true,
+      initialScale=0.2,
+      extent={{-100.0,-100.0},{100.0,100.0}}),
+      graphics={
+    Polygon(
+      lineColor={0,127,0},
+      fillColor={0,127,0},
+      fillPattern=FillPattern.Solid,
+      points={{0.0,50.0},{100.0,0.0},{0.0,-50.0},{0.0,50.0}}),
+    Text(
+      lineColor={0,0,127},
+      extent={{-10.0,60.0},{-10.0,85.0}},
+      textString="%name")}),
+  Documentation(info="<html>
+<p>
+Connector with one output signal of type
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.Types.Mode\">
+Buildings.Fluid.CHPs.BaseClasses.Types.Mode</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo
new file mode 100644
index 00000000000..b1e96eeebcc
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/ModeTypeOutput.mo
@@ -0,0 +1,41 @@
+within Buildings.Fluid.CHPs.BaseClasses.Interfaces;
+connector ModeTypeOutput = output CHPs.BaseClasses.Types.Mode
+  "Output connector for mode type"
+annotation (
+  defaultComponentName="y",
+  Icon(
+    coordinateSystem(preserveAspectRatio=true,
+      extent={{-100.0,-100.0},{100.0,100.0}}),
+      graphics={
+    Polygon(
+      lineColor={0,127,0},
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid,
+      points={{-100.0,100.0},{100.0,0.0},{-100.0,-100.0}})}),
+  Diagram(
+    coordinateSystem(preserveAspectRatio=true,
+      extent={{-100.0,-100.0},{100.0,100.0}}),
+      graphics={
+    Polygon(
+      lineColor={0,127,0},
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid,
+      points={{-100.0,50.0},{0.0,0.0},{-100.0,-50.0}}),
+    Text(
+      lineColor={0,0,127},
+      extent={{30.0,60.0},{30.0,110.0}},
+      textString="%name")}),
+  Documentation(info="<html>
+<p>
+Connector with one output signal of type
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.Types.Mode\">
+Buildings.Fluid.CHPs.BaseClasses.Types.Mode</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.mo b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.mo
new file mode 100644
index 00000000000..703beff4250
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+package Interfaces
+  extends Modelica.Icons.InterfacesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains implementations of connectors for input and output
+of CHP operation modes.
+</p>
+</html>"));
+end Interfaces;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.order b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.order
new file mode 100644
index 00000000000..cfda4f7a415
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Interfaces/package.order
@@ -0,0 +1,2 @@
+ModeTypeInput
+ModeTypeOutput
diff --git a/Buildings/Fluid/CHPs/BaseClasses/PowerConsumption.mo b/Buildings/Fluid/CHPs/BaseClasses/PowerConsumption.mo
new file mode 100644
index 00000000000..3fa5350e2c2
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/PowerConsumption.mo
@@ -0,0 +1,80 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model PowerConsumption
+  "Power consumption during stand-by and cool-down modes"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Modelica.SIunits.Power PStaBy
+    "Standby electric power";
+  parameter Modelica.SIunits.Power PCooDow
+    "Cooldown electric power";
+
+  Buildings.Fluid.CHPs.BaseClasses.Interfaces.ModeTypeInput opeMod
+    "Operation mode"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-120,-10},{-100,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PCon(
+    final unit="W")
+    "Power consumption during stand-by and cool-down modes"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+
+protected
+  Modelica.Blocks.Sources.BooleanExpression staBy(
+    final y=opeMod == Buildings.Fluid.CHPs.BaseClasses.Types.Mode.StandBy)
+    "Check if the operation mode is StandBy"
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  Modelica.Blocks.Sources.BooleanExpression cooDow(
+    final y=opeMod == Buildings.Fluid.CHPs.BaseClasses.Types.Mode.StandBy or
+            opeMod == Buildings.Fluid.CHPs.BaseClasses.Types.Mode.CoolDown)
+    "Check if stand-by mode or cool-down mode"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant staByCon(
+    final k=PStaBy)
+    "Stand-by mode power consumption "
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch
+    "Power consumption during stand-by or cool-down mode"
+    annotation (Placement(transformation(extent={{-20,20},{0,40}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch switch1 "Cool-down power consumption"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(final k=0)
+    "Zero power consumption"
+    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowCon(
+    final k=PCooDow)
+    "Cool-down mode power consumption "
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+
+equation
+  connect(staByCon.y, switch.u1) annotation (Line(points={{-58,60},{-40,60},{-40,
+          38},{-22,38}}, color={0,0,127}));
+  connect(switch1.y, PCon) annotation (Line(points={{82,0},{120,0}},
+          color={0,0,127}));
+  connect(staBy.y, switch.u2) annotation (Line(points={{-59,30},{-22,30}},
+          color={255,0,255}));
+  connect(cooDow.y, switch1.u2) annotation (Line(points={{21,0},{58,0}},
+          color={255,0,255}));
+  connect(const.y, switch1.u3) annotation (Line(points={{22,-30},{40,-30},{40,
+          -8},{58,-8}}, color={0,0,127}));
+  connect(cooDowCon.y, switch.u3) annotation (Line(points={{-58,0},{-40,0},{-40,
+          22},{-22,22}}, color={0,0,127}));
+  connect(switch.y, switch1.u1) annotation (Line(points={{2,30},{40,30},{40,8},
+          {58,8}}, color={0,0,127}));
+
+annotation (
+  defaultComponentName="powCon",
+  Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
+  Icon(coordinateSystem(extent={{-100,-100},{100,100}})),
+  Documentation(info="<html>
+<p>
+The model calculates the power consumption during the stand-by and cool-down modes of operation.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 18, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PowerConsumption;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Types/Mode.mo b/Buildings/Fluid/CHPs/BaseClasses/Types/Mode.mo
new file mode 100644
index 00000000000..cb204b479a0
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Types/Mode.mo
@@ -0,0 +1,43 @@
+within Buildings.Fluid.CHPs.BaseClasses.Types;
+type Mode = enumeration(
+    Off "Plant completely turned off",
+    StandBy "Plant ready to run but not producing heat/electricity",
+    PumpOn "Pump starts to run",
+    WarmUp "Warm-up mode",
+    Normal "Normal operating mode",
+    CoolDown "Cool-down before going to stand-by or off mode")
+  "Enumeration for operation mode types"
+annotation (
+  Documentation(info="<html>
+<p>
+Enumeration for the type of modes.
+The possible values are:
+</p>
+<ol>
+<li>
+Off
+</li>
+<li>
+StandBy
+</li>
+<li>
+PumpOn
+</li>
+<li>
+WarmUp
+</li>
+<li>
+Normal
+</li>
+<li>
+CoolDown
+</li>
+</ol>
+</html>", revisions="<html>
+<ul>
+<li>
+June 18, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Types/package.mo b/Buildings/Fluid/CHPs/BaseClasses/Types/package.mo
new file mode 100644
index 00000000000..9c779aeb95f
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Types/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+package Types "Library of CHP operation modes"
+  extends Modelica.Icons.TypesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+In this package, <strong>Mode</strong> defines all the possible operating modes
+of CHP units.
+</p>
+</html>"));
+end Types;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Types/package.order b/Buildings/Fluid/CHPs/BaseClasses/Types/package.order
new file mode 100644
index 00000000000..6de17691a61
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Types/package.order
@@ -0,0 +1 @@
+Mode
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mo
new file mode 100644
index 00000000000..5688ff69bef
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mo
@@ -0,0 +1,42 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model AssertFuelFlow "Validate model AssertFuelFlow"
+  extends Modelica.Icons.Example;
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.AssertFuelFlow assFue(
+    final dmFueMax_flow=per.dmFueMax_flow)
+    "Assert if fuel mass flow rate is outside boundaries"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable mFue_flow(
+    final table=[0,0; 300,1; 600,3.5; 900,0],
+    final smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Fuel mass flow rate"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+
+equation
+  connect(mFue_flow.y[1], assFue.mFue_flow) annotation (Line(points={{-38,0},
+          {38,0}}, color={0,0,127}));
+
+annotation (
+  experiment(StopTime=1200, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.AssertFuelFlow\">
+Buildings.Fluid.CHPs.BaseClasses.AssertFuelFlow</a>
+for sending a warning message if the fuel mass flow rate is outside boundaries.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertFuelFlow;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertPower.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertPower.mo
new file mode 100644
index 00000000000..4fa1f05daa8
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertPower.mo
@@ -0,0 +1,45 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model AssertPower "Validate model AssertPower"
+  extends Modelica.Icons.Example;
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.AssertPower assPow(
+    PEleMax=per.PEleMax,
+    PEleMin=per.PEleMin,
+    use_powerRateLimit=per.use_powerRateLimit,
+    dPEleMax=per.dPEleMax)
+    "Assert if electric power is outside boundaries"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable PEleDem(
+    table=[0,0; 300,500; 600,2000; 900,3001;
+           1200,0; 1500,6000; 2000,6000],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Electricity demand"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+
+equation
+  connect(PEleDem.y[1], assPow.PEleDem)
+    annotation (Line(points={{-38,0},{38,0}}, color={0,0,127}));
+
+annotation (
+  experiment(StopTime=1800, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertPower.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.AssertPower\">
+Buildings.Fluid.CHPs.BaseClasses.AssertPower</a>
+for sending a warning message if the electric power is outside boundaries.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertPower;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mo
new file mode 100644
index 00000000000..b6cebc51cf8
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mo
@@ -0,0 +1,46 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model AssertWaterFlow "Validate model AssertWaterFlow"
+  extends Modelica.Icons.Example;
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.AssertWaterFlow assWatMas(mWatMin_flow=per.mWatMin_flow)
+    "Assert if water mass flow is outside boundaries"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable mWat_flow(
+    table=[0,0; 300,0.05; 360,0.5;
+           600,0.05; 900,0.05],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Water flow rate"
+    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
+  Modelica.Blocks.Sources.BooleanTable runSig(table={300,1000})
+    "Flag is true when electricity/heat demand larger than zero"
+    annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
+
+equation
+  connect(mWat_flow.y[1], assWatMas.mWat_flow) annotation (Line(points={{-38,-20},
+          {0,-20},{0,-4},{38,-4}}, color={0,0,127}));
+  connect(runSig.y, assWatMas.runSig) annotation (Line(points={{-39,20},{0,20},{
+          0,4},{38,4}}, color={255,0,255}));
+
+annotation (
+  experiment(StopTime=900, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.AssertWaterFlow\">
+Buildings.Fluid.CHPs.BaseClasses.AssertWaterFlow</a>
+for sending a warning message if the water mass flow is outside boundaries.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertWaterFlow;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mo
new file mode 100644
index 00000000000..da3b79e540c
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mo
@@ -0,0 +1,42 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model AssertWaterTemperature "Validate model AssertWaterTemperature"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.AssertWaterTemperature assWatTem(TWatMax=per.TWatMax)
+             "Assert if water temperature is outside boundaries"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable TWat(
+    table=[0,273.15 + 20; 300,273.15 + 80;
+           600,273.15 + 100; 900,273.15 + 100],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Water temperature"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+
+equation
+  connect(TWat.y[1], assWatTem.TWat)
+    annotation (Line(points={{-38,0},{38,0}}, color={0,0,127}));
+
+annotation (
+  experiment(StopTime=900, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.AssertWaterTemperature\">
+Buildings.Fluid.CHPs.BaseClasses.AssertWaterTemperature</a>
+for sending a warning message if the water temperature is outside boundaries.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AssertWaterTemperature;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/Controller.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/Controller.mo
new file mode 100644
index 00000000000..fc098f75738
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/Controller.mo
@@ -0,0 +1,63 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model Controller "Validate model Controller"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData3 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Modelica.Blocks.Sources.BooleanTable runSig(
+    startValue=false,
+    table={900,960,1200,2200})
+    "Plant run signal"
+    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
+  Buildings.Fluid.CHPs.BaseClasses.Controller con(final per=per)
+    "Operation mode controller"
+    annotation (Placement(transformation(extent={{20,0},{40,20}})));
+  Modelica.Blocks.Sources.BooleanTable avaSig(
+    final startValue=false,
+    table={300,600,900}) "Plant availability signal"
+    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable mWat_flow(
+    table=[0,0; 900,0.4; 1320,0; 1500,0.4;
+           1900,0; 1960,0.4; 2200,0; 3000,0],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Water flow rate"
+    annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
+
+protected
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
+
+equation
+  connect(avaSig.y, con.avaSig) annotation (Line(points={{-19,70},{10,70},{10,17},
+          {18,17}}, color={255,0,255}));
+  connect(runSig.y, con.runSig) annotation (Line(points={{-19,30},{-10,30},{-10,
+          14},{18,14}}, color={255,0,255}));
+  connect(mWat_flow.y[1], con.mWat_flow) annotation (Line(points={{-18,-30},{-10,
+          -30},{-10,11},{18,11}},     color={0,0,127}));
+
+annotation (
+  experiment(StopTime=3000, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/Controller.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.Controller\">
+Buildings.Fluid.CHPs.BaseClasses.Controller</a>
+for switching between six operating modes.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Controller;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/CoolDown.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/CoolDown.mo
new file mode 100644
index 00000000000..1c95e45abd6
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/CoolDown.mo
@@ -0,0 +1,122 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model CoolDown "Validate model CoolDown"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,80},{80,100}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.Types.Mode actMod=
+    if norm.active then
+      Buildings.Fluid.CHPs.BaseClasses.Types.Mode.Normal
+    elseif cooDow.active then
+      Buildings.Fluid.CHPs.BaseClasses.Types.Mode.CoolDown
+    else
+      Buildings.Fluid.CHPs.BaseClasses.Types.Mode.Off
+  "Mode indicator";
+  Modelica.Blocks.Sources.BooleanTable runSig(
+    final startValue=true,
+    table={300,600,660,690}) "Plant run signal"
+    annotation (Placement(transformation(extent={{-80,-110},{-60,-90}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Not notRun "Plant does not run"
+    annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.And and1 "Plant run and cool-down is optional"
+    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant cooDowOpt(
+    final k=per.coolDownOptional)
+    "Cool-down is optional"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+
+  Modelica.StateGraph.StepWithSignal cooDow(nIn=2, nOut=2) "Cool-down mode"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+protected
+  Modelica.StateGraph.InitialStep norm(final nIn=2, final nOut=2)
+    "Normal operation mode"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{20,80},{40,100}})));
+  Modelica.StateGraph.TransitionWithSignal transition2 "Cool-down to off mode"
+    annotation (Placement(transformation(extent={{10,40},{30,60}})));
+  Modelica.StateGraph.TransitionWithSignal transition1
+    "Normal to cool-down mode"
+    annotation (Placement(transformation(extent={{-50,60},{-30,80}})));
+  Modelica.StateGraph.TransitionWithSignal transition4
+    "Cool-down to normal mode"
+    annotation (Placement(transformation(extent={{-30,-10},{-50,10}})));
+  Modelica.StateGraph.Step off(final nIn=1, final nOut=1) "Off mode"
+    annotation (Placement(transformation(extent={{40,40},{60,60}})));
+  Modelica.StateGraph.TransitionWithSignal transition3 "Off to normal mode"
+    annotation (Placement(transformation(extent={{70,40},{90,60}})));
+  Modelica.StateGraph.Transition transition5(
+    final condition=false,
+    final waitTime=0)
+    annotation (Placement(transformation(extent={{-50,20},{-30,40}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Logical.Timer timer(
+    final t=per.timeDelayCool)
+    "Time of the plant in cool-down mode"
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
+
+equation
+  connect(transition4.outPort, norm.inPort[1]) annotation (Line(points={{-41.5,0},
+          {-90,0},{-90,50.5},{-81,50.5}}, color={0,0,0}));
+  connect(transition1.inPort, norm.outPort[1]) annotation (Line(points={{-44,70},
+          {-52,70},{-52,50.25},{-59.5,50.25}}, color={0,0,0}));
+  connect(off.inPort[1], transition2.outPort) annotation (Line(points={{39,50},
+          {21.5,50}}, color={0,0,0}));
+  connect(off.outPort[1], transition3.inPort) annotation (Line(points={{60.5,50},
+          {76,50}}, color={0,0,0}));
+  connect(transition3.outPort, norm.inPort[2]) annotation (Line(points={{81.5,50},
+          {90,50},{90,-20},{-90,-20},{-90,49.5},{-81,49.5}}, color={0,0,0}));
+  connect(transition5.inPort, norm.outPort[2]) annotation (Line(points={{-44,30},
+          {-52,30},{-52,49.75},{-59.5,49.75}},color={0,0,0}));
+  connect(runSig.y, notRun.u) annotation (Line(points={{-59,-100},{-22,-100}},
+          color={255,0,255}));
+  connect(notRun.y, transition1.condition) annotation (Line(points={{2,-100},{40,
+          -100},{40,-10},{-26,-10},{-26,52},{-40,52},{-40,58}}, color={255,0,255}));
+  connect(cooDowOpt.y, and1.u1) annotation (Line(points={{-58,-60},{-22,-60}},
+          color={255,0,255}));
+  connect(runSig.y, and1.u2) annotation (Line(points={{-59,-100},{-40,-100},{-40,
+          -68},{-22,-68}}, color={255,0,255}));
+  connect(runSig.y, transition3.condition) annotation (Line(points={{-59,-100},{
+          -40,-100},{-40,-40},{80,-40},{80,38}}, color={255,0,255}));
+  connect(and1.y, transition4.condition) annotation (Line(points={{2,-60},{20,-60},
+          {20,-30},{-40,-30},{-40,-12}}, color={255,0,255}));
+  connect(cooDow.outPort[1], transition2.inPort) annotation (Line(points={{0.5,
+          50.25},{8,50.25},{8,50},{16,50}}, color={0,0,0}));
+  connect(cooDow.outPort[2], transition4.inPort) annotation (Line(points={{0.5,
+          49.75},{10,49.75},{10,30},{-20,30},{-20,0},{-36,0}}, color={0,0,0}));
+  connect(transition1.outPort, cooDow.inPort[1]) annotation (Line(points={{
+          -38.5,70},{-32,70},{-32,50},{-22,50},{-22,50.5},{-21,50.5}}, color={0,
+          0,0}));
+  connect(transition5.outPort, cooDow.inPort[2]) annotation (Line(points={{
+          -38.5,30},{-32,30},{-32,49.5},{-21,49.5}}, color={0,0,0}));
+  connect(cooDow.active, timer.u)
+    annotation (Line(points={{-10,39},{-10,10},{-2,10}}, color={255,0,255}));
+  connect(timer.passed, transition2.condition) annotation (Line(points={{22,2},{
+          40,2},{40,30},{20,30},{20,38}}, color={255,0,255}));
+annotation (
+  experiment(StopTime=900, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/CoolDown.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates the transitions to and from the cool-down operating mode.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-100,-120},{100,120}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
+end CoolDown;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mo
new file mode 100644
index 00000000000..eb53b899f23
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mo
@@ -0,0 +1,116 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model EnergyConversion "Validate model EnergyConversion"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData2 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+  parameter Data.ValidationData2 per1(warmUpByTimeDelay=true)
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.EnergyConversion eneConEngTem(
+    final per=per)
+    "Energy conversion volume: warm-up by engine temperature"
+    annotation (Placement(transformation(extent={{60,-40},{80,-20}})));
+  Buildings.Fluid.CHPs.BaseClasses.EnergyConversion eneConTimDel(
+    final per=per1)
+    "Energy conversion volume: warm-up by time delay"
+    annotation (Placement(transformation(extent={{60,-80},{80,-60}})));
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable mWat_flow(
+    table=[0,0; 300,0.4; 2700,0; 3000,0],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Cooling water flow rate"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Fluid.CHPs.BaseClasses.Controller con(final per=per) "Operation mode"
+    annotation (Placement(transformation(extent={{0,70},{20,90}})));
+  Modelica.Blocks.Sources.BooleanTable runSig(startValue=false, table={300,2700})
+    "Plant run signal"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Modelica.Blocks.Sources.BooleanTable avaSig(startValue=true, table={3500})
+    "Plant availability signal"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TEng(
+    final height=90,
+    final duration=600,
+    final offset=273.15 + 15,
+    final startTime=360) "Engine temperature"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TWatIn(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 15) "Cooling water inlet temperature"
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  Modelica.Blocks.Sources.TimeTable PEle(
+    table=[0,0; 299,0; 300,2500; 2699,2500;2700,0; 3000,0])
+    "Electric power demand"
+    annotation (Placement(transformation(extent={{-30,30},{-10,50}})));
+  Controls.OBC.CDL.Continuous.Sources.Constant TRoo(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 15)
+    "Room temperature"
+    annotation (Placement(transformation(extent={{-30,-60},{-10,-40}})));
+protected
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
+
+equation
+  connect(con.opeMod, eneConEngTem.opeMod) annotation (Line(points={{21,80},{40,
+          80},{40,-25},{59,-25}}, color={0,127,0}));
+  connect(avaSig.y, con.avaSig) annotation (Line(points={{-59,80},{-30,80},{-30,
+          87},{-2,87}}, color={255,0,255}));
+  connect(runSig.y, con.runSig) annotation (Line(points={{-59,40},{-54,40},{-54,
+          84},{-2,84}}, color={255,0,255}));
+  connect(TEng.y, con.TEng) annotation (Line(points={{-58,-30},{-40,-30},{-40,
+          78},{-2,78}},
+                    color={0,0,127}));
+  connect(TEng.y, eneConEngTem.TEng) annotation (Line(points={{-58,-30},{0,-30},
+          {0,-37},{58,-37}}, color={0,0,127}));
+  connect(TWatIn.y, eneConEngTem.TWatIn) annotation (Line(points={{-8,0},{20,0},
+          {20,-31},{58,-31}}, color={0,0,127}));
+  connect(PEle.y, eneConEngTem.PEle) annotation (Line(points={{-9,40},{30,40},{
+          30,-22},{58,-22}}, color={0,0,127}));
+  connect(mWat_flow.y[1], eneConEngTem.mWat_flow) annotation (Line(points={{-58,0},
+          {-48,0},{-48,-28},{58,-28}},    color={0,0,127}));
+  connect(mWat_flow.y[1], con.mWat_flow) annotation (Line(points={{-58,0},{-48,
+          0},{-48,81},{-2,81}}, color={0,0,127}));
+  connect(TWatIn.y, eneConTimDel.TWatIn) annotation (Line(points={{-8,0},{20,0},
+          {20,-71},{58,-71}}, color={0,0,127}));
+  connect(mWat_flow.y[1], eneConTimDel.mWat_flow) annotation (Line(points={{-58,0},
+          {-48,0},{-48,-68},{58,-68}},    color={0,0,127}));
+  connect(PEle.y, eneConTimDel.PEle) annotation (Line(points={{-9,40},{30,40},{
+          30,-62},{58,-62}}, color={0,0,127}));
+  connect(con.opeMod, eneConTimDel.opeMod) annotation (Line(points={{21,80},{40,
+          80},{40,-65},{59,-65}}, color={0,127,0}));
+  connect(PEle.y, con.PEle) annotation (Line(points={{-9,40},{-6,40},{-6,72},{
+          -2,72}}, color={0,0,127}));
+  connect(eneConEngTem.PEleNet, con.PEleNet) annotation (Line(points={{82,-22},
+          {90,-22},{90,96},{-6,96},{-6,75},{-2,75}}, color={0,0,127}));
+  connect(TRoo.y, eneConEngTem.TRoo) annotation (Line(points={{-8,-50},{50,-50},
+          {50,-34},{58,-34}}, color={0,0,127}));
+  connect(TRoo.y, eneConTimDel.TRoo) annotation (Line(points={{-8,-50},{50,-50},
+          {50,-74},{58,-74}}, color={0,0,127}));
+annotation (
+  experiment(StopTime=3000, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.EnergyConversion\">
+Buildings.Fluid.CHPs.BaseClasses.EnergyConversion</a>
+for defining the energy conversion control volume.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EnergyConversion;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mo
new file mode 100644
index 00000000000..61ab2cca005
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mo
@@ -0,0 +1,58 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model EnergyConversionNormal "Validate model EnergyConversionNormal"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal opeModBas(
+    final per=per) "Energy conversion for a typical CHP operation"
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp PEle(
+    final height=5000,
+    final duration=360,
+    final offset=0,
+    final startTime=600) "Electric power"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant mWat_flow(
+    final k=0.05) "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TWatIn(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 15)
+    "Water inlet temperature"
+    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+
+equation
+  connect(TWatIn.y, opeModBas.TWatIn) annotation (Line(points={{-38,-30},{0,-30},
+          {0,4},{38,4}}, color={0,0,127}));
+  connect(mWat_flow.y, opeModBas.mWat_flow) annotation (Line(points={{-38,10},
+          {38,10}}, color={0,0,127}));
+  connect(PEle.y, opeModBas.PEle) annotation (Line(points={{-38,50},{0,50},{0,
+          16},{38,16}}, color={0,0,127}));
+
+annotation (
+  experiment(StopTime=1500, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal\">
+Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal</a>
+for defining energy conversion for a typical CHP operation.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EnergyConversionNormal;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mo
new file mode 100644
index 00000000000..544473f0c22
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mo
@@ -0,0 +1,67 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model EnergyConversionWarmUp "Validate model EnergyConversionWarmUp"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData2 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{40,60},{60,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.EnergyConversionWarmUp opeModWarUpEngTem(
+    final per=per) "Energy conversion during warm-up by engine temperature"
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TEng(
+    y(final unit="K", displayUnit="degC"),
+    final height=90,
+    final duration=360,
+    final offset=273.15 + 15,
+    final startTime=600) "Engine temperature"
+    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant mWat_flow(
+    final k=0.05)
+    "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TWatIn(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 15)
+    "Water inlet temperature"
+    annotation (Placement(transformation(extent={{-60,2},{-40,22}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TRoo(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 15)
+    "Room temperature"
+    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+
+equation
+  connect(TWatIn.y, opeModWarUpEngTem.TWatIn) annotation (Line(points={{-38,12},
+          {0,12},{0,13},{38,13}},  color={0,0,127}));
+  connect(mWat_flow.y, opeModWarUpEngTem.mWat_flow) annotation (Line(points={{-38,50},
+          {0,50},{0,18},{38,18}},  color={0,0,127}));
+  connect(TRoo.y, opeModWarUpEngTem.TRoo) annotation (Line(points={{-38,-30},{0,
+          -30},{0,7},{38,7}},   color={0,0,127}));
+  connect(TEng.y, opeModWarUpEngTem.TEng) annotation (Line(points={{-38,-70},{
+          20,-70},{20,2},{38,2}}, color={0,0,127}));
+
+annotation (
+  experiment(StopTime=1500, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.EnergyConversionWarmUp\">
+Buildings.Fluid.CHPs.BaseClasses.EnergyConversionWarmUp</a>
+for defining energy conversion during the warm-up mode dependent on the engine temperature.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EnergyConversionWarmUp;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mo
new file mode 100644
index 00000000000..d36d5ae0472
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mo
@@ -0,0 +1,75 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model EngineTemperature "Validate model EngineTemperature"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.EngineTemperature eng(
+    final UAHex=per.UAHex,
+    final UALos=per.UALos,
+    final capEng=per.capEng,
+    final TEngIni=273.15 + 20) "Heat exchange within the engine control volume"
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp QGen(
+    final height=5000,
+    final duration=360,
+    final offset=0,
+    final startTime=600) "Heat generation within the engine"
+    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TRoo(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 15)
+    "Room temperature"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TWat(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 60)
+    "Water temperature"
+    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+
+protected
+  Buildings.HeatTransfer.Sources.PrescribedTemperature rooTem
+    "Room temperature"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+  Buildings.HeatTransfer.Sources.PrescribedTemperature cooWatTem
+    "Entering cooling water temperature"
+    annotation (Placement(transformation(extent={{-20,-40},{0,-20}})));
+
+equation
+  connect(QGen.y, eng.QGen_flow)
+    annotation (Line(points={{-38,10},{38,10}}, color={0,0,127}));
+  connect(rooTem.port, eng.TRoo) annotation (Line(points={{0,50},{20,50},{20,
+          15.8},{40,15.8}}, color={191,0,0}));
+  connect(rooTem.T, TRoo.y) annotation (Line(points={{-22,50},{-38,50}},
+          color={0,0,127}));
+  connect(cooWatTem.T, TWat.y) annotation (Line(points={{-22,-30},{-38,-30}},
+          color={0,0,127}));
+  connect(cooWatTem.port, eng.TWat) annotation (Line(points={{0,-30},{20,-30},{20,
+          4},{40,4}}, color={191,0,0}));
+
+annotation (
+  experiment(StopTime=1500, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.EngineTemperature\">
+Buildings.Fluid.CHPs.BaseClasses.EngineTemperature</a>
+for defining the heat exchange within the engine control volume.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EngineTemperature;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/FilterPower.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/FilterPower.mo
new file mode 100644
index 00000000000..567641921cc
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/FilterPower.mo
@@ -0,0 +1,52 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model FilterPower "Validate model FilterPower"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable PEleDem(
+    table=[0,0; 300,500; 600,2000; 900,3000;
+           1200,0; 1500,6000; 1800,6000],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Electricity demand"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Fluid.CHPs.BaseClasses.FilterPower filPow(
+    final PEleMax=per.PEleMax,
+    final PEleMin=per.PEleMin,
+    final dPEleMax=per.dPEleMax,
+    final use_powerRateLimit=per.use_powerRateLimit)
+    "Constraints for electric power"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+
+equation
+  connect(PEleDem.y[1], filPow.PEleDem)
+    annotation (Line(points={{-38,0},{18,0}}, color={0,0,127}));
+
+annotation (
+  experiment(StopTime=1800, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/FilterPower.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.FilterPower\">
+Buildings.Fluid.CHPs.BaseClasses.FilerPower</a>
+for applying constraints and sending a warning message if the electric power
+is outside boundaries. The constraints include minimum and maximum electric power and
+the maximum rate of change in power output.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end FilterPower;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mo
new file mode 100644
index 00000000000..2e473eb8fac
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mo
@@ -0,0 +1,71 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model PowerConsumption "Validate model PowerConsumption"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable mWat_flow(
+    table=[0,0; 300,0.4; 2700,0; 3000,0],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-80,-8},{-60,12}})));
+  Buildings.Fluid.CHPs.BaseClasses.Controller con(final per=per)
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Modelica.Blocks.Sources.BooleanTable runSig(
+    final startValue=false,
+    final table={300,2700})
+    "Plant run signal"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Modelica.Blocks.Sources.BooleanTable avaSig(
+    final startValue=true,
+    final table={3500})
+    "Plant availability signal"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  Buildings.Fluid.CHPs.BaseClasses.PowerConsumption powCon(
+    final PStaBy=per.PStaBy,
+    final PCooDow=per.PCooDow)
+    "Internal controller for water mass flow rate"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+
+protected
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{20,60},{40,80}})));
+
+equation
+  connect(avaSig.y, con.avaSig) annotation (Line(points={{-59,80},{-40,80},{-40,
+          7},{-12,7}},        color={255,0,255}));
+  connect(runSig.y, con.runSig) annotation (Line(points={{-59,40},{-50,40},{-50,
+          4},{-12,4}},  color={255,0,255}));
+  connect(con.opeMod,powCon. opeMod) annotation (Line(points={{11,0},{39,0}},
+          color={0,127,0}));
+  connect(mWat_flow.y[1], con.mWat_flow) annotation (Line(points={{-58,2},{-36,
+          2},{-36,1},{-12,1}},
+          color={0,0,127}));
+
+annotation (
+  experiment(StopTime=3000, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.PowerConsumption\">
+Buildings.Fluid.CHPs.BaseClasses.PowerConsumption</a>
+for calculating the power consumption during the stand-by and cool-down modes of
+operation.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PowerConsumption;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/StandBy.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/StandBy.mo
new file mode 100644
index 00000000000..6302fd5e1b6
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/StandBy.mo
@@ -0,0 +1,108 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model StandBy "Validate model StandBy"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant mWat_flow(
+    final k=0.5) "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
+  Buildings.Fluid.CHPs.BaseClasses.Types.Mode actMod "Mode indicator";
+  Modelica.StateGraph.TransitionWithSignal transition1 "Off to standby mode"
+    annotation (Placement(transformation(extent={{-50,70},{-30,90}})));
+  Modelica.StateGraph.TransitionWithSignal transition2
+    "Standby to pump on mode"
+    annotation (Placement(transformation(extent={{10,70},{30,90}})));
+
+  Modelica.StateGraph.Step staBy(nOut=2) "Plant is in standby mode"
+    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+  Modelica.StateGraph.Step pumOn "Plant pump is on"
+    annotation (Placement(transformation(extent={{40,70},{60,90}})));
+protected
+  Modelica.Blocks.Sources.BooleanTable avaSig(table={300,600,900,1260})
+    "Plant availability signal"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notAva "Plant not available"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Modelica.Blocks.Sources.BooleanTable runSig(table={1200,1260})
+    "Plant run signal"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Modelica.StateGraph.InitialStep off(nIn=2) "Off mode"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{60,-80},{80,-60}})));
+  Modelica.StateGraph.TransitionWithSignal transition3(
+    final enableTimer=true,
+    final waitTime=60) "Pump on to off mode"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Modelica.StateGraph.TransitionWithSignal transition4 "Standby to off mode"
+    annotation (Placement(transformation(extent={{-30,30},{-50,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minWatFlo(
+    final k=per.mWatMin_flow)
+    "Minimum water mass flow rate"
+    annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
+  Buildings.Controls.OBC.CDL.Continuous.Greater cheMinFlo
+    "Check if water mass flow rate is higher than the minimum"
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
+
+equation
+  if off.active then
+    actMod = CHPs.BaseClasses.Types.Mode.Off;
+  elseif staBy.active then
+    actMod = CHPs.BaseClasses.Types.Mode.StandBy;
+  else
+    actMod = CHPs.BaseClasses.Types.Mode.PumpOn;
+  end if;
+  connect(transition1.inPort, off.outPort[1])
+    annotation (Line(points={{-44,80},{-59.5,80}}, color={0,0,0}));
+  connect(transition4.outPort, off.inPort[1]) annotation (Line(points={{-41.5,40},
+          {-90,40},{-90,80.5},{-81,80.5}}, color={0,0,0}));
+  connect(transition3.outPort, off.inPort[2]) annotation (Line(points={{81.5,80},
+          {92,80},{92,20},{-90,20},{-90,79.5},{-81,79.5}}, color={0,0,0}));
+  connect(avaSig.y, transition1.condition) annotation (Line(points={{-59,-40},{-50,
+          -40},{-50,60},{-40,60},{-40,68}}, color={255,0,255}));
+  connect(avaSig.y, notAva.u) annotation (Line(points={{-59,-40},{-50,-40},{-50,
+          -20},{-90,-20},{-90,0},{-82,0}}, color={255,0,255}));
+  connect(notAva.y, transition4.condition)
+    annotation (Line(points={{-58,0},{-40,0},{-40,28}}, color={255,0,255}));
+  connect(runSig.y, transition2.condition)
+    annotation (Line(points={{1,0},{20,0},{20,68}}, color={255,0,255}));
+  connect(mWat_flow.y, cheMinFlo.u1)
+    annotation (Line(points={{2,-40},{18,-40}}, color={0,0,127}));
+  connect(minWatFlo.y, cheMinFlo.u2) annotation (Line(points={{2,-80},{10,-80},{
+          10,-48},{18,-48}}, color={0,0,127}));
+  connect(cheMinFlo.y, transition3.condition)
+    annotation (Line(points={{42,-40},{80,-40},{80,68}}, color={255,0,255}));
+  connect(pumOn.outPort[1], transition3.inPort) annotation (Line(points={{60.5,
+          80.25},{68,80.25},{68,80},{76,80}}, color={0,0,0}));
+  connect(transition2.outPort, pumOn.inPort[1])
+    annotation (Line(points={{21.5,80},{39,80}}, color={0,0,0}));
+  connect(staBy.outPort[1], transition2.inPort) annotation (Line(points={{0.5,
+          80.25},{8,80.25},{8,80},{16,80}}, color={0,0,0}));
+  connect(transition1.outPort, staBy.inPort[1])
+    annotation (Line(points={{-38.5,80},{-21,80}}, color={0,0,0}));
+  connect(staBy.outPort[2], transition4.inPort) annotation (Line(points={{0.5,
+          79.75},{10,79.75},{10,40},{-36,40}}, color={0,0,0}));
+annotation (
+  experiment(StopTime=1500, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/StandBy.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates the transitions to and from the stand-by operating mode.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StandBy;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mo
new file mode 100644
index 00000000000..739247e001f
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mo
@@ -0,0 +1,127 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model WarmUpTemperature
+  "Validate model WarmUp if warm-up by engine temperature"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData2 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,80},{80,100}})));
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TEng(
+    final height=200,
+    final duration=360,
+    final offset=273.15,
+    final startTime=0) "Engine temperature"
+    annotation (Placement(transformation(extent={{-100,70},{-80,90}})));
+  Modelica.Blocks.Sources.BooleanTable runSig(
+    final startValue=true,
+    final table={600})
+    "Plant run signal"
+    annotation (Placement(transformation(extent={{-90,-90},{-70,-70}})));
+  Buildings.Fluid.CHPs.BaseClasses.Types.Mode actMod "Mode indicator";
+  Modelica.StateGraph.TransitionWithSignal transition1 "Off to warm-up mode"
+    annotation (Placement(transformation(extent={{-50,20},{-30,40}})));
+  Modelica.StateGraph.TransitionWithSignal transition2 "Warm-up to normal mode"
+    annotation (Placement(transformation(extent={{10,20},{30,40}})));
+  Modelica.StateGraph.TransitionWithSignal transition3 "Normal to off mode"
+    annotation (Placement(transformation(extent={{70,20},{90,40}})));
+
+  Modelica.StateGraph.StepWithSignal warUp(nIn=2, nOut=2)
+    "Plant is in warm-up mode"
+    annotation (Placement(transformation(extent={{-20,40},{0,20}})));
+  Controls.OBC.CDL.Continuous.Sources.Constant PEle[2](k={1,2})
+    "Power output and demand"
+    annotation (Placement(transformation(extent={{-50,70},{-30,90}})));
+protected
+  Modelica.StateGraph.InitialStep off(final nIn=2, final nOut=2) "Off mode"
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
+  Modelica.StateGraph.TransitionWithSignal transition4 "Warm-up to off mode"
+    annotation (Placement(transformation(extent={{-30,-50},{-50,-30}})));
+  Modelica.StateGraph.Step nor(nIn=1, nOut=1) "Normal mode"
+    annotation (Placement(transformation(extent={{40,20},{60,40}})));
+  Modelica.StateGraph.Transition transition5(
+    final condition=false,
+    final waitTime=0)
+    annotation (Placement(transformation(extent={{-50,-20},{-30,0}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notRun "Plant not run"
+    annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
+  WarmUpLeaving warUpCtr(
+    final timeDelayStart=per.timeDelayStart,
+    final TEngNom=per.TEngNom,
+    final warmUpByTimeDelay=per.warmUpByTimeDelay) "Warm-up control sequence"
+    annotation (Placement(transformation(extent={{0,70},{20,90}})));
+equation
+  if off.active then
+    actMod = CHPs.BaseClasses.Types.Mode.Off;
+  elseif warUp.active then
+    actMod = CHPs.BaseClasses.Types.Mode.WarmUp;
+  else
+    actMod = CHPs.BaseClasses.Types.Mode.Normal;
+  end if;
+  connect(transition4.outPort, off.inPort[1]) annotation (Line(points={{-41.5,-40},
+          {-90,-40},{-90,30.5},{-81,30.5}}, color={0,0,0}));
+  connect(transition1.inPort, off.outPort[1]) annotation (Line(points={{-44,30},
+          {-52,30},{-52,30.25},{-59.5,30.25}}, color={0,0,0}));
+  connect(nor.inPort[1], transition2.outPort) annotation (Line(points={{39,30},
+          {21.5,30}}, color={0,0,0}));
+  connect(nor.outPort[1], transition3.inPort) annotation (Line(points={{60.5,30},
+          {76,30}}, color={0,0,0}));
+  connect(transition3.outPort, off.inPort[2]) annotation (Line(points={{81.5,30},
+          {90,30},{90,60},{-90,60},{-90,29.5},{-81,29.5}}, color={0,0,0}));
+  connect(transition5.inPort, off.outPort[2]) annotation (Line(points={{-44,-10},
+          {-52,-10},{-52,29.75},{-59.5,29.75}}, color={0,0,0}));
+  connect(runSig.y, notRun.u) annotation (Line(points={{-69,-80},{18,-80}},
+          color={255,0,255}));
+  connect(runSig.y, transition1.condition) annotation (Line(points={{-69,-80},{
+          -60,-80},{-60,10},{-40,10},{-40,18}},
+                                          color={255,0,255}));
+  connect(notRun.y, transition3.condition) annotation (Line(points={{42,-80},
+          {80,-80},{80,18}}, color={255,0,255}));
+  connect(notRun.y, transition4.condition) annotation (Line(points={{42,-80},{80,
+          -80},{80,-60},{-40,-60},{-40,-52}}, color={255,0,255}));
+  connect(warUp.active, warUpCtr.actWarUp)
+    annotation (Line(points={{-10,41},{-10,86},{-2,86}}, color={255,0,255}));
+  connect(transition1.outPort, warUp.inPort[1]) annotation (Line(points={{-38.5,
+          30},{-30,30},{-30,29.5},{-21,29.5}}, color={0,0,0}));
+  connect(warUp.outPort[1], transition2.inPort) annotation (Line(points={{0.5,
+          29.75},{8,29.75},{8,30},{16,30}}, color={0,0,0}));
+  connect(transition5.outPort, warUp.inPort[2]) annotation (Line(points={{-38.5,
+          -10},{-30,-10},{-30,30.5},{-21,30.5}}, color={0,0,0}));
+  connect(warUp.outPort[2], transition4.inPort) annotation (Line(points={{0.5,
+          30.25},{8,30.25},{8,-40},{-36,-40}}, color={0,0,0}));
+  connect(TEng.y, warUpCtr.TEng) annotation (Line(points={{-78,80},{-60,80},{
+          -60,100},{-20,100},{-20,82},{-2,82}},
+                            color={0,0,127}));
+  connect(warUpCtr.y, transition2.condition) annotation (Line(points={{22,80},{
+          30,80},{30,0},{20,0},{20,18}}, color={255,0,255}));
+  connect(PEle[1].y, warUpCtr.PEleNet) annotation (Line(points={{-28,80},{-20,
+          80},{-20,78},{-2,78}}, color={0,0,127}));
+  connect(PEle[2].y, warUpCtr.PEle) annotation (Line(points={{-28,80},{-20,80},
+          {-20,74},{-2,74}}, color={0,0,127}));
+annotation (
+  experiment(StopTime=900, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.WarmUpLeaving\">
+Buildings.Fluid.CHPs.BaseClasses.WarmUpLeaving</a>. 
+The example is for the warm-up mode dependent on the engine temperature 
+(e.g. CHPs with Stirling engines).
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end WarmUpTemperature;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mo
new file mode 100644
index 00000000000..d2207c7e1c9
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mo
@@ -0,0 +1,107 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model WarmUpTimeDelay
+  "Validate model WarmUp if warm-up by time delay"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData1 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,62},{80,82}})));
+  Modelica.Blocks.Sources.BooleanTable runSig(final table={300,330,600})
+  "Plant run signal"
+    annotation (Placement(transformation(extent={{-90,-90},{-70,-70}})));
+  Buildings.Fluid.CHPs.BaseClasses.Types.Mode actMod "Mode indicator";
+  Modelica.StateGraph.TransitionWithSignal transition1 "Off to warm-up mode"
+    annotation (Placement(transformation(extent={{-50,20},{-30,40}})));
+  Modelica.StateGraph.TransitionWithSignal transition2 "Warm-up to normal mode"
+    annotation (Placement(transformation(extent={{10,20},{30,40}})));
+  Modelica.StateGraph.TransitionWithSignal transition3 "Normal to off mode"
+    annotation (Placement(transformation(extent={{70,20},{90,40}})));
+  Modelica.StateGraph.StepWithSignal warUp(nIn=2, nOut=2)
+    "Plant is in warm-up mode"
+    annotation (Placement(transformation(extent={{-20,40},{0,20}})));
+protected
+  Modelica.StateGraph.InitialStep off(nIn=2, nOut=2) "Off mode"
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
+  Modelica.StateGraph.TransitionWithSignal transition4 "Warm-up to off mode"
+    annotation (Placement(transformation(extent={{-30,-50},{-50,-30}})));
+  Modelica.StateGraph.Step nor(nIn=1, nOut=1) "Normal mode"
+    annotation (Placement(transformation(extent={{40,20},{60,40}})));
+  Modelica.StateGraph.Transition transition5(
+    final condition=false,
+    final waitTime=0)
+    annotation (Placement(transformation(extent={{-50,-20},{-30,0}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notRun "Plant not run"
+    annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
+  WarmUpLeaving warUpCtr(
+    final timeDelayStart=per.timeDelayStart,
+    final TEngNom=per.TEngNom,
+    final PEleMax=per.PEleMax,
+    final warmUpByTimeDelay=per.warmUpByTimeDelay) "Warm-up control sequence"
+    annotation (Placement(transformation(extent={{0,70},{20,90}})));
+equation
+  if off.active then
+    actMod = CHPs.BaseClasses.Types.Mode.Off;
+  elseif warUp.active then
+    actMod = CHPs.BaseClasses.Types.Mode.WarmUp;
+  else
+    actMod = CHPs.BaseClasses.Types.Mode.Normal;
+  end if;
+  connect(transition4.outPort, off.inPort[1]) annotation (Line(points={{-41.5,-40},
+          {-90,-40},{-90,30.5},{-81,30.5}}, color={0,0,0}));
+  connect(transition1.inPort, off.outPort[1]) annotation (Line(points={{-44,30},
+          {-52,30},{-52,30.25},{-59.5,30.25}}, color={0,0,0}));
+  connect(nor.inPort[1], transition2.outPort) annotation (Line(points={{39,30},
+          {21.5,30}}, color={0,0,0}));
+  connect(nor.outPort[1], transition3.inPort) annotation (Line(points={{60.5,30},
+          {76,30}}, color={0,0,0}));
+  connect(transition3.outPort, off.inPort[2]) annotation (Line(points={{81.5,30},
+          {90,30},{90,50},{-90,50},{-90,29.5},{-81,29.5}}, color={0,0,0}));
+  connect(transition5.inPort, off.outPort[2]) annotation (Line(points={{-44,-10},
+          {-52,-10},{-52,29.75},{-59.5,29.75}}, color={0,0,0}));
+  connect(runSig.y, transition1.condition) annotation (Line(points={{-69,-80},{
+          -60,-80},{-60,10},{-40,10},{-40,18}}, color={255,0,255}));
+  connect(runSig.y, notRun.u) annotation (Line(points={{-69,-80},{-22,-80}},
+          color={255,0,255}));
+  connect(notRun.y, transition3.condition) annotation (Line(points={{2,-80},
+          {80,-80},{80,18}}, color={255,0,255}));
+  connect(notRun.y, transition4.condition) annotation (Line(points={{2,-80},{20,
+          -80},{20,-60},{-40,-60},{-40,-52}}, color={255,0,255}));
+  connect(warUpCtr.y, transition2.condition) annotation (Line(points={{22,80},{
+          30,80},{30,0},{20,0},{20,18}}, color={255,0,255}));
+  connect(warUp.active, warUpCtr.actWarUp)
+    annotation (Line(points={{-10,41},{-10,86},{-2,86}}, color={255,0,255}));
+  connect(transition1.outPort, warUp.inPort[1]) annotation (Line(points={{-38.5,
+          30},{-30,30},{-30,29.5},{-21,29.5}}, color={0,0,0}));
+  connect(warUp.outPort[1], transition2.inPort) annotation (Line(points={{0.5,
+          29.75},{8,29.75},{8,30},{16,30}}, color={0,0,0}));
+  connect(warUp.outPort[2], transition4.inPort) annotation (Line(points={{0.5,
+          30.25},{10,30.25},{10,-40},{-36,-40}}, color={0,0,0}));
+  connect(transition5.outPort, warUp.inPort[2]) annotation (Line(points={{-38.5,
+          -10},{-30,-10},{-30,30},{-21,30},{-21,30.5}}, color={0,0,0}));
+annotation (
+    experiment(StopTime=900, Tolerance=1e-6),
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.WarmUpLeaving\">
+Buildings.Fluid.CHPs.BaseClasses.WarmUpLeaving</a>. 
+The example is for the warm-up mode with the static time delay
+(e.g. CHPs with internal combustion engines).
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end WarmUpTimeDelay;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mo
new file mode 100644
index 00000000000..64f1b9b4287
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mo
@@ -0,0 +1,92 @@
+within Buildings.Fluid.CHPs.BaseClasses.Validation;
+model WaterFlowControl "Validate model WaterFlowControl"
+  extends Modelica.Icons.Example;
+
+  parameter Buildings.Fluid.CHPs.Data.ValidationData2 per
+    "CHP performance data"
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  Buildings.Fluid.CHPs.BaseClasses.WaterFlowControl conWat(final per=per)
+    "Internal controller for water mass flow rate"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+protected
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{60,59},{80,79}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable mWat_flow(
+    table=[0,0; 300,0.4; 2700,0; 3000,0],
+    smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Water mass flow rate"
+    annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
+  Buildings.Fluid.CHPs.BaseClasses.Controller con(final per=per)
+    "Operation mode controller"
+    annotation (Placement(transformation(extent={{0,60},{20,80}})));
+  Modelica.Blocks.Sources.BooleanTable runSig(
+    final startValue=false,
+    final table={300,2700})
+    "Plant run signal"
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  Modelica.Blocks.Sources.BooleanTable avaSig(
+    final startValue=true,
+    final table={3500})
+    "Plant availability signal"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TEng(
+    y(final unit="K", displayUnit="degC"),
+    final height=90,
+    final duration=300,
+    final offset=273.15 + 15,
+    final startTime=360) "Engine temperature"
+    annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TWatIn(
+    y(final unit="K", displayUnit="degC"),
+    final k=273.15 + 15)
+    "Water inlet temperature"
+    annotation (Placement(transformation(extent={{-20,-40},{0,-20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable PEle(
+    final table=[0,0; 300,2500; 2700,0; 3000,0],
+    final smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments)
+    "Electric power demand"
+    annotation (Placement(transformation(extent={{-20,20},{0,40}})));
+equation
+  connect(avaSig.y, con.avaSig) annotation (Line(points={{-59,70},{-48,70},{-48,
+          77},{-2,77}},      color={255,0,255}));
+  connect(runSig.y, con.runSig) annotation (Line(points={{-59,30},{-42,30},{-42,
+          74},{-2,74}}, color={255,0,255}));
+  connect(TEng.y, con.TEng) annotation (Line(points={{-58,-50},{-30,-50},{-30,
+          68},{-2,68}}, color={0,0,127}));
+  connect(con.opeMod, conWat.opeMod) annotation (Line(points={{21,70},{40,70},{40,
+          7},{59,7}}, color={0,127,0}));
+  connect(TWatIn.y, conWat.TWatIn) annotation (Line(points={{2,-30},{20,-30},
+          {20,-7},{58,-7}}, color={0,0,127}));
+  connect(mWat_flow.y[1], con.mWat_flow) annotation (Line(points={{-58,-10},{
+          -36,-10},{-36,71},{-2,71}},
+                                 color={0,0,127}));
+  connect(PEle.y[1], conWat.PEle) annotation (Line(points={{2,30},{20,30},{20,0},
+          {58,0}}, color={0,0,127}));
+  connect(PEle.y[1], con.PEle) annotation (Line(points={{2,30},{20,30},{20,54},
+          {-10,54},{-10,62},{-2,62}}, color={0,0,127}));
+  connect(PEle.y[1], con.PEleNet) annotation (Line(points={{2,30},{20,30},{20,
+          54},{-10,54},{-10,65},{-2,65}}, color={0,0,127}));
+annotation (
+    experiment(StopTime=3000, Tolerance=1e-6),
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses.WaterFlowControl\">
+Buildings.Fluid.CHPs.BaseClasses.WaterFlowControl</a>
+for calculating the optimum cooling water flow rate based on internal contol.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end WaterFlowControl;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/package.mo b/Buildings/Fluid/CHPs/BaseClasses/Validation/package.mo
new file mode 100644
index 00000000000..e64b05547c4
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+package Validation "Validation of the baseclasses"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models that validate the models in
+<a href=\"modelica://Buildings.Fluid.CHPs.BaseClasses\">
+Buildings.Fluid.CHPs.BaseClasses</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/Validation/package.order b/Buildings/Fluid/CHPs/BaseClasses/Validation/package.order
new file mode 100644
index 00000000000..816d829b5f6
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/Validation/package.order
@@ -0,0 +1,16 @@
+AssertFuelFlow
+AssertPower
+AssertWaterFlow
+AssertWaterTemperature
+Controller
+CoolDown
+EnergyConversion
+EnergyConversionNormal
+EnergyConversionWarmUp
+EngineTemperature
+FilterPower
+PowerConsumption
+StandBy
+WarmUpTemperature
+WarmUpTimeDelay
+WaterFlowControl
diff --git a/Buildings/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo b/Buildings/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo
new file mode 100644
index 00000000000..a096fbcfb3f
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/WarmUpLeaving.mo
@@ -0,0 +1,126 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model WarmUpLeaving
+  "Model evaluating the condition for transitioning from warm-up to normal mode"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Modelica.SIunits.Time timeDelayStart
+    "Time delay between activation and power generation";
+  parameter Modelica.SIunits.Temperature TEngNom
+    "Nominal engine operating temperature";
+  parameter Modelica.SIunits.Power PEleMax=0
+    "Maximum power output"
+    annotation (Dialog(enable=not warmUpByTimeDelay));
+  parameter Boolean warmUpByTimeDelay
+    "If true, the plant will be in warm-up mode depending on the delay time, otherwise depending on engine temperature "
+    annotation(Evaluate=true);
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEng(
+    final unit="K",
+    displayUnit="degC") if not warmUpByTimeDelay
+    "Engine temperature"
+    annotation (Placement(transformation(extent={{-140,0},{-100,40}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Transition signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput actWarUp
+    "Warm-up state active signal"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEle(final unit="W") if
+    not warmUpByTimeDelay
+    "Power demand"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEleNet(final unit="W") if
+    not warmUpByTimeDelay
+    "Net power output"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+
+protected
+  Buildings.Controls.OBC.CDL.Logical.Timer timer(
+    final t=timeDelayStart) if warmUpByTimeDelay
+    "Check the time since the warm-up mode is activated"
+    annotation (Placement(transformation(extent={{0,50},{20,70}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysTem(
+    final uLow=-0.5,
+    final uHigh=0) if not warmUpByTimeDelay
+    "Check if actual engine temperature is higher than norminal value"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add(final k2=-1) if
+    not warmUpByTimeDelay
+    "Difference between actual engine temperature and nominal value"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant temEngNom(
+    y(final unit="K", displayUnit="degC"),
+    final k=TEngNom)
+    "Nominal engine temperature"
+    annotation (Placement(transformation(extent={{-88,-30},{-68,-10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add add1(final k2=-1) if
+    not warmUpByTimeDelay
+    "Difference between actual power output and demand"
+    annotation (Placement(transformation(extent={{-50,-70},{-30,-50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysPow(
+    final uLow=-0.01*PEleMax - 1e-6,
+    final uHigh=0) if not warmUpByTimeDelay
+    "Check if actual power output is higher than demand"
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or2 if not warmUpByTimeDelay "OR evaluation"
+    annotation (Placement(transformation(extent={{30,-30},{50,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre pre if not warmUpByTimeDelay
+    "Infinitesimal time delay to break algebraic loop related to power output computation"
+    annotation (Placement(transformation(extent={{60,-30},{80,-10}})));
+
+equation
+  connect(add.y, hysTem.u)
+    annotation (Line(points={{-28,0},{-12,0}}, color={0,0,127}));
+  connect(TEng, add.u1)
+    annotation (Line(points={{-120,20},{-80,20},{-80,6},{-52,6}}, color={0,0,127}));
+  connect(temEngNom.y, add.u2)
+    annotation (Line(points={{-66,-20},{-60,-20},{-60, -6},{-52,-6}}, color={0,0,127}));
+  connect(actWarUp, timer.u)
+    annotation (Line(points={{-120,60},{-2,60}},    color={255,0,255}));
+  connect(add1.y, hysPow.u)
+    annotation (Line(points={{-28,-60},{-12,-60}}, color={0,0,127}));
+  connect(PEle, add1.u2) annotation (Line(points={{-120,-80},{-80,-80},{-80,-66},
+          {-52,-66}}, color={0,0,127}));
+  connect(hysTem.y, or2.u1) annotation (Line(points={{12,0},{20,0},{20,-20},{28,
+          -20}}, color={255,0,255}));
+  connect(hysPow.y, or2.u2) annotation (Line(points={{12,-60},{20,-60},{20,-28},
+          {28,-28}}, color={255,0,255}));
+  connect(or2.y, pre.u)
+    annotation (Line(points={{52,-20},{58,-20}}, color={255,0,255}));
+  connect(pre.y, y) annotation (Line(points={{82,-20},{90,-20},{90,0},{120,0}},
+        color={255,0,255}));
+  connect(PEleNet, add1.u1) annotation (Line(points={{-120,-40},{-80,-40},{-80,
+          -54},{-52,-54}}, color={0,0,127}));
+  connect(timer.passed, y) annotation (Line(points={{22,52},{60,52},{60,0},{120,
+          0}}, color={255,0,255}));
+
+annotation (defaultComponentName="warUpCtr", Documentation(info="<html>
+<p>
+The model computes a boolean variable which is true when warm-up
+is over.
+CHP will transition from the warm-up mode to the normal mode
+</p>
+<ul>
+<li>
+after the specified time delay if <code>warmUpByTimeDelay</code> is true, or
+</li>
+<li>
+when the engine temperature exceeds the nominal value or the net power produced
+exceeds that requested by the controller if <code>warmUpByTimeDelay</code> is false.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+April 8, 2020, by Antoine Gautier:<br/>
+Add condition on power output.
+</li>
+<li>
+June 1, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end WarmUpLeaving;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/WaterFlowControl.mo b/Buildings/Fluid/CHPs/BaseClasses/WaterFlowControl.mo
new file mode 100644
index 00000000000..e4c0f355eb5
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/WaterFlowControl.mo
@@ -0,0 +1,93 @@
+within Buildings.Fluid.CHPs.BaseClasses;
+model WaterFlowControl "Internal controller for water flow rate"
+  extends Modelica.Blocks.Icons.Block;
+
+  replaceable parameter Buildings.Fluid.CHPs.Data.Generic per
+    "Performance data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+
+  Buildings.Fluid.CHPs.BaseClasses.Interfaces.ModeTypeInput opeMod  "Operation mode"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+      iconTransformation(extent={{-120,60},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput PEle(
+    final unit="W") "Electric power"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TWatIn(
+    final unit="K", displayUnit="degC") "Water inlet temperature"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-90},{-100,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mWatSet_flow(
+    final unit="kg/s", final quantity="MassFlowRate")
+    "Water mass flow rate set point"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+        iconTransformation(extent={{100,-20},{140,20}})));
+protected
+  Modelica.Blocks.Sources.BooleanExpression offStaBy(
+    final y=opeMod == Buildings.Fluid.CHPs.BaseClasses.Types.Mode.Off or
+            opeMod == Buildings.Fluid.CHPs.BaseClasses.Types.Mode.StandBy)
+    "Check if off mode or stand-by mode"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Utilities.Math.Biquadratic mWatIntCon(
+    final a=per.coeMasWat) "Internal control of water flow rate "
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch watFloSet "Water flow setpoint"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(final k=0)
+    "Zero flow rate"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Buildings.Controls.OBC.UnitConversions.To_degC to_degC
+    annotation (Placement(transformation(extent={{-60,-56},{-40,-36}})));
+equation
+  connect(mWatIntCon.y, watFloSet.u3) annotation (Line(points={{21,-40},{40,-40},
+          {40,-8},{58,-8}}, color={0,0,127}));
+  connect(watFloSet.y, mWatSet_flow) annotation (Line(points={{82,0},{120,0}},
+                          color={0,0,127}));
+  connect(const.y, watFloSet.u1) annotation (Line(points={{22,40},{40,40},{40,8},
+          {58,8}},  color={0,0,127}));
+  connect(offStaBy.y, watFloSet.u2) annotation (Line(points={{21,0},{58,0}},
+          color={255,0,255}));
+
+  connect(PEle, mWatIntCon.u1) annotation (Line(points={{-120,0},{-20,0},{-20,
+          -34},{-2,-34}},  color={0,0,127}));
+  connect(TWatIn, to_degC.u) annotation (Line(points={{-120,-60},{-92,-60},{-92,
+          -46},{-62,-46}}, color={0,0,127}));
+  connect(mWatIntCon.u2, to_degC.y)
+    annotation (Line(points={{-2,-46},{-38,-46}}, color={0,0,127}));
+annotation (
+  defaultComponentName="conWat",
+  Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
+  Icon(coordinateSystem(extent={{-100,-100},{100,100}})),
+  Documentation(info="<html>
+<p>
+The model calculates the water mass flow rate that is determined by the internal controller.
+In CHPs that use this type of internal control the cooling water mass flow rate is
+controlled to optimize engine performance and heat recovery.
+In the main model of the CHP unit
+<a href=\"modelica://Buildings.Fluid.CHPs.ThermalElectricalFollowing\">
+Buildings.Fluid.CHPs.ThermalElectricalFollowing</a>,
+this optimum water mass flow rate is specified as the set point signal for the external pump controller.
+</p>
+<h4>Implementation</h4>
+<p>
+The mass flow rate is computed as a biquadratic function of the net power output of
+the system and the water inlet temperature. Note that
+this implementation is a truncated version of the empirical correlation proposed
+in Beausoleil-Morrison (2007) which includes terms of higher order (up to four).
+</p>
+<h4>References</h4>
+<p>
+Beausoleil-Morrison, Ian and Kelly, Nick, 2007. <i>Specifications for modelling fuel cell
+and combustion-based residential cogeneration device within whole-building simulation
+programs</i>, Section III. <a href=\"https://strathprints.strath.ac.uk/6704/\">
+[Report]</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+June 18, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end WaterFlowControl;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/package.mo b/Buildings/Fluid/CHPs/BaseClasses/package.mo
new file mode 100644
index 00000000000..af22aafede2
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Fluid.CHPs;
+package BaseClasses
+  extends Modelica.Icons.BasesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://Buildings.Fluid.CHPs\">Buildings.Fluid.CHPs</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Fluid/CHPs/BaseClasses/package.order b/Buildings/Fluid/CHPs/BaseClasses/package.order
new file mode 100644
index 00000000000..68ea24e212a
--- /dev/null
+++ b/Buildings/Fluid/CHPs/BaseClasses/package.order
@@ -0,0 +1,18 @@
+AssertFuelFlow
+AssertPower
+AssertWaterFlow
+AssertWaterTemperature
+Controller
+EfficiencyCurve
+EnergyConversion
+EnergyConversionNormal
+EnergyConversionWarmUp
+EngineTemperature
+FilterPower
+PowerConsumption
+WarmUpLeaving
+WaterFlowControl
+Functions
+Types
+Validation
+Interfaces
diff --git a/Buildings/Fluid/CHPs/Data/Generic.mo b/Buildings/Fluid/CHPs/Data/Generic.mo
new file mode 100644
index 00000000000..06f63e0f68e
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Data/Generic.mo
@@ -0,0 +1,104 @@
+within Buildings.Fluid.CHPs.Data;
+record Generic "Generic data for CHP models"
+  extends Modelica.Icons.Record;
+  parameter Real[27] coeEtaQ
+    "Vector of coefficients used to calculate thermal efficiency of the engine.
+    The independent variable x1 is the steady-state power output,
+    x2 is the cooling water mass flow rate, x3 is the cooling water inlet temperature.
+    From index 1 to 27, coefficients correspond to the following terms:
+    constant, x1^2, x1, x2^2, x2, x3^2, x3,
+    x1^2*x2^2, x1*x2, x1*x2^2, x1^2*x2,
+    x1^2*x3^2, x1*x3, x1*x3^2, x1^2*x3,
+    x2^2*x3^2, x2*x3, x2*x3^2, x2^2*x3,
+    x1^2*x2^2*x3^2, x1^2*x2^2*x3, x1^2*x2*x3^2, x1*x2^2*x3^2,
+    x1^2*x2*x3, x1*x2^2*x3,  x1*x2*x3^2, x1*x2*x3";
+  parameter Real[27] coeEtaE
+    "Vector of coefficients used to calculate electrical conversion efficiency
+    of the engine. The independent variables and mapping of the coefficients
+    to the polynomial terms are the same as for the thermal efficiency";
+  parameter Boolean compute_coolingWaterFlowRate=true
+    "If true, then an empirical correlation is used to calculate
+    cooling water mass flow rate based on internal control";
+  parameter Real[6] coeMasWat
+    "Vector of coefficients used to calculate cooling water mass flow rate
+    in case coolingWaterControl is true.
+    The independent variable x1 is the steady-state power output,
+    x2 is the cooling water mass flow rate.
+    From index 1 to 6, coefficients correspond to the following terms:
+    constant, x1, x1^2, x2, x2^2, x1*x2";
+  parameter Real[3] coeMasAir
+    "Vector of coefficients used to calculate air mass flow rate.
+    The independent variable x1 is the fuel mass flow rate.
+    From index 1 to 3, coefficients correspond to the following terms:
+    constant, x1, x1^2";
+  parameter Modelica.SIunits.ThermalConductance UAHex
+    "Thermal conductance between the engine and cooling water";
+  parameter Modelica.SIunits.ThermalConductance UALos
+    "Thermal conductance between the engine and surroundings";
+  parameter Modelica.SIunits.HeatCapacity capEng
+    "Thermal capacitance of the engine control volume";
+  parameter Modelica.SIunits.HeatCapacity capHeaRec
+    "Thermal capacitance of heat recovery portion";
+  parameter Boolean warmUpByTimeDelay=true
+    "If true, the plant will be in warm-up mode depending on the delay time,
+    otherwise depending on engine temperature ";
+  parameter Modelica.SIunits.Time timeDelayStart = 60
+    "Time delay between activation and power generation";
+  parameter Modelica.SIunits.Temperature TEngNom = 273.15+100
+    "Nominal engine operating temperature";
+  parameter Boolean coolDownOptional=false
+    "If true, cooldown is optional. The model will complete cooldown before
+    switching to standby, but if reactivated during cooldown period, it
+    will immediately switch into warm-up mode";
+  parameter Modelica.SIunits.Time timeDelayCool = 0
+    "Cooldown period";
+  parameter Modelica.SIunits.Power PEleMax
+    "Maximum power output";
+  parameter Modelica.SIunits.Power PEleMin = 0
+    "Minimum power output";
+  parameter Modelica.SIunits.MassFlowRate mWatMin_flow = 0
+    "Minimum cooling water mass flow rate";
+  parameter Modelica.SIunits.Temperature TWatMax=373.15
+    "Maximum cooling water temperature";
+  parameter Boolean use_powerRateLimit=false
+    "If true, the rate at which net power output can change is limited";
+  parameter Boolean use_fuelRateLimit=false
+    "If true, the rate at which fuel mass flow rate can change is limited";
+  parameter Real dPEleMax(final unit="W/s")
+    "Maximum rate at which net power output can change";
+  parameter Real dmFueMax_flow(final unit="kg/s2")
+    "Maximum rate at which fuel mass flow rate can change";
+  parameter Modelica.SIunits.Power PStaBy
+    "Standby electric power";
+  parameter Modelica.SIunits.Power PCooDow
+    "Cooldown electric power";
+  parameter Real LHVFue(final unit="J/kg") = 47.614e6
+    "Lower heating value of fuel";
+  parameter Real kF(final unit="1") = 1
+    "Warm-up fuel coefficient";
+  parameter Real kP(final unit="1") = 1
+    "Warm-up power coefficient";
+  parameter Real rFue(final unit="1") = 10
+    "Warm-up maximum fuel flow ratio";
+annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName = "per",
+  Documentation(preferredView="info",
+  info="<html>
+<p>
+This is the base record for CHP models.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+April 8, 2020, by Antoine Gautier:<br/>
+Updated parameter names and descriptions.
+</li>
+<li>
+March 08, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Generic;
diff --git a/Buildings/Fluid/CHPs/Data/Senertech5_5kW.mo b/Buildings/Fluid/CHPs/Data/Senertech5_5kW.mo
new file mode 100644
index 00000000000..98f2adca26e
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Data/Senertech5_5kW.mo
@@ -0,0 +1,45 @@
+within Buildings.Fluid.CHPs.Data;
+record Senertech5_5kW "SENERTECH5_5kW"
+  extends Buildings.Fluid.CHPs.Data.Generic(
+    coeEtaQ={0.66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    coeEtaE={0.27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    compute_coolingWaterFlowRate=true,
+    coeMasWat={0.4,0,0,0,0,0},
+    coeMasAir={0,2,-10000},
+    UAHex=741,
+    UALos=13.7,
+    capEng=63605.6,
+    capHeaRec=1000.7,
+    warmUpByTimeDelay=true,
+    timeDelayStart=60,
+    coolDownOptional=true,
+    timeDelayCool=60,
+    PEleMax=5500,
+    PEleMin=0,
+    mWatMin_flow=0,
+    TWatMax=273.15 + 80,
+    use_powerRateLimit=true,
+    use_fuelRateLimit=true,
+    dPEleMax=1000000000,
+    dmFueMax_flow=1000000000,
+    PStaBy=0,
+    PCooDow=0,
+    LHVFue=47.614e6);
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName = "per",
+  Documentation(preferredView="info",
+  info="<html>
+<p>
+This is the record of parameters for CHP models from EnergyPlus example
+<code>MicroCogeneration</code>.
+</p>
+</html>",revisions="<html>
+<ul>
+<li>
+March 08, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Senertech5_5kW;
diff --git a/Buildings/Fluid/CHPs/Data/ValidationData1.mo b/Buildings/Fluid/CHPs/Data/ValidationData1.mo
new file mode 100644
index 00000000000..0b4276f843b
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Data/ValidationData1.mo
@@ -0,0 +1,63 @@
+within Buildings.Fluid.CHPs.Data;
+record ValidationData1 "Validation data set 1"
+  extends Buildings.Fluid.CHPs.Data.Generic(
+    coeEtaQ={0.66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    coeEtaE={0.27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    compute_coolingWaterFlowRate=true,
+    coeMasWat={0.4,0,0,0,0,0},
+    coeMasAir={0,2,-10000},
+    UAHex=741,
+    UALos=13.7,
+    capEng=63605.6,
+    capHeaRec=1000.7,
+    warmUpByTimeDelay=true,
+    timeDelayStart=60,
+    coolDownOptional=true,
+    timeDelayCool=60,
+    PEleMax=5500,
+    PEleMin=0,
+    mWatMin_flow=0.1,
+    TWatMax=273.15 + 80,
+    use_powerRateLimit=true,
+    use_fuelRateLimit=true,
+    dPEleMax=200,
+    dmFueMax_flow=2,
+    PStaBy=100,
+    PCooDow=200,
+    LHVFue=47.614e6);
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName = "per",
+  Documentation(preferredView="info",
+  info="<html>
+<p>
+This is the record of parameters for CHP models derived from the parameters of
+EnergyPlus example <code>MicroCogeneration</code>, with following changes:
+</p>
+<ul>
+<li>
+changed the condition of the warm-up mode, from depending on the time delay to
+engine temperature.
+</li>
+<li>
+changed the minimum cooling water flow rate <code>mWatMin_flow</code> from 0 to 0.1 kg/s.
+</li>
+<li>
+limited the maximum rate of change in the power output <code>dPEleMax</code> and
+the maximum rate of change in the fuel mass flow rate <code>dmFueMax_flow</code>,
+by reducing from 1e+9 to 200 and from 1e+9 to 2 respectively.
+</li>
+<li>
+changed electric power consumptions during standby <code>PStaBy</code> and cool-down
+<code>PCooDow</code> mode from 0 W to 100 W and 200 W respectively.
+</li>
+</ul>
+</html>",revisions="<html>
+<ul>
+<li>
+March 08, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ValidationData1;
diff --git a/Buildings/Fluid/CHPs/Data/ValidationData2.mo b/Buildings/Fluid/CHPs/Data/ValidationData2.mo
new file mode 100644
index 00000000000..9b0629829ff
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Data/ValidationData2.mo
@@ -0,0 +1,60 @@
+within Buildings.Fluid.CHPs.Data;
+record ValidationData2 "Validation data set 2"
+  extends Buildings.Fluid.CHPs.Data.Generic(
+    coeEtaQ={0.66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    coeEtaE={0.27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    compute_coolingWaterFlowRate=true,
+    coeMasWat={0.4,0,0,0,0,0},
+    coeMasAir={0,2,-10000},
+    UAHex=741,
+    UALos=13.7,
+    capEng=63605.6,
+    capHeaRec=1000.7,
+    warmUpByTimeDelay=false,
+    timeDelayStart=0,
+    coolDownOptional=true,
+    timeDelayCool=60,
+    TEngNom=273.15 + 100,
+    PEleMax=5500,
+    PEleMin=0,
+    mWatMin_flow=0.1,
+    TWatMax=273.15 + 80,
+    use_powerRateLimit=true,
+    use_fuelRateLimit=true,
+    dPEleMax=200,
+    dmFueMax_flow=2,
+    PStaBy=100,
+    PCooDow=200,
+    LHVFue=47.614e6);
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName = "per",
+  Documentation(preferredView="info",
+  info="<html>
+<p>
+This is the record of parameters for CHP models derived from the parameters of
+EnergyPlus example <code>MicroCogeneration</code>, with following changes:
+</p>
+<ul>
+<li>
+changed the minimum cooling water flow rate <code>mWatMin_flow</code> from 0 to 0.1 kg/s.
+</li>
+<li>
+limited the maximum net electrical power rate of change <code>dPEleMax</code> and
+the maximum fuel flow rate of change <code>dmFueMax_flow</code>, by reducing from 1e+9 to
+200 and from 1e+9 to 2 respectively.
+</li>
+<li>
+changed electric power consumptions during standby <code>PStaBy</code> and cool-down
+<code>PCooDow</code> mode from 0 W to 100 W and 200 W respectively.
+</li>
+</ul>
+</html>",revisions="<html>
+<ul>
+<li>
+March 08, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ValidationData2;
diff --git a/Buildings/Fluid/CHPs/Data/ValidationData3.mo b/Buildings/Fluid/CHPs/Data/ValidationData3.mo
new file mode 100644
index 00000000000..e3be56a8a6b
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Data/ValidationData3.mo
@@ -0,0 +1,54 @@
+within Buildings.Fluid.CHPs.Data;
+record ValidationData3 "Validation data set 3"
+  extends Buildings.Fluid.CHPs.Data.Generic(
+    coeEtaQ={0.66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    coeEtaE={0.27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+    compute_coolingWaterFlowRate=true,
+    coeMasWat={0.4,0,0,0,0,0},
+    coeMasAir={0,2,-10000},
+    UAHex=741,
+    UALos=13.7,
+    capEng=63605.6,
+    capHeaRec=1000.7,
+    warmUpByTimeDelay=true,
+    timeDelayStart=60,
+    coolDownOptional=true,
+    timeDelayCool=60,
+    PEleMax=5500,
+    PEleMin=0,
+    mWatMin_flow=0,
+    TWatMax=273.15 + 80,
+    use_powerRateLimit=false,
+    use_fuelRateLimit=false,
+    dPEleMax=1000000000,
+    dmFueMax_flow=1000000000,
+    PStaBy=100,
+    PCooDow=200,
+    LHVFue=47.614e6);
+  annotation (
+  defaultComponentPrefixes = "parameter",
+  defaultComponentName = "per",
+  Documentation(preferredView="info",
+  info="<html>
+<p>
+This is the record of parameters for CHP models derived from the parameters of
+EnergyPlus example <code>MicroCogeneration</code>, with following changes:
+</p>
+<ul>
+<li>
+The rate of change in the net electrical power and in the fuel flow rate, becomes unlimitted.
+</li>
+<li>
+changed electric power consumptions during standby <code>PStaBy</code> and cool-down
+<code>PCooDow</code> mode from 0 W to 100 W and 200 W respectively.
+</li>
+</ul>
+</html>",revisions="<html>
+<ul>
+<li>
+March 08, 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ValidationData3;
diff --git a/Buildings/Fluid/CHPs/Data/package.mo b/Buildings/Fluid/CHPs/Data/package.mo
new file mode 100644
index 00000000000..0f5d944e4cb
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Data/package.mo
@@ -0,0 +1,22 @@
+within Buildings.Fluid.CHPs;
+package Data
+  extends Modelica.Icons.MaterialPropertiesPackage;
+
+annotation(preferredView="info",
+  Documentation(info="<html>
+<p>
+This package contains the common parameters that are used
+to specify the performance data
+for the CHP model
+<a href=\"Buildings.Fluid.CHPs.ThermalElectricalFollowing\">
+Buildings.Fluid.CHPs.ThermalElectricalFollowing</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Added information section.
+</li>
+</ul>
+</html>"));
+end Data;
diff --git a/Buildings/Fluid/CHPs/Data/package.order b/Buildings/Fluid/CHPs/Data/package.order
new file mode 100644
index 00000000000..2be50a3d838
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Data/package.order
@@ -0,0 +1,5 @@
+Generic
+Senertech5_5kW
+ValidationData1
+ValidationData2
+ValidationData3
diff --git a/Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo b/Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo
new file mode 100644
index 00000000000..285916ecf8c
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Validation/ElectricalFollowing.mo
@@ -0,0 +1,232 @@
+within Buildings.Fluid.CHPs.Validation;
+model ElectricalFollowing "Validate model ElectricalFollowing"
+  extends Modelica.Icons.Example;
+
+  package Medium = Buildings.Media.Water;
+
+  Buildings.Fluid.CHPs.ThermalElectricalFollowing eleFol(
+    redeclare package Medium = Medium,
+    redeclare Data.ValidationData3 per,
+    m_flow_nominal=0.4,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    switchThermalElectricalFollowing=false,
+    TEngIni=273.15 + 69.55,
+    waitTime=0) "CHP unit with the electricity demand priority"
+    annotation (Placement(transformation(extent={{-20,-30},{0,-10}})));
+
+  Modelica.Blocks.Sources.BooleanTable avaSig(
+    startValue=true,
+    table={172800})
+    "Plant availability signal"
+    annotation (Placement(transformation(extent={{-160,70},{-140,90}})));
+  Buildings.Fluid.Sources.Boundary_pT sin(
+    redeclare package Medium = Medium,
+    p(displayUnit="Pa"),
+    nPorts=1) "Cooling water sink"
+    annotation (Placement(transformation(extent={{40,-30},{20,-10}})));
+  Buildings.Fluid.Sources.MassFlowSource_T cooWat(
+    redeclare package Medium = Medium,
+    use_m_flow_in=true,
+    use_T_in=true,
+    nPorts=1) "Cooling water source"
+    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dPEleNet(
+    final k2=-1)
+    "Absolute error for electric power generaton"
+    annotation (Placement(transformation(extent={{140,0},{160,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dQGen(
+    final k2=-1) "Absolute error for heat generaton"
+    annotation (Placement(transformation(extent={{140,-30},{160,-10}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dQWat(
+    final k2=-1)
+    "Absolute error for heat transfer to water control volume"
+    annotation (Placement(transformation(extent={{140,-60},{160,-40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dQLos(
+    final k2=-1)
+    "Absolute error for heat loss to the surroundings"
+    annotation (Placement(transformation(extent={{140,-90},{160,-70}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dTWatOut(
+    final k2=-1)
+    "Absolute error for water outlet temperature"
+    annotation (Placement(transformation(extent={{140,60},{160,80}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dTEng(
+    final k2=-1)
+    "Absolute error for engine temperature"
+    annotation (Placement(transformation(extent={{140,30},{160,50}})));
+  Modelica.Blocks.Sources.RealExpression PEleNet(
+    final y=eleFol.PEleNet)
+    "Electric power generation"
+    annotation (Placement(transformation(extent={{100,0},{120,20}})));
+  Modelica.Blocks.Sources.RealExpression QGen(final y=eleFol.eneCon.QGen_flow)
+    "Heat generation"
+    annotation (Placement(transformation(extent={{100,-30},{120,-10}})));
+  Modelica.Blocks.Sources.RealExpression QWat(
+    final y=eleFol.QWat_flow)
+    "Heat transfer to the water control volume"
+    annotation (Placement(transformation(extent={{100,-60},{120,-40}})));
+  Modelica.Blocks.Sources.RealExpression QLos(
+    final y=eleFol.QLos.Q_flow)
+    "Heat loss to the surrounding"
+    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
+  Modelica.Blocks.Sources.RealExpression TWatOut(
+    final y=eleFol.vol.T)
+    "Water outlet temperature"
+    annotation (Placement(transformation(extent={{100,60},{120,80}})));
+  Modelica.Blocks.Sources.RealExpression TEng(
+    final y=eleFol.eng.TEng)
+    "Engine temperature"
+    annotation (Placement(transformation(extent={{100,30},{120,50}})));
+  Buildings.HeatTransfer.Sources.PrescribedTemperature preTem
+    "Variable temperature boundary condition in Kelvin"
+    annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
+  Modelica.Blocks.Sources.CombiTimeTable valDat(
+    tableOnFile=true,
+    tableName="tab1",
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    y(unit={"W", "kg/s", "degC", "degC", "W", "W", "W", "W", "W", "degC", "degC", "degC"}),
+    offset={0,0,0,0,0,0,0,0,0,0,0,0},
+    columns={2,3,4,5,6,7,8,9,10,11,12,13},
+    smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1,
+    fileName=ModelicaServices.ExternalReferences.loadResource(
+        "modelica://Buildings/Resources/Data/Fluid/CHPs/Validation/MicroCogeneration.mos"))
+    "Validation data from EnergyPlus simulation"
+    annotation (Placement(transformation(extent={{-160,20},{-140,40}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TWatIn
+    "Convert cooling water inlet temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{-100,-30},{-80,-10}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TRoo
+    "Convert zone temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{-100,-70},{-80,-50}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TWatOutVal
+    "Convert cooling water outplet temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{60,54},{80,74}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TEngVal
+    "Convert engine temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{60,24},{80,44}})));
+  Modelica.Blocks.Routing.RealPassThrough PEleNetVal
+    "Validation data for power output"
+    annotation (Placement(transformation(extent={{60,-6},{80,14}})));
+  Modelica.Blocks.Routing.RealPassThrough QGenVal_flow
+    "Validation data for heat generation rate"
+    annotation (Placement(transformation(extent={{60,-36},{80,-16}})));
+  Modelica.Blocks.Routing.RealPassThrough QWatVal_flow
+    "Validation data for heat flow rate to water"
+    annotation (Placement(transformation(extent={{60,-66},{80,-46}})));
+  Modelica.Blocks.Routing.RealPassThrough QLosVal_flow
+    "Validation data for heat flow rate to ambient"
+    annotation (Placement(transformation(extent={{60,-96},{80,-76}})));
+  Modelica.Blocks.Continuous.Integrator EEle(y(unit="J"))
+    "Electrical energy generated"
+    annotation (Placement(transformation(extent={{40,-130},{60,-110}})));
+  Modelica.Blocks.Continuous.Integrator EThe(y(unit="J"))
+    "Thermal energy recovered"
+    annotation (Placement(transformation(extent={{40,-160},{60,-140}})));
+  Modelica.Blocks.Continuous.Integrator EEleVal(y(unit="J"))
+    "Validation data for electrical energy generated"
+    annotation (Placement(transformation(extent={{98,-130},{118,-110}})));
+  Modelica.Blocks.Continuous.Integrator ETheVal(y(unit="J"))
+    "Validation data for thermal energy recovered"
+    annotation (Placement(transformation(extent={{98,-160},{118,-140}})));
+equation
+  connect(eleFol.port_b, sin.ports[1]) annotation (Line(points={{0,-20},{20,-20}},
+          color={0,127,255}));
+  connect(avaSig.y, eleFol.avaSig) annotation (Line(points={{-139,80},{-30,80},
+          {-30,-11},{-22,-11}}, color={255,0,255}));
+  connect(cooWat.ports[1], eleFol.port_a) annotation (Line(points={{-40,-20},{
+          -20,-20}}, color={0,127,255}));
+  connect(PEleNet.y, dPEleNet.u1) annotation (Line(points={{121,10},{130,10},{130,
+          16},{138,16}}, color={0,0,127}));
+  connect(QGen.y, dQGen.u1) annotation (Line(points={{121,-20},{130,-20},{130,-14},
+          {138,-14}}, color={0,0,127}));
+  connect(QWat.y, dQWat.u1) annotation (Line(points={{121,-50},{130,-50},{130,-44},
+          {138,-44}}, color={0,0,127}));
+  connect(QLos.y, dQLos.u1) annotation (Line(points={{121,-80},{130,-80},{130,-74},
+          {138,-74}}, color={0,0,127}));
+  connect(TWatOut.y, dTWatOut.u1) annotation (Line(points={{121,70},{130.55,70},
+          {130.55,76},{138,76}}, color={0,0,127}));
+  connect(dTEng.u1, TEng.y) annotation (Line(points={{138,46},{130,46},{130,40},
+          {121,40}}, color={0,0,127}));
+  connect(preTem.port, eleFol.TRoo) annotation (Line(points={{-40,-60},{-30,-60},
+          {-30,-27},{-20,-27}}, color={191,0,0}));
+  connect(valDat.y[2], cooWat.m_flow_in) annotation (Line(points={{-139,30},{-70,
+          30},{-70,-12},{-62,-12}},color={0,0,127}));
+  connect(valDat.y[3], TWatIn.u) annotation (Line(points={{-139,30},{-120,30},{-120,
+          -20},{-102,-20}}, color={0,0,127}));
+  connect(TWatIn.y, cooWat.T_in) annotation (Line(points={{-78,-20},{-70,-20},{
+          -70,-16},{-62,-16}}, color={0,0,127}));
+  connect(valDat.y[4], TRoo.u) annotation (Line(points={{-139,30},{-120,30},{-120,
+          -60},{-102,-60}}, color={0,0,127}));
+  connect(TRoo.y, preTem.T) annotation (Line(points={{-78,-60},{-62,-60}},
+          color={0,0,127}));
+  connect(valDat.y[10], TWatOutVal.u) annotation (Line(points={{-139,30},{50,30},
+          {50,64},{58,64}},color={0,0,127}));
+  connect(valDat.y[11], TEngVal.u) annotation (Line(points={{-139,30},{50,30},{50,
+          34},{58,34}}, color={0,0,127}));
+  connect(TWatOutVal.y, dTWatOut.u2) annotation (Line(points={{82,64},{138,64}},
+                             color={0,0,127}));
+  connect(TEngVal.y, dTEng.u2) annotation (Line(points={{82,34},{138,34}},
+                     color={0,0,127}));
+  connect(valDat.y[1], eleFol.PEleDem) annotation (Line(points={{-139,30},{-26,
+          30},{-26,-17},{-22,-17}}, color={0,0,127}));
+  connect(QGenVal_flow.y, dQGen.u2)
+    annotation (Line(points={{81,-26},{138,-26}}, color={0,0,127}));
+  connect(PEleNetVal.y, dPEleNet.u2)
+    annotation (Line(points={{81,4},{138,4}}, color={0,0,127}));
+  connect(valDat.y[5], PEleNetVal.u) annotation (Line(points={{-139,30},{50,30},
+          {50,4},{58,4}}, color={0,0,127}));
+  connect(valDat.y[7], QGenVal_flow.u) annotation (Line(points={{-139,30},{50,30},
+          {50,-26},{58,-26}}, color={0,0,127}));
+  connect(QWatVal_flow.y, dQWat.u2)
+    annotation (Line(points={{81,-56},{138,-56}}, color={0,0,127}));
+  connect(valDat.y[8], QWatVal_flow.u) annotation (Line(points={{-139,30},{50,30},
+          {50,-56},{58,-56}}, color={0,0,127}));
+  connect(QLosVal_flow.y, dQLos.u2)
+    annotation (Line(points={{81,-86},{138,-86}}, color={0,0,127}));
+  connect(valDat.y[9], QLosVal_flow.u) annotation (Line(points={{-139,30},{50,30},
+          {50,-86},{58,-86}}, color={0,0,127}));
+  connect(eleFol.PEleNet, EEle.u) annotation (Line(points={{2,-17},{14,-17},{14,
+          -120},{38,-120}}, color={0,0,127}));
+  connect(eleFol.QWat_flow, EThe.u) annotation (Line(points={{2,-27},{10,-27},{10,
+          -150},{38,-150}}, color={0,0,127}));
+  connect(QWatVal_flow.y, ETheVal.u) annotation (Line(points={{81,-56},{86,-56},
+          {86,-150},{96,-150}}, color={0,0,127}));
+  connect(PEleNetVal.y, EEleVal.u) annotation (Line(points={{81,4},{88,4},{88,-120},
+          {96,-120}}, color={0,0,127}));
+annotation (
+  experiment(StopTime=10000, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ElectricalFollowing.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.ThermalElectricalFollowing\">
+Buildings.Fluid.CHPs.ThermalElectricalFollowing</a>
+for the CHP unit simulation with the electricity demand priority.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 31, 2019, by Jianjun Hu:<br/>
+Refactored implementation.
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-180,-180},{180,100}}),
+            graphics={ Rectangle(
+          extent={{40,100},{180,-180}},
+          fillColor={229,229,229},
+          fillPattern=FillPattern.Solid,
+          lineColor={0,0,0},
+          pattern=LinePattern.Dot),
+                              Text(
+          extent={{78,98},{124,84}},
+          lineColor={0,0,0},
+          pattern=LinePattern.Dash,
+          lineThickness=0.5,
+          textStyle={TextStyle.Bold},
+          textString="Post-processing")}));
+end ElectricalFollowing;
diff --git a/Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo b/Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo
new file mode 100644
index 00000000000..2e5f6e4c00e
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Validation/ThermalFollowing.mo
@@ -0,0 +1,279 @@
+within Buildings.Fluid.CHPs.Validation;
+model ThermalFollowing "Validate model ThermalElectricalFollowing"
+  extends Modelica.Icons.Example;
+
+  package Medium = Buildings.Media.Water;
+
+  Buildings.Fluid.CHPs.ThermalElectricalFollowing theFol(
+    redeclare package Medium = Medium,
+    m_flow_nominal=0.4,
+    redeclare Data.Senertech5_5kW per,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    TEngIni=273.15 + 69.55,
+    waitTime=0) "CHP unit with the thermal demand priority"
+    annotation (Placement(transformation(extent={{-20,0},{0,20}})));
+  Modelica.Blocks.Sources.BooleanTable avaSig(
+    startValue=true,
+    table={172800})
+    "Plant availability signal"
+    annotation (Placement(transformation(extent={{-120,-30},{-100,-10}})));
+  Buildings.Fluid.Sources.Boundary_pT sin(
+    redeclare package Medium = Medium,
+    p(displayUnit="Pa"),
+    nPorts=2)
+    "Cooling water sink"
+    annotation (Placement(transformation(extent={{40,-40},{20,-20}})));
+  Buildings.Fluid.Sources.MassFlowSource_T cooWat(
+    redeclare package Medium = Medium,
+    use_m_flow_in=true,
+    use_T_in=true,
+    nPorts=1) "Cooling water source"
+    annotation (Placement(transformation(extent={{-68,0},{-48,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dPEleNet(
+    final k2=-1)
+    "Absolute error for electric power generaton"
+    annotation (Placement(transformation(extent={{140,0},{160,20}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dQWat(
+    final k2=-1)
+    "Absolute error for heat transfer to water control volume"
+    annotation (Placement(transformation(extent={{140,-60},{160,-40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dTWatOut(
+    final k2=-1)
+    "Absolute error for water outlet temperature"
+    annotation (Placement(transformation(extent={{140,60},{160,80}})));
+  Modelica.Blocks.Sources.RealExpression PEleNet(
+    final y=theFol.PEleNet)
+    "Electric power generation"
+    annotation (Placement(transformation(extent={{100,0},{120,20}})));
+  Modelica.Blocks.Sources.RealExpression QWat(
+    final y=theFol.QWat_flow)
+    "Heat transfer to the water control volume"
+    annotation (Placement(transformation(extent={{100,-60},{120,-40}})));
+  Modelica.Blocks.Sources.RealExpression TWatOut(final y=theFol.TWatOut.T)
+    "Water outlet temperature"
+    annotation (Placement(transformation(extent={{100,60},{120,80}})));
+  HeatTransfer.Sources.PrescribedTemperature preTem
+    "Variable temperature boundary condition in Kelvin"
+    annotation (Placement(transformation(extent={{-70,-60},{-50,-40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dTEng(
+    final k2=-1) "Absolute error for engine temperature"
+    annotation (Placement(transformation(extent={{140,30},{160,50}})));
+  Modelica.Blocks.Sources.RealExpression TEng(
+    final y=theFol.eng.TEng)
+    "Engine temperature"
+    annotation (Placement(transformation(extent={{100,30},{120,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dQLos(
+    final k2=-1)
+    "Absolute error for heat loss to the surroundings"
+    annotation (Placement(transformation(extent={{140,-90},{160,-70}})));
+  Modelica.Blocks.Sources.RealExpression QLos(
+    final y=theFol.QLos.Q_flow)
+    "Heat loss to the surrounding"
+    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
+  Buildings.Controls.OBC.CDL.Continuous.Add dQGen(
+    final k2=-1) "Absolute error for heat generaton"
+    annotation (Placement(transformation(extent={{140,-30},{160,-10}})));
+  Modelica.Blocks.Sources.RealExpression QGen(
+    final y=theFol.eneCon.QGen_flow)
+    "Heat generation"
+    annotation (Placement(transformation(extent={{100,-30},{120,-10}})));
+  Modelica.Blocks.Sources.CombiTimeTable valDat(
+    tableOnFile=true,
+    tableName="tab1",
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    y(unit={"W","kg/s","degC","degC","W","W","W","W","W","degC","degC","degC"}),
+    offset={0,0,0,0,0,0,0,0,0,0,0,0},
+    columns={2,3,4,5,6,7,8,9,10,11,12,13},
+    smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1,
+    fileName=ModelicaServices.ExternalReferences.loadResource("modelica://Buildings/Resources/Data/Fluid/CHPs/Validation/MicroCogeneration.mos"))
+    "Validation data from EnergyPlus simulation"
+    annotation (Placement(transformation(extent={{-170,70},{-150,90}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TRoo
+    "Convert zone temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{-120,-60},{-100,-40}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TWatIn
+    "Convert cooling water inlet temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{-120,0},{-100,20}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TWatOutSet
+    "Convert outlet water setpoint temperature from degC to kelvin "
+    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TEngVal
+    "Convert engine temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{60,24},{80,44}})));
+  Buildings.Controls.OBC.UnitConversions.From_degC TWatOutVal
+    "Convert cooling water outplet temperature from degC to kelvin"
+    annotation (Placement(transformation(extent={{60,54},{80,74}})));
+  Sources.MassFlowSource_T cooWatNeg(
+    redeclare package Medium = Medium,
+    use_m_flow_in=true,
+    use_T_in=true,
+    nPorts=1) "Cooling water source"
+    annotation (Placement(transformation(extent={{-68,-90},{-48,-70}})));
+  ThermalElectricalFollowing theFolNeg(
+    redeclare package Medium = Medium,
+    m_flow_nominal=0.4,
+    redeclare Data.Senertech5_5kW per,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    TEngIni=273.15 + 69.55,
+    waitTime=0)
+    "CHP unit with the thermal demand priority and negative water mass flow rate"
+    annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
+  Controls.OBC.CDL.Continuous.Sources.Constant mWat_flow_negative(final k=-1)
+    "Negative water mass flow rate for validation only"
+    annotation (Placement(transformation(extent={{-170,-90},{-150,-70}})));
+  Modelica.Blocks.Routing.RealPassThrough PEleNetVal
+    "Validation data for power output"
+    annotation (Placement(transformation(extent={{60,-6},{80,14}})));
+  Modelica.Blocks.Routing.RealPassThrough QGenVal_flow
+    "Validation data for heat generation rate"
+    annotation (Placement(transformation(extent={{60,-36},{80,-16}})));
+  Modelica.Blocks.Routing.RealPassThrough QWatVal_flow
+    "Validation data for heat flow rate to water"
+    annotation (Placement(transformation(extent={{60,-66},{80,-46}})));
+  Modelica.Blocks.Routing.RealPassThrough QLosVal_flow
+    "Validation data for heat flow rate to ambient"
+    annotation (Placement(transformation(extent={{60,-96},{80,-76}})));
+  Modelica.Blocks.Continuous.Integrator EEle(y(unit="J"))
+    "Electrical energy generated"
+    annotation (Placement(transformation(extent={{60,-130},{80,-110}})));
+  Modelica.Blocks.Continuous.Integrator EThe(y(unit="J"))
+    "Thermal energy recovered"
+    annotation (Placement(transformation(extent={{60,-160},{80,-140}})));
+  Modelica.Blocks.Continuous.Integrator EEleVal(y(unit="J"))
+    "Validation data for electrical energy generated"
+    annotation (Placement(transformation(extent={{118,-130},{138,-110}})));
+  Modelica.Blocks.Continuous.Integrator ETheVal(y(unit="J"))
+    "Validation data for thermal energy recovered"
+    annotation (Placement(transformation(extent={{118,-160},{138,-140}})));
+protected
+  Modelica.Blocks.Sources.BooleanExpression theFolSig(
+    final y=true)
+    "Signal for thermal following, set to false if electrical following"
+    annotation (Placement(transformation(extent={{-70,32},{-50,48}})));
+equation
+  connect(theFol.port_b, sin.ports[1]) annotation (Line(points={{0,10},{10,10},{
+          10,-28},{20,-28}},
+          color={0,127,255}));
+  connect(avaSig.y,theFol. avaSig) annotation (Line(points={{-99,-20},{-36,-20},
+          {-36,19},{-22,19}}, color={255,0,255}));
+  connect(cooWat.ports[1],theFol. port_a) annotation (Line(points={{-48,10},{-20,
+          10}},      color={0,127,255}));
+  connect(PEleNet.y, dPEleNet.u1) annotation (Line(points={{121,10},{128,10},{128,
+          16},{138,16}}, color={0,0,127}));
+  connect(QWat.y, dQWat.u1) annotation (Line(points={{121,-50},{128,-50},{128,-44},
+          {138,-44}}, color={0,0,127}));
+  connect(theFolSig.y,theFol. theFol) annotation (Line(points={{-49,40},{-34,40},
+          {-34,17},{-22,17}}, color={255,0,255}));
+  connect(preTem.port, theFol.TRoo) annotation (Line(points={{-50,-50},{-30,-50},
+          {-30,3},{-20,3}}, color={191,0,0}));
+  connect(QLos.y,dQLos. u1) annotation (Line(points={{121,-80},{128,-80},{128,-74},
+          {138,-74}}, color={0,0,127}));
+  connect(QGen.y,dQGen. u1) annotation (Line(points={{121,-20},{128,-20},{128,-14},
+          {138,-14}}, color={0,0,127}));
+  connect(valDat.y[2], cooWat.m_flow_in) annotation (Line(points={{-149,80},{-80,
+          80},{-80,18},{-70,18}}, color={0,0,127}));
+  connect(valDat.y[3], TWatIn.u) annotation (Line(points={{-149,80},{-140,80},{-140,
+          10},{-122,10}}, color={0,0,127}));
+  connect(TWatIn.y, cooWat.T_in) annotation (Line(points={{-98,10},{-80,10},{-80,
+          14},{-70,14}}, color={0,0,127}));
+  connect(valDat.y[4], TRoo.u) annotation (Line(points={{-149,80},{-140,80},{-140,
+          -50},{-122,-50}}, color={0,0,127}));
+  connect(TRoo.y, preTem.T) annotation (Line(points={{-98,-50},{-72,-50}},
+          color={0,0,127}));
+  connect(valDat.y[12], TWatOutSet.u) annotation (Line(points={{-149,80},{-140,80},
+          {-140,50},{-122,50}}, color={0,0,127}));
+  connect(TWatOutSet.y,theFol. TWatOutSet) annotation (Line(points={{-98,50},{-30,
+          50},{-30,15},{-22,15}}, color={0,0,127}));
+  connect(TWatOutVal.y, dTWatOut.u2) annotation (Line(points={{82,64},{138,64}},
+                             color={0,0,127}));
+  connect(TWatOut.y, dTWatOut.u1) annotation (Line(points={{121,70},{130,70},{130,
+          76},{138,76}}, color={0,0,127}));
+  connect(TEng.y, dTEng.u1) annotation (Line(points={{121,40},{130,40},{130,46},
+          {138,46}}, color={0,0,127}));
+  connect(TEngVal.y, dTEng.u2) annotation (Line(points={{82,34},{138,34}},
+                     color={0,0,127}));
+  connect(valDat.y[10], TWatOutVal.u) annotation (Line(points={{-149,80},{50,80},
+          {50,64},{58,64}}, color={0,0,127}));
+  connect(valDat.y[11], TEngVal.u) annotation (Line(points={{-149,80},{50,80},{50,
+          34},{58,34}}, color={0,0,127}));
+  connect(valDat.y[1],theFol. PEleDem) annotation (Line(points={{-149,80},{-26,80},
+          {-26,13},{-22,13}}, color={0,0,127}));
+  connect(cooWatNeg.ports[1], theFolNeg.port_a)
+    annotation (Line(points={{-48,-80},{-20,-80}}, color={0,127,255}));
+  connect(theFolNeg.port_b, sin.ports[2]) annotation (Line(points={{0,-80},{10,-80},
+          {10,-32},{20,-32}}, color={0,127,255}));
+  connect(mWat_flow_negative.y, cooWatNeg.m_flow_in) annotation (Line(points={{-148,
+          -80},{-100,-80},{-100,-72},{-70,-72}}, color={0,0,127}));
+  connect(avaSig.y, theFolNeg.avaSig) annotation (Line(points={{-99,-20},{-36,-20},
+          {-36,-71},{-22,-71}}, color={255,0,255}));
+  connect(theFolSig.y, theFolNeg.theFol) annotation (Line(points={{-49,40},{-34,
+          40},{-34,-73},{-22,-73}}, color={255,0,255}));
+  connect(valDat.y[1], theFolNeg.PEleDem) annotation (Line(points={{-149,80},{-26,
+          80},{-26,-77},{-22,-77}}, color={0,0,127}));
+  connect(TWatOutSet.y, theFolNeg.TWatOutSet) annotation (Line(points={{-98,50},
+          {-30,50},{-30,-76},{-26,-76},{-26,-75},{-22,-75}}, color={0,0,127}));
+  connect(TWatIn.y, cooWatNeg.T_in) annotation (Line(points={{-98,10},{-80,10},{
+          -80,-76},{-70,-76}}, color={0,0,127}));
+  connect(valDat.y[5], PEleNetVal.u) annotation (Line(points={{-149,80},{50,80},
+          {50,4},{58,4}}, color={0,0,127}));
+  connect(PEleNetVal.y, dPEleNet.u2)
+    annotation (Line(points={{81,4},{138,4}}, color={0,0,127}));
+  connect(valDat.y[7], QGenVal_flow.u) annotation (Line(points={{-149,80},{50,80},
+          {50,-26},{58,-26}}, color={0,0,127}));
+  connect(QGenVal_flow.y, dQGen.u2)
+    annotation (Line(points={{81,-26},{138,-26}}, color={0,0,127}));
+  connect(valDat.y[8], QWatVal_flow.u) annotation (Line(points={{-149,80},{50,80},
+          {50,-56},{58,-56}}, color={0,0,127}));
+  connect(QWatVal_flow.y, dQWat.u2)
+    annotation (Line(points={{81,-56},{138,-56}}, color={0,0,127}));
+  connect(valDat.y[9], QLosVal_flow.u) annotation (Line(points={{-149,80},{50,80},
+          {50,-86},{58,-86}}, color={0,0,127}));
+  connect(QLosVal_flow.y, dQLos.u2)
+    annotation (Line(points={{81,-86},{138,-86}}, color={0,0,127}));
+  connect(PEleNetVal.y, EEleVal.u) annotation (Line(points={{81,4},{98,4},{98,-120},
+          {116,-120}}, color={0,0,127}));
+  connect(QWatVal_flow.y, ETheVal.u) annotation (Line(points={{81,-56},{94,-56},
+          {94,-150},{116,-150}}, color={0,0,127}));
+  connect(theFol.PEleNet, EEle.u) annotation (Line(points={{2,13},{44,13},{44,-120},
+          {58,-120}}, color={0,0,127}));
+  connect(theFol.QWat_flow, EThe.u) annotation (Line(points={{2,3},{42,3},{42,-150},
+          {58,-150}}, color={0,0,127}));
+annotation (
+  experiment(StopTime=10000, Tolerance=1e-6),
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ThermalFollowing.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.Fluid.CHPs.ThermalElectricalFollowing\">
+Buildings.Fluid.CHPs.ThermalElectricalFollowing</a>
+for the CHP unit simulation with the thermal demand priority. 
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+December 04, 2019, by Jianjun Hu:<br/>
+Refactored implementation. 
+</li>
+<li>
+July 01 2019, by Tea Zakula:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-180,-180},{180,100}}),
+            graphics={
+                  Rectangle(
+          extent={{40,100},{182,-180}},
+          fillColor={229,229,229},
+          fillPattern=FillPattern.Solid,
+          lineColor={0,0,0},
+          pattern=LinePattern.Dot),
+                              Text(
+          extent={{86,98},{132,84}},
+          lineColor={0,0,0},
+          pattern=LinePattern.Dash,
+          lineThickness=0.5,
+          textStyle={TextStyle.Bold},
+          textString="Post-processing")}));
+end ThermalFollowing;
diff --git a/Buildings/Fluid/CHPs/Validation/package.mo b/Buildings/Fluid/CHPs/Validation/package.mo
new file mode 100644
index 00000000000..3be1d26954c
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Validation/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Fluid.CHPs;
+package Validation "Validation of the main model"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models that validate the model
+<a href=\"modelica://Buildings.Fluid.CHPs.ThermalElectricalFollowing\">
+Buildings.Fluid.CHPs.ThermalElectricalFollowing</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Fluid/CHPs/Validation/package.order b/Buildings/Fluid/CHPs/Validation/package.order
new file mode 100644
index 00000000000..2f8b48e4849
--- /dev/null
+++ b/Buildings/Fluid/CHPs/Validation/package.order
@@ -0,0 +1,2 @@
+ElectricalFollowing
+ThermalFollowing
diff --git a/Buildings/Fluid/CHPs/package.mo b/Buildings/Fluid/CHPs/package.mo
new file mode 100644
index 00000000000..cc5f8e248e9
--- /dev/null
+++ b/Buildings/Fluid/CHPs/package.mo
@@ -0,0 +1,10 @@
+within Buildings.Fluid;
+package CHPs "Package with model for combined heat and power device"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models for combined heat and power plant.
+</p>
+</html>"));
+end CHPs;
diff --git a/Buildings/Fluid/CHPs/package.order b/Buildings/Fluid/CHPs/package.order
new file mode 100644
index 00000000000..ec74283ee86
--- /dev/null
+++ b/Buildings/Fluid/CHPs/package.order
@@ -0,0 +1,4 @@
+ThermalElectricalFollowing
+Data
+Validation
+BaseClasses
diff --git a/Buildings/Fluid/Chillers/Examples/package.order b/Buildings/Fluid/Chillers/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Chillers/Validation/AbsorptionIndirectSteam_EnergyPlus.mo b/Buildings/Fluid/Chillers/Validation/AbsorptionIndirectSteam_EnergyPlus.mo
index 100bb7892b3..1692de6bc7a 100644
--- a/Buildings/Fluid/Chillers/Validation/AbsorptionIndirectSteam_EnergyPlus.mo
+++ b/Buildings/Fluid/Chillers/Validation/AbsorptionIndirectSteam_EnergyPlus.mo
@@ -70,14 +70,14 @@ model AbsorptionIndirectSteam_EnergyPlus
        annotation (Placement(transformation(extent={{80,-6},{60,14}})));
 
   Modelica.Blocks.Math.RealToBoolean realToBoolean(threshold=1)
-       annotation (Placement(transformation(extent={{-60,30},{-40,10}})));
+       annotation (Placement(transformation(extent={{-80,40},{-60,20}})));
 
   Modelica.Blocks.Sources.CombiTimeTable datRea(
     tableOnFile=true,
     fileName=ModelicaServices.ExternalReferences.loadResource(
-        "modelica://Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/modelica.csv"),
+        "modelica://Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/IndirectAbsorptionChiller.dat"),
     columns=2:11,
-    tableName="modelica",
+    tableName="EnergyPlus",
     smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments)
     "Reader for \"IndirectAbsorptionChiller.idf\" EnergyPlus example results"
       annotation (Placement(transformation(extent={{-130,60},{-110,80}})));
@@ -92,31 +92,45 @@ model AbsorptionIndirectSteam_EnergyPlus
     "EnergyPlus results: evaporator heat flow rate"
     annotation (Placement(transformation(extent={{-132,-34},{-112,-14}})));
 
+  Controls.OBC.UnitConversions.From_degC TConIn "Condenser inlet temperature"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+  Controls.OBC.UnitConversions.From_degC TEvaSet
+    "Evaporator setpoint temperature"
+    annotation (Placement(transformation(extent={{-80,-14},{-60,6}})));
+  Controls.OBC.UnitConversions.From_degC TEvaIn "Evaporator inlet temperature"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
 equation
   connect(evaPum.ports[1], absChi.port_a2) annotation (Line(points={{60,-30},{
           50,-30},{50,-8},{42,-8}},
                                  color={0,127,255}));
-  connect(absChi.on, realToBoolean.y) annotation (Line(points={{21,0},{-10,0},{-10,
-          20},{-39,20}},       color={255,0,255}));
+  connect(absChi.on, realToBoolean.y) annotation (Line(points={{21,0},{-10,0},{
+          -10,30},{-59,30}},   color={255,0,255}));
   connect(conPum.ports[1], absChi.port_a1) annotation (Line(points={{-20,50},{20,
           50},{20,4},{22,4}}, color={0,127,255}));
   connect(absChi.port_b1, heaVol.ports[1]) annotation (Line(points={{42,4},{60,4}},
                              color={0,127,255}));
   connect(absChi.port_b2, cooVol.ports[1]) annotation (Line(points={{22,-8},{20,
           -8},{20,-20},{-20,-20}}, color={0,127,255}));
-  connect(datRea.y[1], realToBoolean.u) annotation (Line(points={{-109,70},{-100,
-          70},{-100,20},{-62,20}},    color={0,0,127}));
+  connect(datRea.y[1], realToBoolean.u) annotation (Line(points={{-109,70},{
+          -100,70},{-100,30},{-82,30}},
+                                      color={0,0,127}));
   connect(datRea.y[5], evaPum.m_flow_in) annotation (Line(points={{-109,70},{-100,
           70},{-100,-82},{100,-82},{100,-38},{82,-38}},            color={0,0,
           127}));
   connect(datRea.y[9], conPum.m_flow_in) annotation (Line(points={{-109,70},{-100,
           70},{-100,42},{-42,42}},      color={0,0,127}));
-  connect(datRea.y[7], conPum.T_in) annotation (Line(points={{-109,70},{-50,70},
-          {-50,46},{-42,46}}, color={0,0,127}));
-  connect(datRea.y[4], absChi.TSet) annotation (Line(points={{-109,70},{-100,70},
-          {-100,-4},{21,-4}},                   color={0,0,127}));
-  connect(datRea.y[3], evaPum.T_in) annotation (Line(points={{-109,70},{-100,70},
-          {-100,-82},{100,-82},{100,-34},{82,-34}}, color={0,0,127}));
+  connect(datRea.y[7], TConIn.u)
+    annotation (Line(points={{-109,70},{-82,70}}, color={0,0,127}));
+  connect(TConIn.y, conPum.T_in) annotation (Line(points={{-58,70},{-52,70},{
+          -52,46},{-42,46}}, color={0,0,127}));
+  connect(datRea.y[4], TEvaSet.u) annotation (Line(points={{-109,70},{-100,70},
+          {-100,-4},{-82,-4}}, color={0,0,127}));
+  connect(TEvaSet.y, absChi.TSet)
+    annotation (Line(points={{-58,-4},{21,-4}}, color={0,0,127}));
+  connect(datRea.y[3], TEvaIn.u) annotation (Line(points={{-109,70},{-100,70},{
+          -100,-60},{-82,-60}}, color={0,0,127}));
+  connect(TEvaIn.y, evaPum.T_in) annotation (Line(points={{-58,-60},{90,-60},{
+          90,-34},{82,-34}}, color={0,0,127}));
    annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}}), graphics={
         Ellipse(lineColor = {75,138,73},
diff --git a/Buildings/Fluid/Chillers/package.order b/Buildings/Fluid/Chillers/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Delays/Examples/package.order b/Buildings/Fluid/Delays/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Delays/package.order b/Buildings/Fluid/Delays/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Examples/SimpleHouse.mo b/Buildings/Fluid/Examples/SimpleHouse.mo
index 18654930ace..f83ba127b31 100644
--- a/Buildings/Fluid/Examples/SimpleHouse.mo
+++ b/Buildings/Fluid/Examples/SimpleHouse.mo
@@ -142,7 +142,8 @@ model SimpleHouse
     annotation (Placement(transformation(extent={{-60,-36},{-40,-16}})));
   Modelica.Blocks.Math.BooleanToInteger booleanToInt "Boolean to integer"
     annotation (Placement(transformation(extent={{-16,-144},{4,-124}})));
-  Controls.Continuous.LimPID conDam(controllerType=Modelica.Blocks.Types.SimpleController.P,
+  Controls.Continuous.LimPID conDam(
+      controllerType=Modelica.Blocks.Types.SimpleController.P,
       yMin=0.1) "Controller for damper"
     annotation (Placement(transformation(extent={{-20,80},{0,100}})));
   Modelica.Blocks.Sources.Constant TSetRoo(k=273.15 + 24)
diff --git a/Buildings/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo b/Buildings/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo
index d3825198ad8..cf57a25eb0e 100644
--- a/Buildings/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo
+++ b/Buildings/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo
@@ -29,7 +29,6 @@ model ThermalZoneHVACNoExhaust
     startTime=7*3600) "Setpoint for room temperature"
     annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
   Controls.Continuous.LimPID conPI(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=1,
     yMax=1,
     yMin=0,
diff --git a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo
index b3e1e346129..4f6a50c9833 100644
--- a/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo
@@ -116,11 +116,14 @@ protected
 
   Buildings.Fluid.BaseClasses.MassFlowRateMultiplier masFloDiv(
     redeclare final package Medium = Medium,
-    final k=borFieDat.conDat.nBor) "Division of flow rate"
-    annotation (Placement(transformation(extent={{-60,-50},{-80,-30}})));
+    allowFlowReversal=allowFlowReversal,
+    final k=1/borFieDat.conDat.nBor)
+                                   "Division of flow rate"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
 
   Buildings.Fluid.BaseClasses.MassFlowRateMultiplier masFloMul(
     redeclare final package Medium = Medium,
+    allowFlowReversal=allowFlowReversal,
     final k=borFieDat.conDat.nBor) "Mass flow multiplier"
     annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
 
@@ -166,10 +169,10 @@ equation
   connect(masFloMul.port_b, port_b)
     annotation (Line(points={{80,-40},{90,-40},{90,0},{100,0}},
                                                      color={0,127,255}));
-  connect(masFloDiv.port_b, port_a)
+  connect(masFloDiv.port_a, port_a)
     annotation (Line(points={{-80,-40},{-90,-40},{-90,0},{-100,0}},
                                                 color={0,127,255}));
-  connect(masFloDiv.port_a, borHol.port_a)
+  connect(masFloDiv.port_b, borHol.port_a)
     annotation (Line(points={{-60,-40},{-10,-40}},     color={0,127,255}));
   connect(borHol.port_b, masFloMul.port_a)
     annotation (Line(points={{10,-40},{60,-40}},    color={0,127,255}));
@@ -293,8 +296,6 @@ temperature after calculating and/or read (from a previous calculation) the bore
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 April 9, 2021, by Michael Wetter:<br/>
 Corrected placement of <code>each</code> keyword.<br/>
 See <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/2440\">Buidings, PR #2440</a>.
@@ -309,7 +310,6 @@ March 24, 2020, by Damien Picard:<br/>
 Propagated flowReversal into <code>masFloDiv</code> and <code>masFloMul</code>.
 </li>
 <li>
->>>>>>> master
 June 7, 2019, by Massimo Cimmino:<br/>
 Converted instances that are not of interest to user to be <code>protected</code>.
 </li>
diff --git a/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo b/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo
index 0659377cea9..3f8e820e410 100644
--- a/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo
+++ b/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo
@@ -36,10 +36,8 @@ model CoolingAndHeating
   Buildings.Controls.Continuous.LimPID conHea(
     yMax=0.094,
     Td=0,
-    reverseAction=false,
     Ti=100,
-    k=0.1,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI)
+    k=0.1)
     "Controller for heating"
          annotation (Placement(transformation(extent={{-70,-20},{-50,0}})));
   Sources.MassFlowSource_T pumCoo(
@@ -80,11 +78,10 @@ model CoolingAndHeating
     annotation (Placement(transformation(extent={{-110,20},{-90,40}})));
   Buildings.Controls.Continuous.LimPID conCoo(
     yMax=0.094,
-    reverseAction=true,
+    reverseActing=false,
     Td=0,
     k=0.5,
-    Ti=70,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI)
+    Ti=70)
     "Controller for cooling"
     annotation (Placement(transformation(extent={{-70,20},{-50,40}})));
 
@@ -155,7 +152,7 @@ for both heating and cooling mode. An air volume is maintained at a temperature
 <ul>
 <li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo b/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo
index 91933623a24..248ee942a53 100644
--- a/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo
+++ b/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo
@@ -34,11 +34,10 @@ model CoolingOnly
     "Outdoor air temperature"
     annotation (Placement(transformation(extent={{-110,-110},{-90,-90}})));
   Buildings.Controls.Continuous.LimPID conPID(
-    reverseAction=true,
+    reverseActing=false,
     Td=0,
     k=0.5,
     Ti=70,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMax=0.094) "Controller"
          annotation (Placement(transformation(extent={{-70,-20},{-50,0}})));
   Sources.MassFlowSource_T pum(
@@ -119,7 +118,7 @@ that regulates the water flow rate in the active beam.
 <ul>
 <li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo b/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo
index 148207d1372..464bd361494 100644
--- a/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo
+++ b/Buildings/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo
@@ -36,10 +36,8 @@ model HeatingOnly
   Buildings.Controls.Continuous.LimPID conPID(
     yMax=0.094,
     Td=0,
-    reverseAction=false,
     Ti=100,
-    k=0.1,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI) "Controller"
+    k=0.1) "Controller"
          annotation (Placement(transformation(extent={{-70,-20},{-50,0}})));
   Buildings.Fluid.Sources.Boundary_pT sou_1(
     redeclare package Medium = MediumW,
@@ -133,7 +131,7 @@ that regulates the water flow rate in the active beam.
 <ul>
 <li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/HexElementLatent.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/HexElementLatent.mo
index 73c89b27ee7..19bee0ad0d4 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/HexElementLatent.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/HexElementLatent.mo
@@ -10,6 +10,7 @@ model HexElementLatent "Element of a heat exchanger with humidity condensation o
      final energyDynamics=energyDynamics,
      final massDynamics=energyDynamics,
      final initialize_p=initialize_p2,
+     final simplify_mWat_flow=simplify_mWat_flow,
      prescribedHeatFlowRate=false));
 
   constant Boolean simplify_mWat_flow=true
@@ -94,8 +95,6 @@ surface. This is done using the heat flow sources <code>heaConVapAir</code> and
 revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 March 11, 2021, by Michael Wetter:<br/>
 Changed constant <code>simplify_mWat_flow</code> from protected to public because it is assigned by
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.WetCoilCounterFlow\">Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</a>.<br/>
@@ -107,7 +106,6 @@ Added constant <code>simplify_mWat_flow</code>.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1920\">#1920</a>.
 </li>
 <li>
->>>>>>> master
 April 14, 2017, by David Blum:<br/>
 Added heat of condensation to coil surface heat balance and removed it from the air stream.<br/>
 This is for issue
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo
index 080a3267d3a..2fddcda09a8 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo
@@ -46,11 +46,11 @@ protected
       0,
       m1_flow_small)
     else 1
-    "Fraction of incoming state taken from port a2 (used to avoid excessive calls to regStep)";
+    "Fraction of incoming state taken from port a1 (used to avoid excessive calls to regStep)";
   Real fra_b1(min=0, max=1) = if allowFlowReversal1
     then 1-fra_a1
     else 0
-    "Fraction of incoming state taken from port b2 (used to avoid excessive calls to regStep)";
+    "Fraction of incoming state taken from port b1 (used to avoid excessive calls to regStep)";
   Real fra_a2(min=0, max=1) = if allowFlowReversal2
     then Modelica.Fluid.Utilities.regStep(
       m2_flow,
diff --git a/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/Merkel.mo b/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/Merkel.mo
index 6ac59092fcc..c7aa006dabe 100644
--- a/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/Merkel.mo
+++ b/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/Merkel.mo
@@ -18,20 +18,13 @@ model Merkel "Test model for cooling tower using the Merkel theory"
     "Setpoint for leaving temperature"
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
 
-  Controls.OBC.CDL.Continuous.LimPID conFan(
+  Buildings.Controls.OBC.CDL.Continuous.PID conFan(
     k=1,
     Ti=60,
     Td=10,
-    yMax=1,
-    yMin=0,
-    reverseAction=true,
-    u_s(
-      unit="K",
-      displayUnit="degC"),
-    u_m(
-      unit="K",
-      displayUnit="degC"))
-    "Controller for tower fan"
+    reverseActing=false,
+    u_s(unit="K", displayUnit="degC"),
+    u_m(unit="K", displayUnit="degC")) "Controller for tower fan"
     annotation (Placement(transformation(extent={{-30,-20},{-10,0}})));
 
 equation
diff --git a/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo b/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo
index 4c7d71fb70b..d4423499ae4 100644
--- a/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo
+++ b/Buildings/Fluid/HeatExchangers/CoolingTowers/Examples/YorkCalc.mo
@@ -14,21 +14,21 @@ model YorkCalc
     k=1,
     Ti=60,
     Td=10,
-    reverseAction=true,
+    reverseActing=false,
     initType=Modelica.Blocks.Types.InitPID.InitialState)
     "Controller for tower fan"
-    annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
+    annotation (Placement(transformation(extent={{-30,-20},{-10,0}})));
 equation
   connect(TSetLea.y, conFan.u_s) annotation (Line(
-      points={{-39,-10},{-22,-10}},
+      points={{-39,-10},{-32,-10}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(conFan.y, tow.y) annotation (Line(
-      points={{1,-10},{6,-10},{6,-42},{20,-42}},
+      points={{-9,-10},{6,-10},{6,-42},{20,-42}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(tow.TLvg, conFan.u_m) annotation (Line(
-      points={{43,-56},{54,-56},{54,-32},{-10,-32},{-10,-22}},
+      points={{43,-56},{54,-56},{54,-32},{-20,-32},{-20,-22}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(weaBus.TWetBul, tow.TAir) annotation (Line(
diff --git a/Buildings/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus.mo b/Buildings/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus.mo
index 26f07de20fe..fc7cbf492c5 100644
--- a/Buildings/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus.mo
+++ b/Buildings/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus.mo
@@ -43,9 +43,10 @@ model MerkelEnergyPlus
   Modelica.Blocks.Sources.CombiTimeTable datRea(
     tableOnFile=true,
     fileName=ModelicaServices.ExternalReferences.loadResource(
-      "modelica://Buildings//Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/modelica.csv"),
-    columns=2:16,
-    tableName="modelica",
+      "modelica://Buildings//Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/CoolingTower_VariableSpeed_Merkel.dat"),
+    verboseRead=false,
+    columns=2:10,
+    tableName="EnergyPlus",
     smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments)
     "Reader for \"CoolingTower_VariableSpeed_Merkel.idf\" energy plus example results"
     annotation (Placement(transformation(extent={{-100,40},{-80,60}})));
@@ -138,12 +139,12 @@ equation
 This model validates the model
 <a href=\"modelica://Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel\">
 Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel</a> by comparing against
-results obtained from EnergyPlus 9.2.
+results obtained from EnergyPlus.
 </p>
 <p>
 The EnergyPlus results were obtained using the example file
 <code>CoolingTower:VariableSpeed</code>, with the cooling tower evaluated as
-the <code>CoolingTower:VariableSpeed:Merkel</code> model from EnergyPlus 9.2.
+the <code>CoolingTower:VariableSpeed:Merkel</code> model from EnergyPlus.
 </p>
 <p>
 The difference in results of the cooling tower's leaving water temperature
diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/SpaceCooling.mo b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/SpaceCooling.mo
index aef527f207e..747e9f91081 100644
--- a/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/SpaceCooling.mo
+++ b/Buildings/Fluid/HeatExchangers/DXCoils/AirCooled/Examples/SpaceCooling.mo
@@ -220,7 +220,7 @@ model SpaceCooling "Space cooling with DX coils"
     controllerType=Modelica.Blocks.Types.SimpleController.P,
     Ti=1,
     Td=1,
-    reverseAction=true) "Controller for variable speed DX coil"
+    reverseActing=false) "Controller for variable speed DX coil"
     annotation (Placement(transformation(extent={{-60,-220},{-40,-200}})));
 equation
   connect(out.ports[1], hex.port_a1) annotation (Line(
diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo
index c19d07da5ae..eb107af68ee 100644
--- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo
+++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/DryWetSelector.mo
@@ -61,7 +61,7 @@ block DryWetSelector "Selects results from dry or wet coil"
  output Real fraWet(min=0, max=1)
     "Fraction of results that are taken from the wet coil model";
 protected
-  output Modelica.SIunits.MassFraction dX
+  output Modelica.SIunits.MassFraction dX(min=-1, max=1)
     "Difference between apparatus dew point mass fraction of wet coil and inlet air mass fraction";
 equation
   dX = XADP-XEvaIn;
@@ -89,6 +89,12 @@ and the coil inlet mass fraction.
 revisions="<html>
 <ul>
 <li>
+May 7, 2020, by Michael Wetter:<br/>
+Corrected limits for <code>dX</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1933\">#1933</a>.
+</li>
+<li>
 April 13, 2017, by Michael Wetter:<br/>
 Removed temperature that is no longer needed.
 </li>
diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo
index 3416bc1ec30..7bcbf2d27d9 100644
--- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo
+++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Evaporation.mo
@@ -80,7 +80,10 @@ protected
     "Wet bulb temperature at nominal outlet conditions";
   final parameter Modelica.SIunits.MassFraction XEvaWetBulOut_nominal(fixed=false)
     "Water vapor mass fraction at nominal outlet wet bulb condition";
-  final parameter Modelica.SIunits.MassFraction dX_nominal(max=0, fixed=false)
+  final parameter Modelica.SIunits.MassFraction dX_nominal(
+    min=-1,
+    max=0,
+    fixed=false)
     "Driving potential for mass transfer";
 
   final parameter Modelica.SIunits.SpecificEnthalpy h_fg(fixed=false)
@@ -104,7 +107,7 @@ protected
   Boolean off=not on "Signal, true when component is off";
 
   Modelica.SIunits.Temperature TEvaWetBulOut "Wet bulb temperature at coil";
-  Modelica.SIunits.MassFraction dX
+  Modelica.SIunits.MassFraction dX(min=-1, max=0)
     "Difference in water vapor concentration that drives mass transfer";
 
   constant Modelica.SIunits.SpecificHeatCapacity cpAir_nominal=
@@ -573,6 +576,12 @@ Florida Solar Energy Center, Technical Report FSEC-CR-1537-05, January 2006.
 </html>", revisions="<html>
 <ul>
 <li>
+May 7, 2020, by Michael Wetter:<br/>
+Corrected limits for <code>dX_nominal</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1933\">#1933</a>.
+</li>
+<li>
 April 13, 2017, by Michael Wetter:<br/>
 Removed input <code>TWat</code> that is not used.
 </li>
diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Functions/package.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/Functions/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo
index 8bf63b70a06..c4ff317ea93 100644
--- a/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo
+++ b/Buildings/Fluid/HeatExchangers/DXCoils/BaseClasses/WetCoil.mo
@@ -8,6 +8,7 @@ model WetCoil "Calculates wet coil condition "
   Modelica.Blocks.Interfaces.RealOutput TADP(
     quantity="ThermodynamicTemperature",
     unit="K",
+    start=288.15,
     min=273.15,
     max=373.15) "Dry bulb temperature of air at ADP"
     annotation (Placement(transformation(extent={{100,-50},{120,-30}})));
diff --git a/Buildings/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo b/Buildings/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo
index 1de163f34a7..a4c9b4ef027 100644
--- a/Buildings/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo
+++ b/Buildings/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo
@@ -48,7 +48,6 @@ partial model Heater "Base class for example model for the heater and cooler"
     y(final unit="K", displayUnit="degC")) "Setpoint for room temperature"
     annotation (Placement(transformation(extent={{-90,20},{-70,40}})));
   Controls.Continuous.LimPID conPI(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=1,
     yMax=1,
     yMin=0,
@@ -133,7 +132,7 @@ and it also is required to account for a variation of density of the fluid.
 <ul>
 <li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo b/Buildings/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo
index 527b96815e0..50238bc2153 100644
--- a/Buildings/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo
+++ b/Buildings/Fluid/HeatExchangers/Examples/DryCoilCounterFlowPControl.mo
@@ -93,9 +93,8 @@ model DryCoilCounterFlowPControl
     annotation (Placement(transformation(extent={{100,-38},{120,-18}})));
   Buildings.Controls.Continuous.LimPID con(
     Td=1,
-    reverseAction=true,
+    reverseActing=false,
     yMin=0,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=0.1,
     Ti=60) "Controller"
     annotation (Placement(transformation(extent={{0,90},{20,110}})));
diff --git a/Buildings/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mo b/Buildings/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mo
index 1a6c7066fa0..2406ba3db6e 100644
--- a/Buildings/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mo
+++ b/Buildings/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mo
@@ -62,7 +62,6 @@ model DryCoilEffectivenessNTUPControl
     dpValve_nominal=6000) "Valve"
     annotation (Placement(transformation(extent={{30,50},{50,70}})));
   Buildings.Controls.Continuous.LimPID P(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     Ti=30,
     k=0.1,
     Td=1)
diff --git a/Buildings/Fluid/HeatExchangers/Examples/PlateHeatExchangerEffectivenessNTUPControl.mo b/Buildings/Fluid/HeatExchangers/Examples/PlateHeatExchangerEffectivenessNTUPControl.mo
index c592362b524..e239d556c5f 100644
--- a/Buildings/Fluid/HeatExchangers/Examples/PlateHeatExchangerEffectivenessNTUPControl.mo
+++ b/Buildings/Fluid/HeatExchangers/Examples/PlateHeatExchangerEffectivenessNTUPControl.mo
@@ -62,7 +62,6 @@ model PlateHeatExchangerEffectivenessNTUPControl
     dpValve_nominal=6000) "Valve"
     annotation (Placement(transformation(extent={{30,50},{50,70}})));
   Buildings.Controls.Continuous.LimPID P(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     Ti=30,
     k=0.1,
     Td=1)
diff --git a/Buildings/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo b/Buildings/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo
index 75cc53ec494..a5b4004d350 100644
--- a/Buildings/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo
+++ b/Buildings/Fluid/HeatExchangers/Examples/WetCoilCounterFlowPControl.mo
@@ -92,9 +92,8 @@ model WetCoilCounterFlowPControl
     annotation (Placement(transformation(extent={{100,-38},{120,-18}})));
   Buildings.Controls.Continuous.LimPID con(
     Td=1,
-    reverseAction=true,
+    reverseActing=false,
     yMin=0,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=0.1,
     Ti=60) "Controller"
     annotation (Placement(transformation(extent={{0,90},{20,110}})));
diff --git a/Buildings/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo b/Buildings/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo
index 23455ce4632..ada711421c6 100644
--- a/Buildings/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo
+++ b/Buildings/Fluid/HeatExchangers/Examples/WetCoilDiscretizedPControl.mo
@@ -100,7 +100,7 @@ model WetCoilDiscretizedPControl
     Ti=60,
     controllerType=Modelica.Blocks.Types.SimpleController.P,
     Td=60,
-    reverseAction=true) "Controller"  annotation (Placement(transformation(
+    reverseActing=false) "Controller"  annotation (Placement(transformation(
           extent={{-40,120},{-20,140}})));
   Buildings.Fluid.Actuators.Motors.IdealMotor mot(tOpe=60) "Motor model"
     annotation (Placement(transformation(extent={{0,120},{20,140}})));
diff --git a/Buildings/Fluid/HeatExchangers/Examples/package.order b/Buildings/Fluid/HeatExchangers/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo
index 890a94a5182..40819d155b1 100644
--- a/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo
+++ b/Buildings/Fluid/HeatExchangers/RadiantSlabs/BaseClasses/Functions/AverageResistance.mo
@@ -1,6 +1,7 @@
 within Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions;
 function AverageResistance
   "Average fictitious resistance for plane that contains the pipes"
+  extends Modelica.Icons.Function;
   input Modelica.SIunits.Distance disPip "pipe distance";
   input Modelica.SIunits.Diameter dPipOut "pipe outside diameter";
   input Modelica.SIunits.ThermalConductivity k
@@ -24,13 +25,13 @@ algorithm
 
   if sysTyp == Buildings.Fluid.HeatExchangers.RadiantSlabs.Types.SystemType.Floor then
     alpha := kIns/dIns;
-    if alpha >= 1.212 then
-       Modelica.Utilities.Streams.print("Warning: In RadiantAverageResistance, require alpha = kIns/dIns >= 1.212 W/(m2.K).\n" +
+    assert(alpha < 1.212,
+           "Warning: In RadiantAverageResistance, require alpha = kIns/dIns <= 1.212 W/(m2.K).\n" +
                      "   Obtained alpha = " + String(alpha) + " W/(m2.K)\n" +
                      "            kIns = " + String(kIns) + " W/(m.K)\n" +
                      "            dIns = " + String(dIns) + " m\n" +
-                     "            For these values, the radiant slab model is outside its valid range.\n");
-    end if;
+                     "            For these values, the radiant slab model is outside its valid range.\n",
+                     level=AssertionLevel.warning);
     infSum := - sum(((alpha/k*disPip - 2*Modelica.Constants.pi*s)/
                     (alpha/k*disPip + 2*Modelica.Constants.pi*s))
                     *Modelica.Math.exp(-4*Modelica.Constants.pi*s*dIns/disPip)/s for s in 1:100);
@@ -56,7 +57,7 @@ Documentation(info="<html>
 <p>
 This function computes a fictitious thermal resistance between the pipe outer wall
 and a fictitious, average temperature of the plane that contains the pipes.
-The equation is the same as is implemented in TRNSYS 17.
+The equation is the same as is implemented in TRNSYS 17 Type 56 active layer component, manual page 197-201.
 Different equations are used for
 </p>
 <ul>
@@ -85,6 +86,13 @@ For a fully dynamic model, a finite element method for the radiant slab would ne
 revisions="<html>
 <ul>
 <li>
+June 16, 2020, by Ettore Zanetti and Michael Wetter:<br/>
+Corrected inequality test on <code>alpha</code>,
+and changed print statement to an assertion with assertion level set to warning.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2009\">issue 2009</a>.
+</li>
+<li>
 April 17, 2012, by Michael Wetter:<br/>
 Added term <code>1/s</code> in computation of <code>infSum</code>.
 </li>
diff --git a/Buildings/Fluid/HeatExchangers/Radiators/Examples/package.order b/Buildings/Fluid/HeatExchangers/Radiators/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/HeatExchangers/Radiators/package.order b/Buildings/Fluid/HeatExchangers/Radiators/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo b/Buildings/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo
index 8286862a189..8845e99ecc4 100644
--- a/Buildings/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo
+++ b/Buildings/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo
@@ -33,7 +33,6 @@ model HeaterCooler_u "Model that demonstrates the ideal heater model"
     "Setpoint"
     annotation (Placement(transformation(extent={{-60,140},{-40,160}})));
   Buildings.Controls.Continuous.LimPID con1(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     Td=1,
     k=1,
     Ti=10)
@@ -53,7 +52,6 @@ model HeaterCooler_u "Model that demonstrates the ideal heater model"
     annotation (Placement(transformation(extent={{40,-20},{60,0}})));
 
   Buildings.Controls.Continuous.LimPID con2(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     Td=1,
     Ti=10,
     k=0.1)
diff --git a/Buildings/Fluid/HeatExchangers/Validation/package.order b/Buildings/Fluid/HeatExchangers/Validation/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo b/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo
index bbe87daf414..c7ae0725857 100644
--- a/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo
+++ b/Buildings/Fluid/HeatExchangers/WetCoilCounterFlow.mo
@@ -4,17 +4,12 @@ model WetCoilCounterFlow
   extends Buildings.Fluid.HeatExchangers.DryCoilCounterFlow(
     redeclare replaceable package Medium2 =
       Modelica.Media.Interfaces.PartialCondensingGases,
-<<<<<<< HEAD
-    redeclare final model HexElement =
-      Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent);
-=======
     redeclare model HexElement =
       Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent(simplify_mWat_flow=simplify_mWat_flow));
 
   constant Boolean simplify_mWat_flow = true
     "Set to true to cause port_a.m_flow + port_b.m_flow = 0 even if mWat_flow is non-zero. Used only if Medium.nX > 1"
     annotation(HideResult=true);
->>>>>>> master
 
   Modelica.SIunits.HeatFlowRate QSen2_flow = Q2_flow - QLat2_flow
     "Sensible heat input into air stream (negative if air is cooled)";
@@ -83,8 +78,6 @@ Buildings.Fluid.HeatExchangers.DryCoilCounterFlow</a> instead of this model.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 March 12, 2021, by Michael Wetter:<br/>
 Removed <code>final</code> declaration in redeclaration.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2392\">#2392</a>.
@@ -95,7 +88,6 @@ Added constant <code>simplify_mWat_flow</code>.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1920\">#1920</a>.
 </li>
 <li>
->>>>>>> master
 October 19, 2018, by Kino:<br/>
 Changed model to use a replaceable model as this allows translation in OpenModelica.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1258\">#1258</a>.
diff --git a/Buildings/Fluid/HeatExchangers/package.order b/Buildings/Fluid/HeatExchangers/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/HeatPumps/EquationFitReversible.mo b/Buildings/Fluid/HeatPumps/EquationFitReversible.mo
index 55f061805b1..322efbab4f3 100644
--- a/Buildings/Fluid/HeatPumps/EquationFitReversible.mo
+++ b/Buildings/Fluid/HeatPumps/EquationFitReversible.mo
@@ -116,10 +116,8 @@ protected
    "Prescribed source side heat flow rate"
     annotation (Placement(transformation(extent={{59,-70},{39,-50}})));
 
-  Buildings.Controls.OBC.CDL.Integers.LessThreshold lesThr(
-    final threshold=0) if
-       not per.reverseCycle
-    "Indicator, outputs true if in cooling mode"
+  Buildings.Controls.OBC.CDL.Integers.LessThreshold lesThr(final t=0) if not
+    per.reverseCycle "Indicator, outputs true if in cooling mode"
     annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
 
   Buildings.Controls.OBC.CDL.Utilities.Assert aleMes(
diff --git a/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible.mo b/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible.mo
index a14288aa209..700a8d3ccb8 100644
--- a/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible.mo
+++ b/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible.mo
@@ -65,8 +65,8 @@ model EquationFitReversible
     duration(displayUnit="h") = 14400,
     offset=6 + 273.15) "Cooling load setpoint water temperature"
     annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
-  Controls.OBC.CDL.Integers.GreaterThreshold intGreThr(threshold=-1)
-   "Integer threshold"
+  Controls.OBC.CDL.Integers.GreaterThreshold intGreThr(t=-1)
+    "Integer threshold"
     annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
   Controls.OBC.CDL.Logical.Switch swi "Switch for set point temperature"
     annotation (Placement(transformation(extent={{-20,0},{0,20}})));
@@ -76,11 +76,10 @@ model EquationFitReversible
     offset=28 + 273.15)
   "Source side entering water temperature in cooling mode"
     annotation (Placement(transformation(extent={{40,-80},{60,-60}})));
-  Modelica.Blocks.Sources.Ramp  uMod1(
+  Modelica.Blocks.Sources.Ramp uMod(
     height=2,
     duration(displayUnit="h") = 14400,
-    offset=-1)
-   "Heat pump operates in heating mode"
+    offset=-1) "Heat pump operates in heating mode"
     annotation (Placement(transformation(extent={{-118,0},{-98,20}})));
   Controls.OBC.CDL.Logical.Switch swi1
    "Switch for set point temperature"
@@ -118,7 +117,7 @@ equation
     annotation (Line(points={{-22,10},{-38,10}}, color={255,0,255}));
   connect(intGreThr.u, reaToInt.y)
     annotation (Line(points={{-62,10},{-67,10}}, color={255,127,0}));
-  connect(reaToInt.u, uMod1.y)
+  connect(reaToInt.u, uMod.y)
     annotation (Line(points={{-90,10},{-97,10}}, color={0,0,127}));
   connect(swi2.u3, TSouEntCoo.y)
     annotation (Line(points={{78,-58},{66,-58},{66,-70},{62,-70}}, color={0,0,127}));
diff --git a/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mo b/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mo
index beb816f606b..a912549606a 100644
--- a/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mo
+++ b/Buildings/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mo
@@ -4,7 +4,7 @@ model EquationFitReversible_CoolingClosedLoop
  package Medium = Buildings.Media.Water "Medium model";
 
   parameter Data.EquationFitReversible.Trane_Axiom_EXW240 per
-   "Reverse heat pump performance data"
+   "Reversible heat pump performance data"
    annotation (Placement(transformation(extent={{-90,-80},{-70,-60}})));
   parameter Modelica.SIunits.MassFlowRate mSou_flow_nominal=per.hea.mSou_flow
    "Source heat exchanger nominal mass flow rate";
@@ -16,10 +16,9 @@ model EquationFitReversible_CoolingClosedLoop
     redeclare package Medium2 = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    T1_start=281.4,
     per=per,
     scaling_factor=1)
-   "Water to Water heat pump"
+   "Reversible water to water heat pump"
    annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
   Modelica.Blocks.Math.RealToInteger reaToInt
    "Real to integer conversion"
@@ -40,11 +39,10 @@ model EquationFitReversible_CoolingClosedLoop
    "Volume for source side"
    annotation (Placement(transformation(extent={{-70,-60},{-50,-40}})));
   Controls.OBC.CDL.Continuous.Sources.Pulse uMod(
-    amplitude=1,
-    width=0.5,
+    amplitude=-1,
+    width=0.7,
     period=200,
-    offset=-1,
-    startTime=0)
+    offset=0)
    "heat pump operational mode input signal"
    annotation (Placement(transformation(extent={{-90,-30},{-70,-10}})));
   Controls.OBC.CDL.Continuous.Sources.Pulse pulse(
@@ -67,7 +65,8 @@ model EquationFitReversible_CoolingClosedLoop
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     m_flow_nominal=mLoa_flow_nominal,
-    addPowerToMedium=false)
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true)
     "Chilled water pump"
     annotation (Placement(transformation(extent={{20,40},{0,60}})));
   MixingVolumes.MixingVolume vol(
@@ -88,8 +87,7 @@ model EquationFitReversible_CoolingClosedLoop
     amplitude=3,
     width=0.7,
     period=200,
-    offset=25 + 273.15,
-    startTime=0)
+    offset=25 + 273.15)
     "Source side entering water temperature"
     annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
   Controls.OBC.CDL.Continuous.Sources.Pulse TLoaSet(
@@ -97,18 +95,16 @@ model EquationFitReversible_CoolingClosedLoop
     amplitude=1,
     width=0.7,
     period=200,
-    offset=6 + 273.15,
-    startTime=0)
+    offset=6 + 273.15)
     "Set point chilled water temperature"
     annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
   Sources.Boundary_pT pre(
-      redeclare package Medium = Medium,
-      nPorts=1)
-    "Pressure source"
+    redeclare package Medium = Medium,
+    nPorts=1) "Pressure source."
     annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
+        extent={{10,-10},{-10,10}},
         rotation=0,
-        origin={-60,10})));
+        origin={60,50})));
 equation
   connect(souPum.ports[1], heaPum.port_a2)
    annotation (Line(points={{40,-50},{20,-50},{20,-26}},       color={0,127,255}));
@@ -128,7 +124,7 @@ equation
   connect(heaFlo.port, vol.heatPort)
    annotation (Line(points={{70,80},{80,80},{80,-2}},color={191,0,0}));
   connect(pum.port_a, vol.ports[1])
-   annotation (Line(points={{20,50},{58,50},{58,-10},{70,-10}},
+   annotation (Line(points={{20,50},{40,50},{40,-10},{70,-10}},
                                                              color={0,127,255}));
   connect(vol.ports[2], heaPum.port_b1)
    annotation (Line(points={{70,-14},{20,-14}},
@@ -145,9 +141,8 @@ equation
   connect(TLoaSet.y, heaPum.TSet)
    annotation (Line(points={{-68,40},{-26,40},{-26,-11},{-1.4,-11}},
                                                                 color={0,0,127}));
-  connect(heaPum.port_a1, pre.ports[1])
-   annotation (Line(points={{0,-14},{-32,-14},{-32,10},{-50,10}},
-                                                       color={0,127,255}));
+  connect(pum.port_a, pre.ports[1])
+    annotation (Line(points={{20,50},{50,50}}, color={0,127,255}));
      annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{120,100}}), graphics={
         Ellipse(lineColor = {75,138,73},
@@ -165,7 +160,7 @@ equation
              __Dymola_Commands(
   file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mos"
         "Simulate and plot"),
-         experiment(Tolerance=1e-6, StopTime=1200),
+         experiment(Tolerance=1e-6, StopTime=2500),
 Documentation(info="<html>
 <p>
 Example that simulates the performance of
@@ -182,9 +177,20 @@ to the heatpump where it is cooled to meet the corresponding set point water tem
 </html>", revisions="<html>
 <ul>
 <li>
+October 19, 2020, by Michael Wetter:<br/>
+Removed <code>startTime=0</code> for pulse block.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
+</li>
+<li>
+May 1, 2020, by Hagar Elarga:<br/>
+Corrected the <code>uMod</code> parameters and relocated the pressure source <code> pre</code> 
+to the pump suction side, i.e. maintain the pressure suction value at 3 bar to avoid cavitation.
+</li>
+<li>
 September 23, 2019, by Hagar Elarga:<br/>
 First implementation.
- </li>
- </ul>
- </html>"));
+</li>
+</ul>
+</html>"));
 end EquationFitReversible_CoolingClosedLoop;
diff --git a/Buildings/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus.mo b/Buildings/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus.mo
index cdd5d17c631..db31f06c9e4 100644
--- a/Buildings/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus.mo
+++ b/Buildings/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus.mo
@@ -48,9 +48,10 @@ model EquationFitReversible_EnergyPlus "Validation with EnergyPlus model"
   Modelica.Blocks.Sources.CombiTimeTable datRea(
     tableOnFile=true,
     fileName=ModelicaServices.ExternalReferences.loadResource(
-    "modelica://Buildings//Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/modelica.csv"),
-    columns=2:15,
-    tableName="modelica",
+    "modelica://Buildings//Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/GSHPSimple-GLHE-ReverseHeatPump.dat"),
+    verboseRead=false,
+    tableName="EnergyPlus",
+    columns=2:8,
     smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments)
     "Reader for \"GSHPSimple-GLHE-ReverseHeatPump.IDF\" energy plus example results"
       annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
@@ -67,14 +68,14 @@ model EquationFitReversible_EnergyPlus "Validation with EnergyPlus model"
   Buildings.Controls.OBC.UnitConversions.From_degC TSetHea
     "Block that converts set point for leaving heating water temperature "
       annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
-  Modelica.Blocks.Sources.RealExpression QSou_flow_EP(y=datRea.y[9])
-    "EnergyPlus results: source side heat flow rate"
+  Modelica.Blocks.Sources.RealExpression QSou_flow_EP(y=datRea.y[2])
+    "EnergyPlus results: source side heat flow rate [W]"
       annotation (Placement(transformation(extent={{-90,-62},{-70,-42}})));
-  Modelica.Blocks.Sources.RealExpression QLoa_flow_EP(y=-1*datRea.y[10])
-    "EnergyPlus results: load side heat flow rate"
+  Modelica.Blocks.Sources.RealExpression QLoa_flow_EP(y=-datRea.y[3])
+    "EnergyPlus results: load side heat flow rate [W]"
       annotation (Placement(transformation(extent={{-90,-82},{-70,-62}})));
-  Modelica.Blocks.Sources.RealExpression P_EP(y=datRea.y[8])
-    "EnergyPlus results: load side heat flow rate"
+  Modelica.Blocks.Sources.RealExpression P_EP(y=datRea.y[1])
+    "EnergyPlus results: compressr power [W]"
       annotation (Placement(transformation(extent={{-90,-102},{-70,-82}})));
 equation
   connect(heaPum.port_a1,loaPum. ports[1])
@@ -91,11 +92,11 @@ equation
     annotation (Line(points={{-38,-40},{92,-40},{92,-24},{82,-24}}, color={0,0,127}));
   connect(TSetHea.y, heaPum.TSet) annotation (Line(points={{-38,40},{8,40},{8,9},
           {28.6,9}},    color={0,0,127}));
-  connect(datRea.y[12], TLoaEnt.u)
+  connect(datRea.y[5], TLoaEnt.u)
     annotation (Line(points={{-79,70},{-62,70}}, color={0,0,127}));
-  connect(datRea.y[11],TSetHea. u)
+  connect(datRea.y[4],TSetHea. u)
     annotation (Line(points={{-79,70},{-70,70},{-70,40},{-62,40}}, color={0,0,127}));
-  connect(datRea.y[14], TSouEnt.u)
+  connect(datRea.y[6], TSouEnt.u)
     annotation (Line(points={{-79,70},{-70,70},{-70,-40},{-62,-40}},
                                color={0,0,127}));
   connect(heaPum.uMod, uMod.y)
@@ -126,7 +127,7 @@ Buildings.Fluid.HeatPumps.EquationFitReversible</a>
 against results obtained using EnergyPlus 9.1.
 <p>
 The EnergyPlus results were generated using the example file <code>GSHPSimple-GLHE-ReverseHeatPump.idf</code>
-from EnergyPlus 9.1, with a nominal cooling capacity of <i>39890</i> Watts and
+from EnergyPlus, with a nominal cooling capacity of <i>39890</i> Watts and
 nominal heating capacity of <i>39040</i> Watts.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Fluid/Humidifiers/Examples/Humidifier_u.mo b/Buildings/Fluid/Humidifiers/Examples/Humidifier_u.mo
index 4613b1ac65a..ae531c36260 100644
--- a/Buildings/Fluid/Humidifiers/Examples/Humidifier_u.mo
+++ b/Buildings/Fluid/Humidifiers/Examples/Humidifier_u.mo
@@ -34,8 +34,7 @@ model Humidifier_u "Model that demonstrates the ideal humidifier model"
     Td=1,
     k=1,
     Ti=10,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    reverseAction=true) "Controller"
+    reverseActing=false) "Controller"
     annotation (Placement(transformation(extent={{40,140},{60,160}})));
   Buildings.Fluid.Humidifiers.Humidifier_u humDyn(
     redeclare package Medium = Medium,
@@ -53,8 +52,7 @@ model Humidifier_u "Model that demonstrates the ideal humidifier model"
     Td=1,
     Ti=10,
     k=0.1,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    reverseAction=true) "Controller"
+    reverseActing=false) "Controller"
     annotation (Placement(transformation(extent={{40,30},{60,50}})));
   Buildings.Fluid.Sources.Boundary_pT sin(
     redeclare package Medium = Medium,
diff --git a/Buildings/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo b/Buildings/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo
index 593946c8de2..517d835861d 100644
--- a/Buildings/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo
+++ b/Buildings/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mo
@@ -51,22 +51,28 @@ package Medium = Buildings.Media.Air;
         transformation(
         extent={{10,-10},{-10,10}},
         origin={40,28})));
-  Sensors.SpecificEnthalpy senEnt1(redeclare package Medium = Medium)
+  Sensors.SpecificEnthalpy senEnt1(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "Specific enthalpy sensor"
     annotation (Placement(transformation(extent={{10,70},{30,90}})));
-  Sensors.Temperature senTem1(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.Temperature senTem1(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "Temperature sensor"
     annotation (Placement(transformation(extent={{-30,70},{-10,90}})));
-  Sensors.MassFraction senMas1(redeclare package Medium = Medium)
+  Sensors.MassFraction senMas1(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "Mass fraction sensor"
     annotation (Placement(transformation(extent={{50,70},{70,90}})));
-  Sensors.Temperature senTem2(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.Temperature senTem2(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "Temperature sensor"
     annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
-  Sensors.SpecificEnthalpy senEnt2(redeclare package Medium = Medium)
+  Sensors.SpecificEnthalpy senEnt2(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "Specific enthalpy sensor"
     annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-  Sensors.MassFraction senMas2(redeclare package Medium = Medium)
+  Sensors.MassFraction senMas2(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "Mass fraction sensor"
     annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
   FixedResistances.PressureDrop res1(
@@ -167,17 +173,14 @@ identical for forward flow and reverse flow.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 September 20, 2020, by Michael Wetter:<br/>
 Updated model to use one port temperature sensor from Modelica Standard Library.<br/>
 This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\"> #1399</a>.
 </li>
 <li>
->>>>>>> master
 May 2, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mo b/Buildings/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mo
index 40ae62c0fe3..eb4a5f05a8b 100644
--- a/Buildings/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mo
+++ b/Buildings/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mo
@@ -63,17 +63,23 @@ package Medium = Buildings.Media.Air;
     linearized=false,
     dp_nominal=1000) "Fixed resistance"
     annotation (Placement(transformation(extent={{-88,24},{-108,44}})));
-  Sensors.SpecificEnthalpy senEnt3(redeclare package Medium = Medium)
+  Sensors.SpecificEnthalpy senEnt3(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{-310,140},{-290,160}})));
-  Sensors.Temperature senTem3(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.Temperature senTem3(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{-350,140},{-330,160}})));
-  Sensors.MassFraction senMas3(redeclare package Medium = Medium)
+  Sensors.MassFraction senMas3(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{-270,140},{-250,160}})));
-  Sensors.SpecificEnthalpy senEnt4(redeclare package Medium = Medium)
+  Sensors.SpecificEnthalpy senEnt4(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{-310,60},{-290,80}})));
-  Sensors.Temperature senTem4(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.Temperature senTem4(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{-350,60},{-330,80}})));
-  Sensors.MassFraction senMas4(redeclare package Medium = Medium)
+  Sensors.MassFraction senMas4(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{-270,60},{-250,80}})));
   Modelica.Blocks.Math.Add cheTem1(k2=-1)
     "Check whether the outputs of the forward flow and reverse flow model are identical"
@@ -127,17 +133,23 @@ package Medium = Buildings.Media.Air;
         transformation(
         extent={{10,-10},{-10,10}},
         origin={40,98})));
-  Sensors.SpecificEnthalpy senEnt1(redeclare package Medium = Medium)
+  Sensors.SpecificEnthalpy senEnt1(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{10,140},{30,160}})));
-  Sensors.Temperature senTem1(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.Temperature senTem1(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{-30,140},{-10,160}})));
-  Sensors.MassFraction senMas1(redeclare package Medium = Medium)
+  Sensors.MassFraction senMas1(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{50,140},{70,160}})));
-  Sensors.Temperature senTem2(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.Temperature senTem2(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
-  Sensors.SpecificEnthalpy senEnt2(redeclare package Medium = Medium)
+  Sensors.SpecificEnthalpy senEnt2(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{60,-60},{80,-40}})));
-  Sensors.MassFraction senMas2(redeclare package Medium = Medium)
+  Sensors.MassFraction senMas2(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     annotation (Placement(transformation(extent={{100,-60},{120,-40}})));
   FixedResistances.PressureDrop res1(
     redeclare package Medium = Medium,
@@ -292,17 +304,14 @@ of stream connector. This bug will be corrected in future versions of Dymola.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 September 20, 2020, by Michael Wetter:<br/>
 Updated model to use one port temperature sensor from Modelica Standard Library.<br/>
 This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\"> #1399</a>.
 </li>
 <li>
->>>>>>> master
 May 2, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/Interfaces/PartialFourPort.mo b/Buildings/Fluid/Interfaces/PartialFourPort.mo
index 2cace6e0a65..a0441eb14e8 100644
--- a/Buildings/Fluid/Interfaces/PartialFourPort.mo
+++ b/Buildings/Fluid/Interfaces/PartialFourPort.mo
@@ -83,6 +83,12 @@ are not implemented.
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2020, by Filip Jorissen:<br/>
+Added arrows to the icon indicating the intended flow direction
+when <code>allowFlowReversal=false</code>.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1336\">#1336</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
@@ -141,10 +147,27 @@ are often iteration variables in nonlinear equation systems.
     Icon(coordinateSystem(
           preserveAspectRatio=true,
           extent={{-100,-100},{100,100}},
-          grid={1,1}), graphics={Text(
+          grid={1,1}), graphics={
+      Text(
           extent={{-151,147},{149,107}},
           lineColor={0,0,255},
           fillPattern=FillPattern.HorizontalCylinder,
           fillColor={0,127,255},
-          textString="%name")}));
+          textString="%name"),
+      Polygon(
+          points={{-5,10},{25,10},{-5,-10},{-5,10}},
+          lineColor={0,128,255},
+          fillColor={0,128,255},
+          fillPattern=FillPattern.Solid,
+          visible=not allowFlowReversal1,
+          origin={75,50},
+          rotation=360),
+      Polygon(
+          points={{10,10},{-20,-10},{10,-10},{10,10}},
+          lineColor={0,128,255},
+          fillColor={0,128,255},
+          fillPattern=FillPattern.Solid,
+          visible=not allowFlowReversal2,
+          origin={-79,-50},
+          rotation=360)}));
 end PartialFourPort;
diff --git a/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo b/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo
index 98370f2d1d8..b8bdba0b26c 100644
--- a/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo
+++ b/Buildings/Fluid/Interfaces/StaticTwoPortConservationEquation.mo
@@ -29,11 +29,7 @@ model StaticTwoPortConservationEquation
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
 
   // Outputs that are needed in models that extend this model
-  Modelica.Blocks.Interfaces.RealOutput hOut(unit="J/kg",
-                                             start=Medium.specificEnthalpy_pTX(
-                                                     p=Medium.p_default,
-                                                     T=Medium.T_default,
-                                                     X=Medium.X_default))
+  Modelica.Blocks.Interfaces.RealOutput hOut(final unit="J/kg")
     "Leaving specific enthalpy of the component"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},
         rotation=90,
@@ -340,6 +336,13 @@ Buildings.Fluid.Interfaces.ConservationEquation</a>.
 revisions="<html>
 <ul>
 <li>
+September 18, 2020, by Michael Wetter:<br/>
+Removed start value for <code>hOut</code> as it will be set by
+<a href=\"modelica://Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume\">
+Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume</a>.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1397\">#1397</a>.
+</li>
+<li>
 February 12, 2019, by Filip Jorissen:<br/>
 Removed obsolete division by <code>TMax</code> in assert.<br/>
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1097\">#1097</a>.
diff --git a/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo b/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
index e7633166c1a..475a5986919 100644
--- a/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
+++ b/Buildings/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo
@@ -58,7 +58,11 @@ protected
     final m_flow_nominal = m_flow_nominal,
     final allowFlowReversal = allowFlowReversal,
     final m_flow_small = m_flow_small,
-    final prescribedHeatFlowRate=prescribedHeatFlowRate) if
+    final prescribedHeatFlowRate=prescribedHeatFlowRate,
+    hOut(start=Medium.specificEnthalpy_pTX(
+                 p=p_start,
+                 T=T_start,
+                 X=X_start))) if
          useSteadyStateTwoPort "Model for steady-state balance if nPorts=2"
         annotation (Placement(transformation(extent={{20,0},{40,20}})));
   Buildings.Fluid.Interfaces.ConservationEquation dynBal(
@@ -299,6 +303,12 @@ Buildings.Fluid.MixingVolumes</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+September 18, 2020, by Michael Wetter:<br/>
+Set start value for <code>steBal.hOut</code> so that <code>T_start</code>
+can be used which is not known in that instance.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1397\">#1397</a>.
+</li>
+<li>
 February 21, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo b/Buildings/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo
index 5740559234b..726d330afd2 100644
--- a/Buildings/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo
+++ b/Buildings/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo
@@ -54,14 +54,12 @@ model MixingVolumeMoistAir "Test model for mixing volume with moist air input"
     k=1,
     Ti=1,
     Td=1,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     wd=0,
     yMin=-1000)
     annotation (Placement(transformation(extent={{-40,120},{-20,140}})));
   Buildings.Controls.Continuous.LimPID PI1(
     Ni=0.1,
     Ti=1,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=10,
     yMax=1,
     yMin=-1,
diff --git a/Buildings/Fluid/Movers/BaseClasses/package.order b/Buildings/Fluid/Movers/BaseClasses/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Movers/Examples/ClosedLoop_y.mo b/Buildings/Fluid/Movers/Examples/ClosedLoop_y.mo
index 18a6dfa004c..1c0ccb9639e 100644
--- a/Buildings/Fluid/Movers/Examples/ClosedLoop_y.mo
+++ b/Buildings/Fluid/Movers/Examples/ClosedLoop_y.mo
@@ -42,7 +42,6 @@ model ClosedLoop_y "Flow machine with feedback control"
     annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
   Buildings.Controls.Continuous.LimPID conPID(
     Td=1,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=0.5,
     Ti=15) annotation (Placement(transformation(extent={{0,100},{20,120}})));
   Modelica.Blocks.Math.Gain gain1(k=1/m_flow_nominal)
diff --git a/Buildings/Fluid/Movers/package.order b/Buildings/Fluid/Movers/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Sensors/BaseClasses/PartialAbsoluteSensor.mo b/Buildings/Fluid/Sensors/BaseClasses/PartialAbsoluteSensor.mo
index 72e6195e329..0ee3a716405 100644
--- a/Buildings/Fluid/Sensors/BaseClasses/PartialAbsoluteSensor.mo
+++ b/Buildings/Fluid/Sensors/BaseClasses/PartialAbsoluteSensor.mo
@@ -13,12 +13,24 @@ partial model PartialAbsoluteSensor
               X_a=0.40)
               "Propylene glycol water, 40% mass fraction")));
 
+  parameter Boolean warnAboutOnePortConnection = true
+   "Set to false to suppress warning about potential numerical issues, see Buildings.Fluid.Sensors.UsersGuide for more information"
+   annotation(HideResult=true);
   Modelica.Fluid.Interfaces.FluidPort_a port(redeclare package Medium=Medium, m_flow(min=0))
     annotation (Placement(transformation(
         origin={0,-100},
         extent={{-10,-10},{10,10}},
         rotation=90)));
 
+protected
+  parameter String instanceName = getInstanceName() "Name of the instance";
+initial equation
+  assert(not warnAboutOnePortConnection,
+  "Sensor " + instanceName + " can lead to numerical problems if connected to a scalar fluid port.
+  Only connect it to a vectorized fluid port, such as used in 'Buildings.Fluid.MixingVolumes`.
+  See Buildings.Fluid.Sensors.UsersGuide for more information.
+  To disable this warning, set 'warnAboutOnePortConnection = false' in " + instanceName + ".",
+  level=AssertionLevel.warning);
 equation
   port.m_flow = 0;
   port.h_outflow = 0;
@@ -36,15 +48,12 @@ Buildings.Fluid.Sensors.BaseClasses.PartialFlowSensor</a>.
 revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 September 20, 2020, by Michael Wetter:<br/>
 Introduced parameter <code>warnAboutOnePortConnection</code> and added assertion with level set to warning.<br/>
 This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\"> #1399</a>.
 </li>
 <li>
->>>>>>> master
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
@@ -72,5 +81,11 @@ First implementation.
 Implementation is based on <code>Modelica.Fluid</code>.
 </li>
 </ul>
-</html>"));
+</html>"),
+Icon(
+  graphics={
+    Bitmap(
+      visible = warnAboutOnePortConnection,
+      extent={{-96,-82},{-64,-50}},
+      fileName="modelica://Buildings/Resources/Images/Fluid/Sensors/warningIcon.png")}));
 end PartialAbsoluteSensor;
diff --git a/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo b/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo
index 3fa54a50516..56595f38c93 100644
--- a/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo
+++ b/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo
@@ -11,8 +11,7 @@ model To_VolumeFraction "Example problem for conversion model"
     "Set point for volume fraction of 700PPM CO2"
     annotation (Placement(transformation(extent={{-180,-20},{-160,0}})));
   Buildings.Controls.Continuous.LimPID limPID(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    reverseAction=true,
+    reverseActing=false,
     Ti=600,
     k=2,
     Td=1)
@@ -155,7 +154,7 @@ the setpoint, which does not comply with ASHRAE regulations.
 <ul>
 <li>
 May 2, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/Sensors/Density.mo b/Buildings/Fluid/Sensors/Density.mo
index d1acca21843..481866891d1 100644
--- a/Buildings/Fluid/Sensors/Density.mo
+++ b/Buildings/Fluid/Sensors/Density.mo
@@ -36,15 +36,25 @@ This model outputs the density of the fluid connected to its port.
 The sensor is ideal, i.e. it does not influence the fluid.
 </p>
 <p>
+To measure density in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.DensityTwoPort\">Buildings.Fluid.Sensors.DensityTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 25, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/Examples/Density.mo b/Buildings/Fluid/Sensors/Examples/Density.mo
index bff0008e25b..01fd29f8484 100644
--- a/Buildings/Fluid/Sensors/Examples/Density.mo
+++ b/Buildings/Fluid/Sensors/Examples/Density.mo
@@ -20,7 +20,8 @@ model Density "Test model for the density sensor"
           extent={{-50,-10},{-30,10}})));
 
   Buildings.Fluid.Sensors.Density senDenVol(
-    redeclare package Medium = Medium) "Density sensor for the volume"
+    redeclare package Medium = Medium, warnAboutOnePortConnection=false)
+                                       "Density sensor for the volume"
     annotation (Placement(transformation(extent={{20,0},{40,20}})));
   Buildings.Fluid.MixingVolumes.MixingVolume vol(
     redeclare package Medium = Medium,
diff --git a/Buildings/Fluid/Sensors/Examples/MassFraction.mo b/Buildings/Fluid/Sensors/Examples/MassFraction.mo
index fcca39daca2..52440e7ec77 100644
--- a/Buildings/Fluid/Sensors/Examples/MassFraction.mo
+++ b/Buildings/Fluid/Sensors/Examples/MassFraction.mo
@@ -20,7 +20,8 @@ model MassFraction "Test model for the mass fraction sensor"
           extent={{-80,0},{-60,20}})));
 
   Buildings.Fluid.Sensors.MassFraction senMasFra2(
-    redeclare package Medium = Medium) "Mass fraction sensor for the volume"
+    redeclare package Medium = Medium, warnAboutOnePortConnection=false)
+                                       "Mass fraction sensor for the volume"
     annotation (Placement(transformation(extent={{20,36},{40,56}})));
   Buildings.Fluid.MixingVolumes.MixingVolume vol(
     redeclare package Medium = Medium,
diff --git a/Buildings/Fluid/Sensors/Examples/PPM.mo b/Buildings/Fluid/Sensors/Examples/PPM.mo
index 0883b725001..1174d899ace 100644
--- a/Buildings/Fluid/Sensors/Examples/PPM.mo
+++ b/Buildings/Fluid/Sensors/Examples/PPM.mo
@@ -22,7 +22,8 @@ model PPM "Test model for the extra property sensor outputting PPM"
     m_flow=m_flow_nominal) "Fresh air supply"
     annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
 
-  Buildings.Fluid.Sensors.PPM senPPMVol(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.PPM senPPMVol(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "PPM sensor for mixing volume"
     annotation (Placement(transformation(extent={{120,40},{140,60}})));
   Modelica.Blocks.Sources.Constant CO2In(k=m_flow_nominal/1000)
@@ -36,7 +37,8 @@ model PPM "Test model for the extra property sensor outputting PPM"
         extent={{10,-10},{-10,10}},
         rotation=90,
         origin={80,10})));
-  Buildings.Fluid.Sensors.PPM senPPMIn(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.PPM senPPMIn(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "PPM sensor for inlet"
     annotation (Placement(transformation(extent={{-20,80},{0,100}})));
   Buildings.Fluid.Sensors.PPMTwoPort senPPMNoRev(
@@ -72,7 +74,8 @@ model PPM "Test model for the extra property sensor outputting PPM"
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Mixing volume without dynamics"
     annotation (Placement(transformation(extent={{70,80},{90,100}})));
-  Buildings.Fluid.Sensors.PPM senPPMVol2( redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.PPM senPPMVol2( redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "PPM sensor for mixing volume"
     annotation (Placement(transformation(extent={{120,80},{140,100}})));
   Buildings.Fluid.Sources.MassFlowSource_T mSouSta(
diff --git a/Buildings/Fluid/Sensors/Examples/RelativeHumidity.mo b/Buildings/Fluid/Sensors/Examples/RelativeHumidity.mo
index 7bf4d9bcdd6..fdfd693b8a9 100644
--- a/Buildings/Fluid/Sensors/Examples/RelativeHumidity.mo
+++ b/Buildings/Fluid/Sensors/Examples/RelativeHumidity.mo
@@ -33,7 +33,7 @@ model RelativeHumidity "Test model for relative humidity sensor"
                  annotation (Placement(transformation(extent={{-100,-20},{-80,0}})));
 
   Buildings.Fluid.Sensors.RelativeHumidity senRelHum(
-    redeclare package Medium = Medium)
+    redeclare package Medium = Medium, warnAboutOnePortConnection=false)
     "Relative humidity of the flow source if the medium were outflowing"
                 annotation (Placement(transformation(extent={{-16,42},{4,62}})));
     Modelica.Blocks.Sources.Ramp m_flow(
diff --git a/Buildings/Fluid/Sensors/Examples/SpecificEnthalpy.mo b/Buildings/Fluid/Sensors/Examples/SpecificEnthalpy.mo
index 664a1279b7e..bfc5cff416f 100644
--- a/Buildings/Fluid/Sensors/Examples/SpecificEnthalpy.mo
+++ b/Buildings/Fluid/Sensors/Examples/SpecificEnthalpy.mo
@@ -26,7 +26,8 @@ model SpecificEnthalpy "Test model for the enthalpy flow rate sensors"
     annotation (Placement(transformation(extent={{-80,-12},{-60,8}})));
 
   Buildings.Fluid.Sensors.SpecificEnthalpy senFloSou(
-    redeclare package Medium = Medium) "Sensor at the flow source"
+    redeclare package Medium = Medium, warnAboutOnePortConnection=false)
+                                       "Sensor at the flow source"
     annotation (Placement(transformation(extent={{-10,0},{10,20}})));
   Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort senStr(
     redeclare package Medium = Medium,
diff --git a/Buildings/Fluid/Sensors/Examples/SpecificEntropy.mo b/Buildings/Fluid/Sensors/Examples/SpecificEntropy.mo
index 617ee25fbd9..322b553924e 100644
--- a/Buildings/Fluid/Sensors/Examples/SpecificEntropy.mo
+++ b/Buildings/Fluid/Sensors/Examples/SpecificEntropy.mo
@@ -26,7 +26,8 @@ model SpecificEntropy "Test model for the entropy flow rate sensors"
     annotation (Placement(transformation(extent={{-80,-12},{-60,8}})));
 
   Buildings.Fluid.Sensors.SpecificEntropy senFloSou(
-    redeclare package Medium = Medium) "Sensor at the flow source"
+    redeclare package Medium = Medium, warnAboutOnePortConnection=false)
+                                       "Sensor at the flow source"
     annotation (Placement(transformation(extent={{-10,0},{10,20}})));
   Buildings.Fluid.Sensors.SpecificEntropyTwoPort senStr(
     redeclare package Medium = Medium,
diff --git a/Buildings/Fluid/Sensors/Examples/TraceSubstances.mo b/Buildings/Fluid/Sensors/Examples/TraceSubstances.mo
index 533b92fe217..149095e91f7 100644
--- a/Buildings/Fluid/Sensors/Examples/TraceSubstances.mo
+++ b/Buildings/Fluid/Sensors/Examples/TraceSubstances.mo
@@ -22,10 +22,12 @@ model TraceSubstances "Test model for the extra property sensor"
   Modelica.Blocks.Sources.Constant step(k=8.18E-6) "CO2 mass flow rate"
     annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
   Buildings.Fluid.Sensors.TraceSubstances senVol(
-    redeclare package Medium = Medium) "Sensor at volume"
+    redeclare package Medium = Medium, warnAboutOnePortConnection=false)
+                                       "Sensor at volume"
     annotation (Placement(transformation(extent={{100,50},{120,70}})));
   Buildings.Fluid.Sensors.TraceSubstances senSou(
     redeclare package Medium = Medium,
+    warnAboutOnePortConnection=false,
     substanceName="CO2") "Sensor at source"
     annotation (Placement(transformation(extent={{24,90},{44,110}})));
   Modelica.Blocks.Sources.Constant m_flow(k=m_flow_nominal)
@@ -64,7 +66,8 @@ model TraceSubstances "Test model for the extra property sensor"
     allowFlowReversal=false,
     tau=0) "Sensor at exhaust air, configured to not allow flow reversal"
     annotation (Placement(transformation(extent={{18,-62},{-2,-42}})));
-  Buildings.Fluid.Sensors.PPM senPPM(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.PPM senPPM(redeclare package Medium = Medium,
+      warnAboutOnePortConnection=false)
     "PPM sensor"
     annotation (Placement(transformation(extent={{100,10},{120,30}})));
 
diff --git a/Buildings/Fluid/Sensors/MassFraction.mo b/Buildings/Fluid/Sensors/MassFraction.mo
index 952de97c5e8..893731e5bf1 100644
--- a/Buildings/Fluid/Sensors/MassFraction.mo
+++ b/Buildings/Fluid/Sensors/MassFraction.mo
@@ -41,14 +41,24 @@ This model outputs the mass fraction of the fluid connected to its port.
 The sensor is ideal, i.e., it does not influence the fluid.
 </p>
 <p>
+To measure mass fraction in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.MassFractionTwoPort\">Buildings.Fluid.Sensors.MassFractionTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 25, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/PPM.mo b/Buildings/Fluid/Sensors/PPM.mo
index 33be9830fab..873e84a623f 100644
--- a/Buildings/Fluid/Sensors/PPM.mo
+++ b/Buildings/Fluid/Sensors/PPM.mo
@@ -85,10 +85,14 @@ and
 Modelica.Media.IdealGases.Common.FluidData</a>.
 </p>
 <p>
+To measure PPM in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.PPMTwoPort\">Buildings.Fluid.Sensors.PPMTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 <h4>Assumptions</h4>
 <p>
@@ -99,6 +103,12 @@ wrong.
 </html>", revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 25, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/Pressure.mo b/Buildings/Fluid/Sensors/Pressure.mo
index 44acff53a51..e3bdeb5379f 100644
--- a/Buildings/Fluid/Sensors/Pressure.mo
+++ b/Buildings/Fluid/Sensors/Pressure.mo
@@ -1,6 +1,7 @@
 within Buildings.Fluid.Sensors;
 model Pressure "Ideal pressure sensor"
-  extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
+  extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor(
+    final warnAboutOnePortConnection = false);
   extends Modelica.Icons.RotationalSensor;
   Modelica.Blocks.Interfaces.RealOutput p(final quantity="AbsolutePressure",
                                           final unit="Pa",
diff --git a/Buildings/Fluid/Sensors/RelativeHumidity.mo b/Buildings/Fluid/Sensors/RelativeHumidity.mo
index 6716eeb7023..8004ea84251 100644
--- a/Buildings/Fluid/Sensors/RelativeHumidity.mo
+++ b/Buildings/Fluid/Sensors/RelativeHumidity.mo
@@ -50,14 +50,24 @@ Note that this sensor can only be used with media that contain the variable <cod
 which is typically the case for moist air models.
 </p>
 <p>
+To measure relative humidity in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.RelativeHumidityTwoPort\">Buildings.Fluid.Sensors.RelativeHumidityTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 21, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/SpecificEnthalpy.mo b/Buildings/Fluid/Sensors/SpecificEnthalpy.mo
index 39f2b6672c3..60945c956a8 100644
--- a/Buildings/Fluid/Sensors/SpecificEnthalpy.mo
+++ b/Buildings/Fluid/Sensors/SpecificEnthalpy.mo
@@ -31,15 +31,25 @@ This model outputs the specific enthalpy of the fluid connected to its port.
 The sensor is ideal, i.e. it does not influence the fluid.
 </p>
 <p>
+To measure specific enthalpy in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort\">Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 25, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/SpecificEntropy.mo b/Buildings/Fluid/Sensors/SpecificEntropy.mo
index 60e83329db4..38cf01508fe 100644
--- a/Buildings/Fluid/Sensors/SpecificEntropy.mo
+++ b/Buildings/Fluid/Sensors/SpecificEntropy.mo
@@ -34,15 +34,25 @@ This model outputs the specific entropy of the fluid connected to its port.
 The sensor is ideal, i.e., it does not influence the fluid.
 </p>
 <p>
+To measure specific entropy in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.SpecificEntropyTwoPort\">Buildings.Fluid.Sensors.SpecificEntropyTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 25, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/Temperature.mo b/Buildings/Fluid/Sensors/Temperature.mo
index 66e1e0afb38..028b17f4d1c 100644
--- a/Buildings/Fluid/Sensors/Temperature.mo
+++ b/Buildings/Fluid/Sensors/Temperature.mo
@@ -1,6 +1,6 @@
 within Buildings.Fluid.Sensors;
 model Temperature "Ideal one port temperature sensor"
-    extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
+  extends Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
 
   Modelica.Blocks.Interfaces.RealOutput T(final quantity="ThermodynamicTemperature",
                                           final unit = "K",
@@ -12,22 +12,34 @@ model Temperature "Ideal one port temperature sensor"
 equation
   T = Medium.temperature(state=Medium.setState_phX(
         p=port.p, h=inStream(port.h_outflow), X=inStream(port.Xi_outflow)));
-annotation (defaultComponentName="senTem",
-    Documentation(info="<html>
+
+annotation (
+  defaultComponentName="senTem",
+  Documentation(info="<html>
 <p>
 This model outputs the temperature of the fluid connected to its port.
 The sensor is ideal, i.e., it does not influence the fluid.
 </p>
 <p>
+To measure temperature in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.TemperatureTwoPort\">Buildings.Fluid.Sensors.TemperatureTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 21, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/TraceSubstances.mo b/Buildings/Fluid/Sensors/TraceSubstances.mo
index f933da92dd7..5da4d1bd5f2 100644
--- a/Buildings/Fluid/Sensors/TraceSubstances.mo
+++ b/Buildings/Fluid/Sensors/TraceSubstances.mo
@@ -50,14 +50,24 @@ This model outputs the trace substances contained in the fluid connected to its
 The sensor is ideal, i.e., it does not influence the fluid.
 </p>
 <p>
+To measure trace substances in a duct or pipe, use
+<a href=\"modelica://Buildings.Fluid.Sensors.TraceSubstancesTwoPort\">Buildings.Fluid.Sensors.TraceSubstancesTwoPort</a>
+rather than this sensor.
 Read the
 <a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">
 Buildings.Fluid.Sensors.UsersGuide</a>
-prior to using this model with one fluid port.
+prior to using this model to see about potential numerical problems if this sensor is used incorrectly
+in a system model.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+September 21, 2020, by Michael Wetter:<br/>
+Introduced parameter <code>warnAboutOnePortConnection</code> and updated documentation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1399\">#1399</a>.
+</li>
+<li>
 February 25, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for
diff --git a/Buildings/Fluid/Sensors/UsersGuide.mo b/Buildings/Fluid/Sensors/UsersGuide.mo
index f5d921f9f3d..2b84e759f5a 100644
--- a/Buildings/Fluid/Sensors/UsersGuide.mo
+++ b/Buildings/Fluid/Sensors/UsersGuide.mo
@@ -21,12 +21,13 @@ Output signals that depend on the flow direction and are not multiplied by
 the mass flow rate are temperature, relative humidity,
 water vapor concentration <i>X</i>, trace substances <i>C</i> and density.
 For such quantities, sensors with two fluid ports need to be used.
-An exception is if the quantity is measured directly in a fluid volume, such as modeled in
-models of the package
+An exception is if the quantity is measured directly in a fluid volume, which is the case
+for models from the package
 <a href=\"modelica://Buildings.Fluid.MixingVolumes\">
 Buildings.Fluid.MixingVolumes</a>.
 Therefore, to measure for example the outlet temperature of a heat exchanger, the
-configuration on the left in the figure below should be used, and not the configuration on the right.
+configuration labelled <em>correct use</em> in the figure below should be used, and not the configuration
+labelled <em>not recommended</em>.
 For an explanation, see
 <a href=\"modelica://Modelica.Fluid.Examples.Explanatory.MeasuringTemperature\">
 Modelica.Fluid.Examples.Explanatory.MeasuringTemperature</a>.
@@ -49,30 +50,59 @@ Modelica.Fluid.Examples.Explanatory.MeasuringTemperature</a>.
 Except for the mass flow rate sensor,
 all sensors with two ports can be
 configured as dynamic sensors or as steady-state sensor.
-For numerical reasons, if the sensor output signal is <i>not</i> multiplied by the
-mass flow rate, then it is strongly suggested to configure these sensors
-as a dynamic sensor, which the default setting.
+The list below advices on how to configure sensors.
+</p>
+<ul>
+<li>
+<p>
+<em>
+Sensors for quantities that depend on the direction of the mass flow rate but
+not of its magnitude:
+</em>
+Such quantities include density, mass fraction, PPM, relative humidity, specific enthalpy, specific entropy and trace substances.
+Not that these are all quantities that are carried by the fluid that flows through the sensor.
+For these sensors, if the parameter <code>allowFlowReversal=true</code> is set (which is the default setting),
+then it is strongly recommended to configure them
+as a dynamic sensor. This is the default setting.<br/>
 Configuring a sensor as a dynamic sensor is done by setting the time constant to a non-zero
 value. Typically, setting <code>tau=10</code> seconds yields good results.
-For <code>tau=0</code>, numerical problems may occur if mass flow rates are close to zero.
-</p>
-
+For <code>tau=0</code>, numerical problems may occur if the mass flow rate is close to zero
+and <code>allowFlowReversal=true</code>.<br/>
+If <code>allowFlowReversal=false</code>, then the measurement of these sensors only depends on properties
+at <code>port_a</code>.
+If the mass flow rate at <code>port_a</code> is <i>m&#775;<sub>a</sub> &le; 0</i>,
+i.e., fluid flows from <code>port_b</code> to <code>port_a</code>,
+the model still assumes <i>m&#775;<sub>a</sub> &gt; 0</i>. Hence there are no numerical problems;
+but use of the sensor output may yield wrong results.
+Therefore, only set <code>allowFlowReversal=false</code> if you can guarantee <i>m&#775;<sub>a</sub> &ge; 0</i>.
+</p>
+</li>
+<li>
 <p>
-If the sensor output signal is the product of mass flow rate times a measured fluid property,
-such as sensors for volumentric flow rate or enthalpy flow rate,
-then the sensor is by default configured as steady-state sensor. These sensors may be configured by the user
-as a dynamic sensor by setting <code>tau &gt; 0</code>, but there is typically little benefit as these sensors typically
+<em>
+Sensors for quantities that are the product of mass flow rate times a measured fluid property:
+</em>
+Such quantities include volumentric flow rate or enthalpy flow rate.
+For these quantities, sensors are by default configured as steady-state sensor.
+These sensors may be configured by the user
+as a dynamic sensor by setting <code>tau &gt; 0</code>, but there is typically no benefit as these sensors typically
 do not cause numerical problems.
 The reason is that these sensors multiply the quantity that is carried by the flow,
 such as specific enthalpy <i>h</i> by the mass flow rate <i>m&#775;</i>
-to output the measured signal <i>H&#775;=m&#775; h</i>.
+to compute the measured signal <i>H&#775;=m&#775; h</i>.
 Hence, as the mass flow rate goes to zero, the sensor output
-signal also goes to zero, which seems to avoid numerical problems.
+signal also goes to zero, which avoids numerical problems.
 </p>
+</li>
+<li>
 <p>
-For static pressure measurements, sensors with one or with two
-ports can be used for all connection topologies.
+<em>Static pressure measurements:
+</em>
+For static pressure measurements, sensors always output the instantaneous measurement.
+These sensors cannot be configured to be dynamic.
 </p>
+</li>
+</ul>
 <p>
 The table below summarizes the recommendations for the use of sensors.
 </p>
diff --git a/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo b/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo
index a5568ef3049..e76a48150c7 100644
--- a/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo
+++ b/Buildings/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo
@@ -228,9 +228,9 @@ estimated based on the dry mass and the specific heat capacity of copper.
 This heat capacity is then added to the model by increasing the size of the fluid
 volume. Note that in earlier implementations, there was a separate model to take into
 account this heat capacity. However, this led to a translation error if glycol
-was used as the medium, because during the translation, the function
-<a href=\"modelica://Modelica.Media.Incompressible.Examples.Glycol47.T_ph\">
-Modelica.Media.Incompressible.Examples.Glycol47.T_ph</a> had to be differentiated,
+was used as the medium, because during the translation, the function <code>T_ph</code> for
+<a href=\"modelica://Modelica.Media.Incompressible.Examples.Glycol47\">
+Modelica.Media.Incompressible.Examples.Glycol47</a> had to be differentiated,
 but this function is not differentiable.
 </p>
 <h4>References</h4>
diff --git a/Buildings/Fluid/Storage/BaseClasses/package.order b/Buildings/Fluid/Storage/BaseClasses/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Storage/Examples/package.order b/Buildings/Fluid/Storage/Examples/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/Storage/package.order b/Buildings/Fluid/Storage/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Fluid/package.order b/Buildings/Fluid/package.order
index 4d699defdcd..15a7ca08b88 100644
--- a/Buildings/Fluid/package.order
+++ b/Buildings/Fluid/package.order
@@ -1,6 +1,7 @@
 UsersGuide
 Actuators
 Boilers
+CHPs
 Chillers
 Delays
 FMI
diff --git a/Buildings/HeatTransfer/Conduction/BaseClasses/Examples/package.mo b/Buildings/HeatTransfer/Conduction/BaseClasses/Examples/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/HeatTransfer/Convection/Exterior.mo b/Buildings/HeatTransfer/Convection/Exterior.mo
index 8813cd268fd..03ffb612558 100644
--- a/Buildings/HeatTransfer/Convection/Exterior.mo
+++ b/Buildings/HeatTransfer/Convection/Exterior.mo
@@ -31,6 +31,8 @@ model Exterior "Model for a exterior (outside) convective heat transfer"
   Modelica.SIunits.HeatFlux qF_flow
     "Convective heat flux from solid -> fluid due to forced convection";
 protected
+  constant Modelica.SIunits.Velocity v_small = 0.5
+    "Small value for wind velocity below which equations are regularized";
   final parameter Real cosTil=Modelica.Math.cos(til) "Cosine of window tilt";
   final parameter Real sinTil=Modelica.Math.sin(til) "Sine of window tilt";
   final parameter Boolean isCeiling = abs(sinTil) < 10E-10 and cosTil > 0
@@ -39,7 +41,9 @@ protected
     "Flag, true if the surface is a floor";
 
   parameter Real R(fixed=false) "Surface roughness";
-   Real W(min=0.5, max=1) "Wind direction modifier";
+
+  Real W(min=0.5, max=1) "Wind direction modifier";
+
 initial equation
   if (roughness == Buildings.HeatTransfer.Types.SurfaceRoughness.VeryRough) then
     R=2.17;
@@ -74,14 +78,18 @@ equation
        qN_flow = Buildings.HeatTransfer.Convection.Functions.HeatFlux.wall(dT=dT);
     end if;
     // Forced convection
-    W = Buildings.HeatTransfer.Convection.Functions.windDirectionModifier(
-          azi=azi,
-          dir=dir);
+    W = Buildings.Utilities.Math.Functions.regStep(
+          x = v-v_small/2,
+          y1 = Buildings.HeatTransfer.Convection.Functions.windDirectionModifier(
+            azi=azi,
+            dir=dir),
+          y2 = 0.75,
+          x_small=v_small/4);
     hF = 2.537 * W * R * 2 / A^(0.25) *
-         Buildings.Utilities.Math.Functions.regNonZeroPower(
+       Buildings.Utilities.Math.Functions.regNonZeroPower(
            x=v,
            n=0.5,
-           delta=0.5);
+           delta=v_small);
     qF_flow = hF*dT;
   end if;
   q_flow = qN_flow + qF_flow;
@@ -223,6 +231,12 @@ Engineering Research Laboratory, Champaign, IL.
 </html>", revisions="<html>
 <ul>
 <li>
+May 7, 2020, by Michael Wetter:<br/>
+Set wind direction modifier to a constant as wind velocity approaches zero.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1923\">#1923</a>.
+</li>
+<li>
 September 17, 2016, by Michael Wetter:<br/>
 Refactored model as part of enabling the pedantic model check in Dymola 2017 FD01 beta 2.<br/>
 This is for
diff --git a/Buildings/HeatTransfer/Convection/Validation/ZeroWindSpeed.mo b/Buildings/HeatTransfer/Convection/Validation/ZeroWindSpeed.mo
new file mode 100644
index 00000000000..4402a16fd1b
--- /dev/null
+++ b/Buildings/HeatTransfer/Convection/Validation/ZeroWindSpeed.mo
@@ -0,0 +1,25 @@
+within Buildings.HeatTransfer.Convection.Validation;
+model ZeroWindSpeed "Validation model for zero wind speed"
+  extends Buildings.HeatTransfer.Convection.Examples.Exterior(vWin(k=0));
+  annotation (Diagram(coordinateSystem(extent={{-100,-100},
+            {140,180}})),
+experiment(Tolerance=1e-6, StopTime=3600),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/HeatTransfer/Convection/Validation/ZeroWindSpeed.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example tests the convective heat transfer models for exterior surfaces if the wind speed is zero.
+From <i>t=0...3600</i> seconds, the wind traverses from North to West to South to East and back to
+North. The plot validates that there is no influence of the wind direction on the forced convection
+coefficient for wall surfaces that face North, West, East and South if the wind speed is zero.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+May 7, 2020, by Michael Wetter:<br/>
+First implementation for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1923\">#1923</a>.
+</li>
+</ul>
+</html>"));
+end ZeroWindSpeed;
diff --git a/Buildings/HeatTransfer/Convection/Validation/package.mo b/Buildings/HeatTransfer/Convection/Validation/package.mo
new file mode 100644
index 00000000000..800f6c9aadb
--- /dev/null
+++ b/Buildings/HeatTransfer/Convection/Validation/package.mo
@@ -0,0 +1,20 @@
+within Buildings.HeatTransfer.Convection;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.HeatTransfer.Convection\">
+Buildings.HeatTransfer.Convection</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/HeatTransfer/Convection/Validation/package.order b/Buildings/HeatTransfer/Convection/Validation/package.order
new file mode 100644
index 00000000000..0daf0059c1f
--- /dev/null
+++ b/Buildings/HeatTransfer/Convection/Validation/package.order
@@ -0,0 +1 @@
+ZeroWindSpeed
diff --git a/Buildings/HeatTransfer/Convection/package.order b/Buildings/HeatTransfer/Convection/package.order
index 6919430d0e7..15910410853 100644
--- a/Buildings/HeatTransfer/Convection/package.order
+++ b/Buildings/HeatTransfer/Convection/package.order
@@ -2,4 +2,5 @@ Exterior
 Interior
 Functions
 Examples
+Validation
 BaseClasses
diff --git a/Buildings/HeatTransfer/Examples/package.mo b/Buildings/HeatTransfer/Examples/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo b/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo
index 6ee4d38fcd9..e03151b5c80 100644
--- a/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo
+++ b/Buildings/HeatTransfer/Sources/FixedHeatFlow.mo
@@ -6,6 +6,7 @@ model FixedHeatFlow "Fixed heat flow boundary condition"
 equation
   port.Q_flow = -Q_flow;
   annotation (
+    defaultComponentName="preHeaFlo",
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
             100,100}}), graphics={
         Text(
diff --git a/Buildings/HeatTransfer/Sources/FixedTemperature.mo b/Buildings/HeatTransfer/Sources/FixedTemperature.mo
index 4e438811b39..77cd6084233 100644
--- a/Buildings/HeatTransfer/Sources/FixedTemperature.mo
+++ b/Buildings/HeatTransfer/Sources/FixedTemperature.mo
@@ -7,6 +7,7 @@ model FixedTemperature "Fixed temperature boundary condition in Kelvin"
 equation
   port.T = T;
   annotation (
+    defaultComponentName="preTem",
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
             100,100}}), graphics={
         Text(
diff --git a/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo b/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo
index 2f0962aa22d..56017a73848 100644
--- a/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo
+++ b/Buildings/HeatTransfer/Sources/PrescribedHeatFlow.mo
@@ -10,6 +10,7 @@ model PrescribedHeatFlow "Prescribed heat flow boundary condition"
 equation
   port.Q_flow = -Q_flow;
   annotation (
+    defaultComponentName="preHeaFlo",
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
             100,100}}), graphics={
         Line(
diff --git a/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo b/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo
index 8754b58c31f..5964913638b 100644
--- a/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo
+++ b/Buildings/HeatTransfer/Sources/PrescribedTemperature.mo
@@ -8,6 +8,7 @@ model PrescribedTemperature "Variable temperature boundary condition in Kelvin"
 equation
   port.T = T;
   annotation (
+    defaultComponentName="preTem",
     Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
             100,100}}), graphics={
         Rectangle(
diff --git a/Buildings/HeatTransfer/package.mo b/Buildings/HeatTransfer/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Media/Air.mo b/Buildings/Media/Air.mo
index e1cc4f289f9..980f55a30c9 100644
--- a/Buildings/Media/Air.mo
+++ b/Buildings/Media/Air.mo
@@ -45,36 +45,60 @@ package Air
   // Therefore, the statement
   //   p(stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default)
   // has been removed.
-  redeclare replaceable model extends BaseProperties(
-    Xi(each stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default),
-    T(stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default),
-    final standardOrderComponents=true) "Base properties"
-
+  redeclare model BaseProperties "Base properties (p, d, T, h, u, R, MM and X and Xi) of a medium"
+
+  parameter Boolean preferredMediumStates=false
+    "= true if StateSelect.prefer shall be used for the independent property variables of the medium"
+    annotation (Evaluate=true, Dialog(tab="Advanced"));
+  final parameter Boolean standardOrderComponents=true
+    "If true, and reducedX = true, the last element of X will be computed from the other ones";
+
+  InputAbsolutePressure p "Absolute pressure of medium";
+  InputMassFraction[1] Xi(
+    start=reference_X[1:1],
+    each stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default)
+    "Structurally independent mass fractions";
+  InputSpecificEnthalpy h "Specific enthalpy of medium";
+  Modelica.Media.Interfaces.Types.Density d "Density of medium";
+  Modelica.Media.Interfaces.Types.Temperature T(
+   stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default)
+   "Temperature of medium";
+  Modelica.Media.Interfaces.Types.MassFraction[2] X(start=reference_X)
+    "Mass fractions (= (component mass)/total mass  m_i/m)";
+  Modelica.Media.Interfaces.Types.SpecificInternalEnergy u
+    "Specific internal energy of medium";
+  Modelica.Media.Interfaces.Types.SpecificHeatCapacity R
+    "Gas constant (of mixture if applicable)";
+  Modelica.Media.Interfaces.Types.MolarMass MM
+    "Molar mass (of mixture or single fluid)";
+  ThermodynamicState state
+    "Thermodynamic state record for optional functions";
+
+  Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC=
+    Modelica.SIunits.Conversions.to_degC(T) "Temperature of medium in [degC]";
+  Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar=
+    Modelica.SIunits.Conversions.to_bar(p) "Absolute pressure of medium in [bar]";
+
+  // Local connector definition, used for equation balancing check
+  connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure
+    "Pressure as input signal connector";
+  connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy
+    "Specific enthalpy as input signal connector";
+  connector InputMassFraction = input Modelica.SIunits.MassFraction
+    "Mass fraction as input signal connector";
+
+    // Declarations for Air only
   protected
-    constant Modelica.SIunits.MolarMass[2] MMX = {steam.MM,dryair.MM}
-      "Molar masses of components";
+  Modelica.SIunits.TemperatureDifference dT(start=T_default-reference_T)
+    "Temperature difference used to compute enthalpy";
 
-    MassFraction X_steam "Mass fraction of steam water";
-    MassFraction X_air "Mass fraction of air";
-    Modelica.SIunits.TemperatureDifference dT(start=T_default-reference_T)
-      "Temperature difference used to compute enthalpy";
   equation
-    assert(T >= 200.0, "
-In "   + getInstanceName() + ": Temperature T exceeded its minimum allowed value of -73.15 degC (200 Kelvin)
-as required from medium model \"" + mediumName + "\".");
-    assert(T <= 423.15, "
-In "   + getInstanceName() + ": Temperature T exceeded its maximum allowed value of 150 degC (423.15 Kelvin)
-as required from medium model \"" + mediumName + "\".");
-
-    MM = 1/(Xi[Water]/MMX[Water]+(1.0-Xi[Water])/MMX[Air]);
-
-    X_steam  = Xi[Water]; // There is no liquid in this medium model
-    X_air    = 1-Xi[Water];
+    MM = 1/(X[1]/steam.MM+(X[2])/dryair.MM);
 
     dT = T - reference_T;
-    h = dT*dryair.cp * X_air +
-       (dT * steam.cp + h_fg) * X_steam;
-    R = dryair.R*X_air + steam.R*X_steam;
+    h = dT*dryair.cp * X[2] +
+       (dT * steam.cp + h_fg) * X[1];
+    R = dryair.R*X[2] + steam.R*X[1];
 
     // Equation for ideal gas, from h=u+p*v and R*T=p*v, from which follows that  u = h-R*T.
     // u = h-R*T;
@@ -90,8 +114,6 @@ as required from medium model \"" + mediumName + "\".");
     state.p = p;
     state.T = T;
     state.X = X;
-<<<<<<< HEAD
-=======
 
     X[1] = Xi[1];
     X[2] = 1 - X[1];
@@ -159,7 +181,6 @@ but with <code>noEvent</code> added to check of bounds.
 </li>
 </ul>
 </html>"));
->>>>>>> master
   end BaseProperties;
 
 redeclare function density "Gas density"
@@ -967,7 +988,7 @@ algorithm
   annotation (
     Inline=true);
 end der_specificHeatCapacityCv;
-  annotation(preferredView="info", Documentation(info="<html>
+  annotation(Documentation(info="<html>
 <p>
 This medium package models moist air using a gas law in which pressure and temperature
 are independent, which often leads to significantly faster and more robust computations.
@@ -1039,6 +1060,12 @@ if <i>T=0</i> &deg;C and no water vapor is present.
 </html>", revisions="<html>
 <ul>
 <li>
+September 28, 2020, by Michael Wetter:<br/>
+Reformulated <code>BaseProperties</code> to avoid event-triggering assertions.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1401\">#1401</a>.
+</li>
+<li>
 January 11, 2019 by Michael Wetter:<br/>
 Reforulated assignment of <code>X_int</code> in <code>setState_psX</code>.<br/>
 This is for
diff --git a/Buildings/Media/Examples/SteamDerivativeCheck.mo b/Buildings/Media/Examples/SteamDerivativeCheck.mo
index c152ad94650..e23fa8f95e9 100644
--- a/Buildings/Media/Examples/SteamDerivativeCheck.mo
+++ b/Buildings/Media/Examples/SteamDerivativeCheck.mo
@@ -24,12 +24,7 @@ equation
          p=1e5,
          T=T,
          X=Medium.X_default));
-<<<<<<< HEAD
-    assert(abs(hVapCod-hVapSym) < 1E-4 * (1+abs(hVapCod)),
-      "Specific enthalpies don't match within required tolerance.");
-=======
     assert(abs(hVapCod-hVapSym) < 1E-4 * (1+abs(hVapCod)), "Model has an error");
->>>>>>> master
     der(hVapCod)=der(hVapSym);
 
     cpCod=Medium.specificHeatCapacityCp(
@@ -38,12 +33,7 @@ equation
          T=T,
          X=Medium.X_default));
     der(cpCod)=der(cpSym);
-<<<<<<< HEAD
-    assert(abs(cpCod-cpSym) < 1E-4 * (1+abs(cpCod)),
-      "Specific heat capacities at constant pressure don't match within required tolerance.");
-=======
     assert(abs(cpCod-cpSym) < 1E-4 * (1+abs(cpCod)), "Model has an error");
->>>>>>> master
 
      cvCod=Medium.specificHeatCapacityCv(
       Medium.setState_pTX(
@@ -51,12 +41,7 @@ equation
          T=T,
          X=Medium.X_default));
     der(cvCod)=der(cvSym);
-<<<<<<< HEAD
-    assert(abs(cvCod-cvSym) < 1E-4 * (1+abs(cvCod)),
-      "Specific heat capacities at constant volume don't match within required tolerance.");
-=======
     assert(abs(cvCod-cvSym) < 1E-4 * (1+abs(cvCod)), "Model has an error");
->>>>>>> master
 
    annotation(experiment(
                  StartTime=0, StopTime=1,
diff --git a/Buildings/Media/Examples/SteamProperties.mo b/Buildings/Media/Examples/SteamProperties.mo
index 734e080b93f..12e7b6f4420 100644
--- a/Buildings/Media/Examples/SteamProperties.mo
+++ b/Buildings/Media/Examples/SteamProperties.mo
@@ -1,16 +1,5 @@
 within Buildings.Media.Examples;
 model SteamProperties
-<<<<<<< HEAD
-  "Model that tests the implementation of the steam properties"
-  extends Modelica.Icons.Example;
-  extends Buildings.Media.Examples.BaseClasses.FluidProperties(
-    redeclare package Medium = Buildings.Media.Steam,
-    TMin=273.16,
-    TMax=647.096);
-
-
-equation
-=======
   "Model that tests the implementation of the steam superheated properties"
   extends Modelica.Icons.Example;
   extends Buildings.Media.Examples.BaseClasses.PartialProperties(
@@ -41,7 +30,6 @@ equation
   ddhp = Medium.density_derh_p(state_pTX);
   ddph = Medium.density_derp_h(state_pTX);
 
->>>>>>> master
   // Check the implementation of the base properties
   basPro.state.p=p;
   basPro.state.T=T;
@@ -57,14 +45,9 @@ This example checks thermophysical properties of the medium.
 revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-March 6, 2020, by Kathryn Hinkelman:<br/>
-Change medium to ideal steam to eliminate discontinuities.
-=======
 October 30, 2020, by Kathryn Hinkelman:<br/>
 Rebased steam medium to PartialMedium and improved steam property consistency
 and efficiency.
->>>>>>> master
 </li>
 <li>
 September 12, 2019, by Yangyang Fu:<br/>
diff --git a/Buildings/Media/Examples/SteamSaturatedProperties.mo b/Buildings/Media/Examples/SteamSaturatedProperties.mo
deleted file mode 100644
index dd982837455..00000000000
--- a/Buildings/Media/Examples/SteamSaturatedProperties.mo
+++ /dev/null
@@ -1,88 +0,0 @@
-within Buildings.Media.Examples;
-model SteamSaturatedProperties
-  "Model that tests the implementation of the steam properties at saturated liquid and vapor states"
-  extends Modelica.Icons.Example;
-
-  package Medium = Buildings.Media.Steam  "Steam medium model";
-
-  parameter Modelica.SIunits.Temperature TMin = 273.16
-    "Minimum temperature for the simulation";
-  parameter Modelica.SIunits.Temperature TMax = 647.096
-    "Maximum temperature for the simulation";
-  parameter Modelica.SIunits.Pressure pMin = 620
-    "Minimum pressure for the simulation";
-  parameter Modelica.SIunits.Pressure pMax = 20000000
-    "Maximum pressure for the simulation";
-  Modelica.SIunits.Pressure pSat "Saturation pressure";
-  Medium.Temperature TSat  "Saturation temperature";
-  Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TSat_degC
-    "Celsius saturation temperature";
-
-  Medium.SaturationProperties sat "Medium saturation state";
-
-  Modelica.SIunits.Density dl "Density of saturated liquid";
-  Modelica.SIunits.Density dv "Density of saturated vapor";
-  Modelica.SIunits.SpecificEnthalpy hl "Enthalpy of saturated liquid";
-  Modelica.SIunits.SpecificEnthalpy hv "Enthalpy of saturated vapor";
-  Modelica.SIunits.SpecificEnthalpy hlv "Enthalpy of vaporization";
-  Modelica.SIunits.SpecificEntropy sl "Entropy of saturated liquid";
-  Modelica.SIunits.SpecificEntropy sv "Entropy of saturated vapor";
-  Modelica.SIunits.SpecificEntropy slv "Entropy of vaporization";
-
-protected
-  constant Real conv(unit="1/s") = 1 "Conversion factor to satisfy unit check";
-
-equation
-    // Compute temperatures that are used as input to the functions
-    pSat = pMin + conv*time * (pMax-pMin);
-    TSat_degC = Modelica.SIunits.Conversions.to_degC(TSat);
-
-    // Saturation state
-    sat = Medium.saturationState_p(pSat);
-    TSat = sat.Tsat;
-    assert(TSat > TMin, "Temperature exceeded minimum value.\n" +
-      "   TSat = " + String(TSat));
-    assert(TSat < TMax, "Temperature exceeded maximum value.\n" +
-      "   TSat = " + String(TSat));
-    // Check the implementation of the functions
-    dl = Medium.densityOfSaturatedLiquid_sat(sat);
-    dv = Medium.densityOfSaturatedVapor_sat(sat);
-    hl = Medium.enthalpyOfSaturatedLiquid_sat(sat);
-    hv = Medium.enthalpyOfSaturatedVapor_sat(sat);
-    hlv = Medium.enthalpyOfVaporization_sat(sat);
-    sl = Medium.entropyOfSaturatedLiquid_sat(sat);
-    sv = Medium.entropyOfSaturatedVapor_sat(sat);
-    slv = Medium.entropyOfVaporization_sat(sat);
-
-   annotation(experiment(Tolerance=1e-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturatedProperties.mos"
-        "Simulate and plot"),
-      Documentation(info="<html>
-<p>
-This example checks the saturation properties of the medium.
-</p>
-<p>
-The steam medium is designed for single phase (saturated or
-superheated) vapor (<code>x=1</code>). The saturated state functions are
-provided for models involving phase change by implementing both
-the <a href=\"modelica://Buildings.Media.Steam\">
-Buildings.Media.Steam</a> model (vapor phase) and the
-<a href=\"modelica://Buildings.Media.Water\"> Buildings.Media.Water</a>
-model (liquid phase). See <a href=\"modelica://Buildings.Media.Steam\">
-Buildings.Media.Steam</a> for more information.
-</p>
-<p>
-Since the steam medium model assumes pressure is steady throughout
-simulation, these saturation properties are evaluted over the possible
-range of saturated pressure values.
-</p>
-</html>",
-revisions="<html>
-<ul>
-<li>
-March 6, 2020, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end SteamSaturatedProperties;
diff --git a/Buildings/Media/Examples/SteamTemperatureEnthalpyInversion.mo b/Buildings/Media/Examples/SteamTemperatureEnthalpyInversion.mo
index 90be9888ad0..ec92de8c995 100644
--- a/Buildings/Media/Examples/SteamTemperatureEnthalpyInversion.mo
+++ b/Buildings/Media/Examples/SteamTemperatureEnthalpyInversion.mo
@@ -3,13 +3,8 @@ model SteamTemperatureEnthalpyInversion
   "Model to check computation of h(T) and its inverse"
   extends Modelica.Icons.Example;
   extends Buildings.Media.Examples.BaseClasses.TestTemperatureEnthalpyInversion(
-<<<<<<< HEAD
-     redeclare package Medium = Buildings.Media.Steam,
-     T0 = 273.15 + 200);
-=======
     redeclare package Medium = Buildings.Media.Steam,
     T0=273.15 + 300);
->>>>>>> master
   annotation (
 experiment(Tolerance=1e-6, StopTime=1.0),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Media/Examples/SteamTemperatureEnthalpyInversion.mos"
@@ -22,13 +17,10 @@ is implemented correctly for the steam model.
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-=======
 March 24, 2020, by Kathryn Hinkelman:<br/>
 Relaxed absolute error tolerance.
 </li>
 <li>
->>>>>>> master
 January 16, 2020, by Kathryn Hinkelman:<br/>
 Change medium to ideal steam to eliminate property discontinuities.
 </li>
diff --git a/Buildings/Media/Examples/package.order b/Buildings/Media/Examples/package.order
index 9f3b75f3d4f..89c8f350e92 100644
--- a/Buildings/Media/Examples/package.order
+++ b/Buildings/Media/Examples/package.order
@@ -6,11 +6,7 @@ PropyleneGlycolWaterProperties
 PropyleneGlycolWaterTemperatureEnthalpyInversion
 SteamDerivativeCheck
 SteamProperties
-<<<<<<< HEAD
-SteamSaturatedProperties
-=======
 SteamSaturationConsistencyCheck
->>>>>>> master
 SteamTemperatureEnthalpyInversion
 WaterDerivativeCheck
 WaterProperties
diff --git a/Buildings/Media/Steam.mo b/Buildings/Media/Steam.mo
index 57ec5f8231a..dea7adfa59f 100644
--- a/Buildings/Media/Steam.mo
+++ b/Buildings/Media/Steam.mo
@@ -1,92 +1,4 @@
 within Buildings.Media;
-<<<<<<< HEAD
-package Steam "Package with model for ideal steam"
-  extends Modelica.Media.Water.IdealSteam(
-     mediumName="steam",
-     reference_T=273.15,
-     reference_p=101325,
-     AbsolutePressure(start=p_default),
-     Temperature(start=T_default));
-
-  extends Modelica.Icons.Package;
-
-  replaceable function saturationState_p
-    "Return saturation property record from pressure"
-    extends Modelica.Icons.Function;
-    input AbsolutePressure p "Pressure";
-    output SaturationProperties sat "Saturation property record";
-  algorithm
-    sat.psat := p;
-    sat.Tsat := saturationTemperature(p);
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Returns the saturation state for given pressure. This relation is
-    valid in the region of <i>273.16</i> to <i>647.096</i> K (<i>613.3</i> to <i>22,049,100</i> Pa).
-    </p>
-    <p>
-    To compute the saturation temperature, the function uses
-    </p>
-    <p align=\"center\" style=\"font-style:italic;\">
-    T = a<sub>1</sub> + a<sub>2</sub> ln(p) + a<sub>3</sub> ln(p)<sup>2</sup> +
-    a<sub>4</sub> ln(p)<sup>3</sup> + a<sub>5</sub> ln(p)<sup>4</sup> + a<sub>6</sub> ln(p)<sup>5</sup>,
-    </p>
-    <p>
-    where temperature <i>T</i> is in units Kelvin, pressure <i>p</i> is in units Pa, and <i>a<sub>1</sub></i>
-    through <i>a<sub>6</sub></i> are regression coefficients.
-    </p>
-  </html>", revisions="<html>
-<ul>
-<li>
-March 14, 2020, by Michael Wetter:<br/>
-Renamed function so it has a similar name as
-<a href=\"modelica://Buildings.Media.Steam.saturationTemperature\">
-Buildings.Media.Steam.saturationTemperature</a>.
-</li>
-<li>
-March 6, 2020, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-  end saturationState_p;
-
-  replaceable function saturationTemperature
-    "Return saturation temperature (K) from a given pressure (Pa)"
-    extends Modelica.Icons.Function;
-    input AbsolutePressure p "Pressure";
-    output Temperature T   "Saturation temperature";
-  protected
-    Real a[:] = {2.2830066E+02,1.1893913E+00,5.2484699E-01,1.2416857E-01,
-      -1.3714779E-02,5.5702047E-04}
-      "Coefficients";
-  algorithm
-    T := a[1] + a[2]*log(p) + a[3]*log(p)^2 + a[4]*log(p)^3 +
-      a[5]*log(p)^4 + a[6]*log(p)^5  "Saturation temperature";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Saturation temperature is computed from pressure. This relation is
-    valid in the region of <i>273.16</i> to <i>647.096</i> K (<i>613.3</i> to <i>22,049,100</i> Pa).
-    </p>
-    <p>
-    The function has the following form:
-    </p>
-    <p align=\"center\" style=\"font-style:italic;\">
-    T = a<sub>1</sub> + a<sub>2</sub> ln(p) + a<sub>3</sub> ln(p)<sup>2</sup> +
-    a<sub>4</sub> ln(p)<sup>3</sup> + a<sub>5</sub> ln(p)<sup>4</sup> + a<sub>6</sub> ln(p)<sup>5</sup>
-    </p>
-    <p>
-    where temperature <i>T</i> is in units Kelvin, pressure <i>p</i> is in units Pa, and <i>a<sub>1</sub></i>
-    through <i>a<sub>6</sub></i> are regression coefficients.
-    </p>
-  </html>", revisions="<html>
-<ul>
-<li>
-March 6, 2020, by Kathryn Hinkelman:<br/>
-=======
 package Steam
   "Package with model for pure steam water vapor"
   extends Modelica.Media.Interfaces.PartialMedium(
@@ -244,282 +156,10 @@ The root mean square error (RMSE) is <i>0.76 kJ/kg</i>.
 <ul>
 <li>
 October 30, 2020, by Kathryn Hinkelman:<br/>
->>>>>>> master
-First implementation.
-</li>
-</ul>
-</html>"));
-<<<<<<< HEAD
-  end saturationTemperature;
-
-  replaceable function densityOfSaturatedLiquid_sat
-    "Return density of saturated liquid"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output Density dl "Density of saturated liquid";
-  protected
-    Real m[:] = {1/3,2/3,5/3,16/3,43/3,110/3} "Powers in equation (2)";
-    Real b[:] = {1.99274064,1.09965342,-0.510839303,-1.75493479,-45.5170352,-6.74694450e5}
-      "Coefficients in equation (2)";
-    Real tau = 1 - sat.Tsat/Tcritical  "Temperature expression";
-  algorithm
-    dl := dcritical*(1 + b[1]*tau^m[1] + b[2]*tau^m[2] + b[3]*tau^m[3] +
-      b[4]*tau^m[4] + b[5]*tau^m[5] + b[6]*tau^m[6])
-      "Density of saturated liquid, equation (2)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Density of saturated liquid is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end densityOfSaturatedLiquid_sat;
-
-  replaceable function densityOfSaturatedVapor_sat
-    "Return density of saturated vapor"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output Density dv "Density of saturated vapor";
-  protected
-    Real m[:] = {2/6,4/6,8/6,18/6,37/6,71/6}  "Powers in equation (3)";
-    Real c[:] = {-2.03150240,-2.68302940,-5.38626492,-17.2991605,-44.7586581,-63.9201063}
-      "Coefficients in equation (3)";
-    Real tau = 1 - sat.Tsat/Tcritical  "Temperature expression";
-  algorithm
-    dv := dcritical*exp(c[1]*tau^m[1] + c[2]*tau^m[2] + c[3]*tau^m[3] +
-      c[4]*tau^m[4] + c[5]*tau^m[5] + c[6]*tau^m[6])
-      "Density of saturated vapor, equation (3)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Density of saturated vapor is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end densityOfSaturatedVapor_sat;
-
-  replaceable function enthalpyOfSaturatedLiquid_sat
-    "Return specific enthalpy of saturated liquid"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output SpecificEnthalpy hl "Boiling curve specific enthalpy";
-  protected
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-    Density dl = densityOfSaturatedLiquid_sat(sat)  "Saturated liquid density";
-    Real r1 = expression1_sat(sat)  "Intermediate expression 1";
-    Real r2 = expression2_sat(sat)  "Intermediate expression 2";
-    Real a = auxiliaryAlpha_sat(sat)  "Value for alpha";
-  algorithm
-    hl := a - exp(r1)*pcritical*(r2+r1*tau)/(dl*tau)
-      "Saturated liquid enthalpy, derived from equation (6)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Enthalpy of saturated liquid is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end enthalpyOfSaturatedLiquid_sat;
-
-  replaceable function enthalpyOfSaturatedVapor_sat
-    "Return specific enthalpy of saturated vapor"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output SpecificEnthalpy hv "Dew curve specific enthalpy";
-  protected
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-    Density dv = densityOfSaturatedVapor_sat(sat)  "Saturated vapor density";
-    Real r1 = expression1_sat(sat)  "Intermediate expression 1";
-    Real r2 = expression2_sat(sat)  "Intermediate expression 2";
-    Real a = auxiliaryAlpha_sat(sat)  "Value for alpha";
-  algorithm
-    hv := a - exp(r1)*pcritical*(r2+r1*tau)/(dv*tau)
-      "Saturated vapor enthalpy, derived from equation (7)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Enthalpy of saturated vapor is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end enthalpyOfSaturatedVapor_sat;
-
-  replaceable function enthalpyOfVaporization_sat
-    "Return enthalpy of vaporization of water as a function of temperature T"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output SpecificEnthalpy hlv "Vaporization enthalpy";
-  protected
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-    Density dv = densityOfSaturatedVapor_sat(sat)  "Saturated vapor density";
-    Density dl = densityOfSaturatedLiquid_sat(sat)  "Saturated liquid density";
-    Real r1 = expression1_sat(sat)  "Intermediate expression 1";
-    Real r2 = expression2_sat(sat)  "Intermediate expression 2";
-    Real a = auxiliaryAlpha_sat(sat)  "Value for alpha";
-
-  algorithm
-    hlv := exp(r1)*pcritical*(r2+r1*tau)/tau * (1/dl-1/dv)
-      "Difference of equations (7) and (6)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Enthalpy of vaporization of water is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>", revisions="<html>
-<ul>
-<li>
-March 14, 2020, by Michael Wetter:<br/>
-Reformulated function to avoid computing common expressions twice.
-</li>
-<li>
-March 6, 2020, by Kathryn Hinkelman:<br/>
 First implementation.
 </li>
 </ul>
 </html>"));
-  end enthalpyOfVaporization_sat;
-
-  replaceable function entropyOfSaturatedLiquid_sat
-    "Return specific entropy of saturated liquid"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output SpecificEntropy sl "Saturated liquid specific enthalpy";
-  protected
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-    Density dl = densityOfSaturatedLiquid_sat(sat)  "Saturated liquid density";
-    Real r1 = expression1_sat(sat)  "Intermediate expression 1";
-    Real r2 = expression2_sat(sat)  "Intermediate expression 2";
-    Real phi = auxiliaryPhi_sat(sat)  "Value for phi";
-  algorithm
-    sl := phi - exp(r1)*pcritical*(r2 + r1*tau)/(dl*tau*sat.Tsat)
-      "Saturated liquid enthalpy, derived from Equation (8)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Entropy of saturated liquid is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end entropyOfSaturatedLiquid_sat;
-
-  replaceable function entropyOfSaturatedVapor_sat
-    "Return specific entropy of saturated vapor"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output SpecificEntropy sv "Saturated vapor specific enthalpy";
-  protected
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-    Density dv = densityOfSaturatedVapor_sat(sat)  "Saturated vapor density";
-    Real r1 = expression1_sat(sat)  "Intermediate expression 1";
-    Real r2 = expression2_sat(sat)  "Intermediate expression 2";
-    Real phi = auxiliaryPhi_sat(sat)  "Value for phi";
-  algorithm
-    sv := phi - exp(r1)*pcritical*(r2 + r1*tau)/(dv*tau*sat.Tsat)
-      "Saturated vapor enthalpy, derived from Equation (9)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Entropy of saturated vapor is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end entropyOfSaturatedVapor_sat;
-
-  replaceable function entropyOfVaporization_sat
-    "Return entropy of vaporization of water as a function of temperature T"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output SpecificEntropy slv "Vaporization enthalpy";
-  protected
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-    Density dv = densityOfSaturatedVapor_sat(sat)  "Saturated vapor density";
-    Density dl = densityOfSaturatedLiquid_sat(sat)  "Saturated liquid density";
-    Real r1 = expression1_sat(sat)  "Intermediate expression 1";
-    Real r2 = expression2_sat(sat)  "Intermediate expression 2";
-    Real phi = auxiliaryPhi_sat(sat)  "Value for phi";
-  algorithm
-    slv := exp(r1)*pcritical*(r2 + r1*tau)/(tau*sat.Tsat) * (1/dl-1/dv)
-     "Difference of equations (8) and (9)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Entropy of vaporization of water is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>", revisions="<html>
-<ul>
-<li>
-March 14, 2020, by Michael Wetter:<br/>
-Reformulated function to avoid computing common expressions twice.
-</li>
-<li>
-March 6, 2020, by Kathryn Hinkelman:<br/>
-=======
 end specificEnthalpy;
 
 redeclare replaceable function extends specificEntropy
@@ -1071,248 +711,10 @@ this function is used.
 <ul>
 <li>
 June 11, 2021, by Michael Wetter:<br/>
->>>>>>> master
 First implementation.
 </li>
 </ul>
 </html>"));
-<<<<<<< HEAD
-  end entropyOfVaporization_sat;
-//////////////////////////////////////////////////////////////////////
-// Protected classes.
-// These classes are only of use within this medium model.
-// Models generally have no need to access them.
-// Therefore, they are made protected. This also allows to redeclare the
-// medium model with another medium model that does not provide an
-// implementation of these classes.
-
-protected
-    constant Modelica.SIunits.Temperature Tcritical=647.096 "Critical temperature";
-    constant Modelica.SIunits.Density dcritical=322 "Critical density";
-    constant Modelica.SIunits.Pressure pcritical=22.064e6 "Critical pressure";
-    constant Modelica.SIunits.SpecificEnthalpy a0 = 1000
-      "Auxiliary quantity for specific enthalpy";
-
-  replaceable function vaporPressure_sat
-    "Returns vapor pressure for a given temperature"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output AbsolutePressure p  "Vapor pressure";
-  protected
-    Real n[:] = {1,1.5,3,3.5,4,7.5} "Powers in equation (1)";
-    Real a[:] = {-7.85951783,1.84408259,-11.7866497,22.6807411,-15.9618719,
-        1.80122502} "Coefficients in equation (1) of [1]";
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-  algorithm
-    p := pcritical*exp(Tcritical/sat.Tsat*(a[1]*tau^n[1] + a[2]*tau^n[2] + a[3]
-        *tau^n[3] + a[4]*tau^n[4]) + a[5]*tau^n[5] + a[6]*tau^n[6])
-        "Equation (1) for vapor pressure";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Vapor pressure is computed from temperature in the region
-    of <i>273.16</i> to <i>647.096</i> K.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end vaporPressure_sat;
-
-  function auxiliaryAlpha_sat
-    "This is auxiliary equation (4) for specific enthalpy calculations"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output Real a  "Alpha in equation (4)";
-  protected
-    Real m[:] = {-19,1,4.5,5,54.5}  "Powers in equation (4)";
-    Real d_a = -1135.905627715  "Coefficient in equation (4)";
-    Real d[:] = {-5.65134998e-8,2690.66631,127.287297,-135.003439,0.981825814}
-      "Coefficients in equation (4) and (5)";
-    Real theta = sat.Tsat / Tcritical  "Temperature ratio";
-  algorithm
-    a := a0*(d_a + d[1]*theta^m[1] + d[2]*theta^m[2] + d[3]*theta^m[3] +
-      d[4]*theta^m[4] + d[5]*theta^m[5])  "Equation (4)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Auxiliary equation for alpha, equation (4).
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end auxiliaryAlpha_sat;
-
-  function auxiliaryPhi_sat
-    "This is auxiliary equation (5) for specific entropy calculations"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output Real phi  "Phi in equation (5)";
-  protected
-    Real m[:] = {-20,0,3.5,4,53.5}  "Powers in equation (5)";
-    Real d_phi = 2319.5246  "Coefficient in equation (5)";
-    Real d[:] = {-5.65134998e-8,2690.66631,127.287297,-135.003439,0.981825814}
-      "Coefficients in equation (4) and (5)";
-    Real a[:] = {19/20,1,9/7,5/4,109/107}  "Additional coefficients in (5)";
-    Real phi0 = a0 / Tcritical  "Given reference constant";
-    Real theta = sat.Tsat / Tcritical  "Temperature ratio";
-  algorithm
-    phi := phi0*(d_phi + a[1]*d[1]*theta^m[1] + a[2]*d[2]*log(theta) +
-      a[3]*d[3]*theta^m[3] + a[4]*d[4]*theta^m[4] + a[5]*d[5]*theta^m[5])
-      "Equation (5)";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Auxiliary equation for <code>phi</code>, equation (5).
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end auxiliaryPhi_sat;
-
-  function expression1_sat
-    "This expression represents ln(p/pcritical), which is used in the saturated
-      enthalpy and entropy functions above"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output Real r1  "Expression 1";
-  protected
-    Real n[:] = {1,1.5,3,3.5,4,7.5} "Powers in equation (1)";
-    Real a[:] = {-7.85951783,1.84408259,-11.7866497,22.6807411,-15.9618719,
-        1.80122502} "Coefficients in equation (1) of [1]";
-    Real Tcri_Tsat = Tcritical/sat.Tsat "Ratio of critical over saturation temperature";
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-  algorithm
-    r1 := Tcri_Tsat * sum(a[i] * tau^n[i] for i in 1:6);
-  /*   r1 := (a[1]*Tcritical*tau^n[1])/sat.Tsat + (a[2]*Tcritical*tau^n[2])/sat.Tsat
-       + (a[3]*Tcritical*tau^n[3])/sat.Tsat + (a[4]*Tcritical*tau^n[4])/sat.Tsat
-       + (a[5]*Tcritical*tau^n[5])/sat.Tsat + (a[6]*Tcritical*tau^n[6])/sat.Tsat
-       "Expression 1";
-  */
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Intermediate expression developed based on the work by Wagner and Pruss (1993),
-    which is used in calculating various saturation state properties, including
-    enthalpy and entropy.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end expression1_sat;
-
-  function expression2_sat
-    "This expression is used in the saturated enthalpy and entropy functions
-      above, which was formulated via evaluating the derivative dP/dT"
-    extends Modelica.Icons.Function;
-    input SaturationProperties sat "Saturation property record";
-    output Real r2  "Expression 2";
-  protected
-    Real n[:] = {1,1.5,3,3.5,4,7.5} "Powers in equation (1)";
-    Real a[:] = {-7.85951783,1.84408259,-11.7866497,22.6807411,-15.9618719,
-        1.80122502} "Coefficients in equation (1) of [1]";
-    Real tau = 1 - sat.Tsat/Tcritical "Temperature expression";
-  algorithm
-    r2 := sum(a[i]*n[i]*tau^n[i] for i in 1:6)
-      "Expression 2";
-  annotation (
-    smoothOrder=2,
-    Documentation(info="<html>
-    <p>
-    Intermediate expression developed based on the work by Wagner and Pruss (1993),
-    which is used in calculating various saturation state properties, including
-    enthalpy and entropy.
-    </p>
-    <p>
-    Source: W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-    Ordinary Water Substance. Revised According to the International Temperature Scale
-    of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-    Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-    <a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-    </p>
-  </html>"));
-  end expression2_sat;
-
-annotation (Documentation(info="<html>
-<p>
-The steam model can be utilized for steam systems and components that use the
-vapor phase of water (quality = 1).
-</p>
-<p>
-States are formulated from the NASA Glenn coefficients for ideal gas \"H2O\".
-Independent variables are temperature <i>T</i> and pressure <i>p</i>. Only
-density is a function of <i>T</i> and <i>p</i>. All other quantities are solely a function
-of T.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Modelica/Resources/Images/Media/IdealGases/SingleGases/H2O.png\"
-alt=\"Specific heat of ideal steam\"/>
-</p>
-<h4>
-Limitations
-</h4>
-<ul>
-<li>
-The properties are valid in the range: <i>200 K &le; T &le; 6000 K</i>, with the
-exception of saturated state properties, which are valid in the range:
-<i>273.16 K &le; T &le; 647.096 K</i>
-</li>
-<li>
-When phase change is required, this model is to be used in combination with the
-<a href=\"modelica://Buildings.Media.Water\">Buildings.Media.Water</a> media model for
-incompressible liquid water for the liquid phase (quality = 0).
-</li>
-<li>
-The two-phase region (e.g., mixed liquid and vapor) is not included.
-</li>
-<li>
-This model assumes the pressure, and hence the saturation pressure,
-is constant throughout the simulation.
-This is done to improve simulation performance by decoupling
-the pressure drop and energy balance calculations. Thus, a function for
-calculating saturation pressure is not provided.
-</li>
-</ul>
-<h4>
-References
-</h4>
-<p>
-S. Gordon and B. J. McBride, \"Computer Program for Calculation of Complex
-Chemical Equilibrium Compositions and Applications: I. Analysis,\" NASA Technical
-Reports, NASA-RP-1311, Cleveland, OH, 1994. Available:
-<a href=\"https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19950013764.pdf\">
-https://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19950013764.pdf</a>.
-</p>
-<p>
-W. Wagner and A. Pruss, \"International Equations for the Saturation Properties of
-Ordinary Water Substance. Revised According to the International Temperature Scale
-of 1990. Addendum to J. Phys. Chem. Ref. Data 16, 893 (1987),\" <i>J. Phys. Chem.
-Ref. Data</i>, vol. 22, no. 3, pp. 783-787, 1993. doi:
-<a href=\"https://doi.org/10.1063/1.555926\">10.1063/1.555926</a>.
-=======
 end g2;
 
 function temperature_ph
@@ -1393,24 +795,10 @@ consistent with that forward function.
 <p>
 The largest error of this linearization is  <i>7.70&deg;C</i> (<i>1.86</i>%),
 which occurs at <i>137.4&deg;C</i> and <i>100 kPa</i>.
->>>>>>> master
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
-<<<<<<< HEAD
-March 14, 2020, by Michael Wetter:<br/>
-Revised implementation.
-</li>
-<li>
-March 6, 2020, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"), Icon(graphics={
-      Line(
-        points={{-30,30},{-50,10},{-30,-10},{-50,-30}},
-=======
 April 13, 2021, by Kathryn Hinkelman:<br/>
 Added pressure as a variable.
 </li>
@@ -1464,7 +852,6 @@ end pressure_dT;
   annotation (Icon(graphics={
       Line(
         points={{50,30},{30,10},{50,-10},{30,-30}},
->>>>>>> master
         color={0,0,0},
         smooth=Smooth.Bezier),
       Line(
@@ -1472,11 +859,6 @@ end pressure_dT;
         color={0,0,0},
         smooth=Smooth.Bezier),
       Line(
-<<<<<<< HEAD
-        points={{50,30},{30,10},{50,-10},{30,-30}},
-        color={0,0,0},
-        smooth=Smooth.Bezier)}));
-=======
         points={{-30,30},{-50,10},{-30,-10},{-50,-30}},
         color={0,0,0},
         smooth=Smooth.Bezier)}), Documentation(info="<html>
@@ -1546,5 +928,4 @@ and improve accuracy of property function calculations.
 </li>
 </ul>
 </html>"));
->>>>>>> master
 end Steam;
diff --git a/Buildings/Media/Water.mo b/Buildings/Media/Water.mo
index 0e150bce7f8..2396c40f600 100644
--- a/Buildings/Media/Water.mo
+++ b/Buildings/Media/Water.mo
@@ -1,18 +1,24 @@
 within Buildings.Media;
 package Water "Package with model for liquid water with constant density"
    extends Modelica.Media.Water.ConstantPropertyLiquidWater(
-     final cv_const=cp_const,
      p_default=300000,
      reference_p=300000,
      reference_T=273.15,
      reference_X={1},
      AbsolutePressure(start=p_default),
      Temperature(start=T_default),
-     Density(start=d_const));
+     Density(start=d_const),
+     final cv_const=cp_const);
   // cp_const and cv_const have been made final because the model sets u=h.
   extends Modelica.Icons.Package;
 
-  redeclare model BaseProperties "Base properties"
+  redeclare replaceable model BaseProperties "Base properties (p, d, T, h, u, R, MM and X and Xi) of a medium"
+    parameter Boolean preferredMediumStates=false
+      "= true if StateSelect.prefer shall be used for the independent property variables of the medium"
+      annotation (Evaluate=true, Dialog(tab="Advanced"));
+    final parameter Boolean standardOrderComponents=true
+      "If true, and reducedX = true, the last element of X will be computed from the other ones";
+    Modelica.SIunits.Density d=d_const "Density of medium";
     Temperature T(stateSelect=
       if preferredMediumStates then StateSelect.prefer else StateSelect.default)
       "Temperature of medium";
@@ -22,7 +28,7 @@ package Water "Package with model for liquid water with constant density"
     InputSpecificEnthalpy h "Specific enthalpy of medium";
     Modelica.SIunits.SpecificInternalEnergy u
       "Specific internal energy of medium";
-    Modelica.SIunits.Density d=d_const "Density of medium";
+
     Modelica.SIunits.MassFraction[nX] X={1}
       "Mass fractions (= (component mass)/total mass  m_i/m)";
     final Modelica.SIunits.SpecificHeatCapacity R=0
@@ -31,11 +37,8 @@ package Water "Package with model for liquid water with constant density"
       "Molar mass (of mixture or single fluid)";
     ThermodynamicState state
       "Thermodynamic state record for optional functions";
-    parameter Boolean preferredMediumStates=false
-      "= true if StateSelect.prefer shall be used for the independent property variables of the medium"
-      annotation(Evaluate=true, Dialog(tab="Advanced"));
-    final parameter Boolean standardOrderComponents=true
-      "If true, and reducedX = true, the last element of X will be computed from the other ones";
+
+
     Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC=
         Modelica.SIunits.Conversions.to_degC(T)
       "Temperature of medium in [degC]";
@@ -52,31 +55,21 @@ package Water "Package with model for liquid water with constant density"
       "Mass fraction as input signal connector";
 
   equation
-assert(T >= T_min, "
-  In " + getInstanceName() + ": Temperature T = " + String(T) + " K exceeded its minimum allowed value of " +
-  String(T_min-273.15) + " degC (" + String(T_min) + " Kelvin)
-as required from medium model \"" + mediumName + "\".");
-assert(T <= T_max, "
-  In " + getInstanceName() + ": Temperature T = " + String(T) + " K exceeded its maximum allowed value of " +
-  String(T_max-273.15) + " degC (" + String(T_max) + " Kelvin)
-as required from medium model \"" + mediumName + "\".");
-
     h = cp_const*(T-reference_T);
     u = h;
     state.T = T;
     state.p = p;
+
+    // Assertions to test for bounds
+    assert(noEvent(T >= T_min), "In " + getInstanceName() + ": Temperature T = " + String(T) + " K exceeded its minimum allowed value of " +
+  String(T_min-273.15) + " degC (" + String(T_min) + " Kelvin) as required from medium model \"Buildings.Media.Water\".");
+
+    assert(noEvent(T <= T_max), "In " + getInstanceName() + ": Temperature T = " + String(T) + " K exceeded its maximum allowed value of " +
+  String(T_max-273.15) + " degC (" + String(T_max) + " Kelvin) as required from medium model \"Buildings.Media.Water\".");
+
+    assert(noEvent(p >= 0.0), "Pressure (= " + String(p) + " Pa) of medium \"Buildings.Media.Water\" is negative\n(Temperature = " + String(T) + " K)");
+
     annotation(Documentation(info="<html>
-<<<<<<< HEAD
-    <p>
-    This base properties model is identical to
-    <a href=\"modelica://Modelica.Media.Water.ConstantPropertyLiquidWater\">
-    Modelica.Media.Water.ConstantPropertyLiquidWater</a>,
-    except that the equation
-    <code>u = cv_const*(T - reference_T)</code>
-    has been replaced by <code>u=h</code> because
-    <code>cp_const=cv_const</code>.
-    </p>
-=======
 <p>
 Model with basic thermodynamic properties.
 </p>
@@ -121,7 +114,6 @@ This model provides equation for the following thermodynamic properties:
       <td>kg/mol</td>
       <td>molar mass</td></tr>
 </table>
->>>>>>> master
 </html>"));
   end BaseProperties;
 
@@ -150,7 +142,7 @@ Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir</a>.
 </ul>
 </html>"));
 end enthalpyOfLiquid;
-  annotation(preferredView="info", Documentation(info="<html>
+  annotation(Documentation(info="<html>
 <p>
 This medium package models liquid water.
 </p>
@@ -184,6 +176,12 @@ There are no phase changes.
 </html>", revisions="<html>
 <ul>
 <li>
+September 28, 2020, by Michael Wetter:<br/>
+Reformulated <code>BaseProperties</code> to avoid event-triggering assertions.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1401\">#1401</a>.
+</li>
+<li>
 October 26, 2018, by Filip Jorissen and Michael Wetter:<br/>
 Now printing different messages if temperature is above or below its limit,
 and adding instance name as JModelica does not print the full instance name in the assertion.
diff --git a/Buildings/Media/package.order b/Buildings/Media/package.order
old mode 100755
new mode 100644
diff --git a/Buildings/Controls/OBC/CDL/Continuous/ChangeSign.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/ChangeSign.mo
similarity index 84%
rename from Buildings/Controls/OBC/CDL/Continuous/ChangeSign.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/ChangeSign.mo
index a907fbf8a60..cd17fce6ac2 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/ChangeSign.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/ChangeSign.mo
@@ -1,17 +1,19 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block ChangeSign "Change sign of the input"
+  extends Modelica.Icons.ObsoleteModel;
 
-  Interfaces.RealInput u "Connector of Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
         iconTransformation(extent={{-140,-20},{-100,20}})));
 
-  Interfaces.RealOutput y "Connector of Real output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
   y = -u;
 
 annotation (
+  obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Continuous.Gain with a gain of -1 instead",
   defaultComponentName="chaSig",
   Icon(coordinateSystem(
         preserveAspectRatio=true,
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Derivative.mo
similarity index 84%
rename from Buildings/Controls/OBC/CDL/Continuous/Derivative.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Derivative.mo
index 5c1b062e754..ca3030f4d55 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Derivative.mo
@@ -1,5 +1,7 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block Derivative "Block that approximates the derivative of the input"
+  extends Modelica.Icons.ObsoleteModel;
+
   parameter Real k(unit="1") = 1 "Gains";
   parameter Modelica.SIunits.Time T(min=1E-60)=0.01
     "Time constant (T>0 required)";
@@ -7,9 +9,9 @@ block Derivative "Block that approximates the derivative of the input"
     annotation (Dialog(group="Initialization"));
   parameter Real y_start=0 "Initial value of output (= state)"
     annotation(Dialog(group="Initialization"));
-  Interfaces.RealInput u "Connector of Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y "Connector of Real output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
   output Real x "State of block";
@@ -30,6 +32,7 @@ equation
 
 annotation (
   defaultComponentName="der",
+  obsolete = "This model is obsolete",
   Documentation(info="<html>
 <p>
 This blocks defines the transfer function between the
@@ -47,6 +50,13 @@ If <code>k=0</code>, the block reduces to <code>y=0</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+August 4, 2020, by Jianjun Hu:<br/>
+Moved the block to 
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continous\">Buildings.Obsolete.Controls.OBC.CDL.Continous</a>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\">issue 2056</a>.
+</li>
+<li>
 April 21, 2020, by Michael Wetter:<br/>
 Removed option to not set the initialization method or to set the initial state.
 The new implementation only allows to set the initial output, from which
diff --git a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqual.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/GreaterEqual.mo
similarity index 77%
rename from Buildings/Controls/OBC/CDL/Continuous/GreaterEqual.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/GreaterEqual.mo
index 6337af2f110..3dd5f4e9bef 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqual.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/GreaterEqual.mo
@@ -1,14 +1,15 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block GreaterEqual
   "Output y is true, if input u1 is greater or equal than input u2"
+  extends Modelica.Icons.ObsoleteModel;
 
-  Interfaces.RealInput u1 "Connector of first Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of first Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 
-  Interfaces.RealInput u2 "Connector of second Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of second Real input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
 
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
@@ -16,6 +17,7 @@ equation
 
 annotation (
   defaultComponentName="greEqu",
+  obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Continuous.Greater instead",
   Icon(coordinateSystem(preserveAspectRatio=false,extent={{-100,
             -100},{100,100}}), graphics={
         Rectangle(
@@ -53,6 +55,10 @@ Otherwise the output is <code>false</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+August 6, 2020, by Michael Wetter:<br/>
+Moved block to obsolete package.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
similarity index 77%
rename from Buildings/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
index f69870909cb..83639ea0234 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/GreaterEqualThreshold.mo
@@ -1,13 +1,14 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block GreaterEqualThreshold
   "Output y is true, if input u is greater or equal than threshold"
+  extends Modelica.Icons.ObsoleteModel;
 
-  parameter Real threshold=0 "Comparison with respect to threshold";
+  parameter Real threshold=0 "Threshold for comparison";
 
-  Interfaces.RealInput u "Connector of Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
@@ -15,6 +16,7 @@ equation
 
 annotation (
   defaultComponentName="greEquThr",
+  obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold instead",
   Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
             {100,100}}), graphics={
         Text(
@@ -54,6 +56,10 @@ Otherwise the output is <code>false</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+August 6, 2020, by Michael Wetter:<br/>
+Moved block to obsolete package.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo
similarity index 83%
rename from Buildings/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo
index d265aa200a7..33fb976cda4 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.mo
@@ -1,6 +1,7 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block HysteresisWithHold
   "Hysteresis block that optionally allows to specify a hold time"
+  extends Modelica.Icons.ObsoleteModel;
 
   parameter Real uLow "if y=true and u<uLow, switch to y=false";
   parameter Real uHigh "if y=false and u>uHigh, switch to y=true";
@@ -11,20 +12,20 @@ block HysteresisWithHold
   parameter Modelica.SIunits.Time falseHoldDuration = trueHoldDuration
     "false hold duration";
 
-  Interfaces.RealInput u "Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 
-  Interfaces.BooleanOutput y "Boolean output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 protected
-  Continuous.Hysteresis hysteresis(
+  Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysteresis(
     final uLow=uLow,
     final uHigh=uHigh)
     "Transform Real to Boolean signal with Hysteresis"
     annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
 
-  Logical.TrueFalseHold truFalHol(
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol(
     final trueHoldDuration=trueHoldDuration,
     final falseHoldDuration=falseHoldDuration) "True/false hold"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
@@ -34,11 +35,12 @@ equation
     annotation (Line(points={{-120,0},{-100,0},{-42,0}}, color={0,0,127}));
 
   connect(hysteresis.y, truFalHol.u)
-    annotation (Line(points={{-18,0},{39,0}}, color={255,0,255}));
+    annotation (Line(points={{-18,0},{38,0}}, color={255,0,255}));
   connect(truFalHol.y, y)
-    annotation (Line(points={{61,0},{120,0}}, color={255,0,255}));
+    annotation (Line(points={{62,0},{120,0}}, color={255,0,255}));
 annotation (
   defaultComponentName="hysWitHol",
+  obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Continuous.Hysteresis and Buildings.Controls.OBC.CDL.Logical.TrueFalseHold instead",
   Icon(graphics={
         Rectangle(
           extent={{-100,100},{100,-100}},
@@ -95,7 +97,7 @@ at least <code>falseHoldDuration</code> seconds, after which time it is allowed
 to switch immediately.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Continuous/HysteresisWithHold.png\"
+<img src=\"modelica://Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.png\"
 alt=\"Input and output of the block\"/>
 </p>
 <p>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/LessEqual.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/LessEqual.mo
similarity index 77%
rename from Buildings/Controls/OBC/CDL/Continuous/LessEqual.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/LessEqual.mo
index 92004ee43fc..20ec97be838 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/LessEqual.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/LessEqual.mo
@@ -1,20 +1,22 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block LessEqual
   "Output y is true, if input u1 is less or equal than input u2"
+  extends Modelica.Icons.ObsoleteModel;
 
-  Interfaces.RealInput u1 "Connector of first Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1 "Connector of first Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 
-  Interfaces.RealInput u2 "Connector of second Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2 "Connector of second Real input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
 
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
   y = u1 <= u2;
   annotation (
         defaultComponentName="lesEqu",
+        obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Continuous.Less instead",
         Icon(coordinateSystem(preserveAspectRatio=false,extent={{-100,
             -100},{100,100}}), graphics={
         Rectangle(
@@ -52,6 +54,10 @@ Otherwise the output is <code>false</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+August 6, 2020, by Michael Wetter:<br/>
+Moved block to obsolete package.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo
similarity index 77%
rename from Buildings/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo
index 878a04d4c23..03eade32195 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/LessEqualThreshold.mo
@@ -1,13 +1,14 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block LessEqualThreshold
   "Output y is true, if input u is less or equal than threshold"
+  extends Modelica.Icons.ObsoleteModel;
 
-  parameter Real threshold=0 "Comparison with respect to threshold";
+  parameter Real threshold=0 "Threshold for comparison";
 
-  Interfaces.RealInput u "Connector of Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 
-  Interfaces.BooleanOutput y "Connector of Boolean output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
@@ -15,6 +16,7 @@ equation
 
   annotation (
         defaultComponentName="lesEquThr",
+        obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Continuous.LessThreshold instead",
         Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
             {100,100}}), graphics={
         Rectangle(
@@ -54,6 +56,10 @@ Otherwise the output is <code>false</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+August 6, 2020, by Michael Wetter:<br/>
+Moved block to obsolete package.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 First implementation, based on the implementation of the
 Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/LimPID.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/LimPID.mo
similarity index 71%
rename from Buildings/Controls/OBC/CDL/Continuous/LimPID.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/LimPID.mo
index 884afee8b2f..fd0277e388f 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/LimPID.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/LimPID.mo
@@ -1,64 +1,66 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block LimPID
   "P, PI, PD, and PID controller with limited output, anti-windup compensation and setpoint weighting"
+  extends Modelica.Icons.ObsoleteModel;
+
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=
          Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller";
   parameter Real k(
     min=0) = 1 "Gain of controller";
-  parameter Modelica.SIunits.Time Ti(min=Constants.small) = 0.5
+  parameter Modelica.SIunits.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small) = 0.5
     "Time constant of integrator block"
     annotation (Dialog(enable=
-          controllerType == CDL.Types.SimpleController.PI or
-          controllerType == CDL.Types.SimpleController.PID));
+          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
+          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   parameter Modelica.SIunits.Time Td(
     min=0) = 0.1
     "Time constant of derivative block"
     annotation (Dialog(enable=
-          controllerType == CDL.Types.SimpleController.PD or
-          controllerType == CDL.Types.SimpleController.PID));
-  parameter Real yMax "Upper limit of output";
-  parameter Real yMin=-yMax "Lower limit of output";
+          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
+          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real yMax = 1 "Upper limit of output";
+  parameter Real yMin = 0 "Lower limit of output";
   parameter Real wp(min=0) = 1 "Set-point weight for Proportional block (0..1)";
   parameter Real wd(min=0) = 0 "Set-point weight for Derivative block (0..1)"
-       annotation(Dialog(enable=controllerType==CDL.Types.SimpleController.PD or
-                                controllerType==CDL.Types.SimpleController.PID));
-  parameter Real Ni(min=100*Modelica.Constants.eps) = 0.9
+       annotation(Dialog(enable=controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
+                                controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real Ni(min=100*Buildings.Controls.OBC.CDL.Constants.eps) = 0.9
     "Ni*Ti is time constant of anti-windup compensation"
-     annotation(Dialog(enable=controllerType==CDL.Types.SimpleController.PI or
-                              controllerType==CDL.Types.SimpleController.PID));
-  parameter Real Nd(min=100*Modelica.Constants.eps) = 10
+     annotation(Dialog(enable=controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
+                              controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real Nd(min=100*Buildings.Controls.OBC.CDL.Constants.eps) = 10
     "The higher Nd, the more ideal the derivative block"
-       annotation(Dialog(enable=controllerType==CDL.Types.SimpleController.PD or
-                                controllerType==CDL.Types.SimpleController.PID));
+       annotation(Dialog(enable=controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
+                                controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
 
   parameter Real xi_start=0
     "Initial value of integrator state"
     annotation (Dialog(
       group="Initialization",
       enable=
-       controllerType==CDL.Types.SimpleController.PI or
-       controllerType==CDL.Types.SimpleController.PID));
+       controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
+       controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   parameter Real yd_start=0 "Initial value of derivative output"
   annotation(Dialog(
       group="Initialization",
       enable=
-        controllerType==CDL.Types.SimpleController.PD or
-        controllerType==CDL.Types.SimpleController.PID));
-    parameter Boolean reverseAction = false
-    "Set to true for throttling the water flow rate through a cooling coil controller";
-  parameter Buildings.Controls.OBC.CDL.Types.Reset reset = Buildings.Controls.OBC.CDL.Types.Reset.Disabled
+        controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
+        controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Boolean reverseActing = true
+    "Set to true for reverse acting, or false for direct acting control action";
+  parameter Buildings.Obsolete.Controls.OBC.CDL.Types.Reset reset = Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Disabled
     "Type of controller output reset"
     annotation(Evaluate=true,
       Dialog(
         group="Integrator reset",
-        enable=controllerType==CDL.Types.SimpleController.PI or
-               controllerType==CDL.Types.SimpleController.PID));
+        enable=controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
+               controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
   parameter Real y_reset=xi_start
     "Value to which the controller output is reset if the boolean trigger has a rising edge, used if reset == CDL.Types.Reset.Parameter"
     annotation(Dialog(enable=
-      reset == CDL.Types.Reset.Parameter and
-      (controllerType==CDL.Types.SimpleController.PI or
-      controllerType==CDL.Types.SimpleController.PID), group="Integrator reset"));
+      reset == Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Parameter and
+      (controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
+      controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID), group="Integrator reset"));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealInput u_s
     "Connector of setpoint input signal"
@@ -74,16 +76,18 @@ block LimPID
     annotation (Placement(transformation(extent={{220,-20},{260,20}}),
         iconTransformation(extent={{100,-20},{140,20}})));
 
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput y_reset_in if reset == Buildings.Controls.OBC.CDL.Types.Reset.Input
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput y_reset_in if
+       reset == Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Input
     "Input signal for state to which integrator is reset, enabled if reset = CDL.Types.Reset.Input"
     annotation (Placement(transformation(extent={{-260,-120},{-220,-80}}),
-    visible=reset == Buildings.Controls.OBC.CDL.Types.Reset.Input,
+    visible=reset == Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Input,
       iconTransformation(extent={{-140,-100},{-100,-60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger if reset <> Buildings.Controls.OBC.CDL.Types.Reset.Disabled
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger if
+       reset <> Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Disabled
     "Resets the controller output when trigger becomes true"
     annotation (Placement(transformation(extent={{-20,-20},{20,20}},
         rotation=90, origin={-160,-200}),
-     visible=reset <> Buildings.Controls.OBC.CDL.Types.Reset.Disabled,
+     visible=reset <> Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Disabled,
       iconTransformation(extent={{-20,-20},{20,20}}, rotation=90, origin={-60,-120})));
 
   Buildings.Controls.OBC.CDL.Continuous.Feedback controlError "Control error (set point - measurement)"
@@ -91,16 +95,10 @@ block LimPID
 
   Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset I(
     final k=1/Ti,
-    final y_start=xi_start,
-    final reset=
-      if reset == Buildings.Controls.OBC.CDL.Types.Reset.Disabled then
-        Buildings.Controls.OBC.CDL.Types.Reset.Disabled
-      else
-        Buildings.Controls.OBC.CDL.Types.Reset.Input,
-    final y_reset=y_reset) if with_I "Integral term"
+    final y_start=xi_start) if with_I "Integral term"
     annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.Derivative D(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.Derivative D(
     final k=Td,
     final T=Td/Nd,
     final y_start=yd_start) if
@@ -112,11 +110,11 @@ block LimPID
   Buildings.Controls.OBC.CDL.Continuous.Feedback errD if with_D "D error"
     annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
   Buildings.Controls.OBC.CDL.Continuous.Feedback errI1 if with_I
-    "I error (before anti-windup componensation)"
+    "I error (before anti-windup compensation)"
     annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Feedback errI2 if with_I
-    "I error (after anti-windup componensation)"
+    "I error (after anti-windup compensation)"
     annotation (Placement(transformation(extent={{-82,-10},{-62,10}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Limiter lim(
@@ -125,14 +123,14 @@ block LimPID
     "Limiter"
     annotation (Placement(transformation(extent={{120,80},{140,100}})));
 protected
-  final parameter Real revAct = if reverseAction then -1 else 1
-    "Switch for sign for reverse action";
+  final parameter Real revAct = if reverseActing then 1 else -1
+    "Switch for sign for reverse or direct acting controller";
   final parameter Boolean with_I = controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
-                             controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID
+                                   controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID
     "Boolean flag to enable integral action"
     annotation(Evaluate=true, HideResult=true);
   final parameter Boolean with_D = controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
-                             controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID
+                                   controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID
     "Boolean flag to enable derivative action"
     annotation(Evaluate=true, HideResult=true);
 
@@ -186,26 +184,34 @@ protected
       Placement(transformation(extent={{180,-30},{160,-10}})));
 
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yResSig(final k=y_reset) if
-      reset == Buildings.Controls.OBC.CDL.Types.Reset.Parameter
+      reset == Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Parameter
     "Signal for y_reset"
     annotation (Placement(transformation(extent={{-180,-80},{-160,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.Gain divK(final k=1/k) if
-       reset <> Buildings.Controls.OBC.CDL.Types.Reset.Disabled
+       reset <> Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Disabled
     "Division by k for integrator reset"
     annotation (Placement(transformation(extent={{-120,-80},{-100,-60}})));
   Buildings.Controls.OBC.CDL.Continuous.Feedback addRes if
-      reset <> Buildings.Controls.OBC.CDL.Types.Reset.Disabled
+      reset <> Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Disabled
    "Adder for integrator reset"
     annotation (Placement(transformation(extent={{-80,-80},{-60,-60}})));
 
   Buildings.Controls.OBC.CDL.Logical.Sources.Constant cheYMinMax(
-    final k=yMin < yMax)
-    "Check for values of yMin and yMax"
+    final k=yMin < yMax) "Check for values of yMin and yMax"
     annotation (Placement(transformation(extent={{120,-160},{140,-140}})));
 
-  Buildings.Controls.OBC.CDL.Utilities.Assert assMesYMinMax(message="LimPID: Limits must be yMin < yMax")
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMesYMinMax(
+    message="LimPID: Limits must be yMin < yMax")
     "Assertion on yMin and yMax"
     annotation (Placement(transformation(extent={{160,-160},{180,-140}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant noTri(final k=false) if
+       reset == Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Disabled
+    "No trigger when reset is disabled"
+    annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer(final k=0) if
+    reset == Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Disabled
+    "Reset input to integrator when the reset is disabled"
+    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
 
 equation
   connect(trigger, I.trigger)
@@ -285,7 +291,12 @@ equation
           {0,-160},{0,-220}},                       color={0,0,127}));
   connect(cheYMinMax.y, assMesYMinMax.u)
     annotation (Line(points={{142,-150},{158,-150}}, color={255,0,255}));
-annotation (defaultComponentName="conPID",
+  connect(noTri.y, I.trigger) annotation (Line(points={{-98,-120},{-30,-120},{-30,
+          -12}}, color={255,0,255}));
+  connect(zer.y, I.y_reset_in) annotation (Line(points={{-78,-40},{-52,-40},{-52,
+          -8},{-42,-8}}, color={0,0,127}));
+ annotation (defaultComponentName="conPID",
+  obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Continuous.PID instead",
   Icon(
     coordinateSystem(extent={{-100,-100},{100,100}}),
       graphics={
@@ -383,88 +394,99 @@ while the units of <i>T<sub>i</sub></i> and <i>T<sub>d</sub></i> are seconds.
 <p>
 For detailed treatment of integrator anti-windup, set-point weights and output limitation, see
 <a href=\"modelica://Modelica.Blocks.Continuous.LimPID\">Modelica.Blocks.Continuous.LimPID</a>.
-The model is similar to
-<a href=\"modelica://Modelica.Blocks.Continuous.LimPID\">Modelica.Blocks.Continuous.LimPID</a>,
-except for the following changes:
 </p>
-<ol>
-<li>
+<h4>Options</h4>
+This controller can be configured as follows.
+<h5>P, PI, PD, or PID action</h5>
 <p>
-It can be configured to have a reverse action.
+Through the parameter <code>controllerType</code>, the controller can be configured
+as P, PI, PD or PID controller. The default configuration is PI.
 </p>
-<p>If the parameter <code>reverseAction=false</code> (the default), then
-<code>u_m &lt; u_s</code> increases the controller output,
-otherwise the controller output is decreased. Thus,
+<h5>Direct or reverse acting</h5>
+<p>
+Through the parameter <code>reverseActing</code>, the controller can be configured to
+be reverse or direct acting.
+The above standard form is reverse acting, which is the default configuration.
+For a reverse acting controller, for a constant set point,
+an increase in measurement signal <code>u_m</code> decreases the control output signal <code>y</code>
+(Montgomery and McDowall, 2008).
+Thus,
 </p>
 <ul>
-  <li>for a heating coil with a two-way valve, set <code>reverseAction = false</code>, </li>
-  <li>for a cooling coils with a two-way valve, set <code>reverseAction = true</code>. </li>
+  <li>
+  for a heating coil with a two-way valve, leave <code>reverseActing = true</code>, but
+  </li>
+  <li>
+  for a cooling coil with a two-way valve, set <code>reverseActing = false</code>.
+  </li>
 </ul>
-</li>
-<li>
+<h5>Reset of the controller output</h5>
 <p>
-It can be configured to enable an input port that allows resetting the controller
+The controller can be configured to enable an input port that allows resetting the controller
 output. The controller output can be reset as follows:
 </p>
 <ul>
   <li>
-  If <code>reset = CDL.Types.Reset.Disabled</code>, which is the default,
+  If <code>reset = Buildings.Types.Reset.Disabled</code>, which is the default,
   then the controller output is never reset.
   </li>
   <li>
-  If <code>reset = CDL.Types.Reset.Parameter</code>, then a boolean
+  If <code>reset = Buildings.Types.Reset.Parameter</code>, then a boolean
   input signal <code>trigger</code> is enabled. Whenever the value of
   this input changes from <code>false</code> to <code>true</code>,
   the controller output is reset by setting <code>y</code>
   to the value of the parameter <code>y_reset</code>.
   </li>
   <li>
-  If <code>reset = CDL.Types.Reset.Input</code>, then a boolean
-  input signal <code>trigger</code> is enabled. Whenever the value of
-  this input changes from <code>false</code> to <code>true</code>,
-  the controller output is reset by setting <code>y</code>
-  to the value of the input signal <code>y_reset_in</code>.
+  If <code>reset = Buildings.Types.Reset.Input</code>, then a boolean
+  input signal <code>trigger</code> and a real input signal <code>y_reset_in</code>
+  are enabled. Whenever the value of
+  <code>trigger</code> changes from <code>false</code> to <code>true</code>,
+  the controller output is reset by setting the value of <code>y</code>
+  to <code>y_reset_in</code>.
   </li>
 </ul>
 <p>
 Note that this controller implements an integrator anti-windup. Therefore,
 for most applications, keeping the default setting of
-<code>reset = CDL.Types.Reset.Disabled</code> suffices.
-However, better control performance is typically achieved if the output of the
-controller is reset when a control loop is activated.
-Examples where it may be beneficial to reset the controller output are situations
+<code>reset = Buildings.Types.Reset.Disabled</code> is sufficient.
+However, if the controller is used in conjuction with equipment that is being
+switched on, better control performance may be achieved by resetting the controller
+output when the equipment is switched on.
+This is in particular the case in situations
 where the equipment control input should continuously increase as the equipment is
-switched on, such as as a light dimmer that may slowly increase the luminance, or
-a variable speed drive of a motor that should continuously increase the speed,
-or a mixing valve that should slowly open.
+switched on, such as a light dimmer that may slowly increase the luminance, or
+a variable speed drive of a motor that should continuously increase the speed.
 </p>
-</li>
+<h4>References</h4>
+<p>
+R. Montgomery and R. McDowall (2008).
+\"Fundamentals of HVAC Control Systems.\"
+American Society of Heating Refrigerating and Air-Conditioning Engineers Inc. Atlanta, GA.
+</p>
+
+</html>",
+revisions="<html>
+<ul>
 <li>
-There is no optional input for a feedforward compensation.
+August 4, 2020, by Jianjun Hu:<br/>
+Moved the block to
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continous\">Buildings.Obsolete.Controls.OBC.CDL.Continous</a>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\">issue 2056</a>.
 </li>
 <li>
-The parameter <code>limitsAtInit</code> has been removed.
+June 1, 2020, by Michael Wetter:<br/>
+Corrected wrong convention of reverse and direct action.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">issue 1365</a>.
 </li>
 <li>
-Homotopy initialization is not implemented.
+April 23, 2020, by Michael Wetter:<br/>
+Changed default parameters for limits <code>yMax</code> from unspecified to <code>1</code>
+and <code>yMin</code> from <code>-yMax</code> to <code>0</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1888\">issue 1888</a>.
 </li>
-</ol>
-<p>
-During initialization, the state, and hence the output, of the integrator is set to the
-parameter <code>xi_start</code>,
-and the output of the derivative action is set to the parameter
-<code>yd_start</code>.
-Note that both will be multiplied by the gain <code>k</code> before the values
-are sent to the output limiter and then the controller output.
-</p>
-<p>
-For recommendations regarding tuning of closed loop control, see
-<a href=\"modelica://Modelica.Blocks.Continuous.LimPID\">Modelica.Blocks.Continuous.LimPID</a>
-or the control literature.
-</p>
-</html>",
-revisions="<html>
-<ul>
 <li>
 April 7, 2020, by Michael Wetter:<br/>
 Reimplemented block using only CDL constructs.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/NumberOfRequests.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/NumberOfRequests.mo
similarity index 73%
rename from Buildings/Controls/OBC/CDL/Continuous/NumberOfRequests.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/NumberOfRequests.mo
index 24c9db60dbf..e52bc9554ee 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/NumberOfRequests.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/NumberOfRequests.mo
@@ -1,42 +1,44 @@
-within Buildings.Controls.OBC.CDL.Continuous;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
 block NumberOfRequests
   "Outputs the number of signals that are above/below a certain threshold"
+  extends Modelica.Icons.ObsoleteModel;
 
   parameter Integer nin "Number of inputs";
-  parameter Real threShold = 0 "Threshold";
+  parameter Real t=0 "Threshold";
   parameter Integer kind
     "Set to 0 for u>threShold, to 1 for >=, to 2 for <= or to 3 for <";
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Number of input signals that violate the threshold"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-  Interfaces.RealInput u[nin] "Input signals"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin] "Input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 algorithm
   y := 0;
   for i in 1:nin loop
     if kind == 0 then
-      if u[i] > threShold then
+      if u[i] > t then
         y := y+1;
       end if;
     end if;
     if kind == 1 then
-      if u[i] >= threShold then
+      if u[i] >= t then
         y := y+1;
       end if;
     end if;
     if kind == 2 then
-      if u[i] <= threShold then
+      if u[i] <= t then
         y := y+1;
       end if;
     end if;
     if kind == 3 then
-      if u[i] < threShold then
+      if u[i] < t then
         y := y+1;
       end if;
     end if;
   end for;
   annotation (
 defaultComponentName="numReq",
+obsolete = "Obsolete model, this will be removed in future versions.",
 Documentation(info="<html>
 <p>
 Block that outputs the number of inputs that exceed a threshold.
@@ -50,15 +52,15 @@ inequality. The table below shows the allowed settings.
 </tr>
 <tr>
 <td>0</td>
-<td><code>u[i] &gt; threShold</code></td>
+<td><code>u[i] &gt; t</code></td>
 </tr>
 <tr>
 <td>1</td>
-<td><code>u[i] &ge; threShold</code></td>
+<td><code>u[i] &ge; t</code></td>
 </tr>
 <tr>
 <td>2</td>
-<td><code>u[i] &le; threShold</code></td>
+<td><code>u[i] &le; t</code></td>
 </tr>
 <tr>
 <td>3</td>
@@ -73,6 +75,17 @@ exceed a temperature threshold.
 revisions="<html>
 <ul>
 <li>
+September 8, 2020, by Michael Wetter:<br/>
+Moved the block to the obsolete package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2124\">issue 2124</a>.
+</li>
+<li>
+August 6, 2020, by Michael Wetter:<br/>
+Renamed <code>threshold</code> to <code>t</code>.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">issue 2076</a>.
+</li>
+<li>
 January 10, 2017, by Milica Grahovac:<br/>
 Initial CDL implementation.
 </li>
@@ -94,7 +107,7 @@ First implementation.
         Text(
           extent={{-128,88},{-6,28}},
           lineColor={0,0,255},
-          textString="%threShold"),
+          textString="%t"),
         Line(points={{-62,-6},{-4,24}}, color={0,0,255}),
         Line(points={{-4,24},{64,60}}, color={255,0,0}),
         Line(
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mo
similarity index 79%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mo
index bca5e74ce87..afecd08bc63 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mo
@@ -1,6 +1,6 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model ChangeSign "Validation model for the ChangeSign block"
-  Buildings.Controls.OBC.CDL.Continuous.ChangeSign changSign
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.ChangeSign changSign
     "Block that change sign of the input"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
@@ -13,13 +13,13 @@ equation
     annotation (Line(points={{-39,0},{-12,0}},         color={0,0,127}));
   annotation (
 experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.ChangeSign\">
-Buildings.Controls.OBC.CDL.Continuous.ChangeSign</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.ChangeSign\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.ChangeSign</a>.
 </p>
 <p>
 The input <code>u</code> varies from <i>-1.5</i> to <i>+1.5</i>.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/Derivative.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/Derivative.mo
similarity index 79%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/Derivative.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/Derivative.mo
index 864cb3d11cb..9c7dce5c18a 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/Derivative.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/Derivative.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model Derivative "Validation model for the Derivative block"
   Buildings.Controls.OBC.CDL.Continuous.Cos cos1
     "Block that outputs the cosine of the input"
@@ -9,8 +9,8 @@ model Derivative "Validation model for the Derivative block"
     height=6.283*5) "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.Derivative der1(
-    y_start=-10)
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.Derivative der1(
+    y_start=-10) "Approximate the derivative of the input"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
 
 equation
@@ -20,13 +20,13 @@ equation
     annotation (Line(points={{12,0},{38,0}},        color={0,0,127}));
   annotation (
   experiment(StopTime=2.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Derivative.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/Derivative.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Derivative\">
-Buildings.Controls.OBC.CDL.Continuous.Derivative</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.Derivative\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.Derivative</a>.
 </p>
 <p>
 The input <code>u</code> varies from <i>0.0</i> to <i>+5*6.283</i>.
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mo
similarity index 72%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mo
index 351e1ef6ee7..90afc028bf5 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model GreaterEqual "Validation model for the GreaterEqual block"
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
     duration=1,
@@ -11,23 +11,24 @@ model GreaterEqual "Validation model for the GreaterEqual block"
     height=2) "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-26,-30},{-6,-10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqual greEqu
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.GreaterEqual greEqu
+    "Check if the first input is greater than or equal to the second input"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
 
 equation
   connect(ramp1.y, greEqu.u1)
-    annotation (Line(points={{-5,22},{8,22},{8,2},{24,2}}, color={0,0,127}));
-  connect(ramp2.y, greEqu.u2) annotation (Line(points={{-5,-20},{10,-20},{10,-6},
+    annotation (Line(points={{-4,22},{8,22},{8,2},{24,2}}, color={0,0,127}));
+  connect(ramp2.y, greEqu.u2) annotation (Line(points={{-4,-20},{10,-20},{10,-6},
           {24,-6}}, color={0,0,127}));
   annotation (
   experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.GreaterEqual\">
-Buildings.Controls.OBC.CDL.Continuous.GreaterEqual</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.GreaterEqual\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.GreaterEqual</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mo
similarity index 69%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mo
index 2bdf8fb751e..ac9ea0aa43a 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model GreaterEqualThreshold  "Validation model for the GreaterEqualThreshold block"
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2(
     duration=1,
@@ -6,21 +6,22 @@ model GreaterEqualThreshold  "Validation model for the GreaterEqualThreshold blo
     height=2) "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-26,-8},{-6,12}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr
+    "Check if the input is greater than or equal to the threshold"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
 
 equation
   connect(ramp2.y, greEquThr.u)
-    annotation (Line(points={{-5,2},{8,2},{24,2}}, color={0,0,127}));
+    annotation (Line(points={{-4,2},{-4,2},{24,2}},color={0,0,127}));
   annotation (
   experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold\">
-Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.GreaterEqualThreshold\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.GreaterEqualThreshold</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo
similarity index 82%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo
index 1bc18342868..32ebf216a01 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mo
@@ -1,30 +1,30 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model HysteresisWithHold "Validation model for the HysteresisWithHold block"
   Modelica.Blocks.Sources.Sine pulse1(
     amplitude = 0.2,
-    freqHz =    1/360)
+    freqHz =    1/360) "Generate sine wave signal"
     annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
-  Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold noHold(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.HysteresisWithHold noHold(
     trueHoldDuration =  0,
     falseHoldDuration = 0,
     uLow =      0.05,
     uHigh =     0.15) "No true/false hold"
     annotation (Placement(transformation(extent={{20,50},{40,70}})));
-  Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold onHold_30s(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.HysteresisWithHold onHold_30s(
     trueHoldDuration =  30,
     falseHoldDuration = 30,
     uLow =      0.05,
     uHigh =     0.15)
     "On/off signal are hold for short period"
     annotation (Placement(transformation(extent={{20,10},{40,30}})));
-  Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold offHold_300s(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.HysteresisWithHold offHold_300s(
     trueHoldDuration =  30,
     falseHoldDuration = 300,
     uLow =      0.05,
     uHigh =     0.15)
     "Off signal being hold even when it should be on"
     annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
-  Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold onHold_150s(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.HysteresisWithHold onHold_150s(
     trueHoldDuration =  150,
     falseHoldDuration = 30,
     uLow =      0.05,
@@ -43,13 +43,13 @@ equation
     annotation (Line(points={{-19,0},{0,0},{0,20},{18,20}}, color={0,0,127}));
   annotation (
   experiment(StopTime=1800,  Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos"
         "Simulate and plot"),
   Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold\">
-Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.HysteresisWithHold\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.HysteresisWithHold</a>.
 </p>
 <p>
 The hold durations are configured as follows:
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/LessEqual.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqual.mo
similarity index 72%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/LessEqual.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqual.mo
index ba466564859..f68789aacbd 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/LessEqual.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqual.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model LessEqual "Validation model for the LessEqual block"
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
     duration=1,
@@ -11,23 +11,24 @@ model LessEqual "Validation model for the LessEqual block"
     height=2) "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-26,-30},{-6,-10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LessEqual lesEqu
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LessEqual lesEqu
+    "Check if the first input is less than or equal to the second input"
     annotation (Placement(transformation(extent={{26,-8},{46,12}})));
 
 equation
   connect(ramp1.y, lesEqu.u1)
-    annotation (Line(points={{-5,22},{8,22},{8,2},{24,2}}, color={0,0,127}));
-  connect(ramp2.y, lesEqu.u2) annotation (Line(points={{-5,-20},{10,-20},{10,-6},
+    annotation (Line(points={{-4,22},{8,22},{8,2},{24,2}}, color={0,0,127}));
+  connect(ramp2.y, lesEqu.u2) annotation (Line(points={{-4,-20},{10,-20},{10,-6},
           {24,-6}}, color={0,0,127}));
   annotation (
   experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LessEqual\">
-Buildings.Controls.OBC.CDL.Continuous.LessEqual</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.LessEqual\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.LessEqual</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mo
similarity index 69%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mo
index e6ccd7d0d5e..64a84be9bc0 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model LessEqualThreshold  "Validation model for the LessEqualThreshold block"
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
     duration=1,
@@ -6,21 +6,23 @@ model LessEqualThreshold  "Validation model for the LessEqualThreshold block"
     height=4)  "Block that generates ramp signal"
     annotation (Placement(transformation(extent={{-36,-10},{-16,10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold lesEquThr
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LessEqualThreshold lesEquThr
+    "Check if the input is less than or equal to the threshold"
     annotation (Placement(transformation(extent={{16,-10},{36,10}})));
 
 equation
   connect(ramp1.y, lesEquThr.u)
-    annotation (Line(points={{-15,0},{0,0},{14,0}}, color={0,0,127}));
-  annotation (
+    annotation (Line(points={{-14,0},{-14,0},{14,0}}, color={0,0,127}));
+
+annotation (
   experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold\">
-Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.LessEqualThreshold\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.LessEqualThreshold</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPID.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPID.mo
similarity index 84%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/LimPID.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPID.mo
index 1afe40355b8..4b68cad24c3 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPID.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPID.mo
@@ -1,53 +1,55 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model LimPID "Test model for LimPID controller"
   Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse pulse(period=0.25)
+    "Setpoint"
     annotation (Placement(transformation(extent={{-90,14},{-70,34}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPID(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
     Ti=1,
     Td=1,
-    yMax=1,
-    yMin=-1)
+    yMin=-1) "PID controller"
           annotation (Placement(transformation(extent={{-30,40},{-10,60}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPIDOri(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPIDOri(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
     Ti=1,
     Td=1,
-    yMax=1,
-    yMin=-1)
+    yMin=-1) "PID controller"
           annotation (Placement(transformation(extent={{-30,74},{-10,94}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(k=0.5)
+    "Measurement data"
     annotation (Placement(transformation(extent={{-90,-22},{-70,-2}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPI(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPI(
     Ti=1,
     Td=1,
-    yMax=1,
     yMin=-1,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI)
+    "PI controller"
     annotation (Placement(transformation(extent={{-30,2},{-10,22}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPD(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPD(
     Ti=1,
     Td=1,
-    yMax=1,
     yMin=-1,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PD)
+    "PD controller"
     annotation (Placement(transformation(extent={{-30,-30},{-10,-10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limP(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limP(
     Ti=1,
     Td=1,
-    yMax=1,
     yMin=-1,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P)
+    "P controller"
     annotation (Placement(transformation(extent={{-30,-60},{-10,-40}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID noLimPID(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID noLimPID(
     Ti=1,
     Td=1,
     yMax=1e15,
+    yMin=-1e15,
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID)
+    "PID controller with no output limit"
     annotation (Placement(transformation(extent={{-30,-90},{-10,-70}})));
 
 equation
@@ -89,13 +91,13 @@ equation
                            color={0,0,127}));
  annotation (
  experiment(StopTime=1.0, Tolerance=1e-06),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPID.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPID.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID</a>.
 </p>
 <p>
 The model <code>limPIDOri</code> is the original
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mo
similarity index 81%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mo
index d3c974b59ef..ac704e30440 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mo
@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model LimPIDInitialDerivativeOutput
   "Test model for LimPID controller with initial output specified"
 
@@ -9,19 +9,15 @@ model LimPIDInitialDerivativeOutput
     "Measured value"
     annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPID(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
     k=3,
-    yMax=1,
-    yMin=0,
     yd_start=0.2)
             "PID controller"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPD(
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPD(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PD,
     k=3,
-    yMax=1,
-    yMin=0,
     yd_start=0.2) "PD controller"
     annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
 
@@ -38,20 +34,20 @@ equation
  experiment(
       StopTime=0.2,
       Tolerance=1e-06),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID</a>.
 </p>
 <p>
 This model validates setting the initial output of the controller to a specified value.
 Note that the control error must be zero for the initial output to be at the specified value.
 See the description of
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.LimPID\">
-Buildings.Controls.OBC.CDL.Continuous.LimPID</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
new file mode 100644
index 00000000000..d808181f169
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mo
@@ -0,0 +1,78 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
+model LimPIDInitialState
+  "Test model for LimPID controller with initial state specified"
+
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant ySet(k=0.75)
+    "Set point"
+    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yMea(k=0.5)
+    "Measured value"
+    annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
+
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPID(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
+    k=3,
+    xi_start=0.25) "PID controller"
+    annotation (Placement(transformation(extent={{20,20},{40,40}})));
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPI(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    k=3,
+    xi_start=0.25) "PI controller"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+
+equation
+  connect(ySet.y, limPID.u_s) annotation (Line(points={{-18,40},{0,40},{0,30},{18,
+          30}}, color={0,0,127}));
+  connect(ySet.y, limPI.u_s) annotation (Line(points={{-18,40},{0,40},{0,-30},{18,
+          -30}}, color={0,0,127}));
+  connect(yMea.y, limPID.u_m)
+    annotation (Line(points={{-18,10},{30,10},{30,18}}, color={0,0,127}));
+  connect(yMea.y, limPI.u_m) annotation (Line(points={{-18,10},{-4,10},{-4,-50},
+          {30,-50},{30,-42}}, color={0,0,127}));
+ annotation (
+ experiment(
+      StopTime=1,
+      Tolerance=1e-06),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+Validation test for the block
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID</a>.
+</p>
+<p>
+This model validates setting the initial state of the controller to a specified value.
+</p>
+<p>
+The model sets the initial values <code>xi_start=0.25</code>
+of the integrator for both instances of the controller.
+For the instance <code>limPID</code>, it also sets the initial value of the state of the
+derivative block <code>xd_start=-0.5</code>.
+The derivative block obtains as an input signal the value
+<i>u=-0.5</i> because the set point weight for the derivative action is <code>wd=0</code>.
+Therefore, an initial state of <i>x(t<sub>0</sub>)=-0.5</i> causes the state of the derivative
+block to be at steady-state, because
+<i>dx(t)/dt = (u - x)/T</i>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 8, 2020, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+         graphics={
+        Ellipse(lineColor = {75,138,73},
+                fillColor={255,255,255},
+                fillPattern = FillPattern.Solid,
+                extent = {{-100,-100},{100,100}}),
+        Polygon(lineColor = {0,0,255},
+                fillColor = {75,138,73},
+                pattern = LinePattern.None,
+                fillPattern = FillPattern.Solid,
+                points = {{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(coordinateSystem(extent={{-100,-100},{100,100}})));
+end LimPIDInitialState;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
new file mode 100644
index 00000000000..d933ab232d3
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mo
@@ -0,0 +1,163 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
+model LimPIDWithReset
+  "Test model for LimPID controller with reset trigger"
+
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal setPoi "Set point"
+    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.ModelTime modTim "Model time"
+    annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr(
+      threshold=1) "Outputs true after t=1"
+    annotation (Placement(transformation(extent={{-52,-70},{-32,-50}})));
+
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPIDPar(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
+    k=1,
+    Ti=1,
+    Td=1,
+    yMin=-1,
+    reset=Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Parameter,
+    y_reset=0.5) "Controller, reset to parameter value"
+    annotation (Placement(transformation(extent={{20,60},{40,80}})));
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes1
+    "Integrator whose output should be brought to the set point"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPIDInp(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PID,
+    k=1,
+    Ti=1,
+    Td=1,
+    yMin=-1,
+    reset=Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Input,
+    y_reset=0.5) "Controller, reset to input value"
+    annotation (Placement(transformation(extent={{20,20},{40,40}})));
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes2
+    "Integrator whose output should be brought to the set point"
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant resVal(k=0.75)
+    "Reset value"
+    annotation (Placement(transformation(extent={{-40,12},{-20,32}})));
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPIPar(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    k=1,
+    Ti=1,
+    Td=1,
+    yMin=-1,
+    reset=Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Parameter,
+    y_reset=0.5) "Controller, reset to parameter value"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes3
+    "Integrator whose output should be brought to the set point"
+    annotation (Placement(transformation(extent={{60,-40},{80,-20}})));
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID limPIInp(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    k=1,
+    Ti=1,
+    Td=1,
+    yMin=-1,
+    reset=Buildings.Obsolete.Controls.OBC.CDL.Types.Reset.Input,
+    y_reset=0.5) "Controller, reset to input value"
+    annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
+  Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset intWitRes4
+    "Integrator whose output should be brought to the set point"
+    annotation (Placement(transformation(extent={{60,-80},{80,-60}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer(final k=0)
+    "Reset input to integrator when the reset is disabled"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant noTri(final k=false)
+    "No trigger when reset is disabled"
+    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
+
+equation
+  connect(limPIDPar.u_s, setPoi.y) annotation (Line(points={{18,70},{6,70},{6,-40},
+          {2,-40}}, color={0,0,127}));
+  connect(intWitRes1.u, limPIDPar.y)
+    annotation (Line(points={{58,70},{42,70}}, color={0,0,127}));
+  connect(intWitRes1.y, limPIDPar.u_m) annotation (Line(points={{82,70},{90,70},
+          {90,54},{30,54},{30,58}}, color={0,0,127}));
+  connect(modTim.y, greEquThr.u)
+    annotation (Line(points={{-68,-60},{-54,-60}},   color={0,0,127}));
+  connect(greEquThr.y, setPoi.u) annotation (Line(points={{-30,-60},{-26,-60},{-26,
+          -40},{-22,-40}}, color={255,0,255}));
+  connect(greEquThr.y, limPIDPar.trigger) annotation (Line(points={{-30,-60},{8,
+          -60},{8,54},{24,54},{24,58}},  color={255,0,255}));
+  connect(intWitRes2.u, limPIDInp.y)
+    annotation (Line(points={{58,30},{42,30}}, color={0,0,127}));
+  connect(intWitRes2.y, limPIDInp.u_m) annotation (Line(points={{82,30},{90,30},
+          {90,10},{30,10},{30,18}}, color={0,0,127}));
+  connect(limPIDInp.u_s, setPoi.y) annotation (Line(points={{18,30},{6,30},{6,-40},
+          {2,-40}},  color={0,0,127}));
+  connect(limPIDInp.y_reset_in, resVal.y)
+    annotation (Line(points={{18,22},{-18,22}}, color={0,0,127}));
+  connect(limPIPar.u_s, setPoi.y) annotation (Line(points={{18,-30},{12,-30},{12,
+          -40},{2,-40}}, color={0,0,127}));
+  connect(intWitRes3.u, limPIPar.y)
+    annotation (Line(points={{58,-30},{42,-30}}, color={0,0,127}));
+  connect(intWitRes3.y, limPIPar.u_m) annotation (Line(points={{82,-30},{90,-30},
+          {90,-50},{30,-50},{30,-42}}, color={0,0,127}));
+  connect(greEquThr.y, limPIPar.trigger) annotation (Line(points={{-30,-60},{8,-60},
+          {8,-48},{24,-48},{24,-42}}, color={255,0,255}));
+  connect(intWitRes4.u, limPIInp.y)
+    annotation (Line(points={{58,-70},{42,-70}}, color={0,0,127}));
+  connect(intWitRes4.y, limPIInp.u_m) annotation (Line(points={{82,-70},{90,-70},
+          {90,-90},{30,-90},{30,-82}}, color={0,0,127}));
+  connect(limPIInp.u_s, setPoi.y) annotation (Line(points={{18,-70},{6,-70},{6,-40},
+          {2,-40}},  color={0,0,127}));
+  connect(limPIInp.y_reset_in, resVal.y) annotation (Line(points={{18,-78},{14,
+          -78},{14,22},{-18,22}}, color={0,0,127}));
+  connect(greEquThr.y, limPIInp.trigger) annotation (Line(points={{-30,-60},{8,-60},
+          {8,-90},{24,-90},{24,-82}}, color={255,0,255}));
+  connect(limPIDInp.trigger, greEquThr.y) annotation (Line(points={{24,18},{24,10},
+          {8,10},{8,-60},{-30,-60}}, color={255,0,255}));
+  connect(zer.y, intWitRes1.y_reset_in) annotation (Line(points={{-38,50},{50,50},
+          {50,62},{58,62}}, color={0,0,127}));
+  connect(zer.y, intWitRes2.y_reset_in) annotation (Line(points={{-38,50},{50,50},
+          {50,22},{58,22}}, color={0,0,127}));
+  connect(zer.y, intWitRes3.y_reset_in) annotation (Line(points={{-38,50},{50,50},
+          {50,-38},{58,-38}}, color={0,0,127}));
+  connect(zer.y, intWitRes4.y_reset_in) annotation (Line(points={{-38,50},{50,50},
+          {50,-78},{58,-78}}, color={0,0,127}));
+  connect(noTri.y, intWitRes1.trigger) annotation (Line(points={{-38,-10},{54,-10},
+          {54,50},{70,50},{70,58}}, color={255,0,255}));
+  connect(noTri.y, intWitRes2.trigger)
+    annotation (Line(points={{-38,-10},{70,-10},{70,18}}, color={255,0,255}));
+  connect(noTri.y, intWitRes3.trigger) annotation (Line(points={{-38,-10},{54,-10},
+          {54,-46},{70,-46},{70,-42}}, color={255,0,255}));
+  connect(noTri.y, intWitRes4.trigger) annotation (Line(points={{-38,-10},{54,-10},
+          {54,-86},{70,-86},{70,-82}}, color={255,0,255}));
+ annotation (
+ experiment(
+      StopTime=10,
+      Tolerance=1e-06),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+Validation test for the block
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.LimPID</a>.
+</p>
+<p>
+This model validates the controller for different settings of the control output reset.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 7, 2020, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}}),
+         graphics={
+        Ellipse(lineColor = {75,138,73},
+                fillColor={255,255,255},
+                fillPattern = FillPattern.Solid,
+                extent = {{-100,-100},{100,100}}),
+        Polygon(lineColor = {0,0,255},
+                fillColor = {75,138,73},
+                pattern = LinePattern.None,
+                fillPattern = FillPattern.Solid,
+                points = {{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(coordinateSystem(extent={{-100,-100},{100,100}})));
+end LimPIDWithReset;
diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mo
similarity index 84%
rename from Buildings/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mo
index 268f04515ca..59025fb7b05 100644
--- a/Buildings/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mo
@@ -1,9 +1,9 @@
-within Buildings.Controls.OBC.CDL.Continuous.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation;
 model NumberOfRequests  "Validation model for the NumberOfRequests block"
-  Buildings.Controls.OBC.CDL.Continuous.NumberOfRequests numReq1(
-    nin = 5,
-    threShold = 1.0,
-    kind = 0)
+  Buildings.Obsolete.Controls.OBC.CDL.Continuous.NumberOfRequests numReq1(
+    nin=5,
+    t=1.0,
+    kind=0)
     "Block that outputs the number of signals that are above/below a certain threshold"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
@@ -47,13 +47,13 @@ equation
           1.6},{-12,1.6}}, color={0,0,127}));
   annotation (
 experiment(StopTime=1.0, Tolerance=1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.NumberOfRequests\">
-Buildings.Controls.OBC.CDL.Continuous.NumberOfRequests</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous.NumberOfRequests\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous.NumberOfRequests</a>.
 </p>
 <p>
 The input <code>u1</code> varies from <i>-2</i> to <i>+2</i>, input <code>u2</code> varies from <i>-1</i> to <i>+2</i>,
@@ -63,6 +63,12 @@ input <code>u5</code> varies from <i>0</i> to <i>+4</i>,
 </html>", revisions="<html>
 <ul>
 <li>
+September 8, 2020, by Michael Wetter:<br/>
+Moved the example to the obsolete package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2124\">issue 2124</a>.
+</li>
+<li>
 September 26, 2017, by Thierry S. Nouidui:<br/>
 Revised implementation for JModelica verification.
 This is for
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.mo
new file mode 100644
index 00000000000..c5184ddbe2a
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.mo
@@ -0,0 +1,20 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Continuous;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Continuous\">
+Buildings.Obsolete.Controls.OBC.CDL.Continuous</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order
new file mode 100644
index 00000000000..6e530fc61f7
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/Validation/package.order
@@ -0,0 +1,12 @@
+ChangeSign
+Derivative
+GreaterEqual
+GreaterEqualThreshold
+HysteresisWithHold
+LessEqual
+LessEqualThreshold
+LimPID
+LimPIDInitialDerivativeOutput
+LimPIDInitialState
+LimPIDWithReset
+NumberOfRequests
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.mo
new file mode 100644
index 00000000000..db0bf7e416b
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.mo
@@ -0,0 +1,13 @@
+within Buildings.Obsolete.Controls.OBC.CDL;
+package Continuous "Package with obsolete models of the Control Description Language"
+  extends Modelica.Icons.Package;
+annotation (preferredView="info",
+Documentation(info="<html>
+<p>
+Package that contains obsolete components that were part of the
+OpenBuildingControl (OBC) package
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous\">
+Buildings.Controls.OBC.CDL.Continuous</a>.
+</p>
+</html>"));
+end Continuous;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order
new file mode 100644
index 00000000000..9e07f167497
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Continuous/package.order
@@ -0,0 +1,10 @@
+ChangeSign
+Derivative
+GreaterEqual
+GreaterEqualThreshold
+HysteresisWithHold
+LessEqual
+LessEqualThreshold
+LimPID
+NumberOfRequests
+Validation
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/Timer.mo b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Timer.mo
new file mode 100644
index 00000000000..319c444ec8d
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Timer.mo
@@ -0,0 +1,154 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Logical;
+block Timer
+  "Timer measuring the time from the time instant where the Boolean input became true"
+  extends Modelica.Icons.ObsoleteModel;
+
+  parameter Boolean accumulate = false
+    "If true, accumulate time until Boolean input 'reset' becomes true, otherwise reset timer whenever u becomes true";
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
+    "Connector for signal that switches timer on if true, and off if false"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput reset
+    "Connector for signal that sets timer to zero if it switches to true. The input value will be ignored if the timer does not accumulate time"
+    annotation (Placement(transformation(extent={{-140,-90},{-100,-50}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(
+    final quantity="Time",
+    final unit="s") "Timer output"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+
+protected
+  discrete Modelica.SIunits.Time entryTime "Time instant when u became true";
+  discrete Modelica.SIunits.Time yAcc "Accumulated time up to last change to true";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput reset_internal(
+    final start=false,
+    final fixed=true) "Internal connector";
+
+initial equation
+  pre(entryTime) = time;
+  yAcc = 0;
+
+equation
+  if not accumulate then
+    reset_internal = true;
+  else
+    reset_internal = reset;
+  end if;
+
+  when u and (not edge(reset_internal)) then
+    entryTime = time;
+  elsewhen reset then
+    entryTime = time;
+  end when;
+
+  when reset then
+    yAcc = 0;
+  elsewhen (not u) then
+    yAcc = pre(y);
+  end when;
+
+  if not accumulate then
+    y = if u then time - entryTime else 0.0;
+  else
+    y = if u then yAcc + (time - entryTime) else yAcc;
+  end if;
+
+annotation (
+    defaultComponentName="tim",
+    obsolete = "This model is obsolete, use Buildings.Controls.OBC.CDL.Logical.Timer or Buildings.Controls.OBC.CDL.Logical.TimerAccumulating instead",
+    Icon(
+      coordinateSystem(preserveAspectRatio=true,
+        extent={{-100.0,-100.0},{100.0,100.0}}),
+        graphics={Rectangle(
+          extent={{-100,100},{100,-100}},
+          fillColor={210,210,210},
+          lineThickness=5.0,
+          fillPattern=FillPattern.Solid,
+          borderPattern=BorderPattern.Raised),
+      Line(points={{-66,-60},{82,-60}},
+        color={192,192,192}),
+      Line(points={{-58,68},{-58,-80}},
+        color={192,192,192}),
+      Polygon(lineColor={192,192,192},
+        fillColor={192,192,192},
+        fillPattern=FillPattern.Solid,
+        points={{90,-60},{68,-52},{68,-68},{90,-60}}),
+      Polygon(lineColor={192,192,192},
+        fillColor={192,192,192},
+        fillPattern=FillPattern.Solid,
+        points={{-58,90},{-66,68},{-50,68},{-58,90}}),
+      Line(points={{-56,-60},{-38,-60},{-38,-16},{40,-16},{40,-60},{68,-60}},
+        color={255,0,255}),
+      Line(points={{-58,0},{-40,0},{40,90},{40,0},{68,0}},
+        color={0,0,127}),
+        Text(
+          extent={{-150,150},{150,110}},
+          lineColor={0,0,255},
+          textString="%name"),
+        Ellipse(
+          extent={{-83,7},{-69,-7}},
+          lineColor=DynamicSelect({235,235,235}, if u then {0,255,0} else {235,
+              235,235}),
+          fillColor=DynamicSelect({235,235,235}, if u then {0,255,0} else {235,
+              235,235}),
+          fillPattern=FillPattern.Solid)}),
+    Documentation(info="<html>
+<p>
+Timer with option to accumulate time until it is reset by an input signal.
+</p>
+<p>
+Each time the Boolean input <code>u</code> becomes true, the timer runs, otherwise
+it is dormant.
+</p>
+<ul>
+<li>
+If the parameter <code>accumulate</code> is <code>false</code>, the timer is set to zero each time the
+input <code>u</code> becomes <code>false</code>. The value of input <code>reset</code>
+will be ignored.
+</li>
+<li>
+If the parameter <code>accumulate</code> is <code>true</code>, the timer accumulates time,
+and the timer is set to zero only when the value of the input <code>reset</code> becomes <code>true</code>.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+August 28, 2020, by Michael Wetter:<br/>
+Corrected implementation for situation where the simulation does not start at zero.
+</li>
+<li>
+August 26, 2020, by Jianjun Hu:<br/>
+Moved to obsolete package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2101\">issue 2101</a>.
+</li>
+<li>
+July 31, 2020, by Jianjun Hu:<br/>
+Fixed the reset input. This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\">issue 2056</a>.
+</li>
+<li>
+November 8, 2019, by Michael Wetter:<br/>
+Revised implementation. This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1221\">issue 1221</a>.
+</li>
+<li>
+July 23, 2018, by Jianjun Hu:<br/>
+Added conditional boolean input for cumulative time measuring. This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1221\">issue 1221</a>.
+</li>
+<li>
+July 18, 2018, by Jianjun Hu:<br/>
+Updated implementation to output accumulated true input time.  This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1212\">issue 1212</a>.
+</li>
+<li>
+January 3, 2017, by Michael Wetter:<br/>
+First implementation, based on the implementation of the
+Modelica Standard Library.
+</li>
+</ul>
+</html>"));
+end Timer;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.mo
new file mode 100644
index 00000000000..b66215fd51f
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.mo
@@ -0,0 +1,34 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Logical;
+package Validation "Collection of models that validate the logical blocks of the CDL"
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models that validate the blocks in
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Logical\">
+Buildings.Controls.OBC.CDL.Logical</a>.
+</p>
+<p>
+The examples plot various outputs, which have been verified against
+analytical solutions. These model outputs are stored as reference data to
+allow continuous validation whenever models in the library change.
+</p>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}})}));
+end Validation;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order
new file mode 100644
index 00000000000..768aab3a5d1
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/Validation/package.order
@@ -0,0 +1 @@
+Timer
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.mo
new file mode 100644
index 00000000000..defb8f7644e
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.mo
@@ -0,0 +1,33 @@
+within Buildings.Obsolete.Controls.OBC.CDL;
+package Logical "Package with obsolete models of logical blocks"
+
+annotation (
+Documentation(
+info="<html>
+<p>
+Package with obsolete blocks for elementary mathematical functions
+for boolean variables.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+December 22, 2016, by Michael Wetter:<br/>
+Firt implementation, based on the blocks from the Modelica Standard Library.
+</li>
+</ul>
+</html>"), Icon(graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+               Line(
+          points={{-86,-22},{-50,-22},{-50,22},{48,22},{48,-22},{88,-24}},
+          color={255,0,255})}));
+end Logical;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order
new file mode 100644
index 00000000000..d026b762a07
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Logical/package.order
@@ -0,0 +1,2 @@
+Timer
+Validation
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
new file mode 100644
index 00000000000..8deb12f007b
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/TDewPoi_TDryBulPhi.mo
@@ -0,0 +1,133 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics;
+block TDewPoi_TDryBulPhi
+  "Block to compute the dew point temperature based on relative humidity"
+  extends Modelica.Icons.ObsoleteModel;
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul(
+    final quantity="ThermodynamicTemperature",
+    final unit="K",
+    final min=100) "Dry bulb temperature"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput phi(final min=0, final max=1, unit="1")
+    "Relative air humidity"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput p(final quantity="Pressure",
+                         final unit="Pa",
+                         final min = 0) "Pressure"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TDewPoi(
+    final quantity="ThermodynamicTemperature",
+    final unit="K",
+    final min=100) "Dew point temperature"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+
+protected
+  Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure";
+  constant Real C14=6.54 "Constant used in the equation";
+  constant Real C15=14.526 "Constant used in the equation";
+  constant Real C16=0.7389 "Constant used in the equation";
+  constant Real C17=0.09486 "Constant used in the equation";
+  constant Real C18=0.4569 "Constant used in the equation";
+  Real alpha "Variable used in the equation";
+
+equation
+  p_w = phi * Buildings.Utilities.Psychrometrics.Functions.saturationPressure(TDryBul);
+  alpha = Modelica.Math.log(p_w/1000.0);
+
+  TDewPoi = (C14 + C15*alpha + C16*alpha^2 + C17*alpha^3 + C18*(p_w/1000.0)^0.1984)+273.15;
+
+annotation (
+    obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Psychrometrics.DewPoint_TDryBulPhi instead",
+    defaultComponentName="dewPoi",
+    Documentation(info="<html>
+<p>
+Dew point temperature calculation for moist air above freezing temperature.
+</p>
+<p>
+The correlation used in this model is valid for dew point temperatures between
+<i>0</i>&deg;C and <i>93</i>&deg;C. It is the correlation from 2009
+ASHRAE Handbook Fundamentals, p. 1.9, equation 39.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 29, 2020, by Michael Wetter:<br/>
+Moved to <code>Obsolete</code> package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2139\">issue 2139</a>.
+</li>
+<li>
+April 7, 2017 by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
+            100}}), graphics={  Rectangle(
+        extent={{-100,-100},{100,100}},
+        lineColor={0,0,127},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          lineColor={0,0,255}),
+        Text(
+          extent={{-44,82},{-22,64}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="X"),
+        Polygon(
+          points={{-48,88},{-46,74},{-50,74},{-48,88}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-92,14},{-72,-12}},
+          lineColor={0,0,127},
+          textString="phi"),
+        Text(
+          extent={{-92,100},{-62,56}},
+          lineColor={0,0,127},
+          textString="TDryBul"),
+        Text(
+          extent={{-90,-72},{-72,-90}},
+          lineColor={0,0,127},
+          textString="p"),
+        Polygon(
+          points={{86,-74},{76,-72},{76,-76},{86,-74}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{76,-78},{86,-94}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          textString="T"),
+        Line(points={{-48,84},{-48,-74}}),
+        Text(
+          extent={{60,14},{98,-12}},
+          lineColor={0,0,127},
+          textString="TDewPoi"),
+        Line(points={{82,-72},{-66,-72}}),
+        Line(points={{-48,-40},{-38,-36},{-24,-30},{8,-2},{20,22},{28,54},{32,
+              74}}),
+        Line(
+          points={{68,-12},{-2,-12}},
+          color={255,0,0},
+          thickness=0.5),
+        Polygon(
+          points={{-2,-12},{12,-10},{12,-14},{-2,-12}},
+          lineColor={255,0,0},
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid),
+        Line(points={{66,-44},{-48,-44}}, color={175,175,175}),
+        Line(points={{68,-18},{-10,-18}}, color={175,175,175}),
+        Line(points={{70,6},{12,6}}, color={175,175,175}),
+        Line(points={{68,32},{22,32}}, color={175,175,175})}));
+end TDewPoi_TDryBulPhi;
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo
similarity index 87%
rename from Buildings/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo
index f4031ce1280..2d11f52456d 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/TWetBul_TDryBulPhi.mo
@@ -1,26 +1,27 @@
-within Buildings.Controls.OBC.CDL.Psychrometrics;
+within Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics;
 block TWetBul_TDryBulPhi
   "Block to compute the wet bulb temperature based on relative humidity"
+  extends Modelica.Icons.ObsoleteModel;
 
-  Interfaces.RealInput TDryBul(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100) "Dry bulb temperature"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
 
-  Interfaces.RealInput phi(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput phi(
     final min=0,
     final max=1)
     "Relative air humidity"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
 
-  Interfaces.RealInput p(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput p(
     final quantity="Pressure",
     final unit="Pa",
     final min = 0) "Pressure"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
 
-  Interfaces.RealOutput TWetBul(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TWetBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100) "Wet bulb temperature"
@@ -42,6 +43,7 @@ equation
 
 annotation (
     defaultComponentName="wetBul",
+    obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Psychrometrics.WetBulb_TDryBulPhi instead",
     Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{100,
             100}}), graphics={
         Text(
@@ -121,8 +123,8 @@ with a mean error of less than <i>0.3</i> Kelvin.
 </p>
 <p>
 The model is validated in
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi\">
-Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi</a>.
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi\">
+Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi</a>.
 </p>
 <p>
 For a model that takes the mass fraction instead of the relative humidity as an input, see
@@ -143,6 +145,12 @@ DOI: 10.1175/JAMC-D-11-0143.1
 revisions="<html>
 <ul>
 <li>
+September 29, 2020, by Michael Wetter:<br/>
+Moved to <code>Obsolete</code> package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2139\">issue 2139</a>.
+</li>
+<li>
 April 11, 2017, by Jianjun Hu:<br/>
 Changed the model so to avoid using nonlinear equation.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mo
similarity index 72%
rename from Buildings/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mo
index 138bde205ab..64d4a237481 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mo
@@ -1,8 +1,8 @@
-within Buildings.Controls.OBC.CDL.Psychrometrics.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation;
 model TDewPoi_TDryBulPhi
   "Model to test the dew point temperature computation"
 
-  Buildings.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi dewBulPhi
+  Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi dewBulPhi
    "Model for dew point temperature"
     annotation (Placement(transformation(extent={{16,74},{36,94}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant p(k=101325) "Pressure"
@@ -27,26 +27,31 @@ model TDewPoi_TDryBulPhi
     annotation (Placement(transformation(extent={{-94,-60},{-74,-40}})));
 
  // ============ Below blocks are from Buildings Library ============
-  Buildings.Utilities.Psychrometrics.TDewPoi_pW TDewPoi
+  Buildings.Utilities.Psychrometrics.TDewPoi_pW TDewPoi "Dew point temperature"
     annotation (Placement(transformation(extent={{18,4},{38,24}})));
-  Buildings.Utilities.Psychrometrics.X_pTphi X_pTphi
+  Buildings.Utilities.Psychrometrics.X_pTphi X_pTphi "Steam mass fraction"
     annotation (Placement(transformation(extent={{-46,4},{-26,24}})));
   Buildings.Utilities.Psychrometrics.pW_X humRat(use_p_in=false)
+    "Water vapor pressure"
     annotation (Placement(transformation(extent={{-12,4},{8,24}})));
   // ===================================================================
 
   Buildings.Controls.OBC.CDL.Continuous.Add add(k2=-1)
+    "Dew point temperature difference"
     annotation (Placement(transformation(extent={{52,40},{72,60}})));
-  Buildings.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi dewBulPhi1
+  Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi dewBulPhi1
    "Model for dew point temperature"
     annotation (Placement(transformation(extent={{18,-28},{38,-8}})));
   Buildings.Utilities.Psychrometrics.TDewPoi_pW TDewPoi1
+    "Dew point temperature"
     annotation (Placement(transformation(extent={{20,-98},{40,-78}})));
   Buildings.Utilities.Psychrometrics.pW_X humRat1(use_p_in=false)
+    "Water vapor pressure"
     annotation (Placement(transformation(extent={{-10,-98},{10,-78}})));
-  Buildings.Utilities.Psychrometrics.X_pTphi X_pTphi1
+  Buildings.Utilities.Psychrometrics.X_pTphi X_pTphi1 "Steam mass fraction"
     annotation (Placement(transformation(extent={{-44,-98},{-24,-78}})));
-  Controls.OBC.CDL.Continuous.Add add1(k2=-1)
+  Buildings.Controls.OBC.CDL.Continuous.Add add1(k2=-1)
+    "Dew point temperature difference"
     annotation (Placement(transformation(extent={{52,-60},{72,-40}})));
 
 equation
@@ -57,46 +62,46 @@ equation
     annotation (Line(points={{-25,14},{-22,14},{-13,14}},
       color={0,0,127}));
   connect(TDryBul.y, dewBulPhi.TDryBul)
-    annotation (Line(points={{-73,84},{-68,84},{-68,92},{15,92}},
+    annotation (Line(points={{-72,84},{-68,84},{-68,92},{14,92}},
       color={0,0,127}));
   connect(phi.y, dewBulPhi.phi)
-    annotation (Line(points={{-73,50},{-62,50},{-62,84},{15,84}},
+    annotation (Line(points={{-72,50},{-62,50},{-62,84},{14,84}},
       color={0,0,127}));
   connect(p.y, dewBulPhi.p)
-    annotation (Line(points={{-73,18},{-56,18},{-56,76},{15,76}},
+    annotation (Line(points={{-72,18},{-56,18},{-56,76},{14,76}},
       color={0,0,127}));
   connect(p.y, X_pTphi.p_in)
-    annotation (Line(points={{-73,18},{-56,18},{-56,20},{-48,20}},
+    annotation (Line(points={{-72,18},{-56,18},{-56,20},{-48,20}},
       color={0,0,127}));
   connect(TDryBul.y, X_pTphi.T)
-    annotation (Line(points={{-73,84},{-68,84},{-68,14},{-48,14}},
+    annotation (Line(points={{-72,84},{-68,84},{-68,14},{-48,14}},
       color={0,0,127}));
   connect(phi.y, X_pTphi.phi)
-    annotation (Line(points={{-73,50},{-62,50},{-62,8},{-48,8}},
+    annotation (Line(points={{-72,50},{-62,50},{-62,8},{-48,8}},
       color={0,0,127}));
   connect(TDewPoi.T, add.u2)
     annotation (Line(points={{39,14},{44,14},{44,44},{50,44}},
       color={0,0,127}));
   connect(dewBulPhi.TDewPoi, add.u1)
-    annotation (Line(points={{37,84},{42,84},{42,56},{50,56}},
+    annotation (Line(points={{38,84},{42,84},{42,56},{50,56}},
       color={0,0,127}));
   connect(TDryBul2.y, dewBulPhi1.TDryBul)
-    annotation (Line(points={{-73,-18},{-68,-18},{-68,-10},{17,-10}},
+    annotation (Line(points={{-72,-18},{-68,-18},{-68,-10},{16,-10}},
       color={0,0,127}));
   connect(TDryBul2.y, X_pTphi1.T)
-    annotation (Line(points={{-73,-18},{-68,-18},{-68,-88},{-46,-88}},
+    annotation (Line(points={{-72,-18},{-68,-18},{-68,-88},{-46,-88}},
       color={0,0,127}));
   connect(p2.y, X_pTphi1.p_in)
-    annotation (Line(points={{-73,-84},{-56,-84},{-56,-82},{-46,-82}},
+    annotation (Line(points={{-72,-84},{-56,-84},{-56,-82},{-46,-82}},
       color={0,0,127}));
   connect(p2.y, dewBulPhi1.p)
-    annotation (Line(points={{-73,-84},{-56,-84},{-56,-26},{17,-26}},
+    annotation (Line(points={{-72,-84},{-56,-84},{-56,-26},{16,-26}},
       color={0,0,127}));
   connect(phi2.y, dewBulPhi1.phi)
-    annotation (Line(points={{-73,-50},{-62,-50},{-62,-18},{17,-18}},
+    annotation (Line(points={{-72,-50},{-62,-50},{-62,-18},{16,-18}},
       color={0,0,127}));
   connect(phi2.y, X_pTphi1.phi)
-    annotation (Line(points={{-73,-50},{-62,-50},{-62,-94},{-46,-94}},
+    annotation (Line(points={{-72,-50},{-62,-50},{-62,-94},{-46,-94}},
       color={0,0,127}));
   connect(X_pTphi1.X[1], humRat1.X_w)
     annotation (Line(points={{-23,-88},{-11,-88},{-11,-88}},
@@ -105,19 +110,19 @@ equation
     annotation (Line(points={{11,-88},{19,-88},{19,-88}},
       color={0,0,127}));
   connect(dewBulPhi1.TDewPoi, add1.u1)
-    annotation (Line(points={{39,-18},{44,-18},{44,-44},{50,-44}},
+    annotation (Line(points={{40,-18},{44,-18},{44,-44},{50,-44}},
       color={0,0,127}));
   connect(TDewPoi1.T, add1.u2)
     annotation (Line(points={{41,-88},{46,-88},{46,-56},{50,-56}},
       color={0,0,127}));
 
 annotation (experiment(StopTime=1.0, Tolerance = 1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
-This examples is a unit test for the dew point temperature computation <a href=\"modelica://Buildings.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi\">
-Buildings.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi</a>.
+This examples is a unit test for the dew point temperature computation <a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi\">
+Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mo
similarity index 78%
rename from Buildings/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mo
index b1d5947b971..0e2310aec25 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mo
@@ -1,10 +1,10 @@
-within Buildings.Controls.OBC.CDL.Psychrometrics.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation;
 model TWetBul_TDryBulPhi
   "Model to test the wet bulb temperature computation"
   package Medium = Buildings.Media.Air     "Medium model"
     annotation (choicesAllMatching = true);
 
-  Buildings.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi wetBulPhi
+  Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi wetBulPhi
      "Model for wet bulb temperature"
     annotation (Placement(transformation(extent={{-10,46},{10,66}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant p(k=101325) "Pressure"
@@ -32,48 +32,52 @@ model TWetBul_TDryBulPhi
   // ===================================================================
 
   Buildings.Controls.OBC.CDL.Continuous.Add add(k2=-1)
+    "Wet bulb temperature difference"
     annotation (Placement(transformation(extent={{40,6},{60,26}})));
   Buildings.Controls.OBC.CDL.Continuous.Add add1(k2=-1)
+    "Wet bulb temperature difference"
     annotation (Placement(transformation(extent={{40,-34},{60,-14}})));
 equation
   connect(x_pTphi.X[1], wetBulXi.Xi[1])
     annotation (Line(points={{-19.4,-24},{-11,-24}},
       color={0,0,127}));
   connect(TDryBul.y, wetBulPhi.TDryBul)
-    annotation (Line(points={{-69,56},{-40,56},{-40,64},{-11,64}},
+    annotation (Line(points={{-68,56},{-40,56},{-40,64},{-12,64}},
       color={0,0,127}));
   connect(TDryBul.y, wetBulPhi_BuiLib.TDryBul)
-    annotation (Line(points={{-69,56},{-40,56},{-40,24},{-11,24}},
+    annotation (Line(points={{-68,56},{-40,56},{-40,24},{-11,24}},
       color={0,0,127}));
   connect(TDryBul.y, wetBulXi.TDryBul)
-    annotation (Line(points={{-69,56},{-40,56},{-40,-10},{-16,-10},{-16,-16},{-11,-16}},
+    annotation (Line(points={{-68,56},{-40,56},{-40,-10},{-16,-10},{-16,-16},{
+          -11,-16}},
       color={0,0,127}));
   connect(p.y, x_pTphi.p_in)
-    annotation (Line(points={{-69,-24},{-52,-24},{-52,-20.4},{-33.2,-20.4}},
+    annotation (Line(points={{-68,-24},{-52,-24},{-52,-20.4},{-33.2,-20.4}},
       color={0,0,127}));
   connect(phi.y, x_pTphi.phi)
-    annotation (Line(points={{-69,16},{-46,16},{-46,-27.6},{-33.2,-27.6}},
+    annotation (Line(points={{-68,16},{-46,16},{-46,-27.6},{-33.2,-27.6}},
       color={0,0,127}));
   connect(p.y, wetBulXi.p)
-    annotation (Line(points={{-69,-24},{-52,-24},{-52,-32},{-11,-32}},
+    annotation (Line(points={{-68,-24},{-52,-24},{-52,-32},{-11,-32}},
       color={0,0,127}));
   connect(phi.y, wetBulPhi_BuiLib.phi)
-    annotation (Line(points={{-69,16},{-11,16}},
+    annotation (Line(points={{-68,16},{-11,16}},
       color={0,0,127}));
   connect(phi.y, wetBulPhi.phi)
-    annotation (Line(points={{-69,16},{-46,16},{-46,52},{-28,52},{-28,56},{-11,56}},
+    annotation (Line(points={{-68,16},{-46,16},{-46,52},{-28,52},{-28,56},{-12,
+          56}},
       color={0,0,127}));
   connect(p.y, wetBulPhi.p)
-    annotation (Line(points={{-69,-24},{-52,-24},{-52,48},{-11,48}},
+    annotation (Line(points={{-68,-24},{-52,-24},{-52,48},{-12,48}},
       color={0,0,127}));
   connect(p.y, wetBulPhi_BuiLib.p)
-    annotation (Line(points={{-69,-24},{-52,-24},{-52,8},{-11,8}},
+    annotation (Line(points={{-68,-24},{-52,-24},{-52,8},{-11,8}},
       color={0,0,127}));
   connect(TDryBul.y, x_pTphi.T)
-    annotation (Line(points={{-69,56},{-40,56},{-40,-24},{-33.2,-24}},
+    annotation (Line(points={{-68,56},{-40,56},{-40,-24},{-33.2,-24}},
       color={0,0,127}));
   connect(wetBulPhi.TWetBul, add.u1)
-    annotation (Line(points={{11,56},{22,56},{22,22},{38,22}},
+    annotation (Line(points={{12,56},{22,56},{22,22},{38,22}},
       color={0,0,127}));
   connect(wetBulPhi_BuiLib.TWetBul, add.u2)
     annotation (Line(points={{11,16},{28,16},{28,10},{38,10}},
@@ -86,12 +90,12 @@ equation
       color={0,0,127}));
 
 annotation (experiment(StopTime=1.0,Tolerance = 1e-06),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
-This examples is a unit test for the dew point temperature computation <a href=\"modelica://Buildings.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi\">
-Buildings.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi</a>.
+This examples is a unit test for the dew point temperature computation <a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi\">
+Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi</a>.
 </p>
 <p>
 The model contains an assert that validates the model based on a single operating point from Example 17.1 in
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mo
similarity index 77%
rename from Buildings/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mo
index 2decaed5d4a..f120828ddef 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mo
@@ -1,7 +1,7 @@
-within Buildings.Controls.OBC.CDL.Psychrometrics.Validation;
+within Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation;
 model h_TDryBulPhi "Model to test the specific enthalpy computation"
 
-  Buildings.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi   hBulPhi
+  Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi   hBulPhi
    "Model for specific enthalpy computation"
     annotation (Placement(transformation(extent={{46,-10},{66,10}})));
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant p(k=101325) "Pressure"
@@ -20,22 +20,22 @@ model h_TDryBulPhi "Model to test the specific enthalpy computation"
 
 equation
   connect(TDryBul.y, hBulPhi.TDryBul)
-    annotation (Line(points={{-43,34},{0,34},{0,8},{45,8}},
+    annotation (Line(points={{-42,34},{0,34},{0,8},{44,8}},
       color={0,0,127}));
   connect(phi.y, hBulPhi.phi)
-    annotation (Line(points={{-43,0},{0,0},{45,0}},
+    annotation (Line(points={{-42,0},{44,0}},
       color={0,0,127}));
   connect(p.y, hBulPhi.p)
-    annotation (Line(points={{-43,-32},{0,-32},{0,-8},{45,-8}},
+    annotation (Line(points={{-42,-32},{0,-32},{0,-8},{44,-8}},
       color={0,0,127}));
 
 annotation (experiment(StopTime=1.0, Tolerance = 1e-06),
-  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos"
+  __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
-This examples is a unit test for the specific enthalpy computation <a href=\"modelica://Buildings.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi\">
-Buildings.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi</a>.
+This examples is a unit test for the specific enthalpy computation <a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi\">
+Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.mo
new file mode 100644
index 00000000000..1ac13687165
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.mo
@@ -0,0 +1,20 @@
+within Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics\">
+Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.order
new file mode 100644
index 00000000000..45eb7d0d855
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/package.order
@@ -0,0 +1,3 @@
+TDewPoi_TDryBulPhi
+TWetBul_TDryBulPhi
+h_TDryBulPhi
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo
similarity index 80%
rename from Buildings/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo
rename to Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo
index 12e381f88cd..75d3f656235 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/h_TDryBulPhi.mo
@@ -1,22 +1,23 @@
-within Buildings.Controls.OBC.CDL.Psychrometrics;
+within Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics;
 block h_TDryBulPhi
   "Block to compute the specific enthalpy based on relative humidity"
+  extends Modelica.Icons.ObsoleteModel;
 
-  Interfaces.RealInput TDryBul(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100) "Dry bulb temperature"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Interfaces.RealInput phi(final min=0, final max=1)
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput phi(final min=0, final max=1)
     "Relative air humidity"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealInput p(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput p(
     final quantity="Pressure",
     final unit="Pa",
     final min = 0) "Pressure"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
 
-  Interfaces.RealOutput h(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput h(
     final quantity="SpecificEnergy",
     final unit="J/kg") "Specific enthalpy"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
@@ -25,8 +26,8 @@ protected
   Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC
     "Dry bulb temperature in degree Celsius";
   Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure";
-  Modelica.SIunits.MassFraction XiDryBul(nominal=0.01)
-    "Water vapor mass fraction at dry bulb state";
+  Real w(final unit="1", nominal=0.01)
+    "Water vapor mass fraction in kg per kg dry air";
 
   // Modelica.SIunits.Temperature T_ref = 273.15
   //     "Reference temperature for psychrometric calculations"
@@ -43,19 +44,26 @@ protected
 equation
   TDryBul_degC = TDryBul - 273.15;
   p_w = phi * Buildings.Utilities.Psychrometrics.Functions.saturationPressure(TDryBul);
-  XiDryBul = 0.6219647130774989*p_w/(p-p_w);
-  h = 1006*TDryBul_degC + XiDryBul*(2501014.5+1860*TDryBul_degC);
+  w = 0.6219647130774989*p_w/(p-p_w);
+  h = 1006*TDryBul_degC + w*(2501014.5+1860*TDryBul_degC);
 
     annotation (
     defaultComponentName="ent",
+    obsolete = "Obsolete model, use Buildings.Controls.OBC.CDL.Psychrometrics.SpecificEnthalpy_TDryBulPhi instead",
     Documentation(info="<html>
 <p>
-The correlation used in this model is from 2005
-ASHRAE Handbook Fundamentals, p. 6.9.
+The correlation used in this model is from 2009
+ASHRAE Handbook Fundamentals, p. 1.9, equation 32.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+September 29, 2020, by Michael Wetter:<br/>
+Moved to <code>Obsolete</code> package.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2139\">issue 2139</a>.
+</li>
+<li>
 April 7, 2017 by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.mo
new file mode 100644
index 00000000000..ca5c2243f5b
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.mo
@@ -0,0 +1,10 @@
+within Buildings.Obsolete.Controls.OBC.CDL;
+package Psychrometrics "Package with obsolete models for psychrometric calculations"
+  extends Modelica.Icons.Package;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+Package that contains obsolete models for psychrometric calculations.
+</p>
+</html>"));
+end Psychrometrics;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.order b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.order
new file mode 100644
index 00000000000..cbed346465c
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Psychrometrics/package.order
@@ -0,0 +1,4 @@
+TDewPoi_TDryBulPhi
+TWetBul_TDryBulPhi
+h_TDryBulPhi
+Validation
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Types.mo b/Buildings/Obsolete/Controls/OBC/CDL/Types.mo
new file mode 100644
index 00000000000..7b90c09bbdb
--- /dev/null
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Types.mo
@@ -0,0 +1,70 @@
+within Buildings.Obsolete.Controls.OBC.CDL;
+package Types "Package with type definitions"
+
+  type Reset = enumeration(
+      Disabled "Disabled",
+      Parameter "Use parameter value",
+      Input "Use input signal") "Options for integrator reset" annotation (
+      Documentation(info="<html>
+<p>
+Enumeration to define the choice of integrator reset.
+Possible values are:
+</p>
+<table border=\"1\" summary=\"Explanation of the enumeration\">
+<tr>
+<th>Enumeration</th>
+<th>Description</th></tr>
+<tr><td><code>Disabled</code></td>
+<td>
+Use this setting to disable the integrator reset.
+</td></tr>
+<tr><td><code>Parameter</code></td>
+<td>
+Use this setting to use reset the integrator to the value of the parameter.
+</td></tr>
+<tr><td><code>Input</code></td>
+<td>Use this setting to reset the integrator to the value obtained
+from the input signal.
+</td></tr>
+ </table>
+</html>",   revisions="<html>
+<ul>
+<li>
+March 23, 2017, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+annotation (Documentation(info="<html>
+<p>
+This package contains type definitions.
+</p>
+</html>"), Icon(graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),                  Polygon(
+          origin={-12.167,-23},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{12.167,65},{14.167,93},{36.167,89},{24.167,20},{4.167,-30},
+              {14.167,-30},{24.167,-30},{24.167,-40},{-5.833,-50},{-15.833,
+              -30},{4.167,20},{12.167,65}},
+          smooth=Smooth.Bezier,
+          lineColor={0,0,0}), Polygon(
+          origin={2.7403,1.6673},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{49.2597,22.3327},{31.2597,24.3327},{7.2597,18.3327},{-26.7403,
+            10.3327},{-46.7403,14.3327},{-48.7403,6.3327},{-32.7403,0.3327},{-6.7403,
+            4.3327},{33.2597,14.3327},{49.2597,14.3327},{49.2597,22.3327}},
+          smooth=Smooth.Bezier)}));
+end Types;
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/package.order b/Buildings/Obsolete/Controls/OBC/CDL/package.order
index b179551d033..306627820b5 100644
--- a/Buildings/Obsolete/Controls/OBC/CDL/package.order
+++ b/Buildings/Obsolete/Controls/OBC/CDL/package.order
@@ -1 +1,5 @@
+Continuous
 Discrete
+Logical
+Psychrometrics
+Types
diff --git a/Buildings/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo b/Buildings/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo
index fab1f128ba6..485057be99f 100644
--- a/Buildings/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo
+++ b/Buildings/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo
@@ -69,13 +69,8 @@ model VAVBranch "Supply branch of a VAV system"
     "Fraction of mass flow rate, relative to nominal flow"
     annotation (Placement(transformation(extent={{0,70},{20,90}})));
   Modelica.Blocks.Math.Gain ACH(k=1/VRoo/1.2*3600) "Air change per hour"
-<<<<<<< HEAD:Buildings/Examples/VAVReheat/ThermalZones/VAVBranch.mo
-    annotation (Placement(transformation(extent={{0,40},{20,60}})));
-  Fluid.Sources.MassFlowSource_T souTer(
-=======
     annotation (Placement(transformation(extent={{0,30},{20,50}})));
   Buildings.Fluid.Sources.MassFlowSource_T souTer(
->>>>>>> master:Buildings/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo
     redeclare package Medium = MediumW,
     nPorts=1,
     use_m_flow_in=true,
@@ -83,8 +78,8 @@ model VAVBranch "Supply branch of a VAV system"
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={40,20})));
-  Modelica.Blocks.Interfaces.RealInput yVAV
-    "Actuator position for VAV damper (0: closed, 1: open)" annotation (
+  Modelica.Blocks.Interfaces.RealInput yVAV "Signal for VAV damper"
+                                                            annotation (
       Placement(transformation(extent={{-140,20},{-100,60}}),
         iconTransformation(extent={{-140,20},{-100,60}})));
   Modelica.Blocks.Interfaces.RealInput yVal
@@ -94,6 +89,9 @@ model VAVBranch "Supply branch of a VAV system"
   Buildings.Controls.OBC.CDL.Continuous.Gain gaiM_flow(
     final k=m_flow_nominal*1000*15/4200/10) "Gain for mass flow rate"
     annotation (Placement(transformation(extent={{80,2},{60,22}})));
+  Modelica.Blocks.Interfaces.RealOutput y_actual "Actual VAV damper position"
+    annotation (Placement(transformation(extent={{100,46},{120,66}}),
+        iconTransformation(extent={{100,70},{120,90}})));
 equation
   connect(fraMasFlo.u, senMasFlo.m_flow) annotation (Line(
       points={{-2,80},{-24,80},{-24,70},{-39,70}},
@@ -106,7 +104,7 @@ equation
       smooth=Smooth.None,
       thickness=0.5));
   connect(ACH.u, senMasFlo.m_flow) annotation (Line(
-      points={{-2,50},{-24,50},{-24,70},{-39,70}},
+      points={{-2,40},{-24,40},{-24,70},{-39,70}},
       color={0,0,127},
       smooth=Smooth.None,
       pattern=LinePattern.Dash));
@@ -132,11 +130,13 @@ equation
   connect(vav.y, yVAV) annotation (Line(points={{-62,40},{-120,40}},
                 color={0,0,127}));
   connect(souTer.m_flow_in, gaiM_flow.y)
-    annotation (Line(points={{50,12},{59,12}}, color={0,0,127}));
+    annotation (Line(points={{52,12},{58,12}}, color={0,0,127}));
   connect(sinTer.ports[1], terHea.port_b2) annotation (Line(points={{30,-20},{
           -38,-20},{-38,-10}}, color={0,127,255}));
   connect(gaiM_flow.u, yVal) annotation (Line(points={{82,12},{90,12},{90,-40},
           {-120,-40}}, color={0,0,127}));
+  connect(vav.y_actual, y_actual)
+    annotation (Line(points={{-57,45},{-57,56},{110,56}}, color={0,0,127}));
   annotation (Icon(
     graphics={
         Rectangle(
@@ -213,9 +213,6 @@ equation
           smooth=Smooth.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid,
-<<<<<<< HEAD:Buildings/Examples/VAVReheat/ThermalZones/VAVBranch.mo
-          lineColor={0,0,0})}));
-=======
           lineColor={0,0,0})}), Documentation(info="<html>
 <p>
 Model for a VAV supply branch.
@@ -239,5 +236,4 @@ This is for
 </li>
 </ul>
 </html>"));
->>>>>>> master:Buildings/Obsolete/Examples/VAVReheat/BaseClasses/VAVBranch.mo
 end VAVBranch;
diff --git a/Buildings/Obsolete/package.order b/Buildings/Obsolete/package.order
index b3b765c64a9..93c70e13d92 100644
--- a/Buildings/Obsolete/package.order
+++ b/Buildings/Obsolete/package.order
@@ -1,7 +1,4 @@
 Controls
 DistrictHeatingCooling
 Fluid
-<<<<<<< HEAD
-=======
 Examples
->>>>>>> master
diff --git a/Buildings/Resources/C-Sources/python27Wrapper.c b/Buildings/Resources/C-Sources/pythonWrapper.c
similarity index 100%
rename from Buildings/Resources/C-Sources/python27Wrapper.c
rename to Buildings/Resources/C-Sources/pythonWrapper.c
diff --git a/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/IndirectAbsorptionChiller.idf b/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/IndirectAbsorptionChiller.idf
index 9d11515825b..6f376eb8886 100644
--- a/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/IndirectAbsorptionChiller.idf
+++ b/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/IndirectAbsorptionChiller.idf
@@ -1,2707 +1,3 @@
-<<<<<<< HEAD
-!-Generator IDFEditor 1.50
-!-Option SortedOrder UseSpecialFormat
-
-!-NOTE: All comments with '!-' are ignored by the IDFEditor and are generated automatically.
-!-      Use '!' comments if they need to be retained when using the IDFEditor.
-
-
-!-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
-
-!IndirectAbsorptionChiller.idf
-! Basic file description:  1 story building divided into 3 interior conditioned zones. Roof with no plenum.
-!                          Outdoor air is modulated based on occupancy and floor area.
-!
-! Highlights:              Example of indirect absorption chillers.
-!
-!
-! Simulation Location/Run: Miami Intl Ap FL USA WMO=722020, 2 design days, 2 run periods.
-!                          Run Control executes the run periods, design days are not simulated.
-!
-! Location:                Miami, FL USA
-!
-! Design Days:             Miami Intl Ap FL USA Annual Heating 99.6%, MaxDB=8.7°C
-!                          Miami Intl Ap FL USA Annual Cooling (DB=>MWB) .4%, MaxDB=33.2°C MWB=25.3°C
-!
-! Run Period (Weather File): Winter 1/14, Summer 7/7.
-!
-! Run Control:             Perform two design day and two single-day run period simulations.
-!
-! Building: Single floor rectangular L-shaped building 40 ft south wall, 40 ft west wall, zone height 10 feet.
-!           There is a single window in the West zones south wall. The walls are 1 in stucco over 4 in common brick
-!           and gypboard. The roof is a built up roof with 1/2 in stone over 3/8 in felt over 1 in dense insulation
-!           supported by 2 in heavy weight concrete. The window is single pane 3mm clear.
-!           The window to wall ratio is approximately 0.07.
-!
-!           The building is oriented due north.
-!
-! Floor Area:        130.1 m2 (1403 ft2)
-! Number of Stories: 1
-!
-! Zone Description Details:
-!
-!       (0,12.192,0)                 (9.144,12.192,0)
-!           ________________________________
-!          |                                |
-!          |                                |
-!          |                                |
-!          |                                |
-!          |           North                |
-!          |                                |
-!          |                                |
-!          |             (6.096,6.096,0)    |
-!          |________________________________|____________ (12.192,6.069,0)
-!          | (0,6.096,0)        |    (9.144,6.096,0)     |
-!          |                    |                        |
-!          |                    |                        |
-!          |                    |                        |
-!          |       West         |         East           |    window = *
-!          |                    |                        |
-!          |                    |                        |
-!          |                    |                        |
-!          |___**************___|________________________|
-!
-!      (0,0,0)             (6.069,0,0)               (12.192,0,0)
-!
-! Internal gains description:     ZONE West  - lighting is 0 watts, equip is 2928.751 watts, 3 occupants
-! Internal gains description:     ZONE North - lighting is 878.6252 watts, equip is 2928.751 watts, 4 occupants
-! Internal gains description:     ZONE East  - lighting is 1464.375 watts, equip is 1464.375 watts, 3 occupants
-!
-! Interzone Surfaces:             3 interzone surfaces (see diagram)
-! Internal Mass:                  None
-! People:                         10
-! Lights:                         2343 W
-! Equipment:                      7323 W
-! Windows:                        1
-! Detached Shading:               None
-! Daylight:                       None
-! Natural Ventilation:            None
-! Compact Schedules:              Yes
-! Solair Distribution:            FullInteriorAndExterior
-!
-! HVAC:                           3 zone terminal reheat system using single constant volume air loop. Central chilled
-!                                 water coil scheduled to provide 16 C winter and 13 C summer supply air temperature.
-!                                 Terminal reheat coils trim supply air temperature to meet zone thermostat set point.
-!                                 Thermostat setting at 20 C in winter with 15 C set back temperature, 24 C in summer
-!                                 with 30 C set back temperature. Cooling coil off in winter, reheat coil on all year.
-!
-! Zonal Equipment:                AirTerminal:SingleDuct:ConstantVolume:Reheat
-! Central Air Handling Equipment: Yes
-! System Equipment Autosize:      Yes (chiller steam and boiler volume flow rates are autosized)
-! Purchased Cooling:              No
-! Purchased Heating:              No
-! Purchased Chilled Water:        No (used only if alternate priority control equipment list is selected)
-! Purchased Hot Water:            Yes
-! Coils:                          Coil:Cooling:Water:DetailedGeometry
-! Pumps:                          Pump:VariableSpeed
-! Boilers:                        None
-! Chillers:                       CHILLER:INDIRECTABSORPTION
-!                                 DistrictCooling may be used if desired by changing priority control
-!                                 equipment list name in PlantEquipmentOperation:CoolingLoad object.
-! Towers:                         CoolingTower:SingleSpeed
-!
-! Results:
-! Standard Reports:               None
-! Timestep or Hourly Variables:   Timestep
-! Time bins Report:               None
-! HTML Report:                    None
-! Environmental Emissions:        None
-! Utility Tariffs:                None
-Version,9.2;
-
-!-   ===========  ALL OBJECTS IN CLASS: SIMULATIONCONTROL ===========
-
-
-SimulationControl,
-    No,                      !- Do Zone Sizing Calculation
-    No,                      !- Do System Sizing Calculation
-    Yes,                     !- Do Plant Sizing Calculation
-    Yes,                     !- Run Simulation for Sizing Periods
-    Yes;                     !- Run Simulation for Weather File Run Periods
-
-
-!-   ===========  ALL OBJECTS IN CLASS: BUILDING ===========
-
-Building,
-    NONE,                    !- Name
-    0,                       !- North Axis {deg}
-    Suburbs,                 !- Terrain
-    3.9999999E-02,           !- Loads Convergence Tolerance Value
-    0.4000000,               !- Temperature Convergence Tolerance Value {deltaC}
-    FullInteriorAndExterior, !- Solar Distribution
-    25,                      !- Maximum Number of Warmup Days
-    6;                       !- Minimum Number of Warmup Days
-
-
-!-   ===========  ALL OBJECTS IN CLASS: SURFACECONVECTIONALGORITHM:INSIDE ===========
-
-SurfaceConvectionAlgorithm:Inside,TARP;
-
-!-   ===========  ALL OBJECTS IN CLASS: SURFACECONVECTIONALGORITHM:OUTSIDE ===========
-
-SurfaceConvectionAlgorithm:Outside,DOE-2;
-
-!-   ===========  ALL OBJECTS IN CLASS: HEATBALANCEALGORITHM ===========
-
-HeatBalanceAlgorithm,ConductionTransferFunction;
-
-!-   ===========  ALL OBJECTS IN CLASS: TIMESTEP ===========
-
-Timestep,60;
-
-!-   ===========  ALL OBJECTS IN CLASS: SITE:LOCATION ===========
-
-
-!  Data Source=ASHRAE 2009 Annual Design Conditions
-Site:Location,
-    Miami Intl Ap FL USA WMO=722020,  !- Name
-    25.82,                   !- Latitude {deg}
-    -80.30,                  !- Longitude {deg}
-    -5.00,                   !- Time Zone {hr}
-    11.00;                   !- Elevation {m}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: SIZINGPERIOD:DESIGNDAY ===========
-
-! Miami Intl Ap Annual Cooling Design Conditions Wind Speed=4.5m/s Wind Dir=140
-! Hottest Month=July
-! Miami Intl Ap FL USA Annual Cooling (DB=>MWB) .4%, MaxDB=33.2°C MWB=25.3°C
-SizingPeriod:DesignDay,
-    Miami Intl Ap Ann Clg .4% Condns DB=>MWB,  !- Name
-    7,                       !- Month
-    21,                      !- Day of Month
-    SummerDesignDay,         !- Day Type
-    33.2,                    !- Maximum Dry-Bulb Temperature {C}
-    6.7,                     !- Daily Dry-Bulb Temperature Range {deltaC}
-    ,                        !- Dry-Bulb Temperature Range Modifier Type
-    ,                        !- Dry-Bulb Temperature Range Modifier Day Schedule Name
-    Wetbulb,                 !- Humidity Condition Type
-    25.3,                    !- Wetbulb or DewPoint at Maximum Dry-Bulb {C}
-    ,                        !- Humidity Condition Day Schedule Name
-    ,                        !- Humidity Ratio at Maximum Dry-Bulb {kgWater/kgDryAir}
-    ,                        !- Enthalpy at Maximum Dry-Bulb {J/kg}
-    ,                        !- Daily Wet-Bulb Temperature Range {deltaC}
-    101217.,                 !- Barometric Pressure {Pa}
-    4.5,                     !- Wind Speed {m/s}
-    140,                     !- Wind Direction {deg}
-    No,                      !- Rain Indicator
-    No,                      !- Snow Indicator
-    No,                      !- Daylight Saving Time Indicator
-    ASHRAEClearSky,          !- Solar Model Indicator
-    ,                        !- Beam Solar Day Schedule Name
-    ,                        !- Diffuse Solar Day Schedule Name
-    ,                        !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub) {dimensionless}
-    ,                        !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud) {dimensionless}
-    1.00;                    !- Sky Clearness
-
-
-!-   ===========  ALL OBJECTS IN CLASS: RUNPERIOD ===========
-
-RunPeriod,
-    Run Period 2,            !- Name
-    7,                       !- Begin Month
-    7,                       !- Begin Day of Month
-    ,                        !- Begin Year
-    7,                       !- End Month
-    7,                       !- End Day of Month
-    ,                        !- End Year
-    Tuesday,                 !- Day of Week for Start Day
-    Yes,                     !- Use Weather File Holidays and Special Days
-    Yes,                     !- Use Weather File Daylight Saving Period
-    No,                      !- Apply Weekend Holiday Rule
-    Yes,                     !- Use Weather File Rain Indicators
-    No;                      !- Use Weather File Snow Indicators
-
-
-!-   ===========  ALL OBJECTS IN CLASS: RUNPERIODCONTROL:DAYLIGHTSAVINGTIME ===========
-
-!RunPeriod,
-!    1,                       !- Begin Month
-!    1,                       !- Begin Day Of Month
-!    12,                      !- End Month
-!    31,                      !- End Day Of Month
-!    Tuesday,                 !- Day Of Week For Start Day
-!    Yes,                     !- Use WeatherFile Holidays/Special Days
-!    Yes,                     !- Use WeatherFile DaylightSavingPeriod
-!    No,                      !- Apply Weekend Holiday Rule
-!    Yes,                     !- Use WeatherFile Rain Indicators
-!    Yes;                     !- Use WeatherFile Snow Indicators
-!  WMO=722020 Time Zone=NAE        (GMT-05:00) Eastern Time (US & Canada)
-!  Data Source=ASHRAE 2005 Annual Design Conditions
-RunPeriodControl:DaylightSavingTime,
-    1st Sunday in April,     !- Start Date
-    Last Sunday in October;  !- End Date
-
-
-!-   ===========  ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE ===========
-
-Site:GroundTemperature:BuildingSurface,21.0,21.5,22.0,22.2,22.2,22.2,22.2,22.2,22.2,22.0,21.5,21.0;
-
-!-   ===========  ALL OBJECTS IN CLASS: SCHEDULETYPELIMITS ===========
-
-
-ScheduleTypeLimits,
-    Any Number;              !- Name
-
-ScheduleTypeLimits,
-    Fraction,                !- Name
-    0.0,                     !- Lower Limit Value
-    1.0,                     !- Upper Limit Value
-    CONTINUOUS;              !- Numeric Type
-
-ScheduleTypeLimits,
-    Temperature,             !- Name
-    -60,                     !- Lower Limit Value
-    200,                     !- Upper Limit Value
-    CONTINUOUS,              !- Numeric Type
-    Temperature;             !- Unit Type
-
-ScheduleTypeLimits,
-    Control Type,            !- Name
-    0,                       !- Lower Limit Value
-    4,                       !- Upper Limit Value
-    DISCRETE;                !- Numeric Type
-
-ScheduleTypeLimits,
-    On/Off,                  !- Name
-    0,                       !- Lower Limit Value
-    1,                       !- Upper Limit Value
-    DISCRETE;                !- Numeric Type
-
-
-!-   ===========  ALL OBJECTS IN CLASS: SCHEDULE:COMPACT ===========
-
-Schedule:Compact,
-    Activity Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 131.8;     !- Field 4
-
-Schedule:Compact,
-    Work Eff Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 0.0;       !- Field 4
-
-Schedule:Compact,
-    Clothing Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1.0;       !- Field 4
-
-Schedule:Compact,
-    Air Velo Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 0.137;     !- Field 4
-
-Schedule:Compact,
-    OFFICE OCCUPANCY,        !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: WeekDays SummerDesignDay,  !- Field 2
-    Until: 6:00, 0.0,        !- Field 4
-    Until: 7:00, 0.10,       !- Field 6
-    Until: 8:00, 0.50,       !- Field 8
-    Until: 12:00, 1.00,      !- Field 10
-    Until: 13:00, 0.50,      !- Field 12
-    Until: 16:00, 1.00,      !- Field 14
-    Until: 17:00, 0.50,      !- Field 16
-    Until: 18:00, 0.10,      !- Field 18
-    Until: 24:00, 0.0,       !- Field 20
-    For: AllOtherDays,       !- Field 21
-    Until: 24:00, 0.0;       !- Field 23
-
-Schedule:Compact,
-    INTERMITTENT,            !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: WeekDays SummerDesignDay,  !- Field 2
-    Until: 8:00, 0.0,        !- Field 4
-    Until: 18:00, 1.00,      !- Field 6
-    Until: 24:00, 0.0,       !- Field 8
-    For: AllOtherDays,       !- Field 9
-    Until: 24:00, 0.0;       !- Field 11
-
-Schedule:Compact,
-    OFFICE LIGHTING,         !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: WeekDays SummerDesignDay,  !- Field 2
-    Until: 6:00, 0.05,       !- Field 4
-    Until: 7:00, 0.20,       !- Field 6
-    Until: 17:00, 1.00,      !- Field 8
-    Until: 18:00, 0.50,      !- Field 10
-    Until: 24:00, 0.05,      !- Field 12
-    For: AllOtherDays,       !- Field 13
-    Until: 24:00, 0.05;      !- Field 15
-
-Schedule:Compact,
-    On Peak,                 !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until:  9:00, 0.0,       !- Field 4
-    Until: 18:00, 1.0,       !- Field 6
-    Until: 24:00, 0.0;       !- Field 8
-
-Schedule:Compact,
-    Off Peak,                !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 9:00, 1.0,        !- Field 4
-    Until: 18:00, 0.0,       !- Field 6
-    Until: 24:00, 1.0;       !- Field 8
-
-Schedule:Compact,
-    ON,                      !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1.0;       !- Field 4
-
-Schedule:Compact,
-    Seasonal Reset Supply Air Temp Sch,  !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 3/31,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 17.0,      !- Field 4
-    Through: 9/30,           !- Field 5
-    For: AllDays,            !- Field 6
-    Until: 24:00, 15.0,      !- Field 8
-    Through: 12/31,          !- Field 9
-    For: AllDays,            !- Field 10
-    Until: 24:00, 16.0;      !- Field 12
-
-Schedule:Compact,
-    CW Loop Temp Schedule,   !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 6.67;      !- Field 4
-
-Schedule:Compact,
-    HW Loop Temp Schedule,   !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 60;        !- Field 4
-
-Schedule:Compact,
-    FanAndCoilAvailSched,    !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 3/31,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1.0,       !- Field 4
-    Through: 9/30,           !- Field 5
-    For: WeekDays SummerDesignDay WinterDesignDay,  !- Field 6
-    Until: 7:00, 0.0,        !- Field 8
-    Until: 17:00, 1.0,       !- Field 10
-    Until: 24:00, 0.0,       !- Field 12
-    For: AllOtherDays,       !- Field 13
-    Until: 24:00, 0.0,       !- Field 15
-    Through: 12/31,          !- Field 16
-    For: AllDays,            !- Field 17
-    Until: 24:00, 1.0;       !- Field 19
-
-Schedule:Compact,
-    CoolingCoilAvailSched,   !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 1/1,            !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 0.0,       !- Field 4
-    Through: 11/30,          !- Field 5
-    For: WeekDays,           !- Field 6
-    Until: 7:00, 0.0,        !- Field 8
-    Until: 17:00, 1.0,       !- Field 10
-    Until: 24:00, 0.0,       !- Field 12
-    For: SummerDesignDay,    !- Field 13
-    Until: 24:00, 1.0,       !- Field 15
-    For: AllOtherDays,       !- Field 16
-    Until: 24:00, 0.0,       !- Field 18
-    Through: 12/31,          !- Field 19
-    For: AllDays,            !- Field 20
-    Until: 24:00, 0.0;       !- Field 22
-
-Schedule:Compact,
-    Heating Setpoints,       !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until:  7:00, 15.0,      !- Field 4
-    Until: 17:00, 20.0,      !- Field 6
-    Until: 24:00, 15.0;      !- Field 8
-
-Schedule:Compact,
-    Cooling Setpoints,       !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until:  7:00, 30.0,      !- Field 4
-    Until: 17:00, 24.0,      !- Field 6
-    Until: 24:00, 30.0;      !- Field 8
-
-Schedule:Compact,
-    Zone Control Type Sched, !- Name
-    Control Type,            !- Schedule Type Limits Name
-    Through: 1/31,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1,         !- Field 4
-    Through: 11/30,          !- Field 5
-    For: AllDays,            !- Field 6
-    Until: 24:00, 2,         !- Field 8
-    Through: 12/31,          !- Field 9
-    For: AllDays,            !- Field 10
-    Until: 24:00, 1;         !- Field 12
-
-Schedule:Compact,
-    PlantOnSched,            !- Name
-    ON/OFF,                  !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1.0;       !- Field 4
-
-Schedule:Compact,
-    Steam-Loop-Temp-Schedule,!- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 100.0;     !- Field 4
-
-
-!-   ===========  ALL OBJECTS IN CLASS: MATERIAL ===========
-
-Material,
-    A1 - 1 IN STUCCO,        !- Name
-    Smooth,                  !- Roughness
-    2.5389841E-02,           !- Thickness {m}
-    0.6918309,               !- Conductivity {W/m-K}
-    1858.142,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.9200000,               !- Solar Absorptance
-    0.9200000;               !- Visible Absorptance
-
-Material,
-    C4 - 4 IN COMMON BRICK,  !- Name
-    Rough,                   !- Roughness
-    0.1014984,               !- Thickness {m}
-    0.7264224,               !- Conductivity {W/m-K}
-    1922.216,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.7600000,               !- Solar Absorptance
-    0.7600000;               !- Visible Absorptance
-
-Material,
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD,  !- Name
-    Smooth,                  !- Roughness
-    1.9050000E-02,           !- Thickness {m}
-    0.7264224,               !- Conductivity {W/m-K}
-    1601.846,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.9200000,               !- Solar Absorptance
-    0.9200000;               !- Visible Absorptance
-
-Material,
-    C6 - 8 IN CLAY TILE,     !- Name
-    Smooth,                  !- Roughness
-    0.2033016,               !- Thickness {m}
-    0.5707605,               !- Conductivity {W/m-K}
-    1121.292,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.8200000,               !- Solar Absorptance
-    0.8200000;               !- Visible Absorptance
-
-Material,
-    C10 - 8 IN HW CONCRETE,  !- Name
-    MediumRough,             !- Roughness
-    0.2033016,               !- Thickness {m}
-    1.729577,                !- Conductivity {W/m-K}
-    2242.585,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.6500000,               !- Solar Absorptance
-    0.6500000;               !- Visible Absorptance
-
-Material,
-    E2 - 1 / 2 IN SLAG OR STONE,  !- Name
-    Rough,                   !- Roughness
-    1.2710161E-02,           !- Thickness {m}
-    1.435549,                !- Conductivity {W/m-K}
-    881.0155,                !- Density {kg/m3}
-    1673.600,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.5500000,               !- Solar Absorptance
-    0.5500000;               !- Visible Absorptance
-
-Material,
-    E3 - 3 / 8 IN FELT AND MEMBRANE,  !- Name
-    Rough,                   !- Roughness
-    9.5402403E-03,           !- Thickness {m}
-    0.1902535,               !- Conductivity {W/m-K}
-    1121.292,                !- Density {kg/m3}
-    1673.600,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.7500000,               !- Solar Absorptance
-    0.7500000;               !- Visible Absorptance
-
-Material,
-    B5 - 1 IN DENSE INSULATION,  !- Name
-    VeryRough,               !- Roughness
-    2.5389841E-02,           !- Thickness {m}
-    4.3239430E-02,           !- Conductivity {W/m-K}
-    91.30524,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.5000000,               !- Solar Absorptance
-    0.5000000;               !- Visible Absorptance
-
-Material,
-    C12 - 2 IN HW CONCRETE,  !- Name
-    MediumRough,             !- Roughness
-    5.0901599E-02,           !- Thickness {m}
-    1.729577,                !- Conductivity {W/m-K}
-    2242.585,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.6500000,               !- Solar Absorptance
-    0.6500000;               !- Visible Absorptance
-
-
-!-   ===========  ALL OBJECTS IN CLASS: WINDOWMATERIAL:GLAZING ===========
-
-WindowMaterial:Glazing,
-    WIN-LAY-GLASS-LIGHT,     !- Name
-    SpectralAverage,         !- Optical Data Type
-    ,                        !- Window Glass Spectral Data Set Name
-    0.003,                   !- Thickness {m}
-    0.90,                    !- Solar Transmittance at Normal Incidence
-    0.031,                   !- Front Side Solar Reflectance at Normal Incidence
-    0.031,                   !- Back Side Solar Reflectance at Normal Incidence
-    0.90,                    !- Visible Transmittance at Normal Incidence
-    0.05,                    !- Front Side Visible Reflectance at Normal Incidence
-    0.05,                    !- Back Side Visible Reflectance at Normal Incidence
-    0.0,                     !- Infrared Transmittance at Normal Incidence
-    0.84,                    !- Front Side Infrared Hemispherical Emissivity
-    0.84,                    !- Back Side Infrared Hemispherical Emissivity
-    0.9;                     !- Conductivity {W/m-K}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONSTRUCTION ===========
-
-Construction,
-    EXTWALL80,               !- Name
-    A1 - 1 IN STUCCO,        !- Outside Layer
-    C4 - 4 IN COMMON BRICK,  !- Layer 2
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD;  !- Layer 3
-
-Construction,
-    PARTITION06,             !- Name
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD,  !- Outside Layer
-    C6 - 8 IN CLAY TILE,     !- Layer 2
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD;  !- Layer 3
-
-Construction,
-    FLOOR SLAB 8 IN,         !- Name
-    C10 - 8 IN HW CONCRETE;  !- Outside Layer
-
-Construction,
-    ROOF34,                  !- Name
-    E2 - 1 / 2 IN SLAG OR STONE,  !- Outside Layer
-    E3 - 3 / 8 IN FELT AND MEMBRANE,  !- Layer 2
-    B5 - 1 IN DENSE INSULATION,  !- Layer 3
-    C12 - 2 IN HW CONCRETE;  !- Layer 4
-
-Construction,
-    WIN-CON-LIGHT,           !- Name
-    WIN-LAY-GLASS-LIGHT;     !- Outside Layer
-
-
-!-   ===========  ALL OBJECTS IN CLASS: GLOBALGEOMETRYRULES ===========
-
-GlobalGeometryRules,
-    UpperLeftCorner,         !- Starting Vertex Position
-    CounterClockWise,        !- Vertex Entry Direction
-    World;                   !- Coordinate System
-
-
-!-   ===========  ALL OBJECTS IN CLASS: ZONE ===========
-
-! original zone origin (0,0,0)
-Zone,
-    WEST ZONE,               !- Name
-    0,                       !- Direction of Relative North {deg}
-    0, 0, 0,                            !- X,Y,Z  {m}
-    1,                       !- Type
-    1,                       !- Multiplier
-    autocalculate,           !- Ceiling Height {m}
-    autocalculate;           !- Volume {m3}
-
-! original zone origin (6.096,0,0)
-Zone,
-    EAST ZONE,               !- Name
-    0,                       !- Direction of Relative North {deg}
-    0, 0, 0,                            !- X,Y,Z  {m}
-    1,                       !- Type
-    1,                       !- Multiplier
-    autocalculate,           !- Ceiling Height {m}
-    autocalculate;           !- Volume {m3}
-
-! original zone origin (0,6.096,0)
-Zone,
-    NORTH ZONE,              !- Name
-    0,                       !- Direction of Relative North {deg}
-    0, 0, 0,                            !- X,Y,Z  {m}
-    1,                       !- Type
-    1,                       !- Multiplier
-    autocalculate,           !- Ceiling Height {m}
-    autocalculate;           !- Volume {m3}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: BUILDINGSURFACE:DETAILED ===========
-
-BuildingSurface:Detailed,
-    Zn001:Wall001,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    WEST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 0, 3.048000,                     !- X,Y,Z  1 {m}
-    0, 0, 0,                            !- X,Y,Z  2 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  3 {m}
-    6.096000, 0, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Wall002,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    WEST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 3.048000,              !- X,Y,Z  1 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  2 {m}
-    0, 0, 0,                            !- X,Y,Z  3 {m}
-    0, 0, 3.048000;                     !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Wall003,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    WEST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn003:Wall004,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  3 {m}
-    0, 6.096000, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Wall004,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    WEST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn002:Wall004,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 0, 3.048000,              !- X,Y,Z  1 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Flr001,            !- Name
-    Floor,                   !- Surface Type
-    FLOOR SLAB 8 IN,         !- Construction Name
-    WEST ZONE,               !- Zone Name
-    Ground,                  !- Outside Boundary Condition
-    Zn001:Flr001,            !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    1.000000,                !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 0, 0,                            !- X,Y,Z  1 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 0, 0;                     !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Roof001,           !- Name
-    Roof,                    !- Surface Type
-    ROOF34,                  !- Construction Name
-    WEST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0,                       !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 3.048000,              !- X,Y,Z  1 {m}
-    0, 0, 3.048000,                     !- X,Y,Z  2 {m}
-    6.096000, 0, 3.048000,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall001,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    12.19200, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    12.19200, 6.096000, 0,              !- X,Y,Z  2 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    9.144000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall002,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 0, 3.048000,              !- X,Y,Z  1 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  2 {m}
-    12.19200, 0, 0,                     !- X,Y,Z  3 {m}
-    12.19200, 0, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall003,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    12.19200, 0, 3.048000,              !- X,Y,Z  1 {m}
-    12.19200, 0, 0,                     !- X,Y,Z  2 {m}
-    12.19200, 6.096000, 0,              !- X,Y,Z  3 {m}
-    12.19200, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall004,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn001:Wall004,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  3 {m}
-    6.096000, 0, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall005,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn003:Wall005,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    9.144000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Flr001,            !- Name
-    Floor,                   !- Surface Type
-    FLOOR SLAB 8 IN,         !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn002:Flr001,            !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    1.000000,                !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 0, 0,                     !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    12.19200, 6.096000, 0,              !- X,Y,Z  3 {m}
-    12.19200, 0, 0;                     !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Roof001,           !- Name
-    Roof,                    !- Surface Type
-    ROOF34,                  !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0,                       !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 0, 3.048000,              !- X,Y,Z  2 {m}
-    12.19200, 0, 3.048000,              !- X,Y,Z  3 {m}
-    12.19200, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall001,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 12.19200, 3.048000,              !- X,Y,Z  1 {m}
-    0, 12.19200, 0,                     !- X,Y,Z  2 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  3 {m}
-    0, 6.096000, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall002,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    9.144000, 12.19200, 3.048000,       !- X,Y,Z  1 {m}
-    9.144000, 12.19200, 0,              !- X,Y,Z  2 {m}
-    0, 12.19200, 0,                     !- X,Y,Z  3 {m}
-    0, 12.19200, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall003,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    9.144000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    9.144000, 12.19200, 0,              !- X,Y,Z  3 {m}
-    9.144000, 12.19200, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall004,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn001:Wall003,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 3.048000,              !- X,Y,Z  1 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall005,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn002:Wall005,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    9.144000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Flr001,            !- Name
-    Floor,                   !- Surface Type
-    FLOOR SLAB 8 IN,         !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn003:Flr001,            !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    1.000000,                !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 0,                     !- X,Y,Z  1 {m}
-    0, 12.19200, 0,                     !- X,Y,Z  2 {m}
-    9.144000, 12.19200, 0,              !- X,Y,Z  3 {m}
-    9.144000, 6.096000, 0;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Roof001,           !- Name
-    Roof,                    !- Surface Type
-    ROOF34,                  !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0,                       !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 12.19200, 3.048000,              !- X,Y,Z  1 {m}
-    0, 6.096000, 3.048000,              !- X,Y,Z  2 {m}
-    9.144000, 6.096000, 3.048000,       !- X,Y,Z  3 {m}
-    9.144000, 12.19200, 3.048000;       !- X,Y,Z  4 {m}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: FENESTRATIONSURFACE:DETAILED ===========
-
-FenestrationSurface:Detailed,
-    Zn001:Wall001:Win001,    !- Name
-    Window,                  !- Surface Type
-    WIN-CON-LIGHT,           !- Construction Name
-    Zn001:Wall001,           !- Building Surface Name
-    ,                        !- Outside Boundary Condition Object
-    0.5000000,               !- View Factor to Ground
-    ,                        !- Frame and Divider Name
-    1.0,                     !- Multiplier
-    4,                       !- Number of Vertices
-    0.548000, 0, 2.5000,                !- X,Y,Z  1 {m}
-    0.548000, 0, 0.5000,                !- X,Y,Z  2 {m}
-    5.548000, 0, 0.5000,                !- X,Y,Z  3 {m}
-    5.548000, 0, 2.5000;                !- X,Y,Z  4 {m}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PEOPLE ===========
-
-People,
-    WEST ZONE,               !- Name
-    WEST ZONE,               !- Zone or ZoneList Name
-    OFFICE OCCUPANCY,        !- Number of People Schedule Name
-    people,                  !- Number of People Calculation Method
-    3.000000,                !- Number of People
-    ,                        !- People per Zone Floor Area {person/m2}
-    ,                        !- Zone Floor Area per Person {m2/person}
-    0.3000000,               !- Fraction Radiant
-    ,                        !- Sensible Heat Fraction
-    Activity Sch,            !- Activity Level Schedule Name
-    3.82E-8,                 !- Carbon Dioxide Generation Rate {m3/s-W}
-    ,                        !- Enable ASHRAE 55 Comfort Warnings
-    zoneaveraged,            !- Mean Radiant Temperature Calculation Type
-    ,                        !- Surface Name/Angle Factor List Name
-    Work Eff Sch,            !- Work Efficiency Schedule Name
-    ClothingInsulationSchedule,  !- Clothing Insulation Calculation Method
-    ,                        !- Clothing Insulation Calculation Method Schedule Name
-    Clothing Sch,            !- Clothing Insulation Schedule Name
-    Air Velo Sch,            !- Air Velocity Schedule Name
-    FANGER;                  !- Thermal Comfort Model 1 Type
-
-People,
-    EAST ZONE,               !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    OFFICE OCCUPANCY,        !- Number of People Schedule Name
-    people,                  !- Number of People Calculation Method
-    3.000000,                !- Number of People
-    ,                        !- People per Zone Floor Area {person/m2}
-    ,                        !- Zone Floor Area per Person {m2/person}
-    0.3000000,               !- Fraction Radiant
-    ,                        !- Sensible Heat Fraction
-    Activity Sch,            !- Activity Level Schedule Name
-    3.82E-8,                 !- Carbon Dioxide Generation Rate {m3/s-W}
-    ,                        !- Enable ASHRAE 55 Comfort Warnings
-    zoneaveraged,            !- Mean Radiant Temperature Calculation Type
-    ,                        !- Surface Name/Angle Factor List Name
-    Work Eff Sch,            !- Work Efficiency Schedule Name
-    ClothingInsulationSchedule,  !- Clothing Insulation Calculation Method
-    ,                        !- Clothing Insulation Calculation Method Schedule Name
-    Clothing Sch,            !- Clothing Insulation Schedule Name
-    Air Velo Sch,            !- Air Velocity Schedule Name
-    FANGER;                  !- Thermal Comfort Model 1 Type
-
-People,
-    NORTH ZONE,              !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    OFFICE OCCUPANCY,        !- Number of People Schedule Name
-    people,                  !- Number of People Calculation Method
-    4.000000,                !- Number of People
-    ,                        !- People per Zone Floor Area {person/m2}
-    ,                        !- Zone Floor Area per Person {m2/person}
-    0.3000000,               !- Fraction Radiant
-    ,                        !- Sensible Heat Fraction
-    Activity Sch,            !- Activity Level Schedule Name
-    3.82E-8,                 !- Carbon Dioxide Generation Rate {m3/s-W}
-    ,                        !- Enable ASHRAE 55 Comfort Warnings
-    zoneaveraged,            !- Mean Radiant Temperature Calculation Type
-    ,                        !- Surface Name/Angle Factor List Name
-    Work Eff Sch,            !- Work Efficiency Schedule Name
-    ClothingInsulationSchedule,  !- Clothing Insulation Calculation Method
-    ,                        !- Clothing Insulation Calculation Method Schedule Name
-    Clothing Sch,            !- Clothing Insulation Schedule Name
-    Air Velo Sch,            !- Air Velocity Schedule Name
-    FANGER;                  !- Thermal Comfort Model 1 Type
-
-
-!-   ===========  ALL OBJECTS IN CLASS: LIGHTS ===========
-
-Lights,
-    EAST ZONE Lights 1,      !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    OFFICE LIGHTING,         !- Schedule Name
-    LightingLevel,           !- Design Level Calculation Method
-    1464.375,                !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Return Air Fraction
-    0.2000000,               !- Fraction Radiant
-    0.2000000,               !- Fraction Visible
-    0,                       !- Fraction Replaceable
-    GeneralLights;           !- End-Use Subcategory
-
-Lights,
-    NORTH ZONE Lights 1,     !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    OFFICE LIGHTING,         !- Schedule Name
-    LightingLevel,           !- Design Level Calculation Method
-    878.6252,                !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Return Air Fraction
-    0.2000000,               !- Fraction Radiant
-    0.2000000,               !- Fraction Visible
-    0,                       !- Fraction Replaceable
-    GeneralLights;           !- End-Use Subcategory
-
-
-!-   ===========  ALL OBJECTS IN CLASS: ELECTRICEQUIPMENT ===========
-
-ElectricEquipment,
-    WEST ZONE ElecEq 1,      !- Name
-    WEST ZONE,               !- Zone or ZoneList Name
-    INTERMITTENT,            !- Schedule Name
-    EquipmentLevel,          !- Design Level Calculation Method
-    2928.751,                !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Fraction Latent
-    0.3000000,               !- Fraction Radiant
-    0;                       !- Fraction Lost
-
-ElectricEquipment,
-    EAST ZONE ElecEq 1,      !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    INTERMITTENT,            !- Schedule Name
-    EquipmentLevel,          !- Design Level Calculation Method
-    1464.375,                !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Fraction Latent
-    0.3000000,               !- Fraction Radiant
-    0;                       !- Fraction Lost
-
-ElectricEquipment,
-    NORTH ZONE ElecEq 1,     !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    INTERMITTENT,            !- Schedule Name
-    EquipmentLevel,          !- Design Level Calculation Method
-    2928.751,                !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Fraction Latent
-    0.3000000,               !- Fraction Radiant
-    0;                       !- Fraction Lost
-
-
-!-   ===========  ALL OBJECTS IN CLASS: SIZING:PLANT ===========
-
-! Single Boiler Supply
-Sizing:Plant,
-    Steam Boiler Plant,      !- Plant or Condenser Loop Name
-    Steam,                   !- Loop Type
-    105.,                    !- Design Loop Exit Temperature {C}
-    10;                      !- Loop Design Temperature Difference {deltaC}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========
-
-ZoneControl:Thermostat,
-    Zone 1 Thermostat,       !- Name
-    WEST ZONE,               !- Zone or ZoneList Name
-    Zone Control Type Sched, !- Control Type Schedule Name
-    ThermostatSetpoint:SingleHeating,  !- Control 1 Object Type
-    Heating Setpoint with SB,!- Control 1 Name
-    ThermostatSetpoint:SingleCooling,  !- Control 2 Object Type
-    Cooling Setpoint with SB;!- Control 2 Name
-
-ZoneControl:Thermostat,
-    Zone 2 Thermostat,       !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    Zone Control Type Sched, !- Control Type Schedule Name
-    ThermostatSetpoint:SingleHeating,  !- Control 1 Object Type
-    Heating Setpoint with SB,!- Control 1 Name
-    ThermostatSetpoint:SingleCooling,  !- Control 2 Object Type
-    Cooling Setpoint with SB;!- Control 2 Name
-
-ZoneControl:Thermostat,
-    Zone 3 Thermostat,       !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    Zone Control Type Sched, !- Control Type Schedule Name
-    ThermostatSetpoint:SingleHeating,  !- Control 1 Object Type
-    Heating Setpoint with SB,!- Control 1 Name
-    ThermostatSetpoint:SingleCooling,  !- Control 2 Object Type
-    Cooling Setpoint with SB;!- Control 2 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: THERMOSTATSETPOINT:SINGLEHEATING ===========
-
-ThermostatSetpoint:SingleHeating,
-    Heating Setpoint with SB,!- Name
-    Heating Setpoints;       !- Setpoint Temperature Schedule Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: THERMOSTATSETPOINT:SINGLECOOLING ===========
-
-ThermostatSetpoint:SingleCooling,
-    Cooling Setpoint with SB,!- Name
-    Cooling Setpoints;       !- Setpoint Temperature Schedule Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AIRTERMINAL:SINGLEDUCT:CONSTANTVOLUME:REHEAT ===========
-
-AirTerminal:SingleDuct:ConstantVolume:Reheat,
-    Reheat Zone 1,           !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    Zone 1 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    Zone 1 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    0.47,                    !- Maximum Air Flow Rate {m3/s}
-    Coil:Heating:Water,      !- Reheat Coil Object Type
-    Reheat Coil Zone 1,      !- Reheat Coil Name
-    0.0013,                  !- Maximum Hot Water or Steam Flow Rate {m3/s}
-    0.0,                     !- Minimum Hot Water or Steam Flow Rate {m3/s}
-    0.001;                   !- Convergence Tolerance
-
-AirTerminal:SingleDuct:ConstantVolume:Reheat,
-    Reheat Zone 2,           !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    Zone 2 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    Zone 2 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    0.36,                    !- Maximum Air Flow Rate {m3/s}
-    Coil:Heating:Water,      !- Reheat Coil Object Type
-    Reheat Coil Zone 2,      !- Reheat Coil Name
-    0.0012,                  !- Maximum Hot Water or Steam Flow Rate {m3/s}
-    0.0,                     !- Minimum Hot Water or Steam Flow Rate {m3/s}
-    0.001;                   !- Convergence Tolerance
-
-AirTerminal:SingleDuct:ConstantVolume:Reheat,
-    Reheat Zone 3,           !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    Zone 3 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    Zone 3 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    0.47,                    !- Maximum Air Flow Rate {m3/s}
-    Coil:Heating:Water,      !- Reheat Coil Object Type
-    Reheat Coil Zone 3,      !- Reheat Coil Name
-    0.0013,                  !- Maximum Hot Water or Steam Flow Rate {m3/s}
-    0.0,                     !- Minimum Hot Water or Steam Flow Rate {m3/s}
-    0.001;                   !- Convergence Tolerance
-
-
-!-   ===========  ALL OBJECTS IN CLASS: ZONEHVAC:AIRDISTRIBUTIONUNIT ===========
-
-ZoneHVAC:AirDistributionUnit,
-    Zone1TermReheat,         !- Name
-    Zone 1 Reheat Air Outlet Node,  !- Air Distribution Unit Outlet Node Name
-    AirTerminal:SingleDuct:ConstantVolume:Reheat,  !- Air Terminal Object Type
-    Reheat Zone 1;           !- Air Terminal Name
-
-ZoneHVAC:AirDistributionUnit,
-    Zone2TermReheat,         !- Name
-    Zone 2 Reheat Air Outlet Node,  !- Air Distribution Unit Outlet Node Name
-    AirTerminal:SingleDuct:ConstantVolume:Reheat,  !- Air Terminal Object Type
-    Reheat Zone 2;           !- Air Terminal Name
-
-ZoneHVAC:AirDistributionUnit,
-    Zone3TermReheat,         !- Name
-    Zone 3 Reheat Air Outlet Node,  !- Air Distribution Unit Outlet Node Name
-    AirTerminal:SingleDuct:ConstantVolume:Reheat,  !- Air Terminal Object Type
-    Reheat Zone 3;           !- Air Terminal Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: ZONEHVAC:EQUIPMENTLIST ===========
-
-ZoneHVAC:EquipmentList,
-    Zone1Equipment,          !- Name
-    SequentialLoad,          !- Load Distribution Scheme
-    ZoneHVAC:AirDistributionUnit,  !- Zone Equipment 1 Object Type
-    Zone1TermReheat,         !- Zone Equipment 1 Name
-    1,                       !- Zone Equipment 1 Cooling Sequence
-    1,                       !- Zone Equipment 1 Heating or No-Load Sequence
-    ,                        !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
-    ;                        !- Zone Equipment 1 Sequential Heating Fraction Schedule Name
-
-ZoneHVAC:EquipmentList,
-    Zone2Equipment,          !- Name
-    SequentialLoad,          !- Load Distribution Scheme
-    ZoneHVAC:AirDistributionUnit,  !- Zone Equipment 1 Object Type
-    Zone2TermReheat,         !- Zone Equipment 1 Name
-    1,                       !- Zone Equipment 1 Cooling Sequence
-    1,                       !- Zone Equipment 1 Heating or No-Load Sequence
-    ,                        !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
-    ;                        !- Zone Equipment 1 Sequential Heating Fraction Schedule Name
-
-ZoneHVAC:EquipmentList,
-    Zone3Equipment,          !- Name
-    SequentialLoad,          !- Load Distribution Scheme
-    ZoneHVAC:AirDistributionUnit,  !- Zone Equipment 1 Object Type
-    Zone3TermReheat,         !- Zone Equipment 1 Name
-    1,                       !- Zone Equipment 1 Cooling Sequence
-    1,                       !- Zone Equipment 1 Heating or No-Load Sequence
-    ,                        !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
-    ;                        !- Zone Equipment 1 Sequential Heating Fraction Schedule Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: ZONEHVAC:EQUIPMENTCONNECTIONS ===========
-
-ZoneHVAC:EquipmentConnections,
-    WEST ZONE,               !- Zone Name
-    Zone1Equipment,          !- Zone Conditioning Equipment List Name
-    Zone1Inlets,             !- Zone Air Inlet Node or NodeList Name
-    ,                        !- Zone Air Exhaust Node or NodeList Name
-    Zone 1 Node,             !- Zone Air Node Name
-    Zone 1 Outlet Node;      !- Zone Return Air Node or NodeList Name
-
-ZoneHVAC:EquipmentConnections,
-    EAST ZONE,               !- Zone Name
-    Zone2Equipment,          !- Zone Conditioning Equipment List Name
-    Zone2Inlets,             !- Zone Air Inlet Node or NodeList Name
-    ,                        !- Zone Air Exhaust Node or NodeList Name
-    Zone 2 Node,             !- Zone Air Node Name
-    Zone 2 Outlet Node;      !- Zone Return Air Node or NodeList Name
-
-ZoneHVAC:EquipmentConnections,
-    NORTH ZONE,              !- Zone Name
-    Zone3Equipment,          !- Zone Conditioning Equipment List Name
-    Zone3Inlets,             !- Zone Air Inlet Node or NodeList Name
-    ,                        !- Zone Air Exhaust Node or NodeList Name
-    Zone 3 Node,             !- Zone Air Node Name
-    Zone 3 Outlet Node;      !- Zone Return Air Node or NodeList Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: FAN:CONSTANTVOLUME ===========
-
-Fan:ConstantVolume,
-    Supply Fan 1,            !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    0.7,                     !- Fan Total Efficiency
-    600.0,                   !- Pressure Rise {Pa}
-    1.3,                     !- Maximum Flow Rate {m3/s}
-    0.9,                     !- Motor Efficiency
-    1.0,                     !- Motor In Airstream Fraction
-    Air Loop Inlet Node,     !- Air Inlet Node Name
-    Cooling Coil Air Inlet Node;  !- Air Outlet Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: COIL:COOLING:WATER:DETAILEDGEOMETRY ===========
-
-Coil:Cooling:Water:DetailedGeometry,
-    Detailed Cooling Coil,   !- Name
-    CoolingCoilAvailSched,   !- Availability Schedule Name
-    0.0011,                  !- Maximum Water Flow Rate {m3/s}
-    6.23816,                 !- Tube Outside Surface Area {m2}
-    6.20007018,              !- Total Tube Inside Area {m2}
-    101.7158224,             !- Fin Surface Area {m2}
-    0.810606367,             !- Minimum Airflow Area {m2}
-    0.165097968,             !- Coil Depth {m}
-    0.43507152,              !- Fin Diameter {m}
-    0.001499982,             !- Fin Thickness {m}
-    0.014449958,             !- Tube Inside Diameter {m}
-    0.015879775,             !- Tube Outside Diameter {m}
-    385.764854,              !- Tube Thermal Conductivity {W/m-K}
-    203.882537,              !- Fin Thermal Conductivity {W/m-K}
-    0.001814292,             !- Fin Spacing {m}
-    0.02589977,              !- Tube Depth Spacing {m}
-    6,                       !- Number of Tube Rows
-    16,                      !- Number of Tubes per Row
-    Cooling Coil Water Inlet Node,  !- Water Inlet Node Name
-    Cooling Coil Water Outlet Node,  !- Water Outlet Node Name
-    Cooling Coil Air Inlet Node,  !- Air Inlet Node Name
-    Air Loop Outlet Node;    !- Air Outlet Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: COIL:HEATING:WATER ===========
-
-Coil:Heating:Water,
-    Reheat Coil Zone 1,      !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    400.0,                   !- U-Factor Times Area Value {W/K}
-    0.0013,                  !- Maximum Water Flow Rate {m3/s}
-    Zone 1 Reheat Water Inlet Node,  !- Water Inlet Node Name
-    Zone 1 Reheat Water Outlet Node,  !- Water Outlet Node Name
-    Zone 1 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    Zone 1 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    UFactorTimesAreaAndDesignWaterFlowRate,  !- Performance Input Method
-    autosize,                !- Rated Capacity {W}
-    82.2,                    !- Rated Inlet Water Temperature {C}
-    16.6,                    !- Rated Inlet Air Temperature {C}
-    71.1,                    !- Rated Outlet Water Temperature {C}
-    32.2,                    !- Rated Outlet Air Temperature {C}
-    ;                        !- Rated Ratio for Air and Water Convection
-
-Coil:Heating:Water,
-    Reheat Coil Zone 2,      !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    400.0,                   !- U-Factor Times Area Value {W/K}
-    0.0012,                  !- Maximum Water Flow Rate {m3/s}
-    Zone 2 Reheat Water Inlet Node,  !- Water Inlet Node Name
-    Zone 2 Reheat Water Outlet Node,  !- Water Outlet Node Name
-    Zone 2 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    Zone 2 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    UFactorTimesAreaAndDesignWaterFlowRate,  !- Performance Input Method
-    autosize,                !- Rated Capacity {W}
-    82.2,                    !- Rated Inlet Water Temperature {C}
-    16.6,                    !- Rated Inlet Air Temperature {C}
-    71.1,                    !- Rated Outlet Water Temperature {C}
-    32.2,                    !- Rated Outlet Air Temperature {C}
-    ;                        !- Rated Ratio for Air and Water Convection
-
-Coil:Heating:Water,
-    Reheat Coil Zone 3,      !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    400.0,                   !- U-Factor Times Area Value {W/K}
-    0.0018,                  !- Maximum Water Flow Rate {m3/s}
-    Zone 3 Reheat Water Inlet Node,  !- Water Inlet Node Name
-    Zone 3 Reheat Water Outlet Node,  !- Water Outlet Node Name
-    Zone 3 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    Zone 3 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    UFactorTimesAreaAndDesignWaterFlowRate,  !- Performance Input Method
-    autosize,                !- Rated Capacity {W}
-    82.2,                    !- Rated Inlet Water Temperature {C}
-    16.6,                    !- Rated Inlet Air Temperature {C}
-    71.1,                    !- Rated Outlet Water Temperature {C}
-    32.2,                    !- Rated Outlet Air Temperature {C}
-    ;                        !- Rated Ratio for Air and Water Convection
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONTROLLER:WATERCOIL ===========
-
-Controller:WaterCoil,
-    Main Cooling Coil Controller,  !- Name
-    Temperature,             !- Control Variable
-    Reverse,                 !- Action
-    FLOW,                    !- Actuator Variable
-    Air Loop Outlet Node,    !- Sensor Node Name
-    Cooling Coil Water Inlet Node,  !- Actuator Node Name
-    0.1,                     !- Controller Convergence Tolerance {deltaC}
-    0.0011,                  !- Maximum Actuated Flow {m3/s}
-    0.0;                     !- Minimum Actuated Flow {m3/s}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AIRLOOPHVAC:CONTROLLERLIST ===========
-
-AirLoopHVAC:ControllerList,
-    Reheat System 1 Controllers,  !- Name
-    Controller:WaterCoil,    !- Controller 1 Object Type
-    Main Cooling Coil Controller;  !- Controller 1 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AIRLOOPHVAC ===========
-
-AirLoopHVAC,
-    Typical Terminal Reheat 1,  !- Name
-    Reheat System 1 Controllers,  !- Controller List Name
-    Reheat System 1 Avail List,  !- Availability Manager List Name
-    1.3,                     !- Design Supply Air Flow Rate {m3/s}
-    Air Loop Branches,       !- Branch List Name
-    ,                        !- Connector List Name
-    Air Loop Inlet Node,     !- Supply Side Inlet Node Name
-    Return Air Mixer Outlet, !- Demand Side Outlet Node Name
-    Zone Equipment Inlet Node,  !- Demand Side Inlet Node Names
-    Air Loop Outlet Node;    !- Supply Side Outlet Node Names
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AIRLOOPHVAC:ZONESPLITTER ===========
-
-AirLoopHVAC:ZoneSplitter,
-    Zone Supply Air Splitter,!- Name
-    Zone Equipment Inlet Node,  !- Inlet Node Name
-    Zone 1 Reheat Air Inlet Node,  !- Outlet 1 Node Name
-    Zone 2 Reheat Air Inlet Node,  !- Outlet 2 Node Name
-    Zone 3 Reheat Air Inlet Node;  !- Outlet 3 Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AIRLOOPHVAC:SUPPLYPATH ===========
-
-AirLoopHVAC:SupplyPath,
-    TermReheatSupplyPath,    !- Name
-    Zone Equipment Inlet Node,  !- Supply Air Path Inlet Node Name
-    AirLoopHVAC:ZoneSplitter,!- Component 1 Object Type
-    Zone Supply Air Splitter;!- Component 1 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AIRLOOPHVAC:ZONEMIXER ===========
-
-AirLoopHVAC:ZoneMixer,
-    Zone Return Air Mixer,   !- Name
-    Return Air Mixer Outlet, !- Outlet Node Name
-    Zone 1 Outlet Node,      !- Inlet 1 Node Name
-    Zone 2 Outlet Node,      !- Inlet 2 Node Name
-    Zone 3 Outlet Node;      !- Inlet 3 Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AIRLOOPHVAC:RETURNPATH ===========
-
-AirLoopHVAC:ReturnPath,
-    TermReheatReturnPath,    !- Name
-    Return Air Mixer Outlet, !- Return Air Path Outlet Node Name
-    AirLoopHVAC:ZoneMixer,   !- Component 1 Object Type
-    Zone Return Air Mixer;   !- Component 1 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: BRANCH ===========
-
-Branch,
-    Air Loop Main Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Fan:ConstantVolume,      !- Component 1 Object Type
-    Supply Fan 1,            !- Component 1 Name
-    Air Loop Inlet Node,     !- Component 1 Inlet Node Name
-    Cooling Coil Air Inlet Node,  !- Component 1 Outlet Node Name
-    Coil:Cooling:Water:DetailedGeometry,  !- Component 2 Object Type
-    Detailed Cooling Coil,   !- Component 2 Name
-    Cooling Coil Air Inlet Node,  !- Component 2 Inlet Node Name
-    Air Loop Outlet Node;    !- Component 2 Outlet Node Name
-
-Branch,
-    Cooling Demand Inlet,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Demand Side Inlet Pipe,  !- Component 1 Name
-    CW Demand Inlet Node,    !- Component 1 Inlet Node Name
-    CW Demand Entrance Pipe Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Cooling Coil Branch,     !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Cooling:Water:DetailedGeometry,  !- Component 1 Object Type
-    Detailed Cooling Coil,   !- Component 1 Name
-    Cooling Coil Water Inlet Node,  !- Component 1 Inlet Node Name
-    Cooling Coil Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Demand Bypass Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Demand Side Bypass,      !- Component 1 Name
-    CW Demand Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    CW Demand Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Cooling Demand Outlet,   !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    CW Demand Side Outlet Pipe,  !- Component 1 Name
-    CW Demand Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    CW Demand Outlet Node;   !- Component 1 Outlet Node Name
-
-Branch,
-    Cooling Supply Outlet,   !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Supply Side Outlet Pipe, !- Component 1 Name
-    Supply Side Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    CW Supply Outlet Node;   !- Component 1 Outlet Node Name
-
-Branch,
-    CW Pump Branch,          !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pump:VariableSpeed,      !- Component 1 Object Type
-    Circ Pump,               !- Component 1 Name
-    CW Supply Inlet Node,    !- Component 1 Inlet Node Name
-    CW Pump Outlet Node;     !- Component 1 Outlet Node Name
-
-Branch,
-    Little Chiller Branch,   !- Name
-    ,                        !- Pressure Drop Curve Name
-    Chiller:Absorption:Indirect,  !- Component 1 Object Type
-    Little Chiller,          !- Component 1 Name
-    Little Chiller Inlet Node,  !- Component 1 Inlet Node Name
-    Little Chiller Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Big Chiller Branch,      !- Name
-    ,                        !- Pressure Drop Curve Name
-    Chiller:Absorption:Indirect,  !- Component 1 Object Type
-    Big Chiller,             !- Component 1 Name
-    Big Chiller Inlet Node,  !- Component 1 Inlet Node Name
-    Big Chiller Outlet Node; !- Component 1 Outlet Node Name
-
-Branch,
-    Purchased Cooling Branch,!- Name
-    ,                        !- Pressure Drop Curve Name
-    DistrictCooling,         !- Component 1 Object Type
-    Purchased Cooling,       !- Component 1 Name
-    Purchased Cooling Inlet Node,  !- Component 1 Inlet Node Name
-    Purchased Cooling Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Supply Bypass Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Supply Side Bypass,      !- Component 1 Name
-    CW Supply Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    CW Supply Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Absorption Chiller Steam-Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Chiller:Absorption:Indirect,  !- Component 1 Object Type
-    Big Chiller,             !- Component 1 Name
-    AbsorberSteamInletNode,  !- Component 1 Inlet Node Name
-    AbsorberSteamOutletNode; !- Component 1 Outlet Node Name
-
-Branch,
-    Steam Demand 1 Steam Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic:Steam,    !- Component 1 Object Type
-    Steam Demand 1 Steam Inlet Pipe,  !- Component 1 Name
-    Steam Demand 1 Steam Demand Inlet Node,  !- Component 1 Inlet Node Name
-    Steam Demand 1 Steam Demand Entrance Pipe Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Steam Demand 1 Steam Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic:Steam,    !- Component 1 Object Type
-    Steam Demand 1 Steam Outlet Pipe,  !- Component 1 Name
-    Steam Demand 1 Steam Demand Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    Steam Demand 1 Steam Demand Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Steam Boiler Plant Boiler Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Boiler:Steam,            !- Component 1 Object Type
-    Steam Boiler Plant Boiler,  !- Component 1 Name
-    Steam Boiler Plant Boiler Inlet Node,  !- Component 1 Inlet Node Name
-    Steam Boiler Plant Boiler Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Steam Boiler Plant Steam Supply Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic:Steam,    !- Component 1 Object Type
-    Steam Boiler Plant Steam Supply Outlet,  !- Component 1 Name
-    Steam Boiler Plant Steam Supply Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    Steam Boiler Plant Steam Supply Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Steam Boiler Plant Steam Supply Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pump:VariableSpeed:Condensate,  !- Component 1 Object Type
-    Steam Boiler Plant Steam Circ Pump,  !- Component 1 Name
-    Steam Boiler Plant Steam Supply Inlet Node,  !- Component 1 Inlet Node Name
-    Steam Boiler Plant Steam Pump Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Absorption Chiller Demand Side Bypass Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic:Steam,    !- Component 1 Object Type
-    Absorption Chiller Demand Side Bypass,  !- Component 1 Name
-    Absorption Chiller Demand Side Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    Absorption Chiller Demand Side Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Supply Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pump:VariableSpeed,      !- Component 1 Object Type
-    Cond Circ Pump,          !- Component 1 Name
-    Condenser Supply Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Pump Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Supply Tower Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    CoolingTower:SingleSpeed,!- Component 1 Object Type
-    Big Tower,               !- Component 1 Name
-    Condenser Tower Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Tower Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Supply Bypass Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Supply Side Bypass,  !- Component 1 Name
-    Cond Supply Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    Cond Supply Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Supply Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Supply Outlet, !- Component 1 Name
-    Condenser Supply Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Supply Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Demand Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Demand Inlet Pipe,  !- Component 1 Name
-    Condenser Demand Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Demand Entrance Pipe Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Little Chiller Condenser Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Chiller:Absorption:Indirect,  !- Component 1 Object Type
-    Little Chiller,          !- Component 1 Name
-    Little Chiller Condenser Inlet Node,  !- Component 1 Inlet Node Name
-    Little Chiller Condenser Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Big Chiller Condenser Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Chiller:Absorption:Indirect,  !- Component 1 Object Type
-    Big Chiller,             !- Component 1 Name
-    Big Chiller Condenser Inlet Node,  !- Component 1 Inlet Node Name
-    Big Chiller Condenser Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Demand Bypass Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Demand Side Bypass,  !- Component 1 Name
-    Cond Demand Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    Cond Demand Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Demand Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Demand Outlet Pipe,  !- Component 1 Name
-    Condenser Demand Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Demand Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Heating Supply Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pump:VariableSpeed,      !- Component 1 Object Type
-    HW Circ Pump,            !- Component 1 Name
-    HW Supply Inlet Node,    !- Component 1 Inlet Node Name
-    HW Pump Outlet Node;     !- Component 1 Outlet Node Name
-
-Branch,
-    Heating Purchased Hot Water Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    DistrictHeating,         !- Component 1 Object Type
-    Purchased Heating,       !- Component 1 Name
-    Purchased Heat Inlet Node,  !- Component 1 Inlet Node Name
-    Purchased Heat Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Heating Supply Bypass Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Heating Supply Side Bypass,  !- Component 1 Name
-    Heating Supply Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    Heating Supply Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Heating Supply Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Heating Supply Outlet,   !- Component 1 Name
-    Heating Supply Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    HW Supply Outlet Node;   !- Component 1 Outlet Node Name
-
-Branch,
-    Reheat Inlet Branch,     !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Reheat Inlet Pipe,       !- Component 1 Name
-    HW Demand Inlet Node,    !- Component 1 Inlet Node Name
-    HW Demand Entrance Pipe Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Reheat Outlet Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Reheat Outlet Pipe,      !- Component 1 Name
-    HW Demand Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    HW Demand Outlet Node;   !- Component 1 Outlet Node Name
-
-Branch,
-    Zone 1 Reheat Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Heating:Water,      !- Component 1 Object Type
-    Reheat Coil Zone 1,      !- Component 1 Name
-    Zone 1 Reheat Water Inlet Node,  !- Component 1 Inlet Node Name
-    Zone 1 Reheat Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Zone 2 Reheat Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Heating:Water,      !- Component 1 Object Type
-    Reheat Coil Zone 2,      !- Component 1 Name
-    Zone 2 Reheat Water Inlet Node,  !- Component 1 Inlet Node Name
-    Zone 2 Reheat Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Zone 3 Reheat Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Heating:Water,      !- Component 1 Object Type
-    Reheat Coil Zone 3,      !- Component 1 Name
-    Zone 3 Reheat Water Inlet Node,  !- Component 1 Inlet Node Name
-    Zone 3 Reheat Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Reheat Bypass Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Reheat Bypass,           !- Component 1 Name
-    Reheat Bypass Inlet Node,!- Component 1 Inlet Node Name
-    Reheat Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: BRANCHLIST ===========
-
-BranchList,
-    Air Loop Branches,       !- Name
-    Air Loop Main Branch;    !- Branch 1 Name
-
-BranchList,
-    Cooling Supply Side Branches,  !- Name
-    CW Pump Branch,          !- Branch 1 Name
-    Little Chiller Branch,   !- Branch 2 Name
-    Big Chiller Branch,      !- Branch 3 Name
-    Purchased Cooling Branch,!- Branch 4 Name
-    Supply Bypass Branch,    !- Branch 5 Name
-    Cooling Supply Outlet;   !- Branch 6 Name
-
-BranchList,
-    Cooling Demand Side Branches,  !- Name
-    Cooling Demand Inlet,    !- Branch 1 Name
-    Cooling Coil Branch,     !- Branch 2 Name
-    Demand Bypass Branch,    !- Branch 3 Name
-    Cooling Demand Outlet;   !- Branch 4 Name
-
-BranchList,
-    Steam Demand 1 Steam Demand Side Branches,  !- Name
-    Steam Demand 1 Steam Inlet Branch,  !- Branch 1 Name
-    Absorption Chiller Steam-Branch,  !- Branch 2 Name
-    Absorption Chiller Demand Side Bypass Branch,  !- Branch 3 Name
-    Steam Demand 1 Steam Outlet Branch;  !- Branch 4 Name
-
-BranchList,
-    Steam Boiler Plant Steam Supply Side Branches,  !- Name
-    Steam Boiler Plant Steam Supply Inlet Branch,  !- Branch 1 Name
-    Steam Boiler Plant Boiler Branch,  !- Branch 2 Name
-    Steam Boiler Plant Steam Supply Outlet Branch;  !- Branch 3 Name
-
-BranchList,
-    Condenser Supply Side Branches,  !- Name
-    Condenser Supply Inlet Branch,  !- Branch 1 Name
-    Condenser Supply Tower Branch,  !- Branch 2 Name
-    Condenser Supply Bypass Branch,  !- Branch 3 Name
-    Condenser Supply Outlet Branch;  !- Branch 4 Name
-
-BranchList,
-    Condenser Demand Side Branches,  !- Name
-    Condenser Demand Inlet Branch,  !- Branch 1 Name
-    Little Chiller Condenser Branch,  !- Branch 2 Name
-    Big Chiller Condenser Branch,  !- Branch 3 Name
-    Condenser Demand Bypass Branch,  !- Branch 4 Name
-    Condenser Demand Outlet Branch;  !- Branch 5 Name
-
-BranchList,
-    Heating Supply Side Branches,  !- Name
-    Heating Supply Inlet Branch,  !- Branch 1 Name
-    Heating Purchased Hot Water Branch,  !- Branch 2 Name
-    Heating Supply Bypass Branch,  !- Branch 3 Name
-    Heating Supply Outlet Branch;  !- Branch 4 Name
-
-BranchList,
-    Heating Demand Side Branches,  !- Name
-    Reheat Inlet Branch,     !- Branch 1 Name
-    Zone 1 Reheat Branch,    !- Branch 2 Name
-    Zone 2 Reheat Branch,    !- Branch 3 Name
-    Zone 3 Reheat Branch,    !- Branch 4 Name
-    Reheat Bypass Branch,    !- Branch 5 Name
-    Reheat Outlet Branch;    !- Branch 6 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONNECTOR:SPLITTER ===========
-
-Connector:Splitter,
-    CW Loop Splitter,        !- Name
-    CW Pump Branch,          !- Inlet Branch Name
-    Little Chiller Branch,   !- Outlet Branch 1 Name
-    Big Chiller Branch,      !- Outlet Branch 2 Name
-    Purchased Cooling Branch,!- Outlet Branch 3 Name
-    Supply Bypass Branch;    !- Outlet Branch 4 Name
-
-Connector:Splitter,
-    CW Demand Splitter,      !- Name
-    Cooling Demand Inlet,    !- Inlet Branch Name
-    Demand Bypass Branch,    !- Outlet Branch 1 Name
-    Cooling Coil Branch;     !- Outlet Branch 2 Name
-
-Connector:Splitter,
-    Steam Demand 1 Steam Splitter,  !- Name
-    Steam Demand 1 Steam Inlet Branch,  !- Inlet Branch Name
-    Absorption Chiller Steam-Branch,  !- Outlet Branch 1 Name
-    Absorption Chiller Demand Side Bypass Branch;  !- Outlet Branch 2 Name
-
-Connector:Splitter,
-    Steam Boiler Plant Steam Supply Splitter,  !- Name
-    Steam Boiler Plant Steam Supply Inlet Branch,  !- Inlet Branch Name
-    Steam Boiler Plant Boiler Branch;  !- Outlet Branch 1 Name
-
-Connector:Splitter,
-    Condenser Demand Splitter,  !- Name
-    Condenser Demand Inlet Branch,  !- Inlet Branch Name
-    Big Chiller Condenser Branch,  !- Outlet Branch 1 Name
-    Little Chiller Condenser Branch,  !- Outlet Branch 2 Name
-    Condenser Demand Bypass Branch;  !- Outlet Branch 3 Name
-
-Connector:Splitter,
-    Condenser Supply Splitter,  !- Name
-    Condenser Supply Inlet Branch,  !- Inlet Branch Name
-    Condenser Supply Tower Branch,  !- Outlet Branch 1 Name
-    Condenser Supply Bypass Branch;  !- Outlet Branch 2 Name
-
-Connector:Splitter,
-    Reheat Splitter,         !- Name
-    Reheat Inlet Branch,     !- Inlet Branch Name
-    Zone 1 Reheat Branch,    !- Outlet Branch 1 Name
-    Zone 2 Reheat Branch,    !- Outlet Branch 2 Name
-    Zone 3 Reheat Branch,    !- Outlet Branch 3 Name
-    Reheat Bypass Branch;    !- Outlet Branch 4 Name
-
-Connector:Splitter,
-    Heating Supply Splitter, !- Name
-    Heating Supply Inlet Branch,  !- Inlet Branch Name
-    Heating Purchased Hot Water Branch,  !- Outlet Branch 1 Name
-    Heating Supply Bypass Branch;  !- Outlet Branch 2 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONNECTOR:MIXER ===========
-
-Connector:Mixer,
-    CW Loop Mixer,           !- Name
-    Cooling Supply Outlet,   !- Outlet Branch Name
-    Little Chiller Branch,   !- Inlet Branch 1 Name
-    Big Chiller Branch,      !- Inlet Branch 2 Name
-    Purchased Cooling Branch,!- Inlet Branch 3 Name
-    Supply Bypass Branch;    !- Inlet Branch 4 Name
-
-Connector:Mixer,
-    CW Demand Mixer,         !- Name
-    Cooling Demand Outlet,   !- Outlet Branch Name
-    Cooling Coil Branch,     !- Inlet Branch 1 Name
-    Demand Bypass Branch;    !- Inlet Branch 2 Name
-
-Connector:Mixer,
-    Steam Demand 1 Steam Mixer,  !- Name
-    Steam Demand 1 Steam Outlet Branch,  !- Outlet Branch Name
-    Absorption Chiller Steam-Branch,  !- Inlet Branch 1 Name
-    Absorption Chiller Demand Side Bypass Branch;  !- Inlet Branch 2 Name
-
-Connector:Mixer,
-    Steam Boiler Plant Steam Supply Mixer,  !- Name
-    Steam Boiler Plant Steam Supply Outlet Branch,  !- Outlet Branch Name
-    Steam Boiler Plant Boiler Branch;  !- Inlet Branch 1 Name
-
-Connector:Mixer,
-    Condenser Demand Mixer,  !- Name
-    Condenser Demand Outlet Branch,  !- Outlet Branch Name
-    Big Chiller Condenser Branch,  !- Inlet Branch 1 Name
-    Little Chiller Condenser Branch,  !- Inlet Branch 2 Name
-    Condenser Demand Bypass Branch;  !- Inlet Branch 3 Name
-
-Connector:Mixer,
-    Condenser Supply Mixer,  !- Name
-    Condenser Supply Outlet Branch,  !- Outlet Branch Name
-    Condenser Supply Tower Branch,  !- Inlet Branch 1 Name
-    Condenser Supply Bypass Branch;  !- Inlet Branch 2 Name
-
-Connector:Mixer,
-    Reheat Mixer,            !- Name
-    Reheat Outlet Branch,    !- Outlet Branch Name
-    Zone 1 Reheat Branch,    !- Inlet Branch 1 Name
-    Zone 2 Reheat Branch,    !- Inlet Branch 2 Name
-    Zone 3 Reheat Branch,    !- Inlet Branch 3 Name
-    Reheat Bypass Branch;    !- Inlet Branch 4 Name
-
-Connector:Mixer,
-    Heating Supply Mixer,    !- Name
-    Heating Supply Outlet Branch,  !- Outlet Branch Name
-    Heating Purchased Hot Water Branch,  !- Inlet Branch 1 Name
-    Heating Supply Bypass Branch;  !- Inlet Branch 2 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONNECTORLIST ===========
-
-ConnectorList,
-    Cooling Supply Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    CW Loop Splitter,        !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    CW Loop Mixer;           !- Connector 2 Name
-
-ConnectorList,
-    Cooling Demand Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    CW Demand Splitter,      !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    CW Demand Mixer;         !- Connector 2 Name
-
-ConnectorList,
-    Steam Demand 1 Steam Demand Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Steam Demand 1 Steam Splitter,  !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Steam Demand 1 Steam Mixer;  !- Connector 2 Name
-
-ConnectorList,
-    Steam Boiler Plant Steam Supply Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Steam Boiler Plant Steam Supply Splitter,  !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Steam Boiler Plant Steam Supply Mixer;  !- Connector 2 Name
-
-ConnectorList,
-    Condenser Supply Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Condenser Supply Splitter,  !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Condenser Supply Mixer;  !- Connector 2 Name
-
-ConnectorList,
-    Condenser Demand Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Condenser Demand Splitter,  !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Condenser Demand Mixer;  !- Connector 2 Name
-
-ConnectorList,
-    Heating Supply Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Heating Supply Splitter, !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Heating Supply Mixer;    !- Connector 2 Name
-
-ConnectorList,
-    Heating Demand Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Reheat Splitter,         !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Reheat Mixer;            !- Connector 2 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: NODELIST ===========
-
-NodeList,
-    Chilled Water Loop Setpoint Node List,  !- Name
-    CW Supply Outlet Node;   !- Node 1 Name
-
-NodeList,
-    Hot Water Loop Setpoint Node List,  !- Name
-    HW Supply Outlet Node;   !- Node 1 Name
-
-NodeList,
-    Zone1Inlets,             !- Name
-    Zone 1 Reheat Air Outlet Node;  !- Node 1 Name
-
-NodeList,
-    Zone2Inlets,             !- Name
-    Zone 2 Reheat Air Outlet Node;  !- Node 1 Name
-
-NodeList,
-    Zone3Inlets,             !- Name
-    Zone 3 Reheat Air Outlet Node;  !- Node 1 Name
-
-NodeList,
-    Supply Air Temp Nodes,   !- Name
-    Air Loop Outlet Node;    !- Node 1 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PIPE:ADIABATIC ===========
-
-Pipe:Adiabatic,
-    Demand Side Inlet Pipe,  !- Name
-    CW Demand Inlet Node,    !- Inlet Node Name
-    CW Demand Entrance Pipe Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Demand Side Bypass,      !- Name
-    CW Demand Bypass Inlet Node,  !- Inlet Node Name
-    CW Demand Bypass Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    CW Demand Side Outlet Pipe,  !- Name
-    CW Demand Exit Pipe Inlet Node,  !- Inlet Node Name
-    CW Demand Outlet Node;   !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Supply Side Outlet Pipe, !- Name
-    Supply Side Exit Pipe Inlet Node,  !- Inlet Node Name
-    CW Supply Outlet Node;   !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Supply Side Bypass,      !- Name
-    CW Supply Bypass Inlet Node,  !- Inlet Node Name
-    CW Supply Bypass Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Supply Side Bypass,  !- Name
-    Cond Supply Bypass Inlet Node,  !- Inlet Node Name
-    Cond Supply Bypass Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Supply Outlet, !- Name
-    Condenser Supply Exit Pipe Inlet Node,  !- Inlet Node Name
-    Condenser Supply Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Demand Inlet Pipe,  !- Name
-    Condenser Demand Inlet Node,  !- Inlet Node Name
-    Condenser Demand Entrance Pipe Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Demand Side Bypass,  !- Name
-    Cond Demand Bypass Inlet Node,  !- Inlet Node Name
-    Cond Demand Bypass Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Demand Outlet Pipe,  !- Name
-    Condenser Demand Exit Pipe Inlet Node,  !- Inlet Node Name
-    Condenser Demand Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Heating Supply Side Bypass,  !- Name
-    Heating Supply Bypass Inlet Node,  !- Inlet Node Name
-    Heating Supply Bypass Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Heating Supply Outlet,   !- Name
-    Heating Supply Exit Pipe Inlet Node,  !- Inlet Node Name
-    HW Supply Outlet Node;   !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Reheat Inlet Pipe,       !- Name
-    HW Demand Inlet Node,    !- Inlet Node Name
-    HW Demand Entrance Pipe Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Reheat Outlet Pipe,      !- Name
-    HW Demand Exit Pipe Inlet Node,  !- Inlet Node Name
-    HW Demand Outlet Node;   !- Outlet Node Name
-
-Pipe:Adiabatic,
-    Reheat Bypass,           !- Name
-    Reheat Bypass Inlet Node,!- Inlet Node Name
-    Reheat Bypass Outlet Node;  !- Outlet Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PIPE:ADIABATIC:STEAM ===========
-
-Pipe:Adiabatic:Steam,
-    Steam Demand 1 Steam Inlet Pipe,  !- Name
-    Steam Demand 1 Steam Demand Inlet Node,  !- Inlet Node Name
-    Steam Demand 1 Steam Demand Entrance Pipe Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic:Steam,
-    Steam Demand 1 Steam Outlet Pipe,  !- Name
-    Steam Demand 1 Steam Demand Exit Pipe Inlet Node,  !- Inlet Node Name
-    Steam Demand 1 Steam Demand Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic:Steam,
-    Steam Boiler Plant Steam Supply Outlet,  !- Name
-    Steam Boiler Plant Steam Supply Exit Pipe Inlet Node,  !- Inlet Node Name
-    Steam Boiler Plant Steam Supply Outlet Node;  !- Outlet Node Name
-
-Pipe:Adiabatic:Steam,
-    Absorption Chiller Demand Side Bypass,  !- Name
-    Absorption Chiller Demand Side Bypass Inlet Node,  !- Inlet Node Name
-    Absorption Chiller Demand Side Bypass Outlet Node;  !- Outlet Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PUMP:VARIABLESPEED ===========
-
-!******** end of steam loop to feed absorption chiller ***************
-Pump:VariableSpeed,
-    Circ Pump,               !- Name
-    CW Supply Inlet Node,    !- Inlet Node Name
-    CW Pump Outlet Node,     !- Outlet Node Name
-    0.0011,                  !- Design Maximum Flow Rate {m3/s}
-    300000,                  !- Design Pump Head {Pa}
-    500,                     !- Design Power Consumption {W}
-    0.87,                    !- Motor Efficiency
-    0.0,                     !- Fraction of Motor Inefficiencies to Fluid Stream
-    1.0,                     !- Coefficient 1 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 2 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 3 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 4 of the Part Load Performance Curve
-    0.0,                     !- Design Minimum Flow Rate {m3/s}
-    Intermittent;            !- Pump Control Type
-
-Pump:VariableSpeed,
-    Cond Circ Pump,          !- Name
-    Condenser Supply Inlet Node,  !- Inlet Node Name
-    Condenser Pump Outlet Node,  !- Outlet Node Name
-    0.0022,                  !- Design Maximum Flow Rate {m3/s}
-    300000,                  !- Design Pump Head {Pa}
-    800,                     !- Design Power Consumption {W}
-    0.87,                    !- Motor Efficiency
-    0.0,                     !- Fraction of Motor Inefficiencies to Fluid Stream
-    1.0,                     !- Coefficient 1 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 2 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 3 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 4 of the Part Load Performance Curve
-    0.0,                     !- Design Minimum Flow Rate {m3/s}
-    Intermittent;            !- Pump Control Type
-
-Pump:VariableSpeed,
-    HW Circ Pump,            !- Name
-    HW Supply Inlet Node,    !- Inlet Node Name
-    HW Pump Outlet Node,     !- Outlet Node Name
-    0.0043,                  !- Design Maximum Flow Rate {m3/s}
-    300000,                  !- Design Pump Head {Pa}
-    2000,                    !- Design Power Consumption {W}
-    0.87,                    !- Motor Efficiency
-    0.0,                     !- Fraction of Motor Inefficiencies to Fluid Stream
-    1.0,                     !- Coefficient 1 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 2 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 3 of the Part Load Performance Curve
-    0.0,                     !- Coefficient 4 of the Part Load Performance Curve
-    0.0,                     !- Design Minimum Flow Rate {m3/s}
-    Intermittent;            !- Pump Control Type
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PUMP:VARIABLESPEED:CONDENSATE ===========
-
-Pump:VariableSpeed:Condensate,
-    Steam Boiler Plant Steam Circ Pump,  !- Name
-    Steam Boiler Plant Steam Supply Inlet Node,  !- Inlet Node Name
-    Steam Boiler Plant Steam Pump Outlet Node,  !- Outlet Node Name
-    4.0,                     !- Design Steam Volume Flow Rate {m3/s}
-    179352,                  !- Design Pump Head {Pa}
-    550.0,                   !- Design Power Consumption {W}
-    0.9,                     !- Motor Efficiency
-    0.0,                     !- Fraction of Motor Inefficiencies to Fluid Stream
-    0,                       !- Coefficient 1 of the Part Load Performance Curve
-    1,                       !- Coefficient 2 of the Part Load Performance Curve
-    0,                       !- Coefficient 3 of the Part Load Performance Curve
-    0,                       !- Coefficient 4 of the Part Load Performance Curve
-    ;                        !- Pump Flow Rate Schedule Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: BOILER:STEAM ===========
-
-!    100000,                  !- Nominal Capacity {W}
-Boiler:Steam,
-    Steam Boiler Plant Boiler,  !- Name
-    NaturalGas,              !- Fuel Type
-    160000,                  !- Maximum Operating Pressure {Pa}
-    0.8,                     !- Theoretical Efficiency
-    115,                     !- Design Outlet Steam Temperature {C}
-    autosize,                !- Nominal Capacity {W}
-    0.00001,                 !- Minimum Part Load Ratio
-    1.0,                     !- Maximum Part Load Ratio
-    0.2,                     !- Optimum Part Load Ratio
-    0.8,                     !- Coefficient 1 of Fuel Use Function of Part Load Ratio Curve
-    0.1,                     !- Coefficient 2 of Fuel Use Function of Part Load Ratio Curve
-    0.1,                     !- Coefficient 3 of Fuel Use Function of Part Load Ratio Curve
-    Steam Boiler Plant Boiler Inlet Node,  !- Water Inlet Node Name
-    Steam Boiler Plant Boiler Outlet Node;  !- Steam Outlet Node Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CHILLER:ABSORPTION:INDIRECT ===========
-
-Chiller:Absorption:Indirect,
-    Little Chiller,          !- Name
-    10000,                   !- Nominal Capacity {W}
-    150,                     !- Nominal Pumping Power {W}
-    Little Chiller Inlet Node,  !- Chilled Water Inlet Node Name
-    Little Chiller Outlet Node,  !- Chilled Water Outlet Node Name
-    Little Chiller Condenser Inlet Node,  !- Condenser Inlet Node Name
-    Little Chiller Condenser Outlet Node,  !- Condenser Outlet Node Name
-    0.15,                    !- Minimum Part Load Ratio
-    1.0,                     !- Maximum Part Load Ratio
-    0.65,                    !- Optimum Part Load Ratio
-    35.0,                    !- Design Condenser Inlet Temperature {C}
-    10.0,                    !- Condenser Inlet Temperature Lower Limit {C}
-    5.0,                     !- Chilled Water Outlet Temperature Lower Limit {C}
-    0.0011,                  !- Design Chilled Water Flow Rate {m3/s}
-    0.0011,                  !- Design Condenser Water Flow Rate {m3/s}
-    NotModulated,            !- Chiller Flow Mode
-    SteamUseFPLR;            !- Generator Heat Input Function of Part Load Ratio Curve Name
-
-Chiller:Absorption:Indirect,
-    Big Chiller,             !- Name
-    10000,                   !- Nominal Capacity {W}
-    150,                     !- Nominal Pumping Power {W}
-    Big Chiller Inlet Node,  !- Chilled Water Inlet Node Name
-    Big Chiller Outlet Node, !- Chilled Water Outlet Node Name
-    Big Chiller Condenser Inlet Node,  !- Condenser Inlet Node Name
-    Big Chiller Condenser Outlet Node,  !- Condenser Outlet Node Name
-    0.15,                    !- Minimum Part Load Ratio
-    1.0,                     !- Maximum Part Load Ratio
-    0.65,                    !- Optimum Part Load Ratio
-    35.0,                    !- Design Condenser Inlet Temperature {C}
-    10.0,                    !- Condenser Inlet Temperature Lower Limit {C}
-    5.0,                     !- Chilled Water Outlet Temperature Lower Limit {C}
-    0.0011,                  !- Design Chilled Water Flow Rate {m3/s}
-    0.0011,                  !- Design Condenser Water Flow Rate {m3/s}
-    LeavingSetpointModulated,!- Chiller Flow Mode
-    SteamUseFPLR,            !- Generator Heat Input Function of Part Load Ratio Curve Name
-    PumpUseFPLR,             !- Pump Electric Input Function of Part Load Ratio Curve Name
-    AbsorberSteamInletNode,  !- Generator Inlet Node Name
-    AbsorberSteamOutletNode, !- Generator Outlet Node Name
-    CAPfCOND,                !- Capacity Correction Function of Condenser Temperature Curve Name
-    CAPfEVAP,                !- Capacity Correction Function of Chilled Water Temperature Curve Name
-    ,                        !- Capacity Correction Function of Generator Temperature Curve Name
-    SteamFCondTemp,          !- Generator Heat Input Correction Function of Condenser Temperature Curve Name
-    SteamFEvapTemp,          !- Generator Heat Input Correction Function of Chilled Water Temperature Curve Name
-    Steam,                   !- Generator Heat Source Type
-    autosize,                !- Design Generator Fluid Flow Rate {m3/s}
-    30.0,                    !- Temperature Lower Limit Generator Inlet {C}
-    2.0,                     !- Degree of Subcooling in Steam Generator {C}
-    12.0;                    !- Degree of Subcooling in Steam Condensate Loop {C}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: DISTRICTCOOLING ===========
-
-DistrictCooling,
-    Purchased Cooling,       !- Name
-    Purchased Cooling Inlet Node,  !- Chilled Water Inlet Node Name
-    Purchased Cooling Outlet Node,  !- Chilled Water Outlet Node Name
-    680000;                  !- Nominal Capacity {W}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: DISTRICTHEATING ===========
-
-DistrictHeating,
-    Purchased Heating,       !- Name
-    Purchased Heat Inlet Node,  !- Hot Water Inlet Node Name
-    Purchased Heat Outlet Node,  !- Hot Water Outlet Node Name
-    1000000;                 !- Nominal Capacity {W}
-
-
-!-   ===========  ALL OBJECTS IN CLASS: COOLINGTOWER:SINGLESPEED ===========
-
-CoolingTower:SingleSpeed,
-    Big Tower,               !- Name
-    Condenser Tower Inlet Node,  !- Water Inlet Node Name
-    Condenser Tower Outlet Node,  !- Water Outlet Node Name
-    0.0022,                  !- Design Water Flow Rate {m3/s}
-    16.0,                    !- Design Air Flow Rate {m3/s}
-    1000,                    !- Design Fan Power {W}
-    1750.0,                  !- Design U-Factor Times Area Value {W/K}
-    0.0,                     !- Free Convection Regime Air Flow Rate {m3/s}
-    ,                        !- Free Convection Regime Air Flow Rate Sizing Factor
-    0.0,                     !- Free Convection Regime U-Factor Times Area Value {W/K}
-    ,                        !- Free Convection U-Factor Times Area Value Sizing Factor
-    UFactorTimesAreaAndDesignWaterFlowRate,  !- Performance Input Method
-    ,                        !- Heat Rejection Capacity and Nominal Capacity Sizing Ratio
-    ,                        !- Nominal Capacity {W}
-    ,                        !- Free Convection Capacity {W}
-    ;                        !- Free Convection Nominal Capacity Sizing Factor
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PLANTLOOP ===========
-
-PlantLoop,
-    Chilled Water Loop,      !- Name
-    Water,                   !- Fluid Type
-    ,                        !- User Defined Fluid Type
-    CW Loop Operation,       !- Plant Equipment Operation Scheme Name
-    CW Supply Outlet Node,   !- Loop Temperature Setpoint Node Name
-    98,                      !- Maximum Loop Temperature {C}
-    1,                       !- Minimum Loop Temperature {C}
-    0.0011,                  !- Maximum Loop Flow Rate {m3/s}
-    0.0,                     !- Minimum Loop Flow Rate {m3/s}
-    autocalculate,           !- Plant Loop Volume {m3}
-    CW Supply Inlet Node,    !- Plant Side Inlet Node Name
-    CW Supply Outlet Node,   !- Plant Side Outlet Node Name
-    Cooling Supply Side Branches,  !- Plant Side Branch List Name
-    Cooling Supply Side Connectors,  !- Plant Side Connector List Name
-    CW Demand Inlet Node,    !- Demand Side Inlet Node Name
-    CW Demand Outlet Node,   !- Demand Side Outlet Node Name
-    Cooling Demand Side Branches,  !- Demand Side Branch List Name
-    Cooling Demand Side Connectors,  !- Demand Side Connector List Name
-    Optimal;                 !- Load Distribution Scheme
-
-!******** add steam loop to feed absorption chiller ***************
-PlantLoop,
-    Steam Boiler Plant,      !- Name
-    Steam,                   !- Fluid Type
-    ,                        !- User Defined Fluid Type
-    Steam Boiler Plant Operation,  !- Plant Equipment Operation Scheme Name
-    Steam Boiler Plant Steam Supply Outlet Node,  !- Loop Temperature Setpoint Node Name
-    110,                     !- Maximum Loop Temperature {C}
-    10,                      !- Minimum Loop Temperature {C}
-    4.00,                    !- Maximum Loop Flow Rate {m3/s}
-    0.0,                     !- Minimum Loop Flow Rate {m3/s}
-    autocalculate,           !- Plant Loop Volume {m3}
-    Steam Boiler Plant Steam Supply Inlet Node,  !- Plant Side Inlet Node Name
-    Steam Boiler Plant Steam Supply Outlet Node,  !- Plant Side Outlet Node Name
-    Steam Boiler Plant Steam Supply Side Branches,  !- Plant Side Branch List Name
-    Steam Boiler Plant Steam Supply Side Connectors,  !- Plant Side Connector List Name
-    Steam Demand 1 Steam Demand Inlet Node,  !- Demand Side Inlet Node Name
-    Steam Demand 1 Steam Demand Outlet Node,  !- Demand Side Outlet Node Name
-    Steam Demand 1 Steam Demand Side Branches,  !- Demand Side Branch List Name
-    Steam Demand 1 Steam Demand Side Connectors,  !- Demand Side Connector List Name
-    Optimal;                 !- Load Distribution Scheme
-
-PlantLoop,
-    Hot Water Loop,          !- Name
-    Water,                   !- Fluid Type
-    ,                        !- User Defined Fluid Type
-    Hot Loop Operation,      !- Plant Equipment Operation Scheme Name
-    HW Supply Outlet Node,   !- Loop Temperature Setpoint Node Name
-    100.0000,                !- Maximum Loop Temperature {C}
-    10.00000,                !- Minimum Loop Temperature {C}
-    0.0043,                  !- Maximum Loop Flow Rate {m3/s}
-    0,                       !- Minimum Loop Flow Rate {m3/s}
-    autocalculate,           !- Plant Loop Volume {m3}
-    HW Supply Inlet Node,    !- Plant Side Inlet Node Name
-    HW Supply Outlet Node,   !- Plant Side Outlet Node Name
-    Heating Supply Side Branches,  !- Plant Side Branch List Name
-    Heating Supply Side Connectors,  !- Plant Side Connector List Name
-    HW Demand Inlet Node,    !- Demand Side Inlet Node Name
-    HW Demand Outlet Node,   !- Demand Side Outlet Node Name
-    Heating Demand Side Branches,  !- Demand Side Branch List Name
-    Heating Demand Side Connectors,  !- Demand Side Connector List Name
-    Optimal;                 !- Load Distribution Scheme
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONDENSERLOOP ===========
-
-CondenserLoop,
-    Chilled Water Condenser Loop,  !- Name
-    Water,                   !- Fluid Type
-    ,                        !- User Defined Fluid Type
-    Tower Loop Operation,    !- Condenser Equipment Operation Scheme Name
-    Condenser Supply Outlet Node,  !- Condenser Loop Temperature Setpoint Node Name
-    80,                      !- Maximum Loop Temperature {C}
-    10,                      !- Minimum Loop Temperature {C}
-    0.0022,                  !- Maximum Loop Flow Rate {m3/s}
-    0.0,                     !- Minimum Loop Flow Rate {m3/s}
-    autocalculate,           !- Condenser Loop Volume {m3}
-    Condenser Supply Inlet Node,  !- Condenser Side Inlet Node Name
-    Condenser Supply Outlet Node,  !- Condenser Side Outlet Node Name
-    Condenser Supply Side Branches,  !- Condenser Side Branch List Name
-    Condenser Supply Side Connectors,  !- Condenser Side Connector List Name
-    Condenser Demand Inlet Node,  !- Demand Side Inlet Node Name
-    Condenser Demand Outlet Node,  !- Demand Side Outlet Node Name
-    Condenser Demand Side Branches,  !- Condenser Demand Side Branch List Name
-    Condenser Demand Side Connectors,  !- Condenser Demand Side Connector List Name
-    SequentialLoad;          !- Load Distribution Scheme
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PLANTEQUIPMENTLIST ===========
-
-PlantEquipmentList,
-    Purchased Only,          !- Name
-    DistrictCooling,         !- Equipment 1 Object Type
-    Purchased Cooling;       !- Equipment 1 Name
-
-PlantEquipmentList,
-    Chiller 1,               !- Name
-    Chiller:Absorption:Indirect,  !- Equipment 1 Object Type
-    Big Chiller;             !- Equipment 1 Name
-
-PlantEquipmentList,
-    Chiller 2,               !- Name
-    Chiller:Absorption:Indirect,  !- Equipment 1 Object Type
-    Little Chiller,          !- Equipment 1 Name
-    Chiller:Absorption:Indirect,  !- Equipment 2 Object Type
-    Big Chiller;             !- Equipment 2 Name
-
-PlantEquipmentList,
-    Steam Boiler Plant heating plant,  !- Name
-    Boiler:Steam,            !- Equipment 1 Object Type
-    Steam Boiler Plant Boiler;  !- Equipment 1 Name
-
-PlantEquipmentList,
-    heating plant,           !- Name
-    DistrictHeating,         !- Equipment 1 Object Type
-    Purchased Heating;       !- Equipment 1 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONDENSEREQUIPMENTLIST ===========
-
-CondenserEquipmentList,
-    All Towers,              !- Name
-    CoolingTower:SingleSpeed,!- Equipment 1 Object Type
-    Big Tower;               !- Equipment 1 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PLANTEQUIPMENTOPERATION:COOLINGLOAD ===========
-
-PlantEquipmentOperation:CoolingLoad,
-    Peak Operation,          !- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    210000,                  !- Load Range 1 Upper Limit {W}
-    Chiller 2;               !- Range 1 Equipment List Name
-
-PlantEquipmentOperation:CoolingLoad,
-    Off Peak Operation,      !- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    20000,                   !- Load Range 1 Upper Limit {W}
-    Chiller 1;               !- Range 1 Equipment List Name
-
-PlantEquipmentOperation:CoolingLoad,
-    Year Round Tower Operation,  !- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    90000000,                !- Load Range 1 Upper Limit {W}
-    All Towers;              !- Range 1 Equipment List Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PLANTEQUIPMENTOPERATION:HEATINGLOAD ===========
-
-PlantEquipmentOperation:HeatingLoad,
-    Steam Boiler Plant Heat Supply,  !- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    1000000000000000,        !- Load Range 1 Upper Limit {W}
-    Steam Boiler Plant heating plant;  !- Range 1 Equipment List Name
-
-PlantEquipmentOperation:HeatingLoad,
-    Purchased Only,          !- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    1000000,                 !- Load Range 1 Upper Limit {W}
-    heating plant;           !- Range 1 Equipment List Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: PLANTEQUIPMENTOPERATIONSCHEMES ===========
-
-PlantEquipmentOperationSchemes,
-    CW Loop Operation,       !- Name
-    PlantEquipmentOperation:CoolingLoad,  !- Control Scheme 1 Object Type
-    Peak Operation,          !- Control Scheme 1 Name
-    On Peak,                 !- Control Scheme 1 Schedule Name
-    PlantEquipmentOperation:CoolingLoad,  !- Control Scheme 2 Object Type
-    Peak Operation,          !- Control Scheme 2 Name
-    Off Peak;                !- Control Scheme 2 Schedule Name
-
-PlantEquipmentOperationSchemes,
-    Steam Boiler Plant Operation,  !- Name
-    PlantEquipmentOperation:HeatingLoad,  !- Control Scheme 1 Object Type
-    Steam Boiler Plant Heat Supply,  !- Control Scheme 1 Name
-    PlantOnSched;            !- Control Scheme 1 Schedule Name
-
-PlantEquipmentOperationSchemes,
-    Hot Loop Operation,      !- Name
-    PlantEquipmentOperation:HeatingLoad,  !- Control Scheme 1 Object Type
-    Purchased Only,          !- Control Scheme 1 Name
-    ON;                      !- Control Scheme 1 Schedule Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CONDENSEREQUIPMENTOPERATIONSCHEMES ===========
-
-CondenserEquipmentOperationSchemes,
-    Tower Loop Operation,    !- Name
-    PlantEquipmentOperation:CoolingLoad,  !- Control Scheme 1 Object Type
-    Year Round Tower Operation,  !- Control Scheme 1 Name
-    ON;                      !- Control Scheme 1 Schedule Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AVAILABILITYMANAGER:SCHEDULED ===========
-
-AvailabilityManager:Scheduled,
-    Reheat System 1 Avail,   !- Name
-    FanAndCoilAvailSched;    !- Schedule Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: AVAILABILITYMANAGERASSIGNMENTLIST ===========
-
-AvailabilityManagerAssignmentList,
-    Reheat System 1 Avail List,  !- Name
-    AvailabilityManager:Scheduled,  !- Availability Manager 1 Object Type
-    Reheat System 1 Avail;   !- Availability Manager 1 Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: SETPOINTMANAGER:SCHEDULED ===========
-
-SetpointManager:Scheduled,
-    Steam Boiler Plant Boiler Setpoint Manager,  !- Name
-    Temperature,             !- Control Variable
-    Steam-Loop-Temp-Schedule,!- Schedule Name
-    Steam Boiler Plant Boiler Outlet Node;  !- Setpoint Node or NodeList Name
-
-SetpointManager:Scheduled,
-    Big Chiller Setpoint Manager,  !- Name
-    Temperature,             !- Control Variable
-    CW Loop Temp Schedule,   !- Schedule Name
-    Big Chiller Outlet Node; !- Setpoint Node or NodeList Name
-
-SetpointManager:Scheduled,
-    Chilled Water Loop Setpoint Manager,  !- Name
-    Temperature,             !- Control Variable
-    CW Loop Temp Schedule,   !- Schedule Name
-    Chilled Water Loop Setpoint Node List;  !- Setpoint Node or NodeList Name
-
-SetpointManager:Scheduled,
-    Steam Boiler Plant Steam Temp Manager,  !- Name
-    Temperature,             !- Control Variable
-    Steam-Loop-Temp-Schedule,!- Schedule Name
-    Steam Boiler Plant Steam Supply Outlet Node;  !- Setpoint Node or NodeList Name
-
-SetpointManager:Scheduled,
-    Hot Water Loop Setpoint Manager,  !- Name
-    Temperature,             !- Control Variable
-    HW Loop Temp Schedule,   !- Schedule Name
-    Hot Water Loop Setpoint Node List;  !- Setpoint Node or NodeList Name
-
-SetpointManager:Scheduled,
-    Supply Air Temp Manager, !- Name
-    Temperature,             !- Control Variable
-    Seasonal Reset Supply Air Temp Sch,  !- Schedule Name
-    Supply Air Temp Nodes;   !- Setpoint Node or NodeList Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: SETPOINTMANAGER:FOLLOWOUTDOORAIRTEMPERATURE ===========
-
-SetpointManager:FollowOutdoorAirTemperature,
-    MyCondenserControl,      !- Name
-    Temperature,             !- Control Variable
-    OutdoorAirWetBulb,       !- Reference Temperature Type
-    0,                       !- Offset Temperature Difference {deltaC}
-    80,                      !- Maximum Setpoint Temperature {C}
-    10,                      !- Minimum Setpoint Temperature {C}
-    Condenser Supply Outlet Node;  !- Setpoint Node or NodeList Name
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CURVE:QUADRATIC ===========
-
-Curve:Quadratic,
-    PumpUseFPLR,             !- Name
-    1.0,                     !- Coefficient1 Constant
-    0.0,                     !- Coefficient2 x
-    0.0,                     !- Coefficient3 x**2
-    0.15,                    !- Minimum Value of x
-    1.0;                     !- Maximum Value of x
-
-
-!-   ===========  ALL OBJECTS IN CLASS: CURVE:CUBIC ===========
-
-Curve:Cubic,
-    SteamFCondTemp,          !- Name
-    0.712019,                !- Coefficient1 Constant
-    -0.00478,                !- Coefficient2 x
-    0.000864,                !- Coefficient3 x**2
-    -0.000013,               !- Coefficient4 x**3
-    7.0,                     !- Minimum Value of x
-    30.0,                    !- Maximum Value of x
-    ,                        !- Minimum Curve Output
-    ,                        !- Maximum Curve Output
-    Temperature,             !- Input Unit Type for X
-    Dimensionless;           !- Output Unit Type
-
-Curve:Cubic,
-    SteamFEvapTemp,          !- Name
-    0.995571,                !- Coefficient1 Constant
-    0.046821,                !- Coefficient2 x
-    -0.01099,                !- Coefficient3 x**2
-    0.000608,                !- Coefficient4 x**3
-    4.0,                     !- Minimum Value of x
-    10.0,                    !- Maximum Value of x
-    ,                        !- Minimum Curve Output
-    ,                        !- Maximum Curve Output
-    Temperature,             !- Input Unit Type for X
-    Dimensionless;           !- Output Unit Type
-
-Curve:Cubic,
-    SteamUseFPLR,            !- Name
-    0.18892,                 !- Coefficient1 Constant
-    0.968044,                !- Coefficient2 x
-    1.119202,                !- Coefficient3 x**2
-    -0.5034,                 !- Coefficient4 x**3
-    0.15,                    !- Minimum Value of x
-    1.0;                     !- Maximum Value of x
-
-Curve:Cubic,
-    CAPfCOND,                !- Name
-    0.245507,                !- Coefficient1 Constant
-    0.023614,                !- Coefficient2 x
-    0.0000278,               !- Coefficient3 x**2
-    0.000013,                !- Coefficient4 x**3
-    7.0,                     !- Minimum Value of x
-    25.0;                    !- Maximum Value of x
-
-Curve:Cubic,
-    CAPfEVAP,                !- Name
-    0.690571,                !- Coefficient1 Constant
-    0.065571,                !- Coefficient2 x
-    -0.00289,                !- Coefficient3 x**2
-    0.0,                     !- Coefficient4 x**3
-    4.0,                     !- Minimum Value of x
-    10.0;                    !- Maximum Value of x
-
-
-!-   ===========  ALL OBJECTS IN CLASS: OUTPUT:VARIABLEDICTIONARY ===========
-
-Output:VariableDictionary,Regular;
-
-!-   ===========  ALL OBJECTS IN CLASS: OUTPUT:VARIABLE ===========
-
-Output:Variable,Big Chiller,Chiller Electric Power,timestep;
-Output:Variable,Big Chiller,Chiller Source Steam Rate,timestep;
-Output:Variable,Big Chiller,Chiller Evaporator Cooling Rate,timestep;
-Output:Variable,Big Chiller,Chiller Evaporator Inlet Temperature,timestep;
-Output:Variable,Big Chiller,Chiller Evaporator Outlet Temperature,timestep;
-Output:Variable,Big Chiller,Chiller Evaporator Mass Flow Rate,timestep;
-Output:Variable,Big Chiller,Chiller Condenser Heat Transfer Rate,timestep;
-Output:Variable,Big Chiller,Chiller Condenser Inlet Temperature,timestep;
-Output:Variable,Big Chiller,Chiller Condenser Outlet Temperature,timestep;
-Output:Variable,Big Chiller,Chiller Condenser Mass Flow Rate,timestep;
-Output:Variable,Big Chiller,Chiller Steam Heat Loss Rate,timestep;
-
-!-   ===========  ALL OBJECTS IN CLASS: OUTPUT:METER:METERFILEONLY ===========
-
-Output:Meter:MeterFileOnly,Electricity:Facility,monthly;
-Output:Meter:MeterFileOnly,Electricity:Building,monthly;
-Output:Meter:MeterFileOnly,InteriorLights:Electricity,monthly;
-Output:Meter:MeterFileOnly,Electricity:HVAC,monthly;
-Output:Meter:MeterFileOnly,Electricity:Plant,monthly;
-Output:Meter:MeterFileOnly,Electricity:Facility,runperiod;
-Output:Meter:MeterFileOnly,Electricity:Building,runperiod;
-Output:Meter:MeterFileOnly,InteriorLights:Electricity,runperiod;
-Output:Meter:MeterFileOnly,Electricity:HVAC,runperiod;
-Output:Meter:MeterFileOnly,Electricity:Plant,runperiod;
-=======
 !-Generator IDFEditor 1.50
 !-Option SortedOrder UseSpecialFormat
 !-NOTE: All comments with '!-' are ignored by the IDFEditor and are generated automatically.
@@ -5363,4 +2659,3 @@ Output:Meter:MeterFileOnly,Electricity:Plant,runperiod;
   Output:Meter:MeterFileOnly,Electricity:HVAC,runperiod;
 
   Output:Meter:MeterFileOnly,Electricity:Plant,runperiod;
->>>>>>> master
diff --git a/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/modelica.csv b/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/modelica.csv
deleted file mode 100644
index c0f45ff6c73..00000000000
--- a/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/modelica.csv
+++ /dev/null
@@ -1,2884 +0,0 @@
-#1
-float modelica(2881,12)
-# time,Pump [W],QEva_flow [W],TEvaEnt [K],TEvaLvg [K],mEva_flow [kg/s],QCon_flow [W],TConEnt [K],TConLvg [K],mEva_flow [kg/s],QGen_flow [W],QSteLoss [W]
-0,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-60,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-1980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-2940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-3960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-4980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-5940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-6960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-7980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-8940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-9960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-10980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-11940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-12960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-13980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-14940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-15960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-16980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-17940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-18960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-19980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-20940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-21960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22260,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22320,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22380,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22440,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22500,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22560,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22620,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22680,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22740,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22800,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22860,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22920,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-22980,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23040,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23100,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23160,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23220,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23280,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23340,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23400,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23460,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23520,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23580,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23640,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23700,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23760,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23820,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23880,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-23940,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24000,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24060,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24120,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24180,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24240,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24300,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24360,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24420,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24480,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24540,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24600,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24660,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24720,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24780,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24840,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24900,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-24960,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-25020,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-25080,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-25140,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-25200,0.0,0.0,287.4565,287.4565,0.0,0.0,303.0664,303.0664,0.0,0.0,0.0
-25260,150.0,7973.5267,288.36839999999995,279.82,0.2229,22210.2543,302.87579999999997,307.7068,1.0999,14086.7276,263.6646
-25320,150.0,8158.341,289.4462,279.82,0.2026,22725.3129,302.6579,307.601,1.0999,14416.9718,269.8636
-25380,150.0,8219.6002,289.85299999999995,279.82,0.1958,22895.9762,302.54069999999996,307.5209,1.0999,14526.376,271.9114
-25440,150.0,8222.2246,289.87109999999996,279.82,0.1955,22903.2867,302.4656,307.44739999999996,1.0999,14531.0621,271.9992
-25500,150.0,8198.3635,289.7088,279.82,0.1982,22836.8167,302.4126,307.38,1.0999,14488.4532,271.2016
-25560,150.0,8163.4143,289.47889999999995,279.82,0.202,22739.4479,302.373,307.31919999999997,1.0999,14426.0336,270.0338
-25620,150.0,8117.0889,289.1873,279.82,0.2071,22610.3681,302.3415,307.25969999999995,1.0999,14343.2792,268.4957
-25680,150.0,8057.9985,288.83549999999997,279.82,0.2136,22445.6958,302.3151,307.19739999999996,1.0999,14237.6973,266.531
-25740,150.0,7988.3063,288.4473,279.82,0.2213,22251.4509,302.2917,307.1318,1.0999,14113.1446,264.2093
-25800,150.0,7908.6217,288.03499999999997,279.82,0.23,22029.3293,302.27009999999996,307.0619,1.0999,13970.7076,261.5494
-25860,150.0,7819.2397,287.6083,279.82,0.2399,21780.1594,302.2491,306.9867,1.0999,13810.9197,258.5611
-25920,150.0,7720.5754,287.17629999999997,279.82,0.2507,21505.1151,302.22769999999997,306.90549999999996,1.0999,13634.5397,255.2591
-25980,150.0,7614.5347,286.7519,279.82,0.2624,21209.5386,302.2048,306.81829999999997,1.0999,13445.0039,251.7104
-26040,150.0,7502.9601,286.34439999999995,279.82,0.2746,20898.6062,302.18039999999996,306.7263,1.0999,13245.6461,247.9791
-26100,150.0,7385.6581,285.95349999999996,279.82,0.2875,20571.8293,302.155,306.6298,1.0999,13036.1712,244.0584
-26160,150.0,7262.0331,285.5779,279.82,0.3011,20227.6149,302.12829999999997,306.52819999999997,1.0999,12815.5817,239.931
-26220,150.0,7131.7458,285.2172,279.82,0.3155,19865.1014,302.1001,306.42109999999997,1.0999,12583.3556,235.5864
-26280,150.0,6994.4175,284.8709,279.82,0.3306,19483.341,302.0705,306.3085,1.0999,12338.9234,231.014
-26340,150.0,6856.5592,284.55379999999997,279.82,0.3457,19100.531,302.03929999999997,306.1941,1.0999,12093.9718,226.4141
-26400,150.0,6708.7447,284.2433,279.82,0.362,18690.6268,302.0071,306.0727,1.0999,11831.882,221.5254
-26460,150.0,6366.2096,283.9642,279.82,0.3666,17743.4134,301.959,305.8185,1.0999,11227.2038,210.3618
-26520,0.0,0.0,284.82009999999997,284.82009999999997,0.0,0.0,301.3802,301.3802,0.0,0.0,0.0
-26580,150.0,7024.6305,284.9444,279.82,0.3273,19567.2967,301.13599999999997,305.3925,1.0999,12392.6662,231.8898
-26640,150.0,6667.3132,284.1613,279.82,0.3666,18575.8472,301.41749999999996,305.4582,1.0999,11758.534,220.1078
-26700,0.0,0.0,284.9282,284.9282,0.0,0.0,301.0114,301.0114,0.0,0.0,0.0
-26760,150.0,7052.601,285.0137,279.82,0.3242,19645.0385,300.8785,305.15189999999996,1.0999,12442.4375,232.8259
-26820,150.0,6692.1955,284.21029999999996,279.82,0.3638,18644.7735,301.23199999999997,305.2877,1.0999,11802.578,220.9325
-26880,0.0,0.0,284.9675,284.9675,0.0,0.0,300.87809999999996,300.87809999999996,0.0,0.0,0.0
-26940,150.0,7064.0236,285.0424,279.82,0.3229,19676.7914,300.7838,305.06419999999997,1.0999,12462.7678,233.2087
-27000,150.0,6703.2232,284.23229999999995,279.82,0.3626,18675.3273,301.1638,305.22619999999995,1.0999,11822.104,221.2987
-27060,150.0,6249.1387,283.8879,279.82,0.3666,17420.6792,301.3486,305.138,1.0999,11021.5405,206.606
-27120,0.0,0.0,284.7224,284.7224,0.0,0.0,300.93359999999996,300.93359999999996,0.0,0.0,0.0
-27180,150.0,6982.7731,284.84299999999996,279.82,0.3319,19450.989,300.79409999999996,305.02529999999996,1.0999,12318.2159,230.5084
-27240,150.0,6523.2769,284.06649999999996,279.82,0.3666,18177.2453,301.14279999999997,305.0969,1.0999,11503.9684,215.4398
-27300,0.0,0.0,284.8357,284.8357,0.0,0.0,300.80649999999997,300.80649999999997,0.0,0.0,0.0
-27360,150.0,7016.2599,284.9239,279.82,0.3282,19544.0344,300.72049999999996,304.972,1.0999,12377.7745,231.6187
-27420,150.0,6605.9835,284.12039999999996,279.82,0.3666,18406.0414,301.10569999999996,305.10949999999997,1.0999,11650.0579,218.1135
-27480,0.0,0.0,284.8703,284.8703,0.0,0.0,300.7872,300.7872,0.0,0.0,0.0
-27540,150.0,7023.0588,284.9405,279.82,0.3274,19562.9286,300.7106,304.96619999999996,1.0999,12389.8699,231.8411
-27600,150.0,6607.5851,284.12149999999997,279.82,0.3666,18410.4741,301.10179999999997,305.1067,1.0999,11652.889,218.1654
-27660,0.0,0.0,284.8655,284.8655,0.0,0.0,300.78709999999995,300.78709999999995,0.0,0.0,0.0
-27720,150.0,7021.7743,284.93739999999997,279.82,0.3276,19559.359,300.7138,304.9686,1.0999,12387.5847,231.7996
-27780,150.0,6604.5732,284.11949999999996,279.82,0.3666,18402.138,301.10659999999996,305.1096,1.0999,11647.5648,218.0679
-27840,0.0,0.0,284.86289999999997,284.86289999999997,0.0,0.0,300.7935,300.7935,0.0,0.0,0.0
-27900,150.0,7020.0167,284.93309999999997,279.82,0.3278,19554.4747,300.7213,304.9751,1.0999,12384.4579,231.7424
-27960,150.0,6597.3379,284.1148,279.82,0.3666,18382.1137,301.1142,305.11289999999997,1.0999,11634.7758,217.8337
-28020,0.0,0.0,284.8576,284.8576,0.0,0.0,300.8019,300.8019,0.0,0.0,0.0
-28080,150.0,7017.3367,284.9265,279.82,0.3281,19547.0268,300.7301,304.9822,1.0999,12379.6901,231.6545
-28140,150.0,6587.6039,284.1085,279.82,0.3666,18355.177,301.1225,305.1153,1.0999,11617.573,217.5188
-28200,0.0,0.0,284.8476,284.8476,0.0,0.0,300.81059999999997,300.81059999999997,0.0,0.0,0.0
-28260,150.0,7011.0543,284.91119999999995,279.82,0.3288,19529.5687,300.73569999999995,304.984,1.0999,12368.5144,231.4418
-28320,0.0,0.0,285.2285,285.2285,0.0,0.0,300.5807,300.5807,0.0,0.0,0.0
-28380,150.0,7125.1348,285.1998,279.82,0.3162,19846.7147,300.59749999999997,304.91479999999996,1.0999,12571.58,235.2319
-28440,150.0,6745.011,284.3169,279.82,0.358,18791.1394,301.05039999999997,305.138,1.0999,11896.1284,222.6767
-28500,0.0,0.0,285.0204,285.0204,0.0,0.0,300.7716,300.7716,0.0,0.0,0.0
-28560,150.0,7070.6894,285.0592,279.82,0.3222,19695.3224,300.72409999999996,305.00849999999997,1.0999,12474.633,233.421
-28620,150.0,6692.0058,284.2099,279.82,0.3638,18644.2478,301.13649999999996,305.1921,1.0999,11802.242,220.9327
-28680,0.0,0.0,284.9251,284.9251,0.0,0.0,300.83489999999995,300.83489999999995,0.0,0.0,0.0
-28740,150.0,7039.9843,284.98229999999995,279.82,0.3256,19609.9694,300.7691,305.0349,1.0999,12419.985,232.3973
-28800,150.0,6645.0442,284.1459,279.82,0.3666,18514.1761,301.1683,305.1957,1.0999,11719.132,219.3774
-28860,0.0,0.0,284.8698,284.8698,0.0,0.0,300.8585,300.8585,0.0,0.0,0.0
-28920,150.0,7030.4094,284.9586,279.82,0.3266,19583.3572,300.7863,305.0463,1.0999,12402.9478,232.0531
-28980,150.0,6711.0683,284.248,279.82,0.3617,18697.0654,301.18289999999996,305.25,1.0999,11835.9971,221.4551
-29040,150.0,6478.9613,284.0377,279.82,0.3666,18054.7502,301.4049,305.3323,1.0999,11425.7889,214.0123
-29100,150.0,6323.1659,283.93609999999995,279.82,0.3666,17624.6882,301.5322,305.36609999999996,1.0999,11151.5223,208.9921
-29160,150.0,6270.1774,283.9016,279.82,0.3666,17478.6359,301.60409999999996,305.4061,1.0999,11058.4585,207.2854
-29220,150.0,6263.586,283.8973,279.82,0.3666,17460.476,301.64709999999997,305.4452,1.0999,11046.89,207.0702
-29280,150.0,6281.6275,283.909,279.82,0.3666,17510.1859,301.67699999999996,305.48589999999996,1.0999,11078.5584,207.6482
-29340,150.0,6303.9661,283.92359999999996,279.82,0.3666,17571.7545,301.7021,305.52439999999996,1.0999,11117.7883,208.3664
-29400,150.0,6330.8286,283.9411,279.82,0.3666,17645.8184,301.7258,305.56419999999997,1.0999,11164.9897,209.2294
-29460,150.0,6355.3626,283.95709999999997,279.82,0.3666,17713.4877,301.74879999999996,305.6019,1.0999,11208.1251,210.0193
-29520,150.0,6369.7085,283.96639999999996,279.82,0.3666,17753.0675,301.77079999999995,305.6325,1.0999,11233.3589,210.4814
-29580,150.0,6379.2699,283.9727,279.82,0.3666,17779.4514,301.79089999999997,305.6584,1.0999,11250.1815,210.7895
-29640,150.0,6397.6398,283.9847,279.82,0.3666,17830.1518,301.8096,305.688,1.0999,11282.512,211.3808
-29700,150.0,6415.5908,283.9964,279.82,0.3666,17879.7085,301.8273,305.71659999999997,1.0999,11314.1177,211.9598
-29760,150.0,6424.7132,284.0023,279.82,0.3666,17904.8971,301.8442,305.7389,1.0999,11330.1839,212.2541
-29820,150.0,6430.037,284.00579999999997,279.82,0.3666,17919.5986,301.85949999999997,305.75739999999996,1.0999,11339.5616,212.4259
-29880,150.0,6433.6488,284.00809999999996,279.82,0.3666,17929.573,301.873,305.7731,1.0999,11345.9242,212.5425
-29940,150.0,6436.4887,284.01,279.82,0.3666,17937.416,301.8848,305.78659999999996,1.0999,11350.9273,212.6341
-30000,150.0,6438.9713,284.0116,279.82,0.3666,17944.2726,301.89509999999996,305.79839999999996,1.0999,11355.3013,212.7143
-30060,150.0,6441.2732,284.01309999999995,279.82,0.3666,17950.6303,301.9042,305.8089,1.0999,11359.3571,212.7886
-30120,150.0,6443.4713,284.0145,279.82,0.3666,17956.7015,301.91249999999997,305.8184,1.0999,11363.2302,212.8596
-30180,150.0,6445.6019,284.0159,279.82,0.3666,17962.5862,301.91999999999996,305.8273,1.0999,11366.9844,212.9284
-30240,150.0,6458.5751,284.02439999999996,279.82,0.3666,17998.4234,301.9278,305.8429,1.0999,11389.8482,213.3465
-30300,150.0,6472.4895,284.0334,279.82,0.3666,18036.8668,301.93649999999997,305.8599,1.0999,11414.3774,213.796
-30360,150.0,6478.7482,284.03749999999997,279.82,0.3666,18054.1612,301.94599999999997,305.87309999999997,1.0999,11425.413,213.9982
-30420,150.0,6481.9216,284.03959999999995,279.82,0.3666,18062.9307,301.9552,305.8843,1.0999,11431.0091,214.1008
-30480,150.0,6483.8542,284.0408,279.82,0.3666,18068.2713,301.9638,305.8941,1.0999,11434.4171,214.1632
-30540,150.0,6485.3428,284.04179999999997,279.82,0.3666,18072.3851,301.9717,305.90279999999996,1.0999,11437.0423,214.2114
-30600,150.0,6486.7125,284.04269999999997,279.82,0.3666,18076.1704,301.9788,305.91069999999996,1.0999,11439.458,214.2556
-30660,150.0,6488.0799,284.04359999999997,279.82,0.3666,18079.9497,301.98539999999997,305.9181,1.0999,11441.8697,214.2998
-30720,150.0,6489.4791,284.04449999999997,279.82,0.3666,18083.8165,301.9915,305.9251,1.0999,11444.3374,214.3451
-30780,150.0,6490.9159,284.0454,279.82,0.3666,18087.7876,301.99739999999997,305.93179999999995,1.0999,11446.8717,214.3915
-30840,150.0,6492.3882,284.04639999999995,279.82,0.3666,18091.8568,302.003,305.9384,1.0999,11449.4686,214.4391
-30900,150.0,6493.8912,284.0474,279.82,0.3666,18096.0107,302.00849999999997,305.9448,1.0999,11452.1196,214.4877
-30960,150.0,6495.4191,284.04839999999996,279.82,0.3666,18100.2339,302.0139,305.9511,1.0999,11454.8148,214.5371
-31020,150.0,6496.9667,284.0494,279.82,0.3666,18104.5114,302.01919999999996,305.9573,1.0999,11457.5447,214.5871
-31080,150.0,6498.5295,284.05039999999997,279.82,0.3666,18108.8311,302.0245,305.96349999999995,1.0999,11460.3016,214.6377
-31140,150.0,6500.104,284.0514,279.82,0.3666,18113.1829,302.0297,305.9697,1.0999,11463.079,214.6886
-31200,150.0,6501.6871,284.05249999999995,279.82,0.3666,18117.5589,302.0349,305.9758,1.0999,11465.8718,214.7397
-31260,150.0,6503.2768,284.0535,279.82,0.3666,18121.9533,302.03999999999996,305.9819,1.0999,11468.6764,214.7911
-31320,150.0,6504.8716,284.05449999999996,279.82,0.3666,18126.3618,302.04519999999997,305.988,1.0999,11471.4901,214.8427
-31380,150.0,6506.4708,284.05559999999997,279.82,0.3666,18130.7822,302.05039999999997,305.9942,1.0999,11474.3115,214.8944
-31440,150.0,6519.0228,284.06379999999996,279.82,0.3666,18165.4833,302.05629999999996,306.00759999999997,1.0999,11496.4605,215.2998
-31500,150.0,6532.5613,284.07259999999997,279.82,0.3666,18202.9175,302.0635,306.02299999999997,1.0999,11520.3562,215.7377
-31560,150.0,6538.4368,284.0764,279.82,0.3666,18219.1656,302.07169999999996,306.03479999999996,1.0999,11530.7287,215.9278
-31620,150.0,6541.2403,284.0782,279.82,0.3666,18226.9187,302.08009999999996,306.04479999999995,1.0999,11535.6784,216.0186
-31680,150.0,6542.823,284.0793,279.82,0.3666,18231.2958,302.0879,306.0535,1.0999,11538.4727,216.0698
-31740,150.0,6543.9837,284.08,279.82,0.3666,18234.5059,302.09499999999997,306.0614,1.0999,11540.5222,216.1074
-31800,150.0,6545.0473,284.0807,279.82,0.3666,18237.4473,302.10159999999996,306.06859999999995,1.0999,11542.4,216.1418
-31860,150.0,6546.1293,284.0814,279.82,0.3666,18240.4398,302.10769999999997,306.07529999999997,1.0999,11544.3105,216.1768
-31920,150.0,6547.2631,284.0822,279.82,0.3666,18243.5757,302.11339999999996,306.0818,1.0999,11546.3126,216.2135
-31980,150.0,6548.454,284.0829,279.82,0.3666,18246.8695,302.1189,306.08799999999997,1.0999,11548.4155,216.2521
-32040,150.0,6549.6985,284.0838,279.82,0.3666,18250.3117,302.12429999999995,306.09409999999997,1.0999,11550.6131,216.2924
-32100,150.0,6550.9909,284.08459999999997,279.82,0.3666,18253.8862,302.1295,306.09999999999997,1.0999,11552.8953,216.3342
-32160,150.0,6552.3248,284.08549999999997,279.82,0.3666,18257.5757,302.1346,306.106,1.0999,11555.2509,216.3774
-32220,150.0,6553.6941,284.08639999999997,279.82,0.3666,18261.3631,302.13969999999995,306.1119,1.0999,11557.669,216.4217
-32280,150.0,6555.0934,284.08729999999997,279.82,0.3666,18265.2336,302.1447,306.11769999999996,1.0999,11560.1402,216.467
-32340,150.0,6556.5182,284.0882,279.82,0.3666,18269.1748,302.1497,306.12359999999995,1.0999,11562.6565,216.5132
-32400,150.0,6557.9651,284.0891,279.82,0.3666,18273.177,302.1547,306.1295,1.0999,11565.2119,216.56
-32460,150.0,6559.4313,284.09009999999995,279.82,0.3666,18277.2327,302.1597,306.1353,1.0999,11567.8014,216.6075
-32520,150.0,6560.9144,284.0911,279.82,0.3666,18281.3351,302.1645,306.14099999999996,1.0999,11570.4208,216.6555
-32580,150.0,6562.4122,284.092,279.82,0.3666,18285.4787,302.1692,306.14669999999995,1.0999,11573.0664,216.704
-32640,150.0,6563.9236,284.09299999999996,279.82,0.3666,18289.6595,302.174,306.15229999999997,1.0999,11575.736,216.7529
-32700,150.0,6565.4475,284.094,279.82,0.3666,18293.8752,302.17859999999996,306.1579,1.0999,11578.4277,216.8023
-32760,150.0,6566.9832,284.09499999999997,279.82,0.3666,18298.1236,302.1833,306.1635,1.0999,11581.1404,216.852
-32820,150.0,6568.5271,284.096,279.82,0.3666,18302.3947,302.188,306.16909999999996,1.0999,11583.8677,216.902
-32880,150.0,6570.0776,284.097,279.82,0.3666,18306.6844,302.19259999999997,306.1747,1.0999,11586.6067,216.9522
-32940,150.0,6571.637,284.0981,279.82,0.3666,18310.9985,302.1973,306.1803,1.0999,11589.3615,217.0027
-33000,150.0,6584.1229,284.1062,279.82,0.3666,18345.5446,302.2027,306.1932,1.0999,11611.4217,217.4067
-33060,150.0,6597.5985,284.11499999999995,279.82,0.3666,18382.8351,302.20939999999996,306.20799999999997,1.0999,11635.2365,217.8433
-33120,150.0,6603.4406,284.11879999999996,279.82,0.3666,18399.0035,302.21709999999996,306.2192,1.0999,11645.5628,218.0326
-33180,150.0,6606.2271,284.12059999999997,279.82,0.3666,18406.7157,302.2249,306.2287,1.0999,11650.4885,218.1229
-33240,150.0,6607.8042,284.1216,279.82,0.3666,18411.0807,302.2322,306.2369,1.0999,11653.2765,218.174
-33300,150.0,6608.9679,284.12239999999997,279.82,0.3666,18414.3015,302.2389,306.24429999999995,1.0999,11655.3337,218.2118
-33360,150.0,6610.0413,284.12309999999997,279.82,0.3666,18417.2727,302.2449,306.251,1.0999,11657.2314,218.2466
-33420,150.0,6611.1394,284.12379999999996,279.82,0.3666,18420.312,302.25059999999996,306.2573,1.0999,11659.1726,218.2822
-33480,150.0,6612.2948,284.1246,279.82,0.3666,18423.5102,302.25579999999997,306.26329999999996,1.0999,11661.2154,218.3196
-33540,150.0,6613.5127,284.12539999999996,279.82,0.3666,18426.8812,302.2609,306.269,1.0999,11663.3685,218.3591
-33600,150.0,6614.7894,284.1262,279.82,0.3666,18430.4151,302.2657,306.2747,1.0999,11665.6257,218.4005
-33660,150.0,6616.1189,284.1271,279.82,0.3666,18434.0953,302.27049999999997,306.2802,1.0999,11667.9764,218.4436
-33720,150.0,6617.4946,284.12789999999995,279.82,0.3666,18437.9033,302.2752,306.28569999999996,1.0999,11670.4087,218.4882
-33780,150.0,6618.91,284.1289,279.82,0.3666,18441.8212,302.27979999999997,306.2912,1.0999,11672.9113,218.5341
-33840,150.0,6620.3596,284.1298,279.82,0.3666,18445.8343,302.2844,306.2967,1.0999,11675.4746,218.5811
-33900,150.0,6621.8389,284.13079999999997,279.82,0.3666,18449.9293,302.289,306.30219999999997,1.0999,11678.0904,218.629
-33960,150.0,6623.3441,284.1318,279.82,0.3666,18454.0959,302.29359999999997,306.3076,1.0999,11680.7518,218.6778
-34020,150.0,6624.872,284.1328,279.82,0.3666,18458.3257,302.29819999999995,306.31309999999996,1.0999,11683.4538,218.7274
-34080,150.0,6626.4203,284.13379999999995,279.82,0.3666,18462.6121,302.30269999999996,306.3187,1.0999,11686.1918,218.7776
-34140,150.0,6627.9875,284.1348,279.82,0.3666,18466.9509,302.3073,306.32419999999996,1.0999,11688.9633,218.8284
-34200,150.0,6629.5718,284.13579999999996,279.82,0.3666,18471.3369,302.3119,306.3298,1.0999,11691.7651,218.8798
-34260,150.0,6631.1721,284.13689999999997,279.82,0.3666,18475.7675,302.31649999999996,306.33529999999996,1.0999,11694.5953,218.9317
-34320,150.0,6632.7876,284.1379,279.82,0.3666,18480.2399,302.3211,306.3409,1.0999,11697.4523,218.9841
-34380,150.0,6634.4174,284.13899999999995,279.82,0.3666,18484.7522,302.32579999999996,306.3465,1.0999,11700.3349,219.0369
-34440,150.0,6636.0608,284.14,279.82,0.3666,18489.3023,302.3304,306.35209999999995,1.0999,11703.2416,219.0902
-34500,150.0,6637.7172,284.1411,279.82,0.3666,18493.8886,302.335,306.3578,1.0999,11706.1714,219.1439
-34560,150.0,6650.0655,284.14919999999995,279.82,0.3666,18528.0807,302.34049999999996,306.37059999999997,1.0999,11728.0152,219.5443
-34620,150.0,6663.3821,284.1579,279.82,0.3666,18564.9593,302.34709999999995,306.3853,1.0999,11751.5772,219.9763
-34680,150.0,6667.5785,284.16179999999997,279.82,0.3665,18576.582,302.35479999999995,306.39549999999997,1.0999,11759.0035,220.1089
-34740,150.0,6668.7478,284.16409999999996,279.82,0.3664,18579.8206,302.3623,306.40369999999996,1.0999,11761.0728,220.1445
-34800,150.0,6669.6973,284.16589999999997,279.82,0.3663,18582.4505,302.36899999999997,306.411,1.0999,11762.7532,220.1734
-34860,150.0,6670.6165,284.16769999999997,279.82,0.3662,18584.9965,302.3751,306.4176,1.0999,11764.38,220.2014
-34920,150.0,6671.5556,284.1696,279.82,0.3661,18587.5976,302.38059999999996,306.4237,1.0999,11766.042,220.23
-34980,150.0,6672.5362,284.1715,279.82,0.366,18590.3136,302.38559999999995,306.42929999999996,1.0999,11767.7775,220.2611
-35040,150.0,6673.5705,284.1735,279.82,0.3659,18593.1787,302.3902,306.43449999999996,1.0999,11769.6082,220.2952
-35100,150.0,6674.6619,284.1757,279.82,0.3657,18596.2016,302.3947,306.4396,1.0999,11771.5398,220.3313
-35160,150.0,6675.8092,284.17789999999997,279.82,0.3656,18599.3798,302.39889999999997,306.4446,1.0999,11773.5705,220.3693
-35220,150.0,6677.0114,284.1803,279.82,0.3655,18602.7099,302.4031,306.4495,1.0999,11775.6984,220.4091
-35280,150.0,6678.2668,284.1828,279.82,0.3654,18606.1872,302.4072,306.4543,1.0999,11777.9204,220.4506
-35340,150.0,6679.5729,284.1853,279.82,0.3652,18609.8052,302.41119999999995,306.4591,1.0999,11780.2323,220.4938
-35400,150.0,6680.9272,284.188,279.82,0.3651,18613.5569,302.41519999999997,306.46389999999997,1.0999,11782.6297,220.5386
-35460,150.0,6682.3271,284.19079999999997,279.82,0.3649,18617.4348,302.4192,306.46869999999996,1.0999,11785.1077,220.5849
-35520,150.0,6683.77,284.1936,279.82,0.3647,18621.4317,302.4231,306.4736,1.0999,11787.6618,220.6327
-35580,150.0,6685.2533,284.19649999999996,279.82,0.3646,18625.5408,302.4271,306.47839999999997,1.0999,11790.2876,220.6818
-35640,150.0,6686.7742,284.1996,279.82,0.3644,18629.7542,302.431,306.4833,1.0999,11792.98,220.7321
-35700,150.0,6692.1497,284.2102,279.82,0.3638,18644.6465,302.4351,306.4906,1.0999,11802.4968,220.9102
-35760,150.0,6698.552,284.22299999999996,279.82,0.3631,18662.3847,302.4393,306.4987,1.0999,11813.8326,221.1221
-35820,150.0,6703.159,284.2321,279.82,0.3626,18675.1493,302.44379999999995,306.5059,1.0999,11821.9904,221.2748
-35880,150.0,6707.0297,284.2399,279.82,0.3622,18685.8745,302.44829999999996,306.51279999999997,1.0999,11828.8448,221.4031
-35940,150.0,6710.4383,284.2467,279.82,0.3618,18695.3196,302.4529,306.51939999999996,1.0999,11834.8813,221.516
-36000,150.0,6713.5289,284.25289999999995,279.82,0.3615,18703.8841,302.4574,306.5258,1.0999,11840.3552,221.6183
-36060,150.0,6716.3894,284.2587,279.82,0.3612,18711.8108,302.4618,306.53189999999995,1.0999,11845.4214,221.7131
-36120,150.0,6719.0746,284.2641,279.82,0.3609,18719.2523,302.46599999999995,306.53779999999995,1.0999,11850.1777,221.8021
-36180,150.0,6721.6226,284.2693,279.82,0.3606,18726.3137,302.4702,306.54339999999996,1.0999,11854.691,221.8865
-36240,150.0,6727.7013,284.28159999999997,279.82,0.3599,18743.1604,302.4744,306.55129999999997,1.0999,11865.4591,222.088
-36300,150.0,6734.6352,284.29569999999995,279.82,0.3592,18762.3786,302.4786,306.55969999999996,1.0999,11877.7434,222.3177
-36360,150.0,6739.7556,284.30609999999996,279.82,0.3586,18776.5714,302.48299999999995,306.56719999999996,1.0999,11886.8159,222.4875
-36420,150.0,6744.0896,284.315,279.82,0.3581,18788.5852,302.4874,306.57419999999996,1.0999,11894.4956,222.6313
-36480,150.0,6747.9124,284.3228,279.82,0.3577,18799.1822,302.49179999999996,306.5809,1.0999,11901.2699,222.758
-36540,150.0,6751.3726,284.33,279.82,0.3573,18808.7747,302.4962,306.58729999999997,1.0999,11907.4021,222.8727
-36600,150.0,6754.5628,284.3365,279.82,0.357,18817.6186,302.50039999999996,306.59349999999995,1.0999,11913.0559,222.9784
-36660,150.0,6757.543,284.3427,279.82,0.3566,18825.881,302.5046,306.5995,1.0999,11918.338,223.0772
-36720,150.0,6763.9034,284.35589999999996,279.82,0.3559,18843.5151,302.50879999999995,306.6076,1.0999,11929.6117,223.2882
-36780,150.0,6771.043,284.3707,279.82,0.3551,18863.311,302.5132,306.6162,1.0999,11942.268,223.5249
-36840,150.0,6776.3693,284.3818,279.82,0.3546,18878.0804,302.51759999999996,306.6239,1.0999,11951.711,223.7017
-36900,150.0,6780.8923,284.3913,279.82,0.3541,18890.6225,302.52209999999997,306.63109999999995,1.0999,11959.7302,223.8517
-36960,150.0,6784.8863,284.3997,279.82,0.3536,18901.6986,302.5265,306.6379,1.0999,11966.8122,223.9842
-37020,150.0,6788.5014,284.40729999999996,279.82,0.3532,18911.7239,302.5309,306.6445,1.0999,11973.2226,224.1041
-37080,150.0,6791.8312,284.41429999999997,279.82,0.3529,18920.9586,302.5352,306.6508,1.0999,11979.1274,224.2146
-37140,150.0,6794.9371,284.42089999999996,279.82,0.3525,18929.5727,302.5394,306.65689999999995,1.0999,11984.6356,224.3176
-37200,150.0,6801.4277,284.4346,279.82,0.3518,18947.5746,302.5437,306.6651,1.0999,11996.1469,224.533
-37260,150.0,6808.6892,284.45009999999996,279.82,0.351,18967.7162,302.5481,306.67379999999997,1.0999,12009.027,224.7739
-37320,150.0,6814.1182,284.46169999999995,279.82,0.3504,18982.7759,302.5526,306.6816,1.0999,12018.6577,224.9542
-37380,150.0,6818.7314,284.47159999999997,279.82,0.3499,18995.5731,302.5571,306.6889,1.0999,12026.8417,225.1074
-37440,150.0,6822.8058,284.4804,279.82,0.3495,19006.8763,302.56149999999997,306.69579999999996,1.0999,12034.0705,225.2426
-37500,150.0,6826.4932,284.4883,279.82,0.3491,19017.106,302.5659,306.70239999999995,1.0999,12040.6128,225.365
-37560,150.0,6829.8882,284.49559999999997,279.82,0.3487,19026.5252,302.5703,306.7088,1.0999,12046.6369,225.4777
-37620,150.0,6836.5045,284.51,279.82,0.3479,19044.8819,302.5746,306.7172,1.0999,12058.3775,225.6974
-37680,150.0,6843.8211,284.5259,279.82,0.3471,19065.1834,302.5791,306.726,1.0999,12071.3623,225.9402
-37740,150.0,6849.3263,284.5379,279.82,0.3465,19080.4597,302.5836,306.73389999999995,1.0999,12081.1333,226.1231
-37800,150.0,6854.0119,284.54819999999995,279.82,0.346,19093.462,302.5882,306.74129999999997,1.0999,12089.4501,226.2788
-37860,150.0,6858.1517,284.5573,279.82,0.3456,19104.9505,302.5927,306.7483,1.0999,12096.7988,226.4162
-37920,150.0,6861.8971,284.56559999999996,279.82,0.3452,19115.3446,302.59709999999995,306.755,1.0999,12103.4476,226.5406
-37980,150.0,6868.5854,284.58029999999997,279.82,0.3444,19133.9071,302.60159999999996,306.76349999999996,1.0999,12115.3217,226.7628
-38040,150.0,6875.8677,284.5965,279.82,0.3436,19154.1194,302.60609999999997,306.77239999999995,1.0999,12128.2517,227.0046
-38100,150.0,6881.3974,284.60889999999995,279.82,0.343,19169.4681,302.61069999999995,306.78029999999995,1.0999,12138.0707,227.1884
-38160,150.0,6886.1165,284.6194,279.82,0.3425,19182.5675,302.6153,306.78779999999995,1.0999,12146.451,227.3453
-38220,150.0,6890.2901,284.62879999999996,279.82,0.342,19194.1533,302.6198,306.79479999999995,1.0999,12153.8631,227.484
-38280,150.0,6894.0664,284.6373,279.82,0.3416,19204.6363,302.62429999999995,306.8016,1.0999,12160.5699,227.6094
-38340,150.0,6900.6676,284.6522,279.82,0.3409,19222.9623,302.62879999999996,306.80999999999995,1.0999,12172.2947,227.8288
-38400,150.0,6907.8283,284.66839999999996,279.82,0.3401,19242.8428,302.63329999999996,306.8189,1.0999,12185.0145,228.0667
-38460,150.0,6913.2858,284.68089999999995,279.82,0.3395,19257.9955,302.6379,306.8268,1.0999,12194.7097,228.2482
-38520,150.0,6917.9514,284.69149999999996,279.82,0.339,19270.9502,302.6425,306.83419999999995,1.0999,12202.9988,228.4033
-38580,150.0,6922.0827,284.70099999999996,279.82,0.3385,19282.4216,302.647,306.84119999999996,1.0999,12210.3389,228.5407
-38640,150.0,6925.8238,284.70959999999997,279.82,0.3381,19292.8099,302.6515,306.8479,1.0999,12216.9862,228.665
-38700,150.0,6932.3239,284.7245,279.82,0.3374,19310.8604,302.6559,306.8563,1.0999,12228.5365,228.8812
-38760,150.0,6939.3677,284.74089999999995,279.82,0.3366,19330.4216,302.6604,306.8651,1.0999,12241.054,229.1153
-38820,150.0,6944.7435,284.75329999999997,279.82,0.336,19345.3518,302.66499999999996,306.87289999999996,1.0999,12250.6083,229.2941
-38880,150.0,6949.3431,284.7641,279.82,0.3355,19358.1265,302.6696,306.8802,1.0999,12258.7834,229.4471
-38940,150.0,6953.4187,284.7736,279.82,0.3351,19369.4464,302.67409999999995,306.8872,1.0999,12266.0277,229.5827
-39000,150.0,6957.1117,284.78229999999996,279.82,0.3347,19379.704,302.6785,306.8938,1.0999,12272.5923,229.7055
-39060,150.0,6963.5185,284.79729999999995,279.82,0.334,19397.5001,302.683,306.9022,1.0999,12283.9816,229.9186
-39120,150.0,6970.4591,284.8137,279.82,0.3332,19416.7799,302.68739999999997,306.9108,1.0999,12296.3208,230.1494
-39180,150.0,6975.7581,284.8263,279.82,0.3326,19431.5005,302.692,306.91859999999997,1.0999,12305.7424,230.3258
-39240,150.0,6980.2931,284.83709999999996,279.82,0.3321,19444.0989,302.69649999999996,306.92589999999996,1.0999,12313.8059,230.4767
-39300,150.0,6984.3125,284.8467,279.82,0.3317,19455.2656,302.70099999999996,306.9328,1.0999,12320.9531,230.6104
-39360,150.0,6987.9557,284.8554,279.82,0.3313,19465.3874,302.7054,306.9394,1.0999,12327.4317,230.7316
-39420,150.0,6994.2765,284.87059999999997,279.82,0.3306,19482.9492,302.7098,306.94759999999997,1.0999,12338.6727,230.9419
-39480,150.0,7001.1231,284.8871,279.82,0.3298,19501.9727,302.7143,306.95619999999997,1.0999,12350.8496,231.1697
-39540,150.0,7006.3496,284.8997,279.82,0.3293,19516.4952,302.7188,306.96389999999997,1.0999,12360.1457,231.3437
-39600,150.0,7010.822,284.9106,279.82,0.3288,19528.9231,302.7233,306.9711,1.0999,12368.1011,231.4926
-39660,150.0,7014.786,284.9203,279.82,0.3283,19539.9385,302.7276,306.97769999999997,1.0999,12375.1526,231.6245
-39720,150.0,7018.3791,284.929,279.82,0.3279,19549.9236,302.7315,306.9838,1.0999,12381.5445,231.7441
-39780,150.0,7024.6174,284.9443,279.82,0.3273,19567.2602,302.7353,306.9914,1.0999,12392.6428,231.9518
-39840,150.0,7031.3734,284.96099999999996,279.82,0.3265,19586.0366,302.7389,306.9991,1.0999,12404.6631,232.1766
-39900,150.0,7036.5269,284.97369999999995,279.82,0.3259,19600.3598,302.7426,307.0059,1.0999,12413.8329,232.3483
-39960,150.0,7040.9343,284.9846,279.82,0.3255,19612.6099,302.7462,307.0122,1.0999,12421.6755,232.4951
-40020,150.0,7044.8386,284.99429999999995,279.82,0.325,19623.4618,302.7498,307.0181,1.0999,12428.6232,232.6251
-40080,150.0,7051.1161,285.01,279.82,0.3243,19640.9108,302.75329999999997,307.0254,1.0999,12439.7948,232.8341
-40140,150.0,7057.8072,285.0267,279.82,0.3236,19659.5104,302.7568,307.03299999999996,1.0999,12451.7032,233.0569
-40200,150.0,7062.9468,285.0397,279.82,0.323,19673.7978,302.7604,307.03959999999995,1.0999,12460.8511,233.2281
-40260,150.0,7067.3483,285.0508,279.82,0.3226,19686.0341,302.7639,307.0458,1.0999,12468.6858,233.3748
-40320,150.0,7071.2476,285.06059999999997,279.82,0.3221,19696.8742,302.7673,307.0516,1.0999,12475.6267,233.5046
-40380,150.0,7074.7781,285.0696,279.82,0.3217,19706.6897,302.7707,307.0571,1.0999,12481.9115,233.6222
-40440,150.0,7080.7941,285.0849,279.82,0.3211,19723.4155,302.7741,307.06419999999997,1.0999,12492.6214,233.8226
-40500,150.0,7087.2847,285.1015,279.82,0.3204,19741.4616,302.7775,307.07149999999996,1.0999,12504.1769,234.0388
-40560,150.0,7092.2471,285.11429999999996,279.82,0.3198,19755.2595,302.7809,307.0779,1.0999,12513.0124,234.2042
-40620,150.0,7096.4944,285.12519999999995,279.82,0.3194,19767.0694,302.7843,307.08389999999997,1.0999,12520.5749,234.3457
-40680,150.0,7100.2589,285.13489999999996,279.82,0.3189,19777.5371,302.7877,307.0895,1.0999,12527.2781,234.4711
-40740,150.0,7106.2878,285.15049999999997,279.82,0.3183,19794.3018,302.7911,307.09659999999997,1.0999,12538.014,234.6721
-40800,150.0,7112.7073,285.1672,279.82,0.3176,19812.1535,302.79449999999997,307.10389999999995,1.0999,12549.4462,234.8859
-40860,150.0,7117.64,285.1801,279.82,0.317,19825.8711,302.798,307.1103,1.0999,12558.2311,235.0504
-40920,150.0,7121.8647,285.1912,279.82,0.3166,19837.6202,302.8014,307.11629999999997,1.0999,12565.7555,235.1912
-40980,150.0,7125.6077,285.20099999999996,279.82,0.3162,19848.03,302.8048,307.1219,1.0999,12572.4223,235.3159
-41040,150.0,7131.5104,285.21659999999997,279.82,0.3155,19864.4467,302.8082,307.1289,1.0999,12582.9363,235.5127
-41100,150.0,7137.7746,285.23319999999995,279.82,0.3148,19881.8695,302.8116,307.1361,1.0999,12594.0949,235.7214
-41160,150.0,7142.5991,285.246,279.82,0.3143,19895.2885,302.815,307.1425,1.0999,12602.6894,235.8823
-41220,150.0,7146.7345,285.25699999999995,279.82,0.3138,19906.7911,302.8184,307.1484,1.0999,12610.0566,236.0202
-41280,150.0,7150.4001,285.2668,279.82,0.3134,19916.9873,302.8218,307.15389999999996,1.0999,12616.5872,236.1424
-41340,150.0,7153.7207,285.2757,279.82,0.3131,19926.2243,302.825,307.1592,1.0999,12622.5035,236.2531
-41400,150.0,7159.351,285.29089999999997,279.82,0.3124,19941.8862,302.82829999999996,307.16589999999997,1.0999,12632.5351,236.4408
-41460,150.0,7165.417,285.30719999999997,279.82,0.3118,19958.7606,302.8316,307.17289999999997,1.0999,12643.3437,236.643
-41520,150.0,7170.0546,285.3198,279.82,0.3113,19971.6623,302.835,307.179,1.0999,12651.6077,236.7977
-41580,150.0,7174.0231,285.3306,279.82,0.3108,19982.7027,302.8383,307.18469999999996,1.0999,12658.6795,236.9301
-41640,150.0,7177.5404,285.3402,279.82,0.3104,19992.488,302.84159999999997,307.1901,1.0999,12664.9476,237.0474
-41700,150.0,7183.1784,285.3556,279.82,0.3098,20008.1737,302.8449,307.19689999999997,1.0999,12674.9953,237.2354
-41760,150.0,7189.1792,285.3721,279.82,0.3092,20024.8694,302.84819999999996,307.2038,1.0999,12685.6902,237.4355
-41820,150.0,7193.7838,285.3848,279.82,0.3087,20037.6812,302.8515,307.21,1.0999,12693.8973,237.5891
-41880,150.0,7197.7239,285.3957,279.82,0.3082,20048.6442,302.8549,307.21569999999997,1.0999,12700.9202,237.7206
-41940,150.0,7201.213,285.40529999999995,279.82,0.3078,20058.3523,302.8581,307.2211,1.0999,12707.1394,237.837
-42000,150.0,7206.7311,285.42069999999995,279.82,0.3072,20073.7068,302.8615,307.22769999999997,1.0999,12716.9757,238.0211
-42060,150.0,7212.5863,285.43699999999995,279.82,0.3066,20089.9997,302.86469999999997,307.23449999999997,1.0999,12727.4135,238.2163
-42120,150.0,7217.0861,285.44969999999995,279.82,0.3061,20102.5214,302.86809999999997,307.2406,1.0999,12735.4354,238.3665
-42180,150.0,7220.9376,285.46049999999997,279.82,0.3057,20113.2394,302.8714,307.2462,1.0999,12742.3018,238.495
-42240,150.0,7224.3484,285.4701,279.82,0.3053,20122.7311,302.8746,307.25149999999996,1.0999,12748.3828,238.6088
-42300,150.0,7229.7233,285.4853,279.82,0.3047,20137.6893,302.87789999999995,307.25809999999996,1.0999,12757.966,238.7882
-42360,150.0,7235.4214,285.50149999999996,279.82,0.3041,20153.5472,302.8812,307.2648,1.0999,12768.1258,238.9782
-42420,150.0,7239.8016,285.51399999999995,279.82,0.3036,20165.7377,302.8845,307.2707,1.0999,12775.9361,239.1245
-42480,150.0,7243.5507,285.5247,279.82,0.3032,20176.1721,302.8877,307.2763,1.0999,12782.6214,239.2496
-42540,150.0,7246.8707,285.5342,279.82,0.3028,20185.4125,302.89099999999996,307.2815,1.0999,12788.5417,239.3604
-42600,150.0,7252.1002,285.5492,279.82,0.3022,20199.9675,302.89419999999996,307.2879,1.0999,12797.8673,239.535
-42660,150.0,7257.6422,285.5652,279.82,0.3016,20215.3931,302.89739999999995,307.29449999999997,1.0999,12807.7508,239.7198
-42720,150.0,7261.9009,285.5775,279.82,0.3012,20227.2468,302.9007,307.3003,1.0999,12815.3459,239.862
-42780,150.0,7265.5448,285.5881,279.82,0.3008,20237.3896,302.90389999999996,307.3058,1.0999,12821.8448,239.9837
-42840,150.0,7268.771,285.59749999999997,279.82,0.3004,20246.37,302.90709999999996,307.31089999999995,1.0999,12827.5989,240.0913
-42900,150.0,7273.8561,285.6124,279.82,0.2998,20260.5249,302.9104,307.31719999999996,1.0999,12836.6688,240.2611
-42960,150.0,7279.2446,285.6282,279.82,0.2993,20275.5247,302.9135,307.3237,1.0999,12846.2802,240.4409
-43020,150.0,7283.3822,285.64029999999997,279.82,0.2988,20287.0429,302.91679999999997,307.32939999999996,1.0999,12853.6607,240.5791
-43080,150.0,7286.9208,285.6508,279.82,0.2984,20296.8936,302.91999999999996,307.3348,1.0999,12859.9729,240.6973
-43140,150.0,7290.0527,285.65999999999997,279.82,0.2981,20305.6125,302.9231,307.33979999999997,1.0999,12865.5598,240.8018
-43200,150.0,7294.995,285.6747,279.82,0.2975,20319.3716,302.92629999999997,307.346,1.0999,12874.3766,240.9669
-43260,150.0,7300.2319,285.6903,279.82,0.2969,20333.9511,302.9294,307.3522,1.0999,12883.7192,241.1417
-43320,150.0,7303.7786,285.7009,279.82,0.2966,20343.8252,302.9324,307.3574,1.0999,12890.0466,241.2612
-43380,150.0,7305.9259,285.7073,279.82,0.2963,20349.8035,302.93519999999995,307.3615,1.0999,12893.8776,241.3335
-43440,150.0,7307.0301,285.7106,279.82,0.2962,20352.8779,302.93789999999996,307.3649,1.0999,12895.8477,241.3705
-43500,150.0,7307.4777,285.712,279.82,0.2961,20354.124,302.94039999999995,307.36769999999996,1.0999,12896.6463,241.3853
-43560,150.0,7307.5381,285.7122,279.82,0.2961,20354.2922,302.9427,307.37,1.0999,12896.7541,241.3873
-43620,150.0,7307.3644,285.7116,279.82,0.2962,20353.8085,302.9448,307.37199999999996,1.0999,12896.4441,241.3814
-43680,150.0,7307.0402,285.7107,279.82,0.2962,20352.9059,302.9468,307.37379999999996,1.0999,12895.8657,241.3706
-43740,150.0,7306.6161,285.70939999999996,279.82,0.2962,20351.7251,302.9487,307.37539999999996,1.0999,12895.109,241.3564
-43800,150.0,7306.1275,285.7079,279.82,0.2963,20350.3649,302.9504,307.3769,1.0999,12894.2374,241.3401
-43860,150.0,7305.6013,285.7063,279.82,0.2964,20348.9,302.9521,307.3782,1.0999,12893.2986,241.3225
-43920,150.0,7305.0579,285.7047,279.82,0.2964,20347.3869,302.9538,307.3795,1.0999,12892.329,241.3044
-43980,150.0,7304.5123,285.70309999999995,279.82,0.2965,20345.8679,302.9554,307.38079999999997,1.0999,12891.3556,241.2861
-44040,150.0,7303.9756,285.70149999999995,279.82,0.2965,20344.3738,302.95689999999996,307.38199999999995,1.0999,12890.3982,241.2682
-44100,150.0,7303.456,285.69989999999996,279.82,0.2966,20342.9271,302.95849999999996,307.38329999999996,1.0999,12889.4711,241.2509
-44160,150.0,7302.9593,285.6984,279.82,0.2966,20341.5442,302.96,307.3845,1.0999,12888.5849,241.2343
-44220,150.0,7302.4898,285.697,279.82,0.2967,20340.2371,302.9615,307.3857,1.0999,12887.7473,241.2186
-44280,150.0,7302.0507,285.6957,279.82,0.2967,20339.0146,302.96299999999997,307.38689999999997,1.0999,12886.964,241.2039
-44340,150.0,7301.6442,285.69449999999995,279.82,0.2968,20337.883,302.9645,307.3882,1.0999,12886.2388,241.1904
-44400,150.0,7301.272,285.6934,279.82,0.2968,20336.8468,302.96599999999995,307.3895,1.0999,12885.5748,241.1779
-44460,150.0,7300.9351,285.69239999999996,279.82,0.2969,20335.9087,302.9675,307.39079999999996,1.0999,12884.9736,241.1667
-44520,150.0,7300.634,285.69149999999996,279.82,0.2969,20335.0706,302.969,307.39209999999997,1.0999,12884.4366,241.1566
-44580,150.0,7300.3692,285.6907,279.82,0.2969,20334.3334,302.9706,307.39349999999996,1.0999,12883.9642,241.1478
-44640,150.0,7300.1407,285.69,279.82,0.297,20333.6971,302.97209999999995,307.3949,1.0999,12883.5564,241.1401
-44700,150.0,7299.9482,285.68949999999995,279.82,0.297,20333.1612,302.9736,307.3963,1.0999,12883.213,241.1337
-44760,150.0,7299.7915,285.68899999999996,279.82,0.297,20332.7248,302.9752,307.3977,1.0999,12882.9334,241.1284
-44820,150.0,7299.67,285.68859999999995,279.82,0.297,20332.3867,302.9767,307.39919999999995,1.0999,12882.7167,241.1244
-44880,150.0,7299.5832,285.6884,279.82,0.297,20332.145,302.9783,307.4007,1.0999,12882.5618,241.1215
-44940,150.0,7299.5304,285.6882,279.82,0.297,20331.9981,302.9799,307.40229999999997,1.0999,12882.4677,241.1197
-45000,150.0,7299.5109,285.68809999999996,279.82,0.297,20331.9438,302.98139999999995,307.4038,1.0999,12882.4329,241.119
-45060,150.0,7299.5239,285.6882,279.82,0.297,20331.9799,302.98299999999995,307.4054,1.0999,12882.456,241.1194
-45120,150.0,7299.5686,285.68829999999997,279.82,0.297,20332.1043,302.9846,307.40709999999996,1.0999,12882.5357,241.1209
-45180,150.0,7299.644,285.6885,279.82,0.297,20332.3143,302.9862,307.40869999999995,1.0999,12882.6703,241.1234
-45240,150.0,7299.7494,285.6889,279.82,0.297,20332.6078,302.9878,307.4104,1.0999,12882.8584,241.1269
-45300,150.0,7299.8839,285.6893,279.82,0.297,20332.9822,302.98949999999996,307.41209999999995,1.0999,12883.0983,241.1314
-45360,150.0,7300.0465,285.68969999999996,279.82,0.297,20333.4349,302.99109999999996,307.4138,1.0999,12883.3884,241.1368
-45420,150.0,7300.2364,285.6903,279.82,0.2969,20333.9637,302.99269999999996,307.4156,1.0999,12883.7273,241.1432
-45480,150.0,7300.4527,285.691,279.82,0.2969,20334.5659,302.9944,307.41729999999995,1.0999,12884.1131,241.1504
-45540,150.0,7300.6945,285.69169999999997,279.82,0.2969,20335.2391,302.996,307.41909999999996,1.0999,12884.5445,241.1584
-45600,150.0,7300.961,285.6925,279.82,0.2969,20335.9809,302.99769999999995,307.421,1.0999,12885.0199,241.1673
-45660,150.0,7301.2513,285.69329999999997,279.82,0.2968,20336.789,302.9994,307.4228,1.0999,12885.5378,241.177
-45720,150.0,7301.5645,285.6943,279.82,0.2968,20337.6611,303.001,307.4247,1.0999,12886.0966,241.1874
-45780,150.0,7301.8999,285.6953,279.82,0.2968,20338.5948,303.0027,307.4266,1.0999,12886.6949,241.1986
-45840,150.0,7302.2566,285.69629999999995,279.82,0.2967,20339.5879,303.0044,307.4285,1.0999,12887.3313,241.2105
-45900,150.0,7302.6339,285.6975,279.82,0.2967,20340.6383,303.0061,307.43039999999996,1.0999,12888.0044,241.2231
-45960,150.0,7303.0309,285.6987,279.82,0.2966,20341.7438,303.0078,307.4323,1.0999,12888.7128,241.2364
-46020,150.0,7303.4471,285.69989999999996,279.82,0.2966,20342.9023,303.0095,307.4343,1.0999,12889.4552,241.2502
-46080,150.0,7303.8816,285.7012,279.82,0.2965,20344.1121,303.0112,307.4362,1.0999,12890.2305,241.2647
-46140,150.0,7304.3338,285.70259999999996,279.82,0.2965,20345.3711,303.0129,307.4382,1.0999,12891.0373,241.2798
-46200,150.0,7304.803,285.70399999999995,279.82,0.2964,20346.6772,303.0146,307.4402,1.0999,12891.8743,241.2955
-46260,150.0,7305.2884,285.7054,279.82,0.2964,20348.0287,303.0164,307.4423,1.0999,12892.7403,241.3117
-46320,150.0,7305.7896,285.70689999999996,279.82,0.2963,20349.424,303.0181,307.4443,1.0999,12893.6344,241.3284
-46380,150.0,7306.3058,285.70849999999996,279.82,0.2963,20350.8613,303.0198,307.44629999999995,1.0999,12894.5555,241.3456
-46440,150.0,7306.8366,285.71009999999995,279.82,0.2962,20352.339,303.0216,307.4484,1.0999,12895.5024,241.3633
-46500,150.0,7307.3813,285.71169999999995,279.82,0.2962,20353.8556,303.02329999999995,307.4505,1.0999,12896.4743,241.3815
-46560,150.0,7307.9394,285.7134,279.82,0.2961,20355.4095,303.02509999999995,307.45259999999996,1.0999,12897.4701,241.4001
-46620,150.0,7308.5105,285.71509999999995,279.82,0.296,20356.9995,303.0268,307.4547,1.0999,12898.489,241.4192
-46680,150.0,7309.094,285.7168,279.82,0.296,20358.624,303.0286,307.4568,1.0999,12899.53,241.4386
-46740,150.0,7309.6894,285.7186,279.82,0.2959,20360.2817,303.03029999999995,307.45889999999997,1.0999,12900.5923,241.4585
-46800,150.0,7310.2963,285.7204,279.82,0.2958,20361.9713,303.03209999999996,307.46099999999996,1.0999,12901.675,241.4788
-46860,150.0,7310.9141,285.72229999999996,279.82,0.2958,20363.6916,303.03369999999995,307.46299999999997,1.0999,12902.7775,241.4994
-46920,150.0,7311.9993,285.7256,279.82,0.2956,20366.7129,303.0352,307.4652,1.0999,12904.7136,241.5345
-46980,150.0,7313.8854,285.7312,279.82,0.2954,20371.9643,303.0367,307.4677,1.0999,12908.0788,241.5969
-47040,150.0,7316.4047,285.73879999999997,279.82,0.2952,20378.9786,303.0381,307.47069999999997,1.0999,12912.5739,241.6809
-47100,150.0,7319.2807,285.7475,279.82,0.2948,20386.9862,303.03959999999995,307.474,1.0999,12917.7054,241.777
-47160,150.0,7322.315,285.75669999999997,279.82,0.2945,20395.4346,303.0412,307.4774,1.0999,12923.1196,241.8784
-47220,150.0,7325.4025,285.7661,279.82,0.2942,20404.0314,303.0428,307.48089999999996,1.0999,12928.6289,241.9816
-47280,150.0,7328.4948,285.77549999999997,279.82,0.2938,20412.6415,303.04449999999997,307.48449999999997,1.0999,12934.1467,242.0848
-47340,150.0,7331.5685,285.7849,279.82,0.2935,20421.2,303.0462,307.488,1.0999,12939.6315,242.1875
-47400,150.0,7336.7273,285.8007,279.82,0.2929,20435.5647,303.0481,307.493,1.0999,12948.8374,242.3599
-47460,150.0,7342.3665,285.818,279.82,0.2923,20451.2675,303.04999999999995,307.49839999999995,1.0999,12958.901,242.5481
-47520,150.0,7346.9122,285.832,279.82,0.2918,20463.9257,303.0521,307.5032,1.0999,12967.0135,242.7
-47580,150.0,7353.027,285.851,279.82,0.2911,20480.9535,303.05429999999996,307.5091,1.0999,12977.9265,242.9044
-47640,150.0,7359.3219,285.8705,279.82,0.2904,20498.4833,303.0566,307.5152,1.0999,12989.1615,243.1146
-47700,150.0,7364.3644,285.8863,279.82,0.2899,20512.5261,303.0589,307.52049999999997,1.0999,12998.1617,243.2831
-47760,150.0,7370.8369,285.90659999999997,279.82,0.2892,20530.5514,303.06129999999996,307.52689999999996,1.0999,13009.7145,243.4995
-47820,150.0,7377.3928,285.9273,279.82,0.2885,20548.8098,303.06379999999996,307.5333,1.0999,13021.417,243.7184
-47880,150.0,7382.6345,285.9439,279.82,0.2879,20563.4081,303.06629999999996,307.539,1.0999,13030.7737,243.8936
-47940,150.0,7389.2312,285.9649,279.82,0.2872,20581.7809,303.0689,307.5456,1.0999,13042.5498,244.1142
-48000,150.0,7395.8604,285.98609999999996,279.82,0.2864,20600.2447,303.07149999999996,307.55219999999997,1.0999,13054.3843,244.3357
-48060,150.0,7401.1477,286.00309999999996,279.82,0.2858,20614.9716,303.07399999999996,307.558,1.0999,13063.8238,244.5124
-48120,150.0,7407.7406,286.02439999999996,279.82,0.2851,20633.335,303.07669999999996,307.5646,1.0999,13075.5945,244.7329
-48180,150.0,7414.3364,286.0458,279.82,0.2844,20651.7073,303.0793,307.5712,1.0999,13087.3709,244.9533
-48240,150.0,7421.3499,286.0687,279.82,0.2836,20671.2434,303.082,307.5782,1.0999,13099.8935,245.1879
-48300,150.0,7428.0898,286.0908,279.82,0.2829,20690.018,303.0847,307.585,1.0999,13111.9282,245.4132
-48360,150.0,7433.4584,286.1085,279.82,0.2823,20704.9729,303.0874,307.5909,1.0999,13121.5146,245.5926
-48420,150.0,7439.8984,286.1298,279.82,0.2816,20722.913,303.0902,307.5976,1.0999,13133.0146,245.8081
-48480,150.0,7446.2549,286.1509,279.82,0.2809,20740.6209,303.09279999999995,307.60409999999996,1.0999,13144.3659,246.0205
-48540,150.0,7451.3177,286.1679,279.82,0.2803,20754.7248,303.09549999999996,307.60979999999995,1.0999,13153.4071,246.1898
-48600,150.0,7457.4972,286.18859999999995,279.82,0.2796,20771.9404,303.09819999999996,307.6162,1.0999,13164.4431,246.3966
-48660,150.0,7463.6223,286.2093,279.82,0.279,20789.0046,303.1008,307.6226,1.0999,13175.3823,246.6013
-48720,150.0,7468.4757,286.22569999999996,279.82,0.2784,20802.5261,303.1033,307.62809999999996,1.0999,13184.0504,246.7636
-48780,150.0,7474.4315,286.246,279.82,0.2778,20819.1192,303.106,307.6343,1.0999,13194.6877,246.963
-48840,150.0,7480.3381,286.26619999999997,279.82,0.2771,20835.5757,303.1085,307.6404,1.0999,13205.2376,247.1604
-48900,150.0,7484.9985,286.2822,279.82,0.2766,20848.5603,303.111,307.6458,1.0999,13213.5619,247.3163
-48960,150.0,7490.7286,286.3019,279.82,0.276,20864.5255,303.11359999999996,307.6518,1.0999,13223.797,247.5081
-49020,150.0,7496.4089,286.3216,279.82,0.2754,20880.3524,303.11609999999996,307.6577,1.0999,13233.9435,247.698
-49080,150.0,7500.8753,286.33709999999996,279.82,0.2749,20892.7973,303.1185,307.6629,1.0999,13241.9219,247.8474
-49140,150.0,7506.3705,286.3563,279.82,0.2743,20908.1087,303.121,307.6687,1.0999,13251.7382,248.0314
-49200,150.0,7511.8142,286.37539999999996,279.82,0.2737,20923.2769,303.1235,307.6744,1.0999,13261.4627,248.2134
-49260,150.0,7516.0823,286.3904,279.82,0.2732,20935.1698,303.1259,307.6794,1.0999,13269.0875,248.3561
-49320,150.0,7521.3349,286.409,279.82,0.2726,20949.8061,303.12829999999997,307.6851,1.0999,13278.4712,248.5321
-49380,150.0,7526.5347,286.4274,279.82,0.2721,20964.2953,303.1307,307.69059999999996,1.0999,13287.7606,248.7059
-49440,150.0,7530.6017,286.4419,279.82,0.2716,20975.6283,303.133,307.69539999999995,1.0999,13295.0266,248.842
-49500,150.0,7535.6077,286.4598,279.82,0.2711,20989.5779,303.1354,307.70079999999996,1.0999,13303.9702,249.0096
-49560,150.0,7540.5602,286.4776,279.82,0.2705,21003.3788,303.1377,307.7061,1.0999,13312.8185,249.1752
-49620,150.0,7544.4257,286.4915,279.82,0.2701,21014.1505,303.14,307.7107,1.0999,13319.7249,249.3046
-49680,150.0,7547.7214,286.5034,279.82,0.2697,21023.3347,303.1422,307.7149,1.0999,13325.6133,249.4148
-49740,150.0,7552.1943,286.51959999999997,279.82,0.2692,21035.7992,303.14439999999996,307.7199,1.0999,13333.605,249.5647
-49800,150.0,7556.7418,286.53619999999995,279.82,0.2687,21048.4721,303.1466,307.72479999999996,1.0999,13341.7303,249.7167
-49860,150.0,7560.2582,286.549,279.82,0.2683,21058.2716,303.14869999999996,307.72909999999996,1.0999,13348.0134,249.8344
-49920,150.0,7564.7082,286.5653,279.82,0.2679,21070.6729,303.15099999999995,307.734,1.0999,13355.9647,249.9835
-49980,150.0,7569.1383,286.5816,279.82,0.2674,21083.0189,303.1531,307.73879999999997,1.0999,13363.8806,250.1317
-50040,150.0,7572.5587,286.5942,279.82,0.267,21092.5511,303.1552,307.743,1.0999,13369.9924,250.2461
-50100,150.0,7575.459,286.6049,279.82,0.2667,21100.6338,303.1572,307.7468,1.0999,13375.1748,250.3431
-50160,150.0,7579.4567,286.61969999999997,279.82,0.2662,21111.775,303.1594,307.75129999999996,1.0999,13382.3184,250.4771
-50220,150.0,7583.531,286.63489999999996,279.82,0.2658,21123.1298,303.16139999999996,307.75579999999997,1.0999,13389.5988,250.6134
-50280,150.0,7586.6576,286.6465,279.82,0.2654,21131.8436,303.16339999999997,307.75969999999995,1.0999,13395.186,250.718
-50340,150.0,7589.3055,286.65639999999996,279.82,0.2651,21139.2232,303.1653,307.76329999999996,1.0999,13399.9177,250.8066
-50400,150.0,7593.0443,286.6705,279.82,0.2647,21149.6433,303.1674,307.76759999999996,1.0999,13406.599,250.9319
-50460,150.0,7596.8746,286.68489999999997,279.82,0.2643,21160.3185,303.16909999999996,307.7716,1.0999,13413.4439,251.06
-50520,150.0,7599.7948,286.6959,279.82,0.264,21168.457,303.17049999999995,307.77479999999997,1.0999,13418.6623,251.1578
-50580,150.0,7602.2599,286.7052,279.82,0.2637,21175.3276,303.17179999999996,307.7776,1.0999,13423.0677,251.2402
-50640,150.0,7604.415,286.7134,279.82,0.2635,21181.334,303.17289999999997,307.78,1.0999,13426.919,251.3123
-50700,150.0,7607.782,286.72619999999995,279.82,0.2631,21190.7181,303.174,307.78319999999997,1.0999,13432.9361,251.4253
-50760,150.0,7611.3119,286.7396,279.82,0.2627,21200.5564,303.17499999999995,307.7863,1.0999,13439.2445,251.5433
-50820,150.0,7613.9673,286.74969999999996,279.82,0.2624,21207.9571,303.17589999999996,307.7888,1.0999,13443.9899,251.6322
-50880,150.0,7616.1977,286.75829999999996,279.82,0.2622,21214.1736,303.1767,307.791,1.0999,13447.9759,251.7068
-50940,150.0,7619.4848,286.7709,279.82,0.2618,21223.3355,303.17769999999996,307.7939,1.0999,13453.8506,251.8171
-51000,150.0,7622.8797,286.78389999999996,279.82,0.2615,21232.7975,303.1785,307.79679999999996,1.0999,13459.9178,251.9306
-51060,150.0,7625.4313,286.7938,279.82,0.2612,21239.9094,303.17929999999996,307.7992,1.0999,13464.4781,252.016
-51120,150.0,7627.569,286.80199999999996,279.82,0.2609,21245.8676,303.1801,307.8012,1.0999,13468.2986,252.0876
-51180,150.0,7629.4287,286.8092,279.82,0.2607,21251.0509,303.1808,307.8031,1.0999,13471.6222,252.1498
-51240,150.0,7632.4066,286.82079999999996,279.82,0.2604,21259.351,303.1816,307.8057,1.0999,13476.9444,252.2497
-51300,150.0,7635.5392,286.8329,279.82,0.2601,21268.0823,303.1823,307.8083,1.0999,13482.5431,252.3545
-51360,150.0,7637.8739,286.842,279.82,0.2598,21274.5897,303.18309999999997,307.81039999999996,1.0999,13486.7158,252.4326
-51420,150.0,7639.8238,286.84959999999995,279.82,0.2596,21280.0247,303.1837,307.8123,1.0999,13490.2009,252.4979
-51480,150.0,7641.5181,286.8563,279.82,0.2594,21284.7472,303.1844,307.81399999999996,1.0999,13493.2291,252.5546
-51540,150.0,7643.0305,286.8622,279.82,0.2592,21288.9627,303.185,307.8155,1.0999,13495.9321,252.6052
-51600,150.0,7645.7297,286.8728,279.82,0.2589,21296.4861,303.1857,307.8178,1.0999,13500.7564,252.6958
-51660,150.0,7648.6277,286.88419999999996,279.82,0.2586,21304.5637,303.18629999999996,307.8202,1.0999,13505.936,252.7927
-51720,150.0,7650.756,286.8925,279.82,0.2584,21310.4958,303.1869,307.8221,1.0999,13509.7398,252.864
-51780,150.0,7652.5229,286.8995,279.82,0.2582,21315.4209,303.1875,307.8238,1.0999,13512.898,252.9231
-51840,150.0,7654.0541,286.9056,279.82,0.258,21319.6887,303.18809999999996,307.82529999999997,1.0999,13515.6346,252.9743
-51900,150.0,7655.4266,286.911,279.82,0.2579,21323.5145,303.18859999999995,307.8266,1.0999,13518.0879,253.0203
-51960,150.0,7658.0603,286.92139999999995,279.82,0.2576,21330.8556,303.18919999999997,307.8288,1.0999,13522.7953,253.109
-52020,150.0,7660.9454,286.93289999999996,279.82,0.2573,21338.8973,303.18969999999996,307.8311,1.0999,13527.9519,253.2055
-52080,150.0,7663.0768,286.9414,279.82,0.257,21344.8384,303.1903,307.83299999999997,1.0999,13531.7616,253.2769
-52140,150.0,7664.8639,286.94849999999997,279.82,0.2568,21349.8197,303.1909,307.83459999999997,1.0999,13534.9558,253.3368
-52200,150.0,7666.4281,286.9548,279.82,0.2567,21354.1797,303.1914,307.8361,1.0999,13537.7516,253.3891
-52260,150.0,7667.8361,286.9604,279.82,0.2565,21358.1044,303.1919,307.8375,1.0999,13540.2683,253.4362
-52320,150.0,7670.4745,286.971,279.82,0.2562,21365.4585,303.1925,307.83959999999996,1.0999,13544.9841,253.5251
-52380,150.0,7673.3527,286.98249999999996,279.82,0.2559,21373.4813,303.193,307.84189999999995,1.0999,13550.1287,253.6214
-52440,150.0,7675.4859,286.99109999999996,279.82,0.2557,21379.4277,303.1936,307.8438,1.0999,13553.9417,253.6929
-52500,150.0,7677.2767,286.9983,279.82,0.2555,21384.4191,303.19419999999997,307.84549999999996,1.0999,13557.1425,253.7528
-52560,150.0,7678.8447,287.0046,279.82,0.2553,21388.7899,303.19469999999995,307.847,1.0999,13559.9452,253.8053
-52620,150.0,7680.2561,287.0103,279.82,0.2551,21392.7241,303.1952,307.8483,1.0999,13562.468,253.8525
-52680,150.0,7682.8822,287.02099999999996,279.82,0.2549,21400.0445,303.19579999999996,307.85049999999995,1.0999,13567.1622,253.941
-52740,150.0,7685.7428,287.0326,279.82,0.2545,21408.0183,303.19629999999995,307.8528,1.0999,13572.2754,254.0367
-52800,150.0,7687.8637,287.0412,279.82,0.2543,21413.93,303.19689999999997,307.8546,1.0999,13576.0664,254.1077
-52860,150.0,7689.6435,287.0485,279.82,0.2541,21418.8913,303.1975,307.8563,1.0999,13579.2478,254.1673
-52920,150.0,7691.2015,287.0548,279.82,0.2539,21423.2342,303.198,307.85769999999997,1.0999,13582.0327,254.2195
-52980,150.0,7693.8727,287.0657,279.82,0.2536,21430.6802,303.1986,307.85999999999996,1.0999,13586.8075,254.3094
-53040,150.0,7696.7374,287.0775,279.82,0.2533,21438.6656,303.19919999999996,307.8623,1.0999,13591.9282,254.4053
-53100,150.0,7698.8752,287.0863,279.82,0.2531,21444.6248,303.1998,307.8642,1.0999,13595.7495,254.4769
-53160,150.0,7700.6717,287.0936,279.82,0.2529,21449.6324,303.2004,307.8658,1.0999,13598.9607,254.537
-53220,150.0,7702.2438,287.1001,279.82,0.2527,21454.0147,303.2009,307.8673,1.0999,13601.7709,254.5896
-53280,150.0,7703.6569,287.106,279.82,0.2526,21457.9536,303.2014,307.8687,1.0999,13604.2968,254.6369
-53340,150.0,7706.2315,287.11659999999995,279.82,0.2523,21465.1307,303.202,307.8709,1.0999,13608.8991,254.7236
-53400,150.0,7709.0239,287.1282,279.82,0.252,21472.9144,303.20259999999996,307.87309999999997,1.0999,13613.8905,254.8171
-53460,150.0,7711.0969,287.1368,279.82,0.2518,21478.6931,303.20309999999995,307.87489999999997,1.0999,13617.5962,254.8865
-53520,150.0,7712.8367,287.144,279.82,0.2516,21483.543,303.20369999999997,307.87649999999996,1.0999,13620.7063,254.9448
-53580,150.0,7714.36,287.15029999999996,279.82,0.2514,21487.7891,303.20419999999996,307.878,1.0999,13623.4291,254.9958
-53640,150.0,7716.9615,287.16119999999995,279.82,0.2511,21495.0411,303.2048,307.8802,1.0999,13628.0796,255.0833
-53700,150.0,7719.7477,287.1728,279.82,0.2508,21502.8077,303.2054,307.88239999999996,1.0999,13633.06,255.1766
-53760,150.0,7721.8253,287.18149999999997,279.82,0.2506,21508.5992,303.20599999999996,307.8843,1.0999,13636.774,255.2461
-53820,150.0,7723.5694,287.1889,279.82,0.2504,21513.4611,303.2065,307.8859,1.0999,13639.8917,255.3045
-53880,150.0,7725.0945,287.1953,279.82,0.2502,21517.7124,303.20709999999997,307.88739999999996,1.0999,13642.6179,255.3556
-53940,150.0,7727.6607,287.2061,279.82,0.2499,21524.8659,303.2077,307.8895,1.0999,13647.2053,255.4419
-54000,150.0,7730.3998,287.2176,279.82,0.2496,21532.5016,303.2082,307.89169999999996,1.0999,13652.1018,255.5336
-54060,150.0,7732.4446,287.2263,279.82,0.2494,21538.2016,303.2086,307.89329999999995,1.0999,13655.757,255.6021
-54120,150.0,7734.1609,287.2335,279.82,0.2492,21542.9861,303.2086,307.89439999999996,1.0999,13658.8252,255.6596
-54180,150.0,7735.661,287.2399,279.82,0.2491,21547.1678,303.2084,307.89509999999996,1.0999,13661.5068,255.7098
-54240,150.0,7737.0074,287.24559999999997,279.82,0.2489,21550.921,303.20799999999997,307.89549999999997,1.0999,13663.9136,255.7549
-54300,150.0,7739.455,287.256,279.82,0.2486,21557.7442,303.20759999999996,307.8966,1.0999,13668.2891,255.8372
-54360,150.0,7742.1047,287.2673,279.82,0.2483,21565.1303,303.20709999999997,307.8977,1.0999,13673.0256,255.9259
-54420,150.0,7744.0653,287.2757,279.82,0.2481,21570.5958,303.2066,307.8984,1.0999,13676.5306,255.9916
-54480,150.0,7745.7054,287.2827,279.82,0.2479,21575.1678,303.20599999999996,307.8988,1.0999,13679.4624,256.0465
-54540,150.0,7747.1368,287.28889999999996,279.82,0.2478,21579.158,303.2054,307.8991,1.0999,13682.0213,256.0944
-54600,150.0,7749.5929,287.2994,279.82,0.2475,21586.0048,303.2048,307.9,1.0999,13686.4119,256.1771
-54660,150.0,7752.221,287.3107,279.82,0.2472,21593.3312,303.20419999999996,307.9009,1.0999,13691.1102,256.265
-54720,150.0,7754.1704,287.3191,279.82,0.247,21598.7654,303.2036,307.9015,1.0999,13694.595,256.3303
-54780,150.0,7755.8038,287.3262,279.82,0.2468,21603.3189,303.203,307.90189999999996,1.0999,13697.515,256.385
-54840,150.0,7757.2338,287.33239999999995,279.82,0.2467,21607.3051,303.2023,307.902,1.0999,13700.0713,256.4329
-54900,150.0,7759.7129,287.3431,279.82,0.2464,21614.216,303.2016,307.9029,1.0999,13704.5031,256.5164
-54960,150.0,7762.3815,287.3547,279.82,0.2461,21621.6553,303.20099999999996,307.90389999999996,1.0999,13709.2738,256.6057
-55020,150.0,7764.3759,287.36339999999996,279.82,0.2459,21627.215,303.20029999999997,307.90439999999995,1.0999,13712.8391,256.6725
-55080,150.0,7766.0557,287.3707,279.82,0.2457,21631.8978,303.1997,307.90479999999997,1.0999,13715.842,256.7288
-55140,150.0,7767.5293,287.3771,279.82,0.2455,21636.0057,303.19899999999996,307.905,1.0999,13718.4764,256.7781
-55200,150.0,7770.0334,287.38809999999995,279.82,0.2453,21642.9864,303.1984,307.9059,1.0999,13722.953,256.8625
-55260,150.0,7772.7194,287.3999,279.82,0.245,21650.4741,303.1977,307.90689999999995,1.0999,13727.7547,256.9524
-55320,150.0,7774.7349,287.40869999999995,279.82,0.2448,21656.0926,303.1971,307.90749999999997,1.0999,13731.3577,257.0199
-55380,150.0,7776.4356,287.4162,279.82,0.2446,21660.8337,303.1964,307.90779999999995,1.0999,13734.3981,257.0768
-55440,150.0,7777.9292,287.4228,279.82,0.2444,21664.9975,303.19579999999996,307.9081,1.0999,13737.0682,257.1268
-55500,150.0,7780.449,287.4339,279.82,0.2441,21672.0217,303.19509999999997,307.909,1.0999,13741.5727,257.2117
-55560,150.0,7783.148,287.44579999999996,279.82,0.2438,21679.5457,303.19449999999995,307.90999999999997,1.0999,13746.3978,257.302
-55620,150.0,7785.1762,287.4548,279.82,0.2436,21685.1998,303.1939,307.9106,1.0999,13750.0236,257.3699
-55680,150.0,7786.8889,287.4624,279.82,0.2434,21689.9745,303.1932,307.911,1.0999,13753.0855,257.4273
-55740,150.0,7788.3939,287.46909999999997,279.82,0.2433,21694.17,303.19259999999997,307.9112,1.0999,13755.776,257.4777
-55800,150.0,7790.9276,287.4804,279.82,0.243,21701.233,303.1919,307.91209999999995,1.0999,13760.3054,257.563
-55860,150.0,7793.6401,287.49249999999995,279.82,0.2427,21708.7947,303.19129999999996,307.9131,1.0999,13765.1546,257.6538
-55920,150.0,7795.6789,287.5016,279.82,0.2425,21714.4784,303.19059999999996,307.91369999999995,1.0999,13768.7995,257.7221
-55980,150.0,7797.4008,287.50939999999997,279.82,0.2423,21719.2785,303.19,307.91409999999996,1.0999,13771.8777,257.7797
-56040,150.0,7800.0438,287.52119999999996,279.82,0.242,21726.6464,303.1894,307.9151,1.0999,13776.6026,257.8686
-56100,150.0,7802.8164,287.53369999999995,279.82,0.2417,21734.3757,303.18879999999996,307.9162,1.0999,13781.5593,257.9614
-56160,150.0,7804.9147,287.54319999999996,279.82,0.2414,21740.2252,303.1882,307.9169,1.0999,13785.3105,258.0317
-56220,150.0,7806.6893,287.5512,279.82,0.2412,21745.1723,303.1876,307.91729999999995,1.0999,13788.483,258.0911
-56280,150.0,7809.3541,287.56329999999997,279.82,0.2409,21752.601,303.18699999999995,307.91839999999996,1.0999,13793.2469,258.1808
-56340,150.0,7812.1359,287.5759,279.82,0.2406,21760.3558,303.1864,307.91949999999997,1.0999,13798.2199,258.2739
-56400,150.0,7814.2496,287.5856,279.82,0.2404,21766.2483,303.1859,307.92019999999997,1.0999,13801.9987,258.3447
-56460,150.0,7816.04,287.59369999999996,279.82,0.2402,21771.2395,303.1853,307.92069999999995,1.0999,13805.1995,258.4046
-56520,150.0,7818.7074,287.60589999999996,279.82,0.2399,21778.6756,303.18469999999996,307.9217,1.0999,13809.9681,258.4943
-56580,150.0,7821.4873,287.61859999999996,279.82,0.2396,21786.4252,303.1841,307.9228,1.0999,13814.9378,258.5874
-56640,150.0,7823.6037,287.6284,279.82,0.2394,21792.3251,303.1835,307.9235,1.0999,13818.7213,258.6582
-56700,150.0,7825.3981,287.6366,279.82,0.2392,21797.3274,303.183,307.924,1.0999,13821.9293,258.7183
-56760,150.0,7828.0644,287.64889999999997,279.82,0.2389,21804.7601,303.1824,307.9251,1.0999,13826.6957,258.808
-56820,150.0,7830.8414,287.6617,279.82,0.2386,21812.5018,303.18179999999995,307.9262,1.0999,13831.6604,258.9009
-56880,150.0,7832.9574,287.6715,279.82,0.2384,21818.4004,303.1812,307.9269,1.0999,13835.4431,258.9718
-56940,150.0,7834.7523,287.6799,279.82,0.2382,21823.4041,303.1807,307.9274,1.0999,13838.6519,259.0319
-57000,150.0,7837.418,287.6923,279.82,0.2379,21830.8354,303.1801,307.9285,1.0999,13843.4174,259.1215
-57060,150.0,7840.1941,287.7052,279.82,0.2376,21838.5744,303.17949999999996,307.9296,1.0999,13848.3804,259.2144
-57120,150.0,7842.3097,287.71509999999995,279.82,0.2373,21844.4721,303.1789,307.9303,1.0999,13852.1624,259.2852
-57180,150.0,7844.1046,287.7235,279.82,0.2371,21849.4759,303.17839999999995,307.9308,1.0999,13855.3713,259.3453
-57240,150.0,7846.7718,287.736,279.82,0.2368,21856.9114,303.1778,307.9319,1.0999,13860.1395,259.435
-57300,150.0,7849.5497,287.7491,279.82,0.2365,21864.6551,303.17719999999997,307.933,1.0999,13865.1055,259.528
-57360,150.0,7851.6661,287.75899999999996,279.82,0.2363,21870.5552,303.1767,307.9337,1.0999,13868.8891,259.5988
-57420,150.0,7854.4907,287.7724,279.82,0.236,21878.4294,303.17609999999996,307.93489999999997,1.0999,13873.9387,259.6937
-57480,150.0,7857.3517,287.78589999999997,279.82,0.2357,21886.4051,303.1756,307.93609999999995,1.0999,13879.0534,259.7895
-57540,150.0,7859.5431,287.7963,279.82,0.2354,21892.514,303.1751,307.9369,1.0999,13882.9709,259.8629
-57600,150.0,7861.4023,287.80519999999996,279.82,0.2352,21897.697,303.17449999999997,307.93739999999997,1.0999,13886.2947,259.9251
-57660,150.0,7864.0966,287.818,279.82,0.2349,21905.2079,303.1739,307.9385,1.0999,13891.1113,260.0156
-57720,150.0,7866.5333,287.8297,279.82,0.2347,21912.0007,303.1731,307.93919999999997,1.0999,13895.4674,260.0978
-57780,150.0,7867.6991,287.8352,279.82,0.2345,21915.2506,303.17229999999995,307.9391,1.0999,13897.5515,260.1372
-57840,150.0,7868.0522,287.83689999999996,279.82,0.2345,21916.235,303.17139999999995,307.93829999999997,1.0999,13898.1828,260.1491
-57900,150.0,7867.911,287.83619999999996,279.82,0.2345,21915.8411,303.1703,307.9371,1.0999,13897.9302,260.1443
-57960,150.0,7867.4864,287.83419999999995,279.82,0.2346,21914.6575,303.169,307.9357,1.0999,13897.1712,260.1301
-58020,150.0,7866.894,287.8314,279.82,0.2346,21913.0063,303.16769999999997,307.9339,1.0999,13896.1122,260.1102
-58080,150.0,7866.1928,287.828,279.82,0.2347,21911.0514,303.1662,307.9321,1.0999,13894.8586,260.0868
-58140,150.0,7865.4157,287.8243,279.82,0.2348,21908.8851,303.1647,307.92999999999995,1.0999,13893.4694,260.0608
-58200,150.0,7864.5855,287.8203,279.82,0.2349,21906.5707,303.1631,307.92789999999997,1.0999,13891.9852,260.033
-58260,150.0,7863.7197,287.8162,279.82,0.235,21904.157,303.16139999999996,307.9257,1.0999,13890.4374,260.004
-58320,150.0,7862.8319,287.81199999999995,279.82,0.2351,21901.6823,303.1597,307.9235,1.0999,13888.8504,259.9743
-58380,150.0,7861.9328,287.80769999999995,279.82,0.2352,21899.1759,303.15799999999996,307.9212,1.0999,13887.2431,259.9442
-58440,150.0,7861.0304,287.80339999999995,279.82,0.2353,21896.6601,303.15619999999996,307.9189,1.0999,13885.6297,259.914
-58500,150.0,7860.1305,287.79909999999995,279.82,0.2354,21894.1516,303.15439999999995,307.91659999999996,1.0999,13884.0211,259.8839
-58560,150.0,7859.238,287.7949,279.82,0.2355,21891.6634,303.1526,307.9142,1.0999,13882.4254,259.8541
-58620,150.0,7857.4735,287.7865,279.82,0.2357,21886.7447,303.1508,307.91139999999996,1.0999,13879.2712,259.7965
-58680,150.0,7855.5122,287.7772,279.82,0.2359,21881.2769,303.149,307.9083,1.0999,13875.7647,259.7308
-58740,150.0,7854.0248,287.7702,279.82,0.236,21877.1306,303.147,307.90549999999996,1.0999,13873.1058,259.681
-58800,150.0,7852.7522,287.76419999999996,279.82,0.2362,21873.583,303.14509999999996,307.90279999999996,1.0999,13870.8308,259.6384
-58860,150.0,7850.7403,287.75469999999996,279.82,0.2364,21867.9744,303.1432,307.89959999999996,1.0999,13867.2341,259.5726
-58920,150.0,7848.6083,287.7446,279.82,0.2366,21862.031,303.14119999999997,307.8963,1.0999,13863.4227,259.5013
-58980,150.0,7846.995,287.73699999999997,279.82,0.2368,21857.5335,303.1391,307.89329999999995,1.0999,13860.5385,259.4472
-59040,150.0,7845.632,287.7306,279.82,0.237,21853.7337,303.1371,307.8905,1.0999,13858.1018,259.4016
-59100,150.0,7844.433,287.72499999999997,279.82,0.2371,21850.3915,303.13509999999997,307.88779999999997,1.0999,13855.9584,259.3615
-59160,150.0,7842.4425,287.71569999999997,279.82,0.2373,21844.8423,303.13309999999996,307.8846,1.0999,13852.3998,259.2964
-59220,150.0,7840.322,287.70579999999995,279.82,0.2375,21838.9309,303.1311,307.88129999999995,1.0999,13848.6089,259.2255
-59280,150.0,7838.7433,287.6984,279.82,0.2377,21834.5301,303.1291,307.87829999999997,1.0999,13845.7868,259.1726
-59340,150.0,7837.4291,287.6923,279.82,0.2379,21830.8663,303.12699999999995,307.87539999999996,1.0999,13843.4373,259.1286
-59400,150.0,7836.2889,287.68699999999995,279.82,0.238,21827.6879,303.125,307.8727,1.0999,13841.399,259.0905
-59460,150.0,7834.3562,287.678,279.82,0.2382,21822.3001,303.123,307.8696,1.0999,13837.9438,259.0274
-59520,150.0,7832.2962,287.6685,279.82,0.2384,21816.5574,303.121,307.86629999999997,1.0999,13834.2612,258.9585
-59580,150.0,7830.7854,287.6615,279.82,0.2386,21812.3457,303.11899999999997,307.86339999999996,1.0999,13831.5603,258.9079
-59640,150.0,7829.5435,287.65569999999997,279.82,0.2387,21808.8834,303.11699999999996,307.8606,1.0999,13829.3399,258.8663
-59700,150.0,7828.4788,287.6508,279.82,0.2388,21805.9153,303.11499999999995,307.8579,1.0999,13827.4366,258.8307
-59760,150.0,7826.639,287.6423,279.82,0.239,21800.7864,303.113,307.85479999999995,1.0999,13824.1475,258.7707
-59820,150.0,7824.6765,287.63329999999996,279.82,0.2393,21795.3155,303.111,307.8517,1.0999,13820.6391,258.7051
-59880,150.0,7823.2554,287.6268,279.82,0.2394,21791.354,303.109,307.8488,1.0999,13818.0986,258.6575
-59940,150.0,7822.0999,287.62149999999997,279.82,0.2395,21788.1327,303.10699999999997,307.8461,1.0999,13816.0328,258.6188
-60000,150.0,7821.1195,287.61699999999996,279.82,0.2397,21785.3997,303.10499999999996,307.84349999999995,1.0999,13814.2802,258.586
-60060,150.0,7820.2634,287.613,279.82,0.2397,21783.0132,303.10299999999995,307.841,1.0999,13812.7498,258.5573
-60120,150.0,7818.4554,287.60479999999995,279.82,0.2399,21777.9728,303.101,307.8379,1.0999,13809.5175,258.4966
-60180,150.0,7816.4563,287.5956,279.82,0.2402,21772.3999,303.09909999999996,307.8348,1.0999,13805.9436,258.4297
-60240,150.0,7815.0367,287.5891,279.82,0.2403,21768.4424,303.09709999999995,307.83189999999996,1.0999,13803.4058,258.3822
-60300,150.0,7813.8868,287.58389999999997,279.82,0.2404,21765.2368,303.0951,307.82919999999996,1.0999,13801.3501,258.3437
-60360,150.0,7812.9138,287.5795,279.82,0.2406,21762.5246,303.0931,307.82669999999996,1.0999,13799.6107,258.3111
-60420,150.0,7812.0675,287.57559999999995,279.82,0.2406,21760.1651,303.09119999999996,307.82419999999996,1.0999,13798.0976,258.2828
-60480,150.0,7811.3178,287.57219999999995,279.82,0.2407,21758.0753,303.0893,307.82189999999997,1.0999,13796.7575,258.2577
-60540,150.0,7809.5661,287.5643,279.82,0.2409,21753.1921,303.08729999999997,307.8189,1.0999,13793.6259,258.1989
-60600,150.0,7807.6045,287.55539999999996,279.82,0.2411,21747.7235,303.0854,307.8157,1.0999,13790.119,258.1332
-60660,150.0,7806.2315,287.5492,279.82,0.2413,21743.896,303.08349999999996,307.81289999999996,1.0999,13787.6645,258.0873
-60720,150.0,7805.1292,287.5442,279.82,0.2414,21740.8233,303.0815,307.8103,1.0999,13785.694,258.0504
-60780,150.0,7804.2032,287.53999999999996,279.82,0.2415,21738.2418,303.0795,307.8078,1.0999,13784.0386,258.0194
-60840,150.0,7803.4023,287.53639999999996,279.82,0.2416,21736.0091,303.07759999999996,307.80539999999996,1.0999,13782.6068,257.9926
-60900,150.0,7802.6965,287.53319999999997,279.82,0.2417,21734.0416,303.0757,307.8031,1.0999,13781.345,257.9689
-60960,150.0,7800.9814,287.52549999999997,279.82,0.2419,21729.2604,303.0738,307.8001,1.0999,13778.2789,257.9113
-61020,150.0,7799.053,287.5168,279.82,0.2421,21723.8844,303.07189999999997,307.79699999999997,1.0999,13774.8314,257.8468
-61080,150.0,7797.7141,287.51079999999996,279.82,0.2422,21720.1519,303.06989999999996,307.79429999999996,1.0999,13772.4378,257.802
-61140,150.0,7796.6454,287.506,279.82,0.2423,21717.1726,303.068,307.7917,1.0999,13770.5272,257.7662
-61200,150.0,7795.7521,287.50199999999995,279.82,0.2424,21714.6823,303.066,307.7892,1.0999,13768.9303,257.7363
-61260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-61980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-62940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-63960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-64980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-65940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-66960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-67980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-68940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-69960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-70980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-71940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-72960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-73980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-74940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-75960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-76980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-77940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-78960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-79980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-80940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-81960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-82980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83460,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83520,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83580,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83640,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83700,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83760,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83820,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83880,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-83940,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84000,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84060,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84120,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84180,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84240,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84300,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84360,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84420,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84480,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84540,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84600,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84660,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84720,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84780,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84840,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84900,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-84960,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85020,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85080,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85140,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85200,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85260,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85320,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85380,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85440,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85500,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85560,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85620,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85680,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85740,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85800,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85860,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85920,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-85980,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86040,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86100,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86160,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86220,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86280,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86340,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86400,0.0,0.0,287.50039999999996,287.50039999999996,0.0,0.0,303.06899999999996,303.06899999999996,0.0,0.0,0.0
-86460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-86940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87060,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87120,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87180,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87240,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87300,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87360,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87420,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87480,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87540,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87600,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87660,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87720,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87780,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87840,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87900,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-87960,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88020,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88080,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88140,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88200,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88260,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88320,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88380,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88440,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88500,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88560,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88620,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88680,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88740,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88800,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88860,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88920,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-88980,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89040,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89100,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89160,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89220,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89280,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89340,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89400,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-89940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90060,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90120,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90180,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90240,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90300,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90360,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90420,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90480,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90540,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90600,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90660,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90720,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90780,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90840,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90900,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-90960,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91020,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91080,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91140,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91200,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91260,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91320,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91380,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91440,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91500,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91560,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91620,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91680,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91740,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91800,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91860,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91920,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-91980,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92040,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92100,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92160,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92220,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92280,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92340,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92400,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-92940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93060,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93120,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93180,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93240,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93300,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93360,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93420,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93480,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93540,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93600,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93660,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93720,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93780,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93840,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93900,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-93960,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94020,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94080,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94140,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94200,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94260,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94320,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94380,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94440,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94500,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94560,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94620,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94680,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94740,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94800,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94860,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94920,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-94980,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95040,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95100,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95160,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95220,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95280,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95340,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95400,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-95940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96060,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96120,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96180,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96240,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96300,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96360,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96420,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96480,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96540,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96600,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96660,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96720,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96780,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96840,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96900,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-96960,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97020,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97080,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97140,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97200,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97260,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97320,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97380,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97440,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97500,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97560,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97620,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97680,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97740,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97800,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97860,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97920,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-97980,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98040,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98100,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98160,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98220,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98280,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98340,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98400,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-98940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99060,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99120,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99180,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99240,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99300,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99360,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99420,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99480,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99540,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99600,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99660,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99720,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99780,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99840,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99900,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-99960,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100020,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100080,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100140,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100200,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100260,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100320,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100380,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100440,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100500,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100560,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100620,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100680,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100740,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100800,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100860,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100920,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-100980,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101040,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101100,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101160,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101220,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101280,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101340,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101400,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-101940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102060,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102120,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102180,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102240,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102300,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102360,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102420,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102480,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102540,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102600,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102660,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102720,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102780,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102840,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102900,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-102960,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103020,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103080,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103140,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103200,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103260,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103320,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103380,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103440,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103500,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103560,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103620,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103680,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103740,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103800,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103860,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103920,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-103980,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104040,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104100,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104160,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104220,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104280,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104340,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104400,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-104940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105060,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105120,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105180,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105240,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105300,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105360,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105420,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105480,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105540,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105600,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105660,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105720,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105780,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105840,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105900,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-105960,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106020,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106080,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106140,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106200,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106260,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106320,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106380,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106440,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106500,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106560,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106620,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106680,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106740,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106800,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106860,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106920,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-106980,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107040,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107100,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107160,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107220,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107280,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107340,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107400,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107460,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107520,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107580,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107640,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107700,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107760,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107820,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107880,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-107940,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-108000,0.0,0.0,283.7829,283.7829,0.0,0.0,297.6918,297.6918,0.0,0.0,0.0
-108060,150.0,6723.9071,284.27389999999997,279.82,0.3603,18733.6714,297.7985,301.87399999999997,1.0999,11859.7643,229.5987
-108120,150.0,6938.5065,284.7389,279.82,0.3367,19328.5253,298.03749999999997,302.24249999999995,1.0999,12240.0188,237.1569
-108180,150.0,6938.5017,284.73879999999997,279.82,0.3367,19328.0168,298.21459999999996,302.4196,1.0999,12239.5151,237.2215
-108240,150.0,6820.8736,284.47619999999995,279.82,0.3497,19001.516,298.3504,302.48429999999996,1.0999,12030.6423,233.204
-108300,150.0,6517.8882,284.063,279.82,0.3666,18162.3463,298.44489999999996,302.3963,1.0999,11494.4581,222.9308
-108360,0.0,0.0,284.7118,284.7118,0.0,0.0,297.88739999999996,297.88739999999996,0.0,0.0,0.0
-108420,150.0,6876.3483,284.5976,279.82,0.3436,19157.7328,297.63,301.79769999999996,1.0999,12131.3845,234.9224
-108480,0.0,0.0,284.72729999999996,284.72729999999996,0.0,0.0,297.3327,297.3327,0.0,0.0,0.0
-108540,0.0,0.0,286.0347,286.0347,0.0,0.0,296.5535,296.5535,0.0,0.0,0.0
-108600,150.0,7158.788,285.2894,279.82,0.3125,19950.1135,296.6925,301.0322,1.0999,12641.3255,244.6349
-108660,0.0,0.0,285.05179999999996,285.05179999999996,0.0,0.0,296.6429,296.6429,0.0,0.0,0.0
-108720,0.0,0.0,286.25199999999995,286.25199999999995,0.0,0.0,296.03249999999997,296.03249999999997,0.0,0.0,0.0
-108780,150.0,7218.2899,285.453,279.82,0.306,20118.9671,296.2838,300.6601,1.0999,12750.6771,246.7336
-108840,0.0,0.0,285.1839,285.1839,0.0,0.0,296.318,296.318,0.0,0.0,0.0
-108900,0.0,0.0,286.3508,286.3508,0.0,0.0,295.7858,295.7858,0.0,0.0,0.0
-108960,150.0,7247.5311,285.5361,279.82,0.3027,20201.8609,296.0913,300.4855,1.0999,12804.3297,247.7415
-109020,0.0,0.0,285.2553,285.2553,0.0,0.0,296.16569999999996,296.16569999999996,0.0,0.0,0.0
-109080,0.0,0.0,286.405,286.405,0.0,0.0,295.66929999999996,295.66929999999996,0.0,0.0,0.0
-109140,150.0,7262.746,285.58,279.82,0.3011,20244.9108,296.0,300.4036,1.0999,12832.1648,248.2478
-109200,0.0,0.0,285.29159999999996,285.29159999999996,0.0,0.0,296.0929,296.0929,0.0,0.0,0.0
-109260,0.0,0.0,286.43179999999995,286.43179999999995,0.0,0.0,295.6124,295.6124,0.0,0.0,0.0
-109320,150.0,7269.8701,285.60069999999996,279.82,0.3003,20265.0819,295.95459999999997,300.36249999999995,1.0999,12845.2117,248.4673
-109380,0.0,0.0,285.30769999999995,285.30769999999995,0.0,0.0,296.05559999999997,296.05559999999997,0.0,0.0,0.0
-109440,0.0,0.0,286.4423,286.4423,0.0,0.0,295.582,295.582,0.0,0.0,0.0
-109500,150.0,7272.2655,285.60769999999997,279.82,0.3,20271.9323,295.9292,300.3386,1.0999,12849.6668,248.5205
-109560,0.0,0.0,285.3119,285.3119,0.0,0.0,296.03389999999996,296.03389999999996,0.0,0.0,0.0
-109620,150.0,7033.8067,284.967,279.82,0.3262,19607.1449,295.9421,300.207,1.0999,12423.3383,239.7666
-109680,0.0,0.0,284.96689999999995,284.96689999999995,0.0,0.0,296.2052,296.2052,0.0,0.0,0.0
-109740,0.0,0.0,286.1495,286.1495,0.0,0.0,295.67789999999997,295.67789999999997,0.0,0.0,0.0
-109800,150.0,7185.8122,285.3628,279.82,0.3095,20030.6768,295.971,300.328,1.0999,12694.8646,245.4691
-109860,0.0,0.0,285.096,285.096,0.0,0.0,296.04479999999995,296.04479999999995,0.0,0.0,0.0
-109920,0.0,0.0,286.2483,286.2483,0.0,0.0,295.55629999999996,295.55629999999996,0.0,0.0,0.0
-109980,150.0,7212.4005,285.43649999999997,279.82,0.3066,20105.4305,295.8795,300.2527,1.0999,12743.0301,246.3645
-110040,0.0,0.0,285.15319999999997,285.15319999999997,0.0,0.0,295.97339999999997,295.97339999999997,0.0,0.0,0.0
-110100,0.0,0.0,286.29569999999995,286.29569999999995,0.0,0.0,295.50109999999995,295.50109999999995,0.0,0.0,0.0
-110160,150.0,7226.3702,285.4758,279.82,0.3051,20144.6607,295.8368,300.21849999999995,1.0999,12768.2906,246.819
-110220,0.0,0.0,285.1864,285.1864,0.0,0.0,295.9393,295.9393,0.0,0.0,0.0
-110280,0.0,0.0,286.3227,286.3227,0.0,0.0,295.4736,295.4736,0.0,0.0,0.0
-110340,150.0,7234.1561,285.49789999999996,279.82,0.3042,20166.5105,295.8148,300.2013,1.0999,12782.3544,247.0572
-110400,0.0,0.0,285.2047,285.2047,0.0,0.0,295.92089999999996,295.92089999999996,0.0,0.0,0.0
-110460,0.0,0.0,286.33689999999996,286.33689999999996,0.0,0.0,295.45759999999996,295.45759999999996,0.0,0.0,0.0
-110520,150.0,7238.0606,285.50899999999996,279.82,0.3038,20177.4852,295.80109999999996,300.19,1.0999,12789.4246,247.1603
-110580,0.0,0.0,285.2133,285.2133,0.0,0.0,295.9086,295.9086,0.0,0.0,0.0
-110640,0.0,0.0,286.34279999999995,286.34279999999995,0.0,0.0,295.44599999999997,295.44599999999997,0.0,0.0,0.0
-110700,150.0,7239.4412,285.5129,279.82,0.3036,20181.4063,295.7903,300.17999999999995,1.0999,12791.9652,247.1759
-110760,0.0,0.0,285.21569999999997,285.21569999999997,0.0,0.0,295.8982,295.8982,0.0,0.0,0.0
-110820,0.0,0.0,286.34319999999997,286.34319999999997,0.0,0.0,295.43559999999997,295.43559999999997,0.0,0.0,0.0
-110880,150.0,7239.1687,285.51219999999995,279.82,0.3037,20180.7168,295.78009999999995,300.1696,1.0999,12791.5481,247.1345
-110940,0.0,0.0,285.21389999999997,285.21389999999997,0.0,0.0,295.888,295.888,0.0,0.0,0.0
-111000,0.0,0.0,286.34009999999995,286.34009999999995,0.0,0.0,295.42519999999996,295.42519999999996,0.0,0.0,0.0
-111060,150.0,7237.8164,285.50829999999996,279.82,0.3038,20177.0197,295.7695,300.15819999999997,1.0999,12789.2033,247.0558
-111120,0.0,0.0,285.20939999999996,285.20939999999996,0.0,0.0,295.8773,295.8773,0.0,0.0,0.0
-111180,0.0,0.0,286.3347,286.3347,0.0,0.0,295.41429999999997,295.41429999999997,0.0,0.0,0.0
-111240,150.0,7235.7644,285.5025,279.82,0.304,20171.3763,295.7584,300.1459,1.0999,12785.6119,246.9531
-111300,0.0,0.0,285.20309999999995,285.20309999999995,0.0,0.0,295.86609999999996,295.86609999999996,0.0,0.0,0.0
-111360,0.0,0.0,286.3277,286.3277,0.0,0.0,295.40299999999996,295.40299999999996,0.0,0.0,0.0
-111420,150.0,7233.2673,285.49539999999996,279.82,0.3043,20164.4963,295.7468,300.1328,1.0999,12781.2289,246.8351
-111480,0.0,0.0,285.19579999999996,285.19579999999996,0.0,0.0,295.8544,295.8544,0.0,0.0,0.0
-111540,0.0,0.0,286.31989999999996,286.31989999999996,0.0,0.0,295.39119999999997,295.39119999999997,0.0,0.0,0.0
-111600,150.0,7230.4965,285.48749999999995,279.82,0.3046,20156.8563,295.73479999999995,300.1191,1.0999,12776.3598,246.7078
-111660,0.0,0.0,285.1878,285.1878,0.0,0.0,295.84279999999995,295.84279999999995,0.0,0.0,0.0
-111720,0.0,0.0,286.335,286.335,0.0,0.0,295.38059999999996,295.38059999999996,0.0,0.0,0.0
-111780,150.0,7266.781,285.5917,279.82,0.3006,20258.0159,295.727,300.13329999999996,1.0999,12841.2349,247.8968
-111840,0.0,0.0,285.453,285.453,0.0,0.0,295.84439999999995,295.84439999999995,0.0,0.0,0.0
-111900,150.0,7158.1341,285.2876,279.82,0.3126,19952.7796,296.075,300.41499999999996,1.0999,12644.6455,244.1825
-111960,150.0,6764.501,284.3571,279.82,0.3559,18855.3737,296.11499999999995,300.21639999999996,1.0999,11940.8727,0.5099
-112020,0.0,0.0,284.9969,284.9969,0.0,0.0,296.5249,296.5249,0.0,0.0,0.0
-112080,150.0,7041.9052,284.98699999999997,279.82,0.3254,19625.2964,296.5592,300.8282,1.0999,12433.3912,240.1042
-112140,0.0,0.0,285.2514,285.2514,0.0,0.0,296.47459999999995,296.47459999999995,0.0,0.0,0.0
-112200,150.0,7114.9047,285.173,279.82,0.3173,19828.7788,296.5567,300.87,1.0999,12563.8741,242.6219
-112260,150.0,6715.3575,284.2566,279.82,0.3613,18712.7961,297.10979999999995,301.1805,1.0999,11847.4385,228.8724
-112320,0.0,0.0,284.9212,284.9212,0.0,0.0,296.85089999999997,296.85089999999997,0.0,0.0,0.0
-112380,150.0,7021.6035,284.9369,279.82,0.3276,19566.8895,296.82149999999996,301.0779,1.0999,12395.286,239.3656
-112440,0.0,0.0,285.2167,285.2167,0.0,0.0,296.685,296.685,0.0,0.0,0.0
-112500,150.0,7106.5888,285.1513,279.82,0.3182,19804.4301,296.71909999999997,301.02709999999996,1.0999,12547.8413,242.3105
-112560,150.0,6707.6554,284.24109999999996,279.82,0.3621,18690.7854,297.23789999999997,301.3039,1.0999,11833.13,228.6066
-112620,0.0,0.0,284.91839999999996,284.91839999999996,0.0,0.0,296.94939999999997,296.94939999999997,0.0,0.0,0.0
-112680,150.0,7026.443,284.9488,279.82,0.3271,19579.8283,296.9009,301.1602,1.0999,12403.3852,239.5221
-112740,0.0,0.0,285.2374,285.2374,0.0,0.0,296.75019999999995,296.75019999999995,0.0,0.0,0.0
-112800,150.0,7116.561,285.1773,279.82,0.3171,19831.8248,296.77459999999996,301.0886,1.0999,12565.2639,242.6474
-112860,150.0,6718.9463,284.2639,279.82,0.3609,18721.9415,297.2853,301.35819999999995,1.0999,11852.9952,228.9895
-112920,0.0,0.0,284.9358,284.9358,0.0,0.0,296.9864,296.9864,0.0,0.0,0.0
-112980,150.0,7032.2922,284.9632,279.82,0.3264,19595.9246,296.92999999999995,301.1928,1.0999,12413.6325,239.7199
-113040,0.0,0.0,285.25019999999995,285.25019999999995,0.0,0.0,296.77329999999995,296.77329999999995,0.0,0.0,0.0
-113100,150.0,7120.9139,285.1887,279.82,0.3167,19843.8268,296.7926,301.10929999999996,1.0999,12572.9129,242.795
-113160,150.0,6724.1463,284.27439999999996,279.82,0.3603,18736.3239,297.2998,301.37579999999997,1.0999,11862.1776,229.1666
-113220,0.0,0.0,284.94599999999997,284.94599999999997,0.0,0.0,296.99699999999996,296.99699999999996,0.0,0.0,0.0
-113280,150.0,7036.1481,284.9728,279.82,0.326,19606.6114,296.93809999999996,301.2032,1.0999,12420.4633,239.8518
-113340,0.0,0.0,285.2593,285.2593,0.0,0.0,296.77939999999995,296.77939999999995,0.0,0.0,0.0
-113400,150.0,7124.1871,285.1973,279.82,0.3163,19852.9172,296.7971,301.11569999999995,1.0999,12578.7302,242.9073
-113460,150.0,6732.5039,284.2913,279.82,0.3594,18759.5314,297.3031,301.3841,1.0999,11877.0274,229.4411
-113520,0.0,0.0,284.9674,284.9674,0.0,0.0,296.99929999999995,296.99929999999995,0.0,0.0,0.0
-113580,150.0,7042.6362,284.98879999999997,279.82,0.3253,19624.6723,296.9401,301.20919999999995,1.0999,12432.0361,240.0752
-113640,0.0,0.0,285.272,285.272,0.0,0.0,296.7811,296.7811,0.0,0.0,0.0
-113700,150.0,7128.3332,285.2082,279.82,0.3159,19864.4637,296.7983,301.11949999999996,1.0999,12586.1305,243.0503
-113760,150.0,6737.1286,284.3008,279.82,0.3589,18772.377,297.30429999999996,301.388,1.0999,11885.2484,229.6114
-113820,0.0,0.0,284.97979999999995,284.97979999999995,0.0,0.0,297.0,297.0,0.0,0.0,0.0
-113880,150.0,7050.663,285.00879999999995,279.82,0.3244,19647.0092,296.94379999999995,301.2177,1.0999,12446.3463,240.3524
-113940,150.0,6660.2702,284.1558,279.82,0.3666,18558.4863,297.4022,301.43949999999995,1.0999,11748.2161,226.9846
-114000,0.0,0.0,284.85519999999997,284.85519999999997,0.0,0.0,297.0689,297.0689,0.0,0.0,0.0
-114060,150.0,7003.7874,284.89349999999996,279.82,0.3295,19516.1299,296.98839999999996,301.23389999999995,1.0999,12362.3425,238.74
-114120,0.0,0.0,285.1901,285.1901,0.0,0.0,296.8148,296.8148,0.0,0.0,0.0
-114180,150.0,7105.2604,285.1479,279.82,0.3184,19799.9968,296.8214,301.1285,1.0999,12544.7365,242.2501
-114240,150.0,6712.1815,284.25019999999995,279.82,0.3616,18702.9955,297.3191,301.38779999999997,1.0999,11840.814,228.7519
-114300,0.0,0.0,284.9321,284.9321,0.0,0.0,297.00829999999996,297.00829999999996,0.0,0.0,0.0
-114360,150.0,7030.0845,284.95779999999996,279.82,0.3267,19589.6684,296.94559999999996,301.207,1.0999,12409.5839,239.6518
-114420,150.0,6591.1042,284.11069999999995,279.82,0.3666,18366.5555,297.39529999999996,301.39079999999996,1.0999,11625.4512,224.6249
-114480,0.0,0.0,284.81699999999995,284.81699999999995,0.0,0.0,297.05699999999996,297.05699999999996,0.0,0.0,0.0
-114540,150.0,6989.3976,284.85889999999995,279.82,0.3311,19476.178,296.9693,301.20599999999996,1.0999,12336.7804,238.2528
-114600,0.0,0.0,285.161,285.161,0.0,0.0,296.7933,296.7933,0.0,0.0,0.0
-114660,150.0,7096.893,285.1262,279.82,0.3193,19776.8263,296.8006,301.10269999999997,1.0999,12529.9334,241.9639
-114720,150.0,6703.8038,284.23339999999996,279.82,0.3625,18679.8093,297.2992,301.36289999999997,1.0999,11826.0055,228.4658
-114780,0.0,0.0,284.9183,284.9183,0.0,0.0,296.9905,296.9905,0.0,0.0,0.0
-114840,150.0,7025.4763,284.9464,279.82,0.3272,19576.9429,296.92909999999995,301.1878,1.0999,12401.4667,239.4952
-114900,150.0,6577.4121,284.10179999999997,279.82,0.3666,18328.6228,297.3789,301.3662,1.0999,11601.2107,224.1668
-114960,0.0,0.0,284.81039999999996,284.81039999999996,0.0,0.0,297.0417,297.0417,0.0,0.0,0.0
-115020,150.0,6987.3228,284.85389999999995,279.82,0.3314,19470.4977,296.95439999999996,301.18989999999997,1.0999,12333.175,238.173
-115080,0.0,0.0,285.1542,285.1542,0.0,0.0,296.77869999999996,296.77869999999996,0.0,0.0,0.0
-115140,150.0,7091.6469,285.11269999999996,279.82,0.3199,19762.3272,296.7836,301.0825,1.0999,12520.6803,241.7842
-115200,150.0,6693.2054,284.21229999999997,279.82,0.3637,18650.4454,297.2813,301.3386,1.0999,11807.24,228.1041
-115260,0.0,0.0,284.89509999999996,284.89509999999996,0.0,0.0,296.9726,296.9726,0.0,0.0,0.0
-115320,150.0,7019.7863,284.9325,279.82,0.3278,19561.2436,296.9068,301.16209999999995,1.0999,12391.4574,239.2901
-115380,0.0,0.0,285.22729999999996,285.22729999999996,0.0,0.0,296.7426,296.7426,0.0,0.0,0.0
-115440,150.0,7114.8704,285.17289999999997,279.82,0.3173,19827.2527,296.75509999999997,301.0682,1.0999,12562.3823,242.5905
-115500,150.0,6723.0064,284.27209999999997,279.82,0.3604,18733.3533,297.25699999999995,301.3323,1.0999,11860.347,229.1185
-115560,0.0,0.0,284.95369999999997,284.95369999999997,0.0,0.0,296.9491,296.9491,0.0,0.0,0.0
-115620,150.0,7039.1508,284.98019999999997,279.82,0.3257,19615.3359,296.8857,301.1527,1.0999,12426.185,239.9615
-115680,0.0,0.0,285.26759999999996,285.26759999999996,0.0,0.0,296.72229999999996,296.72229999999996,0.0,0.0,0.0
-115740,150.0,7128.0569,285.2075,279.82,0.3159,19864.1462,296.7355,301.05649999999997,1.0999,12586.0893,243.0489
-115800,150.0,6738.271,284.3031,279.82,0.3588,18775.8635,297.2381,301.32259999999997,1.0999,11887.5925,229.6566
-115860,0.0,0.0,284.98629999999997,284.98629999999997,0.0,0.0,296.9292,296.9292,0.0,0.0,0.0
-115920,150.0,7054.3835,285.0182,279.82,0.324,19657.8915,296.86899999999997,301.1452,1.0999,12453.508,240.4904
-115980,150.0,6670.1346,284.16679999999997,279.82,0.3662,18586.1842,297.32439999999997,301.36769999999996,1.0999,11766.0496,227.3071
-116040,0.0,0.0,284.8691,284.8691,0.0,0.0,296.9862,296.9862,0.0,0.0,0.0
-116100,150.0,7010.5488,284.9099,279.82,0.3288,19535.5466,296.9015,301.1511,1.0999,12374.9979,238.983
-116160,0.0,0.0,285.20869999999996,285.20869999999996,0.0,0.0,296.7229,296.7229,0.0,0.0,0.0
-116220,150.0,7112.7226,285.16729999999995,279.82,0.3176,19821.4841,296.72479999999996,301.03659999999996,1.0999,12558.7614,242.5206
-116280,150.0,6722.0686,284.2702,279.82,0.3605,18730.9237,297.2192,301.294,1.0999,11858.8551,229.1007
-116340,0.0,0.0,284.9545,284.9545,0.0,0.0,296.90189999999996,296.90189999999996,0.0,0.0,0.0
-116400,150.0,7043.3131,284.9905,279.82,0.3252,19627.2886,296.8341,301.1037,1.0999,12433.9755,240.1124
-116460,150.0,6642.0932,284.144,279.82,0.3666,18508.4793,297.2842,301.3105,1.0999,11716.3861,226.3459
-116520,0.0,0.0,284.8502,284.8502,0.0,0.0,296.9403,296.9403,0.0,0.0,0.0
-116580,150.0,7004.3214,284.8948,279.82,0.3295,19518.5361,296.8517,301.0977,1.0999,12364.2147,238.7752
-116640,0.0,0.0,285.1966,285.1966,0.0,0.0,296.67069999999995,296.67069999999995,0.0,0.0,0.0
-116700,150.0,7109.119,285.1579,279.82,0.318,19811.8263,296.67109999999997,300.9808,1.0999,12552.7073,242.4034
-116760,150.0,6718.4363,284.26279999999997,279.82,0.3609,18721.0859,297.1651,301.23769999999996,1.0999,11852.6496,228.981
-116820,0.0,0.0,284.9491,284.9491,0.0,0.0,296.8469,296.8469,0.0,0.0,0.0
-116880,150.0,7041.8273,284.98679999999996,279.82,0.3254,19623.5361,296.7784,301.0472,1.0999,12431.7088,240.0685
-116940,150.0,6638.6113,284.14169999999996,279.82,0.3666,18499.0349,297.2283,301.2526,1.0999,11710.4236,226.2339
-117000,0.0,0.0,284.84959999999995,284.84959999999995,0.0,0.0,296.8837,296.8837,0.0,0.0,0.0
-117060,150.0,7004.7062,284.89579999999995,279.82,0.3294,19519.9975,296.7946,301.0408,1.0999,12365.2913,238.7957
-117120,0.0,0.0,285.1988,285.1988,0.0,0.0,296.613,296.613,0.0,0.0,0.0
-117180,150.0,7110.2779,285.16089999999997,279.82,0.3178,19815.4743,296.6131,300.92359999999996,1.0999,12555.1964,242.4513
-117240,150.0,6720.1585,284.2663,279.82,0.3607,18726.1522,297.1076,301.18129999999996,1.0999,11855.9937,229.0459
-117300,0.0,0.0,284.9536,284.9536,0.0,0.0,296.7886,296.7886,0.0,0.0,0.0
-117360,150.0,7043.9217,284.99199999999996,279.82,0.3251,19629.7816,296.7199,300.9899,1.0999,12435.8599,240.1486
-117420,150.0,6646.4089,284.1468,279.82,0.3666,18520.9307,297.1708,301.1998,1.0999,11724.5219,226.5013
-117480,0.0,0.0,284.8554,284.8554,0.0,0.0,296.8254,296.8254,0.0,0.0,0.0
-117540,150.0,7007.4054,284.90229999999997,279.82,0.3292,19527.9201,296.736,300.98389999999995,1.0999,12370.5147,238.8959
-117600,0.0,0.0,285.2061,285.2061,0.0,0.0,296.5537,296.5537,0.0,0.0,0.0
-117660,150.0,7113.1235,285.1683,279.82,0.3175,19823.8383,296.5533,300.8656,1.0999,12560.7148,242.5578
-117720,150.0,6723.7895,284.2736,279.82,0.3603,18736.5434,297.0481,301.12399999999997,1.0999,11862.7539,229.1768
-117780,0.0,0.0,284.96189999999996,284.96189999999996,0.0,0.0,296.72799999999995,296.72799999999995,0.0,0.0,0.0
-117840,150.0,7047.3552,285.00059999999996,279.82,0.3248,19639.7803,296.65869999999995,300.93089999999995,1.0999,12442.4251,240.2754
-117900,150.0,6658.5657,284.1547,279.82,0.3666,18554.9667,297.11019999999996,301.14669999999995,1.0999,11746.4011,226.9411
-117960,0.0,0.0,284.86379999999997,284.86379999999997,0.0,0.0,296.7645,296.7645,0.0,0.0,0.0
-118020,150.0,7011.1235,284.9113,279.82,0.3287,19538.7043,296.6747,300.92499999999995,1.0999,12377.5808,239.0314
-118080,150.0,6544.8405,284.0806,279.82,0.3666,18240.1436,296.85519999999997,300.82309999999995,1.0999,11545.303,223.3449
-118140,0.0,0.0,284.8074,284.8074,0.0,0.0,296.7444,296.7444,0.0,0.0,0.0
-118200,150.0,6993.5932,284.8689,279.82,0.3307,19490.067,296.6445,300.88419999999996,1.0999,12346.4738,238.4319
-118260,0.0,0.0,285.1825,285.1825,0.0,0.0,296.4572,296.4572,0.0,0.0,0.0
-118320,150.0,7106.5425,285.15119999999996,279.82,0.3182,19806.2058,296.455,300.7634,1.0999,12549.6633,242.3437
-118380,150.0,6717.3667,284.2607,279.82,0.3611,18719.188,296.95,301.02209999999997,1.0999,11851.8214,228.9659
-118440,0.0,0.0,284.95329999999996,284.95329999999996,0.0,0.0,296.6294,296.6294,0.0,0.0,0.0
-118500,150.0,7045.3547,284.99559999999997,279.82,0.325,19634.9065,296.55969999999996,300.83079999999995,1.0999,12439.5518,240.2194
-118560,150.0,6654.7834,284.15229999999997,279.82,0.3666,18544.9048,297.0122,301.04639999999995,1.0999,11740.1213,226.8088
-118620,0.0,0.0,284.8646,284.8646,0.0,0.0,296.66549999999995,296.66549999999995,0.0,0.0,0.0
-118680,150.0,7012.7607,284.9153,279.82,0.3286,19543.9604,296.5754,300.82669999999996,1.0999,12381.1997,239.1002
-118740,150.0,6552.7382,284.0857,279.82,0.3666,18261.4634,297.0071,300.9796,1.0999,11558.7252,223.3688
-118800,0.0,0.0,284.8144,284.8144,0.0,0.0,296.64849999999996,296.64849999999996,0.0,0.0,0.0
-118860,150.0,6997.336,284.878,279.82,0.3303,19501.151,296.5505,300.79249999999996,1.0999,12353.8151,238.5834
-118920,0.0,0.0,285.19329999999997,285.19329999999997,0.0,0.0,296.366,296.366,0.0,0.0,0.0
-118980,150.0,7110.9548,285.1627,279.82,0.3178,19819.1366,296.368,300.67909999999995,1.0999,12558.1817,242.5414
-119040,150.0,6723.1257,284.2723,279.82,0.3604,18735.6318,296.8692,300.94489999999996,1.0999,11862.5061,229.2149
-119100,0.0,0.0,284.9667,284.9667,0.0,0.0,296.554,296.554,0.0,0.0,0.0
-119160,150.0,7051.0541,285.0098,279.82,0.3244,19651.2801,296.49109999999996,300.76579999999996,1.0999,12450.2261,240.4919
-119220,150.0,6669.7651,284.1661,279.82,0.3663,18586.8341,296.95149999999995,300.9948,1.0999,11767.069,227.4016
-119280,0.0,0.0,284.8798,284.8798,0.0,0.0,296.6131,296.6131,0.0,0.0,0.0
-119340,150.0,7022.4805,284.9391,279.82,0.3275,19571.3576,296.53139999999996,300.78869999999995,1.0999,12398.8771,239.5313
-119400,150.0,6589.4373,284.1097,279.82,0.3666,18363.5159,296.9744,300.96909999999997,1.0999,11624.0786,224.7085
-119460,0.0,0.0,284.8349,284.8349,0.0,0.0,296.625,296.625,0.0,0.0,0.0
-119520,150.0,7008.5985,284.9052,279.82,0.329,19532.6455,296.5349,300.7838,1.0999,12374.0471,239.0845
-119580,150.0,6551.6956,284.08509999999995,279.82,0.3666,18258.7115,296.97069999999997,300.94259999999997,1.0999,11557.0158,223.4711
-119640,0.0,0.0,284.81579999999997,284.81579999999997,0.0,0.0,296.6194,296.6194,0.0,0.0,0.0
-119700,150.0,6999.4167,284.883,279.82,0.33,19507.1076,296.5279,300.77119999999996,1.0999,12357.6909,238.8107
-119760,0.0,0.0,285.20149999999995,285.20149999999995,0.0,0.0,296.3481,296.3481,0.0,0.0,0.0
-119820,150.0,7114.8008,285.17269999999996,279.82,0.3173,19829.958,296.3542,300.66769999999997,1.0999,12565.1571,242.8322
-119880,150.0,6732.7164,284.29179999999997,279.82,0.3594,18762.3678,296.85839999999996,300.9398,1.0999,11879.6513,229.6822
-119940,0.0,0.0,284.99339999999995,284.99339999999995,0.0,0.0,296.546,296.546,0.0,0.0,0.0
-120000,150.0,7060.4868,285.0335,279.82,0.3233,19677.6066,296.4862,300.7666,1.0999,12467.1198,240.9732
-120060,150.0,6680.6762,284.1875,279.82,0.3651,18617.1795,296.9487,300.99859999999995,1.0999,11786.5033,227.9235
-120120,0.0,0.0,284.90279999999996,284.90279999999996,0.0,0.0,296.6115,296.6115,0.0,0.0,0.0
-120180,150.0,7031.9496,284.9624,279.82,0.3265,19597.7478,296.53139999999996,300.7944,1.0999,12415.7982,240.0127
-120240,150.0,6622.2731,284.1311,279.82,0.3666,18454.7239,296.97769999999997,300.99219999999997,1.0999,11682.4508,225.9586
-120300,0.0,0.0,284.85729999999995,284.85729999999995,0.0,0.0,296.6294,296.6294,0.0,0.0,0.0
-120360,150.0,7017.627,284.92719999999997,279.82,0.328,19557.7658,296.54069999999996,300.7951,1.0999,12390.1388,239.5491
-120420,150.0,6581.8494,284.1047,279.82,0.3666,18342.42,296.979,300.96909999999997,1.0999,11610.5706,224.6292
-120480,0.0,0.0,284.8372,284.8372,0.0,0.0,296.6277,296.6277,0.0,0.0,0.0
-120540,150.0,7011.6776,284.9127,279.82,0.3287,19541.2152,296.5365,300.78729999999996,1.0999,12379.5377,239.3771
-120600,150.0,6566.5846,284.09479999999996,279.82,0.3666,18300.0502,296.9727,300.9536,1.0999,11583.4656,224.1472
-120660,0.0,0.0,284.83009999999996,284.83009999999996,0.0,0.0,296.6216,296.6216,0.0,0.0,0.0
-120720,150.0,7009.84,284.90819999999997,279.82,0.3289,19536.1352,296.53069999999997,300.78029999999995,1.0999,12376.2952,239.3473
-120780,150.0,6562.6447,284.0922,279.82,0.3666,18289.1315,296.967,300.94559999999996,1.0999,11576.4868,224.0462
-120840,0.0,0.0,284.8291,284.8291,0.0,0.0,296.6169,296.6169,0.0,0.0,0.0
-120900,150.0,7009.9309,284.9084,279.82,0.3289,19536.4165,296.5267,300.77639999999997,1.0999,12376.4856,239.3839
-120960,150.0,6564.0709,284.0931,279.82,0.3666,18293.1058,296.9638,300.9432,1.0999,11579.0348,224.1254
-121020,0.0,0.0,284.83099999999996,284.83099999999996,0.0,0.0,296.6144,296.6144,0.0,0.0,0.0
-121080,150.0,7010.9906,284.911,279.82,0.3288,19539.3828,296.5249,300.7752,1.0999,12378.3922,239.4537
-121140,150.0,6568.2379,284.0958,279.82,0.3666,18304.683,296.96259999999995,300.9446,1.0999,11586.4451,224.2968
-121200,0.0,0.0,284.8345,284.8345,0.0,0.0,296.6137,296.6137,0.0,0.0,0.0
-121260,150.0,7012.5735,284.9149,279.82,0.3286,19543.7955,296.5247,300.77599999999995,1.0999,12381.222,239.5413
-121320,150.0,6573.9214,284.0995,279.82,0.3666,18320.4664,296.9631,300.9484,1.0999,11596.545,224.5192
-121380,0.0,0.0,284.83889999999997,284.83889999999997,0.0,0.0,296.6144,296.6144,0.0,0.0,0.0
-121440,150.0,7014.4647,284.91949999999997,279.82,0.3284,19549.0594,296.5256,300.7781,1.0999,12384.5947,239.6395
-121500,150.0,6580.527,284.10389999999995,279.82,0.3666,18338.8075,296.96459999999996,300.95399999999995,1.0999,11608.2805,224.7725
-121560,0.0,0.0,284.8438,284.8438,0.0,0.0,296.616,296.616,0.0,0.0,0.0
-121620,150.0,7016.5571,284.9246,279.82,0.3281,19554.8785,296.52729999999997,300.78099999999995,1.0999,12388.3214,239.7445
-121680,150.0,6587.756,284.10859999999997,279.82,0.3666,18358.878,296.9668,300.96049999999997,1.0999,11621.1219,225.0469
-121740,0.0,0.0,284.84909999999996,284.84909999999996,0.0,0.0,296.61809999999997,296.61809999999997,0.0,0.0,0.0
-121800,150.0,7018.7935,284.9301,279.82,0.3279,19561.0954,296.52959999999996,300.78459999999995,1.0999,12392.3019,239.8544
-121860,150.0,6595.4467,284.11359999999996,279.82,0.3666,18380.2298,296.9695,300.9679,1.0999,11634.7832,225.3369
-121920,0.0,0.0,284.8547,284.8547,0.0,0.0,296.6207,296.6207,0.0,0.0,0.0
-121980,150.0,7021.1428,284.9358,279.82,0.3276,19567.6243,296.53209999999996,300.7886,1.0999,12396.4815,239.9682
-122040,150.0,6603.5116,284.11879999999996,279.82,0.3666,18402.6213,296.9726,300.9758,1.0999,11649.1097,225.6395
-122100,0.0,0.0,284.8606,284.8606,0.0,0.0,296.6235,296.6235,0.0,0.0,0.0
-122160,150.0,7023.5866,284.9418,279.82,0.3274,19574.4149,296.53499999999997,300.7929,1.0999,12400.8283,240.0852
-122220,150.0,6611.8974,284.12429999999995,279.82,0.3666,18425.9043,296.9758,300.98409999999996,1.0999,11664.0069,225.9531
-122280,0.0,0.0,284.8667,284.8667,0.0,0.0,296.6266,296.6266,0.0,0.0,0.0
-122340,150.0,7026.1134,284.948,279.82,0.3271,19581.4357,296.53799999999995,300.79749999999996,1.0999,12405.3223,240.2051
-122400,150.0,6633.0769,284.13809999999995,279.82,0.3666,18484.7365,296.97929999999997,301.00039999999996,1.0999,11701.6595,226.7005
-122460,0.0,0.0,284.885,284.885,0.0,0.0,296.6323,296.6323,0.0,0.0,0.0
-122520,150.0,7031.4954,284.9613,279.82,0.3265,19596.3704,296.5471,300.8098,1.0999,12414.8751,240.4006
-122580,150.0,6648.1451,284.1479,279.82,0.3666,18526.5469,296.99269999999996,301.0229,1.0999,11728.4019,227.2076
-122640,0.0,0.0,284.89799999999997,284.89799999999997,0.0,0.0,296.64919999999995,296.64919999999995,0.0,0.0,0.0
-122700,150.0,7039.7214,284.98159999999996,279.82,0.3256,19619.1416,296.56879999999995,300.8365,1.0999,12429.4203,240.6829
-122760,150.0,6669.6327,284.1658,279.82,0.3663,18586.1449,297.0182,301.0614,1.0999,11766.5122,227.9404
-122820,0.0,0.0,284.91069999999996,284.91069999999996,0.0,0.0,296.674,296.674,0.0,0.0,0.0
-122880,150.0,7043.8717,284.9919,279.82,0.3251,19630.5344,296.5934,300.86359999999996,1.0999,12436.6627,240.8228
-122940,150.0,6674.2312,284.1748,279.82,0.3658,18598.8136,297.04179999999997,301.0877,1.0999,11774.5824,228.0962
-123000,0.0,0.0,284.9199,284.9199,0.0,0.0,296.6961,296.6961,0.0,0.0,0.0
-123060,150.0,7047.4629,285.0009,279.82,0.3247,19640.3938,296.6144,300.88669999999996,1.0999,12442.9309,240.944
-123120,150.0,6678.6783,284.18359999999996,279.82,0.3653,18611.0794,297.0616,301.1103,1.0999,11782.401,228.2472
-123180,0.0,0.0,284.9292,284.9292,0.0,0.0,296.7149,296.7149,0.0,0.0,0.0
-123240,150.0,7051.2091,285.0102,279.82,0.3243,19650.7065,296.63239999999996,300.907,1.0999,12449.4974,241.071
-123300,150.0,6687.5965,284.2012,279.82,0.3643,18635.7842,297.0788,301.1327,1.0999,11798.1877,228.5408
-123360,0.0,0.0,284.9516,284.9516,0.0,0.0,296.73139999999995,296.73139999999995,0.0,0.0,0.0
-123420,150.0,7058.2956,285.02799999999996,279.82,0.3236,19670.3383,296.649,300.9278,1.0999,12462.0426,241.3137
-123480,150.0,6695.3716,284.21659999999997,279.82,0.3635,18657.3163,297.09499999999997,301.15369999999996,1.0999,11811.9447,228.8058
-123540,0.0,0.0,284.9704,284.9704,0.0,0.0,296.74739999999997,296.74739999999997,0.0,0.0,0.0
-123600,150.0,7068.4663,285.05359999999996,279.82,0.3224,19698.5483,296.6679,300.9529,1.0999,12480.082,241.6639
-123660,150.0,6707.372,284.2406,279.82,0.3622,18690.574,297.1151,301.181,1.0999,11833.202,229.2295
-123720,0.0,0.0,284.9894,284.9894,0.0,0.0,296.7655,296.7655,0.0,0.0,0.0
-123780,150.0,7074.9522,285.07,279.82,0.3217,19716.5036,296.68489999999997,300.9738,1.0999,12491.5514,241.886
-123840,150.0,6714.8093,284.2555,279.82,0.3613,18711.1699,297.13079999999997,301.2012,1.0999,11846.3606,229.484
-123900,0.0,0.0,285.0039,285.0039,0.0,0.0,296.7795,296.7795,0.0,0.0,0.0
-123960,150.0,7080.2914,285.0836,279.82,0.3211,19731.2913,296.6978,300.98999999999995,1.0999,12500.9999,242.0689
-124020,150.0,6725.2513,284.2766,279.82,0.3602,18740.1365,297.1427,301.21939999999995,1.0999,11864.8853,229.8313
-124080,0.0,0.0,285.0292,285.0292,0.0,0.0,296.7903,296.7903,0.0,0.0,0.0
-124140,150.0,7088.221,285.10389999999995,279.82,0.3203,19753.315,296.7084,301.00539999999995,1.0999,12515.094,242.3417
-124200,150.0,6734.0094,284.2944,279.82,0.3592,18764.432,297.1529,301.2349,1.0999,11880.4226,230.1308
-124260,150.0,6350.9679,283.95419999999996,279.82,0.3666,17701.1995,297.3904,301.2412,1.0999,11200.2316,217.1804
-124320,0.0,0.0,284.80359999999996,284.80359999999996,0.0,0.0,296.947,296.947,0.0,0.0,0.0
-124380,150.0,7021.3849,284.9364,279.82,0.3276,19566.3871,296.806,301.0623,1.0999,12395.0022,240.0259
-124440,150.0,6667.2983,284.16119999999995,279.82,0.3666,18578.7715,297.2138,301.25539999999995,1.0999,11761.4733,227.8368
-124500,0.0,0.0,284.9373,284.9373,0.0,0.0,296.8413,296.8413,0.0,0.0,0.0
-124560,150.0,7059.3013,285.03049999999996,279.82,0.3234,19672.4624,296.745,301.0243,1.0999,12463.1611,241.343
-124620,150.0,6702.4808,284.2308,279.82,0.3627,18676.6818,297.1781,301.241,1.0999,11824.201,229.052
-124680,0.0,0.0,284.99649999999997,284.99649999999997,0.0,0.0,296.8164,296.8164,0.0,0.0,0.0
-124740,150.0,7082.2736,285.08869999999996,279.82,0.3209,19736.5958,296.7287,301.022,1.0999,12504.3222,242.1323
-124800,150.0,6729.502,284.2852,279.82,0.3597,18751.829,297.1679,301.24719999999996,1.0999,11872.3271,229.9843
-124860,150.0,6339.8669,283.947,279.82,0.3666,17670.4788,297.39849999999996,301.2426,1.0999,11180.6119,216.8086
-124920,0.0,0.0,284.8015,284.8015,0.0,0.0,296.9498,296.9498,0.0,0.0,0.0
-124980,150.0,7022.6406,284.93949999999995,279.82,0.3275,19569.8973,296.80429999999996,301.0614,1.0999,12397.2567,240.0678
-125040,150.0,6670.55,284.1676,279.82,0.3662,18587.8266,297.20869999999996,301.2523,1.0999,11767.2766,227.9483
-125100,0.0,0.0,284.9477,284.9477,0.0,0.0,296.83299999999997,296.83299999999997,0.0,0.0,0.0
-125160,150.0,7067.7194,285.0517,279.82,0.3225,19695.9969,296.7342,301.01869999999997,1.0999,12478.2775,241.6263
-125220,150.0,6714.9463,284.25579999999997,279.82,0.3613,18711.3838,297.1656,301.23609999999996,1.0999,11846.4375,229.4818
-125280,150.0,6307.4315,283.92589999999996,279.82,0.3666,17580.7721,297.3884,301.21299999999997,1.0999,11123.3406,215.7233
-125340,0.0,0.0,284.78839999999997,284.78839999999997,0.0,0.0,296.93469999999996,296.93469999999996,0.0,0.0,0.0
-125400,150.0,7020.2444,284.93359999999996,279.82,0.3277,19563.3548,296.7849,301.04049999999995,1.0999,12393.1104,239.9864
-125460,150.0,6669.7655,284.1661,279.82,0.3663,18585.7435,297.1867,301.22979999999995,1.0999,11765.978,227.9226
-125520,0.0,0.0,284.9502,284.9502,0.0,0.0,296.8093,296.8093,0.0,0.0,0.0
-125580,150.0,7069.8747,285.05719999999997,279.82,0.3223,19702.181,296.7091,300.9949,1.0999,12482.3063,241.7038
-125640,150.0,6718.4917,284.2629,279.82,0.3609,18721.3635,297.1395,301.21209999999996,1.0999,11852.8718,229.606
-125700,150.0,6320.8165,283.9346,279.82,0.3666,17617.8096,297.36199999999997,301.1946,1.0999,11146.9931,216.1722
-125760,0.0,0.0,284.7997,284.7997,0.0,0.0,296.90689999999995,296.90689999999995,0.0,0.0,0.0
-125820,150.0,7028.6714,284.9543,279.82,0.3268,19587.0341,296.7561,301.01689999999996,1.0999,12408.3627,240.2724
-125880,150.0,6681.6767,284.18949999999995,279.82,0.365,18618.9681,297.15729999999996,301.2077,1.0999,11787.2914,228.335
-125940,0.0,0.0,284.9726,284.9726,0.0,0.0,296.7779,296.7779,0.0,0.0,0.0
-126000,150.0,7078.4223,285.0789,279.82,0.3213,19726.2338,296.6765,300.96759999999995,1.0999,12497.8115,242.0038
-126060,150.0,6728.8672,284.28389999999996,279.82,0.3598,18750.3639,297.1071,301.186,1.0999,11871.4968,229.9666
-126120,150.0,6349.8036,283.95349999999996,279.82,0.3666,17698.0409,297.3323,301.1823,1.0999,11198.2373,217.1436
-126180,0.0,0.0,284.815,284.815,0.0,0.0,296.87829999999997,296.87829999999997,0.0,0.0,0.0
-126240,150.0,7029.1249,284.9554,279.82,0.3268,19588.4791,296.72999999999996,300.99109999999996,1.0999,12409.3542,240.3023
-126300,150.0,6677.8458,284.1819,279.82,0.3654,18608.4318,297.1336,301.1816,1.0999,11780.586,228.2078
-126360,0.0,0.0,284.9618,284.9618,0.0,0.0,296.7555,296.7555,0.0,0.0,0.0
-126420,150.0,7069.4144,285.056,279.82,0.3223,19701.2771,296.6558,300.9414,1.0999,12481.8627,241.705
-126480,150.0,6714.7278,284.25539999999995,279.82,0.3613,18711.1544,297.08759999999995,301.15799999999996,1.0999,11846.4266,229.4833
-126540,150.0,6308.9179,283.92679999999996,279.82,0.3666,17584.9362,297.31059999999997,301.1361,1.0999,11126.0184,215.775
-126600,0.0,0.0,284.7847,284.7847,0.0,0.0,296.8562,296.8562,0.0,0.0,0.0
-126660,150.0,7018.1218,284.92839999999995,279.82,0.328,19558.0083,296.7029,300.9574,1.0999,12389.8865,239.9152
-126720,150.0,6657.0483,284.15369999999996,279.82,0.3666,18550.7759,297.1047,301.1402,1.0999,11743.7276,227.4947
-126780,0.0,0.0,284.929,284.929,0.0,0.0,296.7274,296.7274,0.0,0.0,0.0
-126840,150.0,7059.5548,285.0311,279.82,0.3234,19674.0159,296.6253,300.9049,1.0999,12464.4611,241.3584
-126900,150.0,6702.2078,284.23019999999997,279.82,0.3627,18676.5038,297.05649999999997,301.1194,1.0999,11824.296,229.0547
-126960,0.0,0.0,284.99449999999996,284.99449999999996,0.0,0.0,296.693,296.693,0.0,0.0,0.0
-127020,150.0,7081.263,285.0861,279.82,0.321,19734.6853,296.60179999999997,300.89459999999997,1.0999,12503.4223,242.114
-127080,150.0,6725.9986,284.2781,279.82,0.3601,18742.7242,297.04049999999995,301.11769999999996,1.0999,11866.7256,229.8772
-127140,0.0,0.0,285.0377,285.0377,0.0,0.0,296.6807,296.6807,0.0,0.0,0.0
-127200,150.0,7095.9028,285.1237,279.82,0.3194,19775.5489,296.59349999999995,300.8952,1.0999,12529.6461,242.6224
-127260,150.0,6746.7403,284.32039999999995,279.82,0.3578,18800.4272,297.03499999999997,301.1248,1.0999,11903.6869,230.5813
-127320,150.0,6397.1226,283.98429999999996,279.82,0.3666,17829.1369,297.2723,301.1509,1.0999,11282.0144,218.7325
-127380,0.0,0.0,284.8397,284.8397,0.0,0.0,296.8254,296.8254,0.0,0.0,0.0
-127440,150.0,7036.3409,284.97319999999996,279.82,0.326,19608.917,296.6828,300.94829999999996,1.0999,12422.5761,240.5601
-127500,150.0,6686.0189,284.19809999999995,279.82,0.3645,18631.3474,297.08979999999997,301.14279999999997,1.0999,11795.3285,228.4925
-127560,0.0,0.0,284.98089999999996,284.98089999999996,0.0,0.0,296.71209999999996,296.71209999999996,0.0,0.0,0.0
-127620,150.0,7077.0349,285.07529999999997,279.82,0.3215,19722.8177,296.61339999999996,300.90369999999996,1.0999,12495.7828,241.9752
-127680,150.0,6724.9089,284.2759,279.82,0.3602,18739.6658,297.04609999999997,301.12269999999995,1.0999,11864.7569,229.8376
-127740,150.0,6342.7376,283.9489,279.82,0.3666,17678.5591,297.2715,301.1173,1.0999,11185.8214,216.9092
-127800,0.0,0.0,284.8094,284.8094,0.0,0.0,296.817,296.817,0.0,0.0,0.0
-127860,150.0,7028.3876,284.9536,279.82,0.3268,19586.8844,296.6642,300.92499999999995,1.0999,12408.4967,240.2745
-127920,150.0,6676.1591,284.17859999999996,279.82,0.3656,18604.0547,297.0666,301.1137,1.0999,11777.8957,228.1546
-127980,0.0,0.0,284.9582,284.9582,0.0,0.0,296.6878,296.6878,0.0,0.0,0.0
-128040,150.0,7071.8416,285.06219999999996,279.82,0.3221,19708.5463,296.58509999999995,300.87219999999996,1.0999,12486.7046,241.7883
-128100,150.0,6718.0444,284.262,279.82,0.361,18720.7317,297.0163,301.08869999999996,1.0999,11852.6873,229.6038
-128160,0.0,0.0,285.0313,285.0313,0.0,0.0,296.65049999999997,296.65049999999997,0.0,0.0,0.0
-128220,150.0,7096.3358,285.1248,279.82,0.3194,19777.005,296.5589,300.86089999999996,1.0999,12530.6692,242.6408
-128280,150.0,6749.977,284.3271,279.82,0.3575,18809.6252,296.99769999999995,301.0895,1.0999,11909.6482,230.6946
-128340,150.0,6416.1257,283.9967,279.82,0.3666,17881.8534,297.2342,301.12429999999995,1.0999,11315.7277,219.3723
-128400,0.0,0.0,284.8587,284.8587,0.0,0.0,296.7856,296.7856,0.0,0.0,0.0
-128460,150.0,7045.8264,284.99679999999995,279.82,0.3249,19635.633,296.6427,300.914,1.0999,12439.8066,240.8918
-128520,150.0,6699.1953,284.2242,279.82,0.3631,18668.1638,297.0496,301.1106,1.0999,11818.9685,228.9494
-128580,150.0,6290.8282,283.91499999999996,279.82,0.3666,17534.9383,297.2578,301.07239999999996,1.0999,11094.11,215.1712
-128640,0.0,0.0,284.7912,284.7912,0.0,0.0,296.79269999999997,296.79269999999997,0.0,0.0,0.0
-128700,150.0,7025.981,284.9477,279.82,0.3271,19580.4017,296.6323,300.8916,1.0999,12404.4207,240.1947
-128760,150.0,6677.1706,284.18059999999997,279.82,0.3655,18607.0362,297.0306,301.07829999999996,1.0999,11779.8656,228.1917
-128820,0.0,0.0,284.9684,284.9684,0.0,0.0,296.649,296.649,0.0,0.0,0.0
-128880,150.0,7077.9835,285.07779999999997,279.82,0.3214,19725.951,296.5451,300.8361,1.0999,12497.9675,242.0055
-128940,150.0,6731.7597,284.28979999999996,279.82,0.3595,18759.0772,296.976,301.0567,1.0999,11877.3175,230.0683
-129000,150.0,6374.9449,283.9699,279.82,0.3666,17767.836,297.20419999999996,301.06949999999995,1.0999,11242.8911,217.9922
-129060,0.0,0.0,284.8425,284.8425,0.0,0.0,296.7505,296.7505,0.0,0.0,0.0
-129120,150.0,7043.1363,284.9901,279.82,0.3252,19628.4126,296.6036,300.8733,1.0999,12435.2763,240.8026
-129180,150.0,6698.7812,284.22339999999997,279.82,0.3631,18667.2133,297.0089,301.06969999999995,1.0999,11818.432,228.9383
-129240,150.0,6296.0872,283.9185,279.82,0.3666,17549.5225,297.2172,301.03499999999997,1.0999,11103.4354,215.3488
-129300,0.0,0.0,284.8035,284.8035,0.0,0.0,296.7518,296.7518,0.0,0.0,0.0
-129360,150.0,7031.7405,284.96189999999996,279.82,0.3265,19596.7116,296.59549999999996,300.8583,1.0999,12414.9711,240.4097
-129420,150.0,6688.2211,284.20239999999995,279.82,0.3643,18637.9222,296.99559999999997,301.0501,1.0999,11799.7011,228.575
-129480,150.0,6272.5912,283.90319999999997,279.82,0.3666,17484.5362,297.2005,301.0041,1.0999,11061.945,214.5628
-129540,0.0,0.0,284.79319999999996,284.79319999999996,0.0,0.0,296.73339999999996,296.73339999999996,0.0,0.0,0.0
-129600,150.0,7029.3853,284.9561,279.82,0.3267,19590.2878,296.5757,300.83709999999996,1.0999,12410.9024,240.3305
-129660,150.0,6686.7242,284.1995,279.82,0.3644,18633.8486,296.9779,301.03139999999996,1.0999,11797.1244,228.5249
-129720,150.0,6273.0624,283.90349999999995,279.82,0.3666,17485.8491,297.1884,300.9923,1.0999,11062.7867,214.5794
-129780,0.0,0.0,284.7999,284.7999,0.0,0.0,296.7292,296.7292,0.0,0.0,0.0
-129840,150.0,7038.8221,284.9794,279.82,0.3257,19616.5489,296.5811,300.84819999999996,1.0999,12427.7268,240.6432
-129900,150.0,6702.9647,284.23179999999996,279.82,0.3626,18678.9316,296.99129999999997,301.05469999999997,1.0999,11825.9669,229.0802
-129960,150.0,6322.0627,283.93539999999996,279.82,0.3666,17621.4108,297.2113,301.0447,1.0999,11149.3481,216.2199
-130020,0.0,0.0,284.835,284.835,0.0,0.0,296.7586,296.7586,0.0,0.0,0.0
-130080,150.0,7052.4726,285.0134,279.82,0.3242,19654.3437,296.61609999999996,300.8914,1.0999,12451.871,241.1104
-130140,150.0,6723.6306,284.27329999999995,279.82,0.3604,18736.1981,297.02909999999997,301.1049,1.0999,11862.5675,229.7748
-130200,150.0,6401.312,283.98699999999997,279.82,0.3666,17840.7717,297.25579999999997,301.13689999999997,1.0999,11289.4596,218.8741
-130260,0.0,0.0,284.8902,284.8902,0.0,0.0,296.8069,296.8069,0.0,0.0,0.0
-130320,150.0,7073.8441,285.06719999999996,279.82,0.3218,19713.507,296.67199999999997,300.9602,1.0999,12489.663,241.8426
-130380,150.0,6750.3719,284.3279,279.82,0.3574,18810.251,297.08779999999996,301.17969999999997,1.0999,11909.8792,230.6926
-130440,150.0,6484.7094,284.04139999999995,279.82,0.3666,18071.7275,297.31739999999996,301.2487,1.0999,11437.0181,221.6706
-130500,150.0,6204.4475,283.8587,279.82,0.3666,17296.2105,297.441,301.20369999999997,1.0999,10941.763,212.2788
-130560,0.0,0.0,284.81,284.81,0.0,0.0,296.94,296.94,0.0,0.0,0.0
-130620,150.0,7051.3396,285.0105,279.82,0.3243,19650.0676,296.7747,301.0492,1.0999,12448.728,241.0598
-130680,150.0,6729.0246,284.2843,279.82,0.3598,18750.4857,297.1713,301.2503,1.0999,11871.4611,229.9574
-130740,150.0,6434.4471,284.0086,279.82,0.3666,17932.3073,297.3852,301.2863,1.0999,11347.8603,219.9791
-130800,150.0,6173.4834,283.8386,279.82,0.3666,17210.805,297.4955,301.2396,1.0999,10887.3216,211.2465
-130860,0.0,0.0,284.799,284.799,0.0,0.0,296.98789999999997,296.98789999999997,0.0,0.0,0.0
-130920,150.0,7049.9882,285.00719999999995,279.82,0.3245,19645.9933,296.8189,301.0925,1.0999,12446.0051,241.0052
-130980,150.0,6729.5274,284.2853,279.82,0.3597,18751.6822,297.2131,301.29229999999995,1.0999,11872.1548,229.9698
-131040,150.0,6439.5929,284.012,279.82,0.3666,17946.4844,297.42629999999997,301.3304,1.0999,11356.8915,220.15
-131100,150.0,6181.3136,283.84369999999996,279.82,0.3666,17232.4631,297.53679999999997,301.2856,1.0999,10901.1495,211.5081
-131160,0.0,0.0,284.80699999999996,284.80699999999996,0.0,0.0,297.02959999999996,297.02959999999996,0.0,0.0,0.0
-131220,150.0,7057.0817,285.0249,279.82,0.3237,19665.4661,296.86089999999996,301.1387,1.0999,12458.3844,241.2358
-131280,150.0,6739.736,284.30609999999996,279.82,0.3586,18779.8551,297.25489999999996,301.34029999999996,1.0999,11890.1191,230.3167
-131340,150.0,6466.4307,284.0295,279.82,0.3666,18020.7384,297.46939999999995,301.3898,1.0999,11404.3076,221.0487
-131400,150.0,6203.3379,283.858,279.82,0.3666,17293.2894,297.5823,301.3445,1.0999,10939.9515,212.243
-131460,0.0,0.0,284.82129999999995,284.82129999999995,0.0,0.0,297.0759,297.0759,0.0,0.0,0.0
-131520,150.0,7062.7543,285.0392,279.82,0.3231,19680.9501,296.90709999999996,301.1884,1.0999,12468.1958,241.4251
-131580,150.0,6750.9177,284.32899999999995,279.82,0.3574,18810.716,297.3001,301.3922,1.0999,11909.7983,230.6852
-131640,150.0,6518.066,284.06309999999996,279.82,0.3666,18163.6964,297.51709999999997,301.46849999999995,1.0999,11495.6304,222.7797
-131700,150.0,6258.7906,283.89419999999996,279.82,0.3666,17446.3963,297.63559999999995,301.43109999999996,1.0999,11037.6058,214.0918
-131760,150.0,6098.1032,283.7894,279.82,0.3666,17003.4265,297.6858,301.38489999999996,1.0999,10755.3233,208.7405
-131820,150.0,6005.8854,283.72929999999997,279.82,0.3666,16749.7174,297.69329999999997,301.3372,1.0999,10593.832,205.6804
-131880,0.0,0.0,284.74249999999995,284.74249999999995,0.0,0.0,297.1457,297.1457,0.0,0.0,0.0
-131940,150.0,7040.9526,284.9847,279.82,0.3255,19619.8628,296.95759999999996,301.2256,1.0999,12428.9102,240.6642
-132000,150.0,6727.7819,284.2817,279.82,0.3599,18746.2389,297.34099999999995,301.41909999999996,1.0999,11868.4571,229.8947
-132060,150.0,6457.9932,284.024,279.82,0.3666,17997.2251,297.55199999999996,301.46729999999997,1.0999,11389.2319,220.7612
-132120,150.0,6223.8821,283.8714,279.82,0.3666,17350.0796,297.6649,301.4394,1.0999,10976.1976,212.9274
-132180,150.0,6081.9284,283.77889999999996,279.82,0.3666,16958.9754,297.7118,301.4013,1.0999,10727.047,208.2044
-132240,150.0,6001.2059,283.7263,279.82,0.3666,16736.965,297.71999999999997,301.36109999999996,1.0999,10585.7591,205.5272
-132300,0.0,0.0,284.74769999999995,284.74769999999995,0.0,0.0,297.17609999999996,297.17609999999996,0.0,0.0,0.0
-132360,150.0,7043.9174,284.99199999999996,279.82,0.3251,19627.8671,296.995,301.2648,1.0999,12433.9497,240.7711
-132420,150.0,6735.02,284.2965,279.82,0.3591,18766.1664,297.3816,301.464,1.0999,11881.1464,230.1394
-132480,150.0,6484.322,284.0411,279.82,0.3666,18070.0592,297.5956,301.5267,1.0999,11435.7372,221.6429
-132540,150.0,6242.4161,283.88349999999997,279.82,0.3666,17401.2787,297.71189999999996,301.4975,1.0999,11008.8626,213.5462
-132600,150.0,6096.1904,283.78819999999996,279.82,0.3666,16998.3912,297.76149999999996,301.4595,1.0999,10752.2008,208.6806
-132660,150.0,6013.4352,283.73429999999996,279.82,0.3666,16770.7982,297.77099999999996,301.41949999999997,1.0999,10607.363,205.9359
-132720,0.0,0.0,284.7571,284.7571,0.0,0.0,297.227,297.227,0.0,0.0,0.0
-132780,150.0,7051.4355,285.01079999999996,279.82,0.3243,19648.4681,297.0454,301.31969999999995,1.0999,12447.0325,241.0149
-132840,150.0,6745.497,284.31789999999995,279.82,0.358,18795.0531,297.431,301.5198,1.0999,11899.5561,230.4949
-132900,150.0,6511.2273,284.0587,279.82,0.3666,18144.4836,297.6456,301.5929,1.0999,11483.2564,222.5437
-132960,150.0,6263.9241,283.8975,279.82,0.3666,17460.691,297.76349999999996,301.5621,1.0999,11046.7669,214.2642
-133020,150.0,6113.0365,283.7992,279.82,0.3666,17044.9309,297.81449999999995,301.5227,1.0999,10781.8944,209.2427
-133080,150.0,6027.5064,283.74339999999995,279.82,0.3666,16809.7053,297.8243,301.48139999999995,1.0999,10632.1989,206.4059
-133140,0.0,0.0,284.76739999999995,284.76739999999995,0.0,0.0,297.2793,297.2793,0.0,0.0,0.0
-133200,150.0,7055.8327,285.0218,279.82,0.3238,19660.3723,297.0963,301.3732,1.0999,12454.5396,241.1596
-133260,150.0,6754.7726,284.337,279.82,0.3569,18820.6137,297.4779,301.5723,1.0999,11915.8411,230.7991
-133320,150.0,6555.8158,284.0877,279.82,0.3666,18267.915,297.68899999999996,301.66319999999996,1.0999,11562.0992,224.0385
-133380,150.0,6312.7916,283.9294,279.82,0.3666,17595.6192,297.8048,301.6327,1.0999,11132.8277,215.8942
-133440,150.0,6161.0715,283.8305,279.82,0.3666,17177.3071,297.85339999999997,301.5904,1.0999,10866.2357,210.839
-133500,150.0,6073.8693,283.7736,279.82,0.3666,16937.3199,297.85889999999995,301.5437,1.0999,10713.4506,207.9429
-133560,150.0,6024.6945,283.74159999999995,279.82,0.3666,16802.0569,297.84259999999995,301.49789999999996,1.0999,10627.3624,206.3118
-133620,150.0,5985.1172,283.7158,279.82,0.3666,16693.2015,297.8173,301.4489,1.0999,10558.0843,204.9988
-133680,150.0,5956.4402,283.6971,279.82,0.3666,16614.2979,297.7872,301.4017,1.0999,10507.8577,204.0477
-133740,150.0,5942.7689,283.6882,279.82,0.3666,16576.6052,297.7569,301.3631,1.0999,10483.8363,203.5931
-133800,150.0,5936.2925,283.68399999999997,279.82,0.3666,16558.678,297.7287,301.33099999999996,1.0999,10472.3855,203.3766
-133860,150.0,5933.4064,283.6821,279.82,0.3666,16550.6254,297.70369999999997,301.30429999999996,1.0999,10467.2191,203.2791
-133920,150.0,5932.3329,283.6814,279.82,0.3666,16547.5683,297.6821,301.282,1.0999,10465.2354,203.2418
-133980,150.0,5932.1941,283.68129999999996,279.82,0.3666,16547.0943,297.6635,301.2634,1.0999,10464.9002,203.2357
-134040,150.0,5932.5574,283.6816,279.82,0.3666,16548.0133,297.64759999999995,301.2476,1.0999,10465.4558,203.2464
-134100,150.0,5933.2041,283.68199999999996,279.82,0.3666,16549.7219,297.6337,301.23409999999996,1.0999,10466.5178,203.2668
-134160,150.0,5934.0172,283.6825,279.82,0.3666,16551.8968,297.62149999999997,301.2224,1.0999,10467.8796,203.2927
-134220,150.0,5934.9309,283.68309999999997,279.82,0.3666,16554.3552,297.61069999999995,301.21209999999996,1.0999,10469.4244,203.3221
-134280,150.0,5935.9065,283.6837,279.82,0.3666,16556.9898,297.601,301.2029,1.0999,10471.0833,203.3537
-134340,150.0,5936.9065,283.6844,279.82,0.3666,16559.6958,297.59209999999996,301.1946,1.0999,10472.7893,203.3861
-134400,150.0,5937.9072,283.6851,279.82,0.3666,16562.4072,297.5838,301.18699999999995,1.0999,10474.5,203.4187
-134460,150.0,5950.6932,283.6934,279.82,0.3666,16597.5076,297.5761,301.1869,1.0999,10496.8144,203.842
-134520,150.0,5953.3019,283.69509999999997,279.82,0.3666,16604.657,297.5714,301.1837,1.0999,10501.3551,203.9276
-134580,150.0,5957.9047,283.69809999999995,279.82,0.3666,16617.2845,297.5659,301.18089999999995,1.0999,10509.3798,204.0802
-134640,150.0,5956.8537,283.69739999999996,279.82,0.3666,16614.3792,297.56199999999995,301.1765,1.0999,10507.5255,204.0447
-134700,150.0,5959.9975,283.69939999999997,279.82,0.3666,16622.9974,297.5564,301.17269999999996,1.0999,10512.9998,204.149
-134760,150.0,5969.6556,283.7057,279.82,0.3666,16649.532,297.5521,301.17409999999995,1.0999,10529.8764,204.4688
-134820,150.0,5973.6763,283.7084,279.82,0.3666,16660.5729,297.54839999999996,301.17289999999997,1.0999,10536.8965,204.6019
-134880,150.0,5975.4803,283.7095,279.82,0.3666,16665.5199,297.54499999999996,301.17049999999995,1.0999,10540.0395,204.6615
-134940,150.0,5965.149,283.70279999999997,279.82,0.3666,16637.0975,297.5412,301.1606,1.0999,10521.9485,204.3182
-135000,150.0,5964.7179,283.7025,279.82,0.3666,16635.885,297.5345,301.1536,1.0999,10521.1671,204.3041
-135060,150.0,5973.0815,283.70799999999997,279.82,0.3666,16658.859,297.5286,301.1527,1.0999,10535.7775,204.581
-135120,150.0,5976.7512,283.7104,279.82,0.3666,16668.9307,297.52329999999995,301.14959999999996,1.0999,10542.1795,204.7024
-135180,150.0,5978.5728,283.7115,279.82,0.3666,16673.9222,297.51849999999996,301.1459,1.0999,10545.3494,204.7625
-135240,150.0,5979.6318,283.7122,279.82,0.3666,16676.8167,297.5137,301.14169999999996,1.0999,10547.1848,204.7974
-135300,150.0,5980.4106,283.7127,279.82,0.3666,16678.9398,297.5087,301.1371,1.0999,10548.5292,204.8229
-135360,150.0,5981.1169,283.7132,279.82,0.3666,16680.8632,297.5034,301.1323,1.0999,10549.7463,204.8461
-135420,150.0,5981.8282,283.71369999999996,279.82,0.3666,16682.7997,297.498,301.1273,1.0999,10550.9715,204.8694
-135480,150.0,5982.567,283.7142,279.82,0.3666,16684.8114,297.4924,301.1221,1.0999,10552.2444,204.8936
-135540,150.0,5983.3363,283.7147,279.82,0.3666,16686.9069,297.4867,301.11679999999996,1.0999,10553.5707,204.9188
-135600,150.0,5984.1337,283.7152,279.82,0.3666,16689.0799,297.48089999999996,301.1115,1.0999,10554.9462,204.9449
-135660,150.0,5984.9557,283.71569999999997,279.82,0.3666,16691.3204,297.47499999999997,301.10609999999997,1.0999,10556.3646,204.9719
-135720,150.0,5985.7983,283.7163,279.82,0.3666,16693.6177,297.46909999999997,301.10069999999996,1.0999,10557.8194,204.9995
-135780,150.0,5986.6578,283.7168,279.82,0.3666,16695.9619,297.4632,301.09529999999995,1.0999,10559.304,205.0278
-135840,150.0,5987.5308,283.7174,279.82,0.3666,16698.3433,297.4572,301.0899,1.0999,10560.8125,205.0564
-135900,150.0,5988.4144,283.71799999999996,279.82,0.3666,16700.7541,297.4512,301.08439999999996,1.0999,10562.3397,205.0855
-135960,150.0,5989.306,283.71849999999995,279.82,0.3666,16703.1873,297.4453,301.07899999999995,1.0999,10563.8813,205.1148
-136020,150.0,5990.2035,283.71909999999997,279.82,0.3666,16705.6369,297.4393,301.07349999999997,1.0999,10565.4335,205.1443
-136080,150.0,5991.1051,283.7197,279.82,0.3666,16708.0982,297.4333,301.06809999999996,1.0999,10566.9931,205.1739
-136140,150.0,5992.0093,283.72029999999995,279.82,0.3666,16710.5671,297.4274,301.06269999999995,1.0999,10568.5578,205.2036
-136200,150.0,5992.915,283.7209,279.82,0.3666,16713.0402,297.42139999999995,301.0573,1.0999,10570.1252,205.2334
-136260,150.0,5993.821,283.7215,279.82,0.3666,16715.5146,297.41549999999995,301.05179999999996,1.0999,10571.6936,205.2632
-136320,150.0,5994.7264,283.72209999999995,279.82,0.3666,16717.9878,297.4095,301.04639999999995,1.0999,10573.2614,205.293
-136380,150.0,5995.6306,283.7227,279.82,0.3666,16720.4577,297.4036,301.041,1.0999,10574.8271,205.3228
-136440,150.0,5996.5327,283.7233,279.82,0.3666,16722.9222,297.39759999999995,301.0356,1.0999,10576.3895,205.3525
-136500,150.0,5997.4322,283.7238,279.82,0.3666,16725.3799,297.39169999999996,301.0302,1.0999,10577.9478,205.3821
-136560,150.0,5998.3284,283.7244,279.82,0.3666,16727.8291,297.3857,301.02479999999997,1.0999,10579.5006,205.4116
-136620,150.0,5999.2211,283.72499999999997,279.82,0.3666,16730.2685,297.3798,301.0193,1.0999,10581.0474,205.441
-136680,150.0,6000.1095,283.7256,279.82,0.3666,16732.6967,297.37379999999996,301.0139,1.0999,10582.5872,205.4702
-136740,150.0,6000.9934,283.72619999999995,279.82,0.3666,16735.1127,297.36789999999996,301.00849999999997,1.0999,10584.1192,205.4994
-136800,150.0,6001.8723,283.7267,279.82,0.3666,16737.5153,297.3619,301.00309999999996,1.0999,10585.6429,205.5283
-136860,150.0,6002.7459,283.72729999999996,279.82,0.3666,16739.9059,297.35679999999996,300.9985,1.0999,10587.1599,205.5571
-136920,150.0,6003.6139,283.7279,279.82,0.3666,16742.2841,297.35269999999997,300.9949,1.0999,10588.6702,205.5858
-136980,150.0,6004.4758,283.72839999999997,279.82,0.3666,16744.6477,297.34929999999997,300.99199999999996,1.0999,10590.1719,205.6143
-137040,150.0,6005.3311,283.729,279.82,0.3666,16746.9946,297.34639999999996,300.9896,1.0999,10591.6635,205.6426
-137100,150.0,6006.1797,283.7295,279.82,0.3666,16749.3242,297.3438,300.98749999999995,1.0999,10593.1445,205.6707
-137160,150.0,6007.0213,283.7301,279.82,0.3666,16751.6356,297.3415,300.98569999999995,1.0999,10594.6143,205.6986
-137220,150.0,6007.8557,283.7306,279.82,0.3666,16753.9278,297.33939999999996,300.98409999999996,1.0999,10596.0721,205.7263
-137280,150.0,6008.6829,283.7312,279.82,0.3666,16756.2006,297.3375,300.98269999999997,1.0999,10597.5177,205.7537
-137340,150.0,6009.5023,283.7317,279.82,0.3666,16758.4524,297.3357,300.98139999999995,1.0999,10598.9501,205.7809
-137400,150.0,6010.3142,283.7322,279.82,0.3666,16760.6838,297.334,300.98019999999997,1.0999,10600.3696,205.8078
-137460,150.0,6011.1181,283.7328,279.82,0.3666,16762.8935,297.3324,300.97909999999996,1.0999,10601.7754,205.8345
-137520,150.0,6011.9139,283.7333,279.82,0.3666,16765.0812,297.3309,300.97799999999995,1.0999,10603.1673,205.8609
-137580,150.0,6012.7014,283.7338,279.82,0.3666,16767.2463,297.32939999999996,300.977,1.0999,10604.5449,205.887
-137640,150.0,6013.4806,283.73429999999996,279.82,0.3666,16769.3885,297.3279,300.976,1.0999,10605.9079,205.9128
-137700,150.0,6014.2513,283.73479999999995,279.82,0.3666,16771.5075,297.3264,300.97499999999997,1.0999,10607.2561,205.9384
-137760,150.0,6015.0134,283.7353,279.82,0.3666,16773.6028,297.325,300.974,1.0999,10608.5894,205.9637
-137820,150.0,6015.7666,283.7358,279.82,0.3666,16775.6737,297.3236,300.97299999999996,1.0999,10609.9071,205.9887
-137880,150.0,6016.5109,283.73629999999997,279.82,0.3666,16777.7204,297.32219999999995,300.972,1.0999,10611.2095,206.0134
-137940,150.0,6017.2463,283.73679999999996,279.82,0.3666,16779.7423,297.32079999999996,300.9711,1.0999,10612.496,206.0378
-138000,150.0,6017.9725,283.7372,279.82,0.3666,16781.7392,297.3193,300.9701,1.0999,10613.7667,206.0619
-138060,150.0,6018.6895,283.73769999999996,279.82,0.3666,16783.7107,297.31789999999995,300.96909999999997,1.0999,10615.0212,206.0857
-138120,150.0,6019.3973,283.7382,279.82,0.3666,16785.6567,297.31649999999996,300.9681,1.0999,10616.2594,206.1092
-138180,150.0,6020.0956,283.73859999999996,279.82,0.3666,16787.577,297.3151,300.96709999999996,1.0999,10617.4813,206.1324
-138240,150.0,6020.7845,283.73909999999995,279.82,0.3666,16789.4711,297.31359999999995,300.9661,1.0999,10618.6866,206.1552
-138300,150.0,6021.4639,283.73949999999996,279.82,0.3666,16791.3391,297.31219999999996,300.965,1.0999,10619.8752,206.1778
-138360,150.0,6022.1337,283.7399,279.82,0.3666,16793.1808,297.3108,300.964,1.0999,10621.0471,206.2
-138420,150.0,6022.7939,283.74039999999997,279.82,0.3666,16794.996,297.3093,300.96299999999997,1.0999,10622.2021,206.2219
-138480,150.0,6023.4443,283.7408,279.82,0.3666,16796.7844,297.30789999999996,300.96189999999996,1.0999,10623.3401,206.2435
-138540,150.0,6024.0851,283.7412,279.82,0.3666,16798.5461,297.3064,300.96079999999995,1.0999,10624.4611,206.2648
-138600,150.0,6024.7159,283.74159999999995,279.82,0.3666,16800.2807,297.3049,300.9597,1.0999,10625.5648,206.2857
-138660,150.0,6025.3371,283.74199999999996,279.82,0.3666,16801.9885,297.30339999999995,300.9586,1.0999,10626.6514,206.3063
-138720,150.0,6025.9495,283.7424,279.82,0.3666,16803.6722,297.30199999999996,300.9575,1.0999,10627.7227,206.3266
-138780,150.0,6026.5551,283.7428,279.82,0.3666,16805.3372,297.3005,300.9563,1.0999,10628.7821,206.3467
-138840,150.0,6027.1555,283.7432,279.82,0.3666,16806.9879,297.299,300.9552,1.0999,10629.8324,206.3667
-138900,150.0,6027.7513,283.74359999999996,279.82,0.3666,16808.6259,297.2974,300.95399999999995,1.0999,10630.8746,206.3864
-138960,150.0,6028.3421,283.74399999999997,279.82,0.3666,16810.2503,297.29589999999996,300.9529,1.0999,10631.9082,206.406
-139020,150.0,6028.9276,283.7444,279.82,0.3666,16811.8599,297.2944,300.95169999999996,1.0999,10632.9324,206.4255
-139080,150.0,6029.5072,283.74469999999997,279.82,0.3666,16813.4536,297.2929,300.9505,1.0999,10633.9463,206.4447
-139140,150.0,6030.0806,283.7451,279.82,0.3666,16815.0298,297.2913,300.9493,1.0999,10634.9492,206.4637
-139200,150.0,6030.6472,283.7455,279.82,0.3666,16816.5876,297.28979999999996,300.94809999999995,1.0999,10635.9404,206.4826
-139260,150.0,6031.2069,283.7458,279.82,0.3666,16818.1264,297.28819999999996,300.94689999999997,1.0999,10636.9195,206.5011
-139320,150.0,6031.7595,283.7462,279.82,0.3666,16819.6456,297.2867,300.94559999999996,1.0999,10637.8861,206.5195
-139380,150.0,6032.3047,283.7466,279.82,0.3666,16821.1445,297.2851,300.9444,1.0999,10638.8398,206.5376
-139440,150.0,6032.8424,283.7469,279.82,0.3666,16822.6227,297.2835,300.9432,1.0999,10639.7803,206.5554
-139500,150.0,6033.3724,283.7473,279.82,0.3666,16824.0797,297.282,300.9419,1.0999,10640.7073,206.573
-139560,150.0,6033.8946,283.7476,279.82,0.3666,16825.5154,297.2804,300.94059999999996,1.0999,10641.6208,206.5903
-139620,150.0,6034.409,283.74789999999996,279.82,0.3666,16826.9293,297.2788,300.9393,1.0999,10642.5203,206.6074
-139680,150.0,6034.9153,283.7483,279.82,0.3666,16828.3213,297.2772,300.938,1.0999,10643.4059,206.6242
-139740,150.0,6035.4136,283.74859999999995,279.82,0.3666,16829.691,297.2756,300.9367,1.0999,10644.2774,206.6408
-139800,150.0,6035.9038,283.7489,279.82,0.3666,16831.0385,297.274,300.93539999999996,1.0999,10645.1347,206.657
-139860,150.0,6036.3859,283.7492,279.82,0.3666,16832.3636,297.27239999999995,300.9341,1.0999,10645.9777,206.673
-139920,150.0,6036.8599,283.74949999999995,279.82,0.3666,16833.6663,297.2707,300.93269999999995,1.0999,10646.8065,206.6888
-139980,150.0,6037.3255,283.7498,279.82,0.3666,16834.9462,297.2691,300.9314,1.0999,10647.6207,206.7042
-140040,150.0,6037.783,283.7501,279.82,0.3666,16836.2036,297.26739999999995,300.92999999999995,1.0999,10648.4206,206.7194
-140100,150.0,6038.2323,283.75039999999996,279.82,0.3666,16837.4386,297.26579999999996,300.92859999999996,1.0999,10649.2062,206.7343
-140160,150.0,6038.6733,283.7507,279.82,0.3666,16838.6506,297.2641,300.92719999999997,1.0999,10649.9772,206.7489
-140220,150.0,6039.1062,283.751,279.82,0.3666,16839.8401,297.2625,300.9258,1.0999,10650.7339,206.7633
-140280,150.0,6039.5308,283.75129999999996,279.82,0.3666,16841.007,297.26079999999996,300.9244,1.0999,10651.4762,206.7774
-140340,150.0,6039.9472,283.75149999999996,279.82,0.3666,16842.1513,297.2591,300.923,1.0999,10652.2041,206.7912
-140400,150.0,6040.3554,283.7518,279.82,0.3666,16843.273,297.25739999999996,300.9215,1.0999,10652.9175,206.8048
-140460,150.0,6040.7506,283.7521,279.82,0.3666,16844.362,297.2573,300.92159999999996,1.0999,10653.6113,206.8274
-140520,150.0,6039.2914,283.75109999999995,279.82,0.3666,16840.3434,297.25899999999996,300.92249999999996,1.0999,10651.052,206.788
-140580,150.0,6034.9494,283.7483,279.82,0.3666,16828.381,297.2614,300.92229999999995,1.0999,10643.4316,206.6528
-140640,150.0,6028.9452,283.7444,279.82,0.3666,16811.8389,297.2638,300.92109999999997,1.0999,10632.8937,206.4625
-140700,150.0,6022.7222,283.7403,279.82,0.3666,16794.6951,297.2659,300.9194,1.0999,10621.973,206.265
-140760,150.0,6017.0702,283.73659999999995,279.82,0.3666,16779.126,297.2677,300.9179,1.0999,10612.0558,206.0866
-140820,150.0,6012.1985,283.7335,279.82,0.3666,16765.7077,297.26939999999996,300.91659999999996,1.0999,10603.5093,205.9341
-140880,150.0,6008.0376,283.7308,279.82,0.3666,16754.249,297.2711,300.9158,1.0999,10596.2115,205.8052
-140940,150.0,6004.4484,283.72839999999997,279.82,0.3666,16744.3667,297.2729,300.91549999999995,1.0999,10589.9182,205.6954
-141000,150.0,5990.0389,283.719,279.82,0.3666,16704.6841,297.275,300.909,1.0999,10564.6452,205.2251
-141060,150.0,5974.9913,283.70919999999995,279.82,0.3666,16663.2481,297.27479999999997,300.89979999999997,1.0999,10538.2568,204.7344
-141120,150.0,5968.1433,283.7048,279.82,0.3666,16644.3911,297.2736,300.8945,1.0999,10526.2478,204.5162
-141180,150.0,5964.7069,283.7025,279.82,0.3666,16634.9273,297.2725,300.8913,1.0999,10520.2204,204.4113
-141240,150.0,5962.7271,283.7012,279.82,0.3666,16629.4763,297.2722,300.8898,1.0999,10516.7492,204.3549
-141300,150.0,5961.3428,283.70029999999997,279.82,0.3666,16625.6677,297.27279999999996,300.8896,1.0999,10514.3249,204.3183
-141360,150.0,5960.1897,283.6996,279.82,0.3666,16622.4982,297.2743,300.8904,1.0999,10512.3086,204.2894
-141420,150.0,5959.1257,283.6989,279.82,0.3666,16619.5768,297.2766,300.89209999999997,1.0999,10510.4511,204.2636
-141480,150.0,5958.0995,283.6982,279.82,0.3666,16616.7612,297.2795,300.89439999999996,1.0999,10508.6617,204.239
-141540,150.0,5957.0926,283.69759999999997,279.82,0.3666,16614.0007,297.2829,300.8972,1.0999,10506.9081,204.2151
-141600,150.0,5956.0993,283.69689999999997,279.82,0.3666,16611.2787,297.2867,300.9004,1.0999,10505.1794,204.1916
-141660,0.0,0.0,284.7484,284.7484,0.0,0.0,296.75329999999997,296.75329999999997,0.0,0.0,0.0
-141720,150.0,7051.2309,285.0103,279.82,0.3243,19651.0795,296.5884,300.863,1.0999,12449.8486,241.3226
-141780,150.0,6749.0896,284.32529999999997,279.82,0.3576,18807.1829,296.99289999999996,301.0841,1.0999,11908.0933,230.9067
-141840,150.0,6540.611,284.07779999999997,279.82,0.3666,18227.0155,297.2274,301.1925,1.0999,11536.4045,223.8044
-141900,150.0,6300.983,283.9217,279.82,0.3666,17562.9527,297.3644,301.1851,1.0999,11111.9696,215.7539
-141960,150.0,6152.5129,283.82489999999996,279.82,0.3666,17152.8638,297.4323,301.16389999999996,1.0999,10850.3509,210.7973
-142020,150.0,6067.1712,283.7693,279.82,0.3666,16917.6163,297.4559,301.1363,1.0999,10700.4451,207.962
-142080,150.0,6018.6804,283.73769999999996,279.82,0.3666,16784.073,297.4566,301.1079,1.0999,10615.3925,206.3579
-142140,150.0,5990.7579,283.7195,279.82,0.3666,16707.1895,297.4473,301.08189999999996,1.0999,10566.4317,205.4386
-142200,0.0,0.0,284.7607,284.7607,0.0,0.0,296.8963,296.8963,0.0,0.0,0.0
-142260,150.0,7054.8279,285.0193,279.82,0.3239,19660.2331,296.71139999999997,300.9881,1.0999,12455.4052,241.5198
-142320,150.0,6753.6527,284.3347,279.82,0.3571,18819.304,297.1013,301.1952,1.0999,11915.6513,231.1367
-142380,150.0,6555.4107,284.0875,279.82,0.3666,18267.7611,297.3248,301.29879999999997,1.0999,11562.3504,224.3884
-142440,150.0,6314.1478,283.93019999999996,279.82,0.3666,17599.3118,297.45369999999997,301.2824,1.0999,11135.164,216.282
-142500,150.0,6163.0235,283.83169999999996,279.82,0.3666,17181.9767,297.51559999999995,301.2534,1.0999,10868.9532,211.236
-142560,150.0,6075.5398,283.7747,279.82,0.3666,16940.8677,297.534,301.2195,1.0999,10715.3279,208.3289
-142620,150.0,6013.7084,283.7344,279.82,0.3666,16770.6247,297.5302,301.1787,1.0999,10606.9163,206.28
-142680,150.0,5971.8683,283.7072,279.82,0.3666,16655.4682,297.5145,301.1379,1.0999,10533.5999,204.8983
-142740,150.0,5949.3031,283.6925,279.82,0.3666,16592.5855,297.28999999999996,300.89959999999996,1.0999,10493.2824,202.4769
-142800,0.0,0.0,284.7378,284.7378,0.0,0.0,296.9389,296.9389,0.0,0.0,0.0
-142860,150.0,7048.7051,285.00399999999996,279.82,0.3246,19642.8735,296.7537,301.0267,1.0999,12444.1684,241.4132
-142920,150.0,6747.9125,284.3228,279.82,0.3577,18803.128,297.14369999999997,301.23409999999996,1.0999,11905.2155,231.0416
-142980,150.0,6538.1938,284.0763,279.82,0.3666,18219.8797,297.3678,301.3314,1.0999,11531.6858,223.9081
-143040,150.0,6299.5806,283.92069999999995,279.82,0.3666,17559.0298,297.4964,301.31629999999996,1.0999,11109.4492,215.8923
-143100,150.0,6151.2424,283.8241,279.82,0.3666,17149.5543,297.5578,301.2886,1.0999,10848.3119,210.9405
-143160,150.0,6054.535,283.7611,279.82,0.3666,16883.1445,297.5762,301.2491,1.0999,10678.6095,207.7261
-143220,150.0,5993.5772,283.7213,279.82,0.3666,16715.3859,297.5703,301.20669999999996,1.0999,10571.8087,205.7079
-143280,150.0,5960.9918,283.70009999999996,279.82,0.3666,16625.7203,297.5539,301.1708,1.0999,10514.7285,204.6339
-143340,0.0,0.0,284.74249999999995,284.74249999999995,0.0,0.0,297.0003,297.0003,0.0,0.0,0.0
-143400,150.0,7049.4434,285.00579999999997,279.82,0.3245,19644.5078,296.81419999999997,301.08759999999995,1.0999,12445.0644,241.5302
-143460,150.0,6747.6892,284.32239999999996,279.82,0.3577,18802.2159,297.20219999999995,301.2924,1.0999,11904.5268,231.1234
-143520,150.0,6535.41,284.07439999999997,279.82,0.3666,18212.0051,297.4235,301.3854,1.0999,11526.5951,223.9032
-143580,150.0,6295.4921,283.9181,279.82,0.3666,17547.7298,297.5494,301.36679999999996,1.0999,11102.2377,215.8438
-143640,150.0,6146.4195,283.8209,279.82,0.3666,17136.3533,297.60819999999995,301.33619999999996,1.0999,10839.9338,210.8679
-143700,150.0,6049.142,283.7575,279.82,0.3666,16868.4523,297.62449999999995,301.2942,1.0999,10669.3103,207.6348
-143760,150.0,5987.7726,283.7175,279.82,0.3666,16699.6058,297.61679999999996,301.24969999999996,1.0999,10561.8332,205.6029
-143820,0.0,0.0,284.7525,284.7525,0.0,0.0,297.06289999999996,297.06289999999996,0.0,0.0,0.0
-143880,150.0,7051.8609,285.0118,279.82,0.3243,19650.8281,296.87399999999997,301.14869999999996,1.0999,12448.9672,241.6945
-143940,150.0,6749.4128,284.3259,279.82,0.3575,18806.7314,297.2587,301.34999999999997,1.0999,11907.3185,231.2619
-144000,150.0,6538.583,284.07649999999995,279.82,0.3666,18220.6609,297.47659999999996,301.4405,1.0999,11532.0779,224.089
-144060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-144960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-145980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-146940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-147960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-148980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-149940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-150960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-151980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-152940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-153960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-154980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-155940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-156960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-157980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-158940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-159960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-160980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-161940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-162960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-163980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-164940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-165960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-166980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-167940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-168960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169860,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169920,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-169980,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170040,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170100,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170160,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170220,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170280,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170340,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170400,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170460,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170520,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170580,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170640,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170700,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170760,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170820,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170880,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-170940,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171000,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171060,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171120,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171180,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171240,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171300,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171360,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171420,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171480,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171540,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171600,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171660,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171720,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171780,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171840,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171900,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-171960,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172020,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172080,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172140,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172200,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172260,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172320,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172380,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172440,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172500,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172560,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172620,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172680,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172740,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
-172800,0.0,0.0,283.9941,283.9941,0.0,0.0,297.56789999999995,297.56789999999995,0.0,0.0,0.0
diff --git a/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/run.sh b/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/run.sh
old mode 100644
new mode 100755
index 71e070b99bd..30835164c8b
--- a/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/run.sh
+++ b/Buildings/Resources/Data/Fluid/Chillers/Validation/IndirectAbsorptionChiller/run.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 set -e
-<<<<<<< HEAD
-EnergyPlus --readvars -d EnergyPlus -w ../../../../../weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw IndirectAbsorptionChiller.idf
-python energyplus_to_modelica.py
-=======
 idf_file=`ls *.idf`
 energyplus \
   --readvars \
@@ -11,5 +7,4 @@ energyplus \
   -w ../../../../../weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw \
   ${idf_file}
 python3 csv_to_mos.py
->>>>>>> master
 rm -rf EnergyPlus
diff --git a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/CoolingTower_VariableSpeed_Merkel.idf b/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/CoolingTower_VariableSpeed_Merkel.idf
index a931fbd00fa..f33603cf3bc 100644
--- a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/CoolingTower_VariableSpeed_Merkel.idf
+++ b/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/CoolingTower_VariableSpeed_Merkel.idf
@@ -117,11 +117,7 @@
 ! Utility Tariffs:                None
 !
 
-<<<<<<< HEAD
-  Version,9.2;
-=======
   Version,9.5;
->>>>>>> master
 
   Building,
     Building,                !- Name
diff --git a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/energyplus_to_modelica.py b/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/energyplus_to_modelica.py
deleted file mode 100644
index c17781b108c..00000000000
--- a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/energyplus_to_modelica.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-# coding: utf-8
-import os
-
-import pandas as pd
-
-def _convert(file_path, timestep, data_type, file_name):
-    '''
-    Parameters:
-    file_path: the file path of the existing energyplus data
-    time_step: the time step of the energyplus data
-    data_type: specify the data type such as float, double etc.
-    file_name: the file name of the modelica data
-    '''
-    # read the existing energyplus data
-    energyplus_data = pd.read_csv(file_path)
-    # get the dimension of the matrix
-    size = energyplus_data.shape
-    # create a new index for modelica
-    energyplus_data.index = (energyplus_data.index)*timestep
-    energyplus_data.index.name = '# time'
-    energyplus_data.drop(['Date/Time'], axis=1, inplace=True)
-
-    # write to csv for modelica
-    file = file_name + '.csv'
-    with open(file,'w') as f:
-        line1 = '#1'
-        line2 = data_type + ' ' + file_name + '(' + str(size[0]) + ',' + str(size[1]) + ')'
-        f.write('{}\n{}\n'.format(line1,line2))
-        energyplus_data.to_csv(f, header=True)
-
-file_path = os.path.abspath(os.path.join('EnergyPlus', 'eplusout.csv'))
-timestep =  60
-data_type = 'float'
-file_name = 'modelica'
-_convert(file_path, timestep, data_type, file_name)
diff --git a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/modelica.csv b/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/modelica.csv
deleted file mode 100644
index 6fc62fc0be1..00000000000
--- a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/modelica.csv
+++ /dev/null
@@ -1,2883 +0,0 @@
-#1
-float modelica(2880,19)
-# time,Environment:Site Outdoor Air Drybulb Temperature [C](TimeStep),Environment:Site Outdoor Air Wetbulb Temperature [C](TimeStep),CENTRAL TOWER:Cooling Tower Inlet Temperature [C](TimeStep),CENTRAL TOWER:Cooling Tower Outlet Temperature [C](TimeStep),CENTRAL TOWER:Cooling Tower Mass Flow Rate [kg/s](TimeStep),CENTRAL TOWER:Cooling Tower Heat Transfer Rate [W](TimeStep),CENTRAL TOWER:Cooling Tower Fan Electric Power [W](TimeStep),CENTRAL TOWER:Cooling Tower Fan Electric Energy [J](TimeStep),CENTRAL TOWER:Cooling Tower Fan Speed Ratio [](TimeStep),CENTRAL TOWER:Cooling Tower Make Up Water Volume [m3](TimeStep),CENTRAL TOWER 2:Cooling Tower Inlet Temperature [C](TimeStep),CENTRAL TOWER 2:Cooling Tower Outlet Temperature [C](TimeStep),CENTRAL TOWER 2:Cooling Tower Mass Flow Rate [kg/s](TimeStep),CENTRAL TOWER 2:Cooling Tower Heat Transfer Rate [W](TimeStep),CENTRAL TOWER 2:Cooling Tower Fan Electric Power [W](TimeStep),CENTRAL TOWER 2:Cooling Tower Fan Electric Energy [J](TimeStep),CENTRAL TOWER 2:Cooling Tower Fan Speed Ratio [](TimeStep),CENTRAL TOWER 2:Cooling Tower Make Up Water Volume [m3](TimeStep) 
-0,21.1,18.84565016886036,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-60,21.1,18.870678642213335,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-120,21.1,18.895675529252866,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-180,21.1,18.92064663673795,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-240,21.1,18.945604670776827,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-300,21.1,18.97053173538624,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-360,21.1,18.995433357954763,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-420,21.1,19.020316063956137,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-480,21.1,19.04517437275872,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-540,21.1,19.070006022890766,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-600,21.1,19.09482034128722,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-660,21.1,19.119609325237906,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-720,21.1,19.14437226200927,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-780,21.1,19.169117620965267,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-840,21.1,19.193837674596775,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-900,21.1,19.218526888954806,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-960,21.1,19.2432032076712,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1020,21.1,19.26785556005046,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1080,21.1,19.292481631912864,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1140,21.1,19.317085073217548,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1200,21.1,19.341668972267076,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1260,21.1,19.366222321569648,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1320,21.1,19.390763207592094,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1380,21.1,19.415279549480218,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1440,21.1,19.439764707851733,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1500,21.1,19.464232768227642,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1560,21.1,19.48868206130507,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1620,21.1,19.513100215566073,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1680,21.1,19.537506754545838,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1740,21.1,19.56188355990532,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1800,21.1,19.58623488718856,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1860,21.1,19.61056961263607,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1920,21.1,19.634885115158394,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-1980,21.1,19.659169705789363,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2040,21.1,19.683438095451056,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2100,21.1,19.707682197994725,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2160,21.1,19.731900318125252,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2220,21.1,19.75610209473789,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2280,21.1,19.78028060767221,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2340,21.1,19.80443308509484,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2400,21.1,19.828569249180546,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2460,21.1,19.852682249776453,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2520,21.1,19.87676942451214,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2580,21.1,19.900834514144265,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2640,21.1,19.924881980085765,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2700,21.1,19.948903936652567,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2760,21.1,19.972909278923076,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2820,21.1,19.99689193043142,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2880,21.1,20.0208437069308,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-2940,21.1,20.04477938573425,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3000,21.1,20.068697112774156,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3060,21.1,20.092589267521888,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3120,21.1,20.11646038467448,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3180,21.1,20.140313701977245,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3240,21.1,20.164137082912127,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3300,21.1,20.187943705437213,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3360,21.1,20.21173332128738,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3420,21.1,20.23549280458884,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3480,21.1,20.259235901351367,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3540,21.1,20.282961693871545,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3600,21.091666666666672,20.288608197225916,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3660,21.083333333333336,20.2942520705944,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3720,21.075000000000006,20.299881359618688,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3780,21.066666666666674,20.30549866369222,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3840,21.058333333333334,20.311093671812245,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3900,21.05,20.31668666790495,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-3960,21.041666666666668,20.322254633299686,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4020,21.033333333333335,20.32782464299265,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4080,21.025000000000006,20.333375557333447,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4140,21.016666666666673,20.33891427467435,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4200,21.008333333333336,20.34444041179596,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4260,21.000000000000004,20.349954484569622,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4320,20.99166666666667,20.35545209323049,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4380,20.983333333333334,20.36093634551564,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4440,20.975,20.36641356439154,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4500,20.966666666666672,20.37187943488682,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4560,20.958333333333336,20.37732689619598,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4620,20.95,20.382768554531697,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4680,20.941666666666674,20.38819193418193,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4740,20.933333333333334,20.39359848179779,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4800,20.925,20.398997977801603,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4860,20.916666666666668,20.40438552255245,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4920,20.908333333333335,20.40976084124418,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-4980,20.9,20.41512370113535,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5040,20.891666666666666,20.4204744714054,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5100,20.883333333333333,20.425813957592425,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5160,20.875000000000004,20.431140221260517,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5220,20.866666666666667,20.43644542822438,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5280,20.858333333333334,20.441748391640612,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5340,20.85,20.44703876044273,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5400,20.841666666666672,20.45231230077661,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5460,20.833333333333336,20.457578710832074,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5520,20.825000000000006,20.462828223186946,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5580,20.816666666666674,20.468065279375406,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5640,20.808333333333334,20.473285895527304,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5700,20.800000000000008,20.478504790303308,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5760,20.791666666666668,20.483706162909492,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5820,20.783333333333335,20.48889493900963,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5880,20.775,20.494072722306427,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-5940,20.766666666666673,20.499237755548986,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6000,20.758333333333333,20.504391595826462,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6060,20.75,20.509533133526087,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6120,20.741666666666667,20.514657947992244,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6180,20.733333333333334,20.51977561097116,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6240,20.725,20.52488079425481,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6300,20.716666666666672,20.529969212255615,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6360,20.708333333333336,20.53505127439014,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6420,20.7,20.540121076277607,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6480,20.691666666666674,20.54517974939065,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6540,20.683333333333334,20.550215526772057,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6600,20.675,20.55524982756656,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6660,20.666666666666668,20.560267431230127,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6720,20.658333333333335,20.565278061122644,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6780,20.650000000000006,20.570270847898364,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6840,20.641666666666666,20.575258218535375,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6900,20.633333333333333,20.58022788130553,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-6960,20.625,20.585190967994713,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7020,20.616666666666667,20.590132432209717,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7080,20.608333333333334,20.595072411474174,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7140,20.6,20.599990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7200,20.608333333333334,20.60831937764446,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7260,20.616666666666667,20.616653442382812,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7320,20.625,20.624998112493504,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7380,20.633333333333333,20.63333129882813,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7440,20.641666666666666,20.64166259765625,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7500,20.650000000000006,20.64999353584133,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7560,20.658333333333335,20.658322849431496,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7620,20.666666666666668,20.666656494140625,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7680,20.675,20.67498779296875,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7740,20.683333333333334,20.68331909179688,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7800,20.691666666666666,20.691664918670664,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7860,20.700000000000006,20.699996948242188,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7920,20.708333333333336,20.708328247070316,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-7980,20.716666666666672,20.71665954589844,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8040,20.725,20.724987605897073,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8100,20.733333333333334,20.73332050992157,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8160,20.741666666666667,20.741653442382812,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8220,20.75,20.749993472778026,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8280,20.758333333333333,20.75832879369598,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8340,20.766666666666673,20.766661477498428,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8400,20.775,20.77499152703389,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8460,20.783333333333328,20.7833251953125,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8520,20.79166666666667,20.79165274554908,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8580,20.800000000000008,20.79998779296875,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8640,20.808333333333334,20.80831909179688,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8700,20.816666666666674,20.816665649414066,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8760,20.825000000000006,20.824990045753726,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8820,20.833333333333336,20.833321573128018,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8880,20.841666666666672,20.84165954589844,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-8940,20.85,20.849990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9000,20.858333333333334,20.85832019723409,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9060,20.866666666666667,20.866653442382812,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9120,20.875,20.874994299652766,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9180,20.883333333333333,20.883329830949148,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9240,20.891666666666673,20.89166259765625,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9300,20.9,20.899992966506233,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9360,20.908333333333335,20.90832057648864,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9420,20.916666666666668,20.916655753071552,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9480,20.925,20.92498779296875,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9540,20.933333333333334,20.93331909179688,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9600,20.941666666666674,20.94166029245617,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9660,20.950000000000006,20.949994436672252,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9720,20.958333333333336,20.958326578377015,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9780,20.966666666666672,20.966655435841442,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9840,20.975,20.974990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9900,20.983333333333334,20.983322143554688,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-9960,20.99166666666667,20.991653442382812,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10020,21.0,20.999990372205108,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10080,21.008333333333336,21.00832630540817,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10140,21.016666666666673,21.01665958956994,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10200,21.025000000000006,21.024990227565716,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10260,21.033333333333335,21.0333251953125,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10320,21.04166666666667,21.041653043723336,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10380,21.05,21.049985858482987,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10440,21.058333333333334,21.05831909179688,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10500,21.066666666666674,21.06665764591429,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10560,21.075000000000006,21.07499260658264,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10620,21.083333333333336,21.083324273557693,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10680,21.091666666666672,21.09165954589844,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10740,21.1,21.099990379076573,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10800,21.1,21.099989238046447,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10860,21.1,21.09998534034318,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10920,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-10980,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11040,21.1,21.09998704003162,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11100,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11160,21.1,21.099982537148186,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11220,21.1,21.09998928624563,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11280,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11340,21.1,21.09998407520783,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11400,21.1,21.09999079193071,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11460,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11520,21.1,21.09998615978694,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11580,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11640,21.1,21.099988159595963,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11700,21.1,21.09998750386179,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11760,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11820,21.1,21.099990081788008,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11880,21.1,21.09998939444873,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-11940,21.1,21.099985298400977,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12000,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12060,21.1,21.099990544560896,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12120,21.1,21.099986415500524,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12180,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12240,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12300,21.1,21.099988079103667,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12360,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12420,21.1,21.09998312344045,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12480,21.1,21.099989002266486,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12540,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12600,21.1,21.099983982000182,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12660,21.1,21.0999904719257,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12720,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12780,21.1,21.09998538705378,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12840,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12900,21.1,21.099987572279172,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-12960,21.1,21.09998669514282,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13020,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13080,21.1,21.09998881500164,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13140,21.1,21.09998790627283,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13200,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13260,21.1,21.0999899607688,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13320,21.1,21.099989020449375,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13380,21.1,21.099984660114483,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13440,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13500,21.1,21.09999003767794,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13560,21.1,21.099985644342304,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13620,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13680,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13740,21.1,21.09998653162967,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13800,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13860,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13920,21.1,21.099987321982077,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-13980,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14040,21.1,21.09998242792505,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14100,21.1,21.099988015405085,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14160,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14220,21.1,21.09998305676278,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14280,21.1,21.099989255273048,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14340,21.1,21.099990844726566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14400,21.091666666666672,21.07824302747296,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14460,21.083333333333336,21.056509820139038,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14520,21.075000000000006,21.034766442825962,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14580,21.066666666666674,21.01302739162411,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14640,21.058333333333334,20.991271003862526,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14700,21.05,20.969531060294596,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14760,21.041666666666668,20.94778438267841,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14820,21.033333333333335,20.926035473430193,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14880,21.025000000000006,20.90428757249256,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-14940,21.016666666666673,20.882533139234106,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15000,21.008333333333336,20.860776696145454,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15060,21.000000000000004,20.839032031371968,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15120,20.99166666666667,20.817265877334002,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15180,20.983333333333334,20.795512449556462,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15240,20.975,20.7737549091177,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15300,20.966666666666672,20.751991865990814,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15360,20.958333333333336,20.73023115667251,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15420,20.95,20.708471767476375,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15480,20.941666666666674,20.68670679946902,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15540,20.933333333333334,20.664940299473,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15600,20.925,20.643174378769015,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15660,20.916666666666668,20.621402189521262,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15720,20.908333333333335,20.599638472879178,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15780,20.9,20.57787118339713,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15840,20.891666666666666,20.556097515058465,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15900,20.883333333333333,20.534327184315398,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-15960,20.875000000000004,20.512553006750416,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16020,20.866666666666667,20.490768640719573,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16080,20.858333333333334,20.46899735738484,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16140,20.85,20.447221982064978,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16200,20.841666666666672,20.42544111151012,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16260,20.833333333333336,20.403663061177173,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16320,20.825000000000006,20.381881901482025,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16380,20.816666666666674,20.360099828572398,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16440,20.808333333333334,20.33831149049161,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16500,20.800000000000008,20.31652912581164,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16560,20.791666666666668,20.294736191553113,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16620,20.783333333333335,20.272951975348565,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16680,20.775,20.25116890989381,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16740,20.766666666666673,20.22937581073299,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16800,20.758333333333333,20.207585167360133,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16860,20.75,20.185796979523932,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16920,20.741666666666667,20.1639928937079,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-16980,20.733333333333334,20.14220272914041,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17040,20.725,20.120408798766046,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17100,20.716666666666672,20.098609347722192,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17160,20.708333333333336,20.07681315648265,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17220,20.7,20.055014067241558,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17280,20.691666666666674,20.033209327542785,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17340,20.683333333333334,20.011408860499106,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17400,20.675,19.98960402670863,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17460,20.666666666666668,19.96779971975802,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17520,20.658333333333335,19.945993776429244,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17580,20.650000000000006,19.924194667394193,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17640,20.641666666666666,19.902380449275483,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17700,20.633333333333333,19.8805747853827,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17760,20.625,19.85876542930028,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17820,20.616666666666667,19.836946621663085,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17880,20.608333333333334,19.81513628727441,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-17940,20.6,19.79332795047712,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18000,20.6,19.78747960576536,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18060,20.6,19.78162495615381,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18120,20.6,19.775773966031505,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18180,20.6,19.769915712645236,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18240,20.6,19.764054882665018,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18300,20.6,19.758206537043247,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18360,20.6,19.752350422602788,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18420,20.6,19.746486836884092,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18480,20.6,19.740626746101054,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18540,20.6,19.734766073062293,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18600,20.6,19.728903498864184,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18660,20.6,19.723040164012037,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18720,20.6,19.717174925977055,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18780,20.6,19.7112952231995,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18840,20.6,19.705434476953066,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18900,20.6,19.699564661645535,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-18960,20.6,19.693693597732867,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19020,20.6,19.687821284115227,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19080,20.6,19.68194754350759,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19140,20.6,19.676077965945094,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19200,20.6,19.670201064867697,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19260,20.6,19.66432339196837,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19320,20.6,19.658443805622824,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19380,20.6,19.6525623048526,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19440,20.6,19.646680204869106,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19500,20.6,19.640801638079267,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19560,20.6,19.63491618914946,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19620,20.6,19.62902947965636,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19680,20.6,19.62314133257844,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19740,20.6,19.617257366351094,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19800,20.6,19.61136603772414,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19860,20.6,19.605479569198344,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19920,20.6,19.599585712420375,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-19980,20.6,19.593690237171415,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20040,20.6,19.58779846986631,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20100,20.6,19.58190045990617,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20160,20.6,19.5760059858558,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20220,20.6,19.57010477951781,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20280,20.6,19.56420778862161,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20340,20.6,19.558309335681926,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20400,20.6,19.5524041384944,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20460,20.6,19.546502310752828,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20520,20.6,19.540599582108037,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20580,20.6,19.534689727249514,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20640,20.6,19.528783904420745,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20700,20.6,19.522876807159395,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20760,20.6,19.516968147887283,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20820,20.6,19.511052827588426,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20880,20.6,19.505141240803994,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-20940,20.6,19.499228199755567,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21000,20.6,19.493313417274052,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21060,20.6,19.487397639928012,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21120,20.6,19.48148058048921,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21180,20.6,19.475561951965012,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21240,20.6,19.469641493345357,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21300,20.6,19.463719463766076,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21360,20.6,19.457796433350772,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21420,20.6,19.45187193998547,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21480,20.6,19.44594587272034,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21540,20.6,19.440018144909253,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21600,20.608333333333334,19.43625383389285,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21660,20.616666666666667,19.43248472563837,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21720,20.625,19.42871329069168,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21780,20.633333333333333,19.424918577219483,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21840,20.641666666666666,19.421118568122534,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21900,20.650000000000006,19.417312245321124,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-21960,20.658333333333335,19.413486976252333,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22020,20.666666666666668,19.409656616978747,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22080,20.675,19.40581983694219,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22140,20.683333333333334,19.401963908342047,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22200,20.691666666666666,19.398107863481194,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22260,20.700000000000006,19.394239872727827,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22320,20.708333333333336,19.39035356403771,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22380,20.716666666666672,19.386461971700648,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22440,20.725,19.382564377971566,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22500,20.733333333333334,19.378641722678328,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22560,20.741666666666667,19.374725453735522,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22620,20.75,19.37079601418912,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22680,20.758333333333333,19.3668479294126,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22740,20.766666666666673,19.36289553652023,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22800,20.775,19.358936152732245,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22860,20.783333333333328,19.354951991936105,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22920,20.79166666666667,19.350974446966237,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-22980,20.800000000000008,19.346978885074858,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23040,20.808333333333334,19.342969879866637,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23100,20.816666666666674,19.33896000019432,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23160,20.825000000000006,19.33493333288871,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23220,20.833333333333336,19.33089364335007,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23280,20.841666666666672,19.326848455577604,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23340,20.85,19.322791392364227,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23400,20.858333333333334,19.31871526583548,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23460,20.866666666666667,19.31463898776293,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23520,20.875,19.310555609150946,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23580,20.883333333333333,19.3064538373766,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23640,20.891666666666673,19.30234754431188,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23700,20.9,19.298227840721783,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23760,20.908333333333335,19.29408960603203,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23820,20.916666666666668,19.289952203029976,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23880,20.925,19.28579633473373,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-23940,20.933333333333334,19.28163253359455,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24000,20.941666666666674,19.27746317228534,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24060,20.950000000000006,19.27328217748285,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24120,20.958333333333336,19.2690818761442,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24180,20.966666666666672,19.264875803037512,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24240,20.975,19.26066345250578,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24300,20.983333333333334,19.256432616347013,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24360,20.99166666666667,19.252195537392932,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24420,21.0,19.247957274070753,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24480,21.008333333333336,19.243694443640027,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24540,21.016666666666673,19.239426282990827,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24600,21.025000000000006,19.23514600727378,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24660,21.033333333333335,19.23085226062144,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24720,21.04166666666667,19.226553222037047,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24780,21.05,19.222241490785557,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24840,21.058333333333334,19.217910846646305,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24900,21.066666666666674,19.213585569954887,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-24960,21.075000000000006,19.20924222027805,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-25020,21.083333333333336,19.20488025438327,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-25080,21.091666666666672,19.200518429486547,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-25140,21.1,19.196144358667667,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0,33.019029522084395,33.019029522084395,0.0,0.0,0.0,0.0,0.0,0.0
-25200,21.110000000000007,19.195382771244823,32.628769514813,30.00000001128301,1.0879421538075698,11954.587470132381,11.209830325878535,672.5898195527119,0.32167997357623335,0.00032386156465132976,30.00000001128301,30.00000001128301,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25260,21.12,19.19462852884356,32.42238570664577,30.00000000742609,1.0879421538075698,11016.036852539955,9.994023155832911,599.6413893499747,0.3017054674346475,0.00029850534885823485,30.00000000742609,30.00000000742609,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25320,21.130000000000006,19.193856231808912,32.456095178905265,30.000000009691483,1.0879421538075698,11169.3339777064,10.184387815428225,611.0632689256936,0.3050083078400973,0.00030273683749827696,30.000000009691483,30.000000009691483,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25380,21.14,19.19307797215452,32.43746889014939,30.00000000711236,1.0879421538075698,11084.629112162014,10.078138607264995,604.6883164358998,0.3031737541127788,0.0003005174974394338,30.00000000711236,30.00000000711236,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25440,21.150000000000006,19.19228318677739,32.352586795047394,29.99999982129295,1.0879421538075698,10698.620294048427,9.607389492733343,576.4433695640006,0.2947652173295646,0.00029012716395352203,29.99999982129295,29.99999982129295,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25500,21.160000000000004,19.19148281241272,32.2032366994868,29.99999985814857,1.0879421538075698,10019.435900267245,8.827203865573402,529.6322319344041,0.2796681750201255,0.00027178313481433184,29.99999985814857,29.99999985814857,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25560,21.17,19.190668796129795,32.05906106785523,29.999999942157523,1.0879421538075698,9363.782674916394,8.132914548741539,487.9748729244925,0.264709109758515,0.0002540714177239763,29.999999942157523,29.999999942157523,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25620,21.180000000000003,19.18985773242977,31.93915386598089,29.9999998950755,1.0879421538075698,8818.493113266053,7.600285615410257,456.0171369246154,0.2519691012980875,0.00023934716789933145,29.9999998950755,29.9999998950755,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25680,21.19,19.189028931699287,31.843711093497163,30.00000002429475,1.0879421538075698,8384.457145000588,7.205718322084866,432.343099325092,0.24162753248846006,0.0002276352444612583,30.00000002429475,30.00000002429475,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25740,21.200000000000006,19.18819330105368,31.769500431895754,30.00000001178009,1.0879421538075698,8046.97693057644,6.9170408353813,415.022450122878,0.2334598976168208,0.00021853847631261156,30.00000001178009,30.00000001178009,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25800,21.21,19.187346734907244,31.71291282262816,30.00000000684471,1.0879421538075698,7789.639242807975,6.707584068780237,402.45504412681436,0.22715520091903915,0.000211612878136946,30.00000000684471,30.00000000684471,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25860,21.220000000000006,19.18648946181912,31.669889693044762,29.99999979416017,1.0879421538075698,7593.988303234532,6.554504367595907,393.2702620557545,0.2223160376381088,0.00020635876806895172,29.99999979416017,29.99999979416017,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25920,21.230000000000004,19.18562491057956,31.637173361345553,29.999999820531826,1.0879421538075698,7445.207452065558,6.441646285869073,386.4987771521444,0.2186086598624104,0.00020237499100136583,29.999999820531826,29.999999820531826,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-25980,21.24,19.184750337189147,31.61223886658323,29.999999841702962,1.0879421538075698,7331.815292215986,6.357672727802325,381.4603636681395,0.21576629340216116,0.00019935055184290063,29.999999841702962,29.999999841702962,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26040,21.25,19.183868704572465,31.593165424108772,29.999999945566568,1.0879421538075698,7245.076467165782,6.2946106779865305,377.67664067919196,0.2135814555175624,0.00019704883060734648,29.999999945566568,29.999999945566568,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26100,21.26,19.1829763948487,31.578503710539643,29.999999969460443,1.0879421538075698,7178.400776227368,6.24680661604062,374.8083969624372,0.21189496150777407,0.0001952912197115341,29.999999969460443,29.999999969460443,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26160,21.27,19.182072738443967,31.56716452728929,30.000000024763786,1.0879421538075698,7126.834475358167,6.2102168073606006,372.61300844163605,0.21058572443971785,0.00019394343587317826,30.000000024763786,30.000000024763786,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26220,21.28,19.181162696833546,31.5583301525004,29.99999997327226,1.0879421538075698,7086.659522607097,6.181923412090753,370.91540472544517,0.20956207018782805,0.00019290474560910783,29.99999997327226,29.99999997327226,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26280,21.29,19.180236149549284,31.551386786061762,29.9999999374612,1.0879421538075698,7055.084044722857,6.159798329012923,369.58789974077536,0.2087545611881732,0.0001920993455284532,29.9999999374612,29.9999999374612,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26340,21.300000000000008,19.17930388048649,31.54587370553724,29.999999910490324,1.0879421538075698,7030.01289228972,6.142287108320263,368.5372264992157,0.20811098891196333,0.00019147052988402425,29.999999910490324,29.999999910490324,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26400,21.310000000000006,19.178371025384127,31.541444954536754,30.00000001724685,1.0879421538075698,7009.8722267129915,6.128243944998879,367.6946366999328,0.20759198369353016,0.00019097566696045133,30.00000001724685,30.00000001724685,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26460,21.32,19.17741609202357,31.53784065957972,30.000000001733014,1.0879421538075698,6993.481411994279,6.116811460251317,367.0086876150791,0.2071675390956656,0.00019058246293535011,30.000000001733014,30.000000001733014,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26520,21.330000000000005,19.17645495838445,31.534831432696837,29.99999998966445,1.0879421538075698,6979.796712112525,6.107259096005645,366.43554576033864,0.20681155777865187,0.00019026277214415345,29.99999998966445,29.99999998966445,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26580,21.34,19.17549356629162,31.532261500504926,29.9999999778479,1.0879421538075698,6968.10974683188,6.099091044315207,365.9454626589125,0.20650618975790208,0.00018999744048562447,29.9999999778479,29.9999999778479,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26640,21.35,19.17450957446065,31.53007638584407,29.999999970569764,1.0879421538075698,6958.172756425069,6.092121586871297,365.5272952122778,0.20624491606406586,0.00018977946957733727,29.999999970569764,29.999999970569764,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26700,21.36,19.173525699544843,31.528219439469947,30.00000009079587,1.0879421538075698,6949.7275636911645,6.086176285040783,365.1705771024469,0.2060215119389633,0.00018960214673719456,30.00000009079587,30.00000009079587,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26760,21.370000000000008,19.172529833145614,31.526579399463124,29.99999995938544,1.0879421538075698,6942.269918305252,6.080904801867508,364.8542881120504,0.20582302156825807,0.00018945162270566382,29.99999995938544,29.99999995938544,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26820,21.380000000000006,19.17152263023921,31.525083376365682,30.00000007994697,1.0879421538075698,6935.466058090374,6.076079507617747,364.5647704570649,0.20564099561517876,0.0001893188259891545,30.00000007994697,30.00000007994697,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26880,21.39,19.170509379774174,31.52374001249289,29.99999994910143,1.0879421538075698,6929.357573989572,6.071727664761309,364.30365988567866,0.20547655298478334,0.0001892049602513888,29.99999994910143,29.99999994910143,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-26940,21.4,19.169479723867187,31.522543314004842,29.99999994558372,1.0879421538075698,6923.915486093006,6.067824076508139,364.06944459048833,0.20532882423988968,0.00018910911554358026,29.99999994558372,29.99999994558372,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27000,21.41,19.16844420570289,31.52142196603341,30.000000067004343,1.0879421538075698,6918.815493901059,6.064153739013791,363.8492243408274,0.2051897285512761,0.00018902260285278232,30.000000067004343,30.000000067004343,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27060,21.42,19.167402361609927,31.520334595751663,29.999999937174817,1.0879421538075698,6913.871161174432,6.0605897984895565,363.6353879093733,0.2050544843139938,0.0001889403421675904,29.999999937174817,29.999999937174817,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27120,21.43,19.16634936275721,31.519319249836393,29.999999934246254,1.0879421538075698,6909.253789232685,6.057245531088997,363.4347318653398,0.2049274137721959,0.000188866927918467,29.999999934246254,29.999999934246254,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27180,21.44,19.16528550758953,31.518360962724238,30.000000057214212,1.0879421538075698,6904.895325274774,6.054074693363904,363.2444816018343,0.2048067872422841,0.0001888005354222629,30.000000057214212,30.000000057214212,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27240,21.45,19.164214430710253,31.517426596939263,29.999999928034192,1.0879421538075698,6900.646792568982,6.050978146677187,363.05868880063116,0.2046888496312527,0.0001887371381702106,29.999999928034192,29.999999928034192,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27300,21.46,19.163127331736387,31.51656381734434,30.00000005244145,1.0879421538075698,6896.72265187935,6.0480962810179495,362.88577686107686,0.2045789663049972,0.0001886824958804277,30.00000005244145,30.00000005244145,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27360,21.47,19.162034719070867,31.515751673611803,30.000000050060574,1.0879421538075698,6893.029359328015,6.045369416731132,362.72216500386804,0.2044748842620657,0.00018863416827152982,30.000000050060574,30.000000050060574,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27420,21.48,19.160934918664612,31.51493878851623,29.99999992255221,1.0879421538075698,6889.333264385051,6.042640642702462,362.55843856214767,0.2043706231464964,0.00018858577418756045,29.99999992255221,29.99999992255221,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27480,21.490000000000006,19.159824853813948,31.514147821269212,29.999999920187047,1.0879421538075698,6885.736273909711,6.039977213564301,362.39863281385806,0.20426875604014413,0.00018854005086098608,29.999999920187047,29.999999920187047,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27540,21.5,19.158701984387054,31.513358709884145,30.00000004218557,1.0879421538075698,6882.147157592852,6.037317431400876,362.2390458840526,0.20416692692508487,0.00018849448283065652,30.00000004218557,30.00000004218557,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27600,21.51,19.157569355279048,31.512546573322414,30.00000004094605,1.0879421538075698,6878.453892461045,6.034586993824933,362.07521962949585,0.2040622870181592,0.00018844604727630206,30.00000004094605,30.00000004094605,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27660,21.52,19.156429913765646,31.51175567298464,30.00000003892529,1.0879421538075698,6874.857204695903,6.031921141631954,361.91526849791717,0.20396001860676055,0.00018840025179645464,30.00000003892529,30.00000003892529,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27720,21.53,19.155284604555455,31.510972970195716,30.00000003664645,1.0879421538075698,6871.297797262797,6.029280733396171,361.7568440037703,0.20385862509116984,0.00018835549796119736,30.00000003664645,30.00000003664645,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27780,21.54,19.154122779496593,31.510171222001734,30.00000003403465,1.0879421538075698,6867.651780494129,6.026579663514272,361.5947798108564,0.20375479765721446,0.000188308271727551,30.00000003403465,30.00000003403465,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27840,21.55,19.152949405749897,31.509391748335624,30.000000032821273,1.0879421538075698,6864.1070529688195,6.023944470399711,361.4366682239827,0.20365340040781155,0.00018826377864583792,30.000000032821273,30.000000032821273,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27900,21.56,19.15177476457997,31.508619312677784,30.00000003230259,1.0879421538075698,6860.594328318114,6.021332058451822,361.2799235071094,0.20355277997192134,0.00018822022496808855,30.00000003230259,30.00000003230259,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-27960,21.57,19.150584251159838,31.50782507414733,30.000000029111934,1.0879421538075698,6856.982465114132,6.01865178523386,361.1191071140317,0.2034494422793128,0.00018817386338323966,30.000000029111934,30.000000029111934,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28020,21.58,19.149387805471527,31.507051170559567,30.00000002870201,1.0879421538075698,6853.463064413401,6.0160327450303095,360.96196470181854,0.20334836391264896,0.0001881300475826094,30.00000002870201,30.00000002870201,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28080,21.59,19.1481790483206,31.506281909456693,30.00000002542951,1.0879421538075698,6849.9647888863965,6.013426011909423,360.80556071456533,0.2032476606436484,0.00018808676317145107,30.00000002542951,30.00000002542951,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28140,21.6,19.146959417649864,31.50548761876722,30.00000002500865,1.0879421538075698,6846.352675888265,6.010743382548554,360.64460295291326,0.20314392105498852,0.00018804032485346083,30.00000002500865,30.00000002500865,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28200,21.61,19.145734384510494,31.50468043597939,30.000000022286372,1.0879421538075698,6842.681945272725,6.008022699377795,360.48136196266785,0.2030386015621317,0.00018799229482135892,30.000000022286372,30.000000022286372,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28260,21.62,19.144496637367247,31.503895770646935,30.00000002070111,1.0879421538075698,6839.1136098261095,6.005367660069525,360.3220596041715,0.2029357177411613,0.00018794701291531624,30.00000002070111,30.00000002070111,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28320,21.63,19.143248646755236,31.50313939943328,30.000000019928574,1.0879421538075698,6835.6739409673155,6.002796827191387,360.16780963148324,0.20283599744517755,0.0001879052420891716,30.000000019928574,30.000000019928574,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28380,21.64,19.141993692600852,31.50238580396141,30.000000019188104,1.0879421538075698,6832.2468949210925,6.000233998403991,360.0140399042395,0.20273648993127294,0.00018786381361175672,30.000000019188104,30.000000019188104,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28440,21.65,19.140728118260753,31.501614931998898,30.000000017427244,1.0879421538075698,6828.741286977378,5.997618576861508,359.8571146116905,0.20263483957796027,0.00018782019674487742,30.000000017427244,30.000000017427244,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28500,21.66,19.139450650066067,31.50082351183177,30.00000001629619,1.0879421538075698,6825.1422311911965,5.9949404016384165,359.696424098305,0.2025306444624783,0.00018777396117163934,30.00000001629619,30.00000001629619,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28560,21.67,19.13816686097622,31.500016094463877,30.00000001605893,1.0879421538075698,6821.470422498921,5.992214939251689,359.5328963551014,0.20242449944651636,0.0001877257600352332,30.00000001605893,30.00000001605893,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28620,21.68,19.13686676466411,31.499200055804014,30.000000012304355,1.0879421538075698,6817.759423630133,5.9894616445007545,359.36769867004534,0.20231715733103053,0.00018767636699967396,30.000000012304355,30.000000012304355,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28680,21.69,19.135561102183,31.49837950077314,30.000000012477198,1.0879421538075698,6814.027868260285,5.986695305258206,359.2017183154924,0.2022091918159736,0.0001876264344663471,30.000000012477198,30.000000012477198,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28740,21.7,19.134248390748105,31.497556806145273,30.000000011031407,1.0879421538075698,6810.286590223892,5.983923394806143,359.0354036883686,0.20210089310169305,0.00018757623219393138,30.000000011031407,30.000000011031407,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28800,21.726666666666667,19.127112893618843,31.495997403215398,29.999999885028966,1.0879421538075698,6803.195625270861,5.9772041103228215,358.63224661936925,0.20183788741976014,0.00018753265841091183,29.999999885028966,29.999999885028966,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28860,21.75333333333333,19.119919378819038,31.493477762858035,30.000000004543434,1.0879421538075698,6791.736769805943,5.9676485904612955,358.05891542767785,0.2014626814075631,0.00018736908945975834,30.000000004543434,30.000000004543434,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28920,21.78,19.1126247322101,31.49253933037122,30.000000003547242,1.0879421538075698,6787.4691604456375,5.962757734689452,357.7654640813672,0.20127009566482107,0.00018740291245583691,30.000000003547242,30.000000003547242,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-28980,21.80666666666667,19.105248261723982,31.493807511923514,30.00000000430528,1.0879421538075698,6793.23633714655,5.964351196265135,357.86107177590804,0.2013328813866656,0.0001877130962285641,30.00000000430528,30.00000000430528,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29040,21.83333333333333,19.097794616136078,31.49493785190916,30.000000004870962,1.0879421538075698,6798.3766666614865,5.965512780228359,357.9307668137016,0.20137862556077188,0.00018800641892766464,30.000000004870962,30.000000004870962,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29100,21.86,19.09024671979353,31.493965809060413,30.000000004316,1.0879421538075698,6793.9562088730945,5.960453041556102,357.6271824933661,0.20117921657160084,0.00018803621134912105,30.000000004316,30.000000004316,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29160,21.88666666666667,19.08261432664855,31.491231662649678,29.99999988601008,1.0879421538075698,6781.522947576949,5.9502133442827185,357.0128006569632,0.20077444663172775,0.00018784477828301684,29.99999988601008,29.99999988601008,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29220,21.91333333333333,19.074912559686926,31.48758763795018,29.999999999454932,1.0879421538075698,6764.950871500518,5.937341066932802,356.24046401596814,0.2002632853551797,0.0001875388287597832,29.999999999454932,29.999999999454932,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29280,21.94,19.06710990687164,31.482249746159948,29.99675201593847,1.0879421538075698,6755.446808390476,5.9307364898490675,355.8441893909442,0.2,0.00018742925613575296,29.99675201593847,29.99675201593847,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29340,21.966666666666665,19.05922982285856,31.474878561339523,29.989857754499756,1.0879421538075698,6753.277952476845,5.9307364898490675,355.8441893909442,0.2,0.00018752453212211422,29.989857754499756,29.989857754499756,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29400,21.99333333333333,19.05126577868904,31.465499597863055,29.981256273448647,1.0879421538075698,6749.7422747964965,5.9307364898490675,355.8441893909442,0.2,0.0001875832154710433,29.981256273448647,29.981256273448647,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29460,22.02,19.04320793402952,31.454066105910567,29.97090667708764,1.0879421538075698,6744.813153152544,5.9307364898490675,355.8441893909442,0.2,0.0001876044648007884,29.97090667708764,29.97090667708764,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29520,22.04666666666667,19.03507126352275,31.44077378582997,29.95897551138997,1.0879421538075698,6738.623169926856,5.9307364898490675,355.8441893909442,0.2,0.0001875920560420717,29.95897551138997,29.95897551138997,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29580,22.07333333333333,19.02684107837118,31.425825709268018,29.94563291181708,1.0879421538075698,6731.322105656553,5.9307364898490675,355.8441893909442,0.2,0.00018754987007735282,29.94563291181708,29.94563291181708,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29640,22.1,19.018531725284678,31.40940522542726,29.931034729886544,1.0879421538075698,6723.0350087644665,5.9307364898490675,355.8441893909442,0.2,0.00018748145970669266,29.931034729886544,29.931034729886544,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29700,22.12666666666667,19.010132778411396,31.39167358774674,29.915316130590952,1.0879421538075698,6713.880519022771,5.9307364898490675,355.8441893909442,0.2,0.00018738991096936154,29.915316130590952,29.915316130590952,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29760,22.15333333333333,19.001645438418826,31.372579834237012,29.898433765699487,1.0879421538075698,6703.824012116374,5.9307364898490675,355.8441893909442,0.2,0.00018727432103469774,29.898433765699487,29.898433765699487,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29820,22.18,18.993072845326203,31.35207997668012,29.880349951265845,1.0879421538075698,6692.836818750943,5.9307364898490675,355.8441893909442,0.2,0.0001871339601613636,29.880349951265845,29.880349951265845,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29880,22.20666666666667,18.984411038321678,31.330292391622443,29.861163939319486,1.0879421538075698,6681.005909545166,5.9307364898490675,355.8441893909442,0.2,0.00018697113913051383,29.861163939319486,29.861163939319486,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-29940,22.233333333333334,18.975659632555693,31.30733917640941,29.840978794701787,1.0879421538075698,6668.417836680299,5.9307364898490675,355.8441893909442,0.2,0.00018678821170377977,29.840978794701787,29.840978794701787,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30000,22.26,18.966817808287864,31.283328080545612,29.81988502727509,1.0879421538075698,6655.150999122382,5.9307364898490675,355.8441893909442,0.2,0.00018658727878713744,29.81988502727509,29.81988502727509,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30060,22.28666666666667,18.95789222245228,31.258346989624947,29.79795740647953,1.0879421538075698,6641.265043868839,5.9307364898490675,355.8441893909442,0.2,0.00018637005314836661,29.79795740647953,29.79795740647953,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30120,22.313333333333336,18.94887575527037,31.23245153007833,29.775241973336353,1.0879421538075698,6626.803561511323,5.9307364898490675,355.8441893909442,0.2,0.00018613763185359924,29.775241973336353,29.775241973336353,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30180,22.34,18.939769064912227,31.205686444000932,29.75177603045882,1.0879421538075698,6611.800383824442,5.9307364898490675,355.8441893909442,0.2,0.0001858909427957696,29.75177603045882,29.75177603045882,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30240,22.36666666666667,18.930573068422536,31.17809500538598,29.727596145259643,1.0879421538075698,6596.286009641736,5.9307364898490675,355.8441893909442,0.2,0.00018563083352750672,29.727596145259643,29.727596145259643,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30300,22.39333333333333,18.92129141450594,31.14971974700443,29.702738148685626,1.0879421538075698,6580.2909161665775,5.9307364898490675,355.8441893909442,0.2,0.0001853581825291289,29.702738148685626,29.702738148685626,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30360,22.42,18.91191896599662,31.120600728506304,29.67723522356452,1.0879421538075698,6563.846376423669,5.9307364898490675,355.8441893909442,0.2,0.0001850737736837277,29.67723522356452,29.67723522356452,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30420,22.44666666666667,18.90245056177648,31.09077386206571,29.651116974792853,1.0879421538075698,6546.981073377205,5.9307364898490675,355.8441893909442,0.2,0.00018477834249497983,29.651116974792853,29.651116974792853,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30480,22.47333333333333,18.892897085342465,31.06027162409259,29.624411489051855,1.0879421538075698,6529.714969749436,5.9307364898490675,355.8441893909442,0.2,0.00018447255401191548,29.624411489051855,29.624411489051855,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30540,22.5,18.88325168121305,31.029123985686784,29.59714319033677,1.0879421538075698,6512.073291543436,5.9307364898490675,355.8441893909442,0.2,0.000184157019402568,29.59714319033677,29.59714319033677,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30600,22.52666666666667,18.87351132564095,30.99735775257565,29.56933433348845,1.0879421538075698,6494.076734362433,5.9307364898490675,355.8441893909442,0.2,0.0001838322893998495,29.56933433348845,29.56933433348845,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30660,22.553333333333335,18.86367833223116,30.96499708119966,29.541005024758785,1.0879421538075698,6475.743716836664,5.9307364898490675,355.8441893909442,0.2,0.00018349887517879335,29.541005024758785,29.541005024758785,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30720,22.58,18.853754567977198,30.932061314492184,29.51217176630548,1.0879421538075698,6457.087157672583,5.9307364898490675,355.8441893909442,0.2,0.0001831571660255956,29.51217176630548,29.51217176630548,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30780,22.60666666666667,18.843744783512772,30.898566026085614,29.482847740432728,1.0879421538075698,6438.117931669862,5.9307364898490675,355.8441893909442,0.2,0.00018280752243163265,29.482847740432728,29.482847740432728,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30840,22.63333333333333,18.833637913375547,30.86452606510355,29.453044178621287,1.0879421538075698,6418.8524904146725,5.9307364898490675,355.8441893909442,0.2,0.000182450264879106,29.453044178621287,29.453044178621287,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30900,22.66,18.823433955300228,30.829956592195373,29.42277385200957,1.0879421538075698,6399.301700442867,5.9307364898490675,355.8441893909442,0.2,0.00018208570710530428,29.42277385200957,29.42277385200957,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-30960,22.68666666666667,18.813142925833517,30.796176148452872,29.39315892586209,1.0879421538075698,6380.358600113508,5.9307364898490675,355.8441893909442,0.2,0.00018173796172419568,29.39315892586209,29.39315892586209,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31020,22.71333333333333,18.802760450785808,30.76141532123797,29.36269371193977,1.0879421538075698,6360.82387682375,5.9307364898490675,355.8441893909442,0.2,0.0001813747511834012,29.36269371193977,29.36269371193977,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31080,22.740000000000006,18.79227558605133,30.72568603272936,29.33138695948657,1.0879421538075698,6340.711959805847,5.9307364898490675,355.8441893909442,0.2,0.00018099635763580457,29.33138695948657,29.33138695948657,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31140,22.76666666666667,18.781703051199678,30.69492316156049,29.304292703681956,1.0879421538075698,6324.028571168188,5.9307364898490675,355.8441893909442,0.2,0.0001807105654652613,29.304292703681956,29.304292703681956,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31200,22.79333333333333,18.77103336142684,30.667721281400432,29.280216215551075,1.0879421538075698,6309.815543992869,5.9307364898490675,355.8441893909442,0.2,0.00018049148824875595,29.280216215551075,29.280216215551075,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31260,22.82,18.760269907939183,30.639939396820804,29.255632421889075,1.0879421538075698,6295.271911483101,5.9307364898490675,355.8441893909442,0.2,0.00018026390484107604,29.255632421889075,29.255632421889075,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31320,22.84666666666667,18.749414388248656,30.618795809046603,29.23669109759972,1.0879421538075698,6285.256902017066,5.9307364898490675,355.8441893909442,0.2,0.00018015833227331764,29.23669109759972,29.23669109759972,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31380,22.873333333333335,18.738455257412387,30.602731542079674,29.22206573402727,1.0879421538075698,6278.713347526161,5.9307364898490675,355.8441893909442,0.2,0.00018014620922875426,29.22206573402727,29.22206573402727,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31440,22.900000000000006,18.727408828386462,30.588460948334998,29.208959513664055,1.0879421538075698,6273.418245229125,5.9307364898490675,355.8441893909442,0.2,0.0001801680129577567,29.208959513664055,29.208959513664055,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31500,22.92666666666667,18.71626873729479,30.57681875027783,29.19808380044859,1.0879421538075698,6269.932580140426,5.9307364898490675,355.8441893909442,0.2,0.00018023873340994065,29.19808380044859,29.19808380044859,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31560,22.953333333333337,18.705019599320305,30.5671477267953,29.188877509720694,1.0879421538075698,6267.819162300669,5.9307364898490675,355.8441893909442,0.2,0.0001803464491046111,29.188877509720694,29.188877509720694,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31620,22.98,18.693681632454688,30.559002190811878,29.995722559035354,1.0879421538075698,2561.569441205921,0.0,0.0,0.0,0.0,29.995722559035354,29.995722559035354,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31680,23.00666666666667,18.682245837805407,30.687783690197406,29.2897034053672,1.0879421538075698,6357.907390825624,5.9307364898490675,355.8441893909442,0.2,0.0001830954339974428,29.2897034053672,29.2897034053672,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31740,23.033333333333335,18.670715293911407,30.781951759976486,29.36887866568311,1.0879421538075698,6426.088664197038,5.9307364898490675,355.8441893909442,0.2,0.0001850928904426753,29.36887866568311,29.36887866568311,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31800,23.06,18.65908535334609,30.769529565380353,29.357311448172602,1.0879421538075698,6422.200571938892,5.9307364898490675,355.8441893909442,0.2,0.00018515397571255456,29.357311448172602,29.357311448172602,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31860,23.08666666666667,18.647350688611585,30.748718867659182,29.338593886865286,1.0879421538075698,6412.6818285447725,5.9307364898490675,355.8441893909442,0.2,0.00018506396635444963,29.338593886865286,29.338593886865286,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31920,23.11333333333333,18.635527376989703,30.728800357674665,29.320625175245468,1.0879421538075698,6403.814929005438,5.9307364898490675,355.8441893909442,0.2,0.0001849919290567156,29.320625175245468,29.320625175245468,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-31980,23.14,18.623598076291746,30.70963937247517,29.303289560763968,1.0879421538075698,6395.513876408628,5.9307364898490675,355.8441893909442,0.2,0.00018493535452233491,29.303289560763968,29.303289560763968,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32040,23.16666666666667,18.611569662919077,30.691507641937886,29.28681927692602,1.0879421538075698,6387.958284384449,5.9307364898490675,355.8441893909442,0.2,0.0001848991538254564,29.28681927692602,29.28681927692602,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32100,23.19333333333333,18.59944614896924,30.67393128378208,29.27081143090673,1.0879421538075698,6380.82532141118,5.9307364898490675,355.8441893909442,0.2,0.00018487467911792625,29.27081143090673,29.27081143090673,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32160,23.22,18.58722297085227,30.65704171117891,29.25537784012484,1.0879421538075698,6374.204101097264,5.9307364898490675,355.8441893909442,0.2,0.00018486429315785164,29.25537784012484,29.25537784012484,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32220,23.24666666666667,18.574898783021236,30.640395955257173,29.240141296398097,1.0879421538075698,6367.795570251788,5.9307364898490675,355.8441893909442,0.2,0.0001848599436020987,29.240141296398097,29.240141296398097,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32280,23.27333333333333,18.562473496125623,30.62411229975173,29.225202490731935,1.0879421538075698,6361.679733539467,5.9307364898490675,355.8441893909442,0.2,0.00018486377743518864,29.225202490731935,29.225202490731935,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32340,23.3,18.54994253173365,30.60773077509823,29.210169317989568,1.0879421538075698,6355.547970811531,5.9307364898490675,355.8441893909442,0.2,0.00018486745776725744,29.210169317989568,29.210169317989568,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32400,23.3,18.549917574532518,30.599881340706197,29.203480070645167,1.0879421538075698,6350.271906278661,5.9307364898490675,355.8441893909442,0.2,0.00018472612108915592,29.203480070645167,29.203480070645167,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32460,23.3,18.54988691594738,30.591975139289502,29.196741543194552,1.0879421538075698,6344.96179424894,5.9307364898490675,355.8441893909442,0.2,0.00018458381288618175,29.196741543194552,29.196741543194552,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32520,23.3,18.549862880037935,30.592999820450288,29.19761459406161,1.0879421538075698,6345.65134790021,5.9307364898490675,355.8441893909442,0.2,0.00018460266606378984,29.19761459406161,29.19761459406161,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32580,23.3,18.549838155837787,30.61033602913223,29.212387862145217,1.0879421538075698,6357.306571959343,5.9307364898490675,355.8441893909442,0.2,0.00018491593868166605,29.212387862145217,29.212387862145217,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32640,23.3,18.54980745359236,30.637003468310965,29.2351085937635,1.0879421538075698,6375.254612168705,5.9307364898490675,355.8441893909442,0.2,0.0001853981750508516,29.2351085937635,29.2351085937635,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32700,23.300000000000008,18.54978923550944,30.67056058058824,29.263694354056803,1.0879421538075698,6397.8623235170935,5.9307364898490675,355.8441893909442,0.2,0.000186005808926523,29.263694354056803,29.263694354056803,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32760,23.3,18.54975850424601,30.70982003413661,29.297127219617447,1.0879421538075698,6424.359304579178,5.9307364898490675,355.8441893909442,0.2,0.00018671793657195265,29.297127219617447,29.297127219617447,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32820,23.3,18.549727583901696,30.752758912790647,29.33368222770118,1.0879421538075698,6453.390582912383,5.9307364898490675,355.8441893909442,0.2,0.00018749835884723283,29.33368222770118,29.33368222770118,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32880,23.3,18.54970949729563,30.798610383955346,29.372704726277856,1.0879421538075698,6484.44600638138,5.9307364898490675,355.8441893909442,0.2,0.00018833355479506693,29.372704726277856,29.372704726277856,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-32940,23.3,18.549679195331823,30.84610694723248,29.41311186114071,1.0879421538075698,6516.685878297871,5.9307364898490675,355.8441893909442,0.2,0.00018920071090557642,29.41311186114071,29.41311186114071,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33000,23.3,18.549654265375835,30.894904517052137,29.454610990371627,1.0879421538075698,6549.876253603299,5.9307364898490675,355.8441893909442,0.2,0.0001900937605314916,29.454610990371627,29.454610990371627,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33060,23.3,18.549630101870925,30.944179353241058,29.496500365021273,1.0879421538075698,6583.462365227044,5.9307364898490675,355.8441893909442,0.2,0.00019099774098273452,29.496500365021273,29.496500365021273,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33120,23.300000000000008,18.5495992834586,30.993633696216033,29.53852579496646,1.0879421538075698,6617.246076770907,5.9307364898490675,355.8441893909442,0.2,0.00019190725305449994,29.53852579496646,29.53852579496646,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33180,23.3,18.549574309357226,31.042675564352695,29.580185535586747,1.0879421538075698,6650.81702659804,5.9307364898490675,355.8441893909442,0.2,0.00019281138683601231,29.580185535586747,29.580185535586747,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33240,23.3,18.549550750516214,31.0934919996427,29.6233360623177,1.0879421538075698,6685.678498584946,5.9307364898490675,355.8441893909442,0.2,0.00019375056678377269,29.6233360623177,29.6233360623177,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33300,23.300000000000008,18.549525747142066,31.144316224658603,29.666476184940514,1.0879421538075698,6720.622708818761,5.9307364898490675,355.8441893909442,0.2,0.00019469226118168172,29.666476184940514,29.666476184940514,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33360,23.3,18.5494951383626,31.196095134082896,29.710408540487922,1.0879421538075698,6756.305683128394,5.9307364898490675,355.8441893909442,0.2,0.00019565409845465957,29.710408540487922,29.710408540487922,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33420,23.3,18.549471064402198,31.25111774537913,29.757074382350673,1.0879421538075698,6794.308912786267,5.9307364898490675,355.8441893909442,0.2,0.00019667887105925708,29.757074382350673,29.757074382350673,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33480,23.3,18.549446016848577,31.307432689406735,29.80481530681572,1.0879421538075698,6833.300108740723,5.9307364898490675,355.8441893909442,0.2,0.00019773061443927932,29.80481530681572,29.80481530681572,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33540,23.3,18.549414921894453,31.363919524787306,29.85268033010561,1.0879421538075698,6872.508645910164,5.9307364898490675,355.8441893909442,0.2,0.0001987885266755915,29.85268033010561,29.85268033010561,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33600,23.3,18.549396663172004,31.420509508777467,29.90061249018818,1.0879421538075698,6911.880950353466,5.9307364898490675,355.8441893909442,0.2,0.00019985135505329917,29.90061249018818,29.90061249018818,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33660,23.3,18.54936618656048,31.477607028357898,29.948951796950496,1.0879421538075698,6951.709783225911,5.9307364898490675,355.8441893909442,0.2,0.00020092673469322619,29.948951796950496,29.948951796950496,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33720,23.300000000000008,18.54933522259927,31.533750700452682,29.996462123173547,1.0879421538075698,6990.97077139732,5.9307364898490675,355.8441893909442,0.2,0.00020198713418395487,29.996462123173547,29.996462123173547,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33780,23.3,18.549317188808825,31.58309642909865,29.999999936580164,1.0879421538075698,7199.286764419137,6.060276502953335,363.61659017720007,0.2050425868572254,0.0002079460209757515,29.999999936580164,29.999999936580164,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33840,23.3,18.549286195739032,31.619528382894202,30.00000007197129,1.0879421538075698,7364.964036324059,6.168700036970866,370.12200221825185,0.20908020091410814,0.00021268712431016235,30.00000007197129,30.00000007197129,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33900,23.3,18.549261692329907,31.642732336821762,29.99999994208131,1.0879421538075698,7470.48688619299,6.239590799580129,374.3754479748078,0.21163804964584124,0.00021570617769464432,29.99999994208131,29.99999994208131,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-33960,23.300000000000008,18.54923731621516,31.65783936841497,30.000000039691287,1.0879421538075698,7539.1871520266905,6.286511686727422,377.1907012036454,0.213297601900948,0.00021767152740864663,30.000000039691287,30.000000039691287,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34020,23.3,18.549212578628136,31.66846235022583,29.999999986276464,1.0879421538075698,7587.4964479285045,6.319867655345211,379.19205932071264,0.21446185261580855,0.00021905349478514168,29.999999986276464,29.999999986276464,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34080,23.3,18.54918152716212,31.6770840995468,29.99999992210222,1.0879421538075698,7626.704991485215,6.347157363252902,380.8294417951741,0.21540505183814776,0.0002201750141616337,29.99999992210222,29.99999992210222,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34140,23.3,18.549157653237142,31.68449405818109,29.999999983758226,1.0879421538075698,7660.402225667468,6.370770912195303,382.2462547317181,0.2162145793985903,0.0002211389643022496,29.999999983758226,29.999999983758226,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34200,23.3,18.549132429062887,31.69441377495938,29.99999993834855,1.0879421538075698,7705.513318366797,6.402610761528665,384.1566456917199,0.21729661793108696,0.00022242916896609237,29.99999993834855,29.99999993834855,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34260,23.3,18.549101436665374,31.70485888340645,29.999999903202443,1.0879421538075698,7753.013634600374,6.436417047957658,386.1850228774594,0.2184338103775468,0.00022378747954679282,29.999999903202443,29.999999903202443,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34320,23.3,18.549083171107814,31.71709454728868,29.99999988999693,1.0879421538075698,7808.656577736008,6.476392836265756,388.58357017594534,0.21976343692387199,0.00022537859912378995,29.99999988999693,29.99999988999693,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34380,23.3,18.549052694338354,31.731329918455483,30.00000000347828,1.0879421538075698,7873.392810004414,6.523396401577156,391.40378409462954,0.22130651305091056,0.000227229282307502,30.00000000347828,30.00000000347828,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34440,23.3,18.549021658336986,31.74521819906101,30.00000000521327,1.0879421538075698,7936.551122037651,6.569772539481147,394.1863523688689,0.22280818783723255,0.00022903463399758935,30.00000000521327,30.00000000521327,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34500,23.3,18.54900334978985,31.758651223611174,30.00000000481864,1.0879421538075698,7997.639122136342,6.615121287449143,396.90727724694864,0.22425727597312375,0.0002307807889633586,30.00000000481864,30.00000000481864,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34560,23.3,18.548972829357727,31.771691911660362,30.000000004331646,1.0879421538075698,8056.942933888236,6.659598272061162,399.57589632366967,0.22566054455198076,0.0002324756007109405,30.000000004331646,30.000000004331646,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34620,23.3,18.548947501959287,31.78438155321011,30.00000000594992,1.0879421538075698,8114.650317636283,6.703313405947753,402.19880435686514,0.2270229751770059,0.000234124693314497,30.00000000594992,30.00000000594992,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34680,23.3,18.548923295618568,31.79668075821545,30.000000007526218,1.0879421538075698,8170.58215304747,6.74609115509328,404.76546930559687,0.2283405446085403,0.00023572289157577271,30.000000007526218,30.000000007526218,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34740,23.3,18.548898585916227,31.80906516764417,30.000000009001266,1.0879421538075698,8226.901464401792,6.789570847654746,407.3742508592848,0.2296643322249245,0.00023733199452779746,30.000000009001266,30.000000009001266,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34800,23.3,18.548867462576414,31.820872953632,30.00000000834238,1.0879421538075698,8280.59853373678,6.831402535822406,409.88415214934435,0.2309236991291888,0.0002388659578371948,30.00000000834238,30.00000000834238,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34860,23.3,18.54884321375111,31.83193643197545,30.00000001214775,1.0879421538075698,8330.910770664139,6.870934306648643,412.2560583989185,0.2321013312919561,0.00024030319442799736,30.00000001214775,30.00000001214775,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34920,23.3,18.548818255288552,31.842733708587335,29.999999868307878,1.0879421538075698,8380.013100506716,6.909828318653719,414.5896991192231,0.2332484177687732,0.00024170575066732798,29.999999868307878,29.999999868307878,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-34980,23.3,18.54878763295268,31.853817290748548,30.000000013014922,1.0879421538075698,8430.416120755403,6.950071508593725,417.0042905156235,0.2344235374316794,0.00024314523788609814,30.000000013014922,30.000000013014922,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35040,23.3,18.548769029854935,31.86443168467893,30.000000014558026,1.0879421538075698,8478.686112500833,6.988921652852659,419.3352991711596,0.2355469104080146,0.0002445238741422041,30.000000014558026,30.000000014558026,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35100,23.300000000000008,18.548737998999922,31.874321631189193,30.00000001619823,1.0879421538075698,8523.661608018838,7.025382381328665,421.52294287971984,0.2365915324125085,0.0002458081576866732,30.00000001619823,30.00000001619823,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35160,23.300000000000008,18.54871308367944,31.88486434637897,30.00000001760232,1.0879421538075698,8571.60563428451,7.064537972286006,423.87227833716037,0.2377031865106875,0.00024717716622437737,30.00000001760232,30.00000001760232,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35220,23.3,18.548689026899453,31.8956800382001,30.000000018880517,1.0879421538075698,8620.791049160847,7.10501373977091,426.3008243862546,0.2388414957862436,0.0002485815033828566,30.000000018880517,30.000000018880517,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35280,23.3,18.548657786995218,31.90601730317896,30.00000002024763,1.0879421538075698,8667.800770584687,7.143983804870179,428.63902829221087,0.23992730112851116,0.00024992351963488844,30.00000002024763,30.00000002024763,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35340,23.3,18.548632827594844,31.91617340930075,29.999999873118455,1.0879421538075698,8713.987329617099,7.182548874619519,430.95293247717115,0.24099223303572734,0.00025124202450921453,29.999999873118455,29.999999873118455,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35400,23.3,18.54860855363389,31.926336658546305,29.999999872221824,1.0879421538075698,8760.205707699497,7.221413668027933,433.284820081676,0.2420560034883565,0.00025256133510107053,29.999999872221824,29.999999872221824,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35460,23.3,18.548583462513,31.93693767834191,29.99999987633469,1.0879421538075698,8808.414867567382,7.262242911952839,435.7345747171704,0.24316356341896586,0.00025393733857402784,29.99999987633469,29.99999987633469,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35520,23.3,18.54855270916877,31.947199052556694,30.000000028198208,1.0879421538075698,8855.078783891759,7.302042497056316,438.1225498233789,0.2442335668618432,0.00025526905691697685,30.000000028198208,30.000000028198208,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35580,23.3,18.548534142171,31.956893527573328,30.000000030957853,1.0879421538075698,8899.165348505823,7.339904364960733,440.39426189764407,0.24524284565368684,0.00025652731532284655,30.000000030957853,30.000000030957853,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35640,23.3,18.548503359623247,31.96647755806777,30.000000032230197,1.0879421538075698,8942.749662572938,7.37757202835251,442.6543217011506,0.2462387710191841,0.00025777097933724617,30.000000032230197,30.000000032230197,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35700,23.3,18.54847820957755,31.976510266386608,30.00000003563484,1.0879421538075698,8988.374373411116,7.41726517487246,445.0359104923476,0.2472796050674236,0.00025907283053291116,30.00000003563484,30.00000003563484,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35760,23.3,18.54845358236581,31.986206241117177,30.00000003913782,1.0879421538075698,9032.467754741225,7.455877033378713,447.3526220027228,0.2482837467882853,0.0002603309076184,30.00000003913782,30.00000003913782,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35820,23.3,18.54842292164664,31.995331393575558,30.000000040428162,1.0879421538075698,9073.965275794351,7.492438547414548,449.5463128448729,0.2492271378160176,0.00026151477708905057,30.000000040428162,30.000000040428162,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35880,23.3,18.5483975619748,32.0044448921508,29.999999885443696,1.0879421538075698,9115.41051034446,7.529173850265924,451.75043101595537,0.2501678742708211,0.00026269714212043683,29.999999885443696,29.999999885443696,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-35940,23.3,18.548373705038745,32.01413648652229,29.999999889779073,1.0879421538075698,9159.483967776096,7.5684796958041725,454.10878174825035,0.2511666651769116,0.00026395439749390823,29.999999889779073,29.999999889779073,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36000,23.365,18.557439456423932,32.05821944718942,29.999999901836876,1.0879421538075698,9359.955505651104,7.7575365413141215,465.45219247884734,0.25586329153352977,0.0002700352495479995,29.999999901836876,29.999999901836876,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36060,23.43,18.56624476871821,32.16796239593048,29.999999943483683,1.0879421538075698,9859.022152735644,8.241215283806758,494.4729170284055,0.2671542371118575,0.00028465302412666063,29.999999943483683,29.999999943483683,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36120,23.495,18.57479632180461,32.30824978903255,29.999999852978775,1.0879421538075698,10496.993261078249,8.90487760442754,534.2926562656523,0.28124489731006913,0.00030325631210780755,29.999999852978775,29.999999852978775,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36180,23.56,18.58308189355696,32.4406642517131,30.000000006010065,1.0879421538075698,11099.160337679605,9.579897943996283,574.793876639777,0.2942591528725082,0.0003208584861251513,30.000000006010065,30.000000006010065,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36240,23.625,18.59109557185896,32.558838118221395,30.00000000402943,1.0879421538075698,11636.56760965139,10.22229532138958,613.3377192833748,0.305657526608522,0.000336632355867265,30.00000000402943,30.00000000402943,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36300,23.69,18.598858611272913,32.6634571563548,30.000000007702546,1.0879421538075698,12112.332942753834,10.822483103902966,649.348986234178,0.3155885965172306,0.0003506661948442448,30.000000007702546,30.000000007702546,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36360,23.755,18.60635484056159,32.75614833035393,30.000000017775978,1.0879421538075698,12533.855113248457,11.37897501314098,682.7385007884587,0.3242689786600338,0.0003631694591877961,30.000000017775978,30.000000017775978,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36420,23.82,18.61358016702448,32.838739322454764,30.000000021835927,1.0879421538075698,12909.445742040245,11.894460209448294,713.6676125668978,0.3319147085087899,0.0003743777706116272,30.000000021835927,30.000000021835927,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36480,23.885,18.620541333347138,32.91248055664659,30.000000032582587,1.0879421538075698,13244.791197260274,12.370473856897387,742.2284314138434,0.33867498116351336,0.00038445209554682357,30.000000032582587,30.000000032582587,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36540,23.950000000000006,18.627232165517363,32.97840871578963,30.00000003703734,1.0879421538075698,13544.60595504222,12.808800375332424,768.5280225199454,0.34466985481933854,0.00039352543331255287,30.00000003703734,30.00000003703734,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36600,24.015,18.633652219921764,33.03749053230109,30.00000004155602,1.0879421538075698,13813.286297085602,13.211991309099664,792.7194785459798,0.35000579955210814,0.00040172194088826987,30.00000004155602,30.00000004155602,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36660,24.080000000000005,18.63979244341601,33.0906336012402,30.000000053225943,1.0879421538075698,14054.959568820439,13.583166968073625,814.9900180844174,0.3547781692590261,0.0004091580322321669,30.000000053225943,30.000000053225943,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36720,24.145000000000003,18.64566707925666,33.138652373591405,30.00000000609627,1.0879421538075698,14273.329865997839,13.925621777914815,835.5373066748891,0.3590701661479903,0.0004159387705686487,30.00000000609627,30.00000000609627,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36780,24.21,18.651253923733172,33.18218779255648,30.000000063477078,1.0879421538075698,14471.311198101694,14.241988285190642,854.5192971114384,0.3629460052718681,0.0004221459427601803,30.000000063477078,30.000000063477078,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36840,24.275000000000006,18.65658474978159,33.22178750005408,30.000000005969977,1.0879421538075698,14651.395018272944,14.534752589451212,872.0851553670727,0.3664603867139466,0.00042785054382803996,30.000000005969977,30.000000005969977,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36900,24.340000000000003,18.661628049746945,33.257989034970805,30.000000081171464,1.0879421538075698,14816.024711416923,14.806574360978436,888.3944616587062,0.3696640896805864,0.00043312104457708607,30.000000081171464,30.000000081171464,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-36960,24.405,18.666389813578576,33.291287458613326,30.000000005914,1.0879421538075698,14967.452905174254,15.060145669981404,903.608740198884,0.3726034321498539,0.00043802132265216765,30.000000005914,30.000000005914,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37020,24.47,18.670866104468942,33.32210699721066,30.00000009271541,1.0879421538075698,15107.607388776229,15.297849986726124,917.8709992035676,0.3753173532683567,0.0004426059823948185,30.00000009271541,30.00000009271541,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37080,24.535,18.675066689967007,33.35080082840506,30.00000000572967,1.0879421538075698,15238.095799526864,15.521741565911634,931.3044939546977,0.3778381630699742,0.0004469207407567657,30.00000000572967,30.00000000572967,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37140,24.6,18.67898007015524,33.377660196467716,30.00000010451257,1.0879421538075698,15360.240964235134,15.733523667174099,944.0114200304457,0.3801920634212361,0.0004510029093726011,30.00000010451257,30.00000010451257,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37200,24.665,18.682607485461872,33.40283800210832,30.000000005735842,1.0879421538075698,15474.739957116564,15.933958690515356,956.0375214309213,0.3823933101620421,0.0004548720108146418,30.000000005735842,30.000000005735842,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37260,24.73,18.685948307653998,33.42625057076634,30.00000011669985,1.0879421538075698,15581.210407651672,16.12209542381479,967.3257254288876,0.3844366831692508,0.00045851656028629074,30.00000011669985,30.00000011669985,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37320,24.795,18.689002908741536,33.4479594178985,30.000000005510927,1.0879421538075698,15679.934027499825,16.298083362611855,977.8850017567113,0.3863286388663361,0.00046194417547895525,30.000000005510927,30.000000005510927,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37380,24.86,18.69175420756277,33.468219546186425,30.00000000571533,1.0879421538075698,15772.068949563289,16.463576022283274,987.8145613369963,0.3880910146526616,0.00046518740929939656,30.00000000571533,30.00000000571533,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37440,24.925,18.69422461514206,33.48726109708076,30.000000005380297,1.0879421538075698,15858.662273714635,16.620153943588214,997.2092366152929,0.3897438451875913,0.00046827664315004386,30.000000005380297,30.000000005380297,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37500,24.990000000000006,18.696396921686713,33.50524101194169,30.00000000541854,1.0879421538075698,15940.427702050903,16.768827560275472,1006.1296536165286,0.3913003675249642,0.0004712317430235306,30.00000000541854,30.00000000541854,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37560,25.055,18.69827191325653,33.522049655258215,30.00000000561928,1.0879421538075698,16016.866657277662,16.908592948750066,1014.5155769250039,0.39275241828544494,0.00047403800846702453,30.00000000561928,30.00000000561928,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37620,25.12,18.69985406508034,33.53725408306262,30.000000005435638,1.0879421538075698,16086.010286672492,17.035901490290186,1022.1540894174112,0.3940657717376489,0.0004766381149792175,30.000000005435638,30.000000005435638,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37680,25.185,18.701132990172038,33.55085670461193,30.000000005465413,1.0879421538075698,16147.869543849638,17.150583050442894,1029.0349830265736,0.3952414119273281,0.00047903168252661133,30.000000005465413,30.000000005465413,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37740,25.25,18.70211350094368,33.56317006371897,30.00000000538116,1.0879421538075698,16203.865753979848,17.254940372340222,1035.296422340413,0.3963051702514671,0.0004812595477934581,30.00000000538116,30.00000000538116,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37800,25.315,18.70278584836977,33.574419089865614,30.000000005296606,1.0879421538075698,16255.021805453394,17.350609392920575,1041.0365635752346,0.3972753726695865,0.00048335083088160333,30.000000005296606,30.000000005296606,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37860,25.38,18.703158821251108,33.583947835236586,30.00000000531621,1.0879421538075698,16298.354710689297,17.432313156604025,1045.9387893962416,0.39810021446151894,0.000485218672601005,30.00000000531621,30.00000000531621,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37920,25.445,18.703222084685386,33.59367970338076,30.000000007386713,1.0879421538075698,16342.611327356943,17.51520212424022,1050.9121274544134,0.3989335432858071,0.000487116769300296,30.000000007386713,30.000000007386713,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-37980,25.51,18.702981873705014,33.60276727071685,30.000000005352373,1.0879421538075698,16383.937941494763,17.59254290217902,1055.552574130741,0.3997079656857669,0.0004889331738955756,30.000000005352373,30.000000005352373,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38040,25.575,18.70243166082964,33.61152943191348,30.000000012739157,1.0879421538075698,16423.78469641411,17.666803449010192,1060.0082069406112,0.4004487319453274,0.0004907097676566681,30.000000012739157,30.000000012739157,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38100,25.64,18.70156582189577,33.61948544280755,30.000000005167433,1.0879421538075698,16459.96547169154,17.734107098074496,1064.0464258844697,0.4011177420627682,0.0004923825907117423,30.000000005167433,30.000000005167433,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38160,25.705,18.7003841480463,33.62723141081487,30.000000005182,1.0879421538075698,16495.191021815197,17.79918293732782,1067.9509762396692,0.4017624921585783,0.0004940304907034593,30.000000005182,30.000000005182,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38220,25.770000000000003,18.698886341147247,33.63448522371253,30.000000005194558,1.0879421538075698,16528.178448255763,17.859737597762937,1071.5842558657762,0.4023605947640748,0.0004956159480817009,30.000000005194558,30.000000005194558,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38280,25.835,18.697078347648027,33.640738765230786,30.00000000509769,1.0879421538075698,16556.617042866623,17.911658853637906,1074.6995312182742,0.4028720123855589,0.0004970713837489808,30.00000000509769,30.00000000509769,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38340,25.9,18.69494788689805,33.64702232656467,30.000000005213682,1.0879421538075698,16585.192154568984,17.963198661308745,1077.791919678525,0.4033783918782075,0.00049853332414453,30.000000005213682,30.000000005213682,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38400,25.965,18.692495197248196,33.6532763234758,30.0000000126137,1.0879421538075698,16613.632786030754,18.013853604680012,1080.8312162808008,0.4038748418110741,0.0004999938687055782,30.0000000126137,30.0000000126137,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38460,26.03,18.689720290419388,33.659358339505175,30.00000000501833,1.0879421538075698,16641.291385736724,18.06248036024028,1083.7488216144166,0.4043502687964005,0.0005014340544018986,30.00000000501833,30.00000000501833,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38520,26.095,18.686617468803252,33.665455482582615,30.000000005028113,1.0879421538075698,16669.018742594148,18.110560166911988,1086.6336100147194,0.4048192515764563,0.0005028786715265583,30.000000005028113,30.000000005028113,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38580,26.16,18.683191268644237,33.67158047570193,30.00000000503534,1.0879421538075698,16696.872750263552,18.15820484342008,1089.4922906052047,0.4052829205174697,0.0005043295385140238,30.00000000503534,30.00000000503534,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38640,26.225,18.679435760719535,33.67767535072771,30.00000001254961,1.0879421538075698,16724.589758805923,18.204921168106765,1092.295270086406,0.4057365271016557,0.0005057788521839057,30.00000001254961,30.00000001254961,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38700,26.29,18.675345818016336,33.68370589870799,30.00000000494657,1.0879421538075698,16752.014302539174,18.250417333320414,1095.0250399992246,0.40617731343807373,0.0005072218565331029,30.00000000494657,30.00000000494657,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38760,26.355,18.67092658315924,33.68965066305209,30.00000000495598,1.0879421538075698,16779.0487021444,18.29451629559227,1097.6709777355363,0.40660365193050174,0.00050865586366507,30.00000000495598,30.00000000495598,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38820,26.42,18.66617122876529,33.69518535272889,30.000000005138244,1.0879421538075698,16804.21824614341,18.334559687729,1100.0735812637402,0.4069900091026697,0.000510037228421343,30.000000005138244,30.000000005138244,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38880,26.485,18.661069894136,33.69970397230653,30.000000004967198,1.0879421538075698,16824.767113192214,18.3655605913625,1101.9336354817501,0.40728861716316733,0.0005112842260403856,30.000000004967198,30.000000004967198,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-38940,26.55,18.65563748746232,33.704186328383955,30.000000012478882,1.0879421538075698,16845.15103347462,18.3955282296228,1103.731693777368,0.4075768569507006,0.0005125285279334019,30.000000012478882,30.000000012478882,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39000,26.615,18.64986271633066,33.708468593186396,29.999999999980375,1.0879421538075698,16864.625110032764,18.423101955657987,1105.3861173394794,0.40784171154503734,0.0005137478248734729,29.999999999980375,29.999999999980375,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39060,26.68,18.643746111514247,33.7124236369552,30.00000000486887,1.0879421538075698,16882.61103773734,18.44723790751488,1106.8342744508927,0.4080732631923428,0.0005149250026889133,30.00000000486887,30.00000000486887,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39120,26.745,18.63728601749311,33.71652332500809,30.00000000497927,1.0879421538075698,16901.254771257132,18.47178081830384,1108.3068490982305,0.4083084499064463,0.000516123439991453,30.00000000497927,30.00000000497927,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39180,26.81,18.63047107825684,33.72071719983389,30.00000000505424,1.0879421538075698,16920.326828537272,18.496288060375853,1109.777283622551,0.4085430247835269,0.0005173361448361644,30.00000000505424,30.00000000505424,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39240,26.875,18.623302227465288,33.72492065066693,30.00000000487996,1.0879421538075698,16939.44243478421,18.520071825029095,1111.2043095017457,0.4087704175093032,0.0005185517852731778,30.00000000487996,30.00000000487996,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39300,26.94,18.615788024356327,33.72908667713969,30.000000004881528,1.0879421538075698,16958.387849277868,18.542768732712734,1112.5661239627639,0.4089871833107412,0.0005197643006146598,30.000000004881528,30.000000004881528,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39360,27.005000000000006,18.607918066210203,33.73320373979558,29.999999999927578,1.0879421538075698,16977.11061854165,18.56425405667521,1113.8552434005128,0.40919216644672346,0.0005209725533930539,29.999999999927578,29.999999999927578,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39420,27.07,18.599691320597927,33.737279171648304,30.00000000488591,1.0879421538075698,16995.644022562716,18.58458986159797,1115.0753916958784,0.4093859934655632,0.0005221767938726151,30.00000000488591,30.00000000488591,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39480,27.135,18.591102248183013,33.741304240586736,30.00000000488872,1.0879421538075698,17013.948418820994,18.6036830637503,1116.220983825018,0.4095678099344049,0.0005233757725902912,30.00000000488872,30.00000000488872,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39540,27.2,18.582149681947023,33.74527831266923,29.9999999998011,1.0879421538075698,17032.020925018016,18.62152852306786,1117.2917113840717,0.4097375988537272,0.0005245693374315684,29.9999999998011,29.9999999998011,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39600,27.22833333333333,18.580319419483,33.74926395261934,30.00000000479126,1.0879421538075698,17050.145991399364,18.65249745760989,1119.1498474565933,0.41003191628257624,0.0005253882936289072,30.00000000479126,30.00000000479126,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39660,27.25666666666667,18.57841984608465,33.75079564308405,30.000000004788852,1.0879421538075698,17057.111504215067,18.663228764244593,1119.7937258546756,0.41013380418903783,0.0005258748838788205,30.000000004788852,30.000000004788852,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39720,27.285,18.576465263514002,33.75051043512328,30.000000004894854,1.0879421538075698,17055.81449252315,18.65895989735366,1119.5375938412196,0.41009327968902665,0.0005261155108063366,30.000000004894854,30.000000004894854,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39780,27.31333333333333,18.574446185758482,33.75031593413214,30.000000004892076,1.0879421538075698,17054.929980178014,18.655285651163236,1119.3171390697944,0.41005839352925494,0.0005263685198022727,30.000000004892076,30.000000004892076,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39840,27.34166666666666,18.572354813257565,33.75015338021676,30.000000004889337,1.0879421538075698,17054.19075029701,18.651711116569434,1119.102666994166,0.4100244484117169,0.000526625683013149,30.000000004889337,30.000000004889337,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39900,27.37,18.57021761036713,33.74979369636069,30.00000001236331,1.0879421538075698,17052.555018650914,18.646413856234286,1118.784831374057,0.4099741333073782,0.000526856634424824,30.00000001236331,30.00000001236331,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-39960,27.39833333333333,18.56801473871757,33.7491647533042,30.000000004881873,1.0879421538075698,17049.694872360058,18.638773659096678,1118.3264195458007,0.4099015424671293,0.000527051033525431,30.000000004881873,30.000000004881873,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40020,27.42666666666667,18.565746913548427,33.748360181823266,29.999999992334548,1.0879421538075698,17046.03606159941,18.62955025995374,1117.7730155972245,0.4098138750809769,0.0005272215515190927,29.999999992334548,29.999999992334548,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40080,27.455,18.563408938091854,33.74755691483971,30.00000000487489,1.0879421538075698,17042.38306908012,18.620183246888022,1117.2109948132813,0.4097248042555799,0.000527392096539153,30.00000000487489,30.00000000487489,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40140,27.483333333333334,18.56101609461445,33.74692208549161,30.00000000486784,1.0879421538075698,17039.496120309603,18.61207123018672,1116.724273811203,0.40964763587364733,0.0005275858171101517,30.00000000486784,30.00000000486784,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40200,27.511666666666667,18.55855855556092,33.74656146886102,30.00000000486491,1.0879421538075698,17037.856180781713,18.606054899524892,1116.3632939714937,0.40959038465160613,0.0005278168362082828,30.00000000486491,30.00000000486491,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40260,27.540000000000006,18.55603529110179,33.74652993481426,29.99999999992454,1.0879421538075698,17037.712799074154,18.602576923166662,1116.1546153899997,0.4095572810312304,0.0005280926578574292,29.99999999992454,29.99999999992454,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40320,27.56833333333333,18.553452962742025,33.74684433348743,30.00000001241729,1.0879421538075698,17039.142501103222,18.6017958372157,1116.107750232942,0.40954984586503257,0.0005284158452032473,30.00000001241729,30.00000001241729,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40380,27.596666666666664,18.55079874534345,33.747495365524486,30.00000000503573,1.0879421538075698,17042.103166793353,18.60360181376797,1116.2161088260784,0.409567036567228,0.0005287848092238725,30.00000000503573,30.00000000503573,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40440,27.625,18.548092356805803,33.74845390672654,30.000000004858517,1.0879421538075698,17046.462227847118,18.60780055066498,1116.4680330398987,0.4096069978636409,0.0005291961816673824,30.000000004858517,30.000000004858517,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40500,27.653333333333336,18.54530891859452,33.74968794610207,30.000000004858183,1.0879421538075698,17052.074143095124,18.614072213307885,1116.844332798473,0.4096666736231844,0.0005296449681724298,30.000000004858183,30.000000004858183,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40560,27.681666666666665,18.5424712335778,33.75117279159287,30.000000012410304,1.0879421538075698,17058.826589436732,18.622267797133773,1117.3360678280264,0.4097446295713465,0.0005301284668535679,30.000000012410304,30.000000012410304,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40620,27.71,18.539567737526653,33.75288432959066,30.000000012413288,1.0879421538075698,17066.609976546097,18.632167417436033,1117.930045046162,0.4098387546840023,0.0005306431228864289,30.000000012413288,30.000000012413288,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40680,27.73833333333333,18.536599127747948,33.75479164256353,30.000000012412833,1.0879421538075698,17075.283669596007,18.643519857977267,1118.6111914786363,0.4099466399517776,0.0005311847533391738,30.000000012412833,30.000000012412833,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40740,27.76666666666667,18.533564884929206,33.75687306620103,30.00000001241313,1.0879421538075698,17084.74914798808,18.65614612355386,1119.3687674132316,0.41006656405771336,0.0005317504560453741,30.00000001241313,30.00000001241313,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40800,27.795,18.530464627306348,33.75911445649098,30.000000004866138,1.0879421538075698,17094.942124763336,18.669933994586977,1120.1960396752186,0.4101974410072844,0.000532338289036541,30.000000004866138,30.000000004866138,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40860,27.82333333333333,18.527294571271018,33.76149119059839,29.999999999789853,1.0879421538075698,17105.75057960388,18.684665471083,1121.07992826498,0.4103371826080102,0.0005329448036166472,29.999999999789853,29.999999999789853,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40920,27.85166666666667,18.524063509264668,33.76398681707801,30.000000004871467,1.0879421538075698,17117.099662988632,18.700237184119693,1122.0142310471815,0.41048479122197784,0.0005335680202735028,30.000000004871467,30.000000004871467,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-40980,27.880000000000006,18.52076709724565,33.7669685927978,30.00000000487525,1.0879421538075698,17130.659580876236,18.719634821093614,1123.178089265617,0.4106685184777713,0.0005342580770630997,30.00000000487525,30.00000000487525,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41040,27.90833333333333,18.51741091907344,33.769748280076946,30.00000000477403,1.0879421538075698,17143.300482211907,18.73724876310824,1124.2349257864944,0.4108352089371245,0.0005349210350175859,30.00000000477403,30.00000000477403,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41100,27.93666666666667,18.513983551367033,33.7726269898722,30.00000000488113,1.0879421538075698,17156.39169721643,18.75551598291186,1125.3309589747116,0.4110079389616228,0.0005355977797643964,30.00000000488113,30.00000000488113,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41160,27.965,18.510490150859408,33.77541238098536,30.00000000477749,1.0879421538075698,17169.05853730837,18.77286713856681,1126.3720283140085,0.4111718725882056,0.0005362621350525527,30.00000000477749,30.00000000477749,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41220,27.99333333333333,18.506930627559182,33.77835974338364,30.00000000488845,1.0879421538075698,17182.46195674954,18.79140006319228,1127.484003791537,0.4113468273050727,0.0005369490319641144,30.00000000488845,30.00000000488845,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41280,28.02166666666666,18.50330050337201,33.78128392500882,30.00000000478737,1.0879421538075698,17195.759960312884,18.80958092861713,1128.574855717028,0.4115183140195495,0.000537633019160836,30.00000000478737,30.00000000478737,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41340,28.05,18.49960994598305,33.784382082409536,30.00000001234272,1.0879421538075698,17209.849100982025,18.82904950145866,1129.7429700875196,0.4117017884037718,0.0005383413849038546,30.00000001234272,30.00000001234272,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41400,28.07833333333333,18.495847626401318,33.787833434204,30.000000004792824,1.0879421538075698,17225.54449653404,18.85126050888548,1131.0756305331286,0.41191090834373495,0.0005390984360810878,30.000000004792824,30.000000004792824,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41460,28.10666666666667,18.492025221486774,33.79087258466099,30.000000004796576,1.0879421538075698,17239.365331673584,18.869954774629907,1132.1972864777945,0.4120867532168485,0.000539799571713128,30.000000004796576,30.000000004796576,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41520,28.135,18.488130483243772,33.79422014659516,30.00000000480197,1.0879421538075698,17254.588698285042,18.891014361573852,1133.460861694431,0.4122846675509877,0.0005405432537806782,30.00000000480197,30.00000000480197,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41580,28.16333333333333,18.4841704719179,33.79743736929837,30.00000000480581,1.0879421538075698,17269.21933445107,18.910860534122293,1134.6516320473374,0.4124710046788048,0.0005412695140293651,30.00000000480581,30.00000000480581,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41640,28.19166666666667,18.48014427386821,33.800817732756826,30.000000012263886,1.0879421538075698,17284.591835323667,18.9318892212728,1135.9133532763678,0.4126682609897689,0.0005420185827035367,30.000000012263886,30.000000012263886,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41700,28.22,18.476046892285613,33.804454806867234,30.000000004815348,1.0879421538075698,17301.131820884922,18.95487592174488,1137.2925553046925,0.4128836686269234,0.0005428032589730749,30.000000004815348,30.000000004815348,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41760,28.24833333333333,18.47188252700403,33.80792397891208,30.00000000471481,1.0879421538075698,17316.908221898873,18.976326857003283,1138.5796114201964,0.41308448211724214,0.000543565279334755,30.00000000471481,30.00000000471481,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41820,28.276666666666664,18.467652075010108,33.811347842699305,30.000000004720203,1.0879421538075698,17332.4785786802,18.99725672243197,1139.8354033459182,0.4132802295906272,0.0005443215576738812,30.000000004720203,30.000000004720203,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41880,28.305,18.463349547837428,33.814779079532514,30.000000007393513,1.0879421538075698,17348.0824529795,19.01808355920896,1141.0850135525375,0.41347482959543896,0.0005450791609810616,30.000000007393513,30.000000007393513,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-41940,28.333333333333336,18.458980903586017,33.81823702321434,30.000000004728125,1.0879421538075698,17363.80780357389,19.03898600549542,1142.3391603297252,0.4136699520736815,0.0005458408960502889,30.000000004728125,30.000000004728125,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42000,28.361666666666665,18.454545624893488,33.82194281291855,30.000000012191038,1.0879421538075698,17380.66021223481,19.06176554131551,1143.7059324789304,0.4138823876173763,0.0005466371734618999,30.000000012191038,30.000000012191038,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42060,28.39,18.450039022483498,33.82559579309555,29.999999999420012,1.0879421538075698,17397.272556400516,19.083955835372212,1145.0373501223328,0.4140891185812473,0.0005474265536731384,29.999999999420012,29.999999999420012,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42120,28.41833333333333,18.445460081125855,33.82908053757225,30.00000000481525,1.0879421538075698,17413.119749585017,19.1045956179403,1146.2757370764184,0.4142812194349298,0.000548193089125642,30.00000000481525,30.00000000481525,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42180,28.44666666666667,18.440814675002265,33.83278554880353,30.00000001220968,1.0879421538075698,17429.968618375253,19.126894927303255,1147.6136956381952,0.4144885660013863,0.000548990453750361,30.00000001220968,30.00000001220968,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42240,28.475,18.436102482316688,33.836706118441896,30.000000004750444,1.0879421538075698,17447.797827738752,19.15082078716954,1149.0492472301723,0.4147108063341296,0.0005498179837295763,30.000000004750444,30.000000004750444,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42300,28.50333333333333,18.431317772183107,33.84043530878906,30.00000000465166,1.0879421538075698,17464.756687509027,19.172999308782114,1150.3799585269267,0.4149166036298628,0.0005506194899581523,30.00000000465166,30.00000000465166,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42360,28.53166666666667,18.42646647071103,33.844174397959016,30.000000012124747,1.0879421538075698,17481.76052871424,19.1951051205337,1151.706307232022,0.4151215232955963,0.0005514228721426179,30.000000012124747,30.000000012124747,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42420,28.56,18.42154317747072,33.84808626514101,30.000000004661388,1.0879421538075698,17499.550162821484,19.2184782165376,1153.108692992256,0.4153379708024671,0.0005522504456762162,30.000000004661388,30.000000004661388,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42480,28.588333333333335,18.416546738094496,33.85203944837266,30.000000012137626,1.0879421538075698,17517.52761778261,19.242012393361573,1154.520743601695,0.4155556823088532,0.0005530840203117428,30.000000012137626,30.000000012137626,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42540,28.616666666666664,18.4114787787943,33.85599576219787,30.00000001232214,1.0879421538075698,17535.519342585194,19.26541574279234,1155.9249445675405,0.4157719575628186,0.0005539184715742927,30.00000001232214,30.00000001232214,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42600,28.645,18.40634324241748,33.85994925739698,29.99999999923658,1.0879421538075698,17553.498309755792,19.288636119536086,1157.3181671721652,0.4159863197861318,0.0005547530280878852,29.99999999923658,29.99999999923658,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42660,28.67333333333333,18.401135332545227,33.863903468451646,30.00000000457829,1.0879421538075698,17571.480448550046,19.311701202529548,1158.7020721517727,0.416199029901902,0.0005555880613800988,30.00000000457829,30.00000000457829,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42720,28.70166666666667,18.39586052066819,33.867864200468524,30.000000004580013,1.0879421538075698,17589.492266344332,19.334661173415025,1160.0796704049014,0.41641055493668394,0.0005564245424053061,30.000000004580013,30.000000004580013,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42780,28.73,18.39051245859798,33.871837688018175,30.00000001224543,1.0879421538075698,17607.562056325227,19.357550683984076,1161.4530410390446,0.4166212171434399,0.0005572631299756973,30.00000001224543,30.00000001224543,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42840,28.75833333333333,18.385091866655934,33.87583004754554,30.000000012070736,1.0879421538075698,17625.717704131675,19.380434228659507,1162.8260537195704,0.41683161170143307,0.0005581047364495706,30.000000012070736,30.000000012070736,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42900,28.78666666666667,18.379593727097895,33.879846961624395,30.00000000459535,1.0879421538075698,17643.985049373005,19.40333949915634,1164.2003699493805,0.4170419935296623,0.0005589499770258161,30.00000000459535,30.00000000459535,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-42960,28.815,18.374032789118267,33.88389326177652,30.00000000449696,1.0879421538075698,17662.385997120702,19.42633648349076,1165.5801890094456,0.4172530044172271,0.0005597999383181769,30.00000000449696,30.00000000449696,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43020,28.84333333333333,18.36839310156185,33.888239171015776,30.00000001226963,1.0879421538075698,17682.149410820195,19.45162578008042,1167.0975468048252,0.41748480249719977,0.0005606915842781419,30.00000001226963,30.00000001226963,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43080,28.871666666666666,18.36268689864643,33.89285173223856,30.00000001210072,1.0879421538075698,17703.125486715882,19.47895980632564,1168.7375883795385,0.417735053160476,0.000561620730708669,30.00000001210072,30.00000001210072,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43140,28.9,18.356906766777907,33.89751021636665,30.00000000451612,1.0879421538075698,17724.310435256815,19.506506026526452,1170.3903615915872,0.4179869435505372,0.0005625566449978306,30.00000000451612,30.00000000451612,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43200,28.871666666666666,18.369428437571386,33.89957078667084,30.00000000452577,1.0879421538075698,17733.681081025257,19.550459872772933,1173.0275923663764,0.4183882423275237,0.0005625331227047507,30.00000000452577,30.00000000452577,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43260,28.84333333333333,18.381847607506682,33.89560091840604,30.00000001220376,1.0879421538075698,17715.627680322028,19.544307594151423,1172.6584556490852,0.4183321183316553,0.0005616750808576446,30.00000001220376,30.00000001220376,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43320,28.815,18.394171076804568,33.88762564949041,30.00000001211165,1.0879421538075698,17679.35936215243,19.504728053852546,1170.2836832311527,0.4179706944320656,0.0005602636333174363,30.00000001211165,30.00000001211165,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43380,28.78666666666667,18.406398119545802,33.877847940057976,30.00000001226861,1.0879421538075698,17634.894267595104,19.44996720497755,1166.998032298653,0.4174696081208576,0.0005586037660842997,30.00000001226861,30.00000001226861,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43440,28.75833333333333,18.418521308199164,33.86503477211754,30.000000004763013,1.0879421538075698,17576.62516222795,19.369836181058425,1162.1901708635055,0.41673419815792023,0.0005565250781765606,30.000000004763013,30.000000004763013,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43500,28.73,18.43055216314511,33.849275606706,30.000000012119433,1.0879421538075698,17504.95877646893,19.265173667284714,1155.9104200370828,0.4157697216437974,0.0005540405407290384,30.000000012119433,30.000000012119433,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43560,28.701666666666664,18.442485648311468,33.83565232477958,30.00000000474007,1.0879421538075698,17443.005597620908,19.17801147275084,1150.6806883650502,0.4149630838593751,0.0005518522850570511,30.00000000474007,30.00000000474007,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43620,28.67333333333333,18.454318049401568,33.82388100155379,30.00000000472232,1.0879421538075698,17389.474349354077,19.105922018721316,1146.3553211232788,0.4142935585670452,0.0005499207787109118,30.00000000472232,30.00000000472232,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43680,28.645,18.46605537857298,33.812315187269505,30.00000001223237,1.0879421538075698,17336.87763894687,19.035320862669927,1142.1192517601955,0.4136357515993345,0.0005480186479962153,30.00000001223237,30.00000001223237,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43740,28.61666666666667,18.47769728220511,33.8016630222954,30.000000004789214,1.0879421538075698,17288.435906501985,18.9720391945876,1138.3223516752557,0.4130443586662177,0.0005462436288208715,30.000000004789214,30.000000004789214,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43800,28.58833333333333,18.489243672549367,33.79196427604949,30.000000012288197,1.0879421538075698,17244.329871401143,18.91637880331292,1134.9827281987752,0.4125227861977155,0.0005446011078366208,30.000000012288197,30.000000012288197,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43860,28.560000000000006,18.500689491411812,33.783120781842925,30.000000004764512,1.0879421538075698,17204.113247254612,18.867516359614374,1132.0509815768626,0.4120638251334855,0.0005430772570024328,30.000000004764512,30.000000004764512,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43920,28.53166666666667,18.512047019128396,33.7750158992397,30.000000004855977,1.0879421538075698,17167.25549727739,18.82451404362061,1129.4708426172365,0.4116590602652444,0.0005416562743672586,30.000000004855977,30.000000004855977,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-43980,28.50333333333333,18.523296801100386,33.76754217429457,30.000000004845752,1.0879421538075698,17133.267999194366,18.786430432305526,1127.1858259383314,0.41129992754524536,0.0005403226297039299,30.000000004845752,30.000000004845752,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44040,28.475,18.534466209434065,33.7606076263315,30.00000001232819,1.0879421538075698,17101.732427312323,18.75257676930463,1125.1546061582776,0.4109801563314746,0.0005390643567972114,30.00000001232819,30.00000001232819,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44100,28.44666666666667,18.545533965950565,33.75413497858243,30.00000000482929,1.0879421538075698,17072.297460142516,18.72227492585562,1123.336495551337,0.410693511868509,0.0005378701711037806,30.00000000482929,30.00000000482929,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44160,28.41833333333333,18.556508066677484,33.74840960430259,30.00000000492755,1.0879421538075698,17046.260757909673,18.697884866985408,1121.8730920191244,0.41046249975820903,0.0005367794823779586,30.00000000492755,30.00000000492755,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44220,28.39,18.567393025392015,33.742708419790866,30.00000000509327,1.0879421538075698,17020.334060716035,18.673470928279603,1120.4082556967758,0.4102310007610956,0.0005356927590093022,30.00000000509327,30.00000000509327,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44280,28.361666666666665,18.57817866746928,33.73729453231255,29.99999999987212,1.0879421538075698,16995.713899492548,18.651175584336624,1119.0705350601977,0.410019362313192,0.0005346459474206463,29.99999999987212,29.99999999987212,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44340,28.333333333333336,18.588871193217486,33.73199764407042,30.000000004911108,1.0879421538075698,16971.625757126283,18.629626682377427,1117.7776009426457,0.409814601621752,0.0005336157225536356,30.000000004911108,30.000000004911108,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44400,28.305,18.599475295486556,33.726995242499974,30.000000004909268,1.0879421538075698,16948.876844742652,18.610280051299867,1116.616803077992,0.4096305927420743,0.0005326265970829588,30.000000004909268,30.000000004909268,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44460,28.276666666666664,18.609980134922864,33.72245207480327,30.000000012379843,1.0879421538075698,16928.216309516407,18.59447030831434,1115.6682184988604,0.4094801009281229,0.0005317008688250497,30.000000012379843,30.000000012379843,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44520,28.248333333333335,18.620397183533736,33.71799908610712,30.000000004899196,1.0879421538075698,16907.965940143178,18.57919942750007,1114.7519656500044,0.4093346334035304,0.0005307880857566669,30.000000004899196,30.000000004899196,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44580,28.22,18.630721494516653,33.71358400336691,30.000000004897753,1.0879421538075698,16887.88791781461,18.56401739506438,1113.8410437038629,0.4091899096686079,0.0005298809132260031,30.000000004897753,30.000000004897753,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44640,28.191666666666666,18.640957709767406,33.709231820266396,30.00000001236424,1.0879421538075698,16868.095903813413,18.549143885175738,1112.9486331105445,0.40904802760293,0.0005289828435575081,30.00000001236424,30.00000001236424,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44700,28.16333333333333,18.65109564919024,33.7049734312667,30.00000000489164,1.0879421538075698,16848.730495633434,18.534816547232086,1112.0889928339254,0.4089112624719273,0.0005280979147671811,30.00000000489164,30.00000000489164,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44760,28.135,18.661145878975326,33.70082935053473,30.0000000049892,1.0879421538075698,16829.884881100334,18.521223616040608,1111.2734169624362,0.4087814231757741,0.0005272291554084607,30.0000000049892,30.0000000049892,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44820,28.10666666666667,18.6711039814667,33.69699485168833,30.000000012352682,1.0879421538075698,16812.44708755121,18.509958167289348,1110.5974900373608,0.40867375338710415,0.0005264031845188898,30.000000012352682,30.000000012352682,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44880,28.07833333333333,18.680975648814677,33.69319518798459,30.000000004985214,1.0879421538075698,16795.167777224644,18.498783032253858,1109.9269819352314,0.4085668906912525,0.0005255824803302604,30.000000004985214,30.000000004985214,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-44940,28.05,18.690754017763933,33.689475880985825,30.00000001235047,1.0879421538075698,16778.2538299068,18.48805211676404,1109.2831270058425,0.40846422322479786,0.0005247730818327672,30.00000001235047,30.00000001235047,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45000,28.02166666666667,18.70044034770975,33.68592729710105,30.000000004982446,1.0879421538075698,16762.116329716293,18.478517752375247,1108.7110651425148,0.4083729603785096,0.0005239873432620072,30.000000004982446,30.000000004982446,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45060,27.99333333333333,18.71004489070788,33.68237028334755,30.00000001245028,1.0879421538075698,16745.94042640239,18.46872040259527,1108.1232241557163,0.4082791377251952,0.0005232010291319036,30.00000001245028,30.00000001245028,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45120,27.965,18.71955820887336,33.67896266656756,30.00000001244627,1.0879421538075698,16730.443954475715,18.459945835315512,1107.5967501189305,0.4081950729555468,0.0005224354339693998,30.00000001244627,30.00000001244627,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45180,27.93666666666667,18.72897993408505,33.67593210947151,30.00000000497507,1.0879421538075698,16716.662232447918,18.454079907424546,1107.2447944454725,0.4081388550981786,0.000521721706710815,30.00000000497507,30.00000000497507,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45240,27.90833333333333,18.738308934962227,33.67314607892927,30.000000004977665,1.0879421538075698,16703.99248494897,18.450022413255443,1107.0013447953263,0.4080999598379495,0.0005210416540390894,30.000000004977665,30.000000004977665,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45300,27.880000000000006,18.747552547456802,33.67037811738168,30.0000000049778,1.0879421538075698,16691.404907988792,18.44591609741782,1106.7549658450694,0.40806058902187176,0.0005203643870177836,30.0000000049778,30.0000000049778,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45360,27.85166666666667,18.756709862540127,33.66753763988545,30.00000000497405,1.0879421538075698,16678.4875576486,18.441017479396233,1106.461048763774,0.408013611777034,0.0005196775300789619,30.00000000497405,30.00000000497405,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45420,27.82333333333333,18.76577514954988,33.664899737386754,30.000000004978123,1.0879421538075698,16666.491436967477,18.437583302621622,1106.254998157297,0.40798067192246706,0.0005190185262511752,30.000000004978123,30.000000004978123,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45480,27.795,18.774760269327015,33.66243751373404,30.000000004977018,1.0879421538075698,16655.294233114244,18.435426803124614,1106.125608187477,0.40795998454315063,0.0005183839981690859,30.000000004977018,30.000000004977018,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45540,27.76666666666667,18.783654965264013,33.65992665673667,30.00000000497879,1.0879421538075698,16643.87586433722,18.432660640632157,1105.9596384379292,0.4079334455721639,0.0005177429640313117,30.00000000497879,30.00000000497879,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45600,27.73833333333333,18.792463580554568,33.65733479962668,30.000000004975185,1.0879421538075698,16632.089139617958,18.429034655898406,1105.742079353904,0.4078986521089716,0.0005170911975023847,30.000000004975185,30.000000004975185,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45660,27.71,18.801181195205906,33.6552810352966,30.00000000497821,1.0879421538075698,16622.749444627552,18.429661916101782,1105.7797149661067,0.40790467146536263,0.0005165129601889263,30.00000000497821,30.00000000497821,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45720,27.681666666666665,18.80981332801231,33.65275775868491,30.000000004978503,1.0879421538075698,16611.274596441446,18.426199591547586,1105.571975492855,0.40787144385816937,0.0005158709368638286,30.000000004978503,30.000000004978503,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45780,27.65333333333333,18.81836652261337,33.6503066669268,30.000000005080658,1.0879421538075698,16600.12801550252,18.42316353920178,1105.389812352107,0.40784230269006105,0.0005152392387523875,30.000000005080658,30.000000005080658,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45840,27.625,18.82683340967226,33.647613481536304,30.00000000497746,1.0879421538075698,16587.880490929852,18.417913375377754,1105.0748025226653,0.4077918998207814,0.0005145747817204701,30.00000000497746,30.00000000497746,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45900,27.59666666666667,18.83520458852492,33.64531649886068,30.00000000497688,1.0879421538075698,16577.434736644733,18.41573823739954,1104.9442942439725,0.4077710143082732,0.0005139643266471435,30.00000000497688,30.00000000497688,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-45960,27.56833333333333,18.843496382957767,33.64304888480459,30.00000000497971,1.0879421538075698,16567.12253902547,18.413630060403907,1104.8178036242343,0.4077507697082392,0.0005133582857512188,30.00000000497971,30.00000000497971,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46020,27.54,18.851703611633006,33.64098152184495,30.00000000497785,1.0879421538075698,16557.721002953906,18.41299628208668,1104.7797769252008,0.4077446832092663,0.0005127797267947067,30.00000000497785,30.00000000497785,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46080,27.511666666666667,18.859826084403647,33.63876698012823,30.0000000049783,1.0879421538075698,16547.650157020627,18.41094780931195,1104.6568685587167,0.40772500942929,0.0005121814197610741,30.0000000049783,30.0000000049783,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46140,27.483333333333334,18.86786395198498,33.63687932968535,30.000000004981388,1.0879421538075698,16539.065881244805,18.411431494610255,1104.6858896766153,0.4077296549725464,0.0005116278070338157,30.000000004981388,30.000000004981388,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46200,27.455,18.875817070969678,33.63485153868182,30.000000004983338,1.0879421538075698,16529.844302512367,18.410549638945998,1104.63297833676,0.4077211851326032,0.0005110553110104115,30.000000004983338,30.000000004983338,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46260,27.42666666666667,18.88369110449521,33.633178976456826,30.000000004984198,1.0879421538075698,16522.23816153982,18.41246018351872,1104.7476110111231,0.4077395346372752,0.0005105314862527776,30.000000004984198,30.000000004984198,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46320,27.39833333333333,18.89147528765929,33.63133828832449,30.00000000498487,1.0879421538075698,16513.867451494025,18.412766267859496,1104.7659760715696,0.4077424742194634,0.0005099848489358191,30.00000000498487,30.00000000498487,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46380,27.37,18.8991760151599,33.62986921907621,30.00000001248005,1.0879421538075698,16507.186680735533,18.415983422851077,1104.9590053710651,0.407773368667668,0.0005094888535517072,30.00000001248005,30.00000001248005,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46440,27.341666666666665,18.90679772054504,33.62820132568477,30.00000000498952,1.0879421538075698,16499.601805809878,18.41736860407849,1105.0421162447094,0.4077866691682364,0.0005089662110360229,30.00000000498952,30.00000000498952,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46500,27.31333333333333,18.914329570382787,33.626921543747784,30.000000004988138,1.0879421538075698,16493.7818717794,18.421799361308356,1105.3079616785012,0.4078292074433712,0.0005084962328882651,30.000000004988138,30.000000004988138,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46560,27.285,18.921782973289954,33.626051299918124,30.000000007329305,1.0879421538075698,16489.824341856838,18.429480050921704,1105.7688030553024,0.40790292625682334,0.0005080820087313107,30.000000007329305,30.000000007329305,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46620,27.25666666666667,18.929158478609207,33.62487732205019,30.000000012395216,1.0879421538075698,16484.48553917664,18.434453187746765,1106.067191264806,0.4079506439273845,0.0005076268963947577,30.000000012395216,30.000000012395216,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46680,27.228333333333335,18.936449152036477,33.62365473140666,30.000000004996124,1.0879421538075698,16478.925721811338,18.43883561020745,1106.3301366124467,0.40799268439253944,0.0005071653065942038,30.000000004996124,30.000000004996124,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46740,27.2,18.943656802791008,33.622513304095484,30.000000012405323,1.0879421538075698,16473.7349353282,18.443704580819226,1106.6222748491537,0.4080393821436815,0.0005067147929728266,30.000000012405323,30.000000012405323,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46800,27.19166666666667,18.933973611336054,33.62633515940172,30.000000005003432,1.0879421538075698,16491.115231311465,18.452233546008284,1107.134012760497,0.4081211567417433,0.0005071856148913765,30.000000005003432,30.000000005003432,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46860,27.18333333333333,18.924287203965736,33.64584112379132,30.00000001237175,1.0879421538075698,16579.820486407574,18.592386574915054,1115.5431944949037,0.4094602577665916,0.0005097789119629446,30.00000001237175,30.00000001237175,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46920,27.175,18.914602584046843,33.670979383991416,30.000000004783157,1.0879421538075698,16694.139227827854,18.780387092088386,1126.8232255253026,0.4112428804825118,0.0005131332800309027,30.000000004783157,30.000000004783157,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-46980,27.16666666666667,18.904925098047148,33.69182314567687,30.00000000471697,1.0879421538075698,16788.928281311622,18.93263290398697,1135.957974239218,0.41267523353733654,0.0005159056572113097,30.00000000471697,30.00000000471697,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47040,27.15833333333333,18.895237076594622,33.71097651416651,30.000000004650033,1.0879421538075698,16876.03010573926,19.07085455074732,1144.2512730448395,0.4139670883291374,0.0005184482538058043,30.000000004650033,30.000000004650033,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47100,27.15,18.885565215099824,33.72891948562364,30.000000004580283,1.0879421538075698,16957.627530809907,19.199069189665142,1151.9441513799084,0.4151582486138889,0.0005208267797294627,30.000000004580283,30.000000004580283,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47160,27.141666666666666,18.875888230712935,33.74543148472979,30.00000001217121,1.0879421538075698,17032.717433751077,19.31526529887609,1158.9159179325652,0.4162318792158356,0.0005230110558431327,30.00000001217121,30.00000001217121,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47220,27.13333333333333,18.86621390006886,33.76079992825655,30.000000012113013,1.0879421538075698,17102.606940179674,19.421845026731653,1165.3107016038991,0.41721180942469543,0.00052504024427176,30.000000012113013,30.000000012113013,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47280,27.125,18.85653029069434,33.7749330859737,30.00000001223935,1.0879421538075698,17166.87886224116,19.517930985000017,1171.0758591000013,0.4180913275705389,0.0005269017559558556,30.00000001223935,30.00000001223935,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47340,27.11666666666667,18.846860137889916,33.78771497435327,30.000000011983172,1.0879421538075698,17225.005756030932,19.60253526289464,1176.1521157736784,0.4188626967101916,0.0005285806445219666,30.000000011983172,30.000000011983172,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47400,27.10833333333333,18.83718552507328,33.799132200631966,29.999999998393868,1.0879421538075698,17276.926775536936,19.675453089362048,1180.5271853617228,0.4195252439398317,0.0005300747286799943,29.999999998393868,29.999999998393868,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47460,27.1,18.827513351354245,33.80925716838099,30.000000007569426,1.0879421538075698,17322.971018950197,19.737285667389482,1184.237140043369,0.4200854330319057,0.0005313940843885282,30.000000007569426,30.000000007569426,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47520,27.091666666666665,18.817843080644575,33.81818634590034,30.00000001196693,1.0879421538075698,17363.577310592642,19.78884887000901,1187.3309322005405,0.42055144409552736,0.0005325518034736876,30.00000001196693,30.00000001196693,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47580,27.08333333333333,18.80816838305948,33.826030915239976,30.00000001207493,1.0879421538075698,17399.251259533048,19.831055327287842,1189.8633196372698,0.4209321247905385,0.0005335627886987338,30.00000001207493,30.00000001207493,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47640,27.075,18.79850401568599,33.83290812853385,30.000000011898784,1.0879421538075698,17430.52606315041,19.864955307615443,1191.8973184569265,0.42123738743367417,0.0005344433437735322,30.000000011898784,30.000000011898784,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47700,27.06666666666667,18.78884015362667,33.83892405025643,30.000000012002058,1.0879421538075698,17457.884057495226,19.891430251350886,1193.4858150810533,0.4214754817595159,0.000535207533466897,30.000000012002058,30.000000012002058,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47760,27.05833333333333,18.779167860089974,33.84417273246733,30.0000000041504,1.0879421538075698,17481.752990991376,19.91127814531036,1194.6766887186216,0.42165380146638054,0.0005358678873398287,30.0000000041504,30.0000000041504,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47820,27.05,18.76950256690722,33.84883370654917,30.00000001202423,1.0879421538075698,17502.949192542757,19.92606883212633,1195.5641299275799,0.4217865876269057,0.0005364490183311775,30.00000001202423,30.00000001202423,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47880,27.041666666666664,18.75983896146595,33.85317288250903,30.00000001203323,1.0879421538075698,17522.68202129906,19.938094370892692,1196.2856622535612,0.4218944875633935,0.00053698671787005,30.00000001203323,30.00000001203323,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-47940,27.033333333333335,18.75017818421554,33.85709131742661,30.0000000120428,1.0879421538075698,17540.501488844948,19.946503377621863,1196.7902026573117,0.4219699051513589,0.0005374676681445892,30.0000000120428,30.0000000120428,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48000,27.025,18.74051915294399,33.86044949658986,30.000000012048393,1.0879421538075698,17555.7731383474,19.950112511255494,1197.0067506753294,0.4220022660052802,0.0005378730385166818,30.000000012048393,30.000000012048393,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48060,27.01666666666667,18.730856489435713,33.86328450236626,30.000000004255796,1.0879421538075698,17568.665640959032,19.949236327683412,1196.9541796610044,0.4219944102689728,0.0005382077286022549,30.000000004255796,30.000000004255796,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48120,27.00833333333333,18.72119638114456,33.86564360630984,30.00000001205494,1.0879421538075698,17579.393862345936,19.944293913436578,1196.6576348061951,0.4219500918121769,0.0005384782653358309,30.00000001205494,30.00000001205494,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48180,27.0,18.71153754060384,33.86757246697973,29.99999999800457,1.0879421538075698,17588.16560955744,19.935700998103822,1196.1420598862292,0.4218730172679321,0.0005386907970146791,29.99999999800457,29.99999999800457,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48240,26.991666666666664,18.701876809515667,33.86911080591268,30.000000011861033,1.0879421538075698,17595.16129391081,19.92378706383564,1195.4272238301385,0.4217661080788269,0.0005388506164170832,30.000000011861033,30.000000011861033,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48300,26.983333333333334,18.692222747659585,33.870291345184256,30.00000001205207,1.0879421538075698,17600.529911311947,19.908869468938644,1194.532168136319,0.4216321692028279,0.0005389623650118975,30.00000001205207,30.00000001205207,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48360,26.975,18.68256463784437,33.87045719736074,30.000000011961678,1.0879421538075698,17601.284140782718,19.88534067422154,1193.1204404532925,0.4214207408280008,0.0005389372011696681,30.000000011961678,30.000000011961678,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48420,26.966666666666665,18.672914970156985,33.87122938051719,30.000000011850723,1.0879421538075698,17604.795720021888,19.867039480676603,1192.022368840596,0.4212561405693239,0.0005389940047373994,30.000000011850723,30.000000011850723,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48480,26.95833333333333,18.66326149198947,33.8719999426905,30.00000001204159,1.0879421538075698,17608.299926308482,19.848760273270265,1190.925616396216,0.4210916095537876,0.0005390504898485002,30.00000001204159,30.00000001204159,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48540,26.95,18.653610106057005,33.873035318797285,30.0000000119524,1.0879421538075698,17613.008401236686,19.83277748109516,1189.9666488657094,0.4209476431230908,0.0005391426856946526,30.0000000119524,30.0000000119524,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48600,26.94166666666667,18.643961223312797,33.87342163053949,30.00000001194789,1.0879421538075698,17614.76519184177,19.81133737910682,1188.6802427464092,0.4207543646986815,0.000539147500237834,30.00000001194789,30.00000001194789,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48660,26.93333333333333,18.63430919886355,33.87380756006341,29.99999999043336,1.0879421538075698,17616.520342090636,19.789942150658497,1187.39652903951,0.4205613136258228,0.0005391521841804521,29.99999999043336,29.99999999043336,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48720,26.925,18.62465862759845,33.8737447107823,30.000000011940607,1.0879421538075698,17616.234431006465,19.7648059606747,1185.8883576404821,0.4203342808553221,0.000539096415661488,30.000000011940607,30.000000011940607,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48780,26.916666666666664,18.61501594840245,33.87287296703551,30.000000004243564,1.0879421538075698,17612.27012571324,19.732936060913886,1183.976163654833,0.4200460754249682,0.0005389318656782743,30.000000004243564,30.000000004243564,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48840,26.90833333333333,18.60537011439536,33.87279492660249,30.00000001222309,1.0879421538075698,17611.915192892586,19.707816691254386,1182.4690014752632,0.4198186372713538,0.0005388742047698069,30.00000001222309,30.00000001222309,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48900,26.9,18.59572589307572,33.87232569866658,30.00000000442206,1.0879421538075698,17609.781368250442,19.679478085053187,1180.7686851031913,0.4195617550214643,0.0005387638672191734,30.00000000442206,30.00000000442206,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-48960,26.89166666666667,18.586077631874254,33.87088608386416,30.000000004223967,1.0879421538075698,17603.2345794629,19.643055585922227,1178.5833351553335,0.4192311316843152,0.0005385227240208826,30.000000004223967,30.000000004223967,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49020,26.88333333333333,18.576438001851308,33.86942875091391,30.000000004515144,1.0879421538075698,17596.60721343316,19.60660329019749,1176.3961974118495,0.4188997149173095,0.0005382794489962011,30.000000004515144,30.000000004515144,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49080,26.875,18.56680077958607,33.867909237215,30.000000004506656,1.0879421538075698,17589.69707570526,19.569731325475363,1174.183879528522,0.418563948253861,0.0005380278564429816,30.000000004506656,30.000000004506656,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49140,26.86666666666667,18.557154887757253,33.86643119858618,30.00000001208909,1.0879421538075698,17582.975515411166,19.533283098062515,1171.9969858837508,0.41823150997574454,0.0005377816857353508,30.00000001208909,30.00000001208909,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49200,26.858333333333334,18.54751575967235,33.864869800694976,30.00000000760444,1.0879421538075698,17575.87492556148,19.496250194343336,1169.7750116606,0.4178931968149725,0.0005375244305996472,30.00000000760444,30.00000000760444,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49260,26.85,18.537878879457928,33.8630781098044,30.000000012064444,1.0879421538075698,17567.727015005024,19.457410850375535,1167.444651022532,0.4175377914638192,0.0005372362668867696,30.000000012064444,30.000000012064444,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49320,26.841666666666665,18.528244213176464,33.86119144547325,30.000000012240662,1.0879421538075698,17559.147222881766,19.417893197081977,1165.0735918249188,0.41717555708514337,0.0005369354107873541,30.000000012240662,30.000000012240662,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49380,26.83333333333333,18.518606115188387,33.85924300341817,30.00000001233536,1.0879421538075698,17550.28649086298,19.377962290316386,1162.6777374189833,0.4168088945810085,0.0005366261308152767,30.00000001233536,30.00000001233536,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49440,26.825,18.508975573605014,33.85723246188401,30.000000012135004,1.0879421538075698,17541.143356706474,19.33764526755637,1160.258716053382,0.4164380309474674,0.000536308788431575,30.000000012135004,30.000000012135004,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49500,26.81666666666667,18.499341710969368,33.855150366199176,30.000000007584894,1.0879421538075698,17531.674842803932,19.296839170249093,1157.8103502149456,0.4160619946361066,0.0005359817896721093,30.000000007584894,30.000000007584894,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49560,26.80833333333333,18.489705309641558,33.85298638882445,30.000000012214198,1.0879421538075698,17521.833922131205,19.255468783940895,1155.3281270364535,0.4156800631309756,0.0005356437493482884,30.000000012214198,30.000000012214198,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49620,26.8,18.4800700976426,33.850731805653574,30.00000001220252,1.0879421538075698,17511.580983808104,19.213466398441188,1152.8079839064712,0.4152915776579173,0.0005352935326354012,30.00000001220252,30.00000001220252,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49680,26.79166666666667,18.470442859485015,33.8480966403655,30.000000004736986,1.0879421538075698,17499.59734482996,19.168480688855666,1150.10884133134,0.4148746913459409,0.0005348923310808749,30.000000004736986,30.000000004736986,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49740,26.78333333333333,18.460818384027935,33.844665967644055,30.00000001227645,1.0879421538075698,17483.995989440657,19.117102652072326,1147.0261591243395,0.4143975396460561,0.000534384077216491,30.00000001227645,30.00000001227645,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49800,26.775,18.45118951849829,33.841241795485466,30.000000012259218,1.0879421538075698,17468.42423036416,19.06592431315614,1143.955458789368,0.41392114762059495,0.000533876623079504,30.000000012259218,30.000000012259218,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49860,26.76666666666667,18.441563544340717,33.83814865112748,30.000000012241692,1.0879421538075698,17454.357852720135,19.017608380479967,1141.056502828798,0.41347039170300603,0.0005334138529052929,30.000000012241692,30.000000012241692,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49920,26.75833333333333,18.431939536407977,33.834553343844334,30.000000012515887,1.0879421538075698,17438.007838533482,18.965352107466558,1137.9211264479934,0.4129817661114284,0.0005328835517250098,30.000000012515887,30.000000012515887,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-49980,26.75,18.422317239441067,33.83101890057727,30.000000004707154,1.0879421538075698,17421.934646194804,18.913756740906656,1134.8254044543996,0.4124981832970494,0.0005323615247205642,30.000000004707154,30.000000004707154,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50040,26.74166666666667,18.41268698262196,33.82735372971337,30.000000004692946,1.0879421538075698,17405.266921825358,18.861235658617748,1131.674139517065,0.4120047568068205,0.000531821741153454,30.000000004692946,30.000000004692946,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50100,26.73333333333333,18.40306407280476,33.82380253927387,30.00000001238348,1.0879421538075698,17389.117499591022,18.809811071117227,1128.5886642670334,0.41152048386835693,0.0005312975022104507,30.00000001238348,30.00000001238348,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50160,26.725,18.3934489579853,33.82004591620952,30.000000012544643,1.0879421538075698,17372.033886561683,18.756906194969968,1125.4143716981985,0.41102107849728736,0.0005307458410107546,30.000000012544643,30.000000012544643,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50220,26.716666666666665,18.38382966804769,33.815961301412464,30.00000001245234,1.0879421538075698,17353.45870007075,18.701512623811773,1122.0907574287069,0.4104968767678871,0.0005301499434694142,30.00000001245234,30.00000001245234,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50280,26.70833333333333,18.37420759446297,33.81236488197252,30.000000004856393,1.0879421538075698,17337.103664032027,18.650211898382587,1119.012713902955,0.4100102096018815,0.0005296197555113234,30.000000004856393,30.000000004856393,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50340,26.7,18.364593334048003,33.808497851462825,30.00000000484341,1.0879421538075698,17319.51796309452,18.596910371004977,1115.8146222602988,0.409503334929552,0.0005290533402896649,30.00000000484341,30.00000000484341,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50400,26.7,18.36162654289367,33.803881873294436,30.00000000493981,1.0879421538075698,17298.52634863287,18.55331480686179,1113.1988884117072,0.4090878249799271,0.0005284424739227546,30.00000000493981,30.00000000493981,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50460,26.7,18.35865372768808,33.7969686792695,30.00000001247437,1.0879421538075698,17267.087885644498,18.491409256146984,1109.484555368819,0.4084963480255444,0.0005275220513317262,30.00000001247437,30.00000001247437,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50520,26.7,18.355686326704866,33.789935516228255,30.000000004902926,1.0879421538075698,17235.103920469253,18.42870114984598,1105.7220689907588,0.4078954516235055,0.0005265855376298938,30.000000004902926,30.000000004902926,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50580,26.7,18.35271239025743,33.7860073881153,30.000000012537637,1.0879421538075698,17217.240337402367,18.390831118109652,1103.4498670865794,0.40753170534249294,0.0005260669218660084,30.000000012537637,30.000000012537637,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50640,26.7,18.349737079122573,33.78333721211439,30.00000000488761,1.0879421538075698,17205.0974846084,18.363032621932362,1101.7819573159418,0.4072642835560271,0.0005257177123616848,30.00000000488761,30.00000000488761,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50700,26.700000000000006,18.346775453448046,33.7807900907106,30.00000000498707,1.0879421538075698,17193.514199437635,18.336276228150567,1100.176573689034,0.4070065546887431,0.0005253854039985558,30.00000000498707,30.00000000498707,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50760,26.7,18.343800353355533,33.778388204393075,30.000000004980322,1.0879421538075698,17182.591385567084,18.31067477188813,1098.6404863132877,0.40675964471925213,0.0005250722893048154,30.000000004980322,30.000000004980322,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50820,26.7,18.340831187552862,33.775943990051466,30.00000000497199,1.0879421538075698,17171.47608085755,18.284784747049933,1097.0870848229963,0.4065096464687337,0.0005247536133213827,30.00000000497199,30.00000000497199,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50880,26.7,18.33786166761781,33.77353831898869,30.000000005071463,1.0879421538075698,17160.536055003307,18.25922708331836,1095.5536249991017,0.4062625555873396,0.0005244401066773846,30.000000005071463,30.000000005071463,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-50940,26.7,18.3348855971884,33.77116939058789,30.000000005067104,1.0879421538075698,17149.763120484822,18.233976007946136,1094.0385604767685,0.406018133261784,0.0005241313486187494,30.000000005067104,30.000000005067104,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51000,26.7,18.331914970011933,33.76881850045557,29.999999995218854,1.0879421538075698,17139.07226152967,18.208908596498414,1092.5345157899048,0.40577519731452016,0.000523825182656387,29.999999995218854,29.999999995218854,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51060,26.7,18.328938363862328,33.766251302343676,30.000000005051888,1.0879421538075698,17127.39763129282,18.182154608994995,1090.9292765396995,0.4055155949315011,0.0005234896671050914,30.000000005051888,30.000000005051888,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51120,26.7,18.32596739763347,33.76345080275654,30.00000000504475,1.0879421538075698,17114.662084435575,18.153598408796185,1089.215904527771,0.40523813789014584,0.0005231228657679367,30.00000000504475,30.00000000504475,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51180,26.7,18.322989462896928,33.76057460129046,30.000000005036092,1.0879421538075698,17101.582275856552,18.12446712537564,1087.4680275225383,0.4049547012026672,0.0005227456447899826,30.000000005036092,30.000000005036092,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51240,26.7,18.320018088352143,33.75767998786368,30.000000012626693,1.0879421538075698,17088.418702519823,18.09524287246762,1085.7145723480573,0.40466996072717704,0.0005223661171293675,30.000000012626693,30.000000012626693,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51300,26.700000000000006,18.31704595928683,33.75438714241105,30.000000005125727,1.0879421538075698,17073.444198568333,18.062922831916424,1083.7753699149857,0.4043545897403685,0.0005219328524503591,30.000000005125727,30.000000005125727,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51360,26.7,18.31407339664052,33.75146924144248,30.000000005116988,1.0879421538075698,17060.174757407098,18.03359516861328,1082.0157101167968,0.4040679912915253,0.0005215500988247832,30.000000005116988,30.000000005116988,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51420,26.7,18.311100256432482,33.74848278964635,30.00000001269359,1.0879421538075698,17046.593540130598,18.003762476574487,1080.225748594469,0.4037760398333391,0.0005211580697238201,30.00000001269359,30.00000001269359,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51480,26.700000000000006,18.30812108504349,33.745710221527034,30.000000005209174,1.0879421538075698,17033.985048369832,17.975642502162266,1078.538550129736,0.4035004624672352,0.0005207946893552133,30.000000005209174,30.000000005209174,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51540,26.7,18.305147358122564,33.74277197437275,30.000000005200327,1.0879421538075698,17020.62308093153,17.94626657533936,1076.7759945203616,0.4032121741102569,0.0005204091049689413,30.000000005200327,30.000000005200327,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51600,26.7,18.302173589192215,33.739793281761656,30.00000000738988,1.0879421538075698,17007.07717380911,17.916607526366953,1074.9964515820172,0.4029206884366776,0.0005200180027025545,30.00000000738988,30.00000000738988,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51660,26.7,18.299193304919054,33.73713968965056,30.000000005184393,1.0879421538075698,16995.009713123072,17.88952749239179,1073.3716495435071,0.4026541802008925,0.0005196705839732907,30.000000005184393,30.000000005184393,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51720,26.700000000000006,18.296218412318076,33.734064752500444,30.00000000737927,1.0879421538075698,16981.026124483684,17.859192336808327,1071.5515402084998,0.40235521711332733,0.0005192664696633278,30.00000000737927,30.00000000737927,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51780,26.7,18.293243232356037,33.731058872538554,30.00000000527589,1.0879421538075698,16967.356599736144,17.82944561006419,1069.7667366038515,0.4020616211211375,0.0005188716227169721,30.00000000527589,30.00000000527589,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51840,26.7,18.290267862176375,33.72836930509459,30.00000000509715,1.0879421538075698,16955.1255284742,17.802197277207735,1068.131836632464,0.4017923071359579,0.0005185194008971658,30.00000000509715,30.00000000509715,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51900,26.7,18.287285851527532,33.72521739728853,30.000000007365323,1.0879421538075698,16940.791907884883,17.771369375586534,1066.2821625351924,0.4014871778759005,0.0005181046666828419,30.000000007365323,30.000000007365323,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-51960,26.700000000000006,18.284309670360237,33.722121365868894,30.000000005250673,1.0879421538075698,16926.712410581327,17.74103452900899,1064.4620717405394,0.40118647538196534,0.0005176975713273337,30.000000005250673,30.000000005250673,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52020,26.7,18.281332829099373,33.71934492161076,30.00000000524189,1.0879421538075698,16914.08625770246,17.71322382516763,1062.7934295100579,0.4009103975216476,0.0005173335292708344,30.00000000524189,30.00000000524189,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52080,26.7,18.27834996634849,33.71607557494118,30.00000000533945,1.0879421538075698,16899.218582219535,17.681609638803565,1060.8965783282138,0.4005960998556585,0.0005169028678739362,30.00000000533945,30.00000000533945,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52140,26.7,18.275372887806,33.71286271252781,30.000000007344397,1.0879421538075698,16884.607765764573,17.6504836597469,1059.029019584814,0.40028617322072296,0.000516479907231625,30.000000007344397,30.000000007344397,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52200,26.7,18.272394933586416,33.70960130597364,30.00000000532198,1.0879421538075698,16869.776208376996,17.619033594330112,1057.142015659807,0.3999725313893982,0.0005160503789493667,30.00000000532198,30.00000000532198,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52260,26.7,18.269417073302623,33.70651495393796,30.00000000531435,1.0879421538075698,16855.740719440706,17.588975304223386,1055.338518253403,0.3996723088898903,0.0005156444332209168,30.00000000531435,30.00000000531435,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52320,26.7,18.266438444356613,33.70340213762192,29.99999999353032,1.0879421538075698,16841.584935144914,17.55875271379472,1053.5251628276835,0.3993699899274714,0.0005152348559714128,29.99999999353032,29.99999999353032,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52380,26.7,18.26345405651658,33.70045785030044,30.0000000052978,1.0879421538075698,16828.195445899084,17.52986144891541,1051.7916869349244,0.3990805597891709,0.0005148478530550338,30.0000000052978,30.0000000052978,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52440,26.7,18.260474885961234,33.69745035172625,30.00000000528888,1.0879421538075698,16814.51855082842,17.50053367647779,1050.0320205886674,0.3987863267487725,0.0005144524266153962,30.00000000528888,30.00000000528888,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52500,26.7,18.25749541566139,33.69458601833505,30.000000005388628,1.0879421538075698,16801.492712992367,17.47234729194911,1048.3408375169465,0.39850313501641177,0.000514076295847638,30.000000005388628,30.000000005388628,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52560,26.7,18.254515625795086,33.69163341294307,30.00000000521411,1.0879421538075698,16788.06545081157,17.443521016526898,1046.611260991614,0.3982130973213749,0.0005136882206067093,30.00000000521411,30.00000000521411,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52620,26.700000000000006,18.251535477964907,33.6888107365005,30.000000005370797,1.0879421538075698,16775.229051781385,17.415727975608167,1044.94367853649,0.3979330549726219,0.0005133176581343851,30.000000005370797,30.000000005370797,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52680,26.7,18.248548585588203,33.685886235297104,30.000000005200683,1.0879421538075698,16761.92959613798,17.387174383938856,1043.2304630363317,0.3976449382497173,0.0005129331448860532,30.000000005200683,30.000000005200683,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52740,26.7,18.24556795208524,33.68308553306385,30.00000000519368,1.0879421538075698,16749.193127726987,17.359622367286775,1041.5773420372066,0.3973665314426853,0.0005125654692591708,30.00000000519368,30.00000000519368,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52800,26.700000000000006,18.24258624765357,33.6801745421428,30.000000005451547,1.0879421538075698,16735.955109473034,17.33126687380495,1039.876012428297,0.3970795977497116,0.0005121828874369932,30.000000005451547,30.000000005451547,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52860,26.7,18.23960442555375,33.6773862693034,30.00000000544643,1.0879421538075698,16723.27516494262,17.30388174450835,1038.2329046705008,0.39680208913208903,0.0005118168209020283,30.00000000544643,30.00000000544643,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52920,26.7,18.236622824384586,33.67448509057896,30.00000000543894,1.0879421538075698,16710.08176982305,17.27567034314576,1036.5402205887456,0.3965158009583498,0.00051143550553554,30.00000000543894,30.00000000543894,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-52980,26.7,18.233640520059787,33.67170231903989,30.00000000542772,1.0879421538075698,16697.426843023903,17.248398851608474,1034.9039310965084,0.3962386574242236,0.0005110701185295462,30.00000000542772,30.00000000542772,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53040,26.7,18.2306516641,33.66879335930193,30.000000005526857,1.0879421538075698,16684.198062496365,17.220190200147403,1033.2114120088443,0.3959515816164153,0.0005106875367744671,30.000000005526857,30.000000005526857,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53100,26.700000000000006,18.227668433210933,33.665997132348515,30.0000000055194,1.0879421538075698,16671.48194586202,17.192887621295956,1031.5732572777576,0.3956733297981645,0.0005103202848743974,30.0000000055194,30.0000000055194,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53160,26.7,18.22468467539979,33.66306721984664,30.000000005405997,1.0879421538075698,16658.157881549483,17.16460141519953,1029.8760849119722,0.3953846400744028,0.0005099349391007044,30.000000005405997,30.000000005405997,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53220,26.7,18.2217009005117,33.660253706159956,30.000000005505058,1.0879421538075698,16645.363151313526,17.137241251169815,1028.2344750701889,0.39510499989166936,0.0005095653071434819,30.000000005505058,30.000000005505058,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53280,26.7,18.218716490806305,33.657317297073455,30.00000000549603,1.0879421538075698,16632.009542669795,17.10898424499645,1026.5390546997867,0.3948157772313786,0.0005091790318641655,30.00000000549603,30.00000000549603,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53340,26.7,18.21573209182359,33.65450547225677,30.00000000548767,1.0879421538075698,16619.222493224537,17.081705581772038,1024.9023349063223,0.3945361657728063,0.0005088095494552947,30.00000000548767,30.00000000548767,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53400,26.700000000000006,18.21274719465712,33.651566982090266,30.000000005478586,1.0879421538075698,16605.85942066539,17.053506763110864,1023.2104057866518,0.3942467053336089,0.00050842294490773,30.000000005478586,30.000000005478586,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53460,26.7,18.209761604874128,33.648752470346324,30.00000000547336,1.0879421538075698,16593.060152140286,17.026280983775827,1021.5768590265496,0.3939668292489345,0.000508053029074407,30.00000000547336,30.00000000547336,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53520,26.7,18.206770080577947,33.64580902604294,30.000000005464234,1.0879421538075698,16579.674550157357,16.99810650497699,1019.8863902986197,0.3936767814153354,0.0005076655481360653,30.000000005464234,30.000000005464234,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53580,26.7,18.203784205607494,33.64299069044636,30.000000129872433,1.0879421538075698,16566.85732650464,16.970929441100832,1018.2557664660497,0.3933965961226421,0.0005072950676546006,30.000000129872433,30.000000129872433,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53640,26.7,18.200797628801734,33.64004198270313,30.000000005552913,1.0879421538075698,16553.4483538258,16.94279662360931,1016.5677974165587,0.3931061363446311,0.0005069069510586032,30.000000005552913,30.000000005552913,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53700,26.7,18.197810620946267,33.63721958157058,30.000000122922803,1.0879421538075698,16540.612673756434,16.915660209554463,1014.9396125732678,0.39282555674067254,0.0005065358407491692,30.000000122922803,30.000000122922803,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53760,26.7,18.1948236591717,33.63426555907401,30.00000000553625,1.0879421538075698,16527.179500186514,16.887564836886046,1013.2538902131627,0.3925346389581951,0.0005061469570354526,30.00000000553625,30.00000000553625,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53820,26.7,18.19183610368864,33.63143911851705,30.0000001233813,1.0879421538075698,16514.325448277115,16.86046975001908,1011.6281850011447,0.3922536697395923,0.0005057752501810076,30.0000001233813,30.0000001233813,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53880,26.7,18.188848349817537,33.62848018031945,30.000000134489106,1.0879421538075698,16500.869335733318,16.832413220823856,1009.9447932494313,0.3919623057885512,0.0005053856185433879,30.000000134489106,30.000000134489106,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-53940,26.7,18.185859658876318,33.62565013727012,30.000000005461636,1.0879421538075698,16488.000023813136,16.80536080954814,1008.3216485728882,0.3916809587059975,0.0005050133767771138,30.000000005461636,30.000000005461636,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54000,26.681666666666665,18.19516516166598,33.62108772289204,30.00000000561289,1.0879421538075698,16467.251995698545,16.787765720594802,1007.265943235688,0.39149775132079145,0.0005041972932504013,30.00000000561289,30.00000000561289,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54060,26.66333333333333,18.204429393661037,33.61120394019771,30.00000000559557,1.0879421538075698,16422.30452335859,16.730181093747735,1003.810865624864,0.3908969540799349,0.0005026631622298351,30.00000000559557,30.00000000559557,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54120,26.645,18.21365019805307,33.59931870248448,30.000000005680462,1.0879421538075698,16368.255237306608,16.657577789572787,999.4546673743672,0.3901368205621317,0.0005008595587473109,30.000000005680462,30.000000005680462,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54180,26.626666666666665,18.222822694478854,33.589163615927006,30.00000000566268,1.0879421538075698,16322.07398400831,16.597886009023586,995.8731605414149,0.3895096404478677,0.0004992901466369659,30.00000000566268,30.00000000566268,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54240,26.60833333333333,18.231944648553647,33.581476190602075,30.000000110711966,1.0879421538075698,16287.114184693664,16.556561914787768,993.3937148872659,0.38907426321000604,0.0004980542566569744,30.000000110711966,30.000000110711966,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54300,26.590000000000003,18.241032267324194,33.574586839016554,30.00000000559083,1.0879421538075698,16255.7846598527,16.52113220854748,991.2679325128488,0.38870020997860655,0.0004969268524889839,30.00000000559083,30.00000000559083,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54360,26.57166666666667,18.250062820984088,33.56757959384346,30.000000005579356,1.0879421538075698,16223.918524348357,16.484716622615977,989.0829973569588,0.3883149964829339,0.0004957837104923276,30.000000005579356,30.000000005579356,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54420,26.553333333333335,18.2590527961008,33.56093922646685,30.000000005721464,1.0879421538075698,16193.72080095354,16.450960691409957,987.0576414845973,0.3879572336461566,0.0004946906510050618,30.000000005721464,30.000000005721464,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54480,26.535,18.267993571348427,33.55475872944064,30.000000005711907,1.0879421538075698,16165.614383827544,16.420539572464097,985.2323743478461,0.3876342486405811,0.0004936599529110697,30.000000005711907,30.000000005711907,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54540,26.51666666666667,18.276892067898604,33.54901718665914,30.000000104577445,1.0879421538075698,16139.503704591652,16.39330589252601,983.5983535515603,0.38734464779878663,0.0004926889237090818,30.000000104577445,30.000000104577445,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54600,26.498333333333335,18.28574035284148,33.54367048858695,30.000000005545907,1.0879421538075698,16115.189520402657,16.368910695346393,982.1346417207837,0.3870848629658284,0.0004917713944683522,30.000000005545907,30.000000005545907,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54660,26.48,18.294555480167748,33.53867399079528,30.000000005692144,1.0879421538075698,16092.46745535936,16.347056145148745,980.8233687089247,0.3868518370410119,0.0004909016988689169,30.000000005692144,30.000000005692144,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54720,26.46166666666667,18.30331316683649,33.533984085838945,30.00000000568697,1.0879421538075698,16071.139652031636,16.3273698632096,979.642191792576,0.3866416898513887,0.0004900733403574732,30.00000000568697,30.00000000568697,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54780,26.44333333333333,18.312024565869514,33.529562939050344,30.00000000553151,1.0879421538075698,16051.034053547868,16.309593349404036,978.5756009642422,0.3864517325930185,0.0004892814998364451,30.00000000553151,30.00000000553151,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54840,26.425,18.32069838368237,33.52565035154476,30.00000010531869,1.0879421538075698,16033.240723846768,16.295527018334724,977.7316211000833,0.3863012893561839,0.0004885585750884736,30.00000010531869,30.00000010531869,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54900,26.40666666666667,18.329325114865924,33.522195894296196,30.00000011587377,1.0879421538075698,16017.531192270913,16.284778348743608,977.0867009246164,0.3861862503800921,0.00048789754490343606,30.00000011587377,30.00000011587377,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-54960,26.388333333333332,18.33790227717171,33.51896555754118,30.000000005522427,1.0879421538075698,16002.841420482524,16.27559742827291,976.5358456963746,0.3860879361348869,0.0004872668073468045,30.000000005522427,30.000000005522427,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55020,26.37,18.346445148339512,33.51663030071897,30.000000005625292,1.0879421538075698,15992.221610286753,16.27302633279418,976.3815799676507,0.3860603944823835,0.000486756925608338,30.000000005625292,30.000000005625292,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55080,26.35166666666667,18.35493816171416,33.51400819167572,30.000000105484304,1.0879421538075698,15980.29685779512,16.268220274955052,976.0932164973027,0.3860089013047168,0.00048620850591537287,30.000000105484304,30.000000105484304,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55140,26.333333333333336,18.363384835279476,33.51082675188441,30.000000005621295,1.0879421538075698,15965.829402054302,16.25915230480361,975.5491382882166,0.38591170761456295,0.00048558505454593664,30.000000005621295,30.000000005621295,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55200,26.315,18.371788003079548,33.50865101871733,30.000000005621448,1.0879421538075698,15955.935041812962,16.257506383728497,975.4503830237097,0.3858940608037612,0.00048509699547203945,30.000000005621448,30.000000005621448,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55260,26.29666666666667,18.3801509405867,33.506226094293645,30.000000005621413,1.0879421538075698,15944.907459861764,16.253927401895446,975.2356441137268,0.38585568303080736,0.00048457572806627405,30.000000005621413,30.000000005621413,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55320,26.278333333333336,18.38845801703168,33.50408960631045,30.000000005772144,1.0879421538075698,15935.191570263394,16.252396690814884,975.143801448893,0.3858392667348378,0.0004840930725781037,30.000000005772144,30.000000005772144,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55380,26.26,18.39673786479645,33.5017054178586,30.000000005620052,1.0879421538075698,15924.349239836038,16.248968334396793,974.9381000638077,0.3858024938431591,0.000483577734854201,30.000000005620052,30.000000005620052,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55440,26.24166666666667,18.404961179563227,33.49977965306798,30.00000000562036,1.0879421538075698,15915.591635333538,16.248861967317186,974.9317180390312,0.3858013528271679,0.000483123792442584,30.00000000562036,30.00000000562036,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55500,26.22333333333333,18.413144664790174,33.497820700013534,30.000000005771536,1.0879421538075698,15906.683103256082,16.24843492694982,974.9060956169893,0.3857967718316504,0.0004826656451473286,30.000000005771536,30.000000005771536,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55560,26.205000000000005,18.42128530430452,33.4961130833503,30.00000011610715,1.0879421538075698,15898.917047025048,16.24981456741782,974.9888740450692,0.3858115712742501,0.00048224134388551133,30.00000011610715,30.00000011610715,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55620,26.18666666666667,18.42937965413833,33.49418945244424,30.00000010558223,1.0879421538075698,15890.16919443666,16.249492784097296,974.9695670458376,0.3858081195969302,0.00048178816137302353,30.00000010558223,30.00000010558223,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55680,26.16833333333333,18.437430218597537,33.492641365281294,30.000000005773362,1.0879421538075698,15883.12956992708,16.251904776937963,975.1142866162776,0.3858339908484124,0.0004813854661207523,30.000000005773362,30.000000005773362,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55740,26.15,18.445448295241338,33.49088363997212,30.00000000577539,1.0879421538075698,15875.13614146066,16.252689835745365,975.161390144722,0.3858424107112168,0.0004809550582030086,30.00000000577539,30.00000000577539,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55800,26.13166666666667,18.45340994170936,33.48950760296725,30.000000105613946,1.0879421538075698,15868.878024024514,16.25624329297455,975.3745975784731,0.3858805174294554,0.0004805755842768751,30.000000105613946,30.000000105613946,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55860,26.11333333333333,18.461332182173127,33.487840239424116,29.99999999507694,1.0879421538075698,15861.2960272501,16.257537378925367,975.452242735522,0.3858943931349556,0.0004801573100210038,29.99999999507694,29.99999999507694,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55920,26.095,18.469211874085214,33.486484777968094,30.000000116089463,1.0879421538075698,15855.131382852176,16.26110324312064,975.6661945872384,0.38593262259031813,0.00047978092703912403,30.000000116089463,30.000000116089463,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-55980,26.07666666666667,18.477045325850934,33.484273999236,30.0000000056748,1.0879421538075698,15845.078151584617,16.2581513349745,975.48908009847,0.3859009758674927,0.0004792900691495113,30.0000000056748,30.0000000056748,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56040,26.05833333333333,18.484835724180773,33.480832136179764,30.00000010566595,1.0879421538075698,15829.425486615786,16.24586301084933,974.75178065096,0.3857691797827039,0.00047863460833631613,30.00000010566595,30.00000010566595,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56100,26.04,18.492593424659376,33.47618488458567,30.00000000576849,1.0879421538075698,15808.292107911531,16.224435050476064,973.4661030285637,0.3855391425944756,0.0004778183522835007,30.00000000576849,30.00000000576849,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56160,26.02166666666667,18.500300952138304,33.47214282585549,30.000000005763713,1.0879421538075698,15789.910448915838,16.207460079676476,972.4476047805883,0.3853567148588193,0.00047708324624832024,30.000000005763713,30.000000005763713,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56220,26.003333333333334,18.5079636087205,33.46858584200675,30.00000000560976,1.0879421538075698,15773.734716257632,16.194043564173647,971.6426138504187,0.38521240706366827,0.00047641326750922334,30.00000000560976,30.00000000560976,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56280,25.985,18.515589693172398,33.46452936297953,30.000000005754604,1.0879421538075698,15755.287478864568,16.17679663483483,970.6077980900895,0.3850267404299184,0.00047567691612887775,30.000000005754604,30.000000005754604,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56340,25.96666666666667,18.523169894185934,33.46038582929023,30.000000005598828,1.0879421538075698,15736.444353213803,16.15880241161412,969.5281446968472,0.3848328379680641,0.0004749291700517469,30.000000005598828,30.000000005598828,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56400,25.948333333333334,18.530701489225823,33.45626269131405,30.000000005744763,1.0879421538075698,15717.693977699273,16.14086494940124,968.4518969640744,0.3846393524803522,0.0004741843136821363,30.000000005744763,30.000000005744763,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56460,25.93,18.538206250274925,33.452191643987625,30.00000000569398,1.0879421538075698,15699.180490424616,16.123263804685777,967.3958282811464,0.38444930533294175,0.0004734471268197448,30.00000000569398,30.00000000569398,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56520,25.91166666666667,18.545655017725288,33.44818060980514,30.000000109919572,1.0879421538075698,15680.939444608408,16.106003863365473,966.3602318019283,0.38426275966194895,0.000472717900338029,30.000000109919572,30.000000109919572,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56580,25.893333333333334,18.55306539348806,33.444227406822534,30.00000011003325,1.0879421538075698,15662.961865311952,16.08910096288034,965.3460577728205,0.3840798971842295,0.00047199683285993496,30.00000011003325,30.00000011003325,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56640,25.875000000000004,18.560444558376858,33.44032967640961,30.00000000583243,1.0879421538075698,15645.237027354118,16.072547356033276,964.3528413619963,0.3839006445861141,0.0004712837169649627,30.00000000583243,30.00000000583243,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56700,25.85666666666667,18.56776827785994,33.43648246289663,30.000000110269948,1.0879421538075698,15627.740971156403,16.05627119077824,963.3762714466943,0.3837242329351015,0.000470577338243292,30.000000110269948,30.000000110269948,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56760,25.838333333333335,18.57505293171828,33.43268299454473,30.000000110132063,1.0879421538075698,15610.46251633431,16.040270471590624,962.4162282954376,0.383550648492936,0.0004698776842639417,30.000000110132063,30.000000110132063,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56820,25.820000000000004,18.582295611401317,33.42892705181467,30.00000009985516,1.0879421538075698,15593.38204466006,16.02451575617017,961.4709453702104,0.3833795791809753,0.000469184150226002,30.00000009985516,30.00000009985516,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56880,25.80166666666667,18.589499132301,33.42521279694756,30.00000000566341,1.0879421538075698,15576.49153424748,16.008992984366277,960.5395790619766,0.38321087893675737,0.0004684965406227701,30.00000000566341,30.00000000566341,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-56940,25.783333333333335,18.59665945264184,33.421536842598734,30.00000010012485,1.0879421538075698,15559.774341284052,15.99367568999026,959.6205413994156,0.3830442660809057,0.0004678142710438086,30.00000010012485,30.00000010012485,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57000,25.765,18.60378195209852,33.417897503840884,30.000000005806278,1.0879421538075698,15543.224519811987,15.978556674344716,958.713400460683,0.3828796677253432,0.0004671372874576592,30.000000005806278,30.000000005806278,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57060,25.74666666666667,18.61085507896514,33.41429174457478,30.000000103507446,1.0879421538075698,15526.826531147683,15.963594646179931,957.815678770796,0.3827166390253129,0.00046646485490362384,30.000000103507446,30.000000103507446,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57120,25.728333333333335,18.617896154032934,33.41071641448031,30.00000000564793,1.0879421538075698,15510.567811461016,15.948792556399491,956.9275533839693,0.3825552162504895,0.00046579701827893045,30.00000000564793,30.00000000564793,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57180,25.71,18.624895022277013,33.40716748514485,30.00000000564507,1.0879421538075698,15494.42870680583,15.934106349952426,956.0463809971452,0.3823949224851482,0.0004651329347055263,30.00000000564507,30.00000000564507,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57240,25.69166666666667,18.631848369117428,33.40365059403276,30.00000000579203,1.0879421538075698,15478.435298436278,15.919574849610227,955.1744909766136,0.38223618489270894,0.0004644733116263958,30.00000000579203,30.00000000579203,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57300,25.673333333333336,18.638759348934947,33.40016493408715,30.00000000574096,1.0879421538075698,15462.583917763935,15.905192085455255,954.3115251273152,0.3820789421152118,0.0004638180873123186,30.00000000574096,30.00000000574096,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57360,25.655,18.64563868230414,33.39670347057578,30.00000000573664,1.0879421538075698,15446.842572539832,15.890927475886125,953.4556485531674,0.38192286314991103,0.00046316661192863525,30.00000000573664,30.00000000573664,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57420,25.63666666666667,18.652469094326335,33.3932614619576,30.00000000562932,1.0879421538075698,15431.18970082141,15.87671186406,952.6027118436,0.3817671932874204,0.0004625178047587168,30.00000000562932,30.00000000562932,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57480,25.61833333333333,18.65926081807791,33.38984542434811,30.00000000572957,1.0879421538075698,15415.654933871485,15.862618501757126,951.7571101054275,0.38161273671294255,0.0004618727908935451,30.00000000572957,30.00000000572957,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57540,25.6,18.666011628902247,33.38645453761527,30.00000000572676,1.0879421538075698,15400.234543471735,15.848628353422608,950.9177012053565,0.3814592875535964,0.00046123138547253826,30.00000000572676,30.00000000572676,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57600,25.57166666666667,18.680881231202353,33.37813160838543,30.000000097237233,1.0879421538075698,15362.384789310208,15.812272688448715,948.7363613069227,0.38105994672895893,0.00045981347014464093,30.000000097237233,30.000000097237233,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57660,25.543333333333337,18.69562961317804,33.357203266608145,30.00000000592946,1.0879421538075698,15267.211515084917,15.68114010204114,940.8684061224684,0.37961254882262696,0.00045672228695726086,30.00000000592946,30.00000000592946,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57720,25.515,18.71028027565545,33.332061536362296,30.00000009191978,1.0879421538075698,15152.876636751282,15.518778309349456,931.1266985609673,0.3778050187599904,0.0004530743384628805,30.00000009191978,30.00000009191978,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57780,25.486666666666668,18.724798425089148,33.311390803802446,30.000000005799755,1.0879421538075698,15058.874842148445,15.389972323689857,923.3983394213916,0.3763586549145086,0.00045002213228428624,30.000000005799755,30.000000005799755,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57840,25.458333333333336,18.73920121990155,33.29480331256051,30.000000076141,1.0879421538075698,14983.44127690201,15.291526601480115,917.4915960888068,0.37524566491914135,0.00044751395571159707,30.000000076141,30.000000076141,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57900,25.430000000000003,18.753502658959167,33.281157176790494,30.00000000585095,1.0879421538075698,14921.384454048406,15.214785490229088,912.8871294137456,0.3743734573761557,0.000445398180881866,30.00000000585095,30.00000000585095,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-57960,25.40166666666667,18.767683370175078,33.269712923565805,30.000000005832618,1.0879421538075698,14869.340588733518,15.154147752575305,909.2488651545184,0.37368138861221495,0.000443575774448625,30.000000005832618,30.000000005832618,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58020,25.373333333333335,18.78174339327642,33.260080936912324,30.000000070346196,1.0879421538075698,14825.537890155818,15.106678754228545,906.4007252537127,0.3731378226017827,0.00044199477468635193,30.000000070346196,30.000000070346196,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58080,25.345000000000006,18.79570267007165,33.251999902953486,30.000000005911748,1.0879421538075698,14788.788887668878,15.070451426770552,904.2270856062331,0.3727219166021014,0.00044062070125964727,30.000000005911748,30.000000005911748,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58140,25.31666666666667,18.809551586794157,33.24524091583224,30.00000007078782,1.0879421538075698,14758.051434952413,15.043760460647393,902.6256276388436,0.3724148974330012,0.00043942272002126464,30.00000007078782,30.00000007078782,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58200,25.28833333333333,18.823276162542488,33.23834820737926,30.0000000058985,1.0879421538075698,14726.706461469008,15.015841953571543,900.9505172142924,0.3720932155826564,0.00043820761966860183,30.0000000058985,30.0000000058985,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58260,25.26000000000001,18.836900463348407,33.229049400636036,30.00000000602461,1.0879421538075698,14684.419224060744,14.97001069552881,898.2006417317286,0.371563930739642,0.0004366753935862669,30.00000000602461,30.00000000602461,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58320,25.23166666666667,18.85040503131703,33.21858678838417,30.000000064613598,1.0879421538075698,14636.839200947219,14.91541023246028,894.9246139476168,0.3709313994242311,0.0004349902568069732,30.000000064613598,30.000000064613598,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58380,25.20333333333333,18.863801979978625,33.20946306214896,30.00000007442709,1.0879421538075698,14595.348115288245,14.870473496206351,892.2284097723808,0.3704091966766912,0.00043348348510964535,30.00000007442709,30.00000007442709,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58440,25.175000000000008,18.877092610193113,33.20137944354341,30.000000006085948,1.0879421538075698,14558.587376632622,14.8329862155078,889.9791729304678,0.3699724336351935,0.00043211536229098384,30.000000006085948,30.000000006085948,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58500,25.14666666666667,18.890264757397734,33.19380137054813,30.000000074893183,1.0879421538075698,14524.12503259008,14.79899769713629,887.9398618281773,0.3695755412644081,0.0004308148236351364,30.000000074893183,30.000000074893183,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58560,25.11833333333333,18.903334360538913,33.186824275976626,30.00000000592817,1.0879421538075698,14492.396323480318,14.769226929779007,886.1536157867406,0.3692271989240682,0.0004295947748910672,30.00000000592817,30.00000000592817,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58620,25.09,18.91630041168662,33.180374913678655,30.00000006821229,1.0879421538075698,14463.066931840964,14.743136137192609,884.5881682315567,0.368921373953766,0.0004284453786432546,30.00000006821229,30.00000006821229,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58680,25.06166666666667,18.92914718782131,33.17436117981127,30.000000058884726,1.0879421538075698,14435.71892893085,14.720018303052655,883.2010981831592,0.3686499724095751,0.00042735403403244913,30.000000058884726,30.000000058884726,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58740,25.033333333333335,18.941887549307836,33.168717021567886,30.000000059006442,1.0879421538075698,14410.051564492764,14.69941075307342,881.9646451844052,0.36840770407027096,0.0004263122397638952,30.000000059006442,30.000000059006442,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58800,25.005,18.954523570398944,33.16337607306613,30.00000000590502,1.0879421538075698,14385.763318168245,14.680832939557055,880.8499763734233,0.3681890244663301,0.0004253112481182178,30.00000000590502,30.00000000590502,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58860,24.97666666666667,18.967046904649166,33.1582808745418,30.000000059268213,1.0879421538075698,14362.592159841086,14.663852795329928,879.8311677197956,0.3679889235767392,0.00042434319894365765,30.000000059268213,30.000000059268213,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58920,24.948333333333334,18.979465195477506,33.15339748357886,30.000000005897913,1.0879421538075698,14340.384702580544,14.648227988648053,878.8936793188832,0.3678046020822256,0.0004234037853677801,30.000000005897913,30.000000005897913,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-58980,24.92,18.991789192453727,33.14868987768497,30.00000006878852,1.0879421538075698,14318.976116476304,14.633723872974224,878.0234323784537,0.3676333355706177,0.0004224884535414127,30.00000006878852,30.00000006878852,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59040,24.89166666666667,19.003990682987197,33.14412464469732,30.000000005993662,1.0879421538075698,14298.215556711548,14.62003708573372,877.2022251440233,0.3674715737126013,0.00042159210777293157,30.000000005993662,30.000000005993662,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59100,24.86333333333333,19.016087351468478,33.139687043467696,30.000000006025186,1.0879421538075698,14278.035129191108,14.6070962225837,876.425773355022,0.36731849671193295,0.0004207132098830413,30.000000006025186,30.000000006025186,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59160,24.835,19.02808639683811,33.13535465798384,30.000000006123894,1.0879421538075698,14258.333180301484,14.594751894893987,875.6851136936392,0.3671723571115265,0.00041984895935526017,30.000000006123894,30.000000006123894,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59220,24.806666666666665,19.03997938037107,33.131106793748735,30.000000005982923,1.0879421538075698,14239.015601180745,14.582833349161627,874.9700009496976,0.3670311477079014,0.0004189963756953176,30.000000005982923,30.000000005982923,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59280,24.77833333333333,19.05176184316531,33.12693711177823,30.000000059912157,1.0879421538075698,14220.053317696484,14.571291680591948,874.2775008355168,0.3668942998622463,0.0004181545474201009,30.000000059912157,30.000000059912157,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59340,24.75,19.063451803996564,33.12283194275999,30.00000000598043,1.0879421538075698,14201.384903706292,14.560050162053356,873.6030097232015,0.366760912641124,0.00041732204522812027,30.00000000598043,30.00000000598043,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59400,24.72166666666667,19.07502600690616,33.1188554782519,30.000000069328298,1.0879421538075698,14183.301252774709,14.549548443357187,872.9729066014313,0.36663621586372935,0.0004165067431425489,30.000000069328298,30.000000069328298,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59460,24.693333333333335,19.086496439237003,33.115169866450735,30.000000062400908,1.0879421538075698,14166.540602674066,14.54100447174606,872.4602683047638,0.3665347026452828,0.00041573014863344426,30.000000062400908,30.000000062400908,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59520,24.665,19.097869496169825,33.11153333131243,30.000000060064586,1.0879421538075698,14150.00311263892,14.532640642155526,871.9584385293315,0.3664352752496876,0.0004149606426303108,30.000000060064586,30.000000060064586,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59580,24.63666666666667,19.109131991781215,33.106594854170254,30.000000006106518,1.0879421538075698,14127.545148241587,14.514477470968632,870.8686482581178,0.3662191693864485,0.0004140211781253235,30.000000006106518,30.000000006106518,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59640,24.608333333333334,19.120296567183907,33.10037838100424,30.00000006267264,1.0879421538075698,14099.27486880342,14.486710054566574,869.2026032739944,0.3658882981352642,0.00041291538205920277,30.00000006267264,30.00000006267264,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59700,24.58,19.1313649400092,33.094477755349644,30.000000005956412,1.0879421538075698,14072.441452103063,14.461091172083117,867.665470324987,0.3655824967573056,0.000411851913420681,30.000000005956412,30.000000005956412,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59760,24.55166666666667,19.142322371112055,33.08921894624641,30.00000006297514,1.0879421538075698,14048.526241977468,14.440002476488733,866.4001485893242,0.3653303857942456,0.00041087294353984197,30.00000006297514,30.00000006297514,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59820,24.52333333333333,19.153183135295397,33.08433349573786,30.000000063097566,1.0879421538075698,14026.309175467642,14.421484408176957,865.2890644906172,0.3651087188669393,0.00040994365485157695,30.000000063097566,30.000000063097566,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59880,24.495,19.163942126295904,33.07982102766619,30.000000005941892,1.0879421538075698,14005.788543695237,14.405526999385355,864.3316199631213,0.3649174876789478,0.0004090637513132001,30.000000005941892,30.000000005941892,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-59940,24.46666666666667,19.174597301730174,33.07564843923729,30.000000006040672,1.0879421538075698,13986.813287605271,14.391887694321435,863.5132616592862,0.3647538772839923,0.00040822882685951717,30.000000006040672,30.000000006040672,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60000,24.43833333333333,19.18515537341484,33.07176672556437,30.000000063329164,1.0879421538075698,13969.160552957017,14.380215501843548,862.8129301106129,0.3646137467632378,0.00040743253805106003,30.000000063329164,30.000000063329164,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60060,24.41,19.19561751735987,33.068130011526236,30.000000054059075,1.0879421538075698,13952.622280889318,14.370172201607687,862.2103320964612,0.3644930856384482,0.0004066688701538569,30.000000054059075,30.000000054059075,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60120,24.38166666666667,19.20597058059345,33.06470114332465,30.000000006034735,1.0879421538075698,13937.029384413127,14.361467515965707,861.6880509579427,0.36438844208842663,0.00040593267692213533,30.000000006034735,30.000000006034735,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60180,24.35333333333333,19.216232583514387,33.06144763266507,30.00000005420364,1.0879421538075698,13922.233506131635,14.353896419947949,861.233785196877,0.3642973771119795,0.0004052200605233941,30.00000005420364,30.00000005420364,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60240,24.325,19.22639363659877,33.058338875910785,30.0000000060332,1.0879421538075698,13908.096348562307,14.347207070703142,860.8324242421886,0.3642168798660637,0.0004045267450453258,30.0000000060332,30.0000000060332,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60300,24.29666666666667,19.236452061311308,33.05535254706944,30.000000006031954,1.0879421538075698,13894.515724895811,14.341243701945867,860.4746221167521,0.36414508879945334,0.000403849804917613,30.000000006031954,30.000000006031954,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60360,24.26833333333333,19.24640889644081,33.052473057997396,30.000000054244055,1.0879421538075698,13881.42074631719,14.335890203861847,860.1534122317108,0.3640806156470537,0.0004031871992788645,30.000000054244055,30.000000054244055,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60420,24.240000000000006,19.256281568864207,33.04968694317626,30.00000006365852,1.0879421538075698,13868.750572750316,14.331077705573495,859.8646623344098,0.3640226383576807,0.0004025375012639549,30.00000006365852,30.00000006365852,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60480,24.21166666666667,19.266046185363738,33.0469793914623,30.00000006374695,1.0879421538075698,13856.437715039461,14.326655244913555,859.5993146948132,0.3639693436543495,0.00040189828824376033,30.00000006374695,30.00000006374695,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60540,24.18333333333333,19.27570919129329,33.044339975155815,30.000000006034288,1.0879421538075698,13844.434972641317,14.32255552777318,859.3533316663909,0.363919924361782,0.00040126830720642537,30.000000006034288,30.000000006034288,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60600,24.155,19.285294501331716,33.041762951065444,30.000000006169362,1.0879421538075698,13832.715701904775,14.318780621196654,859.1268372717993,0.3638744085668701,0.00040064728184908727,30.000000006169362,30.000000006169362,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60660,24.126666666666665,19.29476650986463,33.03920381734084,30.000000054379193,1.0879421538075698,13821.077570738877,14.314942537920835,858.8965522752502,0.3638281193440297,0.00040002871332030286,30.000000054379193,30.000000054379193,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60720,24.09833333333333,19.30414333816957,33.036637318241354,30.000000006032504,1.0879421538075698,13809.406383907517,14.310878191153616,858.6526914692171,0.3637790884251486,0.00039940968848067794,30.000000006032504,30.000000006032504,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60780,24.07,19.31343197746213,33.03409796424266,30.00000000603364,1.0879421538075698,13797.858422221329,14.306860351883689,858.4116211130213,0.3637306055626877,0.0003987948131807723,30.00000000603364,30.00000000603364,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60840,24.041666666666664,19.322617858557074,33.031617552349594,30.000000063787713,1.0879421538075698,13786.57824291164,14.303098339254742,858.1859003552844,0.3636851980149795,0.0003981878854469846,30.000000063787713,30.000000063787713,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60900,24.013333333333332,19.33170358458139,33.029199306276304,29.999999996829988,1.0879421538075698,13775.581335911384,14.299620317425413,857.9772190455251,0.36364320815101386,0.0003975893613311193,29.999999996829988,29.999999996829988,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-60960,23.985,19.34070696566009,33.02683197775229,30.00000005453193,1.0879421538075698,13764.815414564573,14.296376597821565,857.7825958692938,0.3636040382568877,0.0003969981736374902,30.00000005453193,30.00000005453193,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-61020,23.956666666666663,19.34961382795637,33.024506807100394,30.00000005675425,1.0879421538075698,13754.241462580338,14.293274790170875,857.5964874102525,0.3635665741410328,0.00039641285059101663,30.00000005675425,30.00000005675425,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-61080,23.928333333333335,19.35842109454924,33.02221988504725,30.000000063867397,1.0879421538075698,13743.841427613514,14.290278034991546,857.4166820994926,0.3635303715305751,0.00039583281141098017,30.000000063867397,30.000000063867397,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-61140,23.9,19.367140120369335,33.01996661168778,30.0000000061731,1.0879421538075698,13733.5947081038,14.287377146795563,857.2426288077339,0.3634953201815302,0.0003952577251197681,30.0000000061731,30.0000000061731,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-61200,23.89,19.370337352373248,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61260,23.88,19.373531938818328,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61320,23.87,19.37671790351113,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61380,23.86,19.37988220894034,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61440,23.85,19.383038888074747,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61500,23.84,19.38618953955031,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61560,23.83,19.389311418965846,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61620,23.82,19.39243949209033,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61680,23.81,19.39554958409752,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61740,23.8,19.398648621192237,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61800,23.79,19.401734643262692,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61860,23.78,19.404808899097677,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61920,23.77,19.407872717246274,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-61980,23.76,19.41092350979616,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62040,23.75,19.413957962673216,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62100,23.740000000000006,19.416985960727263,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62160,23.73,19.420006773181864,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62220,23.72,19.42300653699636,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62280,23.71,19.425998350327404,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62340,23.7,19.42898511775831,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62400,23.69,19.431949162964717,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62460,23.68,19.43490597697089,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62520,23.67,19.437851324467395,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62580,23.66,19.440786307458254,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62640,23.65,19.443708239577877,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62700,23.64,19.44662430888218,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62760,23.630000000000006,19.449517712980718,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62820,23.62,19.452410209372033,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62880,23.61,19.455281215660378,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-62940,23.6,19.458150251397086,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63000,23.59,19.46100231623148,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63060,23.58,19.4638431864498,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63120,23.57,19.466671637529203,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63180,23.56,19.46949454765776,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63240,23.55,19.472300470535988,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63300,23.54,19.47509421783769,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63360,23.53,19.477881881774053,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63420,23.52,19.480652856444898,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63480,23.51,19.48341741820364,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63540,23.5,19.48617007154964,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63600,23.49,19.48890090626985,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63660,23.48,19.49163029915277,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63720,23.47,19.49434333761857,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63780,23.46,19.49704931296603,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63840,23.450000000000006,19.49974960138389,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63900,23.44,19.50242793063219,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-63960,23.43,19.505099364904527,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64020,23.42,19.50775893115804,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64080,23.41,19.510408326791424,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64140,23.4,19.513044440950512,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64200,23.39,19.515669914260894,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64260,23.380000000000006,19.518283882254213,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64320,23.37,19.520891455414166,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64380,23.360000000000007,19.523476787780677,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64440,23.35,19.526061703219046,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64500,23.34,19.528634389742894,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64560,23.33,19.53119048252444,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64620,23.32,19.53373492299543,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64680,23.31,19.536272411695002,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64740,23.3,19.538799954811747,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64800,23.3,19.517881353416207,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64860,23.3,19.496963855497867,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64920,23.3,19.476021259652317,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-64980,23.3,19.4550602122345,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65040,23.3,19.434086163466386,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65100,23.300000000000008,19.413094184524496,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65160,23.3,19.392083189498123,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65220,23.3,19.371067197728337,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65280,23.3,19.350025349607048,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65340,23.3,19.32896619783317,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65400,23.3,19.3078935107324,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65460,23.3,19.286802416233822,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65520,23.300000000000008,19.265692952168997,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65580,23.3,19.24457084201853,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65640,23.3,19.22343010118357,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65700,23.300000000000008,19.20227669975552,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65760,23.3,19.181098552110868,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65820,23.3,19.159913818186997,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65880,23.3,19.138704543192283,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-65940,23.3,19.117481802282732,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66000,23.3,19.096240686121174,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66060,23.3,19.07498097121216,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66120,23.300000000000008,19.0537083386204,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66180,23.3,19.03241741434275,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66240,23.3,19.011106631543317,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66300,23.3,18.989783559646078,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66360,23.300000000000008,18.968441567451134,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66420,23.3,18.947080369871983,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66480,23.3,18.92570659575876,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66540,23.3,18.904313517149127,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66600,23.3,18.882901190995764,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66660,23.3,18.86147653043102,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66720,23.3,18.84003203575245,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66780,23.3,18.818569252639612,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66840,23.3,18.797092400944678,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66900,23.3,18.775597606769697,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-66960,23.3,18.754082510963322,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67020,23.3,18.732555070157108,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67080,23.3,18.711008158154865,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67140,23.3,18.68944183900381,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67200,23.3,18.667856675105533,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67260,23.3,18.646258057576908,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67320,23.3,18.62464586924096,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67380,23.3,18.60300841503997,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67440,23.3,18.581357658463347,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67500,23.300000000000008,18.559687852697856,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67560,23.300000000000008,18.538003916407558,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67620,23.3,18.51630157908436,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67680,23.3,18.494578731820162,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67740,23.3,18.47284281787201,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67800,23.3,18.451082183176183,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67860,23.3,18.429312910090175,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67920,23.3,18.407518583063187,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-67980,23.3,18.38571093651977,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68040,23.3,18.363883165380518,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68100,23.3,18.34204172819699,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68160,23.3,18.320175050692907,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68220,23.3,18.29830037553088,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68280,23.3,18.276400395438767,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68340,23.3,18.25448667373269,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68400,23.291666666666664,18.24716732447897,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68460,23.283333333333335,18.239852207744747,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68520,23.275,18.232548279863476,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68580,23.26666666666667,18.225229146018236,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68640,23.25833333333333,18.21791416914948,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68700,23.250000000000004,18.21060409028059,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68760,23.24166666666667,18.203286397140936,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68820,23.233333333333334,18.195972048047825,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68880,23.225,18.18866227015593,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-68940,23.21666666666667,18.181349380583587,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69000,23.20833333333333,18.174035102231052,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69060,23.200000000000006,18.166725605971447,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69120,23.19166666666667,18.159407314988588,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69180,23.18333333333333,18.152087662783774,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69240,23.175,18.14477843433389,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69300,23.16666666666667,18.13746620333454,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69360,23.158333333333335,18.130152416397085,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69420,23.15,18.122842912342954,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69480,23.14166666666667,18.115524928897496,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69540,23.13333333333333,18.108211260430892,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69600,23.125,18.10090208595623,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69660,23.11666666666667,18.093585825072527,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69720,23.108333333333334,18.086271703816085,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69780,23.1,18.0789630191885,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69840,23.091666666666665,18.071645603097718,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69900,23.083333333333336,18.064332534790143,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-69960,23.075000000000006,18.057023931369887,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70020,23.06666666666667,18.049706671623962,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70080,23.05833333333333,18.042388476057297,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70140,23.05,18.035080033697678,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70200,23.041666666666664,18.027768733131836,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70260,23.03333333333333,18.020449999236433,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70320,23.025,18.013142151486235,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70380,23.01666666666667,18.005831437993365,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70440,23.00833333333333,17.998512449567137,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70500,23.0,17.991210684487537,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70560,22.99166666666667,17.983888975197925,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70620,22.983333333333334,17.97657078306019,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70680,22.975,17.969263283652236,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70740,22.96666666666667,17.96195284955621,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70800,22.95833333333333,17.95463509174035,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70860,22.95,17.947327723219267,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70920,22.94166666666667,17.940017597061416,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-70980,22.93333333333333,17.932694820500146,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71040,22.925,17.925387648506245,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71100,22.916666666666664,17.918072225200127,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71160,22.90833333333333,17.91076019876252,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71220,22.900000000000006,17.90345386212634,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71280,22.89166666666667,17.896138013938337,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71340,22.88333333333333,17.88882665176073,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71400,22.875,17.88152016860784,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71460,22.86666666666667,17.874200425645046,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71520,22.858333333333334,17.86688306867202,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71580,22.85,17.859577100927886,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71640,22.841666666666665,17.852262433839584,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71700,22.833333333333336,17.844951208642087,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71760,22.825000000000006,17.837645282108614,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71820,22.81666666666667,17.830330884453947,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71880,22.80833333333333,17.823009422045654,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-71940,22.8,17.815704046536226,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72000,22.8,17.810894067915466,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72060,22.8,17.806089542531073,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72120,22.8,17.801284314187487,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72180,22.8,17.796471576338277,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72240,22.8,17.791658019768096,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72300,22.8,17.786850038696038,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72360,22.8,17.782040811028267,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72420,22.8,17.777230610442995,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72480,22.8,17.77241374457011,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72540,22.8,17.767601590804578,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72600,22.8,17.762788459628943,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72660,22.800000000000008,17.757974204576627,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72720,22.8,17.753153255983552,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72780,22.8,17.748330725334608,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72840,22.8,17.743520532987922,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72900,22.800000000000008,17.7387030001222,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-72960,22.8,17.73388432320856,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73020,22.8,17.72905831319843,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73080,22.8,17.724238206592837,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73140,22.800000000000008,17.719416272221213,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73200,22.8,17.71459399281289,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73260,22.8,17.70977056619838,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73320,22.8,17.704946215536435,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73380,22.8,17.70012061239705,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73440,22.8,17.69529429158954,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73500,22.8,17.69046725165881,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73560,22.8,17.685633055455135,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73620,22.8,17.680803934909875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73680,22.8,17.675973292150484,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73740,22.8,17.671142625104174,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73800,22.8,17.666316407533838,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73860,22.8,17.6614837635778,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73920,22.8,17.656649861959114,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-73980,22.8,17.651814597708505,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74040,22.8,17.646978979497895,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74100,22.8,17.642142264800736,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74160,22.8,17.637304185446,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74220,22.8,17.632465483280075,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74280,22.8,17.62762637911558,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74340,22.8,17.622785686561247,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74400,22.8,17.617949894971247,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74460,22.8,17.613107804863283,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74520,22.8,17.608263976409216,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74580,22.8,17.603419624374204,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74640,22.8,17.598574539793074,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74700,22.8,17.593733937236074,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74760,22.8,17.58888675246828,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74820,22.8,17.58403856646136,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74880,22.8,17.579195135640216,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-74940,22.8,17.574344903680426,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75000,22.8,17.569494351574455,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75060,22.8,17.564648086296465,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75120,22.8,17.55979521764969,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75180,22.8,17.554941343498136,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75240,22.8,17.550092237625964,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75300,22.8,17.545236517822552,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75360,22.8,17.540379420321678,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75420,22.8,17.535527675905197,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75480,22.8,17.53066872721035,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75540,22.8,17.525815402489812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75600,22.78166666666667,17.52935815105137,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75660,22.763333333333332,17.532858956722222,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75720,22.745,17.536333316734677,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75780,22.72666666666667,17.53976587198462,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75840,22.70833333333333,17.54316509641228,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75900,22.69,17.54653583014724,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-75960,22.67166666666667,17.549874219676628,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76020,22.653333333333336,17.55317607946336,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76080,22.635,17.556446485661287,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76140,22.61666666666667,17.55968041348507,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76200,22.59833333333333,17.56288254785951,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76260,22.580000000000005,17.566048355562664,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76320,22.56166666666667,17.569182279575912,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76380,22.54333333333333,17.57227355329125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76440,22.525000000000006,17.575346292995764,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76500,22.50666666666667,17.57838238449117,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76560,22.48833333333333,17.581380542225887,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76620,22.47,17.584348728990527,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76680,22.45166666666667,17.587285187855898,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76740,22.433333333333334,17.590185668038377,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76800,22.415,17.59305436873143,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76860,22.396666666666665,17.595887390023247,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76920,22.37833333333333,17.598694609527364,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-76980,22.36,17.60145955866811,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77040,22.341666666666665,17.60420521982959,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77100,22.32333333333333,17.606902653173446,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77160,22.305,17.60958042856848,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77220,22.28666666666667,17.612216186681536,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77280,22.26833333333333,17.614826633315808,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77340,22.25,17.617406067582948,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77400,22.23166666666667,17.61994382446099,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77460,22.21333333333333,17.622462198940195,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77520,22.195,17.62493853719322,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77580,22.17666666666667,17.627383277042615,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77640,22.15833333333333,17.629798120715975,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77700,22.14,17.632181512356716,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77760,22.12166666666667,17.63452962047919,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77820,22.10333333333333,17.636851636930228,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77880,22.085,17.639137519534362,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-77940,22.06666666666667,17.641392776695827,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78000,22.04833333333333,17.643617978860487,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78060,22.03,17.64581154602621,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78120,22.01166666666667,17.64796963998381,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78180,21.99333333333333,17.6501021336452,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78240,21.975,17.65219298428632,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78300,21.95666666666667,17.654264220893094,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78360,21.93833333333333,17.656293534885744,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78420,21.92,17.658304187473558,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78480,21.901666666666664,17.66027304477818,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78540,21.88333333333333,17.6622161203309,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78600,21.865000000000006,17.664123892866193,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78660,21.84666666666667,17.666006030701148,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78720,21.82833333333333,17.667852185073766,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78780,21.810000000000006,17.669667859802466,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78840,21.79166666666667,17.6714537554859,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78900,21.77333333333333,17.673213918947738,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-78960,21.755,17.674932873963048,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79020,21.736666666666668,17.67663212477829,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79080,21.71833333333333,17.67829603474923,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79140,21.7,17.67992852472109,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79200,21.69,17.682239103837865,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79260,21.68,17.684547633555415,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79320,21.67,17.686838798638796,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79380,21.66,17.689118002451,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79440,21.65,17.6913833682571,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79500,21.64,17.69364955150725,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79560,21.63,17.695897465301858,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79620,21.62,17.698139032574026,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79680,21.61,17.700362656164803,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79740,21.6,17.702578872984187,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79800,21.59,17.704782973295934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79860,21.58,17.706975685644256,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79920,21.57,17.709160723624066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-79980,21.56,17.711327051580728,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80040,21.55,17.713495893862934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80100,21.54,17.715643945351648,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80160,21.53,17.717786221408367,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80220,21.52,17.719911031795085,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80280,21.51,17.722035068309072,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80340,21.5,17.72414633932616,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80400,21.490000000000006,17.726233963146647,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80460,21.48,17.728326751820468,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80520,21.470000000000006,17.730396370560307,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80580,21.46,17.73246422107877,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80640,21.45,17.73452063797432,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80700,21.44,17.736558849691605,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80760,21.43,17.738596452517665,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80820,21.42,17.740615740820907,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80880,21.41,17.742623443453844,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-80940,21.4,17.7446300167452,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81000,21.39,17.74661802623646,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81060,21.380000000000006,17.748595122822387,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81120,21.37,17.75056492838794,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81180,21.36,17.7525238908118,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81240,21.35,17.75446903527859,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81300,21.34,17.75640834937579,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81360,21.33,17.758335790157503,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81420,21.32,17.76025077575478,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81480,21.310000000000006,17.76215929941556,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81540,21.3,17.764049955188906,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81600,21.29,17.765934167765128,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81660,21.28,17.767811923646487,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81720,21.27,17.76967211393516,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81780,21.26,17.77152557228109,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81840,21.25,17.773372579851245,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81900,21.240000000000006,17.77519620611066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-81960,21.230000000000004,17.777024965142676,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82020,21.220000000000006,17.77883024230643,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82080,21.21,17.780634687404614,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82140,21.200000000000006,17.78242681069738,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82200,21.19,17.7842014604633,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82260,21.18,17.785975202931823,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82320,21.17,17.787730980517157,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82380,21.16,17.789480866951497,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82440,21.150000000000006,17.79121810766797,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82500,21.14,17.792948769669238,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82560,21.130000000000006,17.794662387067326,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82620,21.12,17.796374949187108,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82680,21.110000000000007,17.79806441138567,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82740,21.1,17.799752490033796,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82800,21.1,17.81708757188197,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82860,21.1,17.83441001274622,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82920,21.1,17.85172059040046,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-82980,21.1,17.86902468417543,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83040,21.1,17.886303999138363,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83100,21.1,17.903590095929612,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83160,21.1,17.920857658549515,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83220,21.1,17.93811317759507,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83280,21.1,17.955362300737427,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83340,21.1,17.972593498560627,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83400,21.1,17.98981805774057,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83460,21.1,18.007030852522057,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83520,21.1,18.024231741905147,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83580,21.1,18.041418967876943,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83640,21.1,18.058602331335358,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83700,21.1,18.07577282797003,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83760,21.1,18.092930944082987,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83820,21.1,18.110077116663565,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83880,21.1,18.127216953150565,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-83940,21.1,18.144339203780373,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84000,21.1,18.161455515922214,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84060,21.1,18.178559520887468,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84120,21.1,18.195651424851047,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84180,21.1,18.212737547047453,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84240,21.1,18.22980586747791,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84300,21.1,18.246868299899408,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84360,21.1,18.263918241312922,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84420,21.1,18.280956683395356,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84480,21.1,18.297988639249017,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84540,21.1,18.315003410920514,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84600,21.1,18.33201209092292,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84660,21.1,18.34900890992356,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84720,21.1,18.36599360929476,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84780,21.1,18.382966332204038,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84840,21.1,18.39993346199943,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84900,21.1,18.41688839831532,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-84960,21.1,18.433832218777933,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85020,21.1,18.450763582354128,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85080,21.1,18.46768331360991,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85140,21.1,18.4845970042603,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85200,21.1,18.501493479479198,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85260,21.1,18.51838408561357,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85320,21.1,18.535268375794693,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85380,21.1,18.552135663121888,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85440,21.1,18.568990897463078,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85500,21.1,18.58584019717356,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85560,21.1,18.602677742735573,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85620,21.1,18.61950405310868,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85680,21.1,18.63632436147588,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85740,21.1,18.65312714432266,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85800,21.1,18.669923815576926,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85860,21.1,18.686709193479647,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85920,21.1,18.703482693319874,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-85980,21.1,18.720244736259495,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86040,21.1,18.737001194267982,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86100,21.1,18.753745786573948,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86160,21.1,18.77047322866284,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86220,21.1,18.787200641561643,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86280,21.1,18.803911392624734,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86340,21.1,18.82060993001132,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86400,21.091666666666672,18.8315128186418,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86460,21.083333333333336,18.842392709476247,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86520,21.075000000000006,18.85325708492601,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86580,21.066666666666674,18.864092194124407,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86640,21.058333333333334,18.8748998992951,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86700,21.05,18.885702530899373,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86760,21.041666666666668,18.896476059601977,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86820,21.033333333333335,18.907231915492627,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86880,21.025000000000006,18.917967116416374,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-86940,21.016666666666673,18.9286787419227,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87000,21.008333333333336,18.93936839152493,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87060,21.000000000000004,18.950048049936566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87120,20.99166666666667,18.960687656945147,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87180,20.983333333333334,18.971321470996052,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87240,20.975,18.981933899365846,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87300,20.966666666666672,18.992523085745436,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87360,20.958333333333336,19.003084195038976,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87420,20.95,19.01364127399781,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87480,20.941666666666674,19.024163961881108,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87540,20.933333333333334,19.03466559544781,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87600,20.925,19.045156175090803,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87660,20.916666666666668,19.055618041265163,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87720,20.908333333333335,19.066063479869868,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87780,20.9,19.07649367834163,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87840,20.891666666666666,19.08689523786568,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87900,20.883333333333333,19.09728060469173,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-87960,20.875000000000004,19.10765064175284,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88020,20.866666666666667,19.11798667283963,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88080,20.858333333333334,19.128312269408138,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88140,20.85,19.13861651955529,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88200,20.841666666666672,19.148903343043443,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88260,20.833333333333336,19.159162336894347,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88320,20.825000000000006,19.169413041955053,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88380,20.816666666666674,19.17963414883012,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88440,20.808333333333334,19.189828920906308,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88500,20.800000000000008,19.20001941991865,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88560,20.791666666666668,19.21018113480841,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88620,20.783333333333335,19.220327420380652,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88680,20.775,19.230452512789494,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88740,20.766666666666673,19.24055528290843,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88800,20.758333333333333,19.25064205434318,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88860,20.75,19.260707975282347,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88920,20.741666666666667,19.270746640819603,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-88980,20.733333333333334,19.280773783412688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89040,20.725,19.290781644682532,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89100,20.716666666666672,19.300765898245526,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89160,20.708333333333336,19.31073459043274,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89220,20.7,19.320682597579086,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89280,20.691666666666674,19.330608920343092,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89340,20.683333333333334,19.34051345882913,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89400,20.675,19.350403596007407,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89460,20.666666666666668,19.36027115323886,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89520,20.658333333333335,19.370122308257137,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89580,20.650000000000006,19.379959652639148,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89640,20.641666666666666,19.389768574199344,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89700,20.633333333333333,19.39955634786546,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89760,20.625,19.40933526363728,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89820,20.616666666666667,19.419081129260586,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89880,20.608333333333334,19.428810878782706,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-89940,20.6,19.4385315849183,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90000,20.580000000000005,19.438861193662643,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90060,20.560000000000006,19.43916217650482,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90120,20.54,19.439431059921613,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90180,20.52,19.439659978118836,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90240,20.5,19.439859628730517,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90300,20.480000000000004,19.440027911975427,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90360,20.46,19.440149929440214,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90420,20.44,19.44024374276352,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90480,20.42,19.440309684260335,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90540,20.400000000000006,19.440336398096576,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90600,20.38,19.44032313669316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90660,20.36,19.440289519542922,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90720,20.34,19.44021373211506,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90780,20.32,19.440105557492092,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90840,20.3,19.439965088783282,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90900,20.28,19.439794846003014,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-90960,20.26,19.43958514031573,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91020,20.24,19.43934922510545,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91080,20.22,19.43906750490572,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91140,20.200000000000006,19.438762189830864,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91200,20.18,19.43842511784689,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91260,20.16,19.43804765550597,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91320,20.14,19.437647334791436,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91380,20.12,19.437209111623535,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91440,20.1,19.43673666475245,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91500,20.08,19.43622440560785,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91560,20.060000000000006,19.43569650424342,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91620,20.04,19.43512260871844,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91680,20.02,19.434515518716506,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91740,20.0,19.43389166754045,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91800,19.98,19.43321713927727,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91860,19.96,19.432514776139218,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91920,19.94,19.43178541509404,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-91980,19.92,19.43102039122918,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92040,19.9,19.4302225176117,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92100,19.88,19.42939276450052,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92160,19.86,19.42853265259105,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92220,19.84,19.427638707171788,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92280,19.82,19.42671326431136,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92340,19.8,19.4257535104038,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92400,19.78,19.424769720659803,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92460,19.76,19.423748608870106,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92520,19.74,19.422692887371067,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92580,19.72,19.421604091222655,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92640,19.7,19.420498173144594,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92700,19.68,19.419347254875426,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92760,19.66,19.41816285226853,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92820,19.64,19.416962022755467,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92880,19.62,19.41571524729185,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-92940,19.6,19.41443552158537,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93000,19.58,19.41313441580078,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93060,19.56,19.411803274217547,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93120,19.54,19.410428346368448,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93180,19.52,19.40903753867785,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93240,19.5,19.40760486212532,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93300,19.48,19.406140270355237,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93360,19.46,19.404653804968536,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93420,19.44,19.403127162371664,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93480,19.42,19.401577633167037,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93540,19.4,19.399993896484375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93600,19.381666666666664,19.38165227227561,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93660,19.363333333333333,19.363327026367188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93720,19.345,19.344985961914066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93780,19.326666666666664,19.32666015625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93840,19.308333333333326,19.30831909179688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93900,19.29,19.289993286132812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-93960,19.271666666666665,19.271652221679688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94020,19.253333333333334,19.253326183508527,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94080,19.235,19.2349853515625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94140,19.216666666666672,19.21665954589844,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94200,19.198333333333327,19.198318481445316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94260,19.18,19.17999267578125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94320,19.16166666666667,19.16165161132813,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94380,19.143333333333327,19.143325805664066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94440,19.125,19.124995901217858,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94500,19.10666666666667,19.10665893554688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94560,19.088333333333328,19.088332738197423,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94620,19.07,19.069992065429688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94680,19.051666666666666,19.051662180795866,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94740,19.033333333333328,19.0333251953125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94800,19.015,19.014995286201575,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94860,18.996666666666666,18.996658325195316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94920,18.978333333333328,18.978332247534627,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-94980,18.96,18.95999145507813,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95040,18.941666666666666,18.941662253657785,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95100,18.923333333333332,18.923324584960934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95160,18.905,18.90499582307104,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95220,18.886666666666667,18.88665771484375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95280,18.868333333333332,18.868328245225126,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95340,18.85,18.849990844726566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95400,18.831666666666667,18.8316645941593,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95460,18.813333333333333,18.813323974609375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95520,18.795,18.794994572996053,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95580,18.776666666666667,18.776657104492188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95640,18.758333333333333,18.758328816206678,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95700,18.740000000000006,18.739990234375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95760,18.721666666666664,18.72166193509554,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95820,18.703333333333333,18.703323364257812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95880,18.685000000000006,18.684994086087453,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-95940,18.666666666666664,18.666656494140625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96000,18.648333333333333,18.648330688476566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96060,18.630000000000006,18.62998962402344,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96120,18.611666666666665,18.61166112019735,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96180,18.593333333333334,18.59332275390625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96240,18.575000000000006,18.574996948242188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96300,18.556666666666665,18.556655883789066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96360,18.538333333333334,18.538330078125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96420,18.52,18.51998901367188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96480,18.501666666666665,18.501660366876155,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96540,18.483333333333334,18.483322143554688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96600,18.465,18.464994514256453,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96660,18.44666666666667,18.4466552734375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96720,18.428333333333335,18.42832883341334,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96780,18.410000000000004,18.409988403320316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96840,18.391666666666666,18.39166224585812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96900,18.373333333333335,18.37332153320313,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-96960,18.355000000000004,18.354995727539066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97020,18.336666666666666,18.336654663085934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97080,18.318333333333335,18.31832885742188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97140,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97200,18.3,18.299985214122827,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97260,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97320,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97380,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97440,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97500,18.300000000000008,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97560,18.3,18.299985214122827,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97620,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97680,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97740,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97800,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97860,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97920,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-97980,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98040,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98100,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98160,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98220,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98280,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98340,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98400,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98460,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98520,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98580,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98640,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98700,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98760,18.300000000000008,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98820,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98880,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-98940,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99000,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99060,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99120,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99180,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99240,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99300,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99360,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99420,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99480,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99540,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99600,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99660,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99720,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99780,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99840,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99900,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-99960,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100020,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100080,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100140,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100200,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100260,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100320,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100380,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100440,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100500,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100560,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100620,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100680,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100740,18.3,18.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100800,18.281666666666666,18.28165639761485,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100860,18.263333333333335,18.263320922851566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100920,18.245,18.2449951171875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-100980,18.226666666666667,18.226654052734375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101040,18.208333333333332,18.208328247070316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101100,18.19,18.189987182617188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101160,18.171666666666667,18.17165406909048,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101220,18.153333333333336,18.1533203125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101280,18.135,18.134994506835934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101340,18.116666666666667,18.116653442382812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101400,18.098333333333333,18.098325935222935,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101460,18.080000000000005,18.079986572265625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101520,18.061666666666667,18.061660766601566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101580,18.043333333333333,18.04331970214844,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101640,18.025000000000006,18.024993896484375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101700,18.006666666666668,18.00665283203125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101760,17.988333333333333,17.988326196267053,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101820,17.97,17.969985961914066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101880,17.951666666666668,17.95165997071082,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-101940,17.933333333333334,17.933319091796875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102000,17.915,17.914993286132816,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102060,17.896666666666665,17.896652221679688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102120,17.878333333333334,17.878326416015625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102180,17.86,17.8599853515625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102240,17.841666666666665,17.84165954589844,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102300,17.823333333333334,17.823318481445316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102360,17.805,17.80499267578125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102420,17.786666666666672,17.786651611328125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102480,17.768333333333327,17.768325805664066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102540,17.75,17.75,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102600,17.73166666666667,17.731658935546875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102660,17.713333333333328,17.713327681863014,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102720,17.695,17.694992065429688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102780,17.676666666666666,17.67666361261965,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102840,17.658333333333328,17.6583251953125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102900,17.64,17.639994787276848,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-102960,17.621666666666666,17.621658325195316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103020,17.603333333333328,17.60332858372369,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103080,17.585,17.58499124367651,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103140,17.566666666666666,17.566663953492775,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103200,17.548333333333332,17.54832458496094,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103260,17.53,17.529996247241584,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103320,17.511666666666667,17.51165771484375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103380,17.493333333333336,17.493330439558196,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103440,17.475,17.474990844726566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103500,17.456666666666667,17.456660630913383,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103560,17.438333333333336,17.438323974609375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103620,17.42,17.419993659738516,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103680,17.401666666666664,17.401657104492188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103740,17.383333333333336,17.38332970447107,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103800,17.365,17.364990234375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103860,17.346666666666664,17.346661604036285,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103920,17.328333333333337,17.328323364257816,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-103980,17.31,17.30999685062087,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104040,17.291666666666668,17.291656494140625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104100,17.273333333333333,17.273328865536563,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104160,17.255,17.25498962402344,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104220,17.236666666666665,17.236663818359375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104280,17.21833333333333,17.21832275390625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104340,17.2,17.19999611199081,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104400,17.246666666666666,17.246653238146074,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104460,17.293333333333337,17.29331970214844,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104520,17.34,17.339996141229587,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104580,17.386666666666667,17.38665771484375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104640,17.433333333333334,17.433319091796875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104700,17.48,17.47999389659046,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104760,17.526666666666664,17.52665636937542,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104820,17.573333333333334,17.573318481445316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104880,17.62,17.6199951171875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-104940,17.666666666666668,17.666656494140625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105000,17.713333333333328,17.713327681863014,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105060,17.76,17.75999450683594,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105120,17.806666666666665,17.806655883789066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105180,17.853333333333328,17.853330869933774,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105240,17.9,17.899993896484375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105300,17.94666666666667,17.9466552734375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105360,17.993333333333336,17.99332928879597,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105420,18.04,18.039993286132812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105480,18.086666666666666,18.086654663085934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105540,18.133333333333333,18.13332944349598,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105600,18.18,18.17999267578125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105660,18.226666666666667,18.226654052734375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105720,18.273333333333333,18.273330688476566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105780,18.32,18.319992065429688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105840,18.366666666666667,18.366653442382812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105900,18.413333333333334,18.413330078125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-105960,18.46,18.45999145507813,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106020,18.506666666666668,18.50665283203125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106080,18.553333333333327,18.55332946777344,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106140,18.6,18.599990844726566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106200,18.646666666666672,18.646652221679688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106260,18.693333333333335,18.69332885742188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106320,18.74,18.739990234375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106380,18.78666666666667,18.78665161132813,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106440,18.833333333333336,18.833326468248305,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106500,18.88,18.87998962402344,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106560,18.926666666666666,18.926666192266786,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106620,18.973333333333333,18.97332763671875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106680,19.02,19.01998901367188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106740,19.066666666666666,19.066663973427268,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106800,19.113333333333333,19.11332698141899,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106860,19.16,19.159988403320316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106920,19.206666666666667,19.20666068890582,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-106980,19.253333333333334,19.253326183508527,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107040,19.3,19.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107100,19.346666666666664,19.346662969391566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107160,19.393333333333327,19.393325805664066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107220,19.44,19.439987182617188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107280,19.486666666666665,19.486663818359375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107340,19.533333333333335,19.5333251953125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107400,19.58,19.579986572265625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107460,19.626666666666672,19.626663208007812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107520,19.673333333333332,19.673324584960934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107580,19.72,19.719985961914066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107640,19.766666666666666,19.76666259765625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107700,19.813333333333333,19.813323974609375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107760,19.86,19.8599853515625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107820,19.906666666666666,19.906661987304688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107880,19.953333333333333,19.953323364257812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-107940,20.0,19.999998148708386,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108000,20.01,20.009989072073427,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108060,20.02,20.01998901367188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108120,20.03,20.02999537631681,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108180,20.040000000000006,20.039993286132812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108240,20.05,20.04998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108300,20.06,20.05999514378022,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108360,20.07,20.06998900376485,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108420,20.080000000000005,20.079986572265625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108480,20.09,20.089996337890625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108540,20.1,20.099990844726566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108600,20.11,20.1099853515625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108660,20.12,20.11999491458104,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108720,20.13,20.12998962402344,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108780,20.14,20.139998910757264,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108840,20.15,20.149993896484375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108900,20.160000000000004,20.159988403320316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-108960,20.17,20.16999764644319,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109020,20.18,20.17999267578125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109080,20.19,20.189987182617188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109140,20.200000000000006,20.199996948242188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109200,20.21,20.20999145507813,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109260,20.22,20.219985961914066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109320,20.23,20.22999498727504,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109380,20.240000000000006,20.239990234375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109440,20.25,20.24999785172252,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109500,20.26,20.25999404266188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109560,20.270000000000003,20.26998901367188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109620,20.28,20.279994353917576,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109680,20.29,20.289993286132812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109740,20.3,20.29998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109800,20.310000000000006,20.30999755859375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109860,20.32,20.319992065429688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109920,20.330000000000005,20.329986572265625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-109980,20.340000000000003,20.339996337890625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110040,20.35,20.349990844726566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110100,20.36,20.3599853515625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110160,20.37,20.3699951171875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110220,20.380000000000006,20.37998962402344,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110280,20.39,20.38999938964844,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110340,20.400000000000006,20.399993089872748,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110400,20.41,20.409988403320316,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110460,20.42,20.419995311803923,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110520,20.43,20.42999267578125,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110580,20.44,20.439987182617188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110640,20.450000000000006,20.449996948242188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110700,20.46,20.45999145507813,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110760,20.47,20.469985961914066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110820,20.48,20.479995727539066,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110880,20.490000000000006,20.489990234375,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-110940,20.5,20.4999988324068,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111000,20.51,20.509994506835934,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111060,20.520000000000003,20.51998901367188,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111120,20.53,20.529996404499727,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111180,20.540000000000006,20.539993286132812,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111240,20.55,20.54998779296875,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111300,20.56,20.55999556115454,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111360,20.57,20.569992065429688,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111420,20.580000000000005,20.579986572265625,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111480,20.590000000000003,20.58999556257718,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111540,20.6,20.599990844726566,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0,33.019030178616134,33.019030178616134,0.0,0.0,0.0,0.0,0.0,0.0
-111600,20.618333333333336,20.61263780281927,32.825316689853004,30.000000006093423,1.0879421538075698,12848.405073732634,15.011915149034786,900.7149089420869,0.3720479256249365,0.00033504207571667536,30.000000006093423,30.000000006093423,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-111660,20.636666666666667,20.62527431726355,32.85886034305463,30.00000000608013,1.0879421538075698,13000.948130812063,15.329156988377948,919.7494193026766,0.3756718786129175,0.00033913382568745264,30.00000000608013,30.00000000608013,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-111720,20.655,20.63791663050712,33.034544946838906,29.999999992980882,1.0879421538075698,13799.891178831524,16.923415336185688,1015.4049201711412,0.3929057825311103,0.00036028596434354833,29.999999992980882,29.999999992980882,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-111780,20.673333333333332,20.650539880313413,33.06729985026463,30.00000000541459,1.0879421538075698,13948.847262243471,17.25957346814902,1035.574408088941,0.3963522651069699,0.0003642941173891178,30.00000000541459,30.00000000541459,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-111840,20.691666666666666,20.66316165699548,33.01138713837891,30.000000005609106,1.0879421538075698,13694.57871326725,16.779872403482702,1006.7923442089623,0.3914155070759443,0.000357654135217995,30.000000005609106,30.000000005609106,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-111900,20.71,20.675773722057073,32.885517889177386,30.000000088189122,1.0879421538075698,13122.175566255388,15.684317840786841,941.0590704472104,0.3796477542859854,0.0003426176691978249,30.000000088189122,30.000000088189122,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-111960,20.728333333333335,20.688382331328267,32.74061959096314,30.000000060426178,1.0879421538075698,12463.236451945408,14.469443358874974,868.1666015324986,0.3656822493485005,0.00032530718936195824,30.000000060426178,30.000000060426178,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112020,20.746666666666673,20.70097976399736,32.61618082074413,30.00000004818297,1.0879421538075698,11897.338979801578,13.475842138650586,808.5505283190349,0.3534114673625338,0.00031045920709146373,30.00000004818297,30.00000004818297,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112080,20.765,20.7135763935458,32.52054600626714,30.00000003833305,1.0879421538075698,11462.430314143352,12.747498920108928,764.8499352065357,0.3438439718561087,0.0002990684037420339,30.00000003833305,30.00000003833305,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112140,20.783333333333335,20.72616615328237,32.450299052273714,30.00000002354949,1.0879421538075698,11142.975459632222,12.2349707195406,734.098243172436,0.3367781396428388,0.00029072068069195843,30.00000002354949,30.00000002354949,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112200,20.801666666666666,20.738753395635936,32.40004015095276,30.000000022655573,1.0879421538075698,10914.418174369705,11.88281044181316,712.9686265087895,0.33174578169514,0.00028476688751553013,30.000000022655573,30.000000022655573,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112260,20.82,20.751326428323058,32.36508987253237,29.999999812490806,1.0879421538075698,10755.479306778643,11.648213511157156,698.8928106694293,0.3283067621728643,0.0002806454260199805,29.999999812490806,29.999999812490806,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112320,20.838333333333335,20.763900510148837,32.34131012795548,30.00000001791118,1.0879421538075698,10647.337648905635,11.496863246517115,689.8117947910271,0.326049268683662,0.0002778608371403913,30.00000001791118,30.00000001791118,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112380,20.85666666666667,20.776463604678067,32.32574615771298,30.000000015187283,1.0879421538075698,10576.558978187868,11.405470229629648,684.3282137777787,0.3246707989745849,0.00027605927789902806,30.000000015187283,30.000000015187283,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112440,20.875,20.78902128044075,32.31612058942297,30.000000011823015,1.0879421538075698,10532.7857764295,11.356876147927117,681.412568875627,0.3239330690718692,0.000274968352837628,30.000000011823015,30.000000011823015,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112500,20.893333333333334,20.801571816006213,32.310746867100015,30.00000001190267,1.0879421538075698,10508.348246088428,11.338743577856366,680.3246146713819,0.3236569271524956,0.00027438634238305545,30.00000001190267,30.00000001190267,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112560,20.91166666666667,20.8141152550738,32.30840668569879,29.99999981049922,1.0879421538075698,10497.706957255688,11.342333261746106,680.5399957047663,0.323711632056747,0.0002741675542029223,29.99999981049922,29.99999981049922,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112620,20.93,20.82665339065593,32.30787304718845,30.000000015004172,1.0879421538075698,10495.279253718732,11.358916582526293,681.5349949515776,0.32396411350683096,0.00027416514909640605,30.000000015004172,30.000000015004172,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112680,20.948333333333334,20.839183897694422,32.30860839822953,30.000000015324222,1.0879421538075698,10498.623333336183,11.38471031097992,683.0826186587951,0.3243560433063912,0.00027431487939448096,30.000000015324222,30.000000015324222,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112740,20.966666666666672,20.851712659335337,32.3104826340488,30.000000015215978,1.0879421538075698,10507.146605271932,11.418860784577957,685.1316470746773,0.3248734992206415,0.00027460131253715655,30.000000015215978,30.000000015215978,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112800,20.985,20.864237461966216,32.31323688600527,30.000000018173214,1.0879421538075698,10519.671823071252,11.459570982477269,687.5742589486363,0.3254882037719609,0.00027499347069288486,30.000000018173214,30.000000018173214,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112860,21.003333333333334,20.876742335385913,32.316649079850286,30.000000017949876,1.0879421538075698,10535.18911068456,11.505276062143473,690.3165637286083,0.3261755735130649,0.000275464473988459,30.000000017949876,30.000000017949876,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112920,21.021666666666672,20.889246963437444,32.3205510679394,30.00000001411965,1.0879421538075698,10552.933802124671,11.554834033428293,693.2900420056976,0.3269176288100525,0.0002759946212883888,30.00000001411965,30.00000001411965,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-112980,21.04,20.901756968568638,32.324800585744576,30.00000001760397,1.0879421538075698,10572.2588858135,11.607254292951508,696.4352575770905,0.3276988936842739,0.00027656695176588313,30.00000001760397,30.00000001760397,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113040,21.058333333333326,20.914248464532736,32.32929192188817,30.00000001685368,1.0879421538075698,10592.68368140079,11.661755893859894,699.7053536315938,0.3285072479263224,0.00027716838894226387,30.00000001685368,30.00000001685368,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113100,21.076666666666668,20.92673787901001,32.333950618230226,29.999999812284532,1.0879421538075698,10613.870490812182,11.717840968443758,703.0704581066253,0.32933495539221397,0.00027779034807774597,29.999999812284532,29.999999812284532,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113160,21.095000000000006,20.939224267480704,32.33873275667387,29.999999814696988,1.0879421538075698,10635.617724033666,11.77519477782127,706.5116866692763,0.330177106086592,0.0002784274898643125,29.999999814696988,29.999999814696988,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113220,21.113333333333333,20.951690566415735,32.34360840256253,30.000000019850326,1.0879421538075698,10657.789269560071,11.833579775604152,710.0147865362491,0.3310300083269462,0.00027907588672060064,30.000000019850326,30.000000019850326,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113280,21.131666666666668,20.9641558032378,32.34856061742205,30.000000019624892,1.0879421538075698,10680.30995398085,11.892915532324686,713.5749319394811,0.3318923198908384,0.0002797339752079302,30.000000019624892,30.000000019624892,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113340,21.15,20.976627194424022,32.35357417639934,30.000000022608013,1.0879421538075698,10703.109592210178,11.95310477378783,717.1862864272697,0.3327624808489942,0.0002804000295854268,30.000000022608013,30.000000022608013,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113400,21.168333333333337,20.989079883159896,32.35864035629338,30.00000002234214,1.0879421538075698,10726.148544001004,12.014052887923192,720.8431732753917,0.3336389999376426,0.00028107252344966203,30.00000002234214,30.00000002234214,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113460,21.186666666666667,21.00153066393668,32.36374922002647,30.00000002533698,1.0879421538075698,10749.381589913217,12.075717208659677,724.5430325195807,0.33452115679445293,0.00028175059596426724,30.00000002533698,30.00000002533698,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113520,21.205,21.013977808713168,32.36889553886647,29.999999809169818,1.0879421538075698,10772.785963263022,12.138061249574294,728.2836749744577,0.3354083327588265,0.00028243360157476007,29.999999809169818,29.999999809169818,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113580,21.223333333333333,21.026416134269198,32.37407160129369,29.99999981230264,1.0879421538075698,10796.3246012084,12.201023846228486,732.0614307737089,0.3362995728612873,0.0002831205077737515,29.99999981230264,29.99999981230264,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113640,21.241666666666667,21.038842914674827,32.37927444470879,30.000000027802038,1.0879421538075698,10819.984062568312,12.264578893327416,735.874733599645,0.3371944338637992,0.00028381084491023244,30.000000027802038,30.000000027802038,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113700,21.26,21.051275829598666,32.38470106497577,30.000000027504267,1.0879421538075698,10844.66215249648,12.330309168851832,739.8185501311099,0.33811495311234663,0.0002845287440339456,30.000000027504267,30.000000027504267,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113760,21.278333333333336,21.06368959050167,32.39001614300534,30.000000023180572,1.0879421538075698,10868.833011454544,12.395559857608257,743.7335914564952,0.3390238251285995,0.00028523335786231874,30.000000023180572,30.000000023180572,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113820,21.296666666666667,21.076091792343398,32.39533938866452,30.000000026965047,1.0879421538075698,10893.040976637629,12.461278417186074,747.6767050311646,0.3399343148355889,0.0002859392229080112,30.000000026965047,30.000000026965047,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113880,21.315,21.08850077174929,32.400564718670076,30.00000002996913,1.0879421538075698,10916.803664319152,12.526656470877006,751.5993882526202,0.3408352731655563,0.0002866339455356662,30.00000002996913,30.00000002996913,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-113940,21.333333333333332,21.100900174825927,32.40581413605065,29.999999812807783,1.0879421538075698,10940.676892927977,12.592633757661364,755.558025459682,0.341739686085286,0.00028733191645956204,29.999999812807783,29.999999812807783,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114000,21.351666666666667,21.11328917439284,32.41123090787427,30.000000032661976,1.0879421538075698,10965.309194930134,12.660357318150533,759.6214390890318,0.3426630847971432,0.0002880502712078855,30.000000032661976,30.000000032661976,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114060,21.37,21.125683188178694,32.41663567542298,30.00000003237336,1.0879421538075698,10989.887907434351,12.728437002130056,763.7062201278034,0.3435863501389807,0.00028876782808582685,30.00000003237336,30.00000003237336,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114120,21.388333333333332,21.138058887975713,32.421759456098,30.000000032090522,1.0879421538075698,11013.188804510432,12.794646709698586,767.678802581915,0.3444795212247411,0.0002894516833599156,30.000000032090522,30.000000032090522,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114180,21.406666666666666,21.150432811865294,32.42690654310949,30.000000035085225,1.0879421538075698,11036.59567453543,12.86146438984258,771.6878633905548,0.3453762226147548,0.00029013883564396663,30.000000035085225,30.000000035085225,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114240,21.425,21.16280338830416,32.432239733998486,29.999999819170842,1.0879421538075698,11060.849865729931,12.930226297485078,775.8135778491046,0.3462941800441121,0.0002908488471735572,29.999999819170842,29.999999819170842,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114300,21.443333333333328,21.1751648109486,32.43758265652208,30.00000003452836,1.0879421538075698,11085.14635123705,12.99949280871685,779.969568523011,0.3472139795512296,0.0002915603141127866,30.00000003452836,30.00000003452836,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114360,21.461666666666666,21.187514904704226,32.44288748695458,29.999999817398237,1.0879421538075698,11109.271575999217,13.068870374105108,784.1322224463063,0.348130394526054,0.00029226752616127565,29.999999817398237,29.999999817398237,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114420,21.48,21.19987082375129,32.44814862587488,30.00000003278837,1.0879421538075698,11133.19614239066,13.138338739486027,788.3003243691617,0.3490431999997453,0.0002929700579269084,30.00000003278837,30.00000003278837,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114480,21.49833333333333,21.212208511771546,32.453375139331534,30.000000036827284,1.0879421538075698,11156.964207226289,13.207928480487935,792.4757088292761,0.3499528384504729,0.000293668571691846,30.000000036827284,30.000000036827284,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114540,21.51666666666667,21.224534264376487,32.458577391489094,30.000000039816605,1.0879421538075698,11180.621946194937,13.277734402358146,796.6640641414888,0.3508605763635427,0.00029436442816819727,30.000000039816605,30.000000039816605,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114600,21.535,21.23686644963998,32.464000926653696,29.99999982052485,1.0879421538075698,11205.287002213701,13.349863447277034,800.9918068366219,0.3517936155992764,0.0002950876559969317,29.99999982052485,29.99999982052485,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114660,21.553333333333335,21.24918999234676,32.46958933864971,29.99999981378285,1.0879421538075698,11230.700885223818,13.423834525088143,805.4300715052887,0.35274536998491934,0.0002958310938046305,29.99999981378285,29.99999981378285,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114720,21.57166666666667,21.26150235576424,32.47513278587618,29.99999982197479,1.0879421538075698,11255.910218615198,13.497883153600295,809.8729892160176,0.3536930057771037,0.00029656942862469634,29.99999982197479,29.99999982197479,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114780,21.59,21.27382029909032,32.480604696656606,30.00000004526696,1.0879421538075698,11280.793254803772,13.571805819049356,814.3083491429612,0.3546339915048239,0.00029729973656741297,30.00000004526696,30.00000004526696,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114840,21.608333333333334,21.28612025918552,32.48602237668307,29.999999814169698,1.0879421538075698,11305.43173769352,13.645704776409568,818.742286584574,0.35556971053009123,0.00029802369148671995,29.999999814169698,29.999999814169698,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114900,21.626666666666665,21.29841782047018,32.49140618052039,30.00000004789535,1.0879421538075698,11329.914051458662,13.719775499225902,823.1865299535541,0.3565026882952012,0.00029874399467784283,30.00000004789535,30.00000004789535,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-114960,21.645,21.310702518882998,32.496770845976,30.000000038153743,1.0879421538075698,11354.310438744737,13.794131752919855,827.6479051751912,0.3574343766315334,0.00029946226675223186,30.000000038153743,30.000000038153743,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115020,21.66333333333333,21.322987422068017,32.5021253767912,30.000000006046253,1.0879421538075698,11378.660839469328,13.868863776796037,832.131826607762,0.3583659048870528,0.00030017984168002003,30.000000006046253,30.000000006046253,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115080,21.681666666666665,21.335261995050907,32.50747472065988,30.00000005370932,1.0879421538075698,11402.987289280882,13.944011491753647,836.6406895052188,0.3592977567670114,0.0003008971087945739,30.00000005370932,30.00000005370932,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115140,21.7,21.347542080198053,32.51282143438768,30.000000053499278,1.0879421538075698,11427.301995976091,14.019623845603096,841.1774307361858,0.36023051705977394,0.00030161471451213844,30.000000053499278,30.000000053499278,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115200,21.765,21.388300596752863,32.52151959832211,30.000000006018013,1.0879421538075698,11466.857966578702,14.193358313764932,851.601498825896,0.3623556140549991,0.00030293627062344614,30.000000006018013,30.000000006018013,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115260,21.83,21.428967858584574,32.533677231499354,30.000000058363327,1.0879421538075698,11522.14575932178,14.401254604887068,864.0752762932241,0.3648662539174109,0.00030467999626533615,30.000000058363327,30.000000058363327,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115320,21.895,21.469543655520877,32.55025671070607,30.00000006423288,1.0879421538075698,11597.542542475137,14.653499481412556,879.2099688847536,0.3678668090623518,0.00030696351648793054,30.00000006423288,30.00000006423288,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115380,21.96,21.510033829244236,32.57100743385416,30.00000000603831,1.0879421538075698,11691.908758418142,14.949729460445239,896.9837676267143,0.3713292297459887,0.0003097578274555949,30.00000000603831,30.00000000603831,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115440,22.025,21.55041121532961,32.59208471511173,30.00000000584528,1.0879421538075698,11787.759765665243,15.255358725719535,915.3215235431722,0.3748351015831436,0.0003125970490621416,30.00000000584528,30.00000000584528,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115500,22.090000000000003,21.59071803287952,32.61108882913284,30.00000008779697,1.0879421538075698,11874.182467752249,15.547530452458089,932.8518271474852,0.3781263690541998,0.0003151909678759922,30.00000008779697,30.00000008779697,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115560,22.155,21.630922962501877,32.627818583345835,30.000000082035346,1.0879421538075698,11950.262694148103,15.82331069084964,949.3986414509784,0.3811812797121611,0.00031751382522551537,30.000000082035346,30.000000082035346,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115620,22.220000000000006,21.67101918497827,32.64311838356093,30.000000087767148,1.0879421538075698,12019.84001204526,16.090163307825446,965.4097984695267,0.3840913951940032,0.0003196675724026353,30.000000087767148,30.000000087767148,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115680,22.285,21.71103537109664,32.657880931959,30.00000010507159,1.0879421538075698,12086.97407191714,16.35663975481142,981.3983852886853,0.3869540576138458,0.00032176110360121967,30.00000010507159,30.00000010507159,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115740,22.35,21.75094787553985,32.67266189705849,30.000000005678416,1.0879421538075698,12154.19241424114,16.628220164066615,997.6932098439968,0.389828612882979,0.0003238614984800744,30.000000005678416,30.000000005678416,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115800,22.415,21.79076677071196,32.687704102794854,30.000000005631748,1.0879421538075698,12222.598322227965,16.907544308268786,1014.4526584961274,0.3927415636770841,0.00032599858164557673,30.000000005631748,30.000000005631748,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115860,22.48,21.83049287098395,32.70306751403641,30.000000117000752,1.0879421538075698,12292.464437119212,17.195437225413016,1031.7262335247808,0.3956993304317039,0.00032817978523315866,30.000000117000752,30.000000117000752,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115920,22.545,21.87012584393927,32.71873498093605,30.000000005436746,1.0879421538075698,12363.71428878454,17.49194740403895,1049.5168442423371,0.3987001021218719,0.0003304032310342382,30.000000005436746,30.000000005436746,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-115980,22.61,21.90964461211926,32.73466510476372,30.000000005390376,1.0879421538075698,12436.158091486312,17.796779085488854,1067.8067451293311,0.4017387123751125,0.00033266332209266186,30.000000005390376,30.000000005390376,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116040,22.675,21.94909067256319,32.75081310770402,30.000000005242928,1.0879421538075698,12509.592721308843,18.10977822955233,1086.58669377314,0.40481163304800377,0.00033495583967808933,30.000000005242928,30.000000005242928,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116100,22.740000000000006,21.988437072843016,32.76713697523675,30.00000000509362,1.0879421538075698,12583.827112644334,18.43058242796009,1105.8349456776057,0.4079135046212972,0.00033727503229083846,30.00000000509362,30.00000000509362,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116160,22.805,22.027681738360986,32.783599292862846,30.0000000049438,1.0879421538075698,12658.691119377927,18.75893845008404,1125.5363070050425,0.41104028476662346,0.0003396163595252147,30.0000000049438,30.0000000049438,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116220,22.87,22.06682591754008,32.80016707332085,30.00000000479802,1.0879421538075698,12734.03472867796,19.094629558018728,1145.6777734811237,0.41418848447406825,0.0003419758564784438,30.00000000479802,30.00000000479802,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116280,22.935000000000006,22.105878434889746,32.81681326463807,30.000000004861413,1.0879421538075698,12809.734918109234,19.437506540515535,1166.2503924309324,0.4173554193122634,0.00034435055235039854,30.000000004861413,30.000000004861413,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116340,23.0,22.1448311532722,32.83351602945385,30.000000012000747,1.0879421538075698,12885.692348902418,19.78742587064491,1187.2455522386945,0.4205385973539581,0.0003467375673412081,30.000000012000747,30.000000012000747,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116400,23.065,22.183679061961517,32.85025766291921,30.00000000734921,1.0879421538075698,12961.826592316702,20.144272337791843,1208.6563402675106,0.4237359109604444,0.00034913470896177944,30.00000000734921,30.00000000734921,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116460,23.13,22.22244212854438,32.86702522465095,30.000000011763877,1.0879421538075698,13038.078705839047,20.50809350058281,1230.4856100349687,0.4269467900812305,0.0003515409401008596,30.000000011763877,30.000000011763877,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116520,23.195,22.261105199485534,32.8838092510651,30.000000011644264,1.0879421538075698,13114.405714741726,20.878819114028328,1252.7291468416997,0.43016967010422136,0.00035395471486079493,30.000000011644264,30.000000011644264,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116580,23.26,22.299658824162563,32.900602355093625,30.000000011416944,1.0879421538075698,13190.774005476973,21.25643589135362,1275.3861534812172,0.4334035521903589,0.00035637496152745695,30.000000011416944,30.000000011416944,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116640,23.325,22.33812439073809,32.91739848311248,30.000000011298326,1.0879421538075698,13267.156047610864,21.641049640301528,1298.4629784180913,0.4366484841841157,0.0003588015250838858,30.000000011298326,30.000000011298326,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116700,23.39,22.376491550548202,32.934192131592326,30.000000011072732,1.0879421538075698,13343.526814284187,22.032661120714547,1321.9596672428727,0.4399036355899671,0.00036123351445938224,30.000000011072732,30.000000011072732,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116760,23.455000000000005,22.414755765277558,32.95097876926809,30.000000018465354,1.0879421538075698,13419.8656639928,22.43128073764205,1345.8768442585229,0.4431682943435037,0.0003636702259240005,30.000000018465354,30.000000018465354,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116820,23.52,22.452917192483763,32.96775474946026,30.000000018498334,1.0879421538075698,13496.156081216843,22.83698413823116,1370.2190482938693,0.4464423047364689,0.0003661113648067602,30.000000018498334,30.000000018498334,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116880,23.585,22.490990586437526,32.98451682871963,30.000000018191233,1.0879421538075698,13572.383284130476,23.24987049263504,1394.9922295581025,0.4497256986036381,0.0003685569003593793,30.000000018191233,30.000000018191233,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-116940,23.65,22.528957275805702,33.00126260060641,30.000000017980966,1.0879421538075698,13648.53632722544,23.669951739809818,1420.1971043885892,0.4530178202532654,0.00037100605566276965,30.000000017980966,30.000000017980966,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117000,23.715,22.566827325689893,33.01799044653383,30.000000017774177,1.0879421538075698,13724.607850244003,24.09733201148343,1445.839920689006,0.4563187517434673,0.00037345900075253066,30.000000017774177,30.000000017774177,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117060,23.78,22.60459160688129,33.03469937268384,30.000000025020718,1.0879421538075698,13800.593299822078,24.532057528591338,1471.9234517154807,0.4596281263723867,0.0003759153265884672,30.000000025020718,30.000000025020718,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117120,23.845,22.642255386168138,33.051387504923895,30.00000002471535,1.0879421538075698,13876.484221395674,24.974228229313997,1498.45369375884,0.4629459921982864,0.00037837504980924285,30.00000002471535,30.00000002471535,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117180,23.910000000000004,22.679827638230925,33.068053508362304,30.00000000723713,1.0879421538075698,13952.274588165916,25.423979974862537,1525.4387984917526,0.46627265234466203,0.0003808382631629338,30.00000000723713,30.00000000723713,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117240,23.975,22.71729512492825,33.08469750634505,30.00000000724393,1.0879421538075698,14027.964803450635,25.88135204946113,1552.8811229676676,0.4696076875425,0.0003833047001937993,30.00000000724393,30.00000000724393,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117300,24.04,22.754657746969762,33.101340276398126,29.999999985673174,1.0879421538075698,14103.649532730647,26.346743288185483,1580.8045972911289,0.47295326243909097,0.00038577689236240256,29.999999985673174,29.999999985673174,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117360,24.105,22.791916307154015,33.117984594253215,30.00000003162447,1.0879421538075698,14179.340993729193,26.820323665640274,1609.2194199384164,0.47630980366467995,0.0003882552934390915,30.00000003162447,30.00000003162447,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117420,24.17,22.829080166429648,33.13460644733233,30.00000003887753,1.0879421538075698,14254.930469936888,27.301895484065017,1638.1137290439015,0.4796751550386215,0.00039073727465648234,30.00000003887753,30.00000003887753,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117480,24.235,22.866136332094,33.151189175069014,30.000000038472876,1.0879421538075698,14330.342054631934,27.79123626408229,1667.4741758449372,0.4830471030653415,0.000393220330465147,30.000000038472876,30.000000038472876,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117540,24.3,22.903093668405948,33.16773298444596,29.999999983684496,1.0879421538075698,14405.576901579412,28.288501717152148,1697.3101030291286,0.4864261029105903,0.0003957049151358748,29.999999983684496,29.999999983684496,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117600,24.365000000000006,22.93995766302338,33.184241923622714,30.000000007353037,1.0879421538075698,14480.652816076676,28.793894534695095,1727.6336720817055,0.489812893027265,0.00039819163855771007,30.000000007353037,30.000000007353037,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117660,24.43,22.97670966194405,33.20072011061431,30.000000006956558,1.0879421538075698,14555.588991429973,29.307463776562237,1758.4478265937344,0.4932071583727958,0.00040068051248066055,30.000000006956558,30.000000006956558,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117720,24.495,23.01335899525913,33.21717120121805,30.000000006953172,1.0879421538075698,14630.401941510927,29.82943828074597,1789.7662968447587,0.4966097599427664,0.000403172293503911,30.000000006953172,30.000000006953172,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117780,24.560000000000006,23.04990683007641,33.23359735499068,30.000000052331767,1.0879421538075698,14705.101282524543,30.35997639266573,1821.5985835599438,0.5000210569350202,0.0004056674210620109,30.000000052331767,30.000000052331767,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117840,24.625000000000004,23.086353181029853,33.24999856082433,30.00000000684577,1.0879421538075698,14779.687583551335,30.89916492902273,1853.9498957413641,0.5034409330908121,0.0004081658156737112,30.00000000684577,30.00000000684577,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117900,24.69,23.122694500513767,33.26637534854373,30.00000003226059,1.0879421538075698,14854.162518377194,31.44714444777768,1886.8286668666608,0.5068696067864167,0.0004106675866200976,30.00000003226059,30.00000003226059,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-117960,24.755000000000006,23.15892930421497,33.282727712202245,30.00000000705649,1.0879421538075698,14928.526612582244,32.003984701803645,1920.2390821082188,0.5103068450563464,0.00041317266329859867,30.00000000705649,30.00000000705649,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118020,24.820000000000004,23.19506433488921,33.30434488768037,30.000000045325642,1.0879421538075698,15026.832666905972,32.66080981635233,1959.6485889811402,0.5143026479916103,0.00041634399940440386,30.000000045325642,30.000000045325642,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118080,24.885,23.231089090932862,33.33317840317241,30.000000006534012,1.0879421538075698,15157.956086549973,33.45540066959932,2007.3240401759595,0.5190550416977144,0.00042042747405210163,30.000000006534012,30.000000006534012,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118140,24.950000000000006,23.26701424322065,33.3657405093721,30.000000056809093,1.0879421538075698,15306.035233556004,34.33175769402545,2059.905461641527,0.5241975133256018,0.0004249877373665078,30.000000056809093,30.000000056809093,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118200,25.015,23.30284066318295,33.407556236010215,30.00000000659028,1.0879421538075698,15496.196585244097,35.39271643358561,2123.5629860151366,0.5302912406792321,0.00043071964410237423,30.00000000659028,30.00000000659028,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118260,25.08,23.338544873793484,33.46579405612335,30.000000006414442,1.0879421538075698,15761.038792131967,36.778530308195094,2206.7118184917053,0.5380457445034617,0.0004385252952557616,30.000000006414442,30.000000006414442,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118320,25.145,23.37415405815299,33.52488982101452,29.99999998026333,1.0879421538075698,16029.782705275711,38.214948494165625,2292.8969096499372,0.545854255264173,0.00044645304754660704,29.99999998026333,29.99999998026333,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118380,25.21,23.40966531157725,33.59212461481268,30.00000001311609,1.0879421538075698,16335.539383324474,39.84229804465512,2390.537882679307,0.5544390196933593,0.0004554190015687036,30.00000001311609,30.00000001311609,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118440,25.275000000000006,23.44506035146144,33.66240677222758,30.000000013052407,1.0879421538075698,16655.154396371116,41.57032222865222,2494.219333719134,0.5632729552981307,0.00046478327082939583,30.000000013052407,30.000000013052407,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118500,25.34,23.480347426702,33.725295447899654,30.000000019594196,1.0879421538075698,16941.14679509177,43.194941133062116,2591.696467983728,0.5713328150562088,0.0004732319035300055,30.000000019594196,30.000000019594196,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118560,25.405,23.515538398860606,33.786216086986414,30.00000001904665,1.0879421538075698,17218.189386413218,44.818143348505814,2689.088600910349,0.5791647269229331,0.00048144733411709367,30.00000001904665,30.00000001904665,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118620,25.470000000000006,23.550608626388502,33.84569225089001,30.000000018866196,1.0879421538075698,17488.663083318126,46.44848570813901,2786.909142488341,0.5868234703711619,0.0004894941142380867,30.000000018866196,30.000000018866196,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118680,25.535,23.58558699605714,33.903028052931965,30.000000006246534,1.0879421538075698,17749.403331035996,48.070372006633356,2884.2223203980016,0.5942491252514817,0.0004972852959898773,30.000000006246534,30.000000006246534,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118740,25.6,23.62045085067647,33.95893881025369,30.00000002436573,1.0879421538075698,18003.66290815708,49.696786252382324,2981.8071751429393,0.6015136801384616,0.0005049097562390854,30.00000002436573,30.00000002436573,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118800,25.6,23.62045085067647,34.02260426214081,30.0000000303085,1.0879421538075698,18293.187775721468,51.05432165033484,3063.259299020091,0.6074456313707473,0.0005129472453684866,30.0000000303085,30.0000000303085,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118860,25.6,23.62045085067647,34.0638912508586,29.999999982165193,1.0879421538075698,18480.94463035473,51.9400531003701,3116.4031860222062,0.611254362342816,0.0005181590792367576,29.999999982165193,29.999999982165193,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118920,25.6,23.62045085067647,34.10655243009639,29.99999998709103,1.0879421538075698,18674.95050998999,52.859556832534416,3171.5734099520655,0.6151587392016314,0.0005235440089840538,29.99999998709103,29.99999998709103,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-118980,25.6,23.62045085067647,34.16495226176782,30.000000005583292,1.0879421538075698,18940.52939545425,54.12514195121208,3247.508517072725,0.6204529103517349,0.0005309149485324579,30.000000005583292,30.000000005583292,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119040,25.6,23.620443235520874,34.217015882131626,30.000000005859107,1.0879421538075698,19177.29382060367,55.25979542999508,3315.5877257997054,0.6251237350048152,0.0005374852866963139,30.000000005859107,30.000000005859107,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119100,25.6,23.62045085067647,34.257734647664854,30.00000000573629,1.0879421538075698,19362.466406126,56.15146676582853,3369.0880059497117,0.6287459320235348,0.0005426241648910272,30.00000000573629,30.00000000573629,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119160,25.6,23.62045085067647,34.28825018018634,29.999999992167808,1.0879421538075698,19501.238848685727,56.82196933646307,3409.3181601877836,0.6314424424901872,0.0005464749038944204,29.999999992167808,29.999999992167808,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119220,25.6,23.62045085067647,34.31097954744276,30.000000005585036,1.0879421538075698,19604.602817358307,57.3225957664252,3439.355745985512,0.6334408578478691,0.0005493429993495021,30.000000005585036,30.000000005585036,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119280,25.6,23.62045085067647,34.328631910288415,30.000000005548078,1.0879421538075698,19684.87867108045,57.71214197031439,3462.728518218863,0.6349871813531371,0.0005515703891256988,30.000000005548078,30.000000005548078,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119340,25.6,23.62045085067647,34.34321860527093,30.00000000551737,1.0879421538075698,19751.213099109093,58.03450380360457,3482.070228216275,0.6362611418134132,0.0005534109175199236,30.00000000551737,30.00000000551737,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119400,25.6,23.62045085067647,34.35543277591504,29.999999951256804,1.0879421538075698,19806.758486335595,58.30475978939373,3498.2855873636245,0.6373252643830172,0.0005549520571351931,29.999999951256804,29.999999951256804,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119460,25.60000000000001,23.62045085067647,34.36567549692345,30.000000005466408,1.0879421538075698,19853.33801946289,58.53164693813678,3511.898816288207,0.6382158878645564,0.0005562444159353824,30.000000005466408,30.000000005466408,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119520,25.6,23.62045085067647,34.3748095156785,30.00000000544904,1.0879421538075698,19894.875866817758,58.73413099407433,3524.04785964446,0.6390086256313382,0.0005573968787341606,30.00000000544904,30.00000000544904,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119580,25.6,23.620443235520874,34.386880965006554,30.000000005384297,1.0879421538075698,19949.77196838305,59.00184818318832,3540.1108909912987,0.6400537451977859,0.0005589195960897742,30.000000005384297,30.000000005384297,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119640,25.6,23.62045085067647,34.39740079543795,30.000000005278824,1.0879421538075698,19997.611930827443,59.23559092809724,3554.1354556858337,0.6409634519335986,0.0005602472284146214,30.000000005278824,30.000000005278824,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119700,25.60000000000001,23.62045085067647,34.40922519094546,30.000000005335576,1.0879421538075698,20051.38453032991,59.49846856493117,3569.9081138958704,0.6419834736859975,0.0005617390806191929,30.000000005335576,30.000000005335576,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119760,25.6,23.62045085067647,34.42558158176828,30.00000000529912,1.0879421538075698,20125.76682400772,59.86253547060483,3591.7521282362895,0.6433908008981005,0.0005638026743251491,30.00000000529912,30.00000000529912,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119820,25.6,23.62045085067647,34.441395959062035,30.000000005229744,1.0879421538075698,20197.68425808453,60.215007078744,3612.90042472464,0.6447474648320276,0.0005657978576111644,30.000000005229744,30.000000005229744,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119880,25.6,23.62045085067647,34.454850416460644,30.000000005199517,1.0879421538075698,20258.86972450906,60.51523939580973,3630.914363748584,0.6458985733860115,0.0005674952813748483,30.000000005199517,30.000000005199517,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-119940,25.6,23.62045085067647,34.466741248987304,30.000000005106397,1.0879421538075698,20312.94445356202,60.78085447110697,3646.8512682664177,0.6469135477290816,0.0005689953907724268,30.000000005106397,30.000000005106397,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120000,25.6,23.62045085067647,34.47760288694604,29.99999994805608,1.0879421538075698,20362.339078265784,61.02373539926713,3661.424123956028,0.6478388702706884,0.0005703656719201599,29.99999994805608,29.99999994805608,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120060,25.6,23.62045085067647,34.48777323799742,30.000000005122327,1.0879421538075698,20408.589488915688,61.25131970741888,3675.079182445133,0.6487035237035043,0.0005716487092165923,30.000000005122327,30.000000005122327,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120120,25.6,23.62045085067647,34.49786468829795,30.00000000509891,1.0879421538075698,20454.48135027365,61.4773314890936,3688.6398893456158,0.6495599275663755,0.0005729217859459648,30.00000000509891,30.00000000509891,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120180,25.6,23.62045085067647,34.50793098866956,30.000000005073122,1.0879421538075698,20500.258839870883,61.702954132735826,3702.17724796415,0.650412610418417,0.0005741916510819553,30.000000005073122,30.000000005073122,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120240,25.6,23.62045085067647,34.51770926251167,29.999999946977788,1.0879421538075698,20544.726764617164,61.92229991936564,3715.337995161939,0.6512394336912343,0.0005754251941268872,29.999999946977788,29.999999946977788,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120300,25.6,23.62045085067647,34.52719093516343,29.99999994664207,1.0879421538075698,20587.84560365563,62.135117408444785,3728.1070445066885,0.652039646825556,0.0005766213047966871,29.99999994664207,29.99999994664207,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120360,25.6,23.62045085067647,34.53724528628431,30.00000000492383,1.0879421538075698,20633.56848770241,62.36099252228283,3741.6595513369703,0.6528868147638401,0.0005778896270762518,30.00000000492383,30.00000000492383,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120420,25.6,23.62045085067647,34.54643343879426,29.999999951097056,1.0879421538075698,20675.35275832729,62.567561175462316,3754.0536705277386,0.6536596517734878,0.0005790486840117978,29.999999951097056,29.999999951097056,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120480,25.6,23.62045085067647,34.554702883169,30.000000009838853,1.0879421538075698,20712.95860157088,62.753603276630294,3765.2161965978175,0.6543541318923659,0.0005800918225414305,30.000000009838853,30.000000009838853,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120540,25.6,23.62045085067647,34.56309054702711,30.00000000485276,1.0879421538075698,20751.10234933344,62.94240028401576,3776.5440170409447,0.6550573920446838,0.0005811498739257424,30.00000000485276,30.00000000485276,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120600,25.6,23.62045085067647,34.572377834357574,30.00000000521302,1.0879421538075698,20793.33719886904,63.151621446695636,3789.0972868017384,0.6558349714632039,0.0005823213957524486,30.00000000521302,30.00000000521302,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120660,25.6,23.62045085067647,34.58069294808652,30.00000000970303,1.0879421538075698,20831.150974701122,63.33903715666439,3800.3422293998638,0.6565299477558556,0.0005833702692633107,30.00000000970303,30.00000000970303,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120720,25.6,23.62045085067647,34.5888358259308,30.00000000966065,1.0879421538075698,20868.18151154507,63.52268747366642,3811.3612484199853,0.6572095368510182,0.0005843974201616037,30.00000000966065,30.00000000966065,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120780,25.6,23.62045085067647,34.60058323413033,30.000000009950785,1.0879421538075698,20921.604002642758,63.787835234902886,3827.270114094173,0.6581882308987037,0.0005858792187499463,30.000000009950785,30.000000009950785,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120840,25.6,23.62045085067647,34.61314277136864,30.00000000475963,1.0879421538075698,20978.71975522447,64.07157106745484,3844.29426404729,0.6592323222279587,0.0005874634592477978,30.00000000475963,30.00000000475963,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120900,25.6,23.62045085067647,34.62816100114819,30.00000000942626,1.0879421538075698,21047.01660875894,64.411156209496,3864.6693725697587,0.6604775960360361,0.0005893577845050782,30.00000000942626,30.00000000942626,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-120960,25.6,23.62045085067647,34.644560552548086,30.0000000093368,1.0879421538075698,21121.595179640583,64.7824134871456,3886.944809228736,0.6618336616275161,0.0005914263097336018,30.0000000093368,30.0000000093368,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121020,25.6,23.62045085067647,34.65929795942609,30.00000000957653,1.0879421538075698,21188.614983584404,65.11639075149142,3906.9834450894855,0.6630488268316229,0.0005932851561921566,30.00000000957653,30.00000000957653,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121080,25.6,23.62045085067647,34.67317069189359,29.999999947209076,1.0879421538075698,21251.70288044524,65.43110007504849,3925.8660045029096,0.6641898244163043,0.0005950349143774513,29.999999947209076,29.999999947209076,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121140,25.6,23.62045085067647,34.68649138830676,30.00000000451243,1.0879421538075698,21312.27979492273,65.73353302603128,3944.0119815618764,0.6652826317095097,0.0005967150156207506,30.00000000451243,30.00000000451243,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121200,25.6,23.62045085067647,34.69999405092067,29.999999941849108,1.0879421538075698,21373.68476412793,66.04040084965641,3962.424050979384,0.6663878065746361,0.0005984180740302336,29.999999941849108,29.999999941849108,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121260,25.6,23.62045085067647,34.71220894453207,30.000000009255174,1.0879421538075698,21429.232885828234,66.31825396649333,3979.0952379896003,0.6673853332570561,0.0005999586632593084,30.000000009255174,30.000000009255174,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121320,25.6,23.62045085067647,34.72313759763105,30.000000004381064,1.0879421538075698,21478.932031186952,66.56699978281779,3994.019986969068,0.6682758382983472,0.0006013370138507173,30.000000004381064,30.000000004381064,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121380,25.6,23.62045085067647,34.73392573794465,30.00000000912993,1.0879421538075698,21527.99213709393,66.8127497249641,4008.764983497848,0.6691532937325523,0.0006026976167347459,30.00000000912993,30.00000000912993,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121440,25.6,23.62045085067647,34.7454944672873,30.000000009063466,1.0879421538075698,21580.60207016483,67.07647273805121,4024.588364283073,0.6700923696947529,0.0006041566758881603,30.000000009063466,30.000000009063466,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121500,25.6,23.62045085067647,34.756206626832665,29.99999994459802,1.0879421538075698,21629.3169608256,67.32083528950132,4039.250117370079,0.6709601629548089,0.0006055076978894029,29.99999994459802,29.99999994459802,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121560,25.6,23.62045085067647,34.76622140598588,30.00000000458601,1.0879421538075698,21674.85987970411,67.54942121055014,4052.9652726330078,0.6717699023375246,0.0006067707152125926,30.00000000458601,30.00000000458601,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121620,25.6,23.62045085067647,34.77727317248876,29.99999994393971,1.0879421538075698,21725.11914898668,67.80189173597444,4068.113504158466,0.6726619874117895,0.0006081645481996218,29.99999994393971,29.99999994393971,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121680,25.6,23.62045085067647,34.788634332283394,29.9999999435632,1.0879421538075698,21776.785140563978,68.06156178814396,4083.6937072886376,0.6735770497948489,0.0006095973563350433,29.9999999435632,29.9999999435632,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121740,25.6,23.62045085067647,34.80112356482697,30.000000008715148,1.0879421538075698,21833.58085575009,68.34725977450708,4100.8355864704245,0.6745809690044162,0.0006111724063469126,30.000000008715148,30.000000008715148,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121800,25.6,23.62045085067647,34.81302096884191,30.000000008623815,1.0879421538075698,21887.6854692831,68.61960393611648,4117.176236166989,0.6755351900491479,0.0006126728177756124,30.000000008623815,30.000000008623815,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121860,25.6,23.62045085067647,34.82375126320005,29.999999942780935,1.0879421538075698,21936.48283604993,68.86539437285674,4131.923662371404,0.6763940656274655,0.0006140260481502109,29.999999942780935,29.999999942780935,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121920,25.6,23.62045085067647,34.83445491600391,30.00000000405106,1.0879421538075698,21985.15846967346,69.1107023624984,4146.642141749904,0.6772490861093786,0.0006153758757739406,30.00000000405106,30.00000000405106,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-121980,25.6,23.62045085067647,34.845170892752,30.000000004018325,1.0879421538075698,22033.8904264244,69.3564887058669,4161.3893223520145,0.6781036141217059,0.0006167272594145514,30.000000004018325,30.000000004018325,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122040,25.6,23.62045085067647,34.85676796147544,30.00000001238151,1.0879421538075698,22086.629197277853,69.62265056391175,4177.359033834705,0.6790265595085698,0.0006181897281363338,30.00000001238151,30.00000001238151,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122100,25.6,23.62045085067647,34.86753934481194,30.000000012262966,1.0879421538075698,22135.613121320923,69.8700145783303,4192.200874699818,0.6798820776211866,0.0006195480593219295,30.000000012262966,30.000000012262966,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122160,25.6,23.62045085067647,34.877241369475136,29.999999945014768,1.0879421538075698,22179.734337061695,70.0929504591253,4205.577027547518,0.6806512697080069,0.0006207715414223849,29.999999945014768,29.999999945014768,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122220,25.6,23.62045085067647,34.887777968963015,29.9999999446437,1.0879421538075698,22227.65055964509,70.33520910153219,4220.112546091931,0.6814851645153144,0.0006221002567331807,29.9999999446437,29.9999999446437,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122280,25.6,23.62045085067647,34.89750773822066,30.000000003854822,1.0879421538075698,22271.897371567546,70.55902632874391,4233.541579724634,0.6822537713614579,0.0006233271990444168,30.000000003854822,30.000000003854822,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122340,25.6,23.62045085067647,34.90632495667846,30.000000008324623,1.0879421538075698,22311.9945180541,70.76199031044726,4245.719418626834,0.682949272274698,0.0006244390845110286,30.000000008324623,30.000000008324623,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122400,25.626666666666665,23.62766967778313,34.973938488069415,30.000000011425648,1.0879421538075698,22619.473677798134,72.45988430522284,4347.59305831337,0.6887127820106796,0.0006333132437754497,30.000000011425648,30.000000011425648,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122460,25.653333333333336,23.634853747442623,35.145397855982196,30.000000002963862,1.0879421538075698,23399.20202967217,76.58971118419545,4595.382671051727,0.7023429790214685,0.0006552943291698474,30.000000002963862,30.000000002963862,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122520,25.68,23.64201061649263,35.34247428228962,29.999999996840092,1.0879421538075698,24295.42645963329,81.34470663207073,4880.682397924244,0.7174084407168168,0.0006805179355790992,29.999999996840092,29.999999996840092,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122580,25.70666666666667,23.649128670742968,35.50297844717772,30.000000003433446,1.0879421538075698,25025.334881454964,85.29436268260889,5117.661760956534,0.7294578485739771,0.0007011392892426432,30.000000003433446,30.000000003433446,1.0879421538075698,0.0,0.0,0.0,0.0,0.0
-122640,25.733333333333334,23.65620303208989,35.582617865610636,30.0059082428366,1.0879421538075698,25360.634658709536,87.01724720616028,5221.034832369616,0.7345913808031133,0.0007108070350995747,30.0059082428366,29.67472914572441,1.0879421538075698,1506.0694668706076,0.0,0.0,0.0,0.0
-122700,25.76,23.66325971288544,35.58169310474988,30.004983568745004,1.0879421538075698,25360.634264118267,87.20750767664623,5232.450460598774,0.7351539004037765,0.0007111841886195002,30.004983568745004,29.67418588011736,1.0879421538075698,1504.3349743317226,0.0,0.0,0.0,0.0
-122760,25.78666666666667,23.67027301896729,35.61355385050283,30.03684431471707,1.0879421538075698,25360.63426312187,86.35692409066819,5181.415445440091,0.7326323700990508,0.0007114977999181796,30.03684431471707,29.704510319456812,1.0879421538075698,1511.3214796133184,0.0,0.0,0.0,0.0
-122820,25.81333333333333,23.67724220889365,35.641668517312716,30.064958981713968,1.0879421538075698,25360.634262271407,85.63270883657528,5137.962530194516,0.730471691431136,0.0007118168224669563,30.064958981713968,29.731303844346055,1.0879421538075698,1517.329503087908,0.0,0.0,0.0,0.0
-122880,25.840000000000003,23.68419824064055,35.66233840786807,30.085628872397127,1.0879421538075698,25360.634261690186,85.14570970057783,5108.742582034671,0.7290115225092213,0.0007121505395210168,30.085628872397127,29.751086471882864,1.0879421538075698,1521.364419377745,0.0,0.0,0.0,0.0
-122940,25.86666666666667,23.691103004486237,35.71313344095661,30.136423820589123,1.0879421538075698,25360.634647765524,83.74353175336854,5024.611905202112,0.7247743683311192,0.0007124219529740213,30.136423820589123,29.7992241315147,1.0879421538075698,1533.4487000585807,0.0,0.0,0.0,0.0
-123000,25.89333333333333,23.697971726735172,35.782917049481135,30.20620751484785,1.0879421538075698,25360.63425788083,81.8112834271365,4908.677005628189,0.7188529796878863,0.000712653349405559,30.20620751484785,29.86522644236733,1.0879421538075698,1550.6449124406467,0.0,0.0,0.0,0.0
-123060,25.92000000000001,23.704808699967252,35.86926582766552,30.292556293598533,1.0879421538075698,25360.634255305562,79.46734318633109,4768.040591179866,0.7115364110604777,0.0007128503327856298,30.292556293598533,29.94680438839499,1.0879421538075698,1572.340742758288,0.0,0.0,0.0,0.0
-123120,25.94666666666667,23.71161344492188,35.95954352537952,30.382833933996658,1.0879421538075698,25360.634515955142,77.10380627546995,4626.228376528197,0.7040030708951531,0.0007130384286825638,30.382833933996658,29.547185572991246,1.0879421538075698,3800.192984777626,5.9307364898490675,355.8441893909442,0.2,0.00010991159737776912
-123180,25.97333333333333,23.718373676599693,35.975450340634424,30.398740807275423,1.0879421538075698,25360.6342520859,76.80326073173138,4608.195643903883,0.7030335153213603,0.000713369845695723,30.398740807275423,29.561599104734267,1.0879421538075698,3806.9841020618733,5.9307364898490675,355.8441893909442,0.2,0.00011019124849117122
-123240,26.000000000000004,23.72511159667419,35.88617111921742,30.309461585226988,1.0879421538075698,25360.634254957407,79.39794713148,4763.876827888799,0.7113174900601322,0.000713917303270557,30.309461585226988,29.963656244101056,1.0879421538075698,1572.583747862916,0.0,0.0,0.0,0.0
-123300,26.02666666666667,23.73179771234416,35.92480308110801,30.3480935473573,1.0879421538075698,25360.634253867247,78.45023527060025,4707.014116236015,0.7083141980405584,0.0007142028508863575,30.3480935473573,29.519823802185826,1.0879421538075698,3766.638004671181,5.9307364898490675,355.8441893909442,0.2,0.00010930266880244186
-123360,26.053333333333335,23.738458324088825,35.931143091620115,30.354433550592827,1.0879421538075698,25360.63428695819,78.40580730811587,4704.3484384869535,0.7081727801073238,0.0007145563526064825,30.354433550592827,29.526038813372857,1.0879421538075698,3767.2064182863255,5.9307364898490675,355.8441893909442,0.2,0.00010941558605474478
-123420,26.08,23.745083096010603,35.91570997394278,30.339000440078678,1.0879421538075698,25360.634254382934,78.96753153305093,4738.051891983056,0.7099566552143721,0.0007149580008879102,30.339000440078678,29.99237993099837,1.0879421538075698,1576.2908041872906,0.0,0.0,0.0,0.0
-123480,26.10666666666667,23.751674248071975,35.96766207917139,30.390952545593127,1.0879421538075698,25360.634253082997,77.65825933043955,4659.495559826373,0.7057847533459624,0.0007152109846282987,30.390952545593127,29.558866036629446,1.0879421538075698,3783.995112833615,5.9307364898490675,355.8441893909442,0.2,0.00011006218302974848
-123540,26.133333333333336,23.7582263393791,35.97080546220585,30.394095928665877,1.0879421538075698,25360.63425290893,77.69994448698488,4661.996669219093,0.7059183415051825,0.0007155712091947553,30.394095928665877,29.562331784408325,1.0879421538075698,3782.5291276752746,5.9307364898490675,355.8441893909442,0.2,0.00011012082250111746
-123600,26.16,23.76474265660892,35.93943729175703,30.36272775752533,1.0879421538075698,25360.63425605457,78.6959954291696,4721.759725750175,0.7090954550483556,0.0007160118963888265,30.36272775752533,29.536247422142523,1.0879421538075698,3758.500487931973,5.9307364898490675,355.8441893909442,0.2,0.00010957359589218255
-123660,26.18666666666667,23.77121628847559,35.98227728474842,30.405567750761985,1.0879421538075698,25360.634254939247,77.63911827574246,4658.347096544548,0.7057233951830216,0.00071628053318437,30.405567750761985,29.573689562837785,1.0879421538075698,3783.0477524487974,5.9307364898490675,355.8441893909442,0.2,0.00011033105660211184
-123720,26.21333333333334,23.777659460156197,35.99746070910556,30.420751175673853,1.0879421538075698,25360.634252416567,77.34958301275208,4640.974980765124,0.7047939628095047,0.0007166131934623829,30.420751175673853,29.58744909394653,1.0879421538075698,3789.523049349047,5.9307364898490675,355.8441893909442,0.2,0.00011060338339468834
-123780,26.240000000000006,23.784068118510074,35.9797158645964,30.403006331018695,1.0879421538075698,25360.634253080483,77.96139648208752,4677.683788925251,0.7067550643645562,0.0007170252461452399,30.403006331018695,29.573019850216962,1.0879421538075698,3774.445028538269,5.9307364898490675,355.8441893909442,0.2,0.00011029682978303778
-123840,26.26666666666667,23.790442291504952,35.986286581467574,30.40957698120824,1.0879421538075698,25360.63455632176,77.90570957207134,4674.342574324281,0.7065770160168222,0.0007173794764313964,30.40957698120824,29.57940014383976,1.0879421538075698,3775.310693719091,5.9307364898490675,355.8441893909442,0.2,0.00011041871599702951
-123900,26.293333333333337,23.79677434185565,36.002827337721406,30.426117804251216,1.0879421538075698,25360.63425259157,77.57553054604352,4654.531832762612,0.7055194830566272,0.0007177084928290472,30.426117804251216,29.594309457294735,1.0879421538075698,3782.730143789527,5.9307364898490675,355.8441893909442,0.2,0.0001107167312347712
-123960,26.32,23.803078423267078,36.026868585918116,30.45015897094873,1.0879421538075698,25360.634623217167,77.04265379917355,4622.5592279504135,0.7038060103027131,0.0007180182849022616,30.45015897094873,29.615633016416393,1.0879421538075698,3795.08873111774,5.9307364898490675,355.8441893909442,0.2,0.00011114772356644065
-124020,26.34666666666667,23.809335777388455,36.05699693872156,30.48028734155304,1.0879421538075698,25360.634542265965,76.3501769439758,4581.010616638548,0.7015667990641958,0.0007183109593213692,30.48028734155304,29.642156694933465,1.0879421538075698,3811.481422375689,5.9307364898490675,355.8441893909442,0.2,0.00011168719155832364
-124080,26.373333333333335,23.81555961281373,36.092817604530005,30.516108071581286,1.0879421538075698,25360.63425022012,75.51437800420742,4530.862680252445,0.6988449562740062,0.00071858781930072,30.516108071581286,29.673540620951233,1.0879421538075698,3831.658224320443,5.9307364898490675,355.8441893909442,0.2,0.00011232864871971968
-124140,26.4,23.8217557008507,36.134026203941396,30.55731668996692,1.0879421538075698,25360.634163932868,74.54977659003018,4472.9865954018105,0.6956770694712398,0.0007188497419501372,30.55731668996692,29.70952161478392,1.0879421538075698,3855.431360342929,5.9307364898490675,355.8441893909442,0.2,0.00011306720246251403
-124200,26.42666666666667,23.827905539629196,36.180077302082154,30.60336779637465,1.0879421538075698,25360.634126338042,73.47675608179195,4408.6053649075175,0.6921188797271838,0.0007190970113353714,30.60336779637465,29.74962719909328,1.0879421538075698,3882.4692059528816,5.9307364898490675,355.8441893909442,0.2,0.00011389375078474499
-124260,26.45333333333333,23.834012521274424,36.23050983665959,30.653800225897747,1.0879421538075698,25360.63460408297,72.31361027566619,4338.816616539972,0.6882200452516822,0.0007193310403212893,30.653800225897747,29.793459779093784,1.0879421538075698,3912.4826697813282,5.9307364898490675,355.8441893909442,0.2,0.00011480065306383799
-124320,26.48,23.84010105994888,36.28480809358389,30.70809856173834,1.0879421538075698,25360.63424520336,71.07974483533499,4264.7846901201,0.6840352919534319,0.0007195543002697915,30.70809856173834,29.8405775415248,1.0879421538075698,3945.137032514659,5.9307364898490675,355.8441893909442,0.2,0.00011577929704512029
-124380,26.50666666666667,23.84613962396163,36.34239484957221,30.765685257701822,1.0879421538075698,25360.634518172206,69.79418408386465,4187.651045031879,0.6796200437898576,0.0007197667725374362,30.765685257701822,29.89048005505289,1.0879421538075698,3980.0816067486853,5.9307364898490675,355.8441893909442,0.2,0.00011681989114400891
-124440,26.53333333333333,23.852143444376306,36.40268200095296,30.82597246917997,1.0879421538075698,25360.63424487335,68.47564132843095,4108.538479705857,0.6750311197318433,0.0007199708132181545,30.82597246917997,29.942663619216372,1.0879421538075698,4016.9337387139226,5.9307364898490675,355.8441893909442,0.2,0.0001179124014615558
-124500,26.560000000000006,23.858115543355908,36.46489421770768,30.88818463670662,1.0879421538075698,25360.634468742865,67.14558887736587,4028.735332641952,0.6703380465147942,0.0007201685827388066,30.88818463670662,29.99646387511445,1.0879421538075698,4055.187732919112,5.9307364898490675,355.8441893909442,0.2,0.00011904328788539741
-124560,26.58666666666667,23.864037390463082,36.521722493908655,30.94501295738332,1.0879421538075698,25360.6342664852,65.96752484823777,3958.0514908942664,0.6661256778777647,0.0007203779444251507,30.94501295738332,30.00000003563245,1.0879421538075698,4297.539064686298,6.2038831911218075,372.23299146730835,0.2103574390879588,0.00012618534997418926
-124620,26.613333333333333,23.869934111044717,36.564045763862254,30.98733618563557,1.0879421538075698,25360.63445612616,65.13062627324284,3907.8375763945705,0.6631005234075554,0.0007206235320486918,30.98733618563557,29.999999956484494,1.0879421538075698,4490.008461360906,6.4417180973719645,386.50308584231794,0.2186110590698424,0.00013188926743425182
-124680,26.64,23.87579905982173,36.591979253856614,31.01526971780956,1.0879421538075698,25360.634264310138,64.61584427520626,3876.950656512376,0.6612259337613815,0.0007209049787883183,31.01526971780956,29.99999980997781,1.0879421538075698,4617.03960833,6.60926511089988,396.55590665399285,0.2240711980907956,0.00013569767509875413
-124740,26.66666666666667,23.881613948408994,36.61094437516011,31.03423483852795,1.0879421538075698,25360.634266970923,64.29708703008207,3857.825221804924,0.6600598232538372,0.0007212081672140524,31.03423483852795,30.000000007244726,1.0879421538075698,4703.28446013637,6.728975419939644,403.7385251963787,0.22781520236104516,0.00013832515155163633
-124800,26.693333333333335,23.88739458360127,36.625183607929046,31.04847407725577,1.0879421538075698,25360.63423987234,64.08038701546255,3844.823220927752,0.6592647102160182,0.0007215232812645718,31.04847407725577,30.000000013718942,1.0879421538075698,4768.038767143714,6.822645683652432,409.3587410191459,0.2306612059401444,0.00014033130750823954
-124860,26.72,23.893139758426727,36.63708200918497,31.06037247856197,1.0879421538075698,25360.63423964371,63.913782923300246,3834.8269753980153,0.6586521018822543,0.0007218443365486556,31.06037247856197,30.000000014647327,1.0879421538075698,4822.147911319444,6.903515312870202,414.2109187722122,0.2330629974455097,0.00014203059975827258
-124920,26.74666666666667,23.89884245242368,36.64783192156961,31.07112240321102,1.0879421538075698,25360.634183870057,63.77144833115692,3826.2868998694157,0.6581278291091298,0.0007221680506508786,31.07112240321102,30.00000002790014,1.0879421538075698,4871.03418906653,6.978467620593856,418.70805723563126,0.2352456806999732,0.00014358016697044296
-124980,26.77333333333333,23.904516300922694,36.657983627972214,31.081274115582694,1.0879421538075698,25360.634156725162,63.64171566153142,3818.502939691885,0.6576492453361189,0.0007224936097625557,31.081274115582694,30.000000036928096,1.0879421538075698,4917.200056948932,7.0507638262670405,423.04582957602236,0.237313315940262,0.00014505283997781992
-125040,26.8,23.910145440714327,36.66778644433412,31.091076914472946,1.0879421538075698,25360.634236179198,63.51903682393582,3811.142209436149,0.6571960414858009,0.0007228196286549795,31.091076914472946,30.00000002045013,1.0879421538075698,4961.779322500937,7.1218687927715765,427.31212756629463,0.2393123299588138,0.00014648121068566662
-125100,26.82666666666667,23.91574217363844,36.677346230635635,31.100636727433912,1.0879421538075698,25360.63411494272,63.401332642989615,3804.0799585793775,0.6567606268222477,0.0007231464880758133,31.100636727433912,30.00000005014393,1.0879421538075698,5005.253375706924,7.192411230280608,431.54467381683645,0.24126306496491298,0.00014787948035402672
-125160,26.85333333333333,23.921290942827447,36.686714684097424,31.110005166160285,1.0879421538075698,25360.634181953486,63.2872516917734,3797.2351015064037,0.6563380636483149,0.0007234732598849793,31.110005166160285,30.00000003637224,1.0879421538075698,5047.857333451246,7.262660626250538,435.7596375750323,0.24317484254553934,0.00014925414221216585
-125220,26.880000000000006,23.92681416769584,36.69591197569323,31.119202391688532,1.0879421538075698,25360.63448240219,63.17666573081621,3790.599943848972,0.6559279261301278,0.0007238010290749247,31.119202391688532,29.999999973277173,1.0879421538075698,5089.682906666333,7.332729161476946,439.9637496886167,0.2450522151360196,0.00015060825182081758
-125280,26.90666666666667,23.932294863078763,36.70495525782842,31.128245745986714,1.0879421538075698,25360.63415423392,63.068938889418824,3784.136333365129,0.6555278986340416,0.000724128934610827,31.128245745986714,30.00000004628313,1.0879421538075698,5130.8081164193345,7.402674156403315,444.16044938419884,0.2468980188933393,0.00015194373044185983
-125340,26.93333333333333,23.937733311645193,36.71385049132637,31.13714096090457,1.0879421538075698,25360.634238728682,62.96394212161591,3777.8365272969545,0.6551375384745114,0.0007244569346841617,31.13714096090457,30.00000003064895,1.0879421538075698,5171.2600508923215,7.472497022672238,448.3498213603343,0.2487134770811665,0.00015326132689174926
-125400,26.96,23.94314481275161,36.722607562976606,31.14589804551281,1.0879421538075698,25360.63417980087,62.86169646730645,3771.701788038387,0.6547569589015994,0.0007247858678894652,31.14589804551281,30.00000004655966,1.0879421538075698,5211.0836807640035,7.542250380805832,452.53502284834997,0.2505010431833367,0.0001545626401610422
-125460,26.986666666666668,23.948510663226127,36.73122906419905,31.154519528828533,1.0879421538075698,25360.634261233456,62.76181462201049,3765.708877320629,0.6543847502275083,0.0007251147551619523,31.154519528828533,30.00000003155426,1.0879421538075698,5250.290791035565,7.611892919164102,456.7135751498461,0.25226067448842804,0.00015584759007804906
-125520,27.013333333333332,23.953833794675433,36.739723751418644,31.16301422180905,1.0879421538075698,25360.634235035122,62.664210448672435,3759.8526269203467,0.6540206197722068,0.000725443717779363,31.16301422180905,29.99999989272984,1.0879421538075698,5288.921872885774,7.681460705968662,460.88764235811965,0.2539942439274168,0.00015711740713327405
-125580,27.04,23.95913032025591,36.74703064154516,31.170321130102625,1.0879421538075698,25360.634152418632,62.59099205155924,3755.4595230935533,0.6537471985738256,0.0007257769080646028,31.170321130102625,30.00000005955209,1.0879421538075698,5322.149997269958,7.743034741890361,464.5820845134217,0.25550911440764734,0.00015823106751354003
-125640,27.066666666666666,23.964380475923086,36.75558339826046,31.178873868703214,1.0879421538075698,25360.63423479706,62.49151911671712,3749.4911470030265,0.6533753676045749,0.0007261058161873262,31.178873868703214,30.000000046407255,1.0879421538075698,5361.044475737411,7.814626298330399,468.87757789982396,0.25724815512420174,0.00015951215151173008
-125700,27.09333333333333,23.969589106162662,36.76371503622765,31.187005506057673,1.0879421538075698,25360.634237583527,62.40038235369048,3744.022941221429,0.6530343254486597,0.0007264358254594386,31.187005506057673,30.000000048720985,1.0879421538075698,5398.023884635351,7.88385887581379,473.0315325488274,0.2589078197950997,0.00016073883046332138
-125760,27.12,23.97477014744657,36.77220893162139,31.195499348760148,1.0879421538075698,25360.634477202217,62.301609501256564,3738.0965700753936,0.6526643056604403,0.0007267652159529549,31.195499348760148,30.000000000926228,1.0879421538075698,5436.650685796387,7.956680613810053,477.4008368286032,0.260630866018434,0.00016201577281930698
-125820,27.146666666666665,23.97990227349332,36.78006727908317,31.20335776219586,1.0879421538075698,25360.634177179283,62.21538847110004,3732.923308266003,0.6523409638009274,0.0007270960763432392,31.20335776219586,29.99999991524216,1.0879421538075698,5472.3879822711,8.025383932476327,481.52303594857966,0.2622358386844209,0.00016320950901000801
-125880,27.173333333333336,23.984999188326015,36.78823697925308,31.21152744981219,1.0879421538075698,25360.63423426791,62.122471095957366,3727.3482657574427,0.6519921504128248,0.0007274260579046152,31.21152744981219,30.000000062286137,1.0879421538075698,5509.5397702965665,8.097277842810763,485.83667056864573,0.2638945740982755,0.00016444650460012368
-125940,27.2,23.990056870882626,36.79581299134428,31.219103408881775,1.0879421538075698,25360.63447538888,62.04136720333501,3722.4820322001005,0.6516873796782929,0.0007277579431793143,31.219103408881775,30.00000001224842,1.0879421538075698,5543.992415698196,8.165239087675063,489.91434526050386,0.265443629217657,0.00016560592502633245
-126000,27.21,23.991935208421893,36.80124179259351,31.22453228165979,1.0879421538075698,25360.634150104757,61.95762706981633,3717.4576241889795,0.6513724031280923,0.0007278744554183026,31.22453228165979,29.99999993075568,1.0879421538075698,5568.681118383593,8.211589894729137,492.6953936837482,0.2664898308303295,0.00016638706389874916
-126060,27.22,23.99380446344739,36.80173491402676,31.225025397353658,1.0879421538075698,25360.63417620513,61.974565714055345,3718.4739428433213,0.6514361399954735,0.0007280071589795603,31.225025397353658,29.999999926837926,1.0879421538075698,5570.923628243262,8.21856914342344,493.1141486054065,0.2666466521556195,0.00016650882322354069
-126120,27.23,23.995676226652627,36.798639279522405,31.22192974945413,1.0879421538075698,25360.634237121063,62.06489690769683,3723.8938144618096,0.6517758285259444,0.000728152329882445,31.22192974945413,30.00000006747351,1.0879421538075698,5556.845225864345,8.196809732973348,491.80858397840086,0.2661571149637813,0.00016615101460276717
-126180,27.24,23.997535763434453,36.79577489523893,31.219065365114428,1.0879421538075698,25360.63423737672,62.15050829111822,3729.0304974670935,0.6520974418296326,0.000728296591298227,31.219065365114428,29.999999909658193,1.0879421538075698,5543.819874469312,8.176928085874156,490.6156851524493,0.2657082433808097,0.00016582381405526566
-126240,27.25,23.999385630906996,36.794501291981504,31.217791762526737,1.0879421538075698,25360.634234331064,62.20351172755689,3732.210703653413,0.6522963990977348,0.0007284354498576212,31.217791762526737,30.000000065210095,1.0879421538075698,5538.027334242749,8.169742671462918,490.1845602877751,0.265545643272697,0.000165709119755754
-126300,27.26,24.001247438414698,36.7933374554686,31.216627872689887,1.0879421538075698,25360.634476826905,62.25450676197104,3735.2704057182627,0.6524877030034387,0.0007285749272210897,31.216627872689887,29.99999985581782,1.0879421538075698,5532.735383144222,8.163454054876269,489.80724329257623,0.2654031733936377,0.00016560945909611984
-126360,27.27,24.003088151582013,36.791424740640245,31.21471522372097,1.0879421538075698,25360.63417732461,62.320650476556004,3739.239028593361,0.6527356690144047,0.0007287162652872867,31.21471522372097,30.00000007664773,1.0879421538075698,5524.036419884704,8.151172753705998,489.07036522235984,0.2651244961370097,0.00016540912323228884
-126420,27.28,24.00492308346365,36.7898374112989,31.2131279001194,1.0879421538075698,25360.634151222464,62.380120071426724,3742.8072042856043,0.6529584537036526,0.0007288566431691651,31.2131279001194,29.9999999268081,1.0879421538075698,5516.818591337137,8.141483726305374,488.48902357832236,0.26490422651182893,0.00016525227944194748
-126480,27.29,24.00676167546669,36.78834106878026,31.21163148573561,1.0879421538075698,25360.63447803625,62.437852241265475,3746.271134475929,0.6531745843292346,0.0007289973066932258,31.21163148573561,30.00000000939548,1.0879421538075698,5510.013124400419,8.132527892841498,487.9516735704899,0.26470029897370495,0.00016510768600037145
-126540,27.3,24.008582673258854,36.78674430605525,31.210034722924608,1.0879421538075698,25360.63447842732,62.49748917439006,3749.849350463404,0.6533976956878257,0.0007291378677946874,31.210034722924608,30.000000007668113,1.0879421538075698,5502.751696565989,8.122755471091082,487.36532826546494,0.26447741833559296,0.00016494934021497312
-126600,27.31,24.01040792139696,36.78542844690697,31.20871886369748,1.0879421538075698,25360.6344787859,62.551459141310794,3753.087548478648,0.6535994747584317,0.0007292780254083754,31.20871886369748,29.99999985449796,1.0879421538075698,5496.768394065725,8.115223901718442,486.9134341031065,0.2643053883798413,0.00016482876936164506
-126660,27.32,24.012227274279784,36.78451688545524,31.2078073741434,1.0879421538075698,25360.634151824303,62.59705433638645,3755.8232601831874,0.6537698457929934,0.0007294168854005403,31.2078073741434,29.99999992452128,1.0879421538075698,5492.62298736966,8.110890182825898,486.65341096955376,0.2642062995262804,0.0001647623150556642
-126720,27.33,24.014039372385117,36.78401557548493,31.207306045939774,1.0879421538075698,25360.634234742065,62.63408993733359,3758.045396240016,0.653908167714822,0.0007295543050382786,31.207306045939774,29.99999990639682,1.0879421538075698,5490.34323055459,8.109796793303577,486.5878075982146,0.2641812878408754,0.00016475081084004617
-126780,27.34,24.01584503413812,36.78389108616884,31.207181502793922,1.0879421538075698,25360.634479538243,62.66328826675354,3759.797296005213,0.6540171774677491,0.0007296904875002037,31.207181502793922,29.99999985247519,1.0879421538075698,5489.777103582182,8.11168166845817,486.70090010749016,0.2642244020954265,0.0001647898551191214
-126840,27.35,24.017645827826577,36.7844741279625,31.20776461661839,1.0879421538075698,25360.63415197104,62.67774187760685,3760.6645126564113,0.6540711254861187,0.0007298241967388438,31.20776461661839,29.999999926273237,1.0879421538075698,5492.428535358557,8.119178460776432,487.150707646586,0.2643957431000637,0.00016492387273763054
-126900,27.360000000000007,24.019437875597852,36.785120862416576,31.208411332179217,1.0879421538075698,25360.634237889928,62.69076737114792,3761.4460422688758,0.6541197354423129,0.0007299576523110489,31.208411332179217,29.999999906866766,1.0879421538075698,5495.369626133667,8.127182376978691,487.63094261872163,0.26457842976317,0.00016506647751204575
-126960,27.37,24.02122538973971,36.78599861525321,31.20928908496356,1.0879421538075698,25360.634238127783,62.69895746492052,3761.937447895231,0.654150296427565,0.0007300903467799782,31.20928908496356,29.999999908398394,1.0879421538075698,5499.361286153062,8.137032220341988,488.22193322051925,0.264802903385701,0.00016524018575953344
-127020,27.38,24.02301614471105,36.78690454806342,31.21019501783297,1.0879421538075698,25360.634237858536,62.706594994877825,3762.3956996926695,0.6541787929717088,0.000730223453558483,31.21019501783297,30.000000061767764,1.0879421538075698,5503.4804073796995,8.147131402206272,488.8278841323763,0.26503266486064503,0.00016541796521865056
-127080,27.39,24.02479319095721,36.788030689339756,31.211321172157703,1.0879421538075698,25360.634178519656,62.709511956356685,3762.5707173814008,0.6541896758511723,0.0007303553751918854,31.211321172157703,29.999999922314576,1.0879421538075698,5508.602338940118,8.158991038442775,489.53946230656646,0.2653019699824809,0.00016562528147791034
-127140,27.400000000000006,24.02655767135886,36.78958653728715,31.21287695374656,1.0879421538075698,25360.634480291646,62.70331322127464,3762.1987932764787,0.6541665485833362,0.0007304854484180189,31.21287695374656,29.99999985495257,1.0879421538075698,5515.67771483308,8.174302058838245,490.45812353029464,0.2656488415947376,0.00016589029779221496
-127200,27.41,24.02832927689424,36.791246082042754,31.214536570707956,1.0879421538075698,25360.634151928705,62.695067671979245,3761.7040603187547,0.6541357821873244,0.0007306157829379529,31.214536570707956,30.00000008506021,1.0879421538075698,5523.223939507165,8.190496747034294,491.42980482205775,0.266014749628544,0.0001661696488311487
-127260,27.42,24.03009659481598,36.79293610913825,31.21622659781388,1.0879421538075698,25360.63415188127,62.686134622296436,3761.168077337786,0.6541024472731731,0.0007307461394314006,31.21622659781388,29.999999929471254,1.0879421538075698,5530.910211292965,8.206976833287175,492.41860999723053,0.2663860755212271,0.00016645332400761948
-127320,27.43,24.03184197428521,36.79465693950157,31.217947428194893,1.0879421538075698,25360.63415180076,62.676276565945905,3760.5765939567546,0.6540656566242427,0.0007308755610532883,31.217947428194893,29.999999930603014,1.0879421538075698,5538.735851294449,8.22371880014383,493.4231280086297,0.2667622450200246,0.00016674093007182226
-127380,27.44,24.03359434426055,36.79642394154233,31.21971441200752,1.0879421538075698,25360.634234695048,62.66553895851454,3759.932337510873,0.6540255787466929,0.000731005488395487,31.21971441200752,29.99999991346732,1.0879421538075698,5546.7714616315625,8.240892834120178,494.4535700472107,0.2671470233329883,0.0001670351705428757
-127440,27.45,24.035342724741827,36.79825058414503,31.221541054614683,1.0879421538075698,25360.63423467474,62.653516109785,3759.2109665871008,0.6539806979052821,0.0007311352418489655,31.221541054614683,30.000000069971648,1.0879421538075698,5555.0775865504675,8.258593618449924,495.5156171069953,0.26754244679323064,0.0001673376052356386
-127500,27.46,24.037078027446732,36.800144913099295,31.22343538357379,1.0879421538075698,25360.634234652734,62.639931990172904,3758.395919410374,0.6539299814854107,0.0007312644813603832,31.22343538357379,30.000000071243573,1.0879421538075698,5563.692227736416,8.276878808764927,496.6127285258956,0.2679497018163549,0.00016764920034244957
-127560,27.47,24.03881193267139,36.80211000834129,31.225400478142728,1.0879421538075698,25360.634237713486,62.62487369222252,3757.492421533351,0.6538737520136354,0.0007313936360041122,31.225400478142728,29.99999991591345,1.0879421538075698,5572.629394645716,8.295795091258897,497.74770547553385,0.2683697140370024,0.00016797057714623
-127620,27.48,24.040541456080167,36.804145706698215,31.22743617650497,1.0879421538075698,25360.634237689344,62.60827756903925,3756.4966541423546,0.6538117689151123,0.0007315225666212523,31.22743617650497,30.00000007299134,1.0879421538075698,5581.886218532321,8.315338282400344,498.9202969440206,0.2688022696397894,0.00016830161249467912
-127680,27.49,24.042257809550104,36.806249770420976,31.2295401871117,1.0879421538075698,25360.634479239703,62.59012114822341,3755.407268893405,0.6537439449622382,0.0007316509359627796,31.2295401871117,30.000000021049622,1.0879421538075698,5591.454649596497,8.335486094792069,500.1291656875241,0.2692467549026937,0.00016864190925446192
-127740,27.5,24.04398558689196,36.80841858268575,31.23170899940136,1.0879421538075698,25360.634479126576,62.57076399483954,3754.2458396903717,0.6536716201270771,0.0007317798987074909,31.23170899940136,29.999999865539607,1.0879421538075698,5601.318243664486,8.356249370184988,501.3749622110994,0.2697032877211376,0.00016899148210207507
-127800,27.51,24.045691953429,36.81051227473368,31.23380269147244,1.0879421538075698,25360.634479021224,62.552682868109656,3753.1609720865804,0.6536040484967695,0.000731908393830875,31.23380269147244,30.000000023404173,1.0879421538075698,5610.838796059812,8.376425189306568,502.5855113583941,0.2701454281182998,0.00016933076688619184
-127860,27.52,24.047389666107488,36.812274149897014,31.23556461966495,1.0879421538075698,25360.63423786587,62.541345346267434,3752.480720776046,0.6535616715073431,0.0007320379740484767,31.23556461966495,29.99999992059472,1.0879421538075698,5618.851805077788,8.393906448366966,503.634386902018,0.2705273520640694,0.0001696254825674401
-127920,27.53,24.049098419249763,36.813570588178614,31.236861071177454,1.0879421538075698,25360.634177697062,62.539822880256025,3752.3893728153607,0.6535559804690176,0.0007321702170199973,31.236861071177454,29.99999993516548,1.0879421538075698,5624.747479384253,8.407591305840276,504.45547835041657,0.2708255828733719,0.00016985795869064907
-127980,27.54,24.050786099104986,36.81480600310706,31.238096414035393,1.0879421538075698,25360.634505444767,62.53925671334709,3752.3554028008252,0.6535538640893779,0.000732301968807802,31.238096414035393,30.00000002200962,1.0879421538075698,5630.364927412717,8.420767712341139,505.24606274046823,0.2711121137876044,0.00017008199911573905
-128040,27.55,24.052473364323983,36.81557024471591,31.238860733546918,1.0879421538075698,25360.634151174676,62.54844297120192,3752.906578272116,0.6535882014028482,0.0007324358249058082,31.238860733546918,29.999999941815812,1.0879421538075698,5633.841110139011,8.430051639059636,505.8030983435782,0.2713136366626313,0.00017024278505778446
-128100,27.560000000000006,24.054163011017142,36.816066149562104,31.23935663255288,1.0879421538075698,25360.634177733667,62.56320520723885,3753.792312434331,0.653643373608945,0.0007325711695176231,31.23935663255288,29.999999935533566,1.0879421538075698,5636.096288136514,8.437117880322807,506.2270728193686,0.27146682062829736,0.00017036760937873762
-128160,27.57,24.05584143757163,36.81616728430421,31.23945775480863,1.0879421538075698,25360.6342345166,62.58597839392868,3755.158703635721,0.6537284675848701,0.0007327077974545059,31.23945775480863,29.99999992283687,1.0879421538075698,5636.556209264471,8.440883435827566,506.45300614965385,0.2715483808389212,0.00017043911236157267
-128220,27.58,24.057500405015933,36.81613842713851,31.23942891594005,1.0879421538075698,25360.634151308706,62.61125584286006,3756.675350571604,0.6538228930190892,0.0007328443778251187,31.23942891594005,29.999999940993053,1.0879421538075698,5636.42497911055,8.443539725333759,506.6123835200255,0.27160588539808417,0.00017049283997530614
-128280,27.59,24.059180397593288,36.815828249135244,31.23911866572903,1.0879421538075698,25360.634479680517,62.6426369486756,3758.558216920536,0.6539400810970214,0.0007329834768367515,31.23911866572903,29.999999868804675,1.0879421538075698,5635.014414092206,8.443881151124355,506.63286906746134,0.271613274972508,0.00017050920352562507
-128340,27.6,24.060830117333673,36.815482037713025,31.23877250167137,1.0879421538075698,25360.634264285516,62.67436262328882,3760.461757397329,0.6540585132361522,0.0007331215572381374,31.23877250167137,29.99999991855709,1.0879421538075698,5633.439972791663,8.443874403625554,506.6324642175332,0.2716131289383881,0.0001705201770812859
-128400,27.61,24.06248016070446,36.81491206766943,31.238202484068136,1.0879421538075698,25360.63448056769,62.71079859970069,3762.6479159820415,0.6541944760684006,0.0007332608834422265,31.238202484068136,29.99999986891131,1.0879421538075698,5630.847987532629,8.442000143487638,506.5200086092582,0.2715725587994641,0.00017050105849029332
-128460,27.62,24.06414117120775,36.81435435022356,31.237644747729572,1.0879421538075698,25360.634566484045,62.747127529567976,3764.827651774079,0.6543299832077896,0.0007334010725712535,31.237644747729572,29.999999850204507,1.0879421538075698,5628.311711832733,8.44024357215702,506.41461432942117,0.2715345251396039,0.00017048392700072743
-128520,27.630000000000006,24.065781126953713,36.813597071630724,31.236887560328412,1.0879421538075698,25360.634151780963,62.78738665485526,3767.2431992913157,0.6544800844693482,0.0007335414519362108,31.236887560328412,29.99999994166798,1.0879421538075698,5624.86791182879,8.436787103249165,506.2072261949499,0.2714596538061773,0.0001704395240651485
-128580,27.64,24.067415540172895,36.81287637820585,31.236166866881213,1.0879421538075698,25360.6341518825,62.826833251411756,3769.609995084705,0.6546270895668501,0.000733681757673479,31.236166866881213,29.99999994192316,1.0879421538075698,5621.590486442978,8.433627591503798,506.0176554902278,0.27139117877809815,0.00017040003081202022
-128640,27.650000000000006,24.06905383986623,36.812337173160095,31.235627661722145,1.0879421538075698,25360.634152397794,62.86257713725674,3771.754628235404,0.6547602388274735,0.0007338218895716393,31.235627661722145,30.000000099569817,1.0879421538075698,5619.137681116958,8.43198779830141,505.9192678980845,0.2713556264706255,0.00017038524618204155
-128700,27.66,24.070674828782554,36.81128913160564,31.234579629401654,1.0879421538075698,25360.63411040541,62.90873406156909,3774.5240436941453,0.6549320975385651,0.0007339635988731916,31.234579629401654,29.99999994939437,1.0879421538075698,5614.372334157334,8.426073247402522,505.5643948441513,0.2712273158054144,0.00017030139512771842
-128760,27.67,24.072290780532278,36.81024100926043,31.233531501142107,1.0879421538075698,25360.634137301473,62.9548859735686,3777.293158414116,0.6551038474551809,0.0007341055189401956,31.233531501142107,29.999999943940157,1.0879421538075698,5609.605892771303,8.420152307005203,505.2091384203123,0.2710987448129603,0.00017021751966680068
-128820,27.68,24.07391006837005,36.80903401699745,31.232324432968937,1.0879421538075698,25360.634482510468,63.004453781599,3780.26722689594,0.6552882090563821,0.0007342485902203046,31.232324432968937,29.99999986858198,1.0879421538075698,5604.116974414926,8.412911547722446,504.77469286334684,0.27094134850591295,0.00017011225271448184
-128880,27.69,24.075521821919263,36.808297503934114,31.231587901117,1.0879421538075698,25360.63456795356,63.04410870266573,3782.6465221599437,0.6554356261882814,0.0007343897620052668,31.231587901117,30.000000007346724,1.0879421538075698,5600.766892442345,8.409581975710317,504.57491854261895,0.2708689103767296,0.0001700705794120664
-128940,27.7,24.077118351624456,36.80858426584998,31.231874675845102,1.0879421538075698,25360.634509688607,63.062192023583755,3783.731521415026,0.6555028289075241,0.0007345263599080551,31.231874675845102,30.000000019922926,1.0879421538075698,5602.070971489045,8.414761399314857,504.8856839588913,0.2709815771229499,0.00017016730602335752
-129000,27.71,24.078718801414137,36.80914052452364,31.23243101371253,1.0879421538075698,25360.634149547182,63.074685178588545,3784.481110715313,0.6555492489470084,0.0007346623948867378,31.23243101371253,29.99999994131527,1.0879421538075698,5604.601330051167,8.422203603351308,505.3322162010785,0.2711433017458123,0.000170300835894851
-129060,27.72,24.08031108474257,36.80940254524435,31.232692942305626,1.0879421538075698,25360.634568506557,63.093226183850994,3785.593571031059,0.6556181284920675,0.0007347995846827049,31.232692942305626,29.999999848886052,1.0879421538075698,5605.792896381392,8.427184272216785,505.6310563330071,0.2712514277130458,0.00017039449328045368
-129120,27.73,24.081898568649727,36.80890067119782,31.232191087071747,1.0879421538075698,25360.63448295416,63.12775606780898,3787.665364068538,0.6557463679099993,0.0007349400294318129,31.232191087071747,30.00000002530207,1.0879421538075698,5603.50985815251,8.425771629034688,505.5462977420813,0.271220769222264,0.00017038463728539027
-129180,27.74,24.083479594233392,36.808260615714715,31.23155108610222,1.0879421538075698,25360.63423504832,63.16507813614786,3789.904688168872,0.6558849207491567,0.0007350811268726273,31.23155108610222,29.999999922577626,1.0879421538075698,5600.5998580431215,8.423195115154153,505.3917069092492,0.2711648334752043,0.0001703560738040735
-129240,27.75,24.085057378449246,36.80772849437403,31.23101898275128,1.0879421538075698,25360.634153238207,63.20016145708691,3792.009687425215,0.6560151092046188,0.0007352220187353557,31.23101898275128,30.00000009812635,1.0879421538075698,5598.179267475551,8.421514274221924,505.29085645331526,0.2711283302179326,0.00017034215595614197
-129300,27.76,24.0866216446556,36.80660836414657,31.22989877976014,1.0879421538075698,25360.634484138154,63.247437250799464,3794.846235047968,0.656190460240807,0.0007353651005387678,31.22989877976014,29.99999986623314,1.0879421538075698,5593.086088923311,8.41489744705627,504.8938468233762,0.2709845352739266,0.0001702483253228692
-129360,27.770000000000003,24.088184474695534,36.805458848933625,31.22874926447197,1.0879421538075698,25360.634484480248,63.29535205929333,3797.7211235576,0.656368085878309,0.0007355086135478772,31.22874926447197,29.999999866659078,1.0879421538075698,5587.858553327578,8.408033252441857,504.48199514651145,0.270835203165745,0.00017015051473304204
-129420,27.78,24.08974285965536,36.8044983847762,31.22778887381416,1.0879421538075698,25360.634150233534,63.339284609190166,3800.3570765514105,0.6565308643888261,0.000735651487320921,31.22778887381416,29.99999993830907,1.0879421538075698,5583.49075666265,8.402742571182515,504.1645542709509,0.2707199907177908,0.00017007833822762976
-129480,27.79,24.091288513581553,36.80301740784295,31.226307878241023,1.0879421538075698,25360.63423500023,63.39403976249481,3803.642385749689,0.6567336297913016,0.0007357963263959768,31.226307878241023,29.999999920381146,1.0879421538075698,5576.755865384743,8.393089942247233,503.58539653483393,0.2705095373460475,0.0001699352672982569
-129540,27.8,24.092841080605,36.80154833256921,31.22483880289653,1.0879421538075698,25360.634235321977,63.44871358061521,3806.922814836913,0.6569359691479646,0.0007359419221029814,31.22483880289653,29.999999921020983,1.0879421538075698,5570.075098078449,8.38355354658576,503.0132127951457,0.2703012961074903,0.000169794017000827
-129600,27.8,24.092833354948016,36.79132522146903,31.214615636482034,1.0879421538075698,25360.634486869298,63.66490915396336,3819.894549237801,0.6577348572555841,0.0007359854784758159,31.214615636482034,30.000000015991002,1.0879421538075698,5523.583812978296,8.298820409317917,497.92922455907507,0.26843676558401813,0.0001684047274384141
-129660,27.8,24.092841080605,36.760302702763425,31.183593172157195,1.0879421538075698,25360.63423956744,64.32733700114282,3859.640220068569,0.6601706638138669,0.0007361198593898963,31.183593172157195,30.000000055062188,1.0879421538075698,5382.505932284595,8.04742787331281,482.84567239876856,0.2627466643446224,0.00016418727097266867
-129720,27.8,24.092841080605,36.72463605951532,31.14792652872533,1.0879421538075698,25360.63424040309,65.10020427088061,3906.012256252837,0.6629900355144392,0.0007362753151657626,31.14792652872533,30.000000041076692,1.0879421538075698,5220.308432310202,7.768982441257613,466.13894647545686,0.256142143700176,0.00015933392143917475
-129780,27.8,24.092841080605,36.69699570267843,31.12028617245608,1.0879421538075698,25360.634237821694,65.70765880691845,3942.459528415107,0.6651892785341663,0.0007363968524741611,31.12028617245608,29.99999988753573,1.0879421538075698,5094.611896054794,7.561005933339934,453.66035600039606,0.2509773628598613,0.00015556952193399368
-129840,27.8,24.092841080605,36.6734366424711,31.096727131643508,1.0879421538075698,25360.634149622118,66.231415760473,3973.88494562838,0.6670738939096645,0.0007365011573169886,31.096727131643508,30.000000047670913,1.0879421538075698,4987.4741161627035,7.389127326991774,443.34763961950637,0.2465426814988053,0.00015235865097503427
-129900,27.8,24.092841080605,36.652799533152965,31.0760899520081,1.0879421538075698,25360.634469396828,66.69475973530983,4001.6855841185893,0.6687322953175454,0.0007365930968513244,31.0760899520081,29.9999999715663,1.0879421538075698,4893.624861232658,7.242645586516629,434.5587351909976,0.2426332157876909,0.0001495442935604249
-129960,27.8,24.092833354948016,36.634619297929824,31.057909766736636,1.0879421538075698,25360.63424223672,67.10641645718101,4026.384987430861,0.670198828275542,0.0007366741315799388,31.057909766736636,30.000000018764997,1.0879421538075698,4810.948468722764,7.1167503664457925,427.0050219867476,0.23916954622896736,0.00014706348037787142
-130020,27.8,24.092841080605,36.61776474894179,31.041055242981077,1.0879421538075698,25360.63412748952,67.49129880708985,4049.4779284253914,0.671564195490345,0.0007367503632983009,31.041055242981077,30.00000004056243,1.0879421538075698,4734.300767655003,7.002690946766983,420.16145680601915,0.2359424964438708,0.00014476268881718162
-130080,27.8,24.092841080605,36.60186715908526,31.025157551512326,1.0879421538075698,25360.63458958103,67.85690815159995,4071.4144890959965,0.6728560699627595,0.0007368222405625836,31.025157551512326,29.999999937052912,1.0879421538075698,4662.0049252209465,6.897427573104343,413.8456543862608,0.23288391358510915,0.0001425913735921391
-130140,27.8,24.092841080605,36.58682960816887,31.01012010160755,1.0879421538075698,25360.63413022084,68.20517946885515,4092.310768131308,0.6740820842800043,0.0007368904960688589,31.01012010160755,30.00000003767627,1.0879421538075698,4593.6201874629305,6.799937132602907,407.9962279561745,0.22997770182487695,0.00014053659863173064
-130200,27.8,24.092841080605,36.57259955908468,30.995889950852188,1.0879421538075698,25360.63459258045,68.53692862812257,4112.215717687354,0.675245802929941,0.000736955376411374,30.995889950852188,29.99999977707953,1.0879421538075698,4528.908364549884,6.709542828265512,402.5725696959306,0.2272157954140857,0.0001385913561468082
-130260,27.800000000000008,24.092841080605,36.55911740654177,30.982407892782785,1.0879421538075698,25360.63416295292,68.85323723480785,4131.194234088471,0.6763516357002533,0.0007370170389071018,30.982407892782785,29.999999952503842,1.0879421538075698,4467.596583742561,6.62556345929963,397.5338075579778,0.2245883080720329,0.0001367475607925005
-130320,27.8,24.092841080605,36.54631021188469,30.969600620727018,1.0879421538075698,25360.634514931025,69.15551345179077,4149.330807107445,0.6774050420467074,0.0007370758796302019,30.969600620727018,29.999999849491488,1.0879421538075698,4409.3547248163495,6.547289269081829,392.83735614490973,0.2220827080361973,0.0001349954062225715
-130380,27.8,24.092841080605,36.53410371620804,30.957394184475717,1.0879421538075698,25360.634244688375,69.44524203610216,4166.714522166129,0.6784116551331262,0.0007371321145015656,30.957394184475717,29.999999902706367,1.0879421538075698,4353.844515256039,6.4740460894556975,388.44276536734185,0.21968582614993087,0.00013332480564495883
-130440,27.8,24.092841080605,36.52243566594734,30.945726056592346,1.0879421538075698,25360.634597685184,69.7237032456716,4183.422194740295,0.6793763144942414,0.000737186075653046,30.945726056592346,29.99999983969975,1.0879421538075698,4300.782844390973,6.405271816641066,384.31630899846397,0.21738656384771285,0.0001317273211805973
-130500,27.800000000000008,24.092841080605,36.51079042396292,30.934080886028156,1.0879421538075698,25360.634272894647,70.00311064705802,4200.186638823481,0.6803415060594374,0.000737240090654079,30.934080886028156,29.99999993817605,1.0879421538075698,4247.824839829944,6.337836996909781,380.27021981458677,0.2150838468707588,0.00013013239502952418
-130560,27.800000000000008,24.092841080605,36.496252246488865,30.919542731744784,1.0879421538075698,25360.634167432738,70.35403033005703,4221.241819803422,0.68154986494976,0.0007373077760276313,30.919542731744784,29.99999998108141,1.0879421538075698,4181.710960420885,6.255338355983237,375.3203013589943,0.21219792397245174,0.00012814046227523234
-130620,27.8,24.092841080605,36.47800495829158,30.901295420072127,1.0879421538075698,25360.634274189302,70.79777069316651,4247.866241589991,0.6830717348781242,0.0007373931303023322,30.901295420072127,29.99999998014483,1.0879421538075698,4098.729522909432,6.154438463606,369.26630781636004,0.20855799708591172,0.0001256390743252832
-130680,27.8,24.092841080605,36.46296086663764,30.886251278615863,1.0879421538075698,25360.634500670265,71.16644488672523,4269.986693203514,0.6843310168349368,0.000737463833888593,30.886251278615863,29.99999999240136,1.0879421538075698,4030.3147565207314,6.073461890550206,364.4077134330124,0.20554211552984644,0.00012357572521742695
-130740,27.8,24.092841080605,36.44876467521805,30.872055143562626,1.0879421538075698,25360.634244338737,71.51665210906394,4290.9991265438375,0.685522943986109,0.0007375308010739831,30.872055143562626,29.99999989963986,1.0879421538075698,3965.7568601063317,5.998876386689964,359.9325832013978,0.20268373804290554,0.00012162780549820368
-130800,27.8,24.092841080605,36.433973461334745,30.857263879198094,1.0879421538075698,25360.634473907056,71.88401434538314,4313.040860722987,0.6867688197596297,0.0007376008792866878,30.857263879198094,29.998704551680518,1.0879421538075698,3904.3828549154027,5.9307364898490675,355.8441893909442,0.2,0.00011977841586804275
-130860,27.8,24.092841080605,36.42010284744878,30.843393308120238,1.0879421538075698,25360.634279232985,72.23076765724373,4333.846059434624,0.6879406694651232,0.0007376668726254273,30.843393308120238,29.986862023644317,1.0879421538075698,3895.1601300237544,5.9307364898490675,355.8441893909442,0.2,0.0001195298373719795
-130920,27.800000000000008,24.092841080605,36.402033898941674,30.82532438854798,1.0879421538075698,25360.634147648914,72.68584383148978,4361.150629889386,0.6894725633449822,0.0007377532086841474,30.82532438854798,29.97143312634114,1.0879421538075698,3883.1543694971947,5.9307364898490675,355.8441893909442,0.2,0.00011920628125142132
-130980,27.8,24.092841080605,36.380251841169375,30.80354230850789,1.0879421538075698,25360.63424891388,73.23950221839841,4394.370133103904,0.6913271771664992,0.000737857861152282,30.80354230850789,29.95283067065488,1.0879421538075698,3868.6947154998024,5.9307364898490675,355.8441893909442,0.2,0.00011881663986732825
-131040,27.8,24.092841080605,36.35400569451184,30.777296162225056,1.0879421538075698,25360.634247209877,73.91409082160263,4434.845449296156,0.6935735126603312,0.0007379848454728509,30.777296162225056,29.930411960637535,1.0879421538075698,3851.2890732170586,5.9307364898490675,355.8441893909442,0.2,0.0001183476829186842
-131100,27.8,24.092841080605,36.32422995424111,30.747520441141127,1.0879421538075698,25360.63415995604,74.68947940234638,4481.368764140781,0.6961376605689891,0.0007381300424819508,30.747520441141127,29.9049730264788,1.0879421538075698,3831.567108789636,5.9307364898490675,355.8441893909442,0.2,0.00011781640854496386
-131160,27.8,24.092841080605,36.29061502489435,30.71390549220139,1.0879421538075698,25360.634249057042,75.57785644442752,4534.671386665652,0.6990524232256259,0.0007382954696050398,30.71390549220139,29.876247206145013,1.0879421538075698,3809.333316327349,5.9307364898490675,355.8441893909442,0.2,0.00011721758754877656
-131220,27.8,24.092841080605,36.25403031047589,30.67732077754464,1.0879421538075698,25360.634250140694,76.5607565831027,4593.6453949861625,0.7022492464938381,0.0007384773181946162,30.67732077754464,29.844975460994874,1.0879421538075698,3785.1720657469514,5.9307364898490675,355.8441893909442,0.2,0.00011656699604328113
-131280,27.8,24.092841080605,36.214206593521716,30.637496999033676,1.0879421538075698,25360.634530076273,77.6501371824931,4659.0082309495865,0.7057587184621442,0.0007386774368189381,30.637496999033676,29.81092544289416,1.0879421538075698,3758.9153232812487,5.9307364898490675,355.8441893909442,0.2,0.00011586014697045537
-131340,27.8,24.092841080605,36.172365086201374,30.595655489118897,1.0879421538075698,25360.63454187468,78.81699336658372,4729.019601995024,0.7094794686994892,0.000738890212346895,30.595655489118897,29.775139362712483,1.0879421538075698,3731.377661909111,5.9307364898490675,355.8441893909442,0.2,0.00011511900485835559
-131400,27.8,24.092841080605,36.12778281170584,30.551073193154224,1.0879421538075698,25360.63463950771,80.0860490300466,4805.162941802796,0.7134822911905241,0.0007391197624399879,30.551073193154224,29.73699705973648,1.0879421538075698,3702.091161367057,5.9307364898490675,355.8441893909442,0.2,0.00011433101078338044
-131460,27.8,24.092841080605,36.08198066443398,30.505271130310604,1.0879421538075698,25360.634255562003,81.41833052152121,4885.099831291272,0.7176367695986751,0.0007393586912722327,30.505271130310604,29.69779822876679,1.0879421538075698,3672.0623159637294,5.9307364898490675,355.8441893909442,0.2,0.00011352327093298894
-131520,27.8,24.092841080605,36.03611182302896,30.459402288547867,1.0879421538075698,25360.634257188725,82.78222080958608,4966.933248575165,0.7218405672426403,0.0007396012237324749,30.459402288547867,29.658528946193705,1.0879421538075698,3642.050172452847,5.9307364898490675,355.8441893909442,0.2,0.00011271621664144306
-131580,27.8,24.092841080605,35.98943911048433,30.412729575653,1.0879421538075698,25360.63425878148,84.20137492150437,5052.082495290261,0.7261633366362581,0.0007398514016449985,30.412729575653,29.618558027533577,1.0879421538075698,3611.573105034585,5.9307364898490675,355.8441893909442,0.2,0.00011189689970251377
-131640,27.8,24.092841080605,35.94111975159888,30.36441021638161,1.0879421538075698,25360.634260536557,85.70489408852177,5142.293645311306,0.7306876281968316,0.0007401140401219582,30.36441021638161,29.577162466215157,1.0879421538075698,3580.0864539063973,5.9307364898490675,355.8441893909442,0.2,0.00011105069978714716
-131700,27.8,24.092841080605,35.95426407177843,30.37755453667784,1.0879421538075698,25360.63426000596,85.29240226620398,5117.544135972239,0.7294519660365393,0.0007400422224168049,30.37755453667784,29.58842476544402,1.0879421538075698,3588.6451295301063,5.9307364898490675,355.8441893909442,0.2,0.00011128068473049816
-131760,27.8,24.092841080605,35.93064207268425,30.353932537385678,1.0879421538075698,25360.63426090629,86.03562600026737,5162.137560016043,0.7316753597454828,0.0007401715014296392,30.353932537385678,29.568184229642196,1.0879421538075698,3573.2675922382978,5.9307364898490675,355.8441893909442,0.2,0.00011086747745960008
-131820,27.8,24.092841080605,35.92574284212904,30.349033217970213,1.0879421538075698,25360.634665007026,86.1908633668902,5171.451802013413,0.732138058220977,0.0007401984474297812,30.349033217970213,29.563985871088253,1.0879421538075698,3570.079903884126,5.9307364898490675,355.8441893909442,0.2,0.00011078182791275064
-131880,27.8,24.092841080605,35.95776683972656,30.38105730470429,1.0879421538075698,25360.634259649785,85.18288209216868,5110.972925530121,0.7291231827275777,0.0007400231408678996,30.38105730470429,29.59142582533761,1.0879421538075698,3590.926696533548,5.9307364898490675,355.8441893909442,0.2,0.00011134200015630012
-131940,27.8,24.092841080605,35.91149587479809,30.334786339362534,1.0879421538075698,25360.63426152925,86.6444029400475,5198.664176402849,0.7334865330416999,0.0007402769642817904,30.334786339362534,29.551776282425074,1.0879421538075698,3560.815127793684,5.9307364898490675,355.8441893909442,0.2,0.00011053291240613062
-132000,27.8,24.092841080605,35.89918938896445,30.322479755528516,1.0879421538075698,25360.634707195626,87.03869227760212,5222.321536656127,0.7346548278778259,0.000740345056389644,30.322479755528516,29.993231831514674,1.0879421538075698,1497.2872675590536,0.0,0.0,0.0,0.0
-132060,27.800000000000008,24.092841080605,35.94130251843628,30.364592983235067,1.0879421538075698,25360.63426046355,85.69916718276646,5141.950030965988,0.7306705012487934,0.0007401130659108621,30.364592983235067,29.57731907344868,1.0879421538075698,3580.205417346922,5.9307364898490675,355.8441893909442,0.2,0.00011105389604830112
-132120,27.800000000000008,24.092841080605,35.92389366150654,30.347184117453647,1.0879421538075698,25360.63430071745,86.24953600948947,5174.9721605693685,0.7323127849367862,0.0007402086090375827,30.347184117453647,29.56240126673068,1.0879421538075698,3568.877081626773,5.9307364898490675,355.8441893909442,0.2,0.00011074951293597994
-132180,27.8,24.092841080605,35.922557524294646,30.34584798894661,1.0879421538075698,25360.63426113124,86.29200643587046,5177.520386152227,0.7324392095657102,0.0007402159638022678,30.34584798894661,29.561256256443386,1.0879421538075698,3568.00795275416,5.9307364898490675,355.8441893909442,0.2,0.00011072616003355989
-132240,27.8,24.092841080605,35.941993289100964,30.36528365703587,1.0879421538075698,25360.6347009616,85.67741974797741,5140.645184878645,0.7306054558136866,0.0007401092816359892,30.36528365703587,29.577910876374048,1.0879421538075698,3580.655042362396,5.9307364898490675,355.8441893909442,0.2,0.00011106597701653852
-132300,27.8,24.092841080605,35.9438733934559,30.367163857970763,1.0879421538075698,25360.634261754796,85.61824936302955,5137.094961781773,0.7304284216499324,0.0007400989690291072,30.367163857970763,29.579521881707482,1.0879421538075698,3581.8792357958364,5.9307364898490675,355.8441893909442,0.2,0.00011109887402587324
-132360,27.8,24.092841080605,35.942551437518574,30.36584190231234,1.0879421538075698,25360.634260486393,85.65983693307119,5139.590215984272,0.7305528580692292,0.0007401062082747314,30.36584190231234,29.57838922919613,1.0879421538075698,3581.018361144394,5.9307364898490675,355.8441893909442,0.2,0.00011107573919864487
-132420,27.8,24.092841080605,35.93749568932295,30.360786146056384,1.0879421538075698,25360.634297141514,85.8191058378057,5149.146350268341,0.7310290235851009,0.0007401339122137923,30.360786146056384,29.574057161762056,1.0879421538075698,3577.727315158517,5.9307364898490675,355.8441893909442,0.2,0.00011098730870320674
-132480,27.8,24.092841080605,35.92665590789029,30.349946364493398,1.0879421538075698,25360.634297734272,86.16190596831981,5169.714358099189,0.7320517925464208,0.0007401934061978137,30.349946364493398,29.564768436838392,1.0879421538075698,3570.673732772917,5.9307364898490675,355.8441893909442,0.2,0.00011079778424271667
-132540,27.8,24.092841080605,35.913454289461214,30.336744664947947,1.0879421538075698,25360.634666618913,86.58185852854713,5194.911511712827,0.733300869158645,0.0007402661588718435,30.336744664947947,29.553454657454363,1.0879421538075698,3562.088230439616,5.9307364898490675,355.8441893909442,0.2,0.00011056711618021596
-132600,27.8,24.092841080605,35.84743863668727,30.27072910372829,1.0879421538075698,25360.634250266783,88.7232290025347,5323.393740152082,0.7396048160406219,0.0007406341911393206,30.27072910372829,29.944536780317932,1.0879421538075698,1483.3916237458332,0.0,0.0,0.0,0.0
-132660,27.8,24.092841080605,35.88986856268613,30.31315902679563,1.0879421538075698,25360.634263598182,87.33893162633015,5240.335897579807,0.7355419632159568,0.0007403968086406241,30.31315902679563,29.984461867330932,1.0879421538075698,1494.78261168511,0.0,0.0,0.0,0.0
-132720,27.8,24.092841080605,35.963306196611036,30.386596661580313,1.0879421538075698,25360.634259688268,85.0101498212789,5100.608989276734,0.7286040311180059,0.0007399929828355048,30.386596661580313,29.59617158791081,1.0879421538075698,3594.5356445588973,5.9307364898490675,355.8441893909442,0.2,0.0001114389852001338
-132780,27.8,24.092841080605,35.92119685370079,30.34448731834199,1.0879421538075698,25360.634261180192,86.33524421561636,5180.114652936982,0.7325678736100147,0.000740223464976605,30.34448731834199,29.5600902052816,1.0879421538075698,3567.1229017256455,5.9307364898490675,355.8441893909442,0.2,0.00011070238171585246
-132840,27.8,24.092841080605,35.90045259749048,30.323743062279053,1.0879421538075698,25360.634260509974,86.99811463288799,5219.886877973279,0.7345347661993373,0.0007403380596552093,30.323743062279053,29.99442047636289,1.0879421538075698,1497.6267998919072,0.0,0.0,0.0,0.0
-132900,27.8,24.092841080605,35.912529057209284,30.3358194326692,1.0879421538075698,25360.63466674084,86.61138514177338,5196.683108506403,0.7333885310005687,0.0007402712527463829,30.3358194326692,29.55266173688084,1.0879421538075698,3561.4865299667067,5.9307364898490675,355.8441893909442,0.2,0.00011055095058753794
-132960,27.8,24.092841080605,35.92083727772121,30.34412774235957,1.0879421538075698,25360.634261193085,86.34667449275784,5180.800469565471,0.7326018794991839,0.0007402254249654568,30.34412774235957,29.559782057648487,1.0879421538075698,3566.8890262567493,5.9307364898490675,355.8441893909442,0.2,0.00011069609917208259
-133020,27.8,24.092841080605,35.91077827200606,30.334068736883157,1.0879421538075698,25360.634260107432,86.66731458001357,5200.0388748008145,0.7335545230201426,0.0007402809235228777,30.334068736883157,29.55116133536675,1.0879421538075698,3560.348292185385,5.9307364898490675,355.8441893909442,0.2,0.00011052037366456646
-133080,27.8,24.092841080605,35.88294282782349,30.30623329214824,1.0879421538075698,25360.63426261928,87.56292789049309,5253.775673429586,0.7362024273388533,0.0007404353412669687,30.30623329214824,29.97794525001081,1.0879421538075698,1492.9221104628393,0.0,0.0,0.0,0.0
-133140,27.8,24.092841080605,35.92953437488431,30.352824839591236,1.0879421538075698,25360.63426088133,86.07071065543131,5164.242639325878,0.7317799837950507,0.0007401776013516622,30.352824839591236,29.567235080152997,1.0879421538075698,3572.546578250248,5.9307364898490675,355.8441893909442,0.2,0.00011084810534980151
-133200,27.79,24.096365723915763,35.91926295699639,30.342553421596573,1.0879421538075698,25360.634261366715,86.46690307320075,5188.0141843920455,0.7329593770109583,0.0007400315387218652,30.342553421596573,29.55880919632832,1.0879421538075698,3564.1538303754573,5.9307364898490675,355.8441893909442,0.2,0.00011056297289742751
-133260,27.78,24.0998793447083,35.94884609667976,30.372136553141136,1.0879421538075698,25360.63429837875,85.6000351923221,5136.0021115393265,0.7303739086904861,0.0007396681684484094,30.372136553141136,29.584534149611827,1.0879421538075698,3581.6992749019264,5.9307364898490675,355.8441893909442,0.2,0.00011097484865550307
-133320,27.77,24.10338745659204,35.98911066461208,30.412401041673828,1.0879421538075698,25360.634659456333,84.41375365685906,5064.825219411543,0.7268058341726192,0.0007392509523531152,30.412401041673828,29.619402356140238,1.0879421538075698,3606.239397247051,5.9307364898490675,355.8441893909442,0.2,0.0001115749449807698
-133380,27.76,24.106881627088146,36.00010871687165,30.42339909447184,1.0879421538075698,25360.63465700771,84.1420007956889,5048.520047741335,0.7259835119064203,0.0007389921559570223,30.42339909447184,29.62919542758123,1.0879421538075698,3611.719168300766,5.9307364898490675,355.8441893909442,0.2,0.00011166283996303576
-133440,27.75,24.110357314002123,36.03574041954897,30.459030798053874,1.0879421538075698,25360.63465289344,83.12132198493413,4987.2793190960465,0.7228781813468241,0.0007386049236472706,30.459030798053874,29.660080363208063,1.0879421538075698,3633.3055617234777,5.9307364898490675,355.8441893909442,0.2,0.00011218372036081548
-133500,27.74,24.113825951139887,36.081332785291174,30.50462325107593,1.0879421538075698,25360.634255979752,81.82087724351719,4909.252634611031,0.7188826216270685,0.0007381705874115114,30.50462325107593,29.69948285381837,1.0879421538075698,3661.455023663233,5.9307364898490675,355.8441893909442,0.2,0.00011288136309243186
-133560,27.73,24.1172905306598,36.134731157630576,30.558021623786534,1.0879421538075698,25360.63425429167,80.32086965493801,4819.252179296282,0.7142180497753791,0.0007377028098227057,30.558021623786534,29.74555091821016,1.0879421538075698,3694.7903206007677,5.9307364898490675,355.8441893909442,0.2,0.00011371891058558667
-133620,27.72,24.12072252129481,36.19458066340104,30.617871122345313,1.0879421538075698,25360.634287087534,78.67452121379439,4720.4712728276645,0.7090272584139959,0.0007372089279140678,30.617871122345313,29.797114634200753,1.0879421538075698,3732.4707305175566,5.9307364898490675,355.8441893909442,0.2,0.00011467346581243353
-133680,27.71,24.124165527464804,36.25962146860999,30.682911852242146,1.0879421538075698,25360.634629576783,76.93060632187552,4615.836379312531,0.7034446566818873,0.0007366992947411723,30.682911852242146,29.853094653499475,1.0879421538075698,3773.6752017506606,5.9307364898490675,355.8441893909442,0.2,0.00011572366656364009
-133740,27.700000000000006,24.127591145089326,36.32873943099904,30.752029835854753,1.0879421538075698,25360.634533060558,75.12906583108169,4507.743949864901,0.6975829869042489,0.0007361791260399179,30.752029835854753,29.912529572022404,1.0879421538075698,3817.709891151197,5.9307364898490675,355.8441893909442,0.2,0.00011685053496813484
-133800,27.69,24.130993214527532,36.40078383919949,30.824074254214395,1.0879421538075698,25360.634486860654,73.30732941670804,4398.439765002483,0.6915536977111999,0.0007356545714552799,30.824074254214395,29.97443012575953,1.0879421538075698,3863.840111679191,5.9307364898490675,355.8441893909442,0.2,0.00011803428365231372
-133860,27.680000000000003,24.13439775977828,36.46939029231403,30.892680680846176,1.0879421538075698,25360.634607293603,71.6287970815822,4297.727824894932,0.6859037535632421,0.0007351560104158914,30.892680680846176,30.000000012801053,1.0879421538075698,4059.553001779554,6.137097994384189,368.2258796630514,0.2079195121406633,0.0001237982789197545
-133920,27.67,24.137784233257577,36.52451097922896,30.947801464094876,1.0879421538075698,25360.63416920625,70.3262849545371,4219.577097272225,0.6814544822989056,0.0007347246130700782,30.947801464094876,30.00000001229093,1.0879421538075698,4310.2201789444825,6.454126177719452,387.2475706631672,0.2190248222935816,0.00013125848648754993
-133980,27.66,24.14114745460558,36.56238514307753,30.98567555111167,1.0879421538075698,25360.63451860636,69.46416572004269,4167.849943202561,0.6784772984225198,0.0007343724006549834,30.98567555111167,29.99999974708841,1.0879421538075698,4482.457515033587,6.689211570681847,401.35269424091086,0.2265852647465178,0.00013635506095509864
-134040,27.650000000000006,24.14452153073074,36.587166684107025,31.01045715316523,1.0879421538075698,25360.63424109342,68.92416295871948,4135.4497775231675,0.6765991002933817,0.0007340800325203607,31.01045715316523,30.000000015446577,1.0879421538075698,4595.153063612597,6.851495752521004,411.0897451512602,0.23152376328650695,0.00013966368328824098
-134100,27.640000000000004,24.14786911869181,36.60439175181121,31.027682161465872,1.0879421538075698,25360.634511236865,68.56614350543288,4113.968610325973,0.6753480916549529,0.0007338203905232143,31.027682161465872,29.999999957599698,1.0879421538075698,4673.485743470199,6.968820423024335,418.12922538146006,0.23496701360745614,0.00014194130966565038
-134160,27.630000000000006,24.151203356859636,36.61759554546593,31.040885936963612,1.0879421538075698,25360.634593807554,68.3040006371955,4098.24003823173,0.6744291519012978,0.0007335784182777903,31.040885936963612,29.99999993975362,1.0879421538075698,4733.531290352192,7.0615687572101224,423.69412543260734,0.23761925244076984,0.00014367043455338732
-134220,27.62,24.154538521659482,36.62874726400929,31.052037681005036,1.0879421538075698,25360.634477852604,68.0908528077018,4085.451168462108,0.6736801137366789,0.0007333462546955383,31.052037681005036,29.99999996799537,1.0879421538075698,4784.24481308223,7.141863747967894,428.51182487807364,0.2398684834440688,0.0001451195359116632
-134280,27.61,24.157852504522218,36.63890128084366,31.06219169094845,1.0879421538075698,25360.634509189877,67.90128879769233,4074.0773278615397,0.6730125509389866,0.0007331183613400883,31.06219169094845,29.999999822241243,1.0879421538075698,4830.421833284481,7.216428178586449,432.98569071518693,0.2419200678680616,0.00014643168138348122
-134340,27.6,24.161151189826878,36.6483391882127,31.071629605788452,1.0879421538075698,25360.63447521496,67.72869207902694,4063.721524741617,0.6724035856978984,0.0007328937600988574,31.071629605788452,29.99999982955725,1.0879421538075698,4873.3416445799185,7.286976156714772,437.2185694028864,0.2438296157172063,0.0001476453311138488
-134400,27.59,24.16445752003885,36.657106393219976,31.08039688120854,1.0879421538075698,25360.634155005806,67.57218004849646,4054.3308029097884,0.6718504161183779,0.0007326733267550429,31.08039688120854,30.000000044089738,1.0879421538075698,4913.210714917187,7.35366141562768,441.2196849376608,0.24560751586620003,0.00014876725296960496
-134460,27.58,24.167732383189502,36.665303038012816,31.08859350748743,1.0879421538075698,25360.634239199786,67.42873700963642,4045.7242205781854,0.6713426358194124,0.0007324546211287303,31.08859350748743,30.00000002684313,1.0879421538075698,4950.485756283681,7.41699519220504,445.0197115323024,0.24727255513521215,0.0001498104378928175
-134520,27.57,24.171001475826134,36.673005453701094,31.096295865579012,1.0879421538075698,25360.634501126387,67.29691075600756,4037.8146453604536,0.6708752999880808,0.0007322386607280886,31.096295865579012,29.99999997269398,1.0879421538075698,4985.513232347783,7.477429018608304,448.64574111649836,0.24884071459821974,0.00015078584288453307
-134580,27.560000000000006,24.17426866919097,36.6802755492897,31.10356596782149,1.0879421538075698,25360.63447086729,67.17523000156706,4030.513800094024,0.6704433522395715,0.0007320252427412224,31.10356596782149,29.999999980823127,1.0879421538075698,5018.574699272593,7.535314393468858,452.1188636081314,0.250324435860566,0.00015170200635362792
-134640,27.55,24.17750553390321,36.687157733583824,31.11044812614864,1.0879421538075698,25360.634588954697,67.06220255149805,4023.732153089882,0.6700416231511409,0.0007318128393869076,31.11044812614864,29.99999995854995,1.0879421538075698,5049.8720914027535,7.5908537600666905,455.45122560400137,0.2517316770239273,0.0001525645009500165
-134700,27.54,24.18074553788273,36.6936879516296,31.11697841416613,1.0879421538075698,25360.634270751318,66.95746536548289,4017.4479219289733,0.6696689293258133,0.0007316027921847732,31.11697841416613,30.00000003017705,1.0879421538075698,5079.5688917243815,7.6442793182052275,458.6567590923136,0.2530706708689008,0.00015337886557974438
-134760,27.53,24.183973417970083,36.699895155171795,31.123185618371526,1.0879421538075698,25360.63426773544,66.86007521013869,4011.604512608321,0.6693220063696753,0.0007313944064907343,31.123185618371526,30.00000003257594,1.0879421538075698,5107.796751504741,7.695722920002257,461.7433752001354,0.254346736442382,0.00015414885038099072
-134820,27.52,24.187180676703566,36.70580472698367,31.129095196711415,1.0879421538075698,25360.63423804863,66.76930521359857,4006.1583128159136,0.6689983416133315,0.0007311869803577111,31.129095196711415,30.000000040932843,1.0879421538075698,5134.671101339438,7.7453066877071395,464.71840126242836,0.25556466696138863,0.00015487774469260816
-134880,27.51,24.19038165265725,36.71143773293816,31.13472814511989,1.0879421538075698,25360.634499744767,66.68486079764308,4001.091647858585,0.6686969509494731,0.0007309811742318236,31.13472814511989,29.99999998529273,1.0879421538075698,5160.287740427775,7.793156657205545,467.5893994323327,0.2567291040516649,0.00015556873266504108
-134940,27.5,24.1935713416313,36.71681430279384,31.140104771807284,1.0879421538075698,25360.634241297,66.60614257773284,3996.3685546639704,0.6684157527782671,0.0007307766177221496,31.140104771807284,29.99999989479772,1.0879421538075698,5184.738889824046,7.8393758891938115,470.3625533516287,0.2578439151584876,0.00015622450710463102
-135000,27.490000000000006,24.196749238825852,36.722053160800904,31.145343630610533,1.0879421538075698,25360.63423767626,66.53047373012754,3991.828423807652,0.6681452244035131,0.0007305728588817388,31.145343630610533,30.00000004690748,1.0879421538075698,5208.562422968929,7.884854964854004,473.0912978912402,0.2589315434340047,0.00015686105011236917
-135060,27.48,24.199911348944987,36.727418517254755,31.150708980677468,1.0879421538075698,25360.634266721405,66.45183783414414,3987.1102700486495,0.6678638560320435,0.0007303686964067756,31.150708980677468,29.99999989185616,1.0879421538075698,5232.962584402461,7.931671875872451,475.9003125523471,0.2600417030279765,0.00015751391771177232
-135120,27.47,24.203068349417382,36.733024665224036,31.156315135004224,1.0879421538075698,25360.634237810147,66.36780070847553,3982.06804250853,0.6675628991353755,0.0007301642132856923,31.156315135004224,30.00000005286013,1.0879421538075698,5258.456389562748,7.980776319505023,478.8465791703013,0.26119601097477424,0.00015819857801167318
-135180,27.46,24.206210840215697,36.738818171435135,31.162108591401037,1.0879421538075698,25360.6344643455,66.27950777679689,3976.770466607814,0.6672464085904141,0.000729959213833934,31.162108591401037,29.999999852734337,1.0879421538075698,5284.803611553244,8.031771091120495,481.9062654672296,0.2623840534419181,0.00015890770008945864
-135240,27.45,24.20934397687392,36.744734751752425,31.168025241404443,1.0879421538075698,25360.63414744108,66.18843206354953,3971.3059238129717,0.6669196281344787,0.000729754148852059,31.168025241404443,30.000000078300452,1.0879421538075698,5311.709132691909,8.08417194417178,485.0503166503068,0.2635937488240417,0.00015963263222859442
-135300,27.44,24.212471267966666,36.75072008533151,31.174010554409794,1.0879421538075698,25360.63424100212,66.09585722141381,3965.751433284829,0.6665871402795587,0.0007295494231271151,31.174010554409794,30.00000005931603,1.0879421538075698,5338.92801769252,8.137563965426878,488.25383792561274,0.2648150108003081,0.0001603661985674365
-135360,27.43,24.21557519050603,36.756734859880005,31.18002528028503,1.0879421538075698,25360.6344623486,66.00247694981825,3960.148616989095,0.6662514233152016,0.00072934429687358,31.18002528028503,30.000000014447078,1.0879421538075698,5366.2807783197195,8.191608047734206,491.4964828640523,0.2660398218314091,0.00016110272131620847
-135420,27.42,24.21866994293566,36.76275198423987,31.18604248068052,1.0879421538075698,25360.63411656909,65.90906712759322,3954.5440276555933,0.6659152612809891,0.0007291396349264327,31.18604248068052,29.99999993928681,1.0879421538075698,5393.644929823523,8.24610711934058,494.7664271604349,0.2672636285088525,0.000161838907809749
-135480,27.41,24.22175869454891,36.76870254450674,31.191992964475414,1.0879421538075698,25360.634464332892,65.8171922751647,3949.031536509882,0.6655842918683927,0.0007289357085606968,31.191992964475414,29.999999863639477,1.0879421538075698,5420.70568324935,8.300485461780205,498.02912770681235,0.2684736546381165,0.0001625654833270766
-135540,27.4,24.22483381331635,36.774501201639254,31.197791615448594,1.0879421538075698,25360.634492343106,65.7286771328705,3943.7206279722295,0.6652651138330378,0.0007287325692161524,31.197791615448594,30.0000000192559,1.0879421538075698,5447.074910313352,8.353996491897927,501.2397895138757,0.2696538272592728,0.00016327094622848278
-135600,27.39,24.22789862203798,36.77916679314065,31.20245728351973,1.0879421538075698,25360.634144134638,65.66527906031324,3939.9167436187945,0.6650363174275099,0.0007285337007491341,31.20245728351973,29.999999940942477,1.0879421538075698,5468.2928501870565,8.398257259501426,503.8954355700856,0.2706222395238737,0.00016382406157153668
-135660,27.380000000000006,24.230948885589783,36.78518407711204,31.20847456760313,1.0879421538075698,25360.634143625317,65.5717892478025,3934.30735486815,0.6646986358455756,0.0007283302490545628,31.20847456760313,30.00000010176496,1.0879421538075698,5495.656309115078,8.454378550066876,507.26271300401254,0.2718402771783075,0.0001645573901812541
-135720,27.37,24.23399498461973,36.790911455492505,31.21420192482664,1.0879421538075698,25360.63423983865,65.48478579948512,3929.0871479691073,0.6643840742458833,0.0007281284347185787,31.21420192482664,29.99999992606689,1.0879421538075698,5521.70282753644,8.508439422128934,510.50636532773603,0.2730033633139228,0.0001652513889605031
-135780,27.36,24.237017755126573,36.797101048457925,31.22039151781832,1.0879421538075698,25360.634239719177,65.38741325220808,3923.244795132485,0.6640316694932518,0.0007279248171469982,31.22039151781832,29.99999992893385,1.0879421538075698,5549.850596464353,8.566900300303926,514.0140180182354,0.2742500601950538,0.0001660062389157599
-135840,27.35,24.24004274436459,36.802772446995,31.226062937813353,1.0879421538075698,25360.63414213704,65.30167208658509,3918.100325195105,0.6637210503341994,0.0007277239015721588,31.226062937813353,29.999999955855927,1.0879421538075698,5575.641813410952,8.621291820667702,517.2775092400622,0.2753998844127155,0.00016669137490931378
-135900,27.34,24.24305019638771,36.808833102500955,31.232123572655873,1.0879421538075698,25360.634236105998,65.20720999076738,3912.4325994460432,0.6633785004487307,0.0007275216658328362,31.232123572655873,29.99999993814529,1.0879421538075698,5603.203226070213,8.679502256250528,520.7701353750317,0.2766198964758812,0.00016742767918434578
-135960,27.33,24.246034802415398,36.814404187562296,31.237694608623947,1.0879421538075698,25360.63445936248,65.12340119042665,3907.404071425599,0.6630742863852633,0.0007273207943522937,31.237694608623947,29.999999892230395,1.0879421538075698,5628.538268029483,8.733773977163143,524.0264386297886,0.2777477443192243,0.00016809764910233856
-136020,27.32,24.249030352452387,36.82036633092253,31.243656822068612,1.0879421538075698,25360.634140646627,65.03124310580678,3901.874586348407,0.6627394430413891,0.0007271200330312718,31.243656822068612,29.999999965290023,1.0879421538075698,5655.651686930027,8.791966339868589,527.5179803921152,0.2789469795317364,0.00016881961692282208
-136080,27.31,24.25199975408367,36.82587633236988,31.24916675370614,1.0879421538075698,25360.63445811366,64.9487873419548,3896.9272405172883,0.6624395646445874,0.0007269203195149969,31.24916675370614,29.999999901060697,1.0879421538075698,5680.7089342322115,8.846475923089377,530.7885553853624,0.2800610418131312,0.0001694802460340596
-136140,27.3,24.254955078455467,36.831775211559865,31.255065633039017,1.0879421538075698,25360.634457463886,64.85777754815776,3891.4666528894654,0.6621082610889985,0.0007267195080268832,31.255065633039017,29.999999904180488,1.0879421538075698,5707.5346530980405,8.90488592320321,534.2931553921926,0.2812450652303386,0.00017019200870731455
-136200,27.29,24.25792133294688,36.83725012325841,31.26054059279228,1.0879421538075698,25360.63423893029,64.7762826932112,3886.576961592672,0.6618113132009461,0.0007265214179234386,31.26054059279228,29.999999957813397,1.0879421538075698,5732.432326332082,8.959873867397617,537.592432043857,0.2823506824000045,0.00017084705819912994
-136260,27.28,24.260852474296655,36.84310773791637,31.26639820823056,1.0879421538075698,25360.634235381738,64.68610168721492,3881.166101232895,0.6614824041465036,0.0007263212347822256,31.26639820823056,29.999999961607717,1.0879421538075698,5759.070390517522,9.018710080679133,541.122604840748,0.2835241647834607,0.0001715519026443136
-136320,27.27,24.263778248314935,36.848563199411615,31.271853615066732,1.0879421538075698,25360.63448394917,64.60476649507656,3876.2859897045937,0.6611854768402637,0.0007261229342477899,31.271853615066732,29.99999974478372,1.0879421538075698,5783.8803748703685,9.074241412775603,544.4544847665363,0.2846228905101274,0.00017220268824805709
-136380,27.26,24.266706468579468,36.85439319402589,31.2776836636338,1.0879421538075698,25360.634238593615,64.51541239470932,3870.924743682559,0.6608589674841094,0.000725924416019476,31.2776836636338,29.999999803403217,1.0879421538075698,5810.392826678896,9.133656656034074,548.0193993620443,0.2857891445948163,0.00017290294052044511
-136440,27.25,24.269604559643984,36.85986219589947,31.2831526089506,1.0879421538075698,25360.634495791088,64.43365354750149,3866.0192128500903,0.6605599290640207,0.0007257263707183737,31.2831526089506,29.999999918582606,1.0879421538075698,5835.262868783881,9.190052198097568,551.403131885854,0.2868873883250701,0.00017355405340706883
-136500,27.24,24.27249689773677,36.8657113896036,31.289001860084838,1.0879421538075698,25360.634234621994,64.34366005073676,3860.619603044205,0.6602304585279886,0.0007255276729502245,31.289001860084838,29.999999981387962,1.0879421538075698,5861.862627116831,9.250420053878976,555.0252032327387,0.2880537457426153,0.0001742551914066727
-136560,27.23,24.27538696087377,36.871187122617066,31.29447762099009,1.0879421538075698,25360.63410778141,64.2619027647866,3855.7141658871947,0.6599308558314356,0.0007253309086324511,31.29447762099009,29.99999984676272,1.0879421538075698,5886.764799790647,9.307663966089837,558.4598379653902,0.2891510880628168,0.000174906284796997
-136620,27.22,24.278255074056148,36.87699639444451,31.300286864149772,1.0879421538075698,25360.634238150902,64.17272949724091,3850.363769834455,0.6596037665176521,0.0007251328634845566,31.300286864149772,29.999999991628343,1.0879421538075698,5913.1822447532495,9.368444884318953,562.1066930591371,0.2903071886006519,0.00017560072394749268
-136680,27.21,24.281118688161587,36.882401869911526,31.305692339639815,1.0879421538075698,25360.634238046132,64.0923609824524,3845.5416589471442,0.6593086950235469,0.0007249366834338272,31.305692339639815,29.99999982784193,1.0879421538075698,5937.764920212494,9.425755705698391,565.5453423419034,0.2913889141503664,0.00017624110426767072
-136740,27.2,24.283979441353093,36.888170583401205,31.31146105392411,1.0879421538075698,25360.63423443256,64.00424808842159,3840.254885305296,0.6589848863739373,0.000724740081571901,31.31146105392411,29.999999833375036,1.0879421538075698,5963.99868976252,9.486962486942836,569.21774921657,0.29253537483396136,0.00017692919276629513
-136800,27.21,24.293362738123644,36.89310375975404,31.316394176324987,1.0879421538075698,25360.634479784352,64.03136734945859,3841.882040967516,0.6590845816348033,0.0007247855859360602,31.316394176324987,29.999999957272873,1.0879421538075698,5986.431984889965,9.554487388909585,573.2692433345751,0.293789842341969,0.00017761709370933383
-136860,27.22,24.30275143710885,36.89336017015911,31.316650640669337,1.0879421538075698,25360.634234490233,64.15941200873118,3849.56472052387,0.6595548898564988,0.000724845244959121,31.316650640669337,29.999999841205106,1.0879421538075698,5987.598809510995,9.576671242706416,574.6002745623849,0.2941996415078065,0.00017768491635887255
-136920,27.23,24.31214993999231,36.895910037976606,31.319200508480158,1.0879421538075698,25360.63423452054,64.23841100820502,3854.304660492301,0.6598447190615202,0.0007248985786386736,31.319200508480158,29.999999845165018,1.0879421538075698,5999.1945657770375,9.621622238965225,577.2973343379135,0.2950265324589511,0.00017805732196992681
-136980,27.24,24.32154001550213,36.90357129820259,31.326861762486377,1.0879421538075698,25360.634262805568,64.20688596296536,3852.4131577779212,0.6597290914363517,0.000724936258396548,31.326861762486377,29.99999984612449,1.0879421538075698,6034.034866364561,9.717792839990796,583.0675703994478,0.2967802291278375,0.00017910788176997625
-137040,27.25,24.33091883768665,36.91311626444236,31.336406734285433,1.0879421538075698,25360.6342375242,64.13452925576729,3848.071755346037,0.6594635479739467,0.000724967679886348,31.336406734285433,29.999999864723176,1.0879421538075698,6077.441478385405,9.83414142555052,590.0484855330312,0.2988745504779698,0.00018040828707937949
-137100,27.26,24.340322899663,36.923229912572104,31.34652038244625,1.0879421538075698,25360.634237382896,64.05035444045193,3843.021266427116,0.6591543636358335,0.0007249985991993804,31.34652038244625,30.000000013369256,1.0879421538075698,6123.433610603846,9.957993139042966,597.4795883425779,0.3010721472390705,0.00018178487047323014
-137160,27.27,24.34971209706937,36.9333745889756,31.356665059597788,1.0879421538075698,25360.63423398105,63.9654180671804,3837.925084030825,0.6588420877229674,0.0007250286172368396,31.356665059597788,30.00000001391466,1.0879421538075698,6169.567523707051,10.083922744640967,605.0353646784581,0.3032741982957916,0.0001831654151439482
-137220,27.28,24.35910100322084,36.94346355458853,31.36675402446075,1.0879421538075698,25360.63423739165,63.8817946906008,3832.907681436048,0.6585343496905823,0.00072505876224278,31.36675402446075,30.000000012995446,1.0879421538075698,6215.4480863673425,10.211075827354085,612.6645496412451,0.3054656645977518,0.00018453874303664904
-137280,27.29,24.368490814773192,36.953565748285385,31.376856218974577,1.0879421538075698,25360.634233676334,63.79802241739715,3827.881345043829,0.6582257750560334,0.0007250888653745589,31.376856218974577,30.00000001364314,1.0879421538075698,6261.388805038485,10.340179703217,620.41078219302,0.3076590404605582,0.0001859140286903943
-137340,27.3,24.377887156217227,36.96373877932985,31.387029202472448,1.0879421538075698,25360.634449899146,63.71294591438151,3822.77675486289,0.6579120999081008,0.0007251190799266552,31.387029202472448,29.99999996838379,1.0879421538075698,6307.651652333038,10.471879801829436,628.3127881097662,0.3098647591173122,0.0001872990594272897
-137400,27.31,24.38727406665172,36.974003421978544,31.397293816601444,1.0879421538075698,25360.6345795953,63.625882581905614,3817.552954914337,0.65759078940005,0.0007251484832542915,31.397293816601444,29.999999939639288,1.0879421538075698,6354.331123818111,10.606410209607462,636.3846125764478,0.312085919831164,0.00018869616712314648
-137460,27.32,24.396662223095607,36.98434901870168,31.407639432619952,1.0879421538075698,25360.63449184769,63.53726328702725,3812.2357972216346,0.657263413770349,0.0007251776387154215,31.407639432619952,29.99999995871081,1.0879421538075698,6401.37874190232,10.743726148099803,644.6235688859882,0.3143209293381799,0.00019010420884496904
-137520,27.33,24.40605591339305,36.99475112113516,31.41804153515222,1.0879421538075698,25360.634491398447,63.447622461442,3806.857347686521,0.6569319323032331,0.0007252068457867688,31.41804153515222,29.999999958585907,1.0879421538075698,6448.683325252647,10.883613279620548,653.0167967772328,0.3165655694986844,0.00019152005875843956
-137580,27.34,24.41544231402441,37.0052339438974,31.428524338565964,1.0879421538075698,25360.63457938767,63.35627573489014,3801.376544093409,0.6565937981227786,0.0007252354593900168,31.428524338565964,29.999999938980274,1.0879421538075698,6496.3549923770315,11.026345832227829,661.5807499336696,0.3188235228127789,0.00019294661508970648
-137640,27.35,24.424837152962326,37.01578211597599,31.439072579837212,1.0879421538075698,25360.634264727232,63.26383482085267,3795.83008925116,0.6562512587183665,0.0007252642240662634,31.439072579837212,30.000000010495647,1.0879421538075698,6544.323830202865,11.171838253108714,670.3102951865227,0.3210926852872143,0.00019438221574933365
-137700,27.360000000000007,24.434228757661852,37.02632652467872,31.44961701867621,1.0879421538075698,25360.634127679645,63.171558750606756,3790.2935250364058,0.6559089731392576,0.0007252927487602122,31.44961701867621,30.000000040351033,1.0879421538075698,6592.275565547598,11.319296491224316,679.1577894734588,0.3233602417545596,0.00019581737983036796
-137760,27.37,24.44362108989067,37.03687475075848,31.46016525112359,1.0879421538075698,25360.63409872221,63.07936796807582,3784.762078084549,0.655566646803046,0.0007253213003847714,31.46016525112359,30.00000004643785,1.0879421538075698,6640.244660788806,11.468835626093608,688.1301375656165,0.3256277715848348,0.000197253264352638
-137820,27.38,24.453014596410288,37.047463209109246,31.470753604003697,1.0879421538075698,25360.63457836036,62.98646570738114,3779.187942442868,0.6552213165344022,0.0007253497921672718,31.470753604003697,29.999999943260804,1.0879421538075698,6688.396704525982,11.620900484211335,697.2540290526802,0.3279016647921351,0.00019869469212911508
-137880,27.39,24.462408972783905,37.058079373511575,31.48136984373945,1.0879421538075698,25360.634235774196,62.8931371411616,3773.588228469696,0.6548740347244938,0.0007253781014520338,31.48136984373945,30.000000017994747,1.0879421538075698,6736.674757410104,11.775371664468924,706.5222998681352,0.3301796967500692,0.00020013996040413516
-137940,27.400000000000006,24.47180425828769,37.06872825738118,31.49201872845912,1.0879421538075698,25360.634231908505,62.79929274297724,3767.957564578634,0.6545244616846401,0.0007254063607365157,31.49201872845912,30.000000021099893,1.0879421538075698,6785.101592303363,11.932334424029474,715.9400654417683,0.3324627167203077,0.00020158977301492896
-138000,27.41,24.481186452422513,37.079483128584904,31.50277354712009,1.0879421538075698,25360.634470851866,62.70321272695669,3762.192763617401,0.6541661736290145,0.0007254336225382549,31.50277354712009,29.999999773018608,1.0879421538075698,6834.0113144926345,12.092680710536918,725.5608426322151,0.3347630187958992,0.0002030534876104817
-138060,27.42,24.490587575670684,37.09031736631167,31.51360786032617,1.0879421538075698,25360.634127602258,62.60585623182468,3756.351373909481,0.6538027247373611,0.0007254615403464413,31.51360786032617,30.000000046028262,1.0879421538075698,6883.280176220244,12.256224339771759,735.3734603863057,0.3370770720285262,0.00020452834869904744
-138120,27.43,24.49997225250013,37.10114515173369,31.5244356167025,1.0879421538075698,25360.634259690352,62.50857499908414,3750.514499945049,0.6534391527503772,0.0007254885937668577,31.5244356167025,29.999999818635906,1.0879421538075698,6932.521495747933,12.42183523522738,745.3101141136427,0.3393884403589465,0.0002060021179612419
-138180,27.44,24.50936170646859,37.112008178098655,31.535298597018183,1.0879421538075698,25360.634469104025,62.410803900600655,3744.64823403604,0.6530733418754648,0.0007255157443526972,31.535298597018183,29.999999972855967,1.0879421538075698,6981.921264178935,12.590114204539807,755.4068522723883,0.3417052360445047,0.00020748081291793903
-138240,27.45,24.51876042006336,37.122922934897375,31.54621340532989,1.0879421538075698,25360.634234843637,62.31221373596517,3738.7328241579107,0.6527040510203042,0.0007255431379663926,31.54621340532989,30.00000002666109,1.0879421538075698,7031.557182158354,12.761321697974445,765.6793018784666,0.3440305454338982,0.0002089667852934896
-138300,27.46,24.52815229497318,37.13387249197389,31.55716296334441,1.0879421538075698,25360.634230577936,62.21299600845685,3732.779760507411,0.6523319871339872,0.0007255700712837947,31.55716296334441,30.000000028979038,1.0879421538075698,7081.3513619668465,12.937133058700619,776.2279835220372,0.3463861152886957,0.00021045877210396823
-138360,27.47,24.537540069268914,37.14485288632668,31.56814331198944,1.0879421538075698,25360.63443843852,62.11326716979495,3726.796030187697,0.651957578397825,0.0007255966648252267,31.56814331198944,29.999999985724912,1.0879421538075698,7131.285772434713,13.113770470337524,786.8262282202517,0.3487209221005073,0.00021195351852544244
-138420,27.48,24.54693680035735,37.15587055412511,31.579161024660927,1.0879421538075698,25360.634234373858,62.0130302248895,3720.7818134933705,0.6515808282685263,0.0007256235160982968,31.579161024660927,30.000000030203317,1.0879421538075698,7181.389700509871,13.293245694775626,797.5947416865378,0.3510616445008529,0.00021345360996166804
-138480,27.49,24.556326250228487,37.16696233206968,31.590252802710534,1.0879421538075698,25360.63423389618,61.91135840809578,3714.6815044857462,0.6511982394340502,0.0007256497691288737,31.590252802710534,30.00000002827233,1.0879421538075698,7231.83065921678,13.476031560315572,808.5618936189345,0.3534138888301867,0.0002149634964494145
-138540,27.5,24.565724538934766,37.178111993272466,31.601402413131012,1.0879421538075698,25360.63446483375,61.80877976196922,3708.526785718154,0.6508117820945882,0.0007256762282243923,31.601402413131012,29.99999998159225,1.0879421538075698,7282.534819810398,13.662008693564847,819.7205216138907,0.35577549111567797,0.0002164814588589002
-138600,27.51,24.575116260260767,37.18908610834984,31.612376534634517,1.0879421538075698,25360.634435610238,61.709932564523534,3702.595953871412,0.6504389479832808,0.0007257028857375526,31.612376534634517,29.999999781434962,1.0879421538075698,7332.441625273287,13.847948621780743,830.8769173068447,0.3581056874583313,0.00021797620173504004
-138660,27.52,24.58450351397093,37.1994857836379,31.62277621005487,1.0879421538075698,25360.634435008644,61.623034645705175,3697.38207874231,0.6501108310298158,0.0007257309627305758,31.62277621005487,29.99999977795229,1.0879421538075698,7379.73518636353,14.028234976487427,841.6940985892456,0.3603364387169113,0.00021939487030633566
-138720,27.53,24.59390018043672,37.20814185219864,31.63143227869617,1.0879421538075698,25360.634434642267,61.57228518197367,3694.3371109184204,0.6499190533560363,0.000725764667276215,31.63143227869617,29.999999781329908,1.0879421538075698,7419.099493200974,14.186255601835663,851.1753361101398,0.3622692225516136,0.0002205831155133981
-138780,27.54,24.603289143521856,37.21765287052279,31.64094335662116,1.0879421538075698,25360.634163601597,61.50390791004122,3690.2344746024737,0.6496604826630109,0.0007257954168947186,31.64094335662116,30.00000005512893,1.0879421538075698,7462.35080895255,14.358110566511366,861.4866339906821,0.36434807039138417,0.00022188451694277452
-138840,27.55,24.612683548073516,37.22640854109281,31.649699011913004,1.0879421538075698,25360.634233080644,61.45117142433549,3687.0702854601295,0.6494609173892791,0.0007258286827807616,31.649699011913004,30.000000042498012,1.0879421538075698,7502.168068663434,14.52115124688936,871.2690748133616,0.3662986037736692,0.00022308631841363744
-138900,27.560000000000006,24.62207803292592,37.23538951421864,31.65867993053205,1.0879421538075698,25360.634480955552,61.39389981218198,3683.633988730919,0.6492440512920976,0.0007258612339082834,31.65867993053205,29.999999987591952,1.0879421538075698,7543.009927726619,14.68924194211209,881.3545165267253,0.3682880390791487,0.00022431813402924093
-138960,27.57,24.631465097948624,37.24354324342218,31.66683374010969,1.0879421538075698,25360.634115446454,61.35353488917893,3681.2120933507363,0.6490911173977703,0.0007258958344162353,31.66683374010969,30.00000007055143,1.0879421538075698,7580.089800242436,14.847095992216667,890.825759533,0.3701369471494845,0.0002254404109552477
-139020,27.58,24.640857654020227,37.2520197618442,31.67531015740664,1.0879421538075698,25360.63457532263,61.306635642292086,3678.398138537525,0.6489133358164348,0.0007259296775854847,31.67531015740664,29.999999754711318,1.0879421538075698,7618.638576623118,15.011376914371688,900.6826148623013,0.3720417170145323,0.0002266057981829473
-139080,27.59,24.650250187350988,37.25978730362024,31.683077730526428,1.0879421538075698,25360.634432783856,61.274333699931525,3676.460021995891,0.6487908317510075,0.0007259656864234207,31.683077730526428,29.99999977925303,1.0879421538075698,7653.96226657784,15.16689155147158,910.0134930882947,0.3738270484995879,0.00022767754955388598
-139140,27.6,24.659644186100135,37.267935651189255,31.691226122120188,1.0879421538075698,25360.63423257705,61.23424830835328,3674.054898501197,0.6486387448523019,0.0007260005629493067,31.691226122120188,30.00000004741645,1.0879421538075698,7691.0166580467785,15.329687997003687,919.7812798202212,0.3756778860679688,0.00022879992891559962
-139200,27.61,24.669034065467887,37.27541807789245,31.698708581205864,1.0879421538075698,25360.634085314527,61.20779677083839,3672.4678062503026,0.6485383467178821,0.0007260371783789245,31.698708581205864,29.999999858801452,1.0879421538075698,7725.044733283444,15.484113483290145,929.0468089974086,0.3774168566601068,0.00022983428384849904
-139260,27.62,24.67843338542952,37.28329411101101,31.70658450642097,1.0879421538075698,25360.634576016044,61.17338957393503,3670.4033744361022,0.6484077059478415,0.0007260730252448086,31.70658450642097,29.9999997579659,1.0879421538075698,7760.861735197542,15.646090012538581,938.7654007523148,0.3792238026713264,0.0002309211869016357
-139320,27.630000000000006,24.68782572992967,37.29049688061822,31.71378727607725,1.0879421538075698,25360.63457579294,61.152729542031395,3669.1637725218843,0.6483292365203821,0.0007261106068353558,31.71378727607725,29.999999754112316,1.0879421538075698,7793.617055066973,15.79935897884616,947.9615387307697,0.3809178972688365,0.000231919017891589
-139380,27.64,24.697217683669344,37.29816070573333,31.72145112657351,1.0879421538075698,25360.634460369645,61.12263729951294,3667.358237970777,0.6482149083642779,0.0007261466788540642,31.72145112657351,29.99999977794389,1.0879421538075698,7828.469059434757,15.961233560283608,957.6740136170166,0.3826908995565152,0.00023297805671199077
-139440,27.650000000000006,24.70661078382711,37.30524035796513,31.72853082891437,1.0879421538075698,25360.63423249377,61.10451301912809,3666.2707811476857,0.6481460301050928,0.0007261845634538987,31.72853082891437,29.99999983288329,1.0879421538075698,7860.664451234919,16.115619062387427,966.9371437432457,0.3843667031971951,0.00023396002406880719
-139500,27.66,24.716001092225557,37.31277721926565,31.736067635761856,1.0879421538075698,25360.63448012428,61.07703258216769,3664.6219549300617,0.648041567422684,0.0007262208559089601,31.736067635761856,30.00000000255464,1.0879421538075698,7894.938048913165,16.278641884065813,976.7185130439484,0.3861205433571037,0.0002350025945852965
-139560,27.67,24.725399596441154,37.319733445343935,31.74302386610145,1.0879421538075698,25360.634460745565,61.06151952525963,3663.6911715155775,0.6479825820319086,0.000726259343500068,31.74302386610145,29.999999788767408,1.0879421538075698,7926.573161722997,16.43411771074795,986.0470626448773,0.38777847599552745,0.00023596885772121743
-139620,27.68,24.73479124632619,37.32723471011961,31.75052518119349,1.0879421538075698,25360.634231926957,61.034788971007536,3662.0873382604527,0.6478809190811439,0.0007262957644274358,31.75052518119349,29.999999834800658,1.0879421538075698,7960.685919414301,16.599709278435775,995.9825567061464,0.3895288274137616,0.00023700722640481532
-139680,27.69,24.74417886246286,37.33455987290417,31.75785029998923,1.0879421538075698,25360.63443197041,61.01165126531225,3660.6990759187347,0.6477928948597116,0.0007263325055405378,31.75785029998923,29.999999798476853,1.0879421538075698,7993.997781672038,16.76406421181385,1005.8438527088307,0.39125068996558504,0.0002380223838889355
-139740,27.7,24.75357598509435,37.34338319352994,31.76667361008924,1.0879421538075698,25360.63447983738,60.958033889064474,3657.482033343869,0.6475888229205372,0.0007263650916281141,31.76667361008924,29.99999978335701,1.0879421538075698,8034.12271958559,16.954306701422766,1017.258402085366,0.3932250250360325,0.00023923635157755484
-139800,27.71,24.762965265872978,37.35194342477797,31.77523392169877,1.0879421538075698,25360.634114385553,60.9097292646944,3654.5837558816634,0.6474048615361511,0.0007263981026414996,31.77523392169877,29.99999986515057,1.0879421538075698,8073.0512053132215,17.142193624777036,1028.531617486622,0.39515564598527414,0.0002404155043620105
-139860,27.72,24.77235942879107,37.36065411628089,31.783944588267197,1.0879421538075698,25360.6342277776,60.858440856162225,3651.506451369734,0.6472094223278285,0.000726430798435058,31.783944588267197,29.999999841607217,1.0879421538075698,8112.663924011692,17.33449772973447,1040.069863784068,0.39711231222342985,0.00024161488620839093
-139920,27.73,24.781754208097254,37.36844095906183,31.791731452537967,1.0879421538075698,25360.634130050505,60.82605678043458,3649.5634068260742,0.6470859590036517,0.0007264663144789693,31.791731452537967,29.999999864566153,1.0879421538075698,8148.075349567793,17.513434228679976,1050.806053720799,0.3989158059626538,0.0002426922290053556
-139980,27.74,24.791150688269468,37.376490984196494,31.79978145532725,1.0879421538075698,25360.634231668304,60.788317183826955,3647.299031029617,0.6469420184451459,0.0007265010831094332,31.79978145532725,30.000000015731455,1.0879421538075698,8184.682840346758,17.698517346429536,1061.911040785772,0.4007642519510953,0.00024380465288417974
-140040,27.75,24.80054707241807,37.383800432476406,31.807090897313017,1.0879421538075698,25360.634260291547,60.76571094386027,3645.942656631616,0.6468557665214926,0.0007265380836862534,31.807090897313017,30.000000009504234,1.0879421538075698,8217.923273904456,17.872928597793816,1072.375715867629,0.40249064757511,0.00024481930160303217
-140100,27.76,24.80993573075016,37.39142891890853,31.814719423423295,1.0879421538075698,25360.63407985125,60.736528500580796,3644.191710034848,0.6467443897066008,0.0007265737217595317,31.814719423423295,29.999999880408406,1.0879421538075698,8252.615332610416,18.054367656659654,1083.2620593995794,0.4042710280568972,0.00024587619967919496
-140160,27.770000000000003,24.819329826785086,37.39830193671442,31.82159236417405,1.0879421538075698,25360.63443026705,60.72279198367029,3643.367519020217,0.646691950058156,0.0007266118699162532,31.82159236417405,29.99999980828537,1.0879421538075698,8283.871033603862,18.224614842121802,1093.4768905273081,0.4059274453591839,0.0002468334378673678
-140220,27.78,24.82872355307241,37.40566312310892,31.82895354426506,1.0879421538075698,25360.634458932753,60.699132502318726,3641.9479501391243,0.6466016091912901,0.0007266484820531325,31.82895354426506,29.999999965625282,1.0879421538075698,8317.34600743841,18.40482490666577,1104.289494399946,0.4076661930109483,0.0002478554759015896
-140280,27.79,24.838119379661716,37.41253722507175,31.83582768994738,1.0879421538075698,25360.634260114086,60.685402093755684,3641.124125625341,0.6465491697093856,0.0007266866329275428,31.83582768994738,30.00000000941504,1.0879421538075698,8348.606660851676,18.578269884192267,1114.696193051536,0.4093257754108689,0.00024881335917182793
-140340,27.8,24.847511242180918,37.41989214993083,31.843182578352746,1.0879421538075698,25360.63442589094,60.66188576032108,3639.7131456192637,0.6464593358394738,0.0007267231377175762,31.843182578352746,29.999999814239736,1.0879421538075698,8382.054625725392,18.761688097956494,1125.70128587739,0.41106626805564583,0.00024983502598422764
-140400,27.80833333333333,24.84291936390928,37.41971758440055,31.84300800568009,1.0879421538075698,25360.634458371627,60.607773338051096,3636.4664002830664,0.646252528110391,0.0007268922279515394,31.84300800568009,29.999999965700713,1.0879421538075698,8381.260050569294,18.732732647323132,1123.963958839388,0.4107924833347465,0.00024991321852386674
-140460,27.81666666666667,24.83832086398966,37.40137502237919,31.824665493536173,1.0879421538075698,25360.634231549007,60.92372761248685,3655.4236567492107,0.6474581830376456,0.0007271181405533646,31.824665493536173,29.99999985384964,1.0879421538075698,8297.846183960413,18.38842301150736,1103.3053806904416,0.4075085532179596,0.0002475848850851467
-140520,27.825,24.833709226212182,37.38050011553258,31.80379053214242,1.0879421538075698,25360.63447960752,61.293821226847314,3677.6292736108394,0.648864743098068,0.0007273529644717378,31.80379053214242,29.999999793215586,1.0879421538075698,8202.915522779555,18.005065429392065,1080.303925763524,0.4037887997297591,0.00024491830350721394
-140580,27.833333333333336,24.82908664010159,37.36554314678554,31.788833644082818,1.0879421538075698,25360.634112673462,61.543834627243136,3692.6300776345893,0.6498114917320995,0.0007275699539740637,31.788833644082818,29.999999870030752,1.0879421538075698,8134.897256194009,17.72673446295705,1063.6040677774229,0.4010445655852017,0.00024303389271029298
-140640,27.84166666666667,24.824447318396558,37.354837267268046,31.778127739188122,1.0879421538075698,25360.63422807881,61.70641087796404,3702.3846526778425,0.650425656918672,0.0007277736238537928,31.778127739188122,29.999999843361735,1.0879421538075698,8086.211223614231,17.52245784675777,1051.3474708054664,0.3990063235453726,0.00024171160898951274
-140700,27.85,24.819813180373828,37.34577149970051,31.76906196416153,1.0879421538075698,25360.63426199956,61.83539165340166,3710.1234992040995,0.6509120844821014,0.0007279732460253861,31.76906196416153,29.99999983437767,1.0879421538075698,8044.983762251191,17.347232388205484,1040.833943292329,0.3972412062867786,0.00024060634718024439
-140760,27.85833333333333,24.81516102718815,37.33823689816858,31.761527292008996,1.0879421538075698,25360.63458315371,61.932453646081115,3715.947218764866,0.6512776573163147,0.0007281678537038143,31.761527292008996,29.99999976196143,1.0879421538075698,8010.719430030738,17.198570342553392,1031.9142205532037,0.3957312769999226,0.0002397032047398569
-140820,27.86666666666667,24.810499349885283,37.33030438134709,31.753594800876883,1.0879421538075698,25360.634466328727,62.03792660082661,3722.275596049597,0.6516744443405438,0.0007283641412795445,31.753594800876883,29.999999785933966,1.0879421538075698,7974.645538596204,17.04433499898791,1022.6600999392746,0.3941524656496869,0.00023874634134599048
-140880,27.875,24.80582221886573,37.32215582968367,31.74544624814477,1.0879421538075698,25360.63447118874,62.14789536580518,3728.873721948311,0.6520876306368405,0.0007285611771147793,31.74544624814477,29.999999783140932,1.0879421538075698,7937.589207536895,16.887586015154973,1013.2551609092984,0.3925348584142233,0.00023775962774950948
-140940,27.88333333333333,24.801140879437558,37.3151734043318,31.738463876079713,1.0879421538075698,25360.634228861734,62.233526662428645,3734.011599745719,0.6524090113750624,0.0007287550149876304,31.738463876079713,29.999999834542628,1.0879421538075698,7905.835951127463,16.750890222343177,1005.0534133405904,0.3911132310409633,0.000236927366099421
-141000,27.89166666666667,24.796448503276487,37.30865671095865,31.7319471824905,1.0879421538075698,25360.63422984429,62.309338403264114,3738.560304195847,0.6526932745650492,0.0007289474887076943,31.7319471824905,29.999999835612286,1.0879421538075698,7876.200642207899,16.622559755737637,997.3535853442585,0.3897691316618086,0.0002361562373021564
-141060,27.900000000000006,24.791738055249173,37.30239863835463,31.72568905644127,1.0879421538075698,25360.634472891645,62.37959807033002,3742.775884219801,0.6529564988471194,0.0007291390302385957,31.72568905644127,29.999999780158333,1.0879421538075698,7847.741451615054,16.499120237836948,989.9472142702167,0.38846745298807295,0.00023541859119631417
-141120,27.908333333333335,24.787026340967607,37.296263735232145,31.71955420690217,1.0879421538075698,25360.634229215942,62.447278875046116,3746.836732502768,0.6532098610248106,0.0007293308031353509,31.71955420690217,29.99999987757506,1.0879421538075698,7819.842177863759,16.375750182382532,982.545010942952,0.3871577319428068,0.00023469521180742573
-141180,27.916666666666664,24.782287229089004,37.29017103018972,31.71346150084843,1.0879421538075698,25360.634233814966,62.51380650831873,3750.828390499124,0.6534587149173336,0.0007295218801952303,31.71346150084843,29.99999983172091,1.0879421538075698,7792.135207289171,16.256378964739596,975.3827378843756,0.3858819722030368,0.00023397795543287774
-141240,27.925,24.77755440354135,37.28418366375417,31.70747408152781,1.0879421538075698,25360.634474315033,62.578274069602614,3754.696444176157,0.6536996821922335,0.0007297136457215153,31.70747408152781,30.00000000416859,1.0879421538075698,7764.9060457238265,16.13944272151346,968.3665632908077,0.38462400304641853,0.00023327450554620673
-141300,27.933333333333334,24.77281253508296,37.27835141278739,31.701641884261818,1.0879421538075698,25360.634230105366,62.63937229555854,3758.362337733512,0.6539278916923184,0.0007299051837648697,31.701641884261818,30.000000055434533,1.0879421538075698,7738.3833227810765,16.02562738469169,961.5376430815013,0.3833916545753032,0.00023259114362557412
-141360,27.94166666666667,24.768055300656012,37.272628952223364,31.69591942368497,1.0879421538075698,25360.63423016373,62.69802841113558,3761.8817046681347,0.654146829846618,0.0007300963058644972,31.69591942368497,29.999999830157748,1.0879421538075698,7712.360895813836,15.914156530458634,954.849391827518,0.3821769631001861,0.00023192162624034154
-141420,27.950000000000006,24.76328407865739,37.26800581501392,31.69129623990405,1.0879421538075698,25360.63444195208,62.73323008163762,3763.9938048982567,0.6542781522675665,0.0007302835827724258,31.69129623990405,29.99999978168874,1.0879421538075698,7691.336733977527,15.820398658420313,949.2239195052188,0.3811492772926449,0.00023139809970801705
-141480,27.95833333333333,24.758503495183948,37.26202995424482,31.685320347591148,1.0879421538075698,25360.6345854006,62.79701612915287,3767.820967749172,0.6545159765935927,0.0007304759253945346,31.685320347591148,29.999999751190963,1.0879421538075698,7664.160915526248,15.706158362189125,942.3695017313478,0.37988954412165393,0.00023069338845663564
-141540,27.96666666666667,24.75371220843989,37.25646322094558,31.67975369238445,1.0879421538075698,25360.63423026712,62.852050530768565,3771.1230318461144,0.6547210318765218,0.0007306670236632004,31.67975369238445,29.999999827540087,1.0879421538075698,7638.845657106788,15.598891286415329,935.9334771849201,0.3786990514404275,0.00023004265695878036
-141600,27.975,24.748910651152784,37.25043489134185,31.673725362717704,1.0879421538075698,25360.634230553653,62.91680793157732,3775.008475894639,0.6549621501728553,0.0007308600460002472,31.673725362717704,29.99999982853103,1.0879421538075698,7611.431231441351,15.485155173867767,929.1093104320661,0.3774285327111819,0.00022932957182292266
-141660,27.983333333333334,24.74409964438183,37.24499250448781,31.668282897869073,1.0879421538075698,25360.6345852418,62.96904490776652,3778.142694465991,0.6551565205234168,0.0007310512421791664,31.668282897869073,29.999999970817843,1.0879421538075698,7586.680441012987,15.381031007978189,922.8618604786916,0.3762578394334761,0.00022869418616733165
-141720,27.99166666666667,24.739278088073718,37.239149087572656,31.662439480815124,1.0879421538075698,25360.63458587295,63.0297093557585,3781.78256134551,0.6553821042979351,0.0007312440938079606,31.662439480815124,29.99999974965748,1.0879421538075698,7560.107933868063,15.27140995210667,916.2845971264,0.3750174196734087,0.00022800453881657179
-141780,28.0,24.734441758069504,37.23389359044929,31.65718406094616,1.0879421538075698,25360.63423455095,63.077709879105434,3784.6625927463265,0.6555604866502597,0.0007314347643578565,31.65718406094616,30.00000004572884,1.0879421538075698,7536.207049502802,15.171277456803224,910.2766474081934,0.3738771525545121,0.00022739272044822618
-141840,28.00833333333333,24.729600335243717,37.228222509023134,31.651512932453123,1.0879421538075698,25360.634448592227,63.13455531575621,3788.0733189453717,0.6557716135069165,0.0007316274874583491,31.651512932453123,29.99999999618834,1.0879421538075698,7510.417261049632,15.065488720545162,903.9293232327096,0.3726648701748486,0.00022672483660352003
-141900,28.01666666666667,24.7247392598912,37.223093681330134,31.646384176266505,1.0879421538075698,25360.6341234099,63.17957591962878,3790.774555177727,0.6559387259135386,0.0007318179522701932,31.646384176266505,30.00000006794356,1.0879421538075698,7487.093412318293,14.968367031937346,898.1020219162407,0.37154492077408535,0.00022612868413265133
-141960,28.025000000000006,24.71987774141173,37.21806332649211,31.641353744136467,1.0879421538075698,25360.63447490293,63.222509191619814,3793.350551497189,0.6560980110523895,0.0007320087347234733,31.641353744136467,29.99999977234791,1.0879421538075698,7464.218372454127,14.873282141140153,892.3969284684092,0.37044187865006056,0.00022554545262836186
-142020,28.03333333333333,24.714996762886237,37.214597290499185,31.63788776167002,1.0879421538075698,25360.63423148605,63.231691742495926,3793.901504549756,0.6561320688554061,0.0007321933112673666,31.63788776167002,29.99999982380933,1.0879421538075698,7448.456242792478,14.801789035746081,888.1073421447649,0.3696081685550426,0.00022517114272741412
-142080,28.041666666666664,24.71011523936872,37.211265328467604,31.634555721738753,1.0879421538075698,25360.634585742548,63.238020751873925,3794.2812451124355,0.6561555409013219,0.0007323779996053339,31.634555721738753,29.999999964117666,1.0879421538075698,7433.302825923083,14.732614021992795,883.9568413195676,0.3687978946824794,0.000224814657801641
-142140,28.05,24.70521424316761,37.20805795662454,31.63134845139659,1.0879421538075698,25360.634124157245,63.24143040132783,3794.4858240796702,0.656168185383061,0.0007325618828198264,31.63134845139659,29.999999848657428,1.0879421538075698,7418.717974145574,14.665527076643095,879.9316245985858,0.3680086636569193,0.0002244743095375756
-142200,28.05833333333333,24.700302974226055,37.203904150063025,31.627194621193095,1.0879421538075698,25360.634231671378,63.26492572216579,3795.895543329948,0.6562553031338234,0.0007327495573558161,31.627194621193095,29.999999825784073,1.0879421538075698,7399.828127395766,14.584890303849766,875.0934182309859,0.3670555260017773,0.00022400648151348648
-142260,28.06666666666667,24.695385219148324,37.200232110800414,31.62352260548423,1.0879421538075698,25360.63412455845,63.2780683708639,3796.6841022518342,0.6563040243676246,0.0007329356850290763,31.62352260548423,30.00000006336208,1.0879421538075698,7383.12819494772,14.511666150816946,870.6999690490168,0.3661856974278272,0.00022360296220773053
-142320,28.075000000000006,24.690453812678903,37.19644553938369,31.61973595699528,1.0879421538075698,25360.634475051967,63.29346011248358,3797.607606749015,0.6563610740395408,0.0007331222716641806,31.61973595699528,29.99999998646555,1.0879421538075698,7365.908388778829,14.43710205474066,866.2261232844397,0.3652956846267407,0.0002231835642111025
-142380,28.08333333333333,24.6855118921986,37.19337643787404,31.616666854670928,1.0879421538075698,25360.63447875691,63.29334746710679,3797.600848026408,0.6563606565541462,0.000733306167985788,31.616666854670928,29.99999977072873,1.0879421538075698,7351.952325648454,14.373231203851828,862.3938722311098,0.3645298452303252,0.00022286020516083452
-142440,28.09166666666667,24.68056028294917,37.19010121293691,31.61339170752378,1.0879421538075698,25360.634124999327,63.29752512893425,3797.8515077360553,0.6563761394156207,0.0007334910156103247,31.61339170752378,30.000000060993532,1.0879421538075698,7337.056952360055,14.306656774618368,858.3994064771019,0.3637281486722463,0.0002225087300485088
-142500,28.1,24.67559840948033,37.18743959882317,31.610730069984267,1.0879421538075698,25360.634231530334,63.28839884610231,3797.3039307661384,0.6563423154903808,0.0007336735453193887,31.610730069984267,29.999999823543128,1.0879421538075698,7324.953974097595,14.249153785743005,854.9492271445803,0.36303283568535016,0.00022223948273601728
-142560,28.108333333333334,24.67061728443625,37.18451215396993,31.607802648518053,1.0879421538075698,25360.634125175577,63.28474815302046,3797.084889181228,0.6563287842771182,0.0007338568232999973,31.607802648518053,30.000000058561284,1.0879421538075698,7311.640168730518,14.188038359325905,851.2823015595543,0.36229091040978345,0.00022193383095491778
-142620,28.11666666666667,24.665634474073247,37.18212031732893,31.6054107876783,1.0879421538075698,25360.634235221743,63.269591319130704,3796.1754791478425,0.6562725998394323,0.0007340384605829454,31.6054107876783,29.999999823813155,1.0879421538075698,7300.764014214209,14.13481357044017,848.0888142264099,0.3616422907540498,0.00022170024838323173
-142680,28.125,24.660645868444128,37.17941366248489,31.60270413279164,1.0879421538075698,25360.634235415568,63.26111080403897,3795.6666482423384,0.6562411594609739,0.0007342216430064638,31.60270413279164,30.00000003455285,1.0879421538075698,7288.454276956251,14.077335807421493,844.6401484452898,0.36093921957538266,0.00022142402868722774
-142740,28.13333333333333,24.65563435456843,37.17726153025155,31.60055200149817,1.0879421538075698,25360.634231141383,63.2404896708745,3794.4293802524708,0.6561646967889339,0.0007344021076292394,31.60055200149817,30.000000035598717,1.0879421538075698,7278.667243797447,14.027857861228947,841.6714716737368,0.3603318012950784,0.00022122189389656152
-142800,28.14166666666667,24.650612152723607,37.1747805024191,31.598070973591533,1.0879421538075698,25360.63423147875,63.226761411304295,3793.605684678258,0.656113782845941,0.0007345839685734762,31.598070973591533,29.999999823461128,1.0879421538075698,7267.385490464346,13.973921048485836,838.4352629091501,0.3596673020244709,0.0002209751873511812
-142860,28.15,24.645589204459377,37.17275343374123,31.596043934764147,1.0879421538075698,25360.634095730762,63.20335383325131,3792.201229995079,0.6560269530248491,0.0007347645200969593,31.596043934764147,30.000000062913625,1.0879421538075698,7258.166243401974,13.926579940929095,835.5947964557457,0.3590820314740951,0.0002207896111470112
-142920,28.15833333333333,24.64054685045417,37.17034193520434,31.593632405605465,1.0879421538075698,25360.63423498638,63.18788132106482,3791.272879263889,0.655969545510266,0.0007349462988322375,31.593632405605465,30.000000032395224,1.0879421538075698,7247.19971651908,13.873989515450187,832.4393709270113,0.35842961951502456,0.00022055169975625244
-142980,28.16666666666667,24.635494064436568,37.168427211750185,31.59171767569548,1.0879421538075698,25360.63426434492,63.161701288380115,3789.7020773028084,0.6558723870934258,0.0007351260547997502,31.59171767569548,30.000000026017194,1.0879421538075698,7238.492323226086,13.828505150417213,829.7103090250328,0.3578634404293259,0.00022038051279646558
-143040,28.175,24.6304310694736,37.16610725529149,31.58939772644173,1.0879421538075698,25360.63423157974,63.14404903334466,3788.64294200068,0.6558068604138286,0.0007353076162226249,31.58939772644173,29.999999822604135,1.0879421538075698,7227.94305120971,13.777546196915667,826.6527718149401,0.3572269795273104,0.00022015442562632197
-143100,28.18333333333333,24.625357963106733,37.164233894660846,31.587524288642637,1.0879421538075698,25360.63458251085,63.11676444107078,3787.005866464246,0.6557055519055154,0.0007354874357682918,31.587524288642637,29.99999974587741,1.0879421538075698,7219.42375776362,13.73294967548742,823.9769805292451,0.3566681165215288,0.00021998837003995767
-143160,28.19166666666667,24.620278171277963,37.16204172809038,31.585332199312855,1.0879421538075698,25360.634231251202,63.09619365512876,3785.7716193077254,0.6556291512580497,0.0007356687367055452,31.585332199312855,29.999999823587466,1.0879421538075698,7209.454662872782,13.684107149946152,821.0464289967695,0.3560540283067808,0.00021977906555847464
-143220,28.2,24.615184880061317,37.160368159164356,31.58365857672307,1.0879421538075698,25360.63447529246,63.06447460632607,3783.868476379565,0.6555113106492094,0.0007358478872479929,31.58365857672307,29.99999977031342,1.0879421538075698,7201.843942060063,13.642557598278268,818.553455896696,0.355529960850516,0.000219639543248842
-143280,28.208333333333336,24.61007237683301,37.158300722409045,31.581591223353715,1.0879421538075698,25360.634096086622,63.040854489376535,3782.451269362592,0.6554235311509451,0.0007360282511733771,31.581591223353715,29.999999854158048,1.0879421538075698,7192.442068301073,13.595697587781494,815.7418552668898,0.3549370523084165,0.00021944627721879839
-143340,28.21666666666667,24.604957937342302,37.156685642819035,31.57997606684413,1.0879421538075698,25360.634445885942,63.007642610006855,3780.4585566004107,0.6553000659755007,0.0007362072306362548,31.57997606684413,29.9999999840094,1.0879421538075698,7185.096394948941,13.555208296898515,813.3124978139107,0.3544231510057763,0.0002193141633327844
-143400,28.225,24.599824445335255,37.15473646441417,31.578026882184002,1.0879421538075698,25360.634474332357,62.98130478794341,3778.878287276605,0.655202122024016,0.0007363872380963954,31.578026882184002,29.9999999778669,1.0879421538075698,7176.232314224955,13.510257119678267,810.6154271806957,0.35385086698762974,0.00021913641086013388
-143460,28.233333333333334,24.594689716610297,37.15330860990387,31.576599080224575,1.0879421538075698,25360.63423535208,62.94389515763886,3776.633709458333,0.6550629543568661,0.0007365655237102619,31.576599080224575,30.000000027825337,1.0879421538075698,7169.739017409281,13.472568711619843,808.3541226971905,0.3533696163381716,0.00021902924764431072
-143520,28.24166666666667,24.589535690158534,37.151516728156246,31.574807146080488,1.0879421538075698,25360.63447363012,62.91401971010032,3774.8411826060174,0.6549517721406105,0.0007367449859755824,31.574807146080488,29.99999997819059,1.0879421538075698,7161.590246634784,13.430018825478824,805.8011295287296,0.3528247084013991,0.00021887233081938821
-143580,28.25,24.58437563018629,37.150154461700026,31.573444955623774,1.0879421538075698,25360.634128014957,62.87501260578666,3772.5007563471995,0.6548065493958675,0.0007369228565161202,31.573444955623774,30.00000005424419,1.0879421538075698,7155.395205900593,13.393425914581185,803.605554874871,0.35235473761068903,0.00021877351448850973
-143640,28.25833333333333,24.579200441557088,37.1483825047198,31.57167297593407,1.0879421538075698,25360.634231288506,62.84446697740727,3770.668018644436,0.6546927835858779,0.0007371023469105012,31.57167297593407,29.999999824079236,1.0879421538075698,7147.338000945793,13.351398971188159,801.0839382712895,0.3518134249159259,0.00021861889132179468
-143700,28.26666666666667,24.574015573751854,37.14709283531667,31.570383253599292,1.0879421538075698,25360.634472000387,62.80368501977159,3768.221101186295,0.6545408313705726,0.0007372798077612258,31.570383253599292,29.999999976103503,1.0879421538075698,7141.472170628644,13.315977395816198,798.9586437489719,0.3513558931524467,0.00021852938765224312
-143760,28.275,24.568820756875528,37.14543540711158,31.56872587743475,1.0879421538075698,25360.634235340865,62.77055542369399,3766.2333254216387,0.6544173396429652,0.0007374589749837817,31.56872587743475,30.000000028229493,1.0879421538075698,7133.934852713128,13.275732592643154,796.5439555585893,0.3508346107218048,0.00021838988856755364
-143820,28.283333333333335,24.563614985456546,37.14421560209407,31.567506073310923,1.0879421538075698,25360.63423127676,62.72811060769746,3763.686636461848,0.6542590569692747,0.0007376362450596776,31.567506073310923,30.00000002918185,1.0879421538075698,7128.387669340788,13.241451989976886,794.4871193986131,0.3503893563925618,0.00021830953400653856
-143880,28.29166666666667,24.55839878994629,37.1425906775609,31.56588117860905,1.0879421538075698,25360.634095616017,62.69411232522993,3761.6467395137956,0.6541322173406398,0.0007378153197006533,31.56588117860905,30.000000056469283,1.0879421538075698,7120.998177022319,13.2018662813384,792.1119768803039,0.34987378468865804,0.00021817401624871018
-143940,28.3,24.553172520692648,37.14142825236677,31.56471872351688,1.0879421538075698,25360.634231580294,62.65027552130167,3759.0165312781,0.6539685998565427,0.0007379924315232052,31.56471872351688,30.00000002663301,1.0879421538075698,7115.7119340175705,13.16854166398668,790.1124998392007,0.3494385775929273,0.0002181010957059913
-144000,28.29166666666667,24.553214229298803,37.136414311955456,31.55970478314941,1.0879421538075698,25360.63423138089,62.75336336002364,3765.2018016014185,0.6543532372520237,0.0007378890804900912,31.55970478314941,30.0000000294598,1.0879421538075698,7092.910534957879,13.101771743174984,786.1063045904988,0.3485633102946683,0.00021735344375487743
-144060,28.283333333333335,24.553247126306214,37.11863886649178,31.541929357282676,1.0879421538075698,25360.634142261893,63.1269254599041,3787.615527594245,0.6557432837309168,0.0007378424691228209,31.541929357282676,30.00000004695881,1.0879421538075698,7012.074960651734,12.867792872736313,772.0675723641789,0.3454609105462706,0.000214873726504268
-144120,28.275,24.55328785301321,37.099885186691,31.523175657630034,1.0879421538075698,25360.6342325402,63.52448565386501,3811.4691392319,0.6572161839841469,0.0007378008387467235,31.523175657630034,30.000000025345678,1.0879421538075698,6926.7907681011875,12.624271698708098,757.4563019224859,0.3421716841191657,0.00021226167445670969
-144180,28.26666666666667,24.55332048900209,37.088969106902155,31.512259529847423,1.0879421538075698,25360.634450796595,63.756302397658004,3825.37814385948,0.6580719916491274,0.0007377237414612412,31.512259529847423,29.999999777064772,1.0879421538075698,6877.149734096018,12.48393478339792,749.0360870038751,0.3402470768460607,0.0002107140279754612
-144240,28.25833333333333,24.553344382666047,37.083507238432105,31.506797709287408,1.0879421538075698,25360.634232920944,63.87125569858158,3832.275341914895,0.6584955452816107,0.0007376218976242497,31.506797709287408,30.0000000230931,1.0879421538075698,6852.310449894693,12.413957718896587,744.8374631337953,0.3392792087635629,0.00020990720094613032
-144300,28.250000000000004,24.55336624504621,37.081008808325294,31.504299301737326,1.0879421538075698,25360.63413034201,63.92242175881386,3835.345305528832,0.6586838951633497,0.0007375069144302796,31.504299301737326,30.000000045681215,1.0879421538075698,6840.948593488107,12.381848073040269,742.9108843824163,0.3388332391349938,0.00020950308393945583
-144360,28.24166666666667,24.55337700369964,37.0799385622635,31.503228955951737,1.0879421538075698,25360.634583845753,63.942579523284614,3836.554771397077,0.6587580693245582,0.0007373852895911112,31.503228955951737,29.999999945976295,1.0879421538075698,6836.081544334995,12.367872411010328,742.0723446606198,0.3386387645131136,0.00020929282675838132
-144420,28.233333333333334,24.55338291089277,37.07984314773466,31.50313361767007,1.0879421538075698,25360.634237104263,63.94163027990673,3836.497816794404,0.6587545767856355,0.0007372593430068964,31.50313361767007,30.00000002225708,1.0879421538075698,6835.64763724224,12.366255284244495,741.9753170546697,0.3386162473914907,0.00020921493773386202
-144480,28.225,24.5533959666679,37.080387263542455,31.50367775695688,1.0879421538075698,25360.634130331164,63.92696763881362,3835.618058328818,0.6587006240146,0.0007371311815487753,31.50367775695688,30.00000004571098,1.0879421538075698,6838.122057426156,12.372768348777194,742.3661009266316,0.3387069180528635,0.00020922413656894584
-144540,28.21666666666667,24.553392433976068,37.08136034031457,31.504650756565372,1.0879421538075698,25360.63448124026,63.902807976535186,3834.168478592112,0.6586117066447307,0.0007370006840792352,31.504650756565372,29.999999968528318,1.0879421538075698,6842.547219692894,12.384679797083269,743.080787824996,0.3388726160524927,0.00020929120400131398
-144600,28.208333333333336,24.553388695741177,37.082636078227274,31.505926500905694,1.0879421538075698,25360.63445201003,63.87211272846255,3832.3267637077533,0.6584987010234847,0.0007368691306911775,31.505926500905694,29.999999974907325,1.0879421538075698,6848.34876335316,12.400441571207182,744.0264942724309,0.33909162646873553,0.00020939937414101378
-144660,28.200000000000006,24.553383278566127,37.08413673755692,31.50742720768641,1.0879421538075698,25360.634236221642,63.8365472731524,3830.1928363891443,0.6583677170412978,0.0007367368518084737,31.50742720768641,30.00000002231321,1.0879421538075698,6855.1731592293445,12.41907233086731,745.1443398520386,0.3393501372481276,0.00020953804346439037
-144720,28.19166666666667,24.553362103790413,37.085814371318435,31.509104841457873,1.0879421538075698,25360.63423617645,63.79699417888764,3827.8196507332573,0.6582219857483682,0.0007366033926600826,31.509104841457873,30.00000002228057,1.0879421538075698,6862.802363702003,12.439928376582637,746.3957025949582,0.3396390584947711,0.00020970032080674562
-144780,28.18333333333333,24.553335750716123,37.087635777370984,31.510926270984374,1.0879421538075698,25360.63412942632,63.75431295032371,3825.2587770194227,0.6580646565878605,0.0007364694138317681,31.510926270984374,30.000000045748862,1.0879421538075698,6871.0853866191255,12.462625124571634,747.757507474298,0.3399529216801185,0.00020988197774619518
-144840,28.175,24.55332239350014,37.089576889441226,31.512867312390537,1.0879421538075698,25360.634450778172,63.70925122488841,3822.555073493305,0.6578984708931779,0.0007363359107001162,31.512867312390537,29.999999975011786,1.0879421538075698,6879.912784713378,12.486918991923215,749.2151395153929,0.3402882298087624,0.00021008021148446736
-144900,28.16666666666667,24.553282006767912,37.09200603749471,31.515296454184533,1.0879421538075698,25360.634479243843,63.653392411819354,3819.2035447091607,0.6576923493931235,0.0007361993219367832,31.515296454184533,29.999999770427113,1.0879421538075698,6890.9604759392405,12.517407289488055,751.0444373692834,0.3407081017357208,0.00021034382083033308
-144960,28.15833333333333,24.55325139244256,37.09441328067652,31.517703744349912,1.0879421538075698,25360.6342655814,63.598173863675974,3815.890431820559,0.6574884634356107,0.0007360636875994807,31.517703744349912,30.000000015604357,1.0879421538075698,6901.906749401656,12.547693342464314,752.8616005478589,0.3411241663547819,0.00021060465128444757
-145020,28.15,24.553209924496787,37.096534596331416,31.519825066463806,1.0879421538075698,25360.63423620849,63.54901578879961,3812.9409473279775,0.6573068483858879,0.0007359291009560076,31.519825066463806,30.000000022027574,1.0879421538075698,6911.553640824375,12.574326067159994,754.4595640295997,0.3414892053322314,0.00021082649286646683
-145080,28.14166666666667,24.55316975397837,37.09953766877889,31.52282808577486,1.0879421538075698,25360.634477851603,63.48105064422747,3808.8630386536493,0.6570555849883742,0.0007357912276368686,31.52282808577486,29.99999996879993,1.0879421538075698,6925.2104081046255,12.612342882820046,756.7405729692026,0.34200893109741104,0.0002111676435474196
-145140,28.133333333333336,24.553111835462197,37.10475385123559,31.52804427557137,1.0879421538075698,25360.63444447309,63.365646448936246,3801.938786936175,0.6566285013170396,0.0007356434948993054,31.52804427557137,29.999999978627,1.0879421538075698,6948.931498759707,12.67893450104046,760.7360700624275,0.3429155134196073,0.00021180745763823175
-145200,28.125,24.553061547854128,37.111042274934285,31.534332765700288,1.0879421538075698,25360.634142375136,63.227784483269396,3793.667068996165,0.6561175773814623,0.0007354921680535415,31.534332765700288,30.000000044516398,1.0879421538075698,6977.528725530509,12.759709179879279,765.5825507927568,0.3440087908228008,0.0002125921335144784
-145260,28.11666666666667,24.552999038676262,37.11648060321564,31.539771020885116,1.0879421538075698,25360.63447478872,63.108187581374395,3786.491254882464,0.6556736993007005,0.0007353443265351432,31.539771020885116,29.9999997703724,1.0879421538075698,7002.2609717327905,12.829733686747165,769.7840212048299,0.3449509739710388,0.0002132612595753443
-145320,28.108333333333334,24.552932204768442,37.12107821569214,31.544368685953398,1.0879421538075698,25360.63423562237,63.006640629479115,3780.398437768746,0.6552963403894427,0.0007352002134204147,31.544368685953398,30.000000026386232,1.0879421538075698,7023.168140886913,12.889024892883342,773.3414935730003,0.3457447351259516,0.0002138163652518888
-145380,28.1,24.552863520375034,37.12595733016045,31.549247794180012,1.0879421538075698,25360.634264007196,62.89935645877394,3773.9613875264367,0.6548971886755511,0.0007350553294337318,31.549247794180012,30.000000019951482,1.0879421538075698,7045.3563939527185,12.952192425937376,777.1315455562427,0.3465864000723599,0.0002144092357791375
-145440,28.09166666666667,24.55278711593312,37.130793716931976,31.554084210851368,1.0879421538075698,25360.634128034795,62.79311652761203,3767.5869916567217,0.6545014420082671,0.0007349106875172771,31.554084210851368,30.000000049726676,1.0879421538075698,7067.350338310312,13.014991167379627,780.8994700427776,0.3474191184465606,0.00021499588832143133
-145500,28.08333333333333,24.552702033684373,37.13571410228743,31.55900456720675,1.0879421538075698,25360.634259915438,62.685196652230694,3761.111799133841,0.6540989469106373,0.000734765770411226,31.55900456720675,30.00000002323325,1.0879421538075698,7089.726262511193,13.079078204565967,784.744692273958,0.3482648241999816,0.00021559339544551212
-145560,28.075000000000006,24.5526243631225,37.14051123115213,31.56380165610287,1.0879421538075698,25360.63444167645,62.580222501013544,3754.813350060813,0.6537069622866258,0.000734622157893022,31.56380165610287,29.999999983141514,1.0879421538075698,7111.541677675559,13.14177727856834,788.5066367141005,0.34908825809326216,0.0002161742317103505
-145620,28.06666666666667,24.55252994468644,37.1449850693632,31.56827548825872,1.0879421538075698,25360.634469213146,62.482039860351456,3748.922391621088,0.6533399119429766,0.000734479517243904,31.56827548825872,29.99999977038713,1.0879421538075698,7131.887836269094,13.200331463211734,792.0198877927041,0.3498537643122966,0.0002167108291896468
-145680,28.05833333333333,24.55243136539928,37.1498757789155,31.573166249326697,1.0879421538075698,25360.63423494057,62.375269695832046,3742.5161817499225,0.6529402889452411,0.0007343354698939815,31.573166249326697,30.000000025815957,1.0879421538075698,7154.127890925024,13.26659366099261,795.9956196595566,0.3507160200170578,0.00021730500771697484
-145740,28.05,24.55233593939972,37.154707727901794,31.577998229391063,1.0879421538075698,25360.634093609984,62.27002857191227,3736.201714314737,0.6525459096031506,0.0007341922543779043,31.577998229391063,30.000000061216262,1.0879421538075698,7176.1016337959,13.330342188241826,799.8205312945096,0.35154158320543794,0.00021788939951957863
-145800,28.04166666666667,24.55222336108449,37.15896314165311,31.58225360593357,1.0879421538075698,25360.634262820702,62.17677123099402,3730.606273859641,0.6521960393413467,0.0007340509408344588,31.58225360593357,30.000000023855566,1.0879421538075698,7195.453546414779,13.386499134142824,803.1899480485695,0.35226563420729984,0.00021839543869926008
-145860,28.03333333333333,24.552110500292763,37.162530647739906,31.585821073508352,1.0879421538075698,25360.6344379579,62.098021748715645,3725.88130492294,0.6519003051023315,0.0007339127936206733,31.585821073508352,29.99999998074347,1.0879421538075698,7211.677151603277,13.433556303131947,806.0133781879167,0.3528700746798739,0.0002188086714532668
-145920,28.025,24.55200605939259,37.165283485186464,31.58857388074193,1.0879421538075698,25360.63457535436,62.036414059196616,3722.184843551797,0.6516687576051845,0.0007337787309151763,31.58857388074193,29.999999954900193,1.0879421538075698,7224.195930356541,13.46977011520557,808.1862069123341,0.3533338281987639,0.00021911240471902558
-145980,28.01666666666667,24.551884310527047,37.16729143918085,31.590581909760083,1.0879421538075698,25360.63423417641,61.99010902129786,3719.4065412778727,0.6514946155062167,0.0007336471050145165,31.590581909760083,30.00000002534361,1.0879421538075698,7233.3273191625085,13.49592784680205,809.755670808123,0.3536680480009841,0.00021931537444811497
-146040,28.00833333333333,24.55175289895868,37.16773404868354,31.591024519258013,1.0879421538075698,25360.63423419808,61.97616040761185,3718.5696244567107,0.6514421398789344,0.0007335215025234001,31.591024519258013,30.000000032845822,1.0879421538075698,7235.340095202862,13.500937475211115,810.0562485126669,0.35373198446657017,0.0002193075357370739
-146100,28.0,24.55163058530548,37.16597632799197,31.589266753901494,1.0879421538075698,25360.634437316283,62.00800189356014,3720.480113613609,0.6515619173262542,0.0007334053169291306,31.589266753901494,29.999999985229568,1.0879421538075698,7227.346701166002,13.476293890475334,808.57763342852,0.3534172422671685,0.0002190041865736118
-146160,27.99166666666667,24.55148643455703,37.16304054494977,31.586330960766016,1.0879421538075698,25360.63448321645,62.06404865506185,3723.8429193037123,0.6517726403365457,0.0007332929293676942,31.586330960766016,29.999999975301094,1.0879421538075698,7213.995938729663,13.435749815307824,806.1449889184695,0.35289819945437,0.00021854210983800345
-146220,27.983333333333334,24.551346736825717,37.16007250603243,31.58336297650625,1.0879421538075698,25360.63423465579,62.120846888171776,3727.2508132903063,0.6519860497897977,0.0007331810186005969,31.58336297650625,30.00000003003543,1.0879421538075698,7200.498489933904,13.39487504236844,803.6925025421065,0.3523733729265111,0.00021807611388919413
-146280,27.975,24.55120520796112,37.15742630392499,31.580716723378487,1.0879421538075698,25360.634466675732,62.1710387779075,3730.26232667445,0.6521745208511565,0.0007330680504741483,31.580716723378487,29.99999997908006,1.0879421538075698,7188.464625690194,13.358398636495473,801.5039181897282,0.3519036971727144,0.00021765367295481522
-146340,27.96666666666667,24.551056460761906,37.1551020514588,31.578392521911855,1.0879421538075698,25360.63423475021,62.214435879622364,3732.8661527773434,0.6523373896487326,0.0007329536512658169,31.578392521911855,30.0000000301938,1.0879421538075698,7177.894858832571,13.326275197745098,799.5765118647057,0.3514890301529049,0.0002172746021057761
-146400,27.95833333333333,24.550898677109824,37.153005941552614,31.5762964330096,1.0879421538075698,25360.634139232785,62.25304223882549,3735.1825343295295,0.6524822105231707,0.0007328382095809583,31.5762964330096,30.000000046755673,1.0879421538075698,7168.362613390788,13.297223240868757,797.8333944521253,0.3511131671269863,0.0002169262361559402
-146460,27.950000000000006,24.55073969057149,37.15104048942203,31.57433090865188,1.0879421538075698,25360.63446769277,62.2888983616444,3737.333901698664,0.6526166571043821,0.0007327223961880784,31.57433090865188,29.99999997462145,1.0879421538075698,7159.424526391309,13.26995629199382,796.1973775196292,0.3507596642869601,0.0002165956605649809
-146520,27.94166666666667,24.5505721912729,37.14912884015093,31.572419259317712,1.0879421538075698,25360.634467979577,62.32355123206322,3739.4130739237935,0.652746539338038,0.0007326061989763657,31.572419259317712,29.999999979041476,1.0879421538075698,7150.731093214134,13.243418763239474,794.6051257943684,0.3504149324769981,0.00021627235315605563
-146580,27.933333333333334,24.55040102109298,37.14721639697107,31.57050686740176,1.0879421538075698,25360.634234851925,62.358193786047956,3741.491627162877,0.6528763312609206,0.0007324901376177728,31.57050686740176,30.000000027435004,1.0879421538075698,7142.034083099566,13.216900667179631,793.0140400307779,0.350069774232122,0.00021594914534707287
-146640,27.925,24.550233001302622,37.145266514330324,31.568556939586482,1.0879421538075698,25360.63444028751,62.39371190062729,3743.622714037637,0.6530093500059431,0.0007323745864053753,31.568556939586482,30.00000001550087,1.0879421538075698,7133.166649142619,13.187975936931624,791.2785562158975,0.3496925136138717,0.0002156195880648465
-146700,27.91666666666667,24.550048060068267,37.143255621912004,31.566546107038608,1.0879421538075698,25360.63416802081,62.430294153416405,3745.8176492049843,0.6531462974223571,0.0007322586191618457,31.566546107038608,30.000000040601282,1.0879421538075698,7124.022076514964,13.160199213503235,789.6119528101939,0.3493294584776161,0.0002152833192414403
-146760,27.908333333333335,24.54986254655516,37.14117805340773,31.56446853850561,1.0879421538075698,25360.63416815144,62.46828553197401,3748.097131918441,0.6532884592056759,0.0007321431317400945,31.56446853850561,30.0000000406409,1.0879421538075698,7114.574129407684,13.131581053912495,787.8948632347498,0.3489546144026981,0.00021493835497412645
-146820,27.900000000000006,24.5496764361972,37.13810339680924,31.56139381560533,1.0879421538075698,25360.63446966536,62.52722079761323,3751.633247856794,0.6535088695782938,0.0007320316290320608,31.56139381560533,29.99999997705949,1.0879421538075698,7100.591814214599,13.089847545686352,785.3908527411812,0.3484065361507406,0.00021445988824302293
-146880,27.89166666666667,24.549481584228673,37.13335662569497,31.556647120650606,1.0879421538075698,25360.63412332235,62.62127569581745,3757.2765417490473,0.6538603152365079,0.0007319261769493186,31.556647120650606,30.000000050712448,1.0879421538075698,7079.005417824666,13.026185974916448,781.571158494987,0.34756714425716995,0.00021375719865731368
-146940,27.88333333333333,24.549278207080693,37.1275726738085,31.550863144971842,1.0879421538075698,25360.634231520122,62.7372434396701,3764.2346063802056,0.6542931210475265,0.0007318243617422068,31.550863144971842,29.9999998251282,1.0879421538075698,7052.703246288736,12.949140703080106,776.9484421848063,0.3465458318326132,0.00021291555779163457
-147000,27.875,24.549082715294123,37.12209291972143,31.545383390858163,1.0879421538075698,25360.634231641103,62.847182795186384,3770.8309677111843,0.654702900127689,0.0007317219628820607,31.545383390858163,30.000000024594712,1.0879421538075698,7027.7826192354105,12.876423037957641,772.5853822774585,0.3455763327764244,0.00021211533128933432
-147060,27.86666666666667,24.5488669515566,37.11711506579143,31.540405536148825,1.0879421538075698,25360.634235185247,62.946499823949864,3776.789989436992,0.6550726458983882,0.0007316168903784298,31.540405536148825,30.00000002397544,1.0879421538075698,7005.145338921039,12.810458943046848,768.6275365828109,0.3446921449077547,0.00021138233453863231
-147120,27.858333333333334,24.548645285771123,37.112248624164046,31.53553904902914,1.0879421538075698,25360.634442065948,63.043589330224066,3782.6153598134447,0.6554336958502566,0.0007315112709877015,31.53553904902914,29.99999998126757,1.0879421538075698,6983.014705059285,12.74617018006254,764.7702108037524,0.3438260264565231,0.00021066451843234724
-147180,27.85,24.54843116577395,37.10740989589003,31.530700366203128,1.0879421538075698,25360.63423538667,63.140349813823995,3788.42098882944,0.6557931269350683,0.0007314060431329305,31.530700366203128,29.99999982437052,1.0879421538075698,6961.011033240001,12.682507112299474,760.9504267379683,0.3429640158323772,0.0002099510321331992
-147240,27.84166666666667,24.548209735673126,37.1025605468885,31.5258509642872,1.0879421538075698,25360.634476020103,63.23747682077686,3794.248609246612,0.6561535237202012,0.0007313007345673847,31.5258509642872,29.999999969151386,1.0879421538075698,6938.957243396679,12.618920981004225,757.1352588602533,0.3420986997575435,0.00020923629481645856
-147300,27.833333333333336,24.547979309811133,37.09767581190236,31.52096628292112,1.0879421538075698,25360.634232177672,63.33541123329039,3800.124673997423,0.656516516033785,0.0007311952184873477,31.52096628292112,30.000000022903922,1.0879421538075698,6916.7434307495605,12.555093469246446,753.3056081547867,0.3412256738782881,0.00020851698992035677
-147360,27.825000000000006,24.547747869991944,37.09273934865856,31.516029742743807,1.0879421538075698,25360.63458204032,63.434651600633,3806.0790960379795,0.6568839398385611,0.0007310900730516745,31.516029742743807,29.99999974786132,1.0879421538075698,6894.295280293855,12.490853838895461,749.4512303337276,0.3403424770969492,0.0002077911804074969
-147420,27.81666666666667,24.547508078058843,37.0877402251274,31.511030696157373,1.0879421538075698,25360.634232126602,63.5353174291321,3812.119045747926,0.6572562217612363,0.0007309848759634767,31.511030696157373,30.00000002317697,1.0879421538075698,6871.560372996129,12.426034332599395,745.5620599559637,0.3394466373668443,0.00020705708365299736
-147480,27.80833333333333,24.54725534138621,37.082671259565096,31.50596172414477,1.0879421538075698,25360.634261459985,63.63753746873401,3818.252248124041,0.6576338204032547,0.0007308795171818817,31.50596172414477,30.000000016890308,1.0879421538075698,6848.5087535701705,12.360552893711514,741.6331736226907,0.3385368225210155,0.00020631375414275206
-147540,27.8,24.547014590422908,37.07752770505623,31.50081812792598,1.0879421538075698,25360.634451139933,63.74176887919582,3824.506132751749,0.6580184030269399,0.0007307751773518,31.50081812792598,29.999999975308814,1.0879421538075698,6825.117933745004,12.294434700635215,737.6660820381129,0.3376131715892251,0.00020556115172207676
-147600,27.79,24.542712938183932,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-147660,27.78,24.538401227737147,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-147720,27.77,24.534093682395984,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-147780,27.76,24.529780722915177,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-147840,27.75,24.5254664658368,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-147900,27.74,24.52113915160512,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-147960,27.73,24.51681473750316,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148020,27.72,24.512485548530996,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148080,27.71,24.508159219242273,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148140,27.700000000000006,24.50382410136632,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148200,27.69,24.49948360460204,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148260,27.680000000000003,24.49514583033362,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148320,27.67,24.490807789754893,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148380,27.66,24.48645601906421,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148440,27.650000000000006,24.4821077045871,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148500,27.640000000000004,24.477758325446306,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148560,27.630000000000006,24.47340416385201,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148620,27.62,24.469044297290075,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148680,27.61,24.46468008585837,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148740,27.6,24.460318468234053,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148800,27.59,24.455956199847908,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148860,27.58,24.45158029369575,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148920,27.57,24.447207555035142,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-148980,27.560000000000006,24.442834063531066,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149040,27.55,24.438446867768196,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149100,27.54,24.43407123784376,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149160,27.53,24.42968646667481,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149220,27.52,24.42528762160079,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149280,27.51,24.42090139127584,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149340,27.5,24.416504931553703,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149400,27.490000000000006,24.412103706339412,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149460,27.48,24.407706109351,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149520,27.47,24.40329427258616,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149580,27.46,24.39888604613852,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149640,27.45,24.394476832216803,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149700,27.44,24.390062611660415,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149760,27.43,24.385642460584172,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149820,27.42,24.38122194573556,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149880,27.41,24.376796194678718,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-149940,27.4,24.37237447553861,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150000,27.39,24.3679419641796,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150060,27.380000000000006,24.36351419976252,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150120,27.37,24.359080201517173,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150180,27.36,24.35463299782849,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150240,27.35,24.35019722932168,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150300,27.34,24.345752220277078,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150360,27.33,24.34130246790335,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150420,27.32,24.336846176294646,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150480,27.31,24.33239885845417,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150540,27.3,24.32793741653908,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150600,27.29,24.323478707241996,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150660,27.28,24.31901104067544,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150720,27.27,24.314546690916966,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150780,27.26,24.310076901868378,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150840,27.25,24.30560235732422,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150900,27.24,24.301130705645924,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-150960,27.23,24.296649352522255,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151020,27.22,24.29216381582056,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151080,27.21,24.287680297809864,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151140,27.2,24.283196675141692,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151200,27.17333333333333,24.24589009560034,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151260,27.146666666666665,24.20858948343282,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151320,27.12,24.171306787278922,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151380,27.09333333333333,24.134028923566884,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151440,27.066666666666666,24.096761026243858,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151500,27.04,24.059503871846374,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151560,27.013333333333332,24.02225534046273,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151620,26.986666666666668,23.985008534737567,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151680,26.96,23.947781906497326,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151740,26.93333333333333,23.910564517442737,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151800,26.90666666666667,23.873350018841876,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151860,26.880000000000006,23.836145828763105,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151920,26.85333333333333,23.79895625848837,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-151980,26.826666666666664,23.761769825397238,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152040,26.8,23.724590521524497,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152100,26.773333333333333,23.687425183804326,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152160,26.74666666666667,23.65026437833535,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152220,26.72,23.613119783886305,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152280,26.693333333333335,23.575989193481078,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152340,26.66666666666667,23.538855079763604,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152400,26.64,23.50174148697896,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152460,26.61333333333333,23.464625125238147,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152520,26.58666666666667,23.427527925841602,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152580,26.560000000000006,23.39044255979925,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152640,26.53333333333333,23.353355228079227,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152700,26.50666666666667,23.31627804020845,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152760,26.480000000000004,23.27922169320852,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152820,26.45333333333333,23.242164561147185,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152880,26.42666666666667,23.205121929227815,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-152940,26.4,23.16809338480277,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153000,26.373333333333335,23.131067389552303,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153060,26.34666666666667,23.094056181222893,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153120,26.32,23.057050350473627,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153180,26.293333333333337,23.020057595295647,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153240,26.26666666666667,22.98307049991612,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153300,26.240000000000006,22.946098119728013,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153360,26.213333333333335,22.90913440085639,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153420,26.18666666666667,22.87216829047954,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153480,26.16,22.835231261677766,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153540,26.13333333333333,22.79829261101673,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153600,26.10666666666667,22.76136264585801,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153660,26.08,22.72445238926413,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153720,26.053333333333335,22.68754171123221,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153780,26.02666666666667,22.650639955855073,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153840,26.000000000000004,22.61376180091772,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153900,25.97333333333333,22.5768758888347,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-153960,25.94666666666667,22.540012240963488,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154020,25.92,22.503164153354255,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154080,25.893333333333334,22.46630770178412,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154140,25.86666666666667,22.42946552884607,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154200,25.840000000000003,22.392648208360356,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154260,25.81333333333333,22.355823513340344,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154320,25.78666666666667,22.31901229683036,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154380,25.76,22.28222774455793,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154440,25.733333333333334,22.245435167854676,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154500,25.70666666666667,22.208661834854606,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154560,25.68,22.171896900232205,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154620,25.653333333333336,22.135139079234676,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154680,25.626666666666665,22.098389977984148,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154740,25.6,22.061660206361328,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154800,25.6,22.081094438112387,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154860,25.6,22.100531020265908,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154920,25.6,22.119941199867547,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-154980,25.6,22.139338961664905,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155040,25.6,22.15872873157742,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155100,25.6,22.1781022186377,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155160,25.6,22.19745292201305,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155220,25.6,22.216796090036574,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155280,25.6,22.236123354677833,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155340,25.6,22.25543777886607,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155400,25.6,22.274733820171924,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155460,25.60000000000001,22.29402439083123,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155520,25.6,22.31328206155181,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155580,25.6,22.332542088627445,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155640,25.6,22.351786744638968,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155700,25.60000000000001,22.371008379358283,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155760,25.6,22.39022225788888,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155820,25.6,22.409430305628362,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155880,25.6,22.428605768147715,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-155940,25.6,22.447774037266427,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156000,25.6,22.466935952726804,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156060,25.6,22.486075691654452,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156120,25.6,22.505197979963366,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156180,25.6,22.52431470527144,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156240,25.6,22.543408163271874,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156300,25.6,22.562494926270002,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156360,25.6,22.581566008970178,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156420,25.6,22.600624083885627,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156480,25.6,22.619664975870887,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156540,25.6,22.638700943963922,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156600,25.6,22.65770370257101,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156660,25.6,22.676709735351324,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156720,25.6,22.695699835531077,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156780,25.6,22.71466765045579,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156840,25.6,22.733628088900538,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156900,25.6,22.75257411211161,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-156960,25.6,22.771496691022612,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157020,25.6,22.790422045939522,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157080,25.6,22.80932303987988,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157140,25.6,22.82821092251033,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157200,25.6,22.84709181686519,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157260,25.6,22.865957682494113,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157320,25.6,22.884791329357096,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157380,25.6,22.90363659255566,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157440,25.6,22.922458370136567,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157500,25.6,22.94125752200989,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157560,25.6,22.960049158289717,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157620,25.6,22.978835780993084,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157680,25.6,22.997590859320127,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157740,25.6,23.016348264793816,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157800,25.6,23.035090881937872,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157860,25.6,23.053811057381978,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157920,25.6,23.072524893876338,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-157980,25.6,23.09122372769319,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158040,25.6,23.109899890528673,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158100,25.6,23.1285789280907,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158160,25.6,23.14723414362414,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158220,25.6,23.16587664132728,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158280,25.6,23.1845024153699,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158340,25.6,23.20312373043292,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158400,25.561666666666664,23.208557505241238,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158460,25.523333333333333,23.213855568805407,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158520,25.485,23.219004563725683,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158580,25.44666666666667,23.22402248813005,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158640,25.408333333333335,23.228904481061374,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158700,25.370000000000008,23.233651250111254,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158760,25.33166666666667,23.23825347370078,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158820,25.29333333333333,23.242725739000335,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158880,25.255000000000006,23.247057935968126,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-158940,25.21666666666667,23.251264623294247,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159000,25.178333333333335,23.25532669932256,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159060,25.140000000000004,23.25925417900734,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159120,25.10166666666667,23.263052817677693,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159180,25.06333333333333,23.266720608075076,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159240,25.025000000000006,23.270254215638747,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159300,24.986666666666668,23.27365289175345,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159360,24.94833333333333,23.27692299937468,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159420,24.91,23.28006293446929,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159480,24.87166666666667,23.283068660085455,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159540,24.833333333333336,23.285949722388548,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159600,24.795,23.28869658697561,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159660,24.75666666666667,23.291314940932693,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159720,24.718333333333334,23.293804055119075,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159780,24.68,23.296167956860064,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159840,24.64166666666667,23.29840821639207,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159900,24.603333333333335,23.300514694196423,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-159960,24.56500000000001,23.302502077192372,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160020,24.52666666666667,23.304360184813852,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160080,24.48833333333333,23.30608415198989,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160140,24.450000000000006,23.30769363048003,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160200,24.41166666666667,23.309175685466762,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160260,24.373333333333335,23.31053705220961,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160320,24.335,23.31176525475259,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160380,24.29666666666667,23.312879114035702,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160440,24.25833333333333,23.31386958760982,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160500,24.220000000000006,23.314731411322928,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160560,24.181666666666665,23.315483366296053,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160620,24.143333333333334,23.31610144219959,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160680,24.105,23.31660634462821,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160740,24.06666666666667,23.31699580703716,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160800,24.028333333333336,23.317249087905694,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160860,23.990000000000006,23.31739141076127,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160920,23.95166666666667,23.31741957290022,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-160980,23.91333333333333,23.317324852477352,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161040,23.875,23.317115154484142,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161100,23.83666666666667,23.31677789963121,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161160,23.798333333333336,23.31633090774899,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161220,23.76,23.31576051981561,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161280,23.72166666666667,23.31508474493258,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161340,23.68333333333333,23.31428198491748,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161400,23.645,23.313368641412893,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161460,23.60666666666667,23.312341614241372,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161520,23.568333333333335,23.311190375408817,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161580,23.53,23.309934938871226,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161640,23.49166666666667,23.308561431037788,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161700,23.45333333333333,23.30706829978936,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161760,23.415,23.305470229733025,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161820,23.376666666666665,23.30375811401856,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161880,23.338333333333335,23.301931959321127,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-161940,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162000,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162060,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162120,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162180,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162240,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162300,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162360,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162420,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162480,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162540,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162600,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162660,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162720,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162780,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162840,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162900,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-162960,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163020,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163080,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163140,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163200,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163260,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163320,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163380,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163440,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163500,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163560,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163620,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163680,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163740,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163800,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163860,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163920,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-163980,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164040,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164100,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164160,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164220,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164280,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164340,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164400,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164460,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164520,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164580,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164640,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164700,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164760,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164820,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164880,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-164940,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165000,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165060,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165120,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165180,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165240,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165300,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165360,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165420,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165480,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165540,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165600,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165660,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165720,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165780,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165840,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165900,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-165960,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166020,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166080,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166140,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166200,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166260,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166320,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166380,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166440,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166500,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166560,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166620,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166680,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166740,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166800,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166860,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166920,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-166980,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167040,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167100,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167160,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167220,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167280,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167340,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167400,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167460,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167520,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167580,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167640,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167700,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167760,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167820,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167880,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-167940,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168000,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168060,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168120,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168180,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168240,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168300,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168360,23.300000000000008,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168420,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168480,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168540,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168600,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168660,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168720,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168780,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168840,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168900,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-168960,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169020,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169080,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169140,23.3,23.29998779296875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169200,23.28166666666667,23.28166198730469,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169260,23.263333333333332,23.263320922851566,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169320,23.245,23.2449951171875,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169380,23.22666666666667,23.226651418041392,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169440,23.208333333333336,23.208325817620373,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169500,23.19,23.18998718261719,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169560,23.17166666666667,23.17165949105409,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169620,23.153333333333336,23.1533203125,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169680,23.135,23.13499350403464,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169740,23.11666666666667,23.11665344238281,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169800,23.09833333333333,23.098318670539502,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169860,23.080000000000005,23.079986572265625,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169920,23.06166666666667,23.061660766601566,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-169980,23.04333333333333,23.043318341797534,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170040,23.025000000000006,23.024993567294782,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170100,23.00666666666667,23.00665283203125,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170160,22.98833333333333,22.988318372278112,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170220,22.97,22.969985961914066,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170280,22.95166666666667,22.951659480415202,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170340,22.93333333333333,22.93331909179688,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170400,22.915,22.914991813597275,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170460,22.896666666666665,22.89665222167969,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170520,22.87833333333333,22.87832550116311,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170580,22.86,22.8599853515625,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170640,22.841666666666665,22.84165728045668,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170700,22.82333333333333,22.823318481445316,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170760,22.805,22.804989305389157,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170820,22.78666666666667,22.78665107673493,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170880,22.76833333333333,22.76832385450075,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-170940,22.75,22.74999261189465,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171000,22.73166666666667,22.731656161214076,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171060,22.71333333333333,22.713322689613964,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171120,22.695,22.694989133323126,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171180,22.67666666666667,22.676660791156745,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171240,22.65833333333333,22.658325144182573,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171300,22.64,22.639999134935962,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171360,22.62166666666667,22.621658325195316,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171420,22.60333333333333,22.603321114512926,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171480,22.585,22.58499145507813,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171540,22.56666666666667,22.566661011453927,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171600,22.54833333333333,22.54832165542273,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171660,22.53,22.52999201689315,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171720,22.51166666666667,22.51165771484375,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171780,22.49333333333333,22.493326161628712,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171840,22.475,22.474990844726566,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171900,22.456666666666663,22.456659531904535,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-171960,22.43833333333333,22.438316372082895,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172020,22.42,22.419993300353593,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172080,22.40166666666667,22.401655864015414,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172140,22.38333333333333,22.38332042307905,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172200,22.365,22.364990234375,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172260,22.346666666666664,22.346656745904824,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172320,22.32833333333333,22.32832070132667,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172380,22.31,22.30999456112383,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172440,22.291666666666664,22.29165413427884,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172500,22.27333333333333,22.27332619249743,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172560,22.255000000000006,22.254989256243373,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172620,22.236666666666668,22.236656378204316,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172680,22.21833333333333,22.21831774830113,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
-172740,22.2,22.199996948242188,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0,37.07536425521844,37.07536425521844,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/run.sh b/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/run.sh
old mode 100644
new mode 100755
index 1d0a4dcc0f6..3e1d92a7caa
--- a/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/run.sh
+++ b/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus/run.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 set -e
-<<<<<<< HEAD
-EnergyPlus --readvars -d EnergyPlus -w ../../../../../../weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw CoolingTower_VariableSpeed_Merkel.idf
-python energyplus_to_modelica.py
-=======
 idf_file=`ls *.idf`
 energyplus \
   --readvars \
@@ -11,5 +7,4 @@ energyplus \
   -w ../../../../../../weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw \
   ${idf_file}
 python3 csv_to_mos.py
->>>>>>> master
 rm -rf EnergyPlus
diff --git a/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/GSHPSimple-GLHE-ReverseHeatPump.idf b/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/GSHPSimple-GLHE-ReverseHeatPump.idf
index b8dfdb0fcc9..d2d49503507 100644
--- a/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/GSHPSimple-GLHE-ReverseHeatPump.idf
+++ b/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/GSHPSimple-GLHE-ReverseHeatPump.idf
@@ -1,2219 +1,3 @@
-<<<<<<< HEAD
-!-Generator IDFEditor 1.50
-!-Option OriginalOrderTop UseSpecialFormat
-
-!-NOTE: All comments with '!-' are ignored by the IDFEditor and are generated automatically.
-!-      Use '!' comments if they need to be retained when using the IDFEditor.
-
-! GSHPSimple-GLHE.idf
-! Basic File Description:
-! HeatPump:WatertoWater:EquationFit Cooling & Heating and GLHE
-! Condenser Loop Served by GROUND LOOP HEAT EXCHANGER
-! heat gains due to light equipment and occupation increased
-! Basic file description: Basic test of the HeatPump:WatertoWaterSimple Cooling & Heating
-! Run:      Two periods in Jan and July.
-! Building: Fictional 3 zone building with interzone partitions connecting all zones together.
-!           No ground contact (all floors are "partitions").  Roofs exposed to outdoor environment.
-!           There is one single pane window.
-! Internal: People, equipment, and lighting all at approximately "normal" levels and schedules.
-! System:   3 zone terminal reheat system using a single air loop.  Controlled about like the old
-!           BLAST "NWS2" control profile.  Heating up to 21 C during occupied hours, 18 C otherwise.
-!           Cooling to 24 C while occupied, 30 C otherwise.  Fans and coils scheduled to be unavailable
-!           during unoccupied hours.  Cooling coil off all winter.  Reheat coil on all year.
-!           System configuration is very basic--air loop has a fan and cooling coil, each zone leg has
-!           nothing more than a reheat coil.
-! Plant:    Heating loop served by water-to-water heat pump (heating).  Cooling loop served by
-!           a second water-to-water heat pump (cooling). Both heatpumps are on the same condenser
-!           loop. Heat rejection/extraction from the environment is via a ground loop heat exchanger
-!           system.  Priority based controls determine which piece of equipment
-!           tries to meet the load.
-! SolDis=FullInteriorAndExterior, Aniso, Detailed Interior and Exterior Convection
-Version,9.0.1;
-Timestep,60;
-
-Building,
-    NONE,                    !- Name
-    0,                       !- North Axis {deg}
-    Suburbs,                 !- Terrain
-    3.9999999E-02,           !- Loads Convergence Tolerance Value
-    0.4000000,               !- Temperature Convergence Tolerance Value {deltaC}
-    FullInteriorAndExterior, !- Solar Distribution
-    25,                      !- Maximum Number of Warmup Days
-    6;                       !- Minimum Number of Warmup Days
-
-HeatBalanceAlgorithm,ConductionTransferFunction;
-SurfaceConvectionAlgorithm:Inside,TARP;
-SurfaceConvectionAlgorithm:Outside,DOE-2;
-Output:VariableDictionary,Regular;
-
-SimulationControl,
-    No,                      !- Do Zone Sizing Calculation
-    No,                      !- Do System Sizing Calculation
-    No,                      !- Do Plant Sizing Calculation
-    No,                      !- Run Simulation for Sizing Periods
-    Yes;                     !- Run Simulation for Weather File Run Periods
-
-Site:Location,
-    CHICAGO_IL_USA TMY2-94846,  !- Name
-    41.78,                   !- Latitude {deg}
-    -87.75,                  !- Longitude {deg}
-    -6.00,                   !- Time Zone {hr}
-    190.00;                  !- Elevation {m}
-
-! CHICAGO_IL_USA Annual Heating 99% Design Conditions DB, MaxDB= -17.3°C
-SizingPeriod:DesignDay,
-    CHICAGO_IL_USA Annual Heating 99% Design Conditions DB,  !- Name
-    1,                       !- Month
-    21,                      !- Day of Month
-    WinterDesignDay,         !- Day Type
-    -17.3,                   !- Maximum Dry-Bulb Temperature {C}
-    0.0,                     !- Daily Dry-Bulb Temperature Range {deltaC}
-    ,                        !- Dry-Bulb Temperature Range Modifier Type
-    ,                        !- Dry-Bulb Temperature Range Modifier Day Schedule Name
-    Wetbulb,                 !- Humidity Condition Type
-    -17.3,                   !- Wetbulb or DewPoint at Maximum Dry-Bulb {C}
-    ,                        !- Humidity Condition Day Schedule Name
-    ,                        !- Humidity Ratio at Maximum Dry-Bulb {kgWater/kgDryAir}
-    ,                        !- Enthalpy at Maximum Dry-Bulb {J/kg}
-    ,                        !- Daily Wet-Bulb Temperature Range {deltaC}
-    99063.,                  !- Barometric Pressure {Pa}
-    4.9,                     !- Wind Speed {m/s}
-    270,                     !- Wind Direction {deg}
-    No,                      !- Rain Indicator
-    No,                      !- Snow Indicator
-    No,                      !- Daylight Saving Time Indicator
-    ASHRAEClearSky,          !- Solar Model Indicator
-    ,                        !- Beam Solar Day Schedule Name
-    ,                        !- Diffuse Solar Day Schedule Name
-    ,                        !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub) {dimensionless}
-    ,                        !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud) {dimensionless}
-    0.0;                     !- Sky Clearness
-
-! CHICAGO_IL_USA Annual Cooling 1% Design Conditions, MaxDB=  31.5°C MCWB=  23.0°C
-SizingPeriod:DesignDay,
-    CHICAGO_IL_USA Annual Cooling 1% Design Conditions DB/MCWB,  !- Name
-    7,                       !- Month
-    21,                      !- Day of Month
-    SummerDesignDay,         !- Day Type
-    31.5,                    !- Maximum Dry-Bulb Temperature {C}
-    10.7,                    !- Daily Dry-Bulb Temperature Range {deltaC}
-    ,                        !- Dry-Bulb Temperature Range Modifier Type
-    ,                        !- Dry-Bulb Temperature Range Modifier Day Schedule Name
-    Wetbulb,                 !- Humidity Condition Type
-    23.0,                    !- Wetbulb or DewPoint at Maximum Dry-Bulb {C}
-    ,                        !- Humidity Condition Day Schedule Name
-    ,                        !- Humidity Ratio at Maximum Dry-Bulb {kgWater/kgDryAir}
-    ,                        !- Enthalpy at Maximum Dry-Bulb {J/kg}
-    ,                        !- Daily Wet-Bulb Temperature Range {deltaC}
-    99063.,                  !- Barometric Pressure {Pa}
-    5.3,                     !- Wind Speed {m/s}
-    230,                     !- Wind Direction {deg}
-    No,                      !- Rain Indicator
-    No,                      !- Snow Indicator
-    No,                      !- Daylight Saving Time Indicator
-    ASHRAEClearSky,          !- Solar Model Indicator
-    ,                        !- Beam Solar Day Schedule Name
-    ,                        !- Diffuse Solar Day Schedule Name
-    ,                        !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub) {dimensionless}
-    ,                        !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud) {dimensionless}
-    1.0;                     !- Sky Clearness
-
-RunPeriod,
-    ,                        !- Name
-    1,                       !- Begin Month
-    1,                       !- Begin Day of Month
-    ,                        !- Begin Year
-    1,                       !- End Month
-    2,                       !- End Day of Month
-    ,                        !- End Year
-    ,                        !- Day of Week for Start Day
-    Yes,                     !- Use Weather File Holidays and Special Days
-    Yes,                     !- Use Weather File Daylight Saving Period
-    No,                      !- Apply Weekend Holiday Rule
-    Yes,                     !- Use Weather File Rain Indicators
-    Yes;                     !- Use Weather File Snow Indicators
-
-Output:DebuggingData,0,0;
-
-Material,
-    A1 - 1 IN STUCCO,        !- Name
-    Smooth,                  !- Roughness
-    2.5389841E-02,           !- Thickness {m}
-    0.6918309,               !- Conductivity {W/m-K}
-    1858.142,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.9200000,               !- Solar Absorptance
-    0.9200000;               !- Visible Absorptance
-
-Material,
-    C4 - 4 IN COMMON BRICK,  !- Name
-    Rough,                   !- Roughness
-    0.1014984,               !- Thickness {m}
-    0.7264224,               !- Conductivity {W/m-K}
-    1922.216,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.7600000,               !- Solar Absorptance
-    0.7600000;               !- Visible Absorptance
-
-Material,
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD,  !- Name
-    Smooth,                  !- Roughness
-    1.9050000E-02,           !- Thickness {m}
-    0.7264224,               !- Conductivity {W/m-K}
-    1601.846,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.9200000,               !- Solar Absorptance
-    0.9200000;               !- Visible Absorptance
-
-Material,
-    C6 - 8 IN CLAY TILE,     !- Name
-    Smooth,                  !- Roughness
-    0.2033016,               !- Thickness {m}
-    0.5707605,               !- Conductivity {W/m-K}
-    1121.292,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.8200000,               !- Solar Absorptance
-    0.8200000;               !- Visible Absorptance
-
-Material,
-    C10 - 8 IN HW CONCRETE,  !- Name
-    MediumRough,             !- Roughness
-    0.2033016,               !- Thickness {m}
-    1.729577,                !- Conductivity {W/m-K}
-    2242.585,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.6500000,               !- Solar Absorptance
-    0.6500000;               !- Visible Absorptance
-
-Material,
-    E2 - 1 / 2 IN SLAG OR STONE,  !- Name
-    Rough,                   !- Roughness
-    1.2710161E-02,           !- Thickness {m}
-    1.435549,                !- Conductivity {W/m-K}
-    881.0155,                !- Density {kg/m3}
-    1673.600,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.5500000,               !- Solar Absorptance
-    0.5500000;               !- Visible Absorptance
-
-Material,
-    E3 - 3 / 8 IN FELT AND MEMBRANE,  !- Name
-    Rough,                   !- Roughness
-    9.5402403E-03,           !- Thickness {m}
-    0.1902535,               !- Conductivity {W/m-K}
-    1121.292,                !- Density {kg/m3}
-    1673.600,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.7500000,               !- Solar Absorptance
-    0.7500000;               !- Visible Absorptance
-
-Material,
-    B5 - 1 IN DENSE INSULATION,  !- Name
-    VeryRough,               !- Roughness
-    2.5389841E-02,           !- Thickness {m}
-    4.3239430E-02,           !- Conductivity {W/m-K}
-    91.30524,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.5000000,               !- Solar Absorptance
-    0.5000000;               !- Visible Absorptance
-
-Material,
-    C12 - 2 IN HW CONCRETE,  !- Name
-    MediumRough,             !- Roughness
-    5.0901599E-02,           !- Thickness {m}
-    1.729577,                !- Conductivity {W/m-K}
-    2242.585,                !- Density {kg/m3}
-    836.8000,                !- Specific Heat {J/kg-K}
-    0.9000000,               !- Thermal Absorptance
-    0.6500000,               !- Solar Absorptance
-    0.6500000;               !- Visible Absorptance
-
-WindowMaterial:Glazing,
-    WIN-LAY-GLASS-LIGHT,     !- Name
-    SpectralAverage,         !- Optical Data Type
-    ,                        !- Window Glass Spectral Data Set Name
-    0.003,                   !- Thickness {m}
-    0.90,                    !- Solar Transmittance at Normal Incidence
-    0.031,                   !- Front Side Solar Reflectance at Normal Incidence
-    0.031,                   !- Back Side Solar Reflectance at Normal Incidence
-    0.90,                    !- Visible Transmittance at Normal Incidence
-    0.05,                    !- Front Side Visible Reflectance at Normal Incidence
-    0.05,                    !- Back Side Visible Reflectance at Normal Incidence
-    0.0,                     !- Infrared Transmittance at Normal Incidence
-    0.84,                    !- Front Side Infrared Hemispherical Emissivity
-    0.84,                    !- Back Side Infrared Hemispherical Emissivity
-    0.9;                     !- Conductivity {W/m-K}
-
-Construction,
-    EXTWALL80,               !- Name
-    A1 - 1 IN STUCCO,        !- Outside Layer
-    C4 - 4 IN COMMON BRICK,  !- Layer 2
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD;  !- Layer 3
-
-Construction,
-    PARTITION06,             !- Name
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD,  !- Outside Layer
-    C6 - 8 IN CLAY TILE,     !- Layer 2
-    E1 - 3 / 4 IN PLASTER OR GYP BOARD;  !- Layer 3
-
-Construction,
-    FLOOR SLAB 8 IN,         !- Name
-    C10 - 8 IN HW CONCRETE;  !- Outside Layer
-
-Construction,
-    ROOF34,                  !- Name
-    E2 - 1 / 2 IN SLAG OR STONE,  !- Outside Layer
-    E3 - 3 / 8 IN FELT AND MEMBRANE,  !- Layer 2
-    B5 - 1 IN DENSE INSULATION,  !- Layer 3
-    C12 - 2 IN HW CONCRETE;  !- Layer 4
-
-Construction,
-    WIN-CON-LIGHT,           !- Name
-    WIN-LAY-GLASS-LIGHT;     !- Outside Layer
-
-ScheduleTypeLimits,
-    Any Number;              !- Name
-
-ScheduleTypeLimits,
-    Fraction,                !- Name
-    0.0,                     !- Lower Limit Value
-    1.0,                     !- Upper Limit Value
-    CONTINUOUS;              !- Numeric Type
-
-ScheduleTypeLimits,
-    Temperature,             !- Name
-    -60,                     !- Lower Limit Value
-    200,                     !- Upper Limit Value
-    CONTINUOUS,              !- Numeric Type
-    Temperature;             !- Unit Type
-
-ScheduleTypeLimits,
-    Control Type,            !- Name
-    0,                       !- Lower Limit Value
-    4,                       !- Upper Limit Value
-    DISCRETE;                !- Numeric Type
-
-ScheduleTypeLimits,
-    On/Off,                  !- Name
-    0,                       !- Lower Limit Value
-    1,                       !- Upper Limit Value
-    DISCRETE;                !- Numeric Type
-
-Schedule:Compact,
-    Activity Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 131.8;     !- Field 4
-
-Schedule:Compact,
-    Work Eff Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 0.0;       !- Field 4
-
-Schedule:Compact,
-    Clothing Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1.0;       !- Field 4
-
-Schedule:Compact,
-    Air Velo Sch,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 0.137;     !- Field 4
-
-Schedule:Compact,
-    BLDG Sch   1,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: Weekday,            !- Field 2
-    Until: 6:00, 0.00,       !- Field 4
-    Until: 7:00, 0.10,       !- Field 6
-    Until: 8:00, 0.50,       !- Field 8
-    Until: 12:00, 1.00,      !- Field 10
-    Until: 13:00, 0.50,      !- Field 12
-    Until: 16:00, 1.00,      !- Field 14
-    Until: 17:00, 0.50,      !- Field 16
-    Until: 18:00, 0.10,      !- Field 18
-    Until: 24:00, 0.00,      !- Field 20
-    For: AllOtherDays,       !- Field 21
-    Until: 24:00, 0.10;      !- Field 23
-
-Schedule:Compact,
-    BLDG Sch   2,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: Weekday,            !- Field 2
-    Until: 08:00, 0.10,      !- Field 4
-    Until: 18:00, 1.00,      !- Field 6
-    Until: 24:00, 0.10,      !- Field 8
-    For: AllOtherDays,       !- Field 9
-    Until: 24:00, 0.10;      !- Field 11
-
-Schedule:Compact,
-    BLDG Sch   3,            !- Name
-    Any Number,              !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: Weekday,            !- Field 2
-    Until: 06:00, 0.05,      !- Field 4
-    Until: 07:00, 0.20,      !- Field 6
-    Until: 17:00, 1.00,      !- Field 8
-    Until: 18:00, 0.50,      !- Field 10
-    Until: 24:00, 0.05,      !- Field 12
-    For: AllOtherDays,       !- Field 13
-    Until: 24:00, 0.05;      !- Field 15
-
-Schedule:Compact,
-    summer on,               !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 4/30,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 0,         !- Field 4
-    Through: 9/30,           !- Field 5
-    For: AllDays,            !- Field 6
-    Until: 24:00, 1,         !- Field 8
-    Through: 12/31,          !- Field 9
-    For: AllDays,            !- Field 10
-    Until: 24:00, 0;         !- Field 12
-
-Schedule:Compact,
-    winter on,               !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 4/30,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1,         !- Field 4
-    Through: 9/30,           !- Field 5
-    For: AllDays,            !- Field 6
-    Until: 24:00, 0,         !- Field 8
-    Through: 12/31,          !- Field 9
-    For: AllDays,            !- Field 10
-    Until: 24:00, 1;         !- Field 12
-
-Schedule:Compact,
-    Seasonal Reset Supply Air Temp Sch,  !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 3/31,           !- Field 1
-    For: Weekend,            !- Field 2
-    Until: 24:00, 26,        !- Field 4
-    For: AllOtherDays,       !- Field 5
-    Until: 06:00, 21,        !- Field 7
-    Until: 17:00, 18,        !- Field 9
-    Until: 24:00, 21,        !- Field 11
-    Through: 9/30,           !- Field 12
-    For: AllDays,            !- Field 13
-    Until: 24:00, 16,        !- Field 15
-    Through: 12/31,          !- Field 16
-    For: Weekend,            !- Field 17
-    Until: 24:00, 26,        !- Field 19
-    For: AllOtherDays,       !- Field 20
-    Until: 06:00, 21,        !- Field 22
-    Until: 17:00, 18,        !- Field 24
-    Until: 24:00, 21;        !- Field 26
-
-Schedule:Compact,
-    CW Loop Temp Schedule,   !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 6.67;      !- Field 4
-
-Schedule:Compact,
-    HW Loop Temp Schedule,   !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 55.0;      !- Field 4
-
-Schedule:Compact,
-    FanAndCoilAvailSched,    !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 3/31,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1.0,       !- Field 4
-    Through: 9/30,           !- Field 5
-    For: Weekday Weekend,    !- Field 6
-    Until: 07:00, 0.0,       !- Field 8
-    Until: 17:00, 1.0,       !- Field 10
-    Until: 24:00, 0.0,       !- Field 12
-    For: AllOtherDays,       !- Field 13
-    Until: 24:00, 0.0,       !- Field 15
-    Through: 12/31,          !- Field 16
-    For: AllDays,            !- Field 17
-    Until: 24:00, 1.0;       !- Field 19
-
-Schedule:Compact,
-    CoolingCoilAvailSched,   !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 3/31,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 0.0,       !- Field 4
-    Through: 9/30,           !- Field 5
-    For: Weekday Weekend,    !- Field 6
-    Until: 07:00, 0.0,       !- Field 8
-    Until: 17:00, 1.0,       !- Field 10
-    Until: 24:00, 0.0,       !- Field 12
-    For: AllOtherDays,       !- Field 13
-    Until: 24:00, 0.0,       !- Field 15
-    Through: 12/31,          !- Field 16
-    For: AllDays,            !- Field 17
-    Until: 24:00, 0.0;       !- Field 19
-
-Schedule:Compact,
-    Heating Setpoints,       !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 07:00, 17.5,      !- Field 4
-    Until: 17:00, 21.0,      !- Field 6
-    Until: 24:00, 17.5;      !- Field 8
-
-Schedule:Compact,
-    Cooling Setpoints,       !- Name
-    Temperature,             !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 07:00, 28,        !- Field 4
-    Until: 17:00, 24,        !- Field 6
-    Until: 24:00, 28;        !- Field 8
-
-Schedule:Compact,
-    Zone Control Type Sched, !- Name
-    Control Type,            !- Schedule Type Limits Name
-    Through: 3/31,           !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1,         !- Field 4
-    Through: 9/30,           !- Field 5
-    For: AllDays,            !- Field 6
-    Until: 24:00, 2,         !- Field 8
-    Through: 12/31,          !- Field 9
-    For: AllDays,            !- Field 10
-    Until: 24:00, 1;         !- Field 12
-
-ScheduleTypeLimits,
-    FlowRate,                !- Name
-    0.0,                     !- Lower Limit Value
-    10,                      !- Upper Limit Value
-    CONTINUOUS;              !- Numeric Type
-
-Schedule:Compact,
-    ON,                      !- Name
-    Fraction,                !- Schedule Type Limits Name
-    Through: 12/31,          !- Field 1
-    For: AllDays,            !- Field 2
-    Until: 24:00, 1.0;       !- Field 4
-
-Site:GroundTemperature:Deep,13.03,13.03,13.13,13.30,13.43,13.52,13.62,13.77,13.78,13.55,13.44,13.20;
-
-! original zone origin (0,0,0)
-Zone,
-    West Zone,               !- Name
-    0,                       !- Direction of Relative North {deg}
-    0, 0, 0,                            !- X,Y,Z  {m}
-    1,                       !- Type
-    1,                       !- Multiplier
-    autocalculate,           !- Ceiling Height {m}
-    autocalculate;           !- Volume {m3}
-
-! original zone origin (6.096,0,0)
-Zone,
-    EAST ZONE,               !- Name
-    0,                       !- Direction of Relative North {deg}
-    0, 0, 0,                            !- X,Y,Z  {m}
-    1,                       !- Type
-    1,                       !- Multiplier
-    autocalculate,           !- Ceiling Height {m}
-    autocalculate;           !- Volume {m3}
-
-! original zone origin (0,6.096,0)
-Zone,
-    NORTH ZONE,              !- Name
-    0,                       !- Direction of Relative North {deg}
-    0, 0, 0,                            !- X,Y,Z  {m}
-    1,                       !- Type
-    1,                       !- Multiplier
-    autocalculate,           !- Ceiling Height {m}
-    autocalculate;           !- Volume {m3}
-
-People,
-    West Zone,               !- Name
-    West Zone,               !- Zone or ZoneList Name
-    BLDG Sch   1,            !- Number of People Schedule Name
-    people,                  !- Number of People Calculation Method
-    2.000000,                !- Number of People
-    ,                        !- People per Zone Floor Area {person/m2}
-    ,                        !- Zone Floor Area per Person {m2/person}
-    0.3000000,               !- Fraction Radiant
-    ,                        !- Sensible Heat Fraction
-    Activity Sch,            !- Activity Level Schedule Name
-    3.82E-8,                 !- Carbon Dioxide Generation Rate {m3/s-W}
-    ,                        !- Enable ASHRAE 55 Comfort Warnings
-    zoneaveraged,            !- Mean Radiant Temperature Calculation Type
-    ,                        !- Surface Name/Angle Factor List Name
-    Work Eff Sch,            !- Work Efficiency Schedule Name
-    ClothingInsulationSchedule,  !- Clothing Insulation Calculation Method
-    ,                        !- Clothing Insulation Calculation Method Schedule Name
-    Clothing Sch,            !- Clothing Insulation Schedule Name
-    Air Velo Sch,            !- Air Velocity Schedule Name
-    FANGER;                  !- Thermal Comfort Model 1 Type
-
-ElectricEquipment,
-    West Zone ElecEq 1,      !- Name
-    West Zone,               !- Zone or ZoneList Name
-    BLDG Sch   2,            !- Schedule Name
-    EquipmentLevel,          !- Design Level Calculation Method
-    2928.751,                !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Fraction Latent
-    0.3000000,               !- Fraction Radiant
-    0;                       !- Fraction Lost
-
-People,
-    EAST ZONE,               !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    BLDG Sch   1,            !- Number of People Schedule Name
-    people,                  !- Number of People Calculation Method
-    3.000000,                !- Number of People
-    ,                        !- People per Zone Floor Area {person/m2}
-    ,                        !- Zone Floor Area per Person {m2/person}
-    0.3000000,               !- Fraction Radiant
-    ,                        !- Sensible Heat Fraction
-    Activity Sch,            !- Activity Level Schedule Name
-    3.82E-8,                 !- Carbon Dioxide Generation Rate {m3/s-W}
-    ,                        !- Enable ASHRAE 55 Comfort Warnings
-    zoneaveraged,            !- Mean Radiant Temperature Calculation Type
-    ,                        !- Surface Name/Angle Factor List Name
-    Work Eff Sch,            !- Work Efficiency Schedule Name
-    ClothingInsulationSchedule,  !- Clothing Insulation Calculation Method
-    ,                        !- Clothing Insulation Calculation Method Schedule Name
-    Clothing Sch,            !- Clothing Insulation Schedule Name
-    Air Velo Sch,            !- Air Velocity Schedule Name
-    FANGER;                  !- Thermal Comfort Model 1 Type
-
-Lights,
-    EAST ZONE Lights 1,      !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    BLDG Sch   3,            !- Schedule Name
-    LightingLevel,           !- Design Level Calculation Method
-    464.375,                 !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Return Air Fraction
-    0.2000000,               !- Fraction Radiant
-    0.2000000,               !- Fraction Visible
-    0,                       !- Fraction Replaceable
-    GeneralLights;           !- End-Use Subcategory
-
-ElectricEquipment,
-    EAST ZONE ElecEq 1,      !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    BLDG Sch   2,            !- Schedule Name
-    EquipmentLevel,          !- Design Level Calculation Method
-    2464.375,                !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Fraction Latent
-    0.3000000,               !- Fraction Radiant
-    0;                       !- Fraction Lost
-
-People,
-    NORTH ZONE,              !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    BLDG Sch   1,            !- Number of People Schedule Name
-    people,                  !- Number of People Calculation Method
-    4.000000,                !- Number of People
-    ,                        !- People per Zone Floor Area {person/m2}
-    ,                        !- Zone Floor Area per Person {m2/person}
-    0.3000000,               !- Fraction Radiant
-    ,                        !- Sensible Heat Fraction
-    Activity Sch,            !- Activity Level Schedule Name
-    3.82E-8,                 !- Carbon Dioxide Generation Rate {m3/s-W}
-    ,                        !- Enable ASHRAE 55 Comfort Warnings
-    zoneaveraged,            !- Mean Radiant Temperature Calculation Type
-    ,                        !- Surface Name/Angle Factor List Name
-    Work Eff Sch,            !- Work Efficiency Schedule Name
-    ClothingInsulationSchedule,  !- Clothing Insulation Calculation Method
-    ,                        !- Clothing Insulation Calculation Method Schedule Name
-    Clothing Sch,            !- Clothing Insulation Schedule Name
-    Air Velo Sch,            !- Air Velocity Schedule Name
-    FANGER;                  !- Thermal Comfort Model 1 Type
-
-Lights,
-    NORTH ZONE Lights 1,     !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    BLDG Sch   3,            !- Schedule Name
-    LightingLevel,           !- Design Level Calculation Method
-    878.6252,                !- Lighting Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Return Air Fraction
-    0.2000000,               !- Fraction Radiant
-    0.2000000,               !- Fraction Visible
-    0,                       !- Fraction Replaceable
-    GeneralLights;           !- End-Use Subcategory
-
-ElectricEquipment,
-    NORTH ZONE ElecEq 1,     !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    BLDG Sch   2,            !- Schedule Name
-    EquipmentLevel,          !- Design Level Calculation Method
-    2928.751,                !- Design Level {W}
-    ,                        !- Watts per Zone Floor Area {W/m2}
-    ,                        !- Watts per Person {W/person}
-    0,                       !- Fraction Latent
-    0.3000000,               !- Fraction Radiant
-    0;                       !- Fraction Lost
-
-GlobalGeometryRules,
-    UpperLeftCorner,         !- Starting Vertex Position
-    CounterClockWise,        !- Vertex Entry Direction
-    World;                   !- Coordinate System
-
-BuildingSurface:Detailed,
-    Zn001:Wall001,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    West Zone,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 0, 3.048000,                     !- X,Y,Z  1 {m}
-    0, 0, 0,                            !- X,Y,Z  2 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  3 {m}
-    6.096000, 0, 3.048000;              !- X,Y,Z  4 {m}
-
-FenestrationSurface:Detailed,
-    Zn001:Wall001:Win001,    !- Name
-    Window,                  !- Surface Type
-    WIN-CON-LIGHT,           !- Construction Name
-    Zn001:Wall001,           !- Building Surface Name
-    ,                        !- Outside Boundary Condition Object
-    0.5000000,               !- View Factor to Ground
-    ,                        !- Frame and Divider Name
-    1.0,                     !- Multiplier
-    4,                       !- Number of Vertices
-    0.548000, 0, 1.000,                 !- X,Y,Z  1 {m}
-    0.548000, 0, 0.5000,                !- X,Y,Z  2 {m}
-    1.048000, 0, 0.5000,                !- X,Y,Z  3 {m}
-    1.048000, 0, 1.000;                 !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Wall002,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    West Zone,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 3.048000,              !- X,Y,Z  1 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  2 {m}
-    0, 0, 0,                            !- X,Y,Z  3 {m}
-    0, 0, 3.048000;                     !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Wall003,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    West Zone,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn003:Wall004,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  3 {m}
-    0, 6.096000, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Wall004,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    West Zone,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn002:Wall004,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 0, 3.048000,              !- X,Y,Z  1 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Flr001,            !- Name
-    Floor,                   !- Surface Type
-    FLOOR SLAB 8 IN,         !- Construction Name
-    West Zone,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn001:Flr001,            !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    1.000000,                !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 0, 0,                            !- X,Y,Z  1 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 0, 0;                     !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn001:Roof001,           !- Name
-    Roof,                    !- Surface Type
-    ROOF34,                  !- Construction Name
-    West Zone,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0,                       !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 3.048000,              !- X,Y,Z  1 {m}
-    0, 0, 3.048000,                     !- X,Y,Z  2 {m}
-    6.096000, 0, 3.048000,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall001,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    12.19200, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    12.19200, 6.096000, 0,              !- X,Y,Z  2 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    9.144000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall002,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 0, 3.048000,              !- X,Y,Z  1 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  2 {m}
-    12.19200, 0, 0,                     !- X,Y,Z  3 {m}
-    12.19200, 0, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall003,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    12.19200, 0, 3.048000,              !- X,Y,Z  1 {m}
-    12.19200, 0, 0,                     !- X,Y,Z  2 {m}
-    12.19200, 6.096000, 0,              !- X,Y,Z  3 {m}
-    12.19200, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall004,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn001:Wall004,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    6.096000, 0, 0,                     !- X,Y,Z  3 {m}
-    6.096000, 0, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Wall005,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn003:Wall005,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    9.144000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Flr001,            !- Name
-    Floor,                   !- Surface Type
-    FLOOR SLAB 8 IN,         !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn002:Flr001,            !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    1.000000,                !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 0, 0,                     !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    12.19200, 6.096000, 0,              !- X,Y,Z  3 {m}
-    12.19200, 0, 0;                     !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn002:Roof001,           !- Name
-    Roof,                    !- Surface Type
-    ROOF34,                  !- Construction Name
-    EAST ZONE,               !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0,                       !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 0, 3.048000,              !- X,Y,Z  2 {m}
-    12.19200, 0, 3.048000,              !- X,Y,Z  3 {m}
-    12.19200, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall001,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 12.19200, 3.048000,              !- X,Y,Z  1 {m}
-    0, 12.19200, 0,                     !- X,Y,Z  2 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  3 {m}
-    0, 6.096000, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall002,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    9.144000, 12.19200, 3.048000,       !- X,Y,Z  1 {m}
-    9.144000, 12.19200, 0,              !- X,Y,Z  2 {m}
-    0, 12.19200, 0,                     !- X,Y,Z  3 {m}
-    0, 12.19200, 3.048000;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall003,           !- Name
-    Wall,                    !- Surface Type
-    EXTWALL80,               !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    9.144000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    9.144000, 12.19200, 0,              !- X,Y,Z  3 {m}
-    9.144000, 12.19200, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall004,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn001:Wall003,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 3.048000,              !- X,Y,Z  1 {m}
-    0, 6.096000, 0,                     !- X,Y,Z  2 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    6.096000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Wall005,           !- Name
-    Wall,                    !- Surface Type
-    PARTITION06,             !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn002:Wall005,           !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    0.5000000,               !- View Factor to Ground
-    4,                       !- Number of Vertices
-    6.096000, 6.096000, 3.048000,       !- X,Y,Z  1 {m}
-    6.096000, 6.096000, 0,              !- X,Y,Z  2 {m}
-    9.144000, 6.096000, 0,              !- X,Y,Z  3 {m}
-    9.144000, 6.096000, 3.048000;       !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Flr001,            !- Name
-    Floor,                   !- Surface Type
-    FLOOR SLAB 8 IN,         !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Surface,                 !- Outside Boundary Condition
-    Zn003:Flr001,            !- Outside Boundary Condition Object
-    NoSun,                   !- Sun Exposure
-    NoWind,                  !- Wind Exposure
-    1.000000,                !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 6.096000, 0,                     !- X,Y,Z  1 {m}
-    0, 12.19200, 0,                     !- X,Y,Z  2 {m}
-    9.144000, 12.19200, 0,              !- X,Y,Z  3 {m}
-    9.144000, 6.096000, 0;              !- X,Y,Z  4 {m}
-
-BuildingSurface:Detailed,
-    Zn003:Roof001,           !- Name
-    Roof,                    !- Surface Type
-    ROOF34,                  !- Construction Name
-    NORTH ZONE,              !- Zone Name
-    Outdoors,                !- Outside Boundary Condition
-    ,                        !- Outside Boundary Condition Object
-    SunExposed,              !- Sun Exposure
-    WindExposed,             !- Wind Exposure
-    0,                       !- View Factor to Ground
-    4,                       !- Number of Vertices
-    0, 12.19200, 3.048000,              !- X,Y,Z  1 {m}
-    0, 6.096000, 3.048000,              !- X,Y,Z  2 {m}
-    9.144000, 6.096000, 3.048000,       !- X,Y,Z  3 {m}
-    9.144000, 12.19200, 3.048000;       !- X,Y,Z  4 {m}
-
-AirLoopHVAC,
-    Typical Terminal Reheat 1,  !- Name
-    Reheat System 1 Controllers,  !- Controller List Name
-    Reheat System 1 Avail List,  !- Availability Manager List Name
-    1.3,                     !- Design Supply Air Flow Rate {m3/s}
-    Air Loop Branches,       !- Branch List Name
-    ,                        !- Connector List Name
-    Air Loop Inlet Node,     !- Supply Side Inlet Node Name
-    Return Air Mixer Outlet, !- Demand Side Outlet Node Name
-    Zone Equipment Inlet Node,  !- Demand Side Inlet Node Names
-    Air Loop Outlet Node;    !- Supply Side Outlet Node Names
-
-AirLoopHVAC:ControllerList,
-    Reheat System 1 Controllers,  !- Name
-    Controller:WaterCoil,    !- Controller 1 Object Type
-    Main Cooling Coil Controller;  !- Controller 1 Name
-
-BranchList,
-    Air Loop Branches,       !- Name
-    Air Loop Main Branch;    !- Branch 1 Name
-
-Branch,
-    Air Loop Main Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Fan:ConstantVolume,      !- Component 1 Object Type
-    Supply Fan 1,            !- Component 1 Name
-    Air Loop Inlet Node,     !- Component 1 Inlet Node Name
-    Cooling Coil Air Inlet Node,  !- Component 1 Outlet Node Name
-    Coil:Cooling:Water:DetailedGeometry,  !- Component 2 Object Type
-    Detailed Cooling Coil,   !- Component 2 Name
-    Cooling Coil Air Inlet Node,  !- Component 2 Inlet Node Name
-    Air Loop Outlet Node;    !- Component 2 Outlet Node Name
-
-AvailabilityManagerAssignmentList,
-    Reheat System 1 Avail List,  !- Name
-    AvailabilityManager:Scheduled,  !- Availability Manager 1 Object Type
-    Reheat System 1 Avail;   !- Availability Manager 1 Name
-
-AvailabilityManager:Scheduled,
-    Reheat System 1 Avail,   !- Name
-    FanAndCoilAvailSched;    !- Schedule Name
-
-PlantLoop,
-    Chilled Water Loop,      !- Name
-    Water,                   !- Fluid Type
-    ,                        !- User Defined Fluid Type
-    CW Loop Operation,       !- Plant Equipment Operation Scheme Name
-    CW Supply Outlet Node,   !- Loop Temperature Setpoint Node Name
-    98,                      !- Maximum Loop Temperature {C}
-    1,                       !- Minimum Loop Temperature {C}
-    0.0033,                  !- Maximum Loop Flow Rate {m3/s}
-    0.0,                     !- Minimum Loop Flow Rate {m3/s}
-    5.0,                     !- Plant Loop Volume {m3}
-    CW Supply Inlet Node,    !- Plant Side Inlet Node Name
-    CW Supply Outlet Node,   !- Plant Side Outlet Node Name
-    Cooling Supply Side Branches,  !- Plant Side Branch List Name
-    Cooling Supply Side Connectors,  !- Plant Side Connector List Name
-    CW Demand Inlet Node,    !- Demand Side Inlet Node Name
-    CW Demand Outlet Node,   !- Demand Side Outlet Node Name
-    Cooling Demand Side Branches,  !- Demand Side Branch List Name
-    Cooling Demand Side Connectors,  !- Demand Side Connector List Name
-    Optimal;                 !- Load Distribution Scheme
-
-SetpointManager:Scheduled,
-    Chilled Water Loop Setpoint Manager,  !- Name
-    Temperature,             !- Control Variable
-    CW Loop Temp Schedule,   !- Schedule Name
-    Chilled Water Loop Setpoint Node List;  !- Setpoint Node or NodeList Name
-
-NodeList,
-    Chilled Water Loop Setpoint Node List,  !- Name
-    CW Supply Outlet Node;   !- Node 1 Name
-
-BranchList,
-    Cooling Supply Side Branches,  !- Name
-    CW Pump Branch,          !- Branch 1 Name
-    GshpCLG Chiller Branch,  !- Branch 2 Name
-    Purchased Cooling Branch,!- Branch 3 Name
-    Supply Bypass Branch,    !- Branch 4 Name
-    Cooling Supply Outlet;   !- Branch 5 Name
-
-BranchList,
-    Cooling Demand Side Branches,  !- Name
-    Cooling Demand Inlet,    !- Branch 1 Name
-    Cooling Coil Branch,     !- Branch 2 Name
-    Demand Bypass Branch,    !- Branch 3 Name
-    Cooling Demand Outlet;   !- Branch 4 Name
-
-ConnectorList,
-    Cooling Supply Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    CW Loop Splitter,        !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    CW Loop Mixer;           !- Connector 2 Name
-
-ConnectorList,
-    Cooling Demand Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    CW Demand Splitter,      !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    CW Demand Mixer;         !- Connector 2 Name
-
-Branch,
-    Cooling Demand Inlet,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Demand Side Inlet Pipe,  !- Component 1 Name
-    CW Demand Inlet Node,    !- Component 1 Inlet Node Name
-    CW Demand Entrance Pipe Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Demand Side Inlet Pipe,  !- Name
-    CW Demand Inlet Node,    !- Inlet Node Name
-    CW Demand Entrance Pipe Outlet Node;  !- Outlet Node Name
-
-Branch,
-    Cooling Coil Branch,     !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Cooling:Water:DetailedGeometry,  !- Component 1 Object Type
-    Detailed Cooling Coil,   !- Component 1 Name
-    Cooling Coil Water Inlet Node,  !- Component 1 Inlet Node Name
-    Cooling Coil Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Demand Bypass Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Demand Side Bypass,      !- Component 1 Name
-    CW Demand Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    CW Demand Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Demand Side Bypass,      !- Name
-    CW Demand Bypass Inlet Node,  !- Inlet Node Name
-    CW Demand Bypass Outlet Node;  !- Outlet Node Name
-
-Branch,
-    Cooling Demand Outlet,   !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    CW Demand Side Outlet Pipe,  !- Component 1 Name
-    CW Demand Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    CW Demand Outlet Node;   !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    CW Demand Side Outlet Pipe,  !- Name
-    CW Demand Exit Pipe Inlet Node,  !- Inlet Node Name
-    CW Demand Outlet Node;   !- Outlet Node Name
-
-Branch,
-    Cooling Supply Outlet,   !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Supply Side Outlet Pipe, !- Component 1 Name
-    Supply Side Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    CW Supply Outlet Node;   !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Supply Side Outlet Pipe, !- Name
-    Supply Side Exit Pipe Inlet Node,  !- Inlet Node Name
-    CW Supply Outlet Node;   !- Outlet Node Name
-
-Branch,
-    CW Pump Branch,          !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pump:ConstantSpeed,      !- Component 1 Object Type
-    Circ Pump,               !- Component 1 Name
-    CW Supply Inlet Node,    !- Component 1 Inlet Node Name
-    CW Pump Outlet Node;     !- Component 1 Outlet Node Name
-
-Branch,
-    GshpCLG Chiller Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    HeatPump:WaterToWater:EquationFit:Cooling,  !- Component 1 Object Type
-    GshpCLG,                 !- Component 1 Name
-    GshpCLG LoadSide Inlet Node,  !- Component 1 Inlet Node Name
-    GshpCLG LoadSide Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Purchased Cooling Branch,!- Name
-    ,                        !- Pressure Drop Curve Name
-    DistrictCooling,         !- Component 1 Object Type
-    Purchased Cooling,       !- Component 1 Name
-    Purchased Cooling Inlet Node,  !- Component 1 Inlet Node Name
-    Purchased Cooling Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Supply Bypass Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Supply Side Bypass,      !- Component 1 Name
-    CW Supply Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    CW Supply Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Supply Side Bypass,      !- Name
-    CW Supply Bypass Inlet Node,  !- Inlet Node Name
-    CW Supply Bypass Outlet Node;  !- Outlet Node Name
-
-Connector:Splitter,
-    CW Loop Splitter,        !- Name
-    CW Pump Branch,          !- Inlet Branch Name
-    GshpCLG Chiller Branch,  !- Outlet Branch 1 Name
-    Purchased Cooling Branch,!- Outlet Branch 2 Name
-    Supply Bypass Branch;    !- Outlet Branch 3 Name
-
-Connector:Mixer,
-    CW Loop Mixer,           !- Name
-    Cooling Supply Outlet,   !- Outlet Branch Name
-    GshpCLG Chiller Branch,  !- Inlet Branch 1 Name
-    Purchased Cooling Branch,!- Inlet Branch 2 Name
-    Supply Bypass Branch;    !- Inlet Branch 3 Name
-
-Connector:Splitter,
-    CW Demand Splitter,      !- Name
-    Cooling Demand Inlet,    !- Inlet Branch Name
-    Demand Bypass Branch,    !- Outlet Branch 1 Name
-    Cooling Coil Branch;     !- Outlet Branch 2 Name
-
-Connector:Mixer,
-    CW Demand Mixer,         !- Name
-    Cooling Demand Outlet,   !- Outlet Branch Name
-    Cooling Coil Branch,     !- Inlet Branch 1 Name
-    Demand Bypass Branch;    !- Inlet Branch 2 Name
-
-PlantEquipmentOperationSchemes,
-    CW Loop Operation,       !- Name
-    PlantEquipmentOperation:CoolingLoad,  !- Control Scheme 1 Object Type
-    Summer Cooling Operation,!- Control Scheme 1 Name
-    Summer On,               !- Control Scheme 1 Schedule Name
-    PlantEquipmentOperation:CoolingLoad,  !- Control Scheme 2 Object Type
-    Winter Cooling Operation,!- Control Scheme 2 Name
-    Winter On;               !- Control Scheme 2 Schedule Name
-
-PlantEquipmentOperation:CoolingLoad,
-    Summer Cooling Operation,!- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    500000,                  !- Load Range 1 Upper Limit {W}
-    GSHP and Purchased Cooling;  !- Range 1 Equipment List Name
-
-PlantEquipmentOperation:CoolingLoad,
-    Winter Cooling Operation,!- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    900000,                  !- Load Range 1 Upper Limit {W}
-    Purchased Cooling Only;  !- Range 1 Equipment List Name
-
-PlantEquipmentList,
-    GSHP and Purchased Cooling,  !- Name
-    HeatPump:WaterToWater:EquationFit:Cooling,  !- Equipment 1 Object Type
-    GshpCLG,                 !- Equipment 1 Name
-    DistrictCooling,         !- Equipment 2 Object Type
-    Purchased Cooling;       !- Equipment 2 Name
-
-PlantEquipmentList,
-    Purchased Cooling Only,  !- Name
-    DistrictCooling,         !- Equipment 1 Object Type
-    Purchased Cooling;       !- Equipment 1 Name
-
-DistrictCooling,
-    Purchased Cooling,       !- Name
-    Purchased Cooling Inlet Node,  !- Chilled Water Inlet Node Name
-    Purchased Cooling Outlet Node,  !- Chilled Water Outlet Node Name
-    680000;                  !- Nominal Capacity {W}
-
-HeatPump:WaterToWater:EquationFit:Cooling,
-    GshpCLG,                 !- Name
-    GshpCLG SourceSide Inlet Node,  !- Source Side Inlet Node Name
-    GshpCLG SourceSide Outlet Node,  !- Source Side Outlet Node Name
-    GshpCLG LoadSide Inlet Node,  !- Load Side Inlet Node Name
-    GshpCLG LoadSide Outlet Node,  !- Load Side Outlet Node Name
-    1.89E-03,                !- Reference Load Side Flow Rate {m3/s}
-    1.89E-03,                !- Reference Source Side Flow Rate {m3/s}
-    39890.91,                !- Reference Cooling Capacity {W}
-    4790.00,                 !- Reference Cooling Power Consumption {W}
-    -1.52030596,             !- Cooling Capacity Coefficient 1
-    3.46625667,              !- Cooling Capacity Coefficient 2
-    -1.32267797,             !- Cooling Capacity Coefficient 3
-    0.09395678,              !- Cooling Capacity Coefficient 4
-    0.038975504,             !- Cooling Capacity Coefficient 5
-    -8.59564386,             !- Cooling Compressor Power Coefficient 1
-    0.96265085,              !- Cooling Compressor Power Coefficient 2
-    8.69489229,              !- Cooling Compressor Power Coefficient 3
-    0.02501669,              !- Cooling Compressor Power Coefficient 4
-    -0.20132665;             !- Cooling Compressor Power Coefficient 5
-
-Pump:ConstantSpeed,
-    Circ Pump,               !- Name
-    CW Supply Inlet Node,    !- Inlet Node Name
-    CW Pump Outlet Node,     !- Outlet Node Name
-    0.0033,                  !- Design Flow Rate {m3/s}
-    5000,                    !- Design Pump Head {Pa}
-    25,                      !- Design Power Consumption {W}
-    0.87,                    !- Motor Efficiency
-    0.0,                     !- Fraction of Motor Inefficiencies to Fluid Stream
-    CONTINUOUS;              !- Pump Control Type
-
-PlantLoop,
-    Hot Water Loop,          !- Name
-    Water,                   !- Fluid Type
-    ,                        !- User Defined Fluid Type
-    Hot Loop Operation,      !- Plant Equipment Operation Scheme Name
-    HW Supply Outlet Node,   !- Loop Temperature Setpoint Node Name
-    100,                     !- Maximum Loop Temperature {C}
-    10,                      !- Minimum Loop Temperature {C}
-    0.0043,                  !- Maximum Loop Flow Rate {m3/s}
-    0.0,                     !- Minimum Loop Flow Rate {m3/s}
-    5.0,                     !- Plant Loop Volume {m3}
-    HW Supply Inlet Node,    !- Plant Side Inlet Node Name
-    HW Supply Outlet Node,   !- Plant Side Outlet Node Name
-    Heating Supply Side Branches,  !- Plant Side Branch List Name
-    Heating Supply Side Connectors,  !- Plant Side Connector List Name
-    HW Demand Inlet Node,    !- Demand Side Inlet Node Name
-    HW Demand Outlet Node,   !- Demand Side Outlet Node Name
-    Heating Demand Side Branches,  !- Demand Side Branch List Name
-    Heating Demand Side Connectors,  !- Demand Side Connector List Name
-    Optimal;                 !- Load Distribution Scheme
-
-SetpointManager:Scheduled,
-    Hot Water Loop Setpoint Manager,  !- Name
-    Temperature,             !- Control Variable
-    HW Loop Temp Schedule,   !- Schedule Name
-    Hot Water Loop Setpoint Node List;  !- Setpoint Node or NodeList Name
-
-NodeList,
-    Hot Water Loop Setpoint Node List,  !- Name
-    HW Supply Outlet Node;   !- Node 1 Name
-
-BranchList,
-    Heating Supply Side Branches,  !- Name
-    Heating Supply Inlet Branch,  !- Branch 1 Name
-    Heating Gshp Branch,     !- Branch 2 Name
-    Purchased Heating Branch,!- Branch 3 Name
-    Heating Supply Bypass Branch,  !- Branch 4 Name
-    Heating Supply Outlet Branch;  !- Branch 5 Name
-
-ConnectorList,
-    Heating Supply Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Heating Supply Splitter, !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Heating Supply Mixer;    !- Connector 2 Name
-
-Branch,
-    Heating Supply Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pump:ConstantSpeed,      !- Component 1 Object Type
-    HW Circ Pump,            !- Component 1 Name
-    HW Supply Inlet Node,    !- Component 1 Inlet Node Name
-    HW Pump Outlet Node;     !- Component 1 Outlet Node Name
-
-Branch,
-    Heating Gshp Branch,     !- Name
-    ,                        !- Pressure Drop Curve Name
-    HeatPump:WaterToWater:EquationFit:Heating,  !- Component 1 Object Type
-    GshpHeating,             !- Component 1 Name
-    GshpHeating LoadSide Inlet Node,  !- Component 1 Inlet Node Name
-    GshpHeating LoadSide Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Purchased Heating Branch,!- Name
-    ,                        !- Pressure Drop Curve Name
-    DistrictHeating,         !- Component 1 Object Type
-    Steam,                   !- Component 1 Name
-    Purchased Heat Inlet Node,  !- Component 1 Inlet Node Name
-    Purchased Heat Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Heating Supply Bypass Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Heating Supply Side Bypass,  !- Component 1 Name
-    Heating Supply Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    Heating Supply Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Heating Supply Side Bypass,  !- Name
-    Heating Supply Bypass Inlet Node,  !- Inlet Node Name
-    Heating Supply Bypass Outlet Node;  !- Outlet Node Name
-
-Branch,
-    Heating Supply Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Heating Supply Outlet,   !- Component 1 Name
-    Heating Supply Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    HW Supply Outlet Node;   !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Heating Supply Outlet,   !- Name
-    Heating Supply Exit Pipe Inlet Node,  !- Inlet Node Name
-    HW Supply Outlet Node;   !- Outlet Node Name
-
-BranchList,
-    Heating Demand Side Branches,  !- Name
-    Reheat Inlet Branch,     !- Branch 1 Name
-    Zone 1 Reheat Branch,    !- Branch 2 Name
-    Zone 2 Reheat Branch,    !- Branch 3 Name
-    Zone 3 Reheat Branch,    !- Branch 4 Name
-    Reheat Bypass Branch,    !- Branch 5 Name
-    Reheat Outlet Branch;    !- Branch 6 Name
-
-ConnectorList,
-    Heating Demand Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Reheat Splitter,         !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Reheat Mixer;            !- Connector 2 Name
-
-Branch,
-    Reheat Inlet Branch,     !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Reheat Inlet Pipe,       !- Component 1 Name
-    HW Demand Inlet Node,    !- Component 1 Inlet Node Name
-    HW Demand Entrance Pipe Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Reheat Inlet Pipe,       !- Name
-    HW Demand Inlet Node,    !- Inlet Node Name
-    HW Demand Entrance Pipe Outlet Node;  !- Outlet Node Name
-
-Branch,
-    Reheat Outlet Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Reheat Outlet Pipe,      !- Component 1 Name
-    HW Demand Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    HW Demand Outlet Node;   !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Reheat Outlet Pipe,      !- Name
-    HW Demand Exit Pipe Inlet Node,  !- Inlet Node Name
-    HW Demand Outlet Node;   !- Outlet Node Name
-
-Branch,
-    Zone 1 Reheat Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Heating:Water,      !- Component 1 Object Type
-    Reheat Coil Zone 1,      !- Component 1 Name
-    Zone 1 Reheat Water Inlet Node,  !- Component 1 Inlet Node Name
-    Zone 1 Reheat Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Zone 2 Reheat Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Heating:Water,      !- Component 1 Object Type
-    Reheat Coil Zone 2,      !- Component 1 Name
-    Zone 2 Reheat Water Inlet Node,  !- Component 1 Inlet Node Name
-    Zone 2 Reheat Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Zone 3 Reheat Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Coil:Heating:Water,      !- Component 1 Object Type
-    Reheat Coil Zone 3,      !- Component 1 Name
-    Zone 3 Reheat Water Inlet Node,  !- Component 1 Inlet Node Name
-    Zone 3 Reheat Water Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Reheat Bypass Branch,    !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Reheat Bypass,           !- Component 1 Name
-    Reheat Bypass Inlet Node,!- Component 1 Inlet Node Name
-    Reheat Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Reheat Bypass,           !- Name
-    Reheat Bypass Inlet Node,!- Inlet Node Name
-    Reheat Bypass Outlet Node;  !- Outlet Node Name
-
-Connector:Splitter,
-    Reheat Splitter,         !- Name
-    Reheat Inlet Branch,     !- Inlet Branch Name
-    Zone 1 Reheat Branch,    !- Outlet Branch 1 Name
-    Zone 2 Reheat Branch,    !- Outlet Branch 2 Name
-    Zone 3 Reheat Branch,    !- Outlet Branch 3 Name
-    Reheat Bypass Branch;    !- Outlet Branch 4 Name
-
-Connector:Mixer,
-    Reheat Mixer,            !- Name
-    Reheat Outlet Branch,    !- Outlet Branch Name
-    Zone 1 Reheat Branch,    !- Inlet Branch 1 Name
-    Zone 2 Reheat Branch,    !- Inlet Branch 2 Name
-    Zone 3 Reheat Branch,    !- Inlet Branch 3 Name
-    Reheat Bypass Branch;    !- Inlet Branch 4 Name
-
-Connector:Splitter,
-    Heating Supply Splitter, !- Name
-    Heating Supply Inlet Branch,  !- Inlet Branch Name
-    Heating Gshp Branch,     !- Outlet Branch 1 Name
-    Purchased Heating Branch,!- Outlet Branch 2 Name
-    Heating Supply Bypass Branch;  !- Outlet Branch 3 Name
-
-Connector:Mixer,
-    Heating Supply Mixer,    !- Name
-    Heating Supply Outlet Branch,  !- Outlet Branch Name
-    Heating Gshp Branch,     !- Inlet Branch 1 Name
-    Purchased Heating Branch,!- Inlet Branch 2 Name
-    Heating Supply Bypass Branch;  !- Inlet Branch 3 Name
-
-DistrictHeating,
-    Steam,                   !- Name
-    Purchased Heat Inlet Node,  !- Hot Water Inlet Node Name
-    Purchased Heat Outlet Node,  !- Hot Water Outlet Node Name
-    1000000;                 !- Nominal Capacity {W}
-
-PlantEquipmentOperationSchemes,
-    Hot Loop Operation,      !- Name
-    PlantEquipmentOperation:HeatingLoad,  !- Control Scheme 1 Object Type
-    Winter Heating Operation,!- Control Scheme 1 Name
-    winter on,               !- Control Scheme 1 Schedule Name
-    PlantEquipmentOperation:HeatingLoad,  !- Control Scheme 2 Object Type
-    Summer Heating Operation,!- Control Scheme 2 Name
-    summer on;               !- Control Scheme 2 Schedule Name
-
-PlantEquipmentOperation:HeatingLoad,
-    Summer Heating Operation,!- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    1000000,                 !- Load Range 1 Upper Limit {W}
-    Purchased Heating Plant; !- Range 1 Equipment List Name
-
-PlantEquipmentOperation:HeatingLoad,
-    Winter Heating Operation,!- Name
-    0,                       !- Load Range 1 Lower Limit {W}
-    45000,                   !- Load Range 1 Upper Limit {W}
-    GSHP plant,              !- Range 1 Equipment List Name
-    45000,                   !- Load Range 2 Lower Limit {W}
-    1000000,                 !- Load Range 2 Upper Limit {W}
-    Purchased Heating Plant; !- Range 2 Equipment List Name
-
-PlantEquipmentList,
-    Purchased Heating Plant, !- Name
-    DistrictHeating,         !- Equipment 1 Object Type
-    Steam;                   !- Equipment 1 Name
-
-PlantEquipmentList,
-    GSHP plant,              !- Name
-    HeatPump:WaterToWater:EquationFit:Heating,  !- Equipment 1 Object Type
-    GshpHeating,             !- Equipment 1 Name
-    DistrictHeating,         !- Equipment 2 Object Type
-    Steam;                   !- Equipment 2 Name
-
-Pump:ConstantSpeed,
-    HW Circ Pump,            !- Name
-    HW Supply Inlet Node,    !- Inlet Node Name
-    HW Pump Outlet Node,     !- Outlet Node Name
-    0.0043,                  !- Design Flow Rate {m3/s}
-    5000,                    !- Design Pump Head {Pa}
-    35,                      !- Design Power Consumption {W}
-    0.87,                    !- Motor Efficiency
-    0.0,                     !- Fraction of Motor Inefficiencies to Fluid Stream
-    CONTINUOUS;              !- Pump Control Type
-
-HeatPump:WaterToWater:EquationFit:Heating,
-    GshpHeating,             !- Name
-    GshpHeating SourceSide Inlet Node,  !- Source Side Inlet Node Name
-    GshpHeating SourceSide Outlet Node,  !- Source Side Outlet Node Name
-    GshpHeating LoadSide Inlet Node,  !- Load Side Inlet Node Name
-    GshpHeating LoadSide Outlet Node,  !- Load Side Outlet Node Name
-    1.89E-03,                !- Reference Load Side Flow Rate {m3/s}
-    1.89E-03,                !- Reference Source Side Flow Rate {m3/s}
-    39040.92,                !- Reference Heating Capacity {W}
-    5130.00,                 !- Reference Heating Power Consumption {W}
-    -3.33491153,             !- Heating Capacity Coefficient 1
-    -0.51451946,             !- Heating Capacity Coefficient 2
-    4.51592706,              !- Heating Capacity Coefficient 3
-    0.01797107,              !- Heating Capacity Coefficient 4
-    0.155797661,             !- Heating Capacity Coefficient 5
-    -8.93121751,             !- Heating Compressor Power Coefficient 1
-    8.57035762,              !- Heating Compressor Power Coefficient 2
-    1.29660976,              !- Heating Compressor Power Coefficient 3
-    -0.21629222,             !- Heating Compressor Power Coefficient 4
-    0.033862378;             !- Heating Compressor Power Coefficient 5
-
-CondenserLoop,
-    Chilled Water Condenser Loop,  !- Name
-    Water,                   !- Fluid Type
-    ,                        !- User Defined Fluid Type
-    Tower Loop Operation,    !- Condenser Equipment Operation Scheme Name
-    Condenser Supply Outlet Node,  !- Condenser Loop Temperature Setpoint Node Name
-    80,                      !- Maximum Loop Temperature {C}
-    10,                      !- Minimum Loop Temperature {C}
-    0.00330000,              !- Maximum Loop Flow Rate {m3/s}
-    0,                       !- Minimum Loop Flow Rate {m3/s}
-    5.0,                     !- Condenser Loop Volume {m3}
-    Condenser Supply Inlet Node,  !- Condenser Side Inlet Node Name
-    Condenser Supply Outlet Node,  !- Condenser Side Outlet Node Name
-    Condenser Supply Side Branches,  !- Condenser Side Branch List Name
-    Condenser Supply Side Connectors,  !- Condenser Side Connector List Name
-    Condenser Demand Inlet Node,  !- Demand Side Inlet Node Name
-    Condenser Demand Outlet Node,  !- Demand Side Outlet Node Name
-    Condenser Demand Side Branches,  !- Condenser Demand Side Branch List Name
-    Condenser Demand Side Connectors,  !- Condenser Demand Side Connector List Name
-    SequentialLoad;          !- Load Distribution Scheme
-
-SetpointManager:FollowGroundTemperature,
-    MyCondenserControl,      !- Name
-    Temperature,             !- Control Variable
-    Site:GroundTemperature:Deep,  !- Reference Ground Temperature Object Type
-    0,                       !- Offset Temperature Difference {deltaC}
-    80.0,                    !- Maximum Setpoint Temperature {C}
-    10.0,                    !- Minimum Setpoint Temperature {C}
-    Condenser Supply Outlet Node;  !- Setpoint Node or NodeList Name
-
-BranchList,
-    Condenser Supply Side Branches,  !- Name
-    Condenser Supply Inlet Branch,  !- Branch 1 Name
-    Condenser Supply GHE Branch,  !- Branch 2 Name
-    Condenser Supply Bypass Branch,  !- Branch 3 Name
-    Condenser Supply Outlet Branch;  !- Branch 4 Name
-
-ConnectorList,
-    Condenser Supply Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Condenser Supply Splitter,  !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Condenser Supply Mixer;  !- Connector 2 Name
-
-Branch,
-    Condenser Supply Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pump:ConstantSpeed,      !- Component 1 Object Type
-    Cond Circ Pump,          !- Component 1 Name
-    Condenser Supply Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Pump Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Supply GHE Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    GroundHeatExchanger:System,  !- Component 1 Object Type
-    Vertical Ground Heat Exchanger,  !- Component 1 Name
-    GHE Inlet Node,          !- Component 1 Inlet Node Name
-    GHE Outlet Node;         !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Supply Bypass Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Supply Side Bypass,  !- Component 1 Name
-    Cond Supply Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    Cond Supply Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Supply Side Bypass,  !- Name
-    Cond Supply Bypass Inlet Node,  !- Inlet Node Name
-    Cond Supply Bypass Outlet Node;  !- Outlet Node Name
-
-Branch,
-    Condenser Supply Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Supply Outlet, !- Component 1 Name
-    Condenser Supply Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Supply Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Supply Outlet, !- Name
-    Condenser Supply Exit Pipe Inlet Node,  !- Inlet Node Name
-    Condenser Supply Outlet Node;  !- Outlet Node Name
-
-BranchList,
-    Condenser Demand Side Branches,  !- Name
-    Condenser Demand Inlet Branch,  !- Branch 1 Name
-    GshpCLG Condenser Branch,!- Branch 2 Name
-    Gshp Heating Condenser Branch,  !- Branch 3 Name
-    Condenser Demand Bypass Branch,  !- Branch 4 Name
-    Condenser Demand Outlet Branch;  !- Branch 5 Name
-
-ConnectorList,
-    Condenser Demand Side Connectors,  !- Name
-    Connector:Splitter,      !- Connector 1 Object Type
-    Condenser Demand Splitter,  !- Connector 1 Name
-    Connector:Mixer,         !- Connector 2 Object Type
-    Condenser Demand Mixer;  !- Connector 2 Name
-
-Branch,
-    Condenser Demand Inlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Demand Inlet Pipe,  !- Component 1 Name
-    Condenser Demand Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Demand Entrance Pipe Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Demand Inlet Pipe,  !- Name
-    Condenser Demand Inlet Node,  !- Inlet Node Name
-    Condenser Demand Entrance Pipe Outlet Node;  !- Outlet Node Name
-
-Branch,
-    GshpCLG Condenser Branch,!- Name
-    ,                        !- Pressure Drop Curve Name
-    HeatPump:WaterToWater:EquationFit:Cooling,  !- Component 1 Object Type
-    GshpCLG,                 !- Component 1 Name
-    GshpCLG SourceSide Inlet Node,  !- Component 1 Inlet Node Name
-    GshpCLG SourceSide Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Gshp Heating Condenser Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    HeatPump:WaterToWater:EquationFit:Heating,  !- Component 1 Object Type
-    GshpHeating,             !- Component 1 Name
-    GshpHeating SourceSide Inlet Node,  !- Component 1 Inlet Node Name
-    GshpHeating SourceSide Outlet Node;  !- Component 1 Outlet Node Name
-
-Branch,
-    Condenser Demand Bypass Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Demand Side Bypass,  !- Component 1 Name
-    Cond Demand Bypass Inlet Node,  !- Component 1 Inlet Node Name
-    Cond Demand Bypass Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Demand Side Bypass,  !- Name
-    Cond Demand Bypass Inlet Node,  !- Inlet Node Name
-    Cond Demand Bypass Outlet Node;  !- Outlet Node Name
-
-Branch,
-    Condenser Demand Outlet Branch,  !- Name
-    ,                        !- Pressure Drop Curve Name
-    Pipe:Adiabatic,          !- Component 1 Object Type
-    Condenser Demand Outlet Pipe,  !- Component 1 Name
-    Condenser Demand Exit Pipe Inlet Node,  !- Component 1 Inlet Node Name
-    Condenser Demand Outlet Node;  !- Component 1 Outlet Node Name
-
-Pipe:Adiabatic,
-    Condenser Demand Outlet Pipe,  !- Name
-    Condenser Demand Exit Pipe Inlet Node,  !- Inlet Node Name
-    Condenser Demand Outlet Node;  !- Outlet Node Name
-
-Connector:Splitter,
-    Condenser Demand Splitter,  !- Name
-    Condenser Demand Inlet Branch,  !- Inlet Branch Name
-    GshpCLG Condenser Branch,!- Outlet Branch 1 Name
-    Gshp Heating Condenser Branch,  !- Outlet Branch 2 Name
-    Condenser Demand Bypass Branch;  !- Outlet Branch 3 Name
-
-Connector:Mixer,
-    Condenser Demand Mixer,  !- Name
-    Condenser Demand Outlet Branch,  !- Outlet Branch Name
-    GshpCLG Condenser Branch,!- Inlet Branch 1 Name
-    Gshp Heating Condenser Branch,  !- Inlet Branch 2 Name
-    Condenser Demand Bypass Branch;  !- Inlet Branch 3 Name
-
-Connector:Splitter,
-    Condenser Supply Splitter,  !- Name
-    Condenser Supply Inlet Branch,  !- Inlet Branch Name
-    Condenser Supply GHE Branch,  !- Outlet Branch 1 Name
-    Condenser Supply Bypass Branch;  !- Outlet Branch 2 Name
-
-Connector:Mixer,
-    Condenser Supply Mixer,  !- Name
-    Condenser Supply Outlet Branch,  !- Outlet Branch Name
-    Condenser Supply GHE Branch,  !- Inlet Branch 1 Name
-    Condenser Supply Bypass Branch;  !- Inlet Branch 2 Name
-
-CondenserEquipmentOperationSchemes,
-    Tower Loop Operation,    !- Name
-    PlantEquipmentOperation:Uncontrolled,  !- Control Scheme 1 Object Type
-    Year Round Tower Operation,  !- Control Scheme 1 Name
-    ON;                      !- Control Scheme 1 Schedule Name
-
-PlantEquipmentOperation:Uncontrolled,
-    Year Round Tower Operation,  !- Name
-    All Towers;              !- Equipment List Name
-
-CondenserEquipmentList,
-    All Towers,              !- Name
-    GroundHeatExchanger:System,  !- Equipment 1 Object Type
-    Vertical Ground Heat Exchanger;  !- Equipment 1 Name
-
-GroundHeatExchanger:System,
-    Vertical Ground Heat Exchanger,  !- Name
-    GHE Inlet Node,          !- Inlet Node Name
-    GHE Outlet Node,         !- Outlet Node Name
-    0.00330000,              !- Design Flow Rate {m3/s}
-    Site:GroundTemperature:Undisturbed:KusudaAchenbach,  !- Undisturbed Ground Temperature Model Type
-    Vertical Ground Heat Exchanger Ground Temps,  !- Undisturbed Ground Temperature Model Name
-    0.692626E+00,            !- Ground Thermal Conductivity {W/m-K}
-    0.234700E+07,            !- Ground Thermal Heat Capacity {J/m3-K}
-    Vertical Ground Heat Exchanger g-functions;  !- GHE:Vertical:ResponseFactors Object Name
-
-GroundHeatExchanger:Vertical:Properties,
-    Vertical Ground Heat Exchanger Props,  !- Name
-    1,                       !- Depth of Top of Borehole {m}
-    76.2,                    !- Borehole Length {m}
-    0.127016,                !- Borehole Diameter {m}
-    0.692626E+00,            !- Grout Thermal Conductivity {W/m-K}
-    3.90E+06,                !- Grout Thermal Heat Capacity {J/m3-K}
-    0.391312E+00,            !- Pipe Thermal Conductivity {W/m-K}
-    1.542E+06,               !- Pipe Thermal Heat Capacity {J/m3-K}
-    2.66667E-02,             !- Pipe Outer Diameter {m}
-    2.41285E-03,             !- Pipe Thickness {m}
-    5.1225E-02;              !- U-Tube Distance {m}
-
-Site:GroundTemperature:Undisturbed:KusudaAchenbach,
-    Vertical Ground Heat Exchanger Ground Temps,  !- Name
-    0.692626E+00,            !- Soil Thermal Conductivity {W/m-K}
-    920,                     !- Soil Density {kg/m3}
-    2551.09,                 !- Soil Specific Heat {J/kg-K}
-    13.375,                  !- Average Soil Surface Temperature {C}
-    3.2,                     !- Average Amplitude of Surface Temperature {deltaC}
-    8;                       !- Phase Shift of Minimum Surface Temperature {days}
-
-GroundHeatExchanger:ResponseFactors,
-    Vertical Ground Heat Exchanger g-functions,  !- Name
-    Vertical Ground Heat Exchanger Props,  !- GHE:Vertical:Properties Object Name
-    120,                     !- Number of Boreholes
-    0.0005,                  !- G-Function Reference Ratio {dimensionless}
-    -15.2996,                !- g-Function Ln(T/Ts) Value 1
-    -0.348322,               !- g-Function g Value 1
-    -14.201,                 !- g-Function Ln(T/Ts) Value 2
-    0.022208,                !- g-Function g Value 2
-    -13.2202,                !- g-Function Ln(T/Ts) Value 3
-    0.412345,                !- g-Function g Value 3
-    -12.2086,                !- g-Function Ln(T/Ts) Value 4
-    0.867498,                !- g-Function g Value 4
-    -11.1888,                !- g-Function Ln(T/Ts) Value 5
-    1.357839,                !- g-Function g Value 5
-    -10.1816,                !- g-Function Ln(T/Ts) Value 6
-    1.852024,                !- g-Function g Value 6
-    -9.1815,                 !- g-Function Ln(T/Ts) Value 7
-    2.345656,                !- g-Function g Value 7
-    -8.6809,                 !- g-Function Ln(T/Ts) Value 8
-    2.593958,                !- g-Function g Value 8
-    -8.5,                    !- g-Function Ln(T/Ts) Value 9
-    2.679,                   !- g-Function g Value 9
-    -7.8,                    !- g-Function Ln(T/Ts) Value 10
-    3.023,                   !- g-Function g Value 10
-    -7.2,                    !- g-Function Ln(T/Ts) Value 11
-    3.32,                    !- g-Function g Value 11
-    -6.5,                    !- g-Function Ln(T/Ts) Value 12
-    3.681,                   !- g-Function g Value 12
-    -5.9,                    !- g-Function Ln(T/Ts) Value 13
-    4.071,                   !- g-Function g Value 13
-    -5.2,                    !- g-Function Ln(T/Ts) Value 14
-    4.828,                   !- g-Function g Value 14
-    -4.5,                    !- g-Function Ln(T/Ts) Value 15
-    6.253,                   !- g-Function g Value 15
-    -3.963,                  !- g-Function Ln(T/Ts) Value 16
-    7.894,                   !- g-Function g Value 16
-    -3.27,                   !- g-Function Ln(T/Ts) Value 17
-    11.82,                   !- g-Function g Value 17
-    -2.864,                  !- g-Function Ln(T/Ts) Value 18
-    15.117,                  !- g-Function g Value 18
-    -2.577,                  !- g-Function Ln(T/Ts) Value 19
-    18.006,                  !- g-Function g Value 19
-    -2.171,                  !- g-Function Ln(T/Ts) Value 20
-    22.887,                  !- g-Function g Value 20
-    -1.884,                  !- g-Function Ln(T/Ts) Value 21
-    26.924,                  !- g-Function g Value 21
-    -1.191,                  !- g-Function Ln(T/Ts) Value 22
-    38.004,                  !- g-Function g Value 22
-    -0.497,                  !- g-Function Ln(T/Ts) Value 23
-    49.919,                  !- g-Function g Value 23
-    -0.274,                  !- g-Function Ln(T/Ts) Value 24
-    53.407,                  !- g-Function g Value 24
-    -0.051,                  !- g-Function Ln(T/Ts) Value 25
-    56.632,                  !- g-Function g Value 25
-    0.196,                   !- g-Function Ln(T/Ts) Value 26
-    59.825,                  !- g-Function g Value 26
-    0.419,                   !- g-Function Ln(T/Ts) Value 27
-    62.349,                  !- g-Function g Value 27
-    0.642,                   !- g-Function Ln(T/Ts) Value 28
-    64.524,                  !- g-Function g Value 28
-    0.873,                   !- g-Function Ln(T/Ts) Value 29
-    66.412,                  !- g-Function g Value 29
-    1.112,                   !- g-Function Ln(T/Ts) Value 30
-    67.993,                  !- g-Function g Value 30
-    1.335,                   !- g-Function Ln(T/Ts) Value 31
-    69.162,                  !- g-Function g Value 31
-    1.679,                   !- g-Function Ln(T/Ts) Value 32
-    70.476,                  !- g-Function g Value 32
-    2.028,                   !- g-Function Ln(T/Ts) Value 33
-    71.361,                  !- g-Function g Value 33
-    2.275,                   !- g-Function Ln(T/Ts) Value 34
-    71.79,                   !- g-Function g Value 34
-    3.003,                   !- g-Function Ln(T/Ts) Value 35
-    72.511;                  !- g-Function g Value 35
-
-Pump:ConstantSpeed,
-    Cond Circ Pump,          !- Name
-    Condenser Supply Inlet Node,  !- Inlet Node Name
-    Condenser Pump Outlet Node,  !- Outlet Node Name
-    0.0033,                  !- Design Flow Rate {m3/s}
-    5000,                    !- Design Pump Head {Pa}
-    25,                      !- Design Power Consumption {W}
-    0.87,                    !- Motor Efficiency
-    0.0,                     !- Fraction of Motor Inefficiencies to Fluid Stream
-    CONTINUOUS;              !- Pump Control Type
-
-ZoneControl:Thermostat,
-    Zone 1 Thermostat,       !- Name
-    West Zone,               !- Zone or ZoneList Name
-    Zone Control Type Sched, !- Control Type Schedule Name
-    ThermostatSetpoint:SingleHeating,  !- Control 1 Object Type
-    Heating Setpoint with SB,!- Control 1 Name
-    ThermostatSetpoint:SingleCooling,  !- Control 2 Object Type
-    Cooling Setpoint with SB;!- Control 2 Name
-
-ZoneControl:Thermostat,
-    Zone 2 Thermostat,       !- Name
-    EAST ZONE,               !- Zone or ZoneList Name
-    Zone Control Type Sched, !- Control Type Schedule Name
-    ThermostatSetpoint:SingleHeating,  !- Control 1 Object Type
-    Heating Setpoint with SB,!- Control 1 Name
-    ThermostatSetpoint:SingleCooling,  !- Control 2 Object Type
-    Cooling Setpoint with SB;!- Control 2 Name
-
-ZoneControl:Thermostat,
-    Zone 3 Thermostat,       !- Name
-    NORTH ZONE,              !- Zone or ZoneList Name
-    Zone Control Type Sched, !- Control Type Schedule Name
-    ThermostatSetpoint:SingleHeating,  !- Control 1 Object Type
-    Heating Setpoint with SB,!- Control 1 Name
-    ThermostatSetpoint:SingleCooling,  !- Control 2 Object Type
-    Cooling Setpoint with SB;!- Control 2 Name
-
-ThermostatSetpoint:SingleHeating,
-    Heating Setpoint with SB,!- Name
-    Heating Setpoints;       !- Setpoint Temperature Schedule Name
-
-ThermostatSetpoint:SingleCooling,
-    Cooling Setpoint with SB,!- Name
-    Cooling Setpoints;       !- Setpoint Temperature Schedule Name
-
-AirLoopHVAC:SupplyPath,
-    TermReheatSupplyPath,    !- Name
-    Zone Equipment Inlet Node,  !- Supply Air Path Inlet Node Name
-    AirLoopHVAC:ZoneSplitter,!- Component 1 Object Type
-    Zone Supply Air Splitter;!- Component 1 Name
-
-AirLoopHVAC:ReturnPath,
-    TermReheatReturnPath,    !- Name
-    Return Air Mixer Outlet, !- Return Air Path Outlet Node Name
-    AirLoopHVAC:ZoneMixer,   !- Component 1 Object Type
-    Zone Return Air Mixer;   !- Component 1 Name
-
-ZoneHVAC:EquipmentConnections,
-    West Zone,               !- Zone Name
-    Zone1Equipment,          !- Zone Conditioning Equipment List Name
-    Zone1Inlets,             !- Zone Air Inlet Node or NodeList Name
-    ,                        !- Zone Air Exhaust Node or NodeList Name
-    Zone 1 Node,             !- Zone Air Node Name
-    Zone 1 Outlet Node;      !- Zone Return Air Node or NodeList Name
-
-ZoneHVAC:EquipmentConnections,
-    EAST ZONE,               !- Zone Name
-    Zone2Equipment,          !- Zone Conditioning Equipment List Name
-    Zone2Inlets,             !- Zone Air Inlet Node or NodeList Name
-    ,                        !- Zone Air Exhaust Node or NodeList Name
-    Zone 2 Node,             !- Zone Air Node Name
-    Zone 2 Outlet Node;      !- Zone Return Air Node or NodeList Name
-
-ZoneHVAC:EquipmentConnections,
-    NORTH ZONE,              !- Zone Name
-    Zone3Equipment,          !- Zone Conditioning Equipment List Name
-    Zone3Inlets,             !- Zone Air Inlet Node or NodeList Name
-    ,                        !- Zone Air Exhaust Node or NodeList Name
-    Zone 3 Node,             !- Zone Air Node Name
-    Zone 3 Outlet Node;      !- Zone Return Air Node or NodeList Name
-
-ZoneHVAC:EquipmentList,
-    Zone1Equipment,          !- Name
-    SequentialLoad,          !- Load Distribution Scheme
-    ZoneHVAC:AirDistributionUnit,  !- Zone Equipment 1 Object Type
-    Zone1TermReheat,         !- Zone Equipment 1 Name
-    1,                       !- Zone Equipment 1 Cooling Sequence
-    1;                       !- Zone Equipment 1 Heating or No-Load Sequence
-
-ZoneHVAC:EquipmentList,
-    Zone2Equipment,          !- Name
-    SequentialLoad,          !- Load Distribution Scheme
-    ZoneHVAC:AirDistributionUnit,  !- Zone Equipment 1 Object Type
-    Zone2TermReheat,         !- Zone Equipment 1 Name
-    1,                       !- Zone Equipment 1 Cooling Sequence
-    1;                       !- Zone Equipment 1 Heating or No-Load Sequence
-
-ZoneHVAC:EquipmentList,
-    Zone3Equipment,          !- Name
-    SequentialLoad,          !- Load Distribution Scheme
-    ZoneHVAC:AirDistributionUnit,  !- Zone Equipment 1 Object Type
-    Zone3TermReheat,         !- Zone Equipment 1 Name
-    1,                       !- Zone Equipment 1 Cooling Sequence
-    1;                       !- Zone Equipment 1 Heating or No-Load Sequence
-
-ZoneHVAC:AirDistributionUnit,
-    Zone1TermReheat,         !- Name
-    Zone 1 Reheat Air Outlet Node,  !- Air Distribution Unit Outlet Node Name
-    AirTerminal:SingleDuct:ConstantVolume:Reheat,  !- Air Terminal Object Type
-    Reheat Zone 1;           !- Air Terminal Name
-
-ZoneHVAC:AirDistributionUnit,
-    Zone2TermReheat,         !- Name
-    Zone 2 Reheat Air Outlet Node,  !- Air Distribution Unit Outlet Node Name
-    AirTerminal:SingleDuct:ConstantVolume:Reheat,  !- Air Terminal Object Type
-    Reheat Zone 2;           !- Air Terminal Name
-
-ZoneHVAC:AirDistributionUnit,
-    Zone3TermReheat,         !- Name
-    Zone 3 Reheat Air Outlet Node,  !- Air Distribution Unit Outlet Node Name
-    AirTerminal:SingleDuct:ConstantVolume:Reheat,  !- Air Terminal Object Type
-    Reheat Zone 3;           !- Air Terminal Name
-
-NodeList,
-    Zone1Inlets,             !- Name
-    Zone 1 Reheat Air Outlet Node;  !- Node 1 Name
-
-NodeList,
-    Zone2Inlets,             !- Name
-    Zone 2 Reheat Air Outlet Node;  !- Node 1 Name
-
-NodeList,
-    Zone3Inlets,             !- Name
-    Zone 3 Reheat Air Outlet Node;  !- Node 1 Name
-
-Fan:ConstantVolume,
-    Supply Fan 1,            !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    0.7,                     !- Fan Total Efficiency
-    600.0,                   !- Pressure Rise {Pa}
-    1.3,                     !- Maximum Flow Rate {m3/s}
-    0.9,                     !- Motor Efficiency
-    1.0,                     !- Motor In Airstream Fraction
-    Air Loop Inlet Node,     !- Air Inlet Node Name
-    Cooling Coil Air Inlet Node;  !- Air Outlet Node Name
-
-Coil:Cooling:Water:DetailedGeometry,
-    Detailed Cooling Coil,   !- Name
-    CoolingCoilAvailSched,   !- Availability Schedule Name
-    0.0033,                  !- Maximum Water Flow Rate {m3/s}
-    6.23816,                 !- Tube Outside Surface Area {m2}
-    6.20007018,              !- Total Tube Inside Area {m2}
-    101.7158224,             !- Fin Surface Area {m2}
-    0.810606367,             !- Minimum Airflow Area {m2}
-    0.165097968,             !- Coil Depth {m}
-    0.43507152,              !- Fin Diameter {m}
-    0.001499982,             !- Fin Thickness {m}
-    0.014449958,             !- Tube Inside Diameter {m}
-    0.015879775,             !- Tube Outside Diameter {m}
-    385.764854,              !- Tube Thermal Conductivity {W/m-K}
-    203.882537,              !- Fin Thermal Conductivity {W/m-K}
-    0.001814292,             !- Fin Spacing {m}
-    0.02589977,              !- Tube Depth Spacing {m}
-    6,                       !- Number of Tube Rows
-    16,                      !- Number of Tubes per Row
-    Cooling Coil Water Inlet Node,  !- Water Inlet Node Name
-    Cooling Coil Water Outlet Node,  !- Water Outlet Node Name
-    Cooling Coil Air Inlet Node,  !- Air Inlet Node Name
-    Air Loop Outlet Node;    !- Air Outlet Node Name
-
-AirTerminal:SingleDuct:ConstantVolume:Reheat,
-    Reheat Zone 1,           !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    Zone 1 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    Zone 1 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    0.47,                    !- Maximum Air Flow Rate {m3/s}
-    Coil:Heating:Water,      !- Reheat Coil Object Type
-    Reheat Coil Zone 1,      !- Reheat Coil Name
-    0.0013,                  !- Maximum Hot Water or Steam Flow Rate {m3/s}
-    0.0,                     !- Minimum Hot Water or Steam Flow Rate {m3/s}
-    0.001;                   !- Convergence Tolerance
-
-AirTerminal:SingleDuct:ConstantVolume:Reheat,
-    Reheat Zone 2,           !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    Zone 2 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    Zone 2 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    0.36,                    !- Maximum Air Flow Rate {m3/s}
-    Coil:Heating:Water,      !- Reheat Coil Object Type
-    Reheat Coil Zone 2,      !- Reheat Coil Name
-    0.0012,                  !- Maximum Hot Water or Steam Flow Rate {m3/s}
-    0.0,                     !- Minimum Hot Water or Steam Flow Rate {m3/s}
-    0.001;                   !- Convergence Tolerance
-
-AirTerminal:SingleDuct:ConstantVolume:Reheat,
-    Reheat Zone 3,           !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    Zone 3 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    Zone 3 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    0.47,                    !- Maximum Air Flow Rate {m3/s}
-    Coil:Heating:Water,      !- Reheat Coil Object Type
-    Reheat Coil Zone 3,      !- Reheat Coil Name
-    0.0013,                  !- Maximum Hot Water or Steam Flow Rate {m3/s}
-    0.0,                     !- Minimum Hot Water or Steam Flow Rate {m3/s}
-    0.001;                   !- Convergence Tolerance
-
-Coil:Heating:Water,
-    Reheat Coil Zone 1,      !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    400.0,                   !- U-Factor Times Area Value {W/K}
-    0.0013,                  !- Maximum Water Flow Rate {m3/s}
-    Zone 1 Reheat Water Inlet Node,  !- Water Inlet Node Name
-    Zone 1 Reheat Water Outlet Node,  !- Water Outlet Node Name
-    Zone 1 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    Zone 1 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    UFactorTimesAreaAndDesignWaterFlowRate,  !- Performance Input Method
-    autosize,                !- Rated Capacity {W}
-    82.2,                    !- Rated Inlet Water Temperature {C}
-    16.6,                    !- Rated Inlet Air Temperature {C}
-    71.1,                    !- Rated Outlet Water Temperature {C}
-    32.2,                    !- Rated Outlet Air Temperature {C}
-    ;                        !- Rated Ratio for Air and Water Convection
-
-Coil:Heating:Water,
-    Reheat Coil Zone 2,      !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    400.0,                   !- U-Factor Times Area Value {W/K}
-    0.0012,                  !- Maximum Water Flow Rate {m3/s}
-    Zone 2 Reheat Water Inlet Node,  !- Water Inlet Node Name
-    Zone 2 Reheat Water Outlet Node,  !- Water Outlet Node Name
-    Zone 2 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    Zone 2 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    UFactorTimesAreaAndDesignWaterFlowRate,  !- Performance Input Method
-    autosize,                !- Rated Capacity {W}
-    82.2,                    !- Rated Inlet Water Temperature {C}
-    16.6,                    !- Rated Inlet Air Temperature {C}
-    71.1,                    !- Rated Outlet Water Temperature {C}
-    32.2,                    !- Rated Outlet Air Temperature {C}
-    ;                        !- Rated Ratio for Air and Water Convection
-
-Coil:Heating:Water,
-    Reheat Coil Zone 3,      !- Name
-    FanAndCoilAvailSched,    !- Availability Schedule Name
-    400.0,                   !- U-Factor Times Area Value {W/K}
-    0.0018,                  !- Maximum Water Flow Rate {m3/s}
-    Zone 3 Reheat Water Inlet Node,  !- Water Inlet Node Name
-    Zone 3 Reheat Water Outlet Node,  !- Water Outlet Node Name
-    Zone 3 Reheat Air Inlet Node,  !- Air Inlet Node Name
-    Zone 3 Reheat Air Outlet Node,  !- Air Outlet Node Name
-    UFactorTimesAreaAndDesignWaterFlowRate,  !- Performance Input Method
-    autosize,                !- Rated Capacity {W}
-    82.2,                    !- Rated Inlet Water Temperature {C}
-    16.6,                    !- Rated Inlet Air Temperature {C}
-    71.1,                    !- Rated Outlet Water Temperature {C}
-    32.2,                    !- Rated Outlet Air Temperature {C}
-    ;                        !- Rated Ratio for Air and Water Convection
-
-AirLoopHVAC:ZoneSplitter,
-    Zone Supply Air Splitter,!- Name
-    Zone Equipment Inlet Node,  !- Inlet Node Name
-    Zone 1 Reheat Air Inlet Node,  !- Outlet 1 Node Name
-    Zone 2 Reheat Air Inlet Node,  !- Outlet 2 Node Name
-    Zone 3 Reheat Air Inlet Node;  !- Outlet 3 Node Name
-
-AirLoopHVAC:ZoneMixer,
-    Zone Return Air Mixer,   !- Name
-    Return Air Mixer Outlet, !- Outlet Node Name
-    Zone 1 Outlet Node,      !- Inlet 1 Node Name
-    Zone 2 Outlet Node,      !- Inlet 2 Node Name
-    Zone 3 Outlet Node;      !- Inlet 3 Node Name
-
-Controller:WaterCoil,
-    Main Cooling Coil Controller,  !- Name
-    Temperature,             !- Control Variable
-    Reverse,                 !- Action
-    FLOW,                    !- Actuator Variable
-    Air Loop Outlet Node,    !- Sensor Node Name
-    Cooling Coil Water Inlet Node,  !- Actuator Node Name
-    0.001,                   !- Controller Convergence Tolerance {deltaC}
-    0.0033,                  !- Maximum Actuated Flow {m3/s}
-    0.0;                     !- Minimum Actuated Flow {m3/s}
-
-SetpointManager:Scheduled,
-    Supply Air Temp Manager, !- Name
-    Temperature,             !- Control Variable
-    Seasonal Reset Supply Air Temp Sch,  !- Schedule Name
-    Supply Air Temp Nodes;   !- Setpoint Node or NodeList Name
-
-NodeList,
-    Supply Air Temp Nodes,   !- Name
-    Air Loop Outlet Node;    !- Node 1 Name
-
-Output:Variable,*,Water to Water Heat Pump Electric Power,timestep;
-Output:Variable,*,Water to Water Heat Pump Load Side Heat Transfer Rate,timestep;
-Output:Variable,*,Water to Water Heat Pump Source Side Heat Transfer Rate,timestep;
-Output:Variable,*,Water to Water Heat Pump Load Side Inlet Temperature,timestep;
-Output:Variable,*,Water to Water Heat Pump Load Side Outlet Temperature,timestep;
-Output:Variable,*,Water to Water Heat Pump Source Side Inlet Temperature,timestep;
-Output:Variable,*,Water to Water Heat Pump Source Side Outlet Temperature,timestep;
-Output:Meter:MeterFileOnly,Electricity:Facility,monthly;
-Output:Meter:MeterFileOnly,Electricity:Building,monthly;
-Output:Meter:MeterFileOnly,InteriorLights:Electricity,monthly;
-Output:Meter:MeterFileOnly,Electricity:HVAC,monthly;
-Output:Meter:MeterFileOnly,Electricity:Plant,monthly;
-Output:Meter:MeterFileOnly,Electricity:Facility,runperiod;
-Output:Meter:MeterFileOnly,Electricity:Building,runperiod;
-Output:Meter:MeterFileOnly,InteriorLights:Electricity,runperiod;
-Output:Meter:MeterFileOnly,Electricity:HVAC,runperiod;
-Output:Meter:MeterFileOnly,Electricity:Plant,runperiod;
-
-OutputControl:Table:Style,
-    HTML;                    !- Column Separator
-
-Output:Table:SummaryReports,
-    AllSummary;              !- Report 1 Name
-
-=======
 !-Generator IDFEditor 1.50
 !-Option OriginalOrderTop UseSpecialFormat
 !-NOTE: All comments with '!-' are ignored by the IDFEditor and are generated automatically.
@@ -4505,4 +2289,3 @@ Output:Table:SummaryReports,
 !
 ! Output:Table:SummaryReports,
 !     AllSummary;              !- Report 1 Name
->>>>>>> master
diff --git a/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/energyplus_to_modelica_data.py b/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/energyplus_to_modelica_data.py
deleted file mode 100644
index 1cb10324a27..00000000000
--- a/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/energyplus_to_modelica_data.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-import os
-
-import pandas as pd
-
-def energyplus_to_modelica_data(file_path, timestep, data_type, file_name):
-    '''
-    Parameters:
-    file_path: the file path of the existing energyplus data
-    time_step: the time step of the energyplus data
-    data_type: specify the data type such as float, double etc.
-    file_name: the file name of the modelica data
-    '''
-    # read the existing energyplus data
-    energyplus_data = pd.read_csv(file_path)
-    # get the dimension of the matrix
-    size = energyplus_data.shape
-    # create a new index for modelica
-    energyplus_data.index = (energyplus_data.index)*timestep
-    energyplus_data.index.name = '# time'
-    energyplus_data.drop(['Date/Time'], axis=1, inplace=True)
-
-    # write to csv for modelica
-    file = file_name + '.csv'
-    with open(file,'w') as f:
-        line1 = '#1'
-        line2 = data_type + ' ' + file_name + '(' + str(size[0]) + ',' + str(size[1]) + ')'
-        f.write('{}\n{}\n'.format(line1,line2))
-        energyplus_data.to_csv(f, header=True)
-
-file_path = os.path.abspath('GSHPSimple-GLHE-ReverseHeatPump.csv')
-timestep =  60
-data_type = 'float'
-file_name = 'modelica'
-energyplus_to_modelica_data(file_path, timestep, data_type, file_name)
diff --git a/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/modelica.csv b/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/modelica.csv
deleted file mode 100644
index 5e29f575b6d..00000000000
--- a/Buildings/Resources/Data/Fluid/HeatPumps/Validation/EquationFitReversible_EnergyPlus/modelica.csv
+++ /dev/null
@@ -1,2883 +0,0 @@
-#1
-float modelica(2880,15)
-# time,GSHPCLG:Water to Water Heat Pump Electric Power [W](TimeStep),GSHPCLG:Water to Water Heat Pump Load Side Heat Transfer Rate [W](TimeStep),GSHPCLG:Water to Water Heat Pump Source Side Heat Transfer Rate [W](TimeStep),GSHPCLG:Water to Water Heat Pump Load Side Outlet Temperature [C](TimeStep),GSHPCLG:Water to Water Heat Pump Load Side Inlet Temperature [C](TimeStep),GSHPCLG:Water to Water Heat Pump Source Side Outlet Temperature [C](TimeStep),GSHPCLG:Water to Water Heat Pump Source Side Inlet Temperature [C](TimeStep),GSHPHEATING:Water to Water Heat Pump Electric Power [W](TimeStep),GSHPHEATING:Water to Water Heat Pump Load Side Heat Transfer Rate [W](TimeStep),GSHPHEATING:Water to Water Heat Pump Source Side Heat Transfer Rate [W](TimeStep),GSHPHEATING:Water to Water Heat Pump Load Side Outlet Temperature [C](TimeStep),GSHPHEATING:Water to Water Heat Pump Load Side Inlet Temperature [C](TimeStep),GSHPHEATING:Water to Water Heat Pump Source Side Outlet Temperature [C](TimeStep),GSHPHEATING:Water to Water Heat Pump Source Side Inlet Temperature [C](TimeStep) 
-0,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.850201293292908,12.850201293292908,1402.8129605371985,4055.117287939963,2652.304327402764,55.28751201777256,54.77452377029454,12.515048565761363,12.850201293292908
-60,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.866819725882499,12.866819725882499,1404.1611857138184,4060.2261357230745,2656.064950009257,55.28787424819449,54.774239697474044,12.53119019703253,12.866819725882499
-120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902710971732668,12.902710971732668,1404.6795229774302,4064.316346989697,2659.636824012268,55.288164254686784,54.77401226499665,12.566626631900007,12.902710971732668
-180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93680065990689,12.93680065990689,1404.455976819523,4066.1223702980933,2661.666393478569,55.28829230638559,54.77391184271006,12.600456568310607,12.93680065990689
-240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.96243149278323,12.96243149278323,1405.1952466545029,4070.1174448649385,2664.922198210436,55.28857556745896,54.77368970020853,12.625673504733305,12.96243149278323
-300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.982162530541848,12.982162530541848,1406.4629003485015,4075.2257554819757,2668.762855133475,55.28893775985221,54.77340565721134,12.644917303637992,12.982162530541848
-360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998205506862712,12.998205506862712,1407.6393862203415,4079.805168566105,2672.165782345763,55.289262452063475,54.77315102307056,12.660528707663744,12.998205506862712
-420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01161409449102,13.01161409449102,1408.2036617251347,4082.4147402067492,2674.211078481615,55.289447477437534,54.77300592018385,12.67367753634785,13.01161409449102
-480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022911483312384,13.022911483312384,1409.1110462247661,4085.8712030788756,2676.7601568541104,55.28969254959668,54.77281372666485,12.684651706335025,13.022911483312384
-540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.032444184002365,13.032444184002365,1410.2416399887854,4089.8509179216744,2679.6092779328883,55.28997472168531,54.772592438180396,12.693823441094693,13.032444184002365
-600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04048655776286,13.04048655776286,1411.2875878474335,4093.4774803147357,2682.189892467302,55.2902318543611,54.77239078641391,12.701538922831455,13.04048655776286
-660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.047266425490664,13.047266425490664,1412.230232915189,4096.71271634503,2684.482483429841,55.290461240991604,54.77221089399414,12.708028417314505,13.047266425490664
-720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.052973879691153,13.052973879691153,1413.1039984432055,4099.670349021512,2686.566350578307,55.29067094483079,54.77204643745635,12.713471977957461,13.052973879691153
-780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.057768650411715,13.057768650411715,1414.7625077873197,4104.847828109222,2690.0853203219017,55.29103804156245,54.77175854831825,12.717821588687256,13.057768650411715
-840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.061786040020225,13.061786040020225,1416.3076824665534,4109.639626929021,2693.331944462467,55.291377792578146,54.77149210457565,12.721428309367278,13.061786040020225
-900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.065141443303794,13.065141443303794,1417.1002847752225,4112.191890525788,2695.091605750566,55.291558754721116,54.771350188206256,12.72456101585876,13.065141443303794
-960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.067932788711795,13.067932788711795,1418.1306699133233,4115.396096822259,2697.2654269089358,55.291785941308135,54.77117202113179,12.727077381450247,13.067932788711795
-1020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.070244384693188,13.070244384693188,1419.6184409383088,4119.898131881595,2700.2796909432864,55.292105147353894,54.770921689419566,12.729007836623936,13.070244384693188
-1080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.072148530186865,13.072148530186865,1420.961501638646,4123.949303454614,2702.987801815968,55.292392386013795,54.77069642756594,12.730569569540632,13.072148530186865
-1140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.073707505466066,13.073707505466066,1422.2933745227704,4127.943010205024,2705.649635682253,55.29267555027961,54.77047436098404,12.7317920137605,13.073707505466066
-1200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.074974694459529,13.074974694459529,1423.378895404203,4131.197942893145,2707.8190474889416,55.292906333538866,54.77029337328278,12.732784927874965,13.074974694459529
-1260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.075995786321686,13.075995786321686,1424.3724931919448,4134.167252294212,2709.794759102267,55.29311686536539,54.770128267410534,12.733556246903575,13.075995786321686
-1320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.076809880819647,13.076809880819647,1426.1943142512866,4139.534623510702,2713.340309259416,55.29349742608281,54.76982981937904,12.733922206599527,13.076809880819647
-1380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07745092992326,13.07745092992326,1427.5639500123145,4143.572043596557,2716.008093584243,55.29378368978608,54.769605322117975,12.734226061932128,13.07745092992326
-1440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.077947481991465,13.077947481991465,1428.4646085100885,4146.232566474871,2717.7679579647825,55.29397232786254,54.7694573860331,12.734500169169884,13.077947481991465
-1500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.078324192279055,13.078324192279055,1430.1322681658123,4151.119166693552,2720.98689852774,55.29431880069696,54.76918567082271,12.734470061292045,13.078324192279055
-1560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.078594466539792,13.078594466539792,1431.12043755676,4154.018217361137,2722.897779804377,55.294524351038426,54.769024471592274,12.734498828715317,13.078594466539792
-1620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.078742906604056,13.078742906604056,1432.044708503415,4156.722184476045,2724.6774759726304,55.29471606944699,54.76887411981128,12.734422351936917,13.078742906604056
-1680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07876051712034,13.07876051712034,1434.0367732232598,4162.527869319698,2728.4910960964376,55.29512770785156,54.76855129965168,12.7339580292522,13.07876051712034
-1740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07867447312952,13.07867447312952,1435.458861933263,4166.665197310756,2731.206335377493,55.295421055359974,54.76832124704135,12.733528865931063,13.07867447312952
-1800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.078516834331575,13.078516834331575,1436.4509127567994,4169.544226661547,2733.093313904748,55.295625186170966,54.76816116105264,12.733132783143832,13.078516834331575
-1860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.078309578503784,13.078309578503784,1438.0135942556715,4174.082307102105,2736.0687128464333,55.29594694811376,54.76790882492323,12.732549543368926,13.078309578503784
-1920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.078067016821933,13.078067016821933,1439.4136099963919,4178.143808063192,2738.730198066801,55.296234919320256,54.76768298858287,12.731970670908877,13.078067016821933
-1980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.077799495953007,13.077799495953007,1440.6872133612296,4181.835117416406,2741.147904055177,55.29649664296922,54.76747773642663,12.731397648433662,13.077799495953007
-2040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.077515376148524,13.077515376148524,1442.1395006776108,4186.045845293155,2743.906344615545,55.29679519478527,54.76724360242981,12.730764969723351,13.077515376148524
-2100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07722134684011,13.07722134684011,1443.1367735609404,4188.929991635685,2745.793218074745,55.29699968844671,54.76708323188205,12.730232523417616,13.07722134684011
-2160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.076922465251595,13.076922465251595,1444.3006215200296,4192.299136551629,2747.9985150315993,55.29723856980737,54.76689589338759,12.729654985840547,13.076922465251595
-2220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.076623087366027,13.076623087366027,1446.009024359272,4197.254978244225,2751.245953884953,55.297589952217066,54.76662032792936,12.72894525550097,13.076623087366027
-2280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.076326601502835,13.076326601502835,1447.5455281985805,4201.710137837891,2754.16460963931,55.29790583494477,54.7663726024707,12.728279965626626,13.076326601502835
-2340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.076035699171815,13.076035699171815,1448.5721854342214,4204.680079016513,2756.107893582293,55.29811641172388,54.766207461345175,12.727743517525921,13.076035699171815
-2400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.075751863896432,13.075751863896432,1450.119374949733,4209.167291205125,2759.047916255392,55.298434567091455,54.76595795360878,12.727088176930408,13.075751863896432
-2460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.075476584423802,13.075476584423802,1451.7976713185142,4214.037161566423,2762.2394902479077,55.29877985396596,54.76568716846653,12.726409602549095,13.075476584423802
-2520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.075210763887787,13.075210763887787,1453.328516469032,4218.478076075421,2765.149559606389,55.29909472673525,54.76544023504995,12.725776060241667,13.075210763887787
-2580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07495495128391,13.07495495128391,1454.3779953741625,4221.517079738207,2767.1390843640447,55.29931020026785,54.76527125373186,12.725268855048585,13.07495495128391
-2640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07470900433938,13.07470900433938,1455.666972124872,4225.254681427453,2769.58770930258,55.29957520628884,54.765063427433226,12.724713497623597,13.07470900433938
-2700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07447294935522,13.07447294935522,1457.1534831578444,4229.568612272432,2772.4151291145868,55.299881075611495,54.7648235548109,12.72412016253426,13.07447294935522
-2760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.074246357602195,13.074246357602195,1458.5221136921975,4233.539754317578,2775.017640625381,55.30016264029683,54.764602742671784,12.723564711651433,13.074246357602195
-2820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.074029142323587,13.074029142323587,1460.5406995795825,4239.405524069732,2778.8648244901487,55.30057853922017,54.764276581275475,12.722861345910857,13.074029142323587
-2880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07382103421686,13.07382103421686,1461.7971094826,4243.051047166693,2781.253937684093,55.30083701667015,54.76407387489353,12.722351344254268,13.07382103421686
-2940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.073621335423894,13.073621335423894,1462.9487646902508,4246.391947688324,2783.4431829980736,55.30107389556422,54.763888106798184,12.721875008591235,13.073621335423894
-3000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.073429314273925,13.073429314273925,1464.5318855964304,4250.990699410311,2786.458813813881,55.30139995952842,54.763632396884354,12.721301918722775,13.073429314273925
-3060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.073244343284507,13.073244343284507,1465.9610455408356,4255.141348473019,2789.1803029321836,55.30169425181296,54.76340160335001,12.720773049302885,13.073244343284507
-3120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.073065826484077,13.073065826484077,1467.6094059995976,4259.931238082625,2792.321832083027,55.30203386800349,54.76313526534165,12.720197552611268,13.073065826484077
-3180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.072893353237795,13.072893353237795,1469.0830574831696,4264.212489836069,2795.1294323528996,55.30233742040237,54.762897209725935,12.719670297799794,13.072893353237795
-3240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.072726411499984,13.072726411499984,1470.3746071580993,4267.963516202335,2797.588909044236,55.30260337838988,54.76268863686437,12.719192566663356,13.072726411499984
-3300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.072564187366885,13.072564187366885,1471.8892727207324,4272.365071236014,2800.475798515281,55.30291546064554,54.7624438918589,12.718665540145311,13.072564187366885
-3360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.072406176486853,13.072406176486853,1473.7999639770896,4277.920998345055,2804.121034367965,55.303309391050355,54.762134958885824,12.718046893576055,13.072406176486853
-3420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.072252120568194,13.072252120568194,1475.2055001208441,4282.005186573222,2806.799686452378,55.30359897116417,54.76190786078826,12.717554349657572,13.072252120568194
-3480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.072101286321132,13.072101286321132,1476.8090944564829,4286.666787484539,2809.857693028056,55.30392949143156,54.76164865609724,12.717017087750644,13.072101286321132
-3540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.071953271306722,13.071953271306722,1478.5171879863296,4291.633139848382,2813.115951862052,55.30428161942932,54.76137250592473,12.716457338768885,13.071953271306722
-3600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.071807672948303,13.071807672948303,1479.8369016672973,4295.4679051330395,2815.6310034657427,55.304553514813655,54.761159276764396,12.715993925977811,13.071807672948303
-3660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.071663859053428,13.071663859053428,1481.8146926464751,4301.220547027309,2819.4058543808337,55.30496139293461,54.76083940554091,12.715373095562905,13.071663859053428
-3720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.071521629473295,13.071521629473295,1483.3403422224899,4305.655723403466,2822.315381180976,55.30527585914643,54.76059279095986,12.714863201094635,13.071521629473295
-3780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.071380517130153,13.071380517130153,1484.732945031331,4309.7032760273405,2824.970330996009,55.3055628417803,54.760367729890135,12.714386594890849,13.071380517130153
-3840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07124017197132,13.07124017197132,1486.2226107620481,4314.033757654594,2827.811146892547,55.30586988487378,54.76012693675873,12.713887267764845,13.07124017197132
-3900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.071100163460953,13.071100163460953,1487.8844565734335,4318.866047975281,2830.9815914018463,55.306212507604634,54.75985824092417,12.713346621834669,13.071100163460953
-3960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.070960280824373,13.070960280824373,1489.9691695330457,4324.93070313195,2834.961533598905,55.30664250843114,54.759521020358974,12.712703804893147,13.070960280824373
-4020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07082054605817,13.07082054605817,1491.2905551886913,4328.770871460507,2837.480316271816,55.30691478700256,54.75930749069096,12.712245783799036,13.07082054605817
-4080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.070670663794775,13.070670663794775,1492.4551892291406,4332.153455227412,2839.6982659982723,55.30715462157029,54.759119404660645,12.711815632786484,13.070670663794775
-4140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.07049899291774,13.07049899291774,1494.4028306105083,4337.81627784898,2843.4134472384717,55.307556131414394,54.75880452764597,12.711174489044886,13.07049899291774
-4200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.070307584363734,13.070307584363734,1496.1976175461114,4343.032146027636,2846.8345284815255,55.307925950969135,54.758514503181885,12.710550775364965,13.070307584363734
-4260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.070103367686817,13.070103367686817,1498.267454691203,4349.048631254071,2850.781176562866,55.308352536523856,54.75817996098336,12.709847838624096,13.070103367686817
-4320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.069891422681332,13.069891422681332,1499.8596518617392,4353.672537175072,2853.812885313332,55.30868038434692,54.75792285210968,12.7092527960302,13.069891422681332
-4380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.069674090009284,13.069674090009284,1501.685897613623,4358.978134290031,2857.292236676409,55.309056565996315,54.757627838285046,12.708595797420688,13.069674090009284
-4440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.069452932336139,13.069452932336139,1503.842545048931,4365.246363333438,2861.403818284507,55.30950100096457,54.75727929799874,12.707855078827274,13.069452932336139
-4500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.069229050755204,13.069229050755204,1505.2619428568246,4369.365766612078,2864.1038237552534,55.309793078193074,54.75705024158303,12.707290018651063,13.069229050755204
-4560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.069003231675703,13.069003231675703,1507.3325248184174,4375.3828349866135,2868.050310168197,55.3102197052141,54.75671566686529,12.706565502463414,13.069003231675703
-4620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.068776412336602,13.068776412336602,1508.9355020715052,4380.037043488208,2871.1015414167027,55.31054970166709,54.75645687296648,12.70595312026285,13.068776412336602
-4680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.068548955278775,13.068548955278775,1510.7635096929491,4385.347042933365,2874.5835332404163,55.31092619555955,54.756161614270724,12.705285664921105,13.068548955278775
-4740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.068321417685931,13.068321417685931,1512.8661319023745,4391.4573991106345,2878.591267208261,55.311359437021245,54.75582185229454,12.704551690682935,13.068321417685931
-4800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06809437908283,13.06809437908283,1514.7345529736501,4396.885238350381,2882.150685376731,55.31174428613351,54.755520041165006,12.703874869446958,13.06809437908283
-4860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.067868053900005,13.067868053900005,1516.5078274320285,4402.035839123066,2885.528011691037,55.31210947827698,54.7552336456666,12.70322177269577,13.067868053900005
-4920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06764252674009,13.06764252674009,1518.1753944561015,4406.878424002143,2888.7030295460413,55.31245283124181,54.754964377158906,12.702595039805392,13.06764252674009
-4980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.067418038897195,13.067418038897195,1520.4084338485484,4413.3691810624605,2892.960747213913,55.31291304430376,54.754603463180864,12.701832524626989,13.067418038897195
-5040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.067194770405314,13.067194770405314,1522.4159603219248,4419.202789208308,2896.786828886384,55.31332666367328,54.754279089484456,12.701125774886188,13.067194770405314
-5100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.066972785147623,13.066972785147623,1524.0388248515853,4423.91538940882,2899.876564557234,55.31366080041751,54.75401704863524,12.70051336086452,13.066972785147623
-5160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.066752088803806,13.066752088803806,1526.2961122433085,4430.477175480897,2904.181063237589,55.31412604972206,54.753652185072745,12.699748725231723,13.066752088803806
-5220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.066532829056756,13.066532829056756,1528.6092171381094,4437.201788918096,2908.5925717799873,55.31460284398384,54.75327826758114,12.69897200320398,13.066532829056756
-5280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06631497426722,13.06631497426722,1530.406681398012,4442.423637825945,2912.0169564279327,55.31497308798024,54.752987910256174,12.698321429567184,13.06631497426722
-5340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.066098609665904,13.066098609665904,1532.6755949128296,4449.019725727456,2916.344130814627,55.315440769474236,54.752621139291975,12.697558259874857,13.066098609665904
-5400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.065883679269849,13.065883679269849,1534.7058496777172,4454.920342056183,2920.214492378465,55.315859140072824,54.75229303952796,12.696854252040948,13.065883679269849
-5460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06567008636919,13.06567008636919,1536.6896614386656,4460.6857156795095,2923.996054240844,55.31626792160157,54.751972459822845,12.696162803297089,13.06567008636919
-5520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.065457698976457,13.065457698976457,1539.115265709203,4467.738904757289,2928.6236390480867,55.31676801297442,54.75158027198272,12.69536564752856,13.065457698976457
-5580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.065246533464846,13.065246533464846,1541.3501659410085,4474.236374199505,2932.8862082584965,55.31722870226146,54.75121898453355,12.694615840835304,13.065246533464846
-5640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.065036721118648,13.065036721118648,1543.3159128558807,4479.949459438257,2936.6335465823768,55.31763377647683,54.75090131222356,12.693932497279135,13.065036721118648
-5700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06482797376508,13.06482797376508,1545.742351057222,4487.005466795261,2941.263115738039,55.31813406777629,54.750508967594534,12.693138730602046,13.06482797376508
-5760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06462057864381,13.06462057864381,1548.08818386927,4493.82667065382,2945.738486784551,55.31861771086526,54.750129679030984,12.692365802192462,13.06462057864381
-5820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.064414295913448,13.064414295913448,1550.2208750112118,4500.026723218213,2949.8058482070005,55.31905731256078,54.74978492915358,12.691645546545153,13.064414295913448
-5880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.064209085741426,13.064209085741426,1552.4298846018353,4506.449345049299,2954.019460447464,55.319512695092925,54.74942780343336,12.690907881598964,13.064209085741426
-5940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06400474518813,13.06400474518813,1554.7315190766556,4513.142057354233,2958.4105382775774,55.319987227856785,54.74905565948161,12.690148659809685,13.06400474518813
-6000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.063801270157034,13.063801270157034,1557.1421437727633,4520.152570858597,2963.0104270858337,55.320484293686036,54.7486658443707,12.689363915949741,13.063801270157034
-6060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.063598596898009,13.063598596898009,1559.5048545969712,4527.023522102248,2967.518667505276,55.320971464180424,54.748283789501656,12.688591555503116,13.063598596898009
-6120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.063396809781988,13.063396809781988,1561.9241286751867,4534.05946256725,2972.135333892063,55.32147033292896,54.7478925604831,12.687806379319206,13.063396809781988
-6180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.063195720983765,13.063195720983765,1564.4080261885085,4541.2838776256895,2976.8758514371816,55.32198256511603,54.74749085142353,12.687006250304954,13.063195720983765
-6240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06299530681888,13.06299530681888,1566.6848480374233,4547.904759646895,2981.2199116094735,55.322452005077636,54.747122701412145,12.686256896457891,13.06299530681888
-6300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.062795468508007,13.062795468508007,1569.0476257180817,4554.776287876121,2985.72866215804,55.322939216625784,54.74674061434742,12.685487306452815,13.062795468508007
-6360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.062596130631128,13.062596130631128,1571.938451694543,4563.187201596204,2991.2487499016606,55.32353557517822,54.746272930669356,12.684590413666289,13.062596130631128
-6420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.062397387907744,13.062397387907744,1574.2394218900065,4569.8787332005495,2995.6393113105432,55.32401002451327,54.745900852145205,12.683836854892034,13.062397387907744
-6480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06219909401784,13.06219909401784,1576.6297186943516,4576.830736428379,3000.2010177340276,55.32450294209074,54.745514290227604,12.683062117280405,13.06219909401784
-6540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.062001230037449,13.062001230037449,1579.1072695955413,4584.037175449657,3004.929905854117,55.325013899956495,54.74511358053204,12.682266682759506,13.062001230037449
-6600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.061803511424463,13.061803511424463,1581.3576983023772,4590.5815650946315,3009.223866792255,55.32547791659497,54.74474968366618,12.681526355627877,13.061803511424463
-6660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.061605980343135,13.061605980343135,1584.1525125427895,4598.713010313206,3014.560497770416,55.326054460226324,54.74429753949057,12.680654453331316,13.061605980343135
-6720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.061408650886413,13.061408650886413,1586.6616439693923,4606.0116966790365,3019.3500527096444,55.32657195882264,54.74389170034241,12.679851886984071,13.061408650886413
-6780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.06121149796662,13.06121149796662,1589.2806943814887,4613.630890346692,3024.3501959652012,55.32711218238387,54.743468039541284,12.679022885074382,13.06121149796662
-6840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.061014648579615,13.061014648579615,1592.15407850888,4621.991627661624,3029.837549152745,55.327704983652296,54.74300314560048,12.678132617781744,13.061014648579615
-6900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.060818044189372,13.060818044189372,1594.4056748119067,4628.539723204202,3034.1340483922963,55.32816926323734,54.74263904252342,12.677393084315831,13.060818044189372
-6960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.060621503508735,13.060621503508735,1597.3720556550988,4637.171726727168,3039.799671072069,55.328781298188744,54.74215906490593,12.676480597844437,13.060621503508735
-7020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.060425244968794,13.060425244968794,1600.0092037248064,4644.843978793555,3044.834775068749,55.32932528392915,54.74173245368212,12.675648072499554,13.060425244968794
-7080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.060229081432507,13.060229081432507,1602.3759747704005,4651.728024085779,3049.352049315379,55.32981338347708,54.74134967021922,12.674881080599674,13.060229081432507
-7140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.060032918764849,13.060032918764849,1605.2958320346615,4660.224618467945,3054.928786433284,55.330415817662214,54.740877221833365,12.6739802048367,13.060032918764849
-7200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.059836753858821,13.059836753858821,1607.938344220001,4667.91268343812,3059.974339218119,55.330960924718724,54.740449731237184,12.673146452912269,13.059836753858821
-7260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.059640670466495,13.059640670466495,1610.6107264136886,4675.687898001155,3065.0771715874657,55.33151221099028,54.74001739470057,12.67230554411833,13.059640670466495
-7320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.059444645395635,13.059444645395635,1613.364287686877,4683.699858575257,3070.33557088838,55.33208028331904,54.739571893994615,12.671445034652598,13.059444645395635
-7380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.059248539201246,13.059248539201246,1616.6038725200904,4693.128931535609,3076.5250590155188,55.332748833280284,54.73904759547729,12.670466782063034,13.059248539201246
-7440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.059052754859428,13.059052754859428,1619.212051634754,4700.717170357549,3081.505118722794,55.333286862549,54.73862565551136,12.669641687344185,13.059052754859428
-7500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.058857005240116,13.058857005240116,1621.8833813377973,4708.4895924232615,3086.606211085463,55.333837951016285,54.738193474099276,12.668801332469066,13.058857005240116
-7560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.058661310066672,13.058661310066672,1624.8949433471905,4717.254096280062,3092.359152932872,55.33445938116775,54.73770612846181,12.66787865762816,13.058661310066672
-7620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.058465586589833,13.058465586589833,1627.331883471372,4724.343225987944,3097.0113425165723,55.33496202220614,54.73731194109146,12.667095057060845,13.058465586589833
-7680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.058269683280027,13.058269683280027,1630.2916497775273,4732.956828063463,3102.665178285936,55.33557275306189,54.73683298618799,12.66618469833523,13.058269683280027
-7740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.058073769441451,13.058073769441451,1632.940786429338,4740.664768155395,3107.723981726058,55.336119269747435,54.73640439011509,12.665349523621002,13.058073769441451
-7800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.057877516188064,13.057877516188064,1635.984380666634,4749.5229131921005,3113.5385325254656,55.336747339560425,54.73591183744018,12.664418505529966,13.057877516188064
-7860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.05768142363694,13.05768142363694,1639.153231713594,4758.746389545803,3119.593157832209,55.337401312553816,54.73539897065282,12.663457309903517,13.05768142363694
-7920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.057485260500135,13.057485260500135,1642.0360072244096,4767.135777898597,3125.099770674187,55.33799614618456,54.734932482867706,12.662565296314517,13.057485260500135
-7980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.057289312833689,13.057289312833689,1644.9014520145447,4775.474720284279,3130.5732682697344,55.33858740309251,54.734468800064384,12.661677683034856,13.057289312833689
-8040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.057093213674097,13.057093213674097,1647.2124154080454,4782.196859162578,3134.984443754533,55.33906402364972,54.73409501879753,12.660924164363015,13.057093213674097
-8100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.056896763666579,13.056896763666579,1650.159760695667,4790.774703871354,3140.614943175687,55.339672219572364,54.733618051870636,12.660016208574346,13.056896763666579
-8160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.056700150449956,13.056700150449956,1653.5572203517138,4800.6651707829205,3147.1079504312056,55.340373484568865,54.73306809716385,12.658999094279473,13.056700150449956
-8220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.056503466375963,13.056503466375963,1656.7227147421731,4809.879308380563,3153.15659363839,55.34102679577086,54.732555749374725,12.658038063654068,13.056503466375963
-8280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.056306960522205,13.056306960522205,1659.2349968392632,4817.188697556789,3157.953700717525,55.34154505439221,54.73214931419034,12.65723536832476,13.056306960522205
-8340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.056110333694185,13.056110333694185,1661.9775474350934,4825.169624320682,3163.192076885589,55.342110927181075,54.731705538434774,12.656376788794336,13.056110333694185
-8400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.055913427722144,13.055913427722144,1665.0573636398672,4834.134122796231,3169.076759156365,55.34274653835258,54.731207071582425,12.655436256332345,13.055913427722144
-8460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.055716334759405,13.055716334759405,1668.1795028344882,4843.222114932639,3175.042612098151,55.34339090567539,54.73070173787283,12.654485279423849,13.055716334759405
-8520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0555192274791,13.0555192274791,1671.7279621944167,4853.553464691292,3181.825502496875,55.34412343105311,54.73012726776333,12.653431039030144,13.0555192274791
-8580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.055322304976436,13.055322304976436,1674.115511546698,4860.499367617936,3186.383856071238,55.344615917586935,54.729741043884104,12.65265809882122,13.055322304976436
-8640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.055125199402399,13.055125199402399,1677.1028189324359,4869.194396546164,3192.091577613728,55.34523242274973,54.72925756058216,12.651739729688359,13.055125199402399
-8700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.054927980890627,13.054927980890627,1680.8274763796328,4880.039896113912,3199.212419734279,55.34600140318975,54.72865450123293,12.650642671295564,13.054927980890627
-8760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.05473087540495,13.05473087540495,1683.4121309320249,4887.56080025424,3204.148669322215,55.346534659284046,54.72823630454487,12.649821793531144,13.05473087540495
-8820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.05453353777405,13.05453353777405,1686.5399356633206,4896.6658131527,3210.12587748938,55.34718023379948,54.72773002411577,12.648869137526114,13.05453353777405
-8880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.054336251436037,13.054336251436037,1689.3334094079808,4904.795842526198,3215.4624331182176,55.34775667891962,54.72727795719582,12.6479974923084,13.054336251436037
-8940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.05413856628031,13.05413856628031,1692.1721202101526,4913.057837779649,3220.885717569497,55.34834248089435,54.72681855232767,12.64711448845426,13.05413856628031
-9000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.053940600445811,13.053940600445811,1695.493432151398,4922.72741774589,3227.233985594493,55.34902808520729,54.72628087923578,12.646114313648912,13.053940600445811
-9060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.053742383734381,13.053742383734381,1698.7863665280786,4932.314313957285,3233.527947429207,55.34970782704573,54.72574780368613,12.645120750772168,13.053742383734381
-9120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.053544237211526,13.053544237211526,1701.7329610816505,4940.8911644051705,3239.1582033235213,55.35031595344305,54.72527089128325,12.64421113082601,13.053544237211526
-9180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.053345943067155,13.053345943067155,1704.411559717668,4948.686417232908,3244.274857515241,55.35086866209291,54.72483743927154,12.643366267308444,13.053345943067155
-9240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.053147294821672,13.053147294821672,1707.8867972711146,4958.805271210471,3250.918473939356,55.35158612165148,54.72427478426502,12.64232808728701,13.053147294821672
-9300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.052948543657825,13.052948543657825,1711.0050992188337,4967.883134598279,3256.878035379445,55.352229771667425,54.72377001309071,12.641376248613017,13.052948543657825
-9360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.052749664269593,13.052749664269593,1713.8318781649775,4976.110759407874,3262.278881242896,55.352813137058675,54.723312519070156,12.640494886804936,13.052749664269593
-9420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.052550565320837,13.052550565320837,1717.1081270095733,4985.649463081612,3268.54133607204,55.35348946227467,54.722782122946406,12.63950442386412,13.052550565320837
-9480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.052351295736363,13.052351295736363,1720.3866214122672,4995.194802257526,3274.808180845259,55.35416625803811,54.72225135780413,12.638513235640154,13.052351295736363
-9540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.052151905155187,13.052151905155187,1723.3406400409797,5003.793760892785,3280.4531208518047,55.35477595238512,54.72177321576437,12.637600516729693,13.052151905155187
-9600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.05195233140722,13.05195233140722,1726.2919122855344,5012.384767881927,3286.0928555963924,55.35538508299003,54.72129551582939,12.63668827254551,13.05195233140722
-9660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.051752470369019,13.051752470369019,1729.3961045406331,5021.4218912867245,3292.025786746092,55.35602584477376,54.72079300970025,12.635738689914241,13.051752470369019
-9720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.051552313345649,13.051552313345649,1732.5241655702694,5030.528701015488,3298.004535445219,55.35667154760942,54.720286628638256,12.634783021448932,13.051552313345649
-9780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.051351957403707,13.051351957403707,1735.6221450271812,5039.547831362991,3303.9256863358087,55.357311033749504,54.71978512291014,12.633834432818196,13.051351957403707
-9840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.051151310327734,13.051151310327734,1738.4141291622782,5047.67440095921,3309.2602717969316,55.35788723443592,54.71933324768304,12.632959677520635,13.051151310327734
-9900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.050950286040356,13.050950286040356,1741.718046220333,5057.294381438733,3315.5763352184003,55.358569322962076,54.718798331784924,12.631960515649503,13.050950286040356
-9960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.050749017182742,13.050749017182742,1744.6220519603296,5065.747827628236,3321.125775667907,55.3591687003952,54.71832828060294,12.63105798755882,13.050749017182742
-10020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.050547399078296,13.050547399078296,1747.6042307974453,5074.429361843675,3326.825131046229,55.35978425008358,54.71784554661495,12.630136165579321,13.050547399078296
-10080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.050345483779214,13.050345483779214,1751.318473640359,5085.246566218254,3333.9280925778953,55.36055122597829,54.717244059295034,12.629036672680789,13.050345483779214
-10140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.05014347617267,13.05014347617267,1754.339717547298,5094.042210506355,3339.7024929590575,55.36117486658056,54.716754980150526,12.628104977979445,13.05014347617267
-10200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04994142856316,13.04994142856316,1757.0691790665155,5101.986703847322,3344.917524780807,55.36173815778364,54.71631322895807,12.627243930814497,13.04994142856316
-10260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.049739013745572,13.049739013745572,1760.141525416868,5110.931544912293,3350.790019495425,55.36237237704986,54.71581585368289,12.626299432928285,13.049739013745572
-10320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.049536262672223,13.049536262672223,1763.348163590942,5120.268223264736,3356.920059673795,55.363034378959846,54.715296690359295,12.625322052876008,13.049536262672223
-10380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.049333237792428,13.049333237792428,1766.5695035274325,5129.647862209634,3363.0783586822017,55.363699426986564,54.71477513817237,12.624340828070636,13.049333237792428
-10440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.049130030241313,13.049130030241313,1769.4627652390568,5138.070415131056,3368.6076498919997,55.36429661444371,54.714306804440405,12.623438908454617,13.049130030241313
-10500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.048926497681215,13.048926497681215,1772.8090960662134,5147.814848640454,3375.005752574242,55.364987527767184,54.713764967850636,12.6224268722067,13.048926497681215
-10560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.048722818049654,13.048722818049654,1776.0714522781961,5157.314371959265,3381.2429196810713,55.365661076197966,54.71323674937172,12.621435026434211,13.048722818049654
-10620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04851905193346,13.04851905193346,1779.0852418491886,5166.088765679292,3387.0035238301043,55.36628321054063,54.712748851484726,12.620503317554624,13.04851905193346
-10680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.048315148329566,13.048315148329566,1782.0547367020047,5174.73398945933,3392.6792527573243,55.366896186352214,54.712268136014224,12.61958219697288,13.048315148329566
-10740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.048110824702661,13.048110824702661,1785.4739237904514,5184.6913082398405,3399.217384449389,55.367602194238174,54.711714461780026,12.61855167465377,13.048110824702661
-10800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.047906523465395,13.047906523465395,1788.2355186109937,5192.730068916116,3404.494550305122,55.36817216986103,54.71126746844924,12.617680523079944,13.047906523465395
-10860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.047701700365453,13.047701700365453,1791.059763856684,5200.951640913089,3409.891877056407,55.3687551074821,54.71081030989994,12.616793665053633,13.047701700365453
-10920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.047496605700687,13.047496605700687,1794.9279393928437,5212.219224095763,3417.2912847029193,55.36955401781443,54.71018377856047,12.615653532629,13.047496605700687
-10980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04729079675725,13.04729079675725,1797.6601065225573,5220.172201810251,3422.512095287694,55.37011791129675,54.70974155504114,12.614787995401715,13.04729079675725
-11040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04708167535175,13.04708167535175,1800.5761756262307,5228.661533254406,3428.085357628175,55.370719834156475,54.70926950765322,12.613874606881044,13.04708167535175
-11100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.046867708675206,13.046867708675206,1803.9506134164067,5238.487962425214,3434.537349008809,55.37141656192147,54.70872311119022,12.61284532881429,13.046867708675206
-11160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04664970853405,13.04664970853405,1806.8306130469564,5246.871376874951,3440.040763827995,55.37201097501668,54.708256953202685,12.611931889469144,13.04664970853405
-11220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.046429129079664,13.046429129079664,1809.8723967143274,5255.726698781927,3445.8543020676,55.37263884804119,54.70776455485567,12.610976680937274,13.046429129079664
-11280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.046206759880947,13.046206759880947,1813.038216982836,5264.943870373699,3451.905653390863,55.373292377525694,54.70725203588235,12.60998963055124,13.046206759880947
-11340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.045983143374144,13.045983143374144,1816.064617816058,5273.754176382956,3457.689558566898,55.37391705888689,54.70676214054099,12.609035130263665,13.045983143374144
-11400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04575854508776,13.04575854508776,1819.4970447944213,5283.749285704222,3464.252240909799,55.374625746997616,54.70620636438777,12.607981234397831,13.04575854508776
-11460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.045533468694419,13.045533468694419,1822.3004196041,5291.90879770941,3469.608378105308,55.375204284912485,54.705752656230466,12.607079331607,13.045533468694419
-11520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.045307763484523,13.045307763484523,1825.1772869267688,5300.282771526912,3475.105484600144,55.37579802897148,54.70528702292278,12.60615898588798,13.045307763484523
-11580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.045081647301883,13.045081647301883,1828.40706171708,5309.686622696773,3481.279560979693,55.37646479500316,54.70476412342075,12.605152680718017,13.045081647301883
-11640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.044855234002775,13.044855234002775,1831.654843530136,5319.1430825897205,3487.4882390595835,55.37713529124508,54.70423829856714,12.604141705956929,13.044855234002775
-11700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04462885169204,13.04462885169204,1834.885790524832,5328.550505918755,3493.664715393924,55.377802310689184,54.7037152003309,12.603134831613104,13.04462885169204
-11760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.044402571169519,13.044402571169519,1837.486016522764,5336.117386263152,3498.631369740389,55.378338829202264,54.70329444514844,12.602280944205495,13.044402571169519
-11820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.044176173243342,13.044176173243342,1840.8652094715799,5345.957592483745,3505.092383012167,55.37903653460506,54.70274728199022,12.601238097544448,13.044176173243342
-11880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04395006312345,13.04395006312345,1843.8783064460833,5354.729516216126,3510.8512097700427,55.37965849506497,54.70225952046771,12.600284273973145,13.04395006312345
-11940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.043723910374933,13.043723910374933,1846.631123275429,5362.7419016495205,3516.1107783740918,55.380226601620166,54.701813992920286,12.599393499053754,13.043723910374933
-12000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.043497944421384,13.043497944421384,1850.1128307744286,5372.881591745902,3522.768760971474,55.38094554169305,54.701250176846536,12.598326193628711,13.043497944421384
-12060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.043272175440796,13.043272175440796,1853.2515290627584,5382.020337425107,3528.7688083623493,55.381593511314975,54.700742018097394,12.597342228426681,13.043272175440796
-12120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.043046794914215,13.043046794914215,1856.080580803808,5390.25548828646,3534.1749074826507,55.382177412899544,54.700284103576706,12.596433708869666,13.043046794914215
-12180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.042821605698455,13.042821605698455,1858.9064562546841,5398.481446661553,3539.574990406869,55.382760662755096,54.69982670016302,12.595526140952833,13.042821605698455
-12240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.042596470912333,13.042596470912333,1861.8798409382612,5407.137989192488,3545.258148254227,55.38337444262167,54.69934535412658,12.594582855421116,13.042596470912333
-12300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.042371321374814,13.042371321374814,1864.8800188639768,5415.872799187253,3550.992780323277,55.383993771989005,54.69885965599203,12.593633050445128,13.042371321374814
-12360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.042146303665358,13.042146303665358,1867.8547861660547,5424.533527871362,3556.678741705307,55.38460784878242,54.69837807709594,12.59268952787865,13.042146303665358
-12420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04192137325338,13.04192137325338,1870.965488596184,5433.5910885421645,3562.625599945981,55.38525006245056,54.697874432352044,12.591713123209724,13.04192137325338
-12480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.041696614184225,13.041696614184225,1874.3524295297248,5443.455014081944,3569.102584552219,55.385949450362034,54.69732594971609,12.590669898005023,13.041696614184225
-12540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.041472213219864,13.041472213219864,1877.3948680976976,5452.313547348026,3574.918679250328,55.386577552396204,54.69683337177228,12.589710547472539,13.041472213219864
-12600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.041248109229276,13.041248109229276,1880.1461853238586,5460.322454472907,3580.176269149048,55.3871454129163,54.69638803717353,12.588822072090624,13.041248109229276
-12660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.041024134950677,13.041024134950677,1883.0475030652585,5468.769257272239,3585.721754206981,55.387744321878,54.695918353382,12.587897345247633,13.041024134950677
-12720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.040800236939907,13.040800236939907,1886.2507725057812,5478.0974937499905,3591.8467212442097,55.38840572774768,54.695399657492494,12.586899465759828,13.040800236939907
-12780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.04057653577894,13.04057653577894,1889.3963310490549,5487.25738229641,3597.8610512473547,55.389055197201,54.69489032252701,12.585915764368908,13.04057653577894
-12840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.040352979813647,13.040352979813647,1891.967145398347,5494.739714197337,3602.77256879899,55.389585721826364,54.694474267945296,12.585071570367772,13.040352979813647
-12900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.040129410957036,13.040129410957036,1895.3047063076087,5504.460211699545,3609.155505391936,55.390274940620145,54.69393376026054,12.584041420736293,13.040129410957036
-12960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.039906080901101,13.039906080901101,1897.9574328543986,5512.181779394421,3614.2243465400234,55.390822428036834,54.69350440290888,12.5831775718475,13.039906080901101
-13020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.039682578186008,13.039682578186008,1900.401312308527,5519.2937439504785,3618.892431641951,55.39132669239911,54.6931089424754,12.582364193829196,13.039682578186008
-13080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.03945888104676,13.03945888104676,1903.8961993290743,5529.473706158808,3625.5775068297335,55.39204848910978,54.69254288613382,12.581295735053466,13.03945888104676
-13140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.039235147292874,13.039235147292874,1906.6268445843268,5537.422854573317,3630.796009988989,55.39261211298323,54.6921008740505,12.580412570033284,13.039235147292874
-13200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.039011398095136,13.039011398095136,1909.4752747925156,5545.715887781045,3636.24061298853,55.39320011960472,54.691639740227004,12.579500817490256,13.039011398095136
-13260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.03878765255448,13.03878765255448,1912.7631499737586,5555.29180744709,3642.528657473332,55.393879087669156,54.69110727149597,12.57848248326415,13.03878765255448
-13320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.038563956184804,13.038563956184804,1915.3018821495166,5562.680903895831,3647.3790217463147,55.39440300193968,54.69069640096846,12.577645877476531,13.038563956184804
-13380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.038340171620936,13.038340171620936,1918.2991144456269,5571.4085135656815,3653.109399120055,55.39502182180178,54.690211102404426,12.576697976628077,13.038340171620936
-13440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.038116392453327,13.038116392453327,1921.7053660343531,5581.330244898698,3659.624878864345,55.39572530938387,54.68965940467406,12.575650868154288,13.038116392453327
-13500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.037892740130365,13.037892740130365,1924.3680462464426,5589.081355370331,3664.7133091238898,55.39627489194097,54.68922840424547,12.574784222349859,13.037892740130365
-13560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.03766920737409,13.03766920737409,1927.0368058827773,5596.850275256289,3669.8134693735105,55.3968257372972,54.68879641348892,12.573916213864079,13.03766920737409
-13620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.037445417074066,13.037445417074066,1929.8581389003332,5605.064641411331,3675.206502510998,55.397408166502544,54.68833965365568,12.573010937713427,13.037445417074066
-13680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.037221558188012,13.037221558188012,1933.1360907955561,5614.612127925058,3681.4760371295033,55.39808511897869,54.68780876561422,12.571994829914123,13.037221558188012
-13740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.036997711790393,13.036997711790393,1935.9179068275964,5622.711253801148,3686.7933469735513,55.39865937732646,54.687358413631955,12.571099066978519,13.036997711790393
-13800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.036773845851352,13.036773845851352,1938.451257240258,5630.085039849395,3691.633782609136,55.39918220640779,54.686948394144935,12.570263546995154,13.036773845851352
-13860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.036549812948756,13.036549812948756,1941.8671548866828,5640.0354749774315,3698.1683200907487,55.39988772963587,54.686395099995096,12.569213777183556,13.036549812948756
-13920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.036325899484133,13.036325899484133,1944.196241599278,5646.813003988354,3702.6167623890747,55.4003682819444,54.686018235321605,12.568427745888107,13.036325899484133
-13980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.036101655829892,13.036101655829892,1946.605286466868,5653.823975932359,3707.2186894654906,55.400865386271704,54.685628390019296,12.567621988712634,13.036101655829892
-14040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.03587713809638,13.03587713809638,1950.0515468470514,5663.863233965561,3713.811687118509,55.40157720755746,54.68507015672879,12.566564346834028,13.03587713809638
-14100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.035652517839196,13.035652517839196,1952.895425788176,5672.143833487404,3719.2484076992278,55.40216433337426,54.68460971366085,12.565652720781438,13.035652517839196
-14160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.035427934044865,13.035427934044865,1955.831793688833,5680.694537244572,3724.862743555738,55.40277061065693,54.68413425139353,12.564718686111846,13.035427934044865
-14220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.035203494110556,13.035203494110556,1958.623310470313,5688.822396002475,3730.1990855321615,55.40334690667871,54.68368230140135,12.563819925334863,13.035203494110556
-14280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.034978909328835,13.034978909328835,1961.303596456161,5696.625530050035,3735.3219335938757,55.40390017853343,54.683248407706145,12.56294799894436,13.034978909328835
-14340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.034754355629584,13.034754355629584,1964.3873808099747,5705.606850150151,3741.2194693401757,55.40453698831306,54.68274900086653,12.561978206796255,13.034754355629584
-14400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.034529833623203,13.034529833623203,1967.3266326788541,5714.166240117596,3746.8396074387438,55.40514388169695,54.68227305543269,12.561043501040961,13.034529833623203
-14460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.034305314141335,13.034305314141335,1970.1255475713665,5722.315932367385,3752.1903847960198,55.40572172600189,54.68181989122673,12.560142836887332,13.034305314141335
-14520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.034080866420707,13.034080866420707,1972.9075746050485,5730.416378921908,3757.50880431686,55.40629607864861,54.68136946529217,12.559246333615999,13.034080866420707
-14580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.033856314594393,13.033856314594393,1975.67811465192,5738.483330495969,3762.8052158440505,55.40686805642226,54.68092090180994,12.558352507478741,13.033856314594393
-14640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.033631765973446,13.033631765973446,1978.635532445217,5747.09601439534,3768.4604819501233,55.40747872876281,54.68044199279597,12.557413336362385,13.033631765973446
-14700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.03340723277688,13.03340723277688,1981.14088991548,5754.388754427273,3773.247864511793,55.407995812061465,54.6800364793377,12.556583854754214,13.03340723277688
-14760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.033182467025352,13.033182467025352,1983.8289985519255,5762.215148155427,3778.3861496035024,55.40855073350294,54.679601291983175,12.555709797332652,13.033182467025352
-14820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.032957576786563,13.032957576786563,1986.9022385052144,5771.166184880937,3784.2639463757237,55.40918539651866,54.679103568705294,12.55474216382859,13.032957576786563
-14880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.032732675878206,13.032732675878206,1989.2692924027122,5778.055170483306,3788.785878080593,55.409673852200385,54.67872050595075,12.553945859685236,13.032732675878206
-14940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.032507516254224,13.032507516254224,1992.136945078329,5786.405967715053,3794.2690226367226,55.410265956019536,54.678256158972225,12.553027828996685,13.032507516254224
-15000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.032282297011069,13.032282297011069,1994.9559383636508,5794.614728274542,3799.6587899108918,55.41084798894058,54.67779970991796,12.552121538821526,13.032282297011069
-15060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.032056954175355,13.032056954175355,1997.5209729533447,5802.081929792332,3804.560956838988,55.41137744249721,54.67738449530302,12.551276742938061,13.032056954175355
-15120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.031831564476313,13.031831564476313,2000.2242300354812,5809.952808376816,3809.728578341335,55.41193551836944,54.676946834141816,12.550398354935846,13.031831564476313
-15180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.031606010934901,13.031606010934901,2002.9830032572306,5817.985842172912,3815.002838915682,55.41250509172437,54.67650015628255,12.549506327280918,13.031606010934901
-15240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.031380389648275,13.031380389648275,2005.7143487722894,5825.9388276057225,3820.2244788334337,55.41306898938678,54.67605792948506,12.548620881617568,13.031380389648275
-15300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.031154692109265,13.031154692109265,2008.1884710360669,5833.14068893937,3824.952217903304,55.41357962946436,54.67565746900929,12.547797773751727,13.031154692109265
-15360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.030928937141896,13.030928937141896,2010.846053070664,5840.8783453160595,3830.0322922453965,55.414128259545286,54.675227215543316,12.546930084148558,13.030928937141896
-15420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.030702872851176,13.030702872851176,2013.8098101207265,5849.510160310437,3835.7003501897093,55.414740289020436,54.67474724222049,12.545987782222426,13.030702872851176
-15480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.030477057387287,13.030477057387287,2016.4666317755277,5857.245696388575,3840.779064613048,55.4152887688594,54.67431710657914,12.545120204154227,13.030477057387287
-15540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.030251125073182,13.030251125073182,2019.136441966157,5865.019201031701,3845.882759065545,55.41583994086393,54.67388485965443,12.544249352624655,13.030251125073182
-15600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.030025343912838,13.030025343912838,2021.5210028859608,5871.9597137512255,3850.4387108652654,55.416332050508565,54.6734989313439,12.543447870199484,13.030025343912838
-15660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.029799267105274,13.029799267105274,2024.133078452857,5879.564680731255,3855.4316022783983,55.41687127261488,54.67307605591614,12.542590876467354,13.029799267105274
-15720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.029573165200713,13.029573165200713,2027.0714188318527,5888.122551258232,3861.051132426381,55.41747805938723,54.672600194090506,12.541654669798186,13.029573165200713
-15780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.029347086275788,13.029347086275788,2029.429484884552,5894.98577406883,3865.556289184279,55.41796468899276,54.67221856340402,12.54085930882164,13.029347086275788
-15840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.029120940826427,13.029120940826427,2032.5137909323385,5903.970057252755,3871.456266320417,55.418601710210154,54.67171899074804,12.539887618891608,13.029120940826427
-15900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.028894988217992,13.028894988217992,2035.3172843643194,5912.134293324603,3876.8170089602836,55.4191805868962,54.67126501691543,12.538984264567905,13.028894988217992
-15960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.028669156753404,13.028669156753404,2037.8671366871026,5919.557805717739,3881.6906690306373,55.41970694338214,54.67085223112356,12.538142583747153,13.028669156753404
-16020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.028443564337973,13.028443564337973,2040.402389956815,5926.938746653892,3886.5363566970777,55.42023028142403,54.67044181249318,12.537304676874795,13.028443564337973
-16080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.028217950378794,13.028217950378794,2042.7058988709475,5933.642873185784,3890.9369743148372,55.420705630670845,54.67006902822909,12.536522991728747,13.028217950378794
-16140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.027992075337323,13.027992075337323,2045.4744296385986,5941.705199390145,3896.2307697515466,55.421277281723576,54.66962072097196,12.53562817536601,13.027992075337323
-16200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.027766254630144,13.027766254630144,2047.964712800827,5948.9548948502625,3900.9901820494338,55.42179131406042,54.66921760017669,12.534800943027756,13.027766254630144
-16260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.027540218390703,13.027540218390703,2050.528093158232,5956.4181072988285,3905.8900141405957,55.422320485645145,54.66880260669323,12.533955750518858,13.027540218390703
-16320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.027314285075601,13.027314285075601,2053.0803288318757,5963.848822292065,3910.768493460191,55.42284735307218,54.66838942020482,12.533113359333914,13.027314285075601
-16380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.027088143996293,13.027088143996293,2055.8345426323067,5971.869502842264,3916.0349602099573,55.42341605146464,54.66794342851943,12.532221730812273,13.027088143996293
-16440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.026862190530002,13.026862190530002,2058.5993269626224,5979.92113297795,3921.3218060153276,55.42398694435556,54.667495715837354,12.531327714677394,13.026862190530002
-16500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.026636368795288,13.026636368795288,2061.362543960239,5987.968254369519,3926.605710409281,55.42455751760726,54.66704825382668,12.53043420204579,13.026636368795288
-16560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.026410815195591,13.026410815195591,2063.828829296113,5995.148142742641,3931.3193134465273,55.425066600593354,54.66664901447242,12.529613026139968,13.026410815195591
-16620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.026185260621235,13.026185260621235,2066.0772814054762,6001.69178816237,3935.614506756895,55.425530571426926,54.666285153528264,12.528844723447634,13.026185260621235
-16680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025959676765947,13.025959676765947,2069.087678246058,6010.46108368838,3941.3734054423217,55.42615234987386,54.665797534746225,12.527891424253466,13.025959676765947
-16740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025734267139145,13.025734267139145,2071.4849393849454,6017.439489206878,3945.954549821932,55.426647147032405,54.665409498800315,12.52708713123123,13.025734267139145
-16800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025508797018311,13.025508797018311,2073.6689270387883,6023.79494262914,3950.1260155903524,55.427097774401254,54.665056102233045,12.526334548555095,13.025508797018311
-16860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025283264678063,13.025283264678063,2076.2341250609697,6031.26395227202,3955.0298272110504,55.427627357451755,54.664640786064815,12.525489357786059,13.025283264678063
-16920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025057506422,13.025057506422,2079.243240455586,6040.029706776358,3960.786466320771,55.42824888502142,54.664153364028856,12.524536170103572,13.025057506422
-16980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024832082426355,13.024832082426355,2081.6254834422602,6046.964392510216,3965.338909067955,55.42874058242502,54.663767759011094,12.52373549002419,13.024832082426355
-17040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024606638938627,13.024606638938627,2083.8078720590843,6053.315304987694,3969.507432928609,55.429190887963884,54.6634146148333,12.522983306038313,13.024606638938627
-17100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024381206605762,13.024381206605762,2086.3072271534324,6060.592156628353,3974.2849294749212,55.429706846394815,54.6630099835327,12.52215417790998,13.024381206605762
-17160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024155560964768,13.024155560964768,2089.014910529807,6068.477594809952,3979.4626842801454,55.430265956136246,54.662571511577795,12.521274256287526,13.024155560964768
-17220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023930075597516,13.023930075597516,2091.730344746562,6076.385744135904,3984.655399389343,55.430826676237594,54.66213177672654,12.520392604479575,13.023930075597516
-17280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023704689755606,13.023704689755606,2094.014921724057,6083.035308048679,3989.020386324623,55.43129815752682,54.661762025839955,12.5196156515571,13.023704689755606
-17340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023479394348884,13.023479394348884,2096.6332489853767,6090.659891439359,3994.026642453983,55.431838771727534,54.66133805868672,12.518757752502685,13.023479394348884
-17400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023254188193865,13.023254188193865,2099.292839541998,6098.40507438854,3999.112234846542,55.43238793697592,54.660907385525114,12.517889917115415,13.023254188193865
-17460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023029153106167,13.023029153106167,2101.808893630498,6105.731004465218,4003.922110834719,55.432907375517146,54.66050002500936,12.517057094889186,13.023029153106167
-17520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02280428172328,13.02280428172328,2104.2096879871847,6112.720275901687,4008.510587914502,55.43340294361535,54.66011138446763,12.516252414402745,13.02280428172328
-17580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022579441621417,13.022579441621417,2106.673117921311,6119.892569053339,4013.219451132028,55.433911488744386,54.659712566918316,12.515432552180851,13.022579441621417
-17640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022354733025342,13.022354733025342,2108.8905623565993,6126.346285405716,4017.455723049119,55.43436908385149,54.65935370602518,12.514672542450947,13.022354733025342
-17700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022129820515973,13.022129820515973,2111.5877317264967,6134.2014992056065,4022.6137674791107,55.43492605095035,54.65891691439993,12.513795845367902,13.022129820515973
-17760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02190504067151,13.02190504067151,2114.2946577190123,6142.085282716259,4027.7906249972466,55.43548504380648,54.65847853411027,12.512916903622054,13.02190504067151
-17820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021680369385704,13.021680369385704,2116.4511113441117,6148.360917056502,4031.909805712392,55.43593001226905,54.65812957544046,12.512171728123818,13.021680369385704
-17880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021455847866823,13.021455847866823,2118.943887625272,6155.619169014782,4036.675281389509,55.436444652426864,54.65772597797229,12.511345030757804,13.021455847866823
-17940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021231278568132,13.021231278568132,2121.484800295646,6163.018089006739,4041.5332887110917,55.4369692665724,54.65731455858016,12.510506592561295,13.021231278568132
-18000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021006797875614,13.021006797875614,2123.907166217863,6170.070715561997,4046.163549344134,55.43746932711399,54.65692239491891,12.509697023165765,13.021006797875614
-18060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020782473168431,13.020782473168431,2126.339643341748,6177.152936085912,4050.813292744165,55.43797148602872,54.65652858564553,12.508885147789695,13.020782473168431
-18120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020558111818685,13.020558111818685,2128.8322151359594,6184.4107643783045,4055.578549242344,55.43848609630445,54.65612501161186,12.508058638575369,13.020558111818685
-18180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02033392850249,13.02033392850249,2131.0745709831153,6190.937602807413,4059.8630318242967,55.43894887638612,54.65576208449389,12.507293062368973,13.02033392850249
-18240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020109710694987,13.020109710694987,2133.3566569204827,6197.580543519651,4064.223886599168,55.43941988863714,54.65539270144225,12.506517800668226,13.020109710694987
-18300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019885469330506,13.019885469330506,2135.5841585299318,6204.064030380586,4068.479871850655,55.439879594976,54.65503218485286,12.505755767740778,13.019885469330506
-18360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019660962777836,13.019660962777836,2138.155582692905,6211.552367998946,4073.3967853060412,55.44041054947628,54.65461579314931,12.504909948907645,13.019660962777836
-18420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019436678999508,13.019436678999508,2140.699473142061,6218.9603268849405,4078.260853742879,55.440935804829394,54.65420387090143,12.50407103086678,13.019436678999508
-18480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019212407111489,13.019212407111489,2143.1904798170776,6226.213813650298,4083.023333833221,55.44145010750143,54.65380053810054,12.503244962407978,13.019212407111489
-18540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01898837740583,13.01898837740583,2145.66175997392,6233.409729207923,4087.7479692340053,55.44196032817226,54.6534004065371,12.50242391856709,13.01898837740583
-18600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018764518524387,13.018764518524387,2147.774564023645,6239.558287156197,4091.783723132553,55.44239628681555,54.65305851365918,12.501690098835047,13.018764518524387
-18660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018540740424282,13.018540740424282,2150.3497677271043,6247.057950082669,4096.708182355564,55.44292804452838,54.652641492050364,12.500844055184764,13.018540740424282
-18720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018317104792006,13.018317104792006,2152.792979112215,6254.172003789043,4101.379024676828,55.443432460961354,54.65224591235811,12.500030203358865,13.018317104792006
-18780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01809352558738,13.01809352558738,2155.1713906534037,6261.096760061708,4105.925369408305,55.44392345544399,54.65186085859372,12.499232140654756,13.01809352558738
-18840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017870218098212,13.017870218098212,2157.004187961692,6266.4273200692505,4109.42313210756,55.44430141469924,54.651564450713046,12.498566857877504,13.017870218098212
-18900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017646611987901,13.017646611987901,2159.11515653068,6272.570665336133,4113.455508805453,55.4447370038944,54.65122284756829,12.497833717991226,13.017646611987901
-18960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01742285400458,13.01742285400458,2162.0854210031684,6281.224877959273,4119.139456956104,55.4453506242664,54.65074162661264,12.496891719046983,13.01742285400458
-19020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01719932004358,13.01719932004358,2164.6407405224068,6288.6666998968385,4124.0259593744295,55.445878281042994,54.65032782109078,12.496050716519742,13.01719932004358
-19080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016976098911742,13.016976098911742,2166.9450159933085,6295.375033693719,4128.43001770041,55.44635393043147,54.64995480144586,12.495270992776957,13.016976098911742
-19140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0167530762698,13.0167530762698,2169.138292337157,6301.759070933751,4132.620778596594,55.44680658584676,54.649599814418934,12.494518421722624,13.0167530762698
-19200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01653025379283,13.01653025379283,2171.2473273170217,6307.89699322667,4136.649665909647,55.44724179069364,54.64925851269255,12.493786506652878,13.01653025379283
-19260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016307353647035,13.016307353647035,2173.14931526245,6313.429910639951,4140.280595377501,55.44763409814071,54.64895085249547,12.493104803471274,13.016307353647035
-19320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016084169583845,13.016084169583845,2175.422225853752,6320.046698875318,4144.624473021565,55.44810325668298,54.64858292318223,12.492332722029062,13.016084169583845
-19380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01586094212192,13.01586094212192,2177.8805924881417,6327.205445577785,4149.324853089644,55.44861084243214,54.64818485800965,12.491515546464731,13.01586094212192
-19440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015637689342745,13.015637689342745,2180.402703846434,6334.550502540773,4154.147798694339,55.44913163841553,54.64777643294385,12.490682857198449,13.015637689342745
-19500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01541466761007,13.01541466761007,2182.904010464372,6341.834830816508,4158.930820352136,55.449648128515165,54.64737138469143,12.489855444164329,13.01541466761007
-19560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015191969216533,13.015191969216533,2184.869963970831,6347.554797958259,4162.684833987427,55.4500536987327,54.6470533234005,12.48915838902981,13.015191969216533
-19620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014969303318551,13.014969303318551,2186.942174494489,6353.585295832426,4166.643121337936,55.450481286938505,54.646717994890544,12.488435552619315,13.014969303318551
-19680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014746722214944,13.014746722214944,2189.477134642993,6360.968114275304,4171.490979632312,55.45100476051946,54.646307469966075,12.487600387036016,13.014746722214944
-19740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014524228728142,13.014524228728142,2191.7980182226406,6367.725383537269,4175.927365314628,55.45148388000902,54.645931728955595,12.486817306433865,13.014524228728142
-19800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01430182899149,13.01430182899149,2194.146796033881,6374.564211219385,4180.417415185504,55.451968782376845,54.64555145282481,12.486027538160588,13.01430182899149
-19860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014079763841094,13.014079763841094,2196.19749466571,6380.5320106799045,4184.3345160141935,55.452391925117176,54.64521961059275,12.48531050736782,13.014079763841094
-19920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013857762732814,13.013857762732814,2198.4162823055,6386.991058381578,4188.574776076078,55.45284989950846,54.644860452252715,12.48455270343434,13.013857762732814
-19980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013635860176866,13.013635860176866,2200.761418062893,6393.819385648149,4193.057967585257,55.45333405745071,54.644480759924534,12.483764299159189,13.013635860176866
-20040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013413975676427,13.013413975676427,2202.896971876186,6400.035256095847,4197.138284219662,55.45377478958564,54.64413512351997,12.483026823806386,13.013413975676427
-20100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013192231727135,13.013192231727135,2205.101382661633,6406.452397091045,4201.351014429411,55.45422979270461,54.64377829534784,12.482272756110929,13.013192231727135
-20160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012970580249936,13.012970580249936,2207.346509157372,6412.988565485631,4205.642056328258,55.45469323541419,54.6434148485756,12.481508884791513,13.012970580249936
-20220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012749028903027,13.012749028903027,2209.3535924661483,6418.829089128828,4209.4754966626815,55.455107353918685,54.64309008344137,12.480802940186305,13.012749028903027
-20280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012527393528568,13.012527393528568,2211.606884977393,6425.389174421762,4213.78228944437,55.45557249250145,54.642725306710474,12.480037094682247,13.012527393528568
-20340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012306005973391,13.012306005973391,2214.148851371837,6432.792982474879,4218.644131103042,55.45609745473698,54.642313614334896,12.479201356213839,13.012306005973391
-20400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01208473832925,13.01208473832925,2216.2075377113456,6438.7844198748,4222.576882163456,55.45652227377239,54.641980457498,12.478483145696275,13.01208473832925
-20460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011863737898848,13.011863737898848,2218.30257894818,6444.882158110799,4226.579579162619,55.45695463002837,54.64164138972878,12.477756363437095,13.011863737898848
-20520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011642735566937,13.011642735566937,2220.43711979775,6451.095359695705,4230.658239897954,55.45739517316859,54.641295901539976,12.477019979902648,13.011642735566937
-20580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011421869959536,13.011421869959536,2222.780609282356,6457.919283309454,4235.138674027097,55.45787901920269,54.640916453820296,12.47623296156126,13.011421869959536
-20640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011201141132936,13.011201141132936,2224.8862316139184,6464.048046885941,4239.161815272023,55.45831357537922,54.640575660802185,12.47550386754849,13.011201141132936
-20700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01098055277654,13.01098055277654,2227.088334882401,6470.458832472735,4243.370497590333,55.45876812818163,54.64021918578287,12.474751467470009,13.01098055277654
-20760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010760167804909,13.010760167804909,2229.3011717033455,6476.90103842671,4247.599866723364,55.45922490885704,54.639860963593435,12.473996656647156,13.010760167804909
-20820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01053982991627,13.01053982991627,2231.7265191695165,6483.9643906000765,4252.2378714305605,55.459725731561434,54.639468202219454,12.473190254240125,13.01053982991627
-20880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010319901575679,13.010319901575679,2233.8878830131166,6490.256263215479,4256.368380202361,55.460171853007076,54.63911833934301,12.472448392966168,13.010319901575679
-20940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01010012110378,13.01010012110378,2235.733065716351,6495.624046150229,4259.890980433879,55.460552452453,54.63881986093935,12.471783500178098,13.01010012110378
-21000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009880441934786,13.009880441934786,2237.799995911723,6501.63997714766,4263.8399812359385,55.46097900847637,54.638485341900285,12.471064825077445,13.009880441934786
-21060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009660718019537,13.009660718019537,2240.043760183068,6508.172779092624,4268.129018909556,55.461442212958964,54.63812208195334,12.470303135309392,13.009660718019537
-21120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009441072000067,13.009441072000067,2242.2162946805993,6514.497423747693,4272.2811290670925,55.46189065820192,54.63777039667982,12.469558826833742,13.009441072000067
-21180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009221631337528,13.009221631337528,2243.894347412567,6519.3768091400925,4275.482461727526,55.46223662819985,54.63749907581009,12.46893487217631,13.009221631337528
-21240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009001996656623,13.009001996656623,2246.072546122366,6525.718049189132,4279.645503066766,55.462686250183154,54.63714646769869,12.468189193803868,13.009001996656623
-21300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008782429101904,13.008782429101904,2248.3134939673323,6532.242732450811,4283.929238483478,55.46314887913373,54.63678365910259,12.467428330673005,13.008782429101904
-21360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008562980828236,13.008562980828236,2250.3441892389415,6538.152902072131,4287.80871283319,55.46356793637235,54.63645502085321,12.46671867277069,13.008562980828236
-21420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008343591064053,13.008343591064053,2252.4082310092417,6544.160567508449,4291.752336499209,55.463993906523655,54.636120961273974,12.46600096697278,13.008343591064053
-21480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008124354736752,13.008124354736752,2254.446463695779,6550.092831355647,4295.646367659869,55.46441453039424,54.63579109442112,12.465289681584347,13.008124354736752
-21540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007905220926904,13.007905220926904,2256.81195451826,6556.981702363085,4300.169747844826,55.46490298199709,54.63540803486536,12.464498968830274,13.007905220926904
-21600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007686307215845,13.007686307215845,2259.1764398165064,6563.867694038615,4304.691254222108,55.46539122947826,54.635025135388425,12.463708713002825,13.007686307215845
-21660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007467823567133,13.007467823567133,2261.066292937889,6569.3663950624195,4308.300102124531,55.46578111189866,54.634719376975745,12.463034218563655,13.007467823567133
-21720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007249591584179,13.007249591584179,2263.019207677476,6575.049472125644,4312.030264448167,55.466184067426326,54.63440336620923,12.462344645482409,13.007249591584179
-21780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007031391181426,13.007031391181426,2265.1864094740704,6581.358948926798,4316.172539452728,55.466631437519595,54.63405252410289,12.461603025963015,13.007031391181426
-21840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006813345545057,13.006813345545057,2267.142515474013,6587.0514118317005,4319.908896357687,55.46703505859684,54.633735991390864,12.460912856520295,13.006813345545057
-21900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006595375176671,13.006595375176671,2268.909126063167,6592.189979935247,4323.280853872079,55.46739940607657,54.6334502583051,12.460268811001178,13.006595375176671
-21960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006377415029723,13.006377415029723,2271.0386080900616,6598.3892848309,4327.350676740838,55.467838964569395,54.63310554230865,12.459536587554915,13.006377415029723
-22020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006159550233821,13.006159550233821,2272.942689625147,6603.9297400774085,4330.9870504522605,55.4682318076947,54.63279746201536,12.45885923382676,13.006159550233821
-22080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005941570278281,13.005941570278281,2275.334287485686,6610.895299085346,4335.56101159966,55.46872569710096,54.63241013795818,12.458063283508386,13.005941570278281
-22140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005724031867883,13.005724031867883,2277.4489579803735,6617.051426459716,4339.602468479341,55.46916219420082,54.632067822805176,12.457335066492579,13.005724031867883
-22200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00550663103364,13.00550663103364,2279.028772634049,6621.644083521079,4342.6153108870285,55.469487834247005,54.63181244534156,12.456736971533635,13.00550663103364
-22260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005289307653365,13.005289307653365,2281.325109509064,6628.331326552206,4347.006217043141,55.46996198988961,54.631440597140525,12.455964810265119,13.005289307653365
-22320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005072142943805,13.005072142943805,2283.5673103780277,6634.8603647395785,4351.293054361551,55.47042492812894,54.63107754599017,12.455205958729744,13.005072142943805
-22380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004855373032973,13.004855373032973,2285.169261600563,6639.517837247307,4354.3485756467435,55.470755163944524,54.63081856437546,12.454603101494365,13.004855373032973
-22440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004638494982377,13.004638494982377,2287.115713515478,6645.182383638737,4358.066670123258,55.471156805864474,54.63050358378264,12.45391640784358,13.004638494982377
-22500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004421768597204,13.004421768597204,2289.306212686147,6651.560395336489,4362.254182650343,55.47160903572558,54.63014893048907,12.453170546269526,13.004421768597204
-22560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004205170140473,13.004205170140473,2291.299283053497,6657.361293358698,4366.0620103052015,55.47202034564489,54.62982636793824,12.452472792848498,13.004205170140473
-22620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003988816203695,13.003988816203695,2293.0280400778774,6662.389551136024,4369.361511058147,55.472376871895115,54.62954676851379,12.451839520434177,13.003988816203695
-22680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003772455604592,13.003772455604592,2294.8978548923387,6667.830183132297,4372.932328239958,55.472762637366635,54.62924423874567,12.451171955584895,13.003772455604592
-22740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003556121781203,13.003556121781203,2297.261222232392,6674.713688905698,4377.452466673307,55.473250709161654,54.6288614770475,12.450384453354495,13.003556121781203
-22800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003340011153796,13.003340011153796,2299.1084043358037,6680.088220263098,4380.979815927295,55.47363178784806,54.62856262280796,12.44972263152878,13.003340011153796
-22860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003124176517543,13.003124176517543,2300.893949511333,6685.282603976607,4384.388654465274,55.47400009326891,54.628273785776656,12.449076061713429,13.003124176517543
-22920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002908402551224,13.002908402551224,2302.910794321337,6691.153202554458,4388.242408233122,55.47441634542246,54.62794734736579,12.448373329395935,13.002908402551224
-22980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002692811862689,13.002692811862689,2305.1373686920183,6697.636984826194,4392.499616134176,55.47487607512042,54.62758681245743,12.447619796546245,13.002692811862689
-23040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002477448395197,13.002477448395197,2306.723449512981,6702.2483301182865,4395.524880605305,55.4752030405265,54.62733039560371,12.447022169621059,13.002477448395197
-23100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002262198111213,13.002262198111213,2308.4167294500353,6707.173092162658,4398.756362712621,55.475552228627,54.62705655099376,12.446398596525269,13.002262198111213
-23160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002046921753516,13.002046921753516,2310.331337236553,6712.7449196780235,4402.413582441471,55.47594729664401,54.626746725868394,12.44572119765111,13.002046921753516
-23220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001831624831462,13.001831624831462,2312.365193804814,6718.665391071797,4406.300197266983,55.47636708512987,54.62641751415128,12.445014789995668,13.001831624831462
-23280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001616550749011,13.001616550749011,2314.412633139981,6724.625619048215,4410.212985908234,55.47678969256588,54.626086091722186,12.444305297663446,13.001616550749011
-23340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001401629908088,13.001401629908088,2316.685505177239,6731.244962598377,4414.55945742114,55.477259034343405,54.62571801870994,12.443541154832024,13.001401629908088
-23400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001187248060615,13.001187248060615,2318.2877465920055,6735.903725314008,4417.615978722,55.47758936197916,54.62545896508688,12.442940559810385,13.001187248060615
-23460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000972905636983,13.000972905636983,2320.066157872815,6741.0775547605635,4421.0113968877495,55.47795621022677,54.62517127081801,12.442297178430538,13.000972905636983
-23520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000758852401466,13.000758852401466,2322.6777453254667,6748.68735704922,4426.009611723753,55.478495780162895,54.624748122610846,12.441451543555287,13.000758852401466
-23580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000545123286773,13.000545123286773,2324.351551768649,6753.555462494172,4429.203910725522,55.47884095122236,54.6244774282945,12.440834190589035,13.000545123286773
-23640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000331755781016,13.000331755781016,2326.152986646796,6758.7967658476855,4432.64377920089,55.479212583749465,54.624185982038796,12.440186167030106,13.000331755781016
-23700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000118551709244,13.000118551709244,2327.766264957255,6763.487982812899,4435.721717855645,55.47954521263785,54.62392512369895,12.439584043379686,13.000118551709244
-23760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999905338667558,12.999905338667558,2329.525739578467,6768.606643073166,4439.0809034947,55.479908149243364,54.623640497066404,12.438946370113824,12.999905338667558
-23820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999692182030266,12.999692182030266,2331.451567175373,6774.2116949181545,4442.760127742779,55.480305573276794,54.623328824276705,12.438268310572667,12.999692182030266
-23880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999479051574161,12.999479051574161,2333.201682608229,6779.303023277782,4446.101340669553,55.48066657196571,54.62304571742107,12.437632991165554,12.999479051574161
-23940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999265968646384,12.999265968646384,2335.344855153288,6785.543583543965,4450.1987283906765,55.48110905652982,54.622698706704824,12.436902162848568,12.999265968646384
-24000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999053105336937,12.999053105336937,2337.218281401895,6790.9955070396545,4453.77722563776,55.481495623126186,54.62239554866868,12.436237125452571,12.999053105336937
-24060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998840505854863,12.998840505854863,2339.087429163349,6796.434966572908,4457.347537409559,55.48188130599229,54.622093083682394,12.435573386280543,12.998840505854863
-24120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998628227828206,12.998628227828206,2341.2798984955575,6802.819822899961,4461.539924404403,55.48233402189682,54.62173804921785,12.434831358026795,12.998628227828206
-24180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998416235514574,12.998416235514574,2342.5589215030336,6806.533942231079,4463.975020728045,55.48259737018481,54.6215315229671,12.434311681189339,12.998416235514574
-24240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998204299792356,12.998204299792356,2344.1508417510313,6811.162938368366,4467.012096617334,55.48292558749645,54.62127412432851,12.433715989893086,12.998204299792356
-24300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99799230978501,12.99799230978501,2346.3123207718095,6817.457263424811,4471.144942653001,55.48337188438401,54.620924123864825,12.432981773866684,12.99799230978501
-24360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997780443944766,12.997780443944766,2347.803513531412,6821.791767206131,4473.988253674721,55.48367922085596,54.620683100656535,12.43241063825867,12.997780443944766
-24420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99756855344258,12.99756855344258,2349.795420496504,6827.590323201762,4477.794902705257,55.484090365459345,54.62036066775181,12.431717742761482,12.99756855344258
-24480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997356896677168,12.997356896677168,2352.0898568060893,6834.273508705334,4482.183651899245,55.484564234442864,54.61998904435808,12.43095152208538,12.997356896677168
-24540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997145658323278,12.997145658323278,2353.926176445751,6839.617253341444,4485.691076895692,55.484943130853814,54.6196919015296,12.430297091145057,12.997145658323278
-24600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996934831494093,12.996934831494093,2355.532308412455,6844.287993603256,4488.755685190801,55.48527430813422,54.619432181587676,12.429699029648472,12.996934831494093
-24660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99672419533567,12.99672419533567,2357.2681973243575,6849.338172570312,4492.069975245955,55.485632389407996,54.61915136266343,12.429069607015439,12.99672419533567
-24720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996513735757626,12.996513735757626,2358.8274158343397,6853.8717942248795,4495.0443783905375,55.48595384437232,54.618899267276475,12.428483311863303,12.996513735757626
-24780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99630314619967,12.99630314619967,2361.170645099161,6860.697883746765,4499.527238647605,55.48643784605208,54.61851969749444,12.427706265880776,12.99630314619967
-24840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996093069824056,12.996093069824056,2363.239708308009,6866.722389977253,4503.482681669242,55.48686501175583,54.61818470032428,12.426996381795385,12.996093069824056
-24900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995883349884872,12.995883349884872,2364.4530463757183,6870.244749914247,4505.79170353853,55.48711476358281,54.6179888368583,12.426494909299247,12.995883349884872
-24960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995673729737728,12.995673729737728,2366.224264870686,6875.398411101042,4509.174146230357,55.48748018233032,54.617702263649676,12.425857890447451,12.995673729737728
-25020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995464234091985,12.995464234091985,2368.458964806714,6881.9073712144345,4513.4484064077205,55.48794169815635,54.61734032800186,12.42510829883982,12.995464234091985
-25080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995254977512085,12.995254977512085,2370.0513584254863,6886.538198430838,4516.486840005351,55.48827004556321,54.61708282733839,12.42451511538098,12.995254977512085
-25140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995045882557989,12.995045882557989,2371.800818524801,6891.628336340246,4519.827517815445,55.48863096027487,54.616799786340465,12.423883899542869,12.995045882557989
-25200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994885270339795,12.994885270339795,2745.314784455008,7984.919317945026,5239.604533490017,55.56615088432067,54.55600615296014,12.332766469119331,12.994885270339795
-25260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994956621503091,12.994956621503091,3372.5699392202228,9825.95538769677,6453.385448476548,55.696691797685425,54.45363174372388,12.179454631416366,12.994956621503091
-25320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995448789533784,12.995448789533784,3633.0879985636548,10592.531667229145,6959.4436686654935,55.75104757975666,54.41100418019084,12.115997064933856,12.995448789533784
-25380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99637163451025,12.99637163451025,3657.916990051511,10665.81480350301,7007.8978134515,55.756243905396616,54.406929053444145,12.110796617138718,12.99637163451025
-25440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997578853403123,12.997578853403123,3732.108047077312,10884.564455290783,7152.456408213472,55.77175492535943,54.3947648095729,12.093735922488651,12.997578853403123
-25500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998929249057673,12.998929249057673,3810.0635789512016,11114.535463938126,7304.471884986922,55.78806166408664,54.38197653729304,12.07587604111917,12.998929249057673
-25560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000340808252055,13.000340808252055,3859.639345397487,11260.95279759225,7401.313452194766,55.798443816160145,54.37383451761716,12.065049524206634,13.000340808252055
-25620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001761014808741,13.001761014808741,3901.7603165038818,11385.434800600735,7483.674484096854,55.80727059175654,54.36691227451458,12.056061523557375,13.001761014808741
-25680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003148415972516,13.003148415972516,3938.893418879959,11495.232614424296,7556.339195544338,55.81505614989104,54.360806587844785,12.04826602639932,13.003148415972516
-25740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004470994572305,13.004470994572305,3971.5786466285967,11591.922478423674,7620.343831795077,55.821912255287316,54.35542980809418,12.041500077425695,13.004470994572305
-25800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00570605510828,13.00570605510828,4001.1944864893158,11679.558928114951,7678.364441625638,55.82812640535214,54.350556470491476,12.035402820927306,13.00570605510828
-25860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006837584985881,13.006837584985881,4026.707034913659,11755.081907221298,7728.374872307639,55.83348161467878,54.3463567420154,12.03021429206808,13.006837584985881
-25920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007854336639399,13.007854336639399,4048.58698511466,11819.872129805914,7771.285144691255,55.838075785450094,54.34275384460553,12.025808249973288,13.007854336639399
-25980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008748877398565,13.008748877398565,4068.5705186590117,11879.048376228886,7810.477857569875,55.842271880942036,54.33946313071351,12.021749811156836,13.008748877398565
-26040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009517182320304,13.009517182320304,4086.5910451706154,11932.410698952845,7845.8196537822305,55.84605572242189,54.336495719760435,12.018051804861006,13.009517182320304
-26100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01015807603379,13.01015807603379,4101.5845968070225,11976.815032510354,7875.230435703333,55.84920436809516,54.334026449917076,12.014975915964444,13.01015807603379
-26160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0106719584651,13.0106719584651,4114.886556324625,12016.20182582157,7901.315269496946,55.8519972286489,54.3318361982795,12.01219334638216,13.0106719584651
-26220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011061025015108,13.011061025015108,4126.843735594243,12051.59420873557,7924.750473141329,55.85450685233604,54.32986807015971,12.009620826025438,13.011061025015108
-26280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011328760768702,13.011328760768702,4136.394937920734,12079.857848802214,7943.462910881481,55.85651098765468,54.3282963623787,12.007523818840019,13.011328760768702
-26340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011479351980205,13.011479351980205,4145.367400042533,12106.388767243514,7961.021367200981,55.85839225864644,54.326821008779355,12.005455527645404,13.011479351980205
-26400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011518264185586,13.011518264185586,4153.09008369299,12129.205779471775,7976.115695778784,55.86001018207357,54.32555218086347,12.003586978114313,13.011518264185586
-26460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011451122251547,13.011451122251547,4158.928453803723,12146.43531140189,7987.506857598168,55.861231905102265,54.32459406612313,12.002080369413214,13.011451122251547
-26520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01128374459696,13.01128374459696,4164.732822545879,12163.543244490458,7998.810421944581,55.862445005941524,54.32364271318279,12.000484623659627,13.01128374459696
-26580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011022966126795,13.011022966126795,4170.029301110218,12179.131197115794,8009.101896005575,55.8635503271748,54.32277588449777,11.998923400825765,13.011022966126795
-26640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010675248235536,13.010675248235536,4174.3002764903085,12191.671442827968,8017.37116633766,55.8644395396495,54.32207853529561,11.997530807186635,13.010675248235536
-26700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01024735289882,13.01024735289882,4177.373887459333,12200.657580711018,8023.283693251687,55.86507673504451,54.32157882604393,11.996355878081415,13.01024735289882
-26760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009744959177956,13.009744959177956,4179.849138740279,12207.86008131931,8028.010942579027,55.86558745507517,54.321178302866365,11.995256254336093,13.009744959177956
-26820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00917334810794,13.00917334810794,4182.085772969924,12214.342669441323,8032.256896471403,55.8660471270732,54.32081781320815,11.99414825418118,13.00917334810794
-26880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008537044052426,13.008537044052426,4183.93536750054,12219.667878630677,8035.732511130137,55.86642473084128,54.32052168411203,11.993072926720464,13.008537044052426
-26940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007840597625966,13.007840597625966,4184.945713060009,12222.500925699667,8037.555212639657,55.866625618591726,54.32036414143636,11.992146350806324,13.007840597625966
-27000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007088567665267,13.007088567665267,4185.71423585757,12224.607528458762,8038.893292601191,55.86677499510761,54.32024699553801,11.991225448544366,13.007088567665267
-27060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006285839083864,13.006285839083864,4187.246091599453,12228.957782398966,8041.7116907995105,55.86708346607886,54.32000508261865,11.990066796901539,13.006285839083864
-27120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00543783549921,13.00543783549921,4187.596502746088,12229.808377291458,8042.211874545371,55.86714378068199,54.319957781954784,11.98915583282031,13.00543783549921
-27180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00454883331167,13.00454883331167,4187.242717306194,12228.570028781867,8041.327311475673,55.86705597096272,54.320026645178615,11.988378870398565,13.00454883331167
-27240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003623330089953,13.003623330089953,4186.75679905823,12226.933502549522,8040.17670349129,55.86693992696884,54.320117650634394,11.987599037184875,13.003623330089953
-27300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002665076755733,13.002665076755733,4186.555984251293,12226.131985631398,8039.576001380106,55.86688309242425,54.32016222212372,11.986716972607653,13.002665076755733
-27360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001678422028176,13.001678422028176,4186.359283056687,12225.336462810923,8038.977179754238,55.86682668291398,54.32020646028738,11.98580627722975,13.001678422028176
-27420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000667429407642,13.000667429407642,4185.333365088894,12222.086595097478,8036.753230008583,55.86659623893737,54.32038718191218,11.985076615672515,13.000667429407642
-27480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999635461094785,12.999635461094785,4184.420599724547,12219.166479519998,8034.7458797954505,55.86638917727114,54.32054956637242,11.98429861305724,12.999635461094785
-27540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998585877252722,12.998585877252722,4183.279198052339,12215.567410196321,8032.288212143984,55.866133971870745,54.32074970670718,11.98355990570038,12.998585877252722
-27600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997521598031655,12.997521598031655,4182.607548829488,12213.352595049331,8030.745046219846,55.8659769221676,54.320872870167335,11.982690943129695,12.997521598031655
-27660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99644593419832,12.99644593419832,4181.621084239304,12210.205679557184,8028.584595317879,55.86575377843007,54.32104786670836,11.981888604294506,12.99644593419832
-27720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995361446939773,12.995361446939773,4180.436592360223,12206.472178507918,8026.0355861476955,55.86548904067346,54.32125548262539,11.981126545801995,12.995361446939773
-27780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994270711165422,12.994270711165422,4179.348552357984,12203.022304564429,8023.673752206443,55.865244414559385,54.3214473263414,11.980334587437401,12.994270711165422
-27840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.993175871921586,12.993175871921586,4177.774518649002,12198.136566292722,8020.362047643721,55.86489797317215,54.321719016889894,11.979658559883006,12.993175871921586
-27900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.992078780724759,12.992078780724759,4176.362866208494,12193.730051889988,8017.367185681495,55.86458551294562,54.321964058312346,11.97894024200553,12.992078780724759
-27960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.990981195001405,12.990981195001405,4175.393704643823,12190.63020951106,8015.236504867236,55.86436570714796,54.32213643713293,11.97811222471062,12.990981195001405
-28020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.989885128840617,12.989885128840617,4173.61770293026,12185.148453621608,8011.530750691348,55.86397700297412,54.32244127152653,11.977484765090045,12.989885128840617
-28080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.988791719091063,12.988791719091063,4172.043922716384,12180.26461387252,8008.220691156138,55.8636306962745,54.32271285644863,11.976809957728536,12.988791719091063
-28140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9877023577745,12.9877023577745,4170.5554800757,12175.633835453407,8005.078355377707,55.86330233383998,54.32297036889727,11.976118002477463,12.9877023577745
-28200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.986618095493796,12.986618095493796,4168.643464189928,12169.753785183244,8001.110320993316,55.86288538719752,54.323297351948845,11.975535486242542,12.986618095493796
-28260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.985540007609826,12.985540007609826,4167.579234682248,12166.378332026585,7998.7990973443375,55.86264603825889,54.32348505713308,11.974749774862072,12.985540007609826
-28320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9844691271575,12.9844691271575,4165.954216261869,12161.348958858238,7995.394742596369,55.862289412046024,54.32376473495146,11.974109405118869,12.9844691271575
-28380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983406340220967,12.983406340220967,4164.250646965534,12156.089663429197,7991.839016463663,55.86191648236954,54.32405719847368,11.973496254734194,12.983406340220967
-28440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.98235219045651,12.98235219045651,4162.974497986803,12152.09427551589,7989.119777529089,55.86163317471575,54.32427937750507,11.972786033841794,12.98235219045651
-28500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981307554219748,12.981307554219748,4161.469265010939,12147.424842327195,7985.955577316258,55.861302071421406,54.324539039424714,11.972141552204544,12.981307554219748
-28560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.980272798497365,12.980272798497365,4159.594620219461,12141.667251632134,7982.072631412674,55.860893808348806,54.32485921253973,11.971597774123385,12.980272798497365
-28620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979248238726651,12.979248238726651,4158.81666777908,12139.149447311243,7980.332779532162,55.86071527421233,54.32499922478785,11.97079337127867,12.979248238726651
-28680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978234729681883,12.978234729681883,4157.340131127837,12134.572018306217,7977.231887178379,55.86039069485676,54.32525377042354,11.970172007097894,12.978234729681883
-28740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977232194740038,12.977232194740038,4154.876682401424,12127.08403998612,7972.207357584696,55.859859732384386,54.32567016837906,11.969804698751485,12.977232194740038
-28800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97624080963965,12.97624080963965,4153.685426444459,12123.35389738259,7969.668470938133,55.859595233004676,54.32587759735319,11.969134432398805,12.97624080963965
-28860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.975260553987079,12.975260553987079,4152.247467484685,12118.898136246235,7966.650668761549,55.85927928100748,54.32612537713521,11.968535811399438,12.975260553987079
-28920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.974291639710215,12.974291639710215,4150.574130632663,12113.75028160221,7963.176150969547,55.85891425361414,54.32641164343124,11.968006242228626,12.974291639710215
-28980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97333416681722,12.97333416681722,4149.064064382561,12109.086991082442,7960.0229266998795,55.85858358602313,54.32667096365821,11.967447509902739,12.97333416681722
-29040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.972388365959358,12.972388365959358,4147.423194466794,12104.040355702988,7956.617161236196,55.85822573598776,54.32695160123782,11.966932358971755,12.972388365959358
-29100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.971454046699279,12.971454046699279,4146.3161474128665,12100.571863910649,7954.255716497785,55.857979789974024,54.32714448006187,11.966296718172204,12.971454046699279
-29160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.970531449919386,12.970531449919386,4144.969007201242,12096.397456459546,7951.428449258305,55.857683788457486,54.32737661403126,11.965731661004726,12.970531449919386
-29220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.969620401218,12.969620401218,4143.048703504961,12090.534206054384,7947.485502549423,55.857268033421754,54.32770266258626,11.965319133662069,12.969620401218
-29280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.968720503438226,12.968720503438226,4142.057861068081,12087.416502846849,7945.358641778768,55.8570469613786,54.32787603443753,11.964688260188069,12.968720503438226
-29340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.967831330125597,12.967831330125597,4140.50648989428,12082.647090563602,7942.1406006693205,55.85670876893254,54.32814125589938,11.964205997260438,12.967831330125597
-29400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966952072828931,12.966952072828931,4138.793682283997,12077.403606491533,7938.609924207537,55.85633696072966,54.328432839925696,11.963773154105748,12.966952072828931
-29460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966082440858864,12.966082440858864,4137.858970888612,12074.458452055576,7936.599481166962,55.85612812391138,54.328596616517636,11.963157825883348,12.966082440858864
-29520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.965221949528784,12.965221949528784,4135.793942068721,12068.180021606477,7932.386079537756,55.85568292913364,54.32894575267114,11.962830016843755,12.965221949528784
-29580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.964370094374187,12.964370094374187,4133.974347222181,12062.627907259155,7928.6535600369725,55.85528923644607,54.32925449921864,11.96245007361425,12.964370094374187
-29640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.963526677328879,12.963526677328879,4133.189162250073,12060.13000204868,7926.940839798606,55.85511211347777,54.32939340478299,11.961823329966904,12.963526677328879
-29700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.962691600722653,12.962691600722653,4131.307884413719,12054.39984348151,7923.09195906779,55.854705795957976,54.32971205213254,11.961474864284616,12.962691600722653
-29760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.961864691654409,12.961864691654409,4129.6595516819125,12049.358966782323,7919.699415100413,55.85434835447068,54.329992369315526,11.961076897707008,12.961864691654409
-29820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.961045765917715,12.961045765917715,4128.783971011729,12046.599954936426,7917.815983924697,55.85415271682358,54.330145794690225,11.960496210121928,12.961045765917715
-29880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.960234881486262,12.960234881486262,4127.002705030458,12041.170629316899,7914.167924286442,55.853767731001604,54.33044771303193,11.960146551933846,12.960234881486262
-29940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.959431869167101,12.959431869167101,4125.417703620725,12036.32223612422,7910.904532503495,55.85342393829746,54.330717326397426,11.959756154141512,12.959431869167101
-30000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.958636487440625,12.958636487440625,4124.655083282748,12033.90188523898,7909.246801956232,55.85325231464596,54.33085191921956,11.959170482335978,12.958636487440625
-30060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.957849115130243,12.957849115130243,4122.881758385748,12028.50154387144,7905.619785485692,55.852869384108075,54.331152225740965,11.958841669810937,12.957849115130243
-30120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.957069279942898,12.957069279942898,4120.796002783231,12022.181306597537,7901.385303814303,55.85242122508568,54.331503686551066,11.958597155428635,12.957069279942898
-30180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95629663776225,12.95629663776225,4119.878124350833,12019.308146169133,7899.430021818302,55.852217493382255,54.3316634595467,11.95807181683899,12.95629663776225
-30240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95553157779622,12.95553157779622,4118.6403470916985,12015.492993955952,7896.852646864257,55.85194696639606,54.33187561556492,11.957632669996448,12.95553157779622
-30300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.954773808361528,12.954773808361528,4117.008787751075,12010.517893582657,7893.509105831582,55.85159418916152,54.33215227488993,11.957297629286877,12.954773808361528
-30360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.954023122784138,12.954023122784138,4114.899738784481,12004.13595215202,7889.236213367541,55.85114165487197,54.332507166926135,11.957087109214244,12.954023122784138
-30420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953278752975613,12.953278752975613,4113.946815778653,12001.16593263495,7887.219116856299,55.850931055069395,54.3326723261074,11.956597845654432,12.953278752975613
-30480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952541123992694,12.952541123992694,4113.033455907209,11998.314143680234,7885.2806877730245,55.85072883883184,54.332830910625646,11.956105379954824,12.952541123992694
-30540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951810397970064,12.951810397970064,4111.34889940114,11993.189122299002,7881.840222897861,55.850365430980276,54.333115906824595,11.955809622187756,12.951810397970064
-30600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951086798893435,12.951086798893435,4109.806638748454,11988.485516475032,7878.678877726577,55.85003190511362,54.33337746860384,11.955485717770904,12.951086798893435
-30660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95036998039796,12.95036998039796,4107.70946805643,11982.146776963207,7874.437308906779,55.849582434315224,54.33372995815113,11.955305095890218,12.95036998039796
-30720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949659521299926,12.949659521299926,4106.576803165377,11978.654418570472,7872.0776154050955,55.849334796274576,54.33392416391746,11.954893025472515,12.949659521299926
-30780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948955807690988,12.948955807690988,4105.5353522399355,11975.432633848777,7869.897281608841,55.849106344226506,54.33410332340743,11.954465033455524,12.948955807690988
-30840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948258833108962,12.948258833108962,4103.605482801769,11969.592098726594,7865.986615924826,55.84869220043309,54.33442810837404,11.954262434242974,12.948258833108962
-30900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947568432718015,12.947568432718015,4101.878564862327,11964.351731997029,7862.473167134704,55.848320613723494,54.334719518698165,11.954016212293947,12.947568432718015
-30960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946884387645545,12.946884387645545,4100.320850471624,11959.611915020107,7859.291064548483,55.847984520279674,54.334983094054536,11.953734472669018,12.946884387645545
-31020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94620656406415,12.94620656406415,4098.930926970379,11955.368420367307,7856.4374933969275,55.84768362033552,54.3352190695294,11.953417437297716,12.94620656406415
-31080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945535024959373,12.945535024959373,4097.092082820661,11949.802470816712,7852.710387996052,55.84728894708658,54.33552858506488,11.95321706976641,12.945535024959373
-31140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944869750188575,12.944869750188575,4095.469485300321,11944.875762365149,7849.406277064825,55.84693960149785,54.33580255318219,11.952969512371432,12.944869750188575
-31200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944210506505545,12.944210506505545,4094.2908534502753,11941.259748169761,7846.968894719486,55.84668319530636,54.33600363521617,11.952618458948571,12.944210506505545
-31260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94355753587826,12.94355753587826,4092.627288695236,11936.215129973965,7843.58784127873,55.84632548894528,54.33628416012176,11.952392924840007,12.94355753587826
-31320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942910727640047,12.942910727640047,4090.7563979271813,11930.560600664134,7839.804202736951,55.845924534718506,54.33659860140333,11.952224424362269,12.942910727640047
-31380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942269698527484,12.942269698527484,4088.856593977252,11924.822223271523,7835.965629294274,55.84551763497411,54.336917705352256,11.952068643106625,12.942269698527484
-31440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941634454910606,12.941634454910606,4087.757883282021,11921.447489898756,7833.689606616734,55.84527833769784,54.3371053700212,11.951721191989744,12.941634454910606
-31500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94100511064388,12.94100511064388,4085.722339845762,11915.311658616924,7829.5893187711645,55.84484325513665,54.33744657584719,11.951610163785107,12.94100511064388
-31560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940381284353476,12.940381284353476,4083.095781092825,11907.43451656218,7824.338735469355,55.84428469889103,54.337884613732754,11.951650010171953,12.940381284353476
-31620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9397627802573,12.9397627802573,4081.950206907016,11903.925556205413,7821.975349298397,55.84403588382707,54.33807974255886,11.951330333194027,12.9397627802573
-31680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939149559455846,12.939149559455846,4080.527347751429,11899.600231936292,7819.072884184864,55.84372918164737,54.338320268334634,11.95108405919545,12.939149559455846
-31740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938541878236885,12.938541878236885,4078.1086318352936,11892.3399705551,7814.2313387198055,55.843214367562936,54.338724002201694,11.951088357000456,12.938541878236885
-31800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937939316617019,12.937939316617019,4076.560698393009,11887.648439773167,7811.087741380157,55.84288169827683,54.33898489222274,11.950883209788769,12.937939316617019
-31860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937342200955033,12.937342200955033,4074.721405409055,11882.099175248572,7807.377769839521,55.84248820842179,54.339293479702405,11.950755077301936,12.937342200955033
-31920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936750089072586,12.936750089072586,4072.3222099439217,11874.900401864918,7802.578191920994,55.84197775445252,54.33969379422603,11.950769636199714,12.936750089072586
-31980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936162867431113,12.936162867431113,4070.7737105518736,11870.210920517038,7799.437209965166,55.84164523055035,54.339954570232315,11.950579493679928,12.936162867431113
-32040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935580711102624,12.935580711102624,4068.897528429961,11864.556589552843,7795.659061122883,55.84124429066945,54.34026900026338,11.950474931101544,12.935580711102624
-32100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935003393669147,12.935003393669147,4067.0184850299324,11858.895017495195,7791.876532465262,55.84084283735797,54.340583832943345,11.950375759352847,12.935003393669147
-32160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934431103277712,12.934431103277712,4065.036073039673,11852.929946053237,7787.893873013566,55.84041986340106,54.34091554280997,11.950306902777672,12.934431103277712
-32220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933863519038894,12.933863519038894,4063.166076794032,11847.297447231655,7784.131370437624,55.84002047167707,54.34122875872628,11.950214930546734,12.933863519038894
-32280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933300788391046,12.933300788391046,4060.563953266282,11839.50791119152,7778.94395792524,55.83946812784096,54.341661924639254,11.950307870349505,12.933300788391046
-32340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932742361345534,12.932742361345534,4058.0083217158895,11831.856595728636,7773.8482740127465,55.838925585054675,54.342087404251735,11.950393520970387,12.932742361345534
-32400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932188148425553,12.932188148425553,4056.580255188443,11827.530203741371,7770.949948552929,55.83861880739986,54.34232798921753,11.950205713330146,12.932188148425553
-32460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931638364481296,12.931638364481296,4054.4010099849897,11820.990610855264,7766.589600870276,55.838155095175246,54.34269164735219,11.950207082906168,12.931638364481296
-32520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931093014590404,12.931093014590404,4052.0735369153194,11814.015233440494,7761.941696525173,55.8376604821921,54.34307953886181,11.950249222436552,12.931093014590404
-32580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.930552060872921,12.930552060872921,4049.694968746941,11806.890396150377,7757.195427403435,55.83715527128337,54.34347574160765,11.950308186661275,12.930552060872921
-32640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.930015151799278,12.930015151799278,4047.5740298612486,11800.525997596887,7752.9519677356375,55.8367039819114,54.34382965733919,11.950307656320751,12.930015151799278
-32700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929482513511466,12.929482513511466,4045.3697336515893,11793.916998793022,7748.547265141432,55.83623534835733,54.34419717493969,11.950331770980869,12.929482513511466
-32760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928953859519634,12.928953859519634,4042.40349849156,11785.06332685992,7742.65982836836,55.83560754866685,54.344689515775784,11.950547235391152,12.928953859519634
-32820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928429071173479,12.928429071173479,4040.372426241032,11778.966970429085,7738.594544188052,55.83517526583494,54.34502852596347,11.950536306586528,12.928429071173479
-32880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92790825079382,12.92790825079382,4038.239491335323,11772.571411843184,7734.331920507862,55.834721767089434,54.34538417435724,11.950554281418915,12.92790825079382
-32940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.927391386663954,12.927391386663954,4035.723959405217,11765.049294238095,7729.325334832881,55.834188385900134,54.345802469148865,11.950670222468489,12.927391386663954
-33000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926878459944847,12.926878459944847,4033.1636200124653,11757.396188693212,7724.232568680746,55.83364571661172,54.346228047968395,11.950800989889803,12.926878459944847
-33060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926369399825324,12.926369399825324,4030.124298623913,11748.332563888494,7718.208265264581,55.83300302974989,54.3467320638061,11.951053336911304,12.926369399825324
-33120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925863776068027,12.925863776068027,4027.779385630813,11741.316359447605,7713.536973816793,55.83250552217146,54.34712222535102,11.951138144960975,12.925863776068027
-33180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925361877594812,12.925361877594812,4025.6556178397245,11734.95283963051,7709.297221790786,55.83205429542402,54.347476091970385,11.95117214535898,12.925361877594812
-33240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924863642535046,12.924863642535046,4022.493042527309,11725.529082379617,7703.036039852307,55.83138607231822,54.348000134157076,11.951465247099314,12.924863642535046
-33300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924368985620944,12.924368985620944,4019.6771006580047,11717.127840650288,7697.450739992283,55.83079035416045,54.3484673156169,11.951676517562735,12.924368985620944
-33360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923877750390467,12.923877750390467,4016.8016770954073,11708.552314412771,7691.750637317365,55.83018227783133,54.34894418875469,11.951905715673465,12.923877750390467
-33420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92338970752328,12.92338970752328,4014.258841535787,11700.95774234875,7686.698900812961,55.82964375938047,54.34936651235309,11.95205617394218,12.92338970752328
-33480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922905279745688,12.922905279745688,4012.243688233354,11694.918999434305,7682.67531120095,55.829215562213285,54.34970231843025,11.952080323840377,12.922905279745688
-33540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922424677866696,12.922424677866696,4008.869514458955,11684.87689161604,7676.007377157082,55.82850349319273,54.35026074600239,11.952442452240405,12.922424677866696
-33600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.921947451413805,12.921947451413805,4006.168733098057,11676.81992250033,7670.651189402274,55.82793218708265,54.35070878274431,11.95264219549258,12.921947451413805
-33660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92147389343318,12.92147389343318,4003.3136728334375,11668.309412786486,7664.99573995305,55.82732872122582,54.35118204020051,11.952883422345815,12.92147389343318
-33720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.921003500031487,12.921003500031487,3999.876157352489,11658.083772642793,7658.207615290306,55.82660363844184,54.35175067358711,11.953270943675655,12.921003500031487
-33780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92053622677886,12.92053622677886,3997.1597720906047,11649.983718603044,7652.823946512442,55.82602927741618,54.35220110609271,11.95348410943675,12.92053622677886
-33840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.920072188065047,12.920072188065047,3993.6644706705824,11639.58981742796,7645.925346757378,55.82529226367243,54.3527790961241,11.953891943483866,12.920072188065047
-33900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.91961108456568,12.91961108456568,3990.940357308327,11631.468833751123,7640.528476442799,55.82471641867522,54.353230692408225,11.954112945118661,12.91961108456568
-33960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.91915336288039,12.91915336288039,3988.43874183088,11624.004274109919,7635.565532279041,55.82418711962222,54.35364578585643,11.95428249422473,12.91915336288039
-34020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.918698949599808,12.918698949599808,3984.881263644392,11613.430159500358,7628.548895855965,55.823437327460184,54.35423379713704,11.954714866152745,12.918698949599808
-34080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.918247882228151,12.918247882228151,3981.423576967008,11603.151077977314,7621.727501010307,55.82270845566439,54.354805401989346,11.955125911072502,12.918247882228151
-34140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917799745368297,12.917799745368297,3978.325917612733,11593.933502976284,7615.60758536355,55.822054853517926,54.35531797794653,11.95545124284688,12.917799745368297
-34200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917354687423547,12.917354687423547,3975.781729731351,11586.347206270577,7610.565476539227,55.82151692251472,54.35573984084946,11.955643455129106,12.917354687423547
-34260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916913001907446,12.916913001907446,3972.2686647623027,11575.907907644174,7603.639242881873,55.82077669021661,54.35632035497536,11.9560771266793,12.916913001907446
-34320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916474457422645,12.916474457422645,3968.821018062281,11565.662309342832,7596.841291280552,55.820050192947654,54.356890097646854,11.95649772778137,12.916474457422645
-34380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916039018657301,12.916039018657301,3965.298051939347,11555.195853637164,7589.897801697817,55.81930803515225,54.357472121810076,11.956939824474087,12.916039018657301
-34440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915606440809393,12.915606440809393,3961.6061911261304,11544.23289467314,7582.626703547009,55.81853067128069,54.35808175571764,11.957426179407115,12.915606440809393
-34500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915176661444171,12.915176661444171,3958.5480223333643,11535.137293943466,7576.5892716101025,55.817885718520564,54.35858754854611,11.957759439348907,12.915176661444171
-34560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.914749914438524,12.914749914438524,3955.4826530486102,11526.021398567105,7570.538745518496,55.81723932676598,54.35909446988063,11.9580973852763,12.914749914438524
-34620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.914326309768615,12.914326309768615,3951.742689234467,11514.919671159298,7563.176981924829,55.81645212331638,54.359711820303744,11.95860416724105,12.914326309768615
-34680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.913905725149176,12.913905725149176,3948.407475148458,11505.010960549229,7556.603485400771,55.81574951461278,54.36026282878914,11.95901435871408,12.913905725149176
-34740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.913488212921814,12.913488212921814,3944.7533017492888,11494.163882006067,7549.410580256778,55.81498036802533,54.360866018436575,11.959505893195482,12.913488212921814
-34800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.913073547947812,12.913073547947812,3940.7335564806904,11482.241196909255,7541.5076404285655,55.814134952238156,54.36152902085887,11.9600899975562,12.913073547947812
-34860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912661656262438,12.912661656262438,3937.548386601168,11472.777170791298,7535.228784190132,55.8134638755373,54.36205530092718,11.960471646711138,12.912661656262438
-34920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912252647626016,12.912252647626016,3933.7207329978173,11461.422096837328,7527.701363839508,55.812658708198526,54.3626867392136,11.961013952863786,12.912252647626016
-34980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.911846469737547,12.911846469737547,3929.504821840592,11448.924725147237,7519.419903306645,55.811772542747775,54.36338169884096,11.961654373118364,12.911846469737547
-35040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.911442920074267,12.911442920074267,3926.1183892624663,11438.870796669236,7512.75240740677,55.81105963740943,54.36394078228057,11.962093471893466,12.911442920074267
-35100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.911042188684974,12.911042188684974,3922.462316468941,11428.023821531433,7505.561505062491,55.81029049869535,54.36454396575344,11.962601528263527,12.911042188684974
-35160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.910644294001226,12.910644294001226,3918.5553753478252,11416.439138427273,7497.883763079444,55.8094690505875,54.365188171945896,11.963173939868796,12.910644294001226
-35220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.910249339143286,12.910249339143286,3914.6186744547813,11404.767840882168,7490.149166427386,55.808641460914785,54.36583719455232,11.963756474722715,12.910249339143286
-35280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.909857020496773,12.909857020496773,3910.5279254908264,11392.643940660164,7482.116015169339,55.80778177814957,54.366511385600546,11.964379371707633,12.909857020496773
-35340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.909467557652787,12.909467557652787,3906.4334278035662,11380.510021832275,7474.076594028707,55.80692138509502,54.36718613368067,11.965005915787545,12.909467557652787
-35400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.909080482824562,12.909080482824562,3902.774220071718,11369.65854105576,7466.884320984043,55.80615192737218,54.36778956733053,11.965527797158856,12.909080482824562
-35460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.908696366382296,12.908696366382296,3898.788467450703,11357.846684965856,7459.058217515154,55.80531437137581,54.3684464058505,11.966132729875207,12.908696366382296
-35520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.908314874851618,12.908314874851618,3894.6577138573216,11345.608910933799,7450.95119707648,55.804446614468354,54.3691269289024,11.966775784636544,12.908314874851618
-35580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.907936340223136,12.907936340223136,3891.236911235543,11335.462130645803,7444.225219410261,55.803727125972145,54.36969117506747,11.967247279894428,12.907936340223136
-35640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.907560783094645,12.907560783094645,3886.7093086873842,11322.0581623689,7435.348853681515,55.80277667671663,54.370436548135096,11.967993485291498,12.907560783094645
-35700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.907188010694634,12.907188010694634,3882.402280826349,11309.304553930437,7426.90227310409,55.80187234333497,54.37114575564187,11.968688164664245,12.907188010694634
-35760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906817877188315,12.906817877188315,3878.9024953481457,11298.928098297632,7420.025602949486,55.80113656929087,54.37172277346068,11.969187100423627,12.906817877188315
-35820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906450726878667,12.906450726878667,3874.688624672284,11286.450688998633,7411.762064326349,55.8002518208653,54.37241662181103,11.96986426986831,12.906450726878667
-35880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906086277136946,12.906086277136946,3869.9218975182253,11272.347009328489,7402.425111810262,55.799251756964225,54.37320090428946,11.970679780745568,12.906086277136946
-35940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.905724537118807,12.905724537118807,3866.04389170136,11260.860176792688,7394.816285091328,55.79843724860457,54.37383966810678,11.971279626003229,12.905724537118807
-36000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.905365513889105,12.905365513889105,3862.125902755701,11249.256600448567,7387.130697692867,55.797614462275604,54.37448492377557,11.971891886974594,12.905365513889105
-36060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.905009258681893,12.905009258681893,3857.363080796016,11235.167533311143,7377.804452515125,55.79661543491533,54.375268393365154,11.972714236474015,12.905009258681893
-36120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.904655668201375,12.904655668201375,3852.678564530296,11221.309997894185,7368.631433363888,55.79563282514886,54.37603898774634,11.973519887369278,12.904655668201375
-36180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.904304449622636,12.904304449622636,3848.8054807157146,11209.841450242107,7361.035969526391,55.79481961377516,54.37667673442529,11.974128561826925,12.904304449622636
-36240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90395590444598,12.90395590444598,3844.3305573355133,11196.60269893953,7352.2721416040185,55.793880880986606,54.3774129190603,11.974887548868608,12.90395590444598
-36300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9036096818237,12.9036096818237,3839.9735155656517,11183.71179380066,7343.73827823501,55.792966813385384,54.378129760457114,11.975619798205248,12.9036096818237
-36360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.903266042678304,12.903266042678304,3835.7069287078693,11171.088046188395,7335.381117480528,55.79207168949697,54.37883174558121,11.976332301133446,12.903266042678304
-36420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902924656411235,12.902924656411235,3830.8309831379706,11156.672109954576,7325.841126816603,55.79104948535943,54.37963339114965,11.977196524148047,12.902924656411235
-36480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902585488081877,12.902585488081877,3826.430636399425,11143.65661149568,7317.225975096255,55.790126583494406,54.38035716066206,11.977946097240048,12.902585488081877
-36540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902248381182053,12.902248381182053,3821.8754298421613,11130.186332545947,7308.310902703786,55.78917143422732,54.38110621963086,11.978735630399811,12.902248381182053
-36600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.901913368365857,12.901913368365857,3817.444554109725,11117.082782945374,7299.638228835649,55.78824228910158,54.38183488531038,11.979496626250313,12.901913368365857
-36660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.901580589396307,12.901580589396307,3813.147191038825,11104.372970588047,7291.225779549222,55.78734106317886,54.38254165584729,11.980226971943926,12.901580589396307
-36720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90125016026067,12.90125016026067,3807.816887898182,11088.625036443496,7280.808148545315,55.7862244106325,54.383417370914756,11.981213050827446,12.90125016026067
-36780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90092158200931,12.90092158200931,3803.061730591203,11074.570197219475,7271.508466628274,55.78522781200714,54.384198935811824,11.982059710575257,12.90092158200931
-36840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.900594975684273,12.900594975684273,3798.8516397160884,11062.11982181936,7263.268182103271,55.78434498260853,54.38489127919913,11.982774471105074,12.900594975684273
-36900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.900270520279884,12.900270520279884,3794.343201931016,11048.792609274196,7254.44940734318,55.78339997869937,54.38563238184988,11.983564482517798,12.900270520279884
-36960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899948512618355,12.899948512618355,3789.2371094519535,11033.7082088193,7244.471099367345,55.782330376545495,54.386471198476755,11.984503464831738,12.899948512618355
-37020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899628513673164,12.899628513673164,3784.754004587719,11020.45740727715,7235.703402689434,55.7813907910594,54.387208051824786,11.985291476645331,12.899628513673164
-37080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899310984148256,12.899310984148256,3780.24905522961,11007.143307423503,7226.894252193895,55.780446717361215,54.38794842497399,11.986087195325911,12.899310984148256
-37140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.898995621102587,12.898995621102587,3775.224970813277,10992.303087241706,7217.078116428429,55.77939442996625,54.38877366280655,11.987012327022311,12.898995621102587
-37200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.898682654141304,12.898682654141304,3770.742832692044,10979.057976412329,7208.315143720286,55.77845524840978,54.38951019937989,11.987806771421713,12.898682654141304
-37260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89837212555395,12.89837212555395,3766.3122493722935,10965.965450564268,7199.653201191975,55.77752688644736,54.39023825087738,11.988590886723257,12.89837212555395
-37320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.898064165001626,12.898064165001626,3760.922203032762,10950.05191610388,7189.129713071118,55.776398493196666,54.39112317338518,11.989612802624707,12.898064165001626
-37380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.897758258123195,12.897758258123195,3756.126493686662,10935.88742342846,7179.760929741799,55.77539412076027,54.39191083475647,11.990490857657356,12.897758258123195
-37440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89745490487046,12.89745490487046,3751.7485197144374,10922.95251456369,7171.203994849254,55.77447693548886,54.392630121131155,11.991268876575614,12.89745490487046
-37500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89715384123376,12.89715384123376,3746.550908029663,10907.608011897266,7161.0571038676035,55.77338889150855,54.39348340043521,11.992250098410278,12.89715384123376
-37560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896855188898824,12.896855188898824,3741.4351756368737,10892.505367866801,7151.070192229928,55.77231799735051,54.39432323029358,11.993213514985321,12.896855188898824
-37620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896558720423991,12.896558720423991,3736.546749979988,10878.072173385564,7141.525423405574,55.77129457249904,54.395125833185396,11.994123243472572,12.896558720423991
-37680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896264602259512,12.896264602259512,3731.8129886935358,10864.094780551854,7132.281791858318,55.770303467650955,54.39590308968452,11.994997268392071,12.896264602259512
-37740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895972739184172,12.895972739184172,3726.390809952736,10848.094018079544,7121.703208126809,55.76916889048628,54.396792861817815,11.996042238194153,12.895972739184172
-37800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895683243636146,12.895683243636146,3721.623171937384,10834.01898115817,7112.395809220786,55.768170862238776,54.39757554787083,11.996928942062304,12.895683243636146
-37860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895396077998875,12.895396077998875,3716.6481634286406,10819.335164292072,7102.687000863431,55.76712966697558,54.39839208689468,11.997868698945028,12.895396077998875
-37920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895111264065713,12.895111264065713,3711.7810929792745,10804.969712391912,7093.188619412636,55.76611104638816,54.39919092212713,11.998784216240574,12.895111264065713
-37980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894829034895134,12.894829034895134,3707.051074459785,10791.00823747232,7083.957163012534,55.76512107101251,54.39996729285741,11.999668587598874,12.894829034895134
-38040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894549348751028,12.894549348751028,3701.384088854765,10774.293015532212,7072.908926677447,55.76393583410058,54.400896794004105,12.000785077547073,12.894549348751028
-38100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894271975162097,12.894271975162097,3695.980484898647,10758.353246908853,7062.372762010205,55.762805582948246,54.401783173538504,12.001839171583955,12.894271975162097
-38160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893996721836727,12.893996721836727,3691.1174997827397,10744.003848909671,7052.886349126934,55.76178810136528,54.40258111552682,12.002762733841822,12.893996721836727
-38220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893723810781633,12.893723810781633,3686.316371911529,10729.83726490132,7043.52089298979,55.76078358283864,54.40336889146679,12.00367335295393,12.893723810781633
-38280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893453395839472,12.893453395839472,3681.3548445557776,10715.200143931925,7033.8452993761475,55.75974569982257,54.404182832919226,12.004625657698464,12.893453395839472
-38340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893185658702093,12.893185658702093,3675.7566532922087,10698.692551941736,7022.935898649527,55.75857518640254,54.405100787427045,12.005736548677797,12.893185658702093
-38400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892920310084019,12.892920310084019,3670.843280008157,10684.199074768261,7013.355794760103,55.75754748916194,54.405906740864715,12.00668185156844,12.892920310084019
-38460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892657383599653,12.892657383599653,3665.637682878855,10668.847626787549,7003.209943908695,55.756458955469405,54.406760404216925,12.007701066061294,12.892657383599653
-38520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892396783825046,12.892396783825046,3660.2291064538863,10652.900587352895,6992.671480899011,55.75532819002938,54.4076471870724,12.00877221867172,12.892396783825046
-38580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892138715357945,12.892138715357945,3655.4341732425532,10638.758252298305,6983.324079055751,55.75432539190953,54.408433613813685,12.009695394061326,12.892138715357945
-38640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891883106657462,12.891883106657462,3650.0336412806664,10622.836973962172,6972.803332681505,55.75319645348692,54.40931896386295,12.010769297348798,12.891883106657462
-38700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891629986603675,12.891629986603675,3644.747704225733,10607.25357177777,6962.505867552039,55.752091473210726,54.41018552515838,12.011817473671904,12.891629986603675
-38760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891379354523034,12.891379354523034,3639.662766444396,10592.261942644922,6952.599176200526,55.7510284542621,54.41101917902268,12.012818757282979,12.891379354523034
-38820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891130992971606,12.891130992971606,3634.0817854193456,10575.81352255792,6941.731737138575,55.74986213810331,54.41193384190238,12.013943714913076,12.891130992971606
-38880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890885023952329,12.890885023952329,3629.4043087827254,10562.02131957028,6932.617010787556,55.74888416778534,54.412700797877896,12.014849583928076,12.890885023952329
-38940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890641818571794,12.890641818571794,3624.0279964098,10546.176504819405,6922.148508409603,55.747760652122786,54.41358189522322,12.015929284702814,12.890641818571794
-39000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890400933535409,12.890400933535409,3618.500465342113,10529.888370317836,6911.387904975724,55.74660570197745,54.41448764450731,12.017048216202983,12.890400933535409
-39060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890162610175759,12.890162610175759,3613.5735091861934,10515.366076778106,6901.792567591913,55.74557596328735,54.415295198915736,12.01802246052954,12.890162610175759
-39120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.889926654072376,12.889926654072376,3608.029577797824,10499.03187352101,6891.002295723186,55.74441774690371,54.41620350968964,12.019150068399053,12.889926654072376
-39180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.889693158905127,12.889693158905127,3602.26481995775,10482.049927207729,6879.785107249981,55.74321360093761,54.417147839928596,12.02033408341552,12.889693158905127
-39240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.889461738004925,12.889461738004925,3596.784044200223,10465.903409613056,6869.119365412835,55.74206869326661,54.41804571357929,12.021450488842213,12.889461738004925
-39300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.889232488381607,12.889232488381607,3591.8267292136898,10451.295842067571,6859.46911285388,55.74103290872024,54.418858009343865,12.022440743275613,12.889232488381607
-39360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.889005486320993,12.889005486320993,3586.686186443344,10436.15089779332,6849.464711349978,55.7399590203604,54.41970018735221,12.023477996320779,12.889005486320993
-39420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88878123960211,12.88878123960211,3581.7129283704016,10421.498464110467,6839.785535740065,55.7389200548022,54.42051497776922,12.024476906936364,12.88878123960211
-39480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888559603196866,12.888559603196866,3575.663724836988,10403.686196891169,6828.022472054181,55.73765703397167,54.421505479582386,12.025741755988669,12.888559603196866
-39540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888340085936608,12.888340085936608,3569.8988660190857,10386.71034291088,6816.811476891795,55.73645332121785,54.422449470082256,12.02693896176094,12.888340085936608
-39600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888122858221946,12.888122858221946,3564.7896281802978,10371.661472771548,6806.871844591249,55.73538624595594,54.4232863050387,12.027977801558945,12.888122858221946
-39660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88790758620198,12.88790758620198,3559.7764215840552,10356.895583092832,6797.119161508778,55.734339236250094,54.42410740393665,12.028994972723106,12.88790758620198
-39720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887695038584162,12.887695038584162,3554.463162400968,10341.24935708857,6786.786194687603,55.73322980443166,54.4249774562756,12.030088194561243,12.887695038584162
-39780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887484990719088,12.887484990719088,3549.005993074013,10325.18146420101,6776.175471126996,55.73209047354042,54.425870956435105,12.03121901388718,12.887484990719088
-39840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887277364560184,12.887277364560184,3543.3673346703554,10308.58155615726,6765.214221486905,55.730913419095714,54.426794040626184,12.032396548108744,12.887277364560184
-39900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88707194738717,12.88707194738717,3537.887390998542,10292.448835509074,6754.561444510534,55.729769491840905,54.427691145402775,12.033537310715046,12.88707194738717
-39960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.886868865969634,12.886868865969634,3532.220986651416,10275.769519317146,6743.548532665731,55.72858680719211,54.428618644982116,12.034725916493606,12.886868865969634
-40020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.886667788372767,12.886667788372767,3526.8289349682427,10259.896932069176,6733.067997100934,55.727461325678995,54.429501284011074,12.03584925215659,12.886667788372767
-40080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88646904033327,12.88646904033327,3521.9317607898897,10245.4786765087,6723.54691571881,55.72643896699122,54.430303050782825,12.036853676034493,12.88646904033327
-40140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.886272644970324,12.886272644970324,3516.030286322192,10228.112059282039,6712.0817729598475,55.72520754832734,54.43126876915408,12.038106111550718,12.886272644970324
-40200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.886078560861835,12.886078560861835,3510.312217444837,10211.285119113241,6700.972901668402,55.72401439688388,54.43220447713256,12.0393158376575,12.886078560861835
-40260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.885886641691,12.885886641691,3505.6023912683427,10197.419861275492,6691.817470007149,55.72303125024303,54.432975492547996,12.040280883302785,12.885886641691
-40320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.885697224911482,12.885697224911482,3499.80610545447,10180.365271901896,6680.559166447424,55.72182195722498,54.43392385927171,12.041514158190735,12.885697224911482
-40380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88551000032027,12.88551000032027,3493.862493549245,10162.879146765838,6669.016653216593,55.72058206544617,54.43489622253392,12.04278553848986,12.88551000032027
-40440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.885324913092553,12.885324913092553,3488.472118106252,10147.018472566691,6658.546354460439,55.719457430004894,54.43577819804596,12.043923566042723,12.885324913092553
-40500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.885141812766681,12.885141812766681,3482.9413551365074,10130.746541592303,6647.805186455796,55.71830363370879,54.43668304244415,12.045097808031029,12.885141812766681
-40560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884960954260404,12.884960954260404,3477.5960488049436,10115.020102624483,6637.42405381954,55.717188516887525,54.43755755314631,12.046228795610144,12.884960954260404
-40620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884782301997573,12.884782301997573,3471.981120405001,10098.503046824251,6626.5219264192465,55.71601733988807,54.4384760280546,12.047427823801652,12.884782301997573
-40680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884605875977087,12.884605875977087,3466.5731797592625,10082.594666813256,6616.021487053993,55.71488932253557,54.439360655770855,12.048578318616727,12.884605875977087
-40740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884431727325454,12.884431727325454,3461.361858434025,10067.26447204504,6605.902613611014,55.713802302811956,54.440213131819675,12.049682873892296,12.884431727325454
-40800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884259941136408,12.884259941136408,3455.8345728990907,10051.00769371414,6595.173120815049,55.71264958192439,54.44111713284768,12.050866951291898,12.884259941136408
-40860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884090389584214,12.884090389584214,3450.1524400765397,10034.297353140904,6584.144913064364,55.71146470046461,54.442046355237295,12.052091009500925,12.884090389584214
-40920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883923124571329,12.883923124571329,3444.2283863476628,10016.877910711417,6572.649524363754,55.710229538886814,54.443015008922785,12.053376388455238,12.883923124571329
-40980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883757708518278,12.883757708518278,3438.9235356070585,10001.276990445553,6562.353454838492,55.709123323576826,54.4438825387717,12.054512064947348,12.883757708518278
-41040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883594512926395,12.883594512926395,3433.3843376269438,9984.989156063251,6551.604818436309,55.707968401405715,54.444788266117506,12.05570714943699,12.883594512926395
-41100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883433357987936,12.883433357987936,3427.2666664189474,9967.004406799962,6539.737740381014,55.7066931562508,54.44578835464149,12.057045604787753,12.883433357987936
-41160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883273977544837,12.883273977544837,3421.744331612168,9950.76796803164,6529.0236364194725,55.70554187881006,54.44669122367178,12.058240139605394,12.883273977544837
-41220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883116687765849,12.883116687765849,3416.4335620235997,9935.153397478553,6518.719835454951,55.704434696377014,54.4475595119699,12.05938491692588,12.883116687765849
-41280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882961388132925,12.882961388132925,3411.2597502996828,9919.94165948499,6508.6819091853085,55.70335607777111,54.44840539959029,12.060498086807055,12.882961388132925
-41340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882808432111428,12.882808432111428,3405.7961182945287,9903.880312249119,6498.084193954591,55.70221721611766,54.44929853175836,12.061684336823394,12.882808432111428
-41400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882657853373225,12.882657853373225,3400.1416410978004,9887.259894428957,6487.1182533311585,55.70103871266138,54.4502227523112,12.062919493889108,12.882657853373225
-41460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882509459797141,12.882509459797141,3394.5988165595454,9870.968105675604,6476.36928911606,55.69988351149846,54.45112869845143,12.064129417474241,12.882509459797141
-41520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882363278412946,12.882363278412946,3388.8653678161245,9854.1179142049,6465.252546388774,55.6986887159087,54.45206569582264,12.065388026586216,12.882363278412946
-41580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882218966639853,12.882218966639853,3383.3669937258533,9837.958443874373,6454.591450148518,55.69754289744557,54.452964283746006,12.066590927438764,12.882218966639853
-41640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882076779755835,12.882076779755835,3377.942417126191,9822.016448844191,6444.074031718001,55.69641249968174,54.453850778257895,12.067777796870118,12.882076779755835
-41700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881936721204633,12.881936721204633,3371.984941730268,9804.511790999772,6432.526849269503,55.69517129853177,54.45482416837135,12.0690969191272,12.881936721204633
-41760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88179849375973,12.88179849375973,3366.2298474431627,9787.601894580372,6421.372047137212,55.69397227029443,54.4557644851218,12.07036828920464,12.88179849375973
-41820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881662065794616,12.881662065794616,3361.5042650553523,9773.713428280815,6412.209163225465,55.6929874824444,54.45653678762659,12.071389751504706,12.881662065794616
-41880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881527973443232,12.881527973443232,3355.655967055878,9756.531928882685,6400.875961826805,55.691769196084216,54.45749220722028,12.072687798746223,12.881527973443232
-41940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881395883148565,12.881395883148565,3349.671845725428,9738.952936759555,6389.281091034129,55.69052272498909,54.45846973019528,12.074020913056511,12.881395883148565
-42000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881265778258953,12.881265778258953,3344.3778975287373,9723.399653899947,6379.021756371211,55.68941989076701,54.45933460848561,12.075187248551657,12.881265778258953
-42060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88113753153768,12.88113753153768,3338.797014692688,9707.005477850202,6368.2084631575135,55.68825743165908,54.46024624654122,12.076425442090436,12.88113753153768
-42120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881011386439882,12.881011386439882,3333.288874981476,9690.825624472482,6357.536749491004,55.68711016969185,54.46114596650722,12.077647846115733,12.881011386439882
-42180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88088720594576,12.88088720594576,3327.3050537810936,9673.251329053901,6345.946275272803,55.68586403249612,54.46212322762752,12.07898831241617,12.88088720594576
-42240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880764720833714,12.880764720833714,3321.923396792707,9657.444268832684,6335.520872039976,55.68474320450668,54.46300221721261,12.080183250628764,12.880764720833714
-42300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880644216042088,12.880644216042088,3316.733038338473,9642.199188697165,6325.466150358691,55.68366222490286,54.46384995640398,12.081333327830677,12.880644216042088
-42360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880525789154685,12.880525789154685,3310.880750062036,9625.013477132972,6314.132727070935,55.682443641575716,54.46480560888875,12.082647064154227,12.880525789154685
-42420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880409311475447,12.880409311475447,3305.160037961703,9608.214626010566,6303.0545880488635,55.6812524894889,54.46573974890705,12.08393049041785,12.880409311475447
-42480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880294663709776,12.880294663709776,3299.745254978072,9592.31392894378,6292.568673965708,55.68012502279125,54.46662394478197,12.0851409102096,12.880294663709776
-42540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88018184850534,12.88018184850534,3294.408268693275,9576.642237653448,6282.233968960173,55.679013794334715,54.467495406102636,12.08633405468485,12.88018184850534
-42600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88007118850996,12.88007118850996,3288.866620192389,9560.37122068706,6271.504600494669,55.677860069847476,54.468400194186,12.08757922502076,12.88007118850996
-42660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879962402492135,12.879962402492135,3283.557959258289,9544.784333852798,6261.226374594508,55.676754854973034,54.469266939460994,12.088769260677966,12.879962402492135
-42720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879855783218446,12.879855783218446,3278.288586585861,9529.313537645114,6251.02495105925,55.67565787188422,54.47012722910325,12.089951757459865,12.879855783218446
-42780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87975127883649,12.87975127883649,3272.4342464784118,9512.128236798297,6239.693990319884,55.67443931914278,54.47108285760172,12.091279101323021,12.87975127883649
-42840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879648679704076,12.879648679704076,3266.7596755270215,9495.471007308399,6228.711331781379,55.67325821040412,54.472009121301326,12.092564337090918,12.879648679704076
-42900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879547679222624,12.879547679222624,3261.6497935541047,9480.470413600024,6218.820620045922,55.67219456837758,54.47284326380347,12.093713188400395,12.879547679222624
-42960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879448779630092,12.879448779630092,3255.902757676595,9463.602425376394,6207.699667699799,55.67099851584219,54.47378124691214,12.095019598063821,12.879448779630092
-43020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879351686718627,12.879351686718627,3250.291104196297,9447.132272462866,6196.841168266568,55.6698306726829,54.474697107315066,12.096294649348788,12.879351686718627
-43080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879256319624407,12.879256319624407,3244.8701604484113,9431.222117662244,6186.351957213834,55.668702537300966,54.47558182759384,12.097524761268186,12.879256319624407
-43140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879162657466606,12.879162657466606,3239.6815915166303,9415.994059537676,6176.312468021048,55.66762276727114,54.47642861819815,12.098699749063769,12.879162657466606
-43200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879071066557145,12.879071066557145,3234.0949578323716,9399.599796903214,6165.504839070843,55.66646030582451,54.47734025808784,12.099973872707233,12.879071066557145
-43260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878981220524617,12.878981220524617,3228.3720039915997,9382.806731840561,6154.434727848961,55.66526956686318,54.47827407411974,12.101282909047901,12.878981220524617
-43320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878893226991615,12.878893226991615,3223.186843742527,9367.59113179526,6144.404288052733,55.664190680749066,54.47912017152874,12.102462420481856,12.878893226991615
-43380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878806889490653,12.878806889490653,3217.7223431641437,9351.55740129046,6133.835058126318,55.66305378399356,54.48001176276024,12.103711671129274,12.878806889490653
-43440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878722452292545,12.878722452292545,3212.448488050663,9336.083368787296,6123.634880736632,55.661956573684684,54.48087223059583,12.104916186681494,12.878722452292545
-43500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878639861478279,12.878639861478279,3207.3001594579614,9320.978089332371,6113.67792987441,55.66088551055761,54.48171219296518,12.106091813099345,12.878639861478279
-43560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878559239374015,12.878559239374015,3201.902124966627,9305.141659550887,6103.239534584259,55.65976260427421,54.482592812415646,12.10733024491576,12.878559239374015
-43620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87848064391534,12.87848064391534,3196.234115627425,9288.514744057064,6092.280628429638,55.65858364759549,54.48351738840022,12.108636476637743,12.87848064391534
-43680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878403645452448,12.878403645452448,3190.6502635189736,9272.135317945931,6081.485054426959,55.6574222397309,54.48442820203675,12.109923665658824,12.878403645452448
-43740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878328227252837,12.878328227252837,3185.7080918681013,9257.63742331578,6071.929331447677,55.656394244857104,54.485234388887996,12.111055762166874,12.878328227252837
-43800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878254728597904,12.878254728597904,3180.400132058309,9242.068197247803,6061.668065189496,55.65529028580399,54.48610014930725,12.112278932920574,12.878254728597904
-43860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878182891100831,12.878182891100831,3174.898214244131,9225.931286978315,6051.033072734187,55.654146074454005,54.486997476880475,12.113550989898679,12.878182891100831
-43920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878112904503421,12.878112904503421,3169.919531645302,9211.328639700509,6041.409108055207,55.65311065244664,54.48780948833023,12.114697139945582,12.878112904503421
-43980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878044781884208,12.878044781884208,3164.131350684987,9194.354414972602,6030.223064287615,55.65190707048267,54.48875337626048,12.116042543851547,12.878044781884208
-44040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877978158913633,12.877978158913633,3158.66582674722,9178.32655551509,6019.66072876787,55.650770592116935,54.48964463937718,12.11731063284649,12.877978158913633
-44100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877913079664244,12.877913079664244,3153.7261199119566,9163.840323284929,6010.11420337297,55.649743425207795,54.49045017691173,12.1184519034964,12.877913079664244
-44160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877849636737206,12.877849636737206,3148.801417079512,9149.398746329649,6000.59732925014,55.64871942480199,54.49125323117188,12.119591063219257,12.877849636737206
-44220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87778823028672,12.87778823028672,3143.587305532632,9134.10987849629,5990.5225729636595,55.64763534621149,54.492103400688926,12.120802755069251,12.87778823028672
-44280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877728611596876,12.877728611596876,3137.654302795707,9116.715301762046,5979.060998966339,55.64640195959604,54.49307066239149,12.122191477865353,12.877728611596876
-44340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877670407178352,12.877670407178352,3132.3303825165412,9101.106199536196,5968.775817019655,55.64529517472397,54.49393863890943,12.123432961158107,12.877670407178352
-44400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877613677148464,12.877613677148464,3127.16488526385,9085.96199523511,5958.797109971259,55.64422135425459,54.49478076367586,12.124637191132946,12.877613677148464
-44460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877558315337039,12.877558315337039,3122.536828699795,9072.393114037532,5949.856285337737,55.643259234366205,54.49553528923147,12.12571163818493,12.877558315337039
-44520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877504903936412,12.877504903936412,3117.418843447457,9057.38951042874,5939.970666981283,55.64219538370485,54.4963695953518,12.12690742295161,12.877504903936412
-44580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877453304528876,12.877453304528876,3112.0857600813347,9041.756463554408,5929.6707034730725,55.641086901704114,54.49723890281296,12.1281573775262,12.877453304528876
-44640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877403430856845,12.877403430856845,3107.300860640616,9027.730161385354,5920.429300744738,55.640092348232606,54.49801886383418,12.129275293630686,12.877403430856845
-44700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877355294214599,12.877355294214599,3102.107630542737,9012.508293249899,5910.400662707164,55.63901302174585,54.49886530659765,12.130494424429244,12.877355294214599
-44760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877308905222144,12.877308905222144,3096.646191713014,8996.501447679779,5899.855255966764,55.637878035594994,54.49975539947115,12.131780603341324,12.877308905222144
-44820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877263862707313,12.877263862707313,3091.679711978672,8981.94524801733,5890.265536038659,55.63684590954189,54.5005648261269,12.132947364164894,12.877263862707313
-44880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877220548279386,12.877220548279386,3087.2511330340276,8968.96542347435,5881.714290440324,55.63592555852828,54.501286595179074,12.133984627086578,12.877220548279386
-44940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877178933814848,12.877178933814848,3081.635318424735,8952.508500447746,5870.8731820230105,55.63475865959468,54.50220171508965,12.13531294540666,12.877178933814848
-45000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877138832578652,12.877138832578652,3076.1160633266118,8936.3351804564,5860.21911712979,55.633611870091855,54.50310106453378,12.136619141066527,12.877138832578652
-45060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877100045599894,12.877100045599894,3071.6288996344947,8923.185635991287,5851.556736356794,55.63267948532385,54.50383227084561,12.137674973857575,12.877100045599894
-45120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877062747128134,12.877062747128134,3066.662829268462,8908.633951533337,5841.971122264876,55.63164768023167,54.50464144579341,12.138848958105545,12.877062747128134
-45180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877026958436568,12.877026958436568,3061.847795572961,8894.525290123069,5832.677494550107,55.630647288386314,54.50542598545637,12.139987555275244,12.877026958436568
-45240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876992893659166,12.876992893659166,3057.1187264117043,8880.669063400212,5823.550336988507,55.629664795876465,54.506196487881105,12.141106840167394,12.876992893659166
-45300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876960508883727,12.876960508883727,3051.962706494099,8865.563040453791,5813.600333959693,55.6285936852192,54.507036487525205,12.142331782578967,12.876960508883727
-45360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876929706140807,12.876929706140807,3047.314428299849,8851.944714846239,5804.630286546391,55.62762806167181,54.507793760763604,12.143434475736678,12.876929706140807
-45420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876900506657755,12.876900506657755,3042.753027638931,8838.581429211106,5795.828401572176,55.626680522172464,54.50853685190625,12.144517522150528,12.876900506657755
-45480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876873021241677,12.876873021241677,3037.353088191649,8822.763079523083,5785.409991331434,55.62555890364037,54.509416461460454,12.145806552550711,12.876873021241677
-45540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876846775021395,12.876846775021395,3032.519469108075,8808.603832794252,5776.084363686176,55.6245549258985,54.510203813299505,12.146958733691847,12.876846775021395
-45600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876821945141142,12.876821945141142,3028.1328151841612,8795.754067357697,5767.621252173536,55.623643798570875,54.510918348838615,12.148003340033464,12.876821945141142
-45660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87679868162416,12.87679868162416,3023.2776645392964,8781.532969615237,5758.255305075942,55.62263543550145,54.511709139793474,12.149163598141456,12.87679868162416
-45720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876776895385909,12.876776895385909,3018.526026191467,8767.61559413111,5749.0895679396435,55.62164860835101,54.51248304158365,12.150300033911364,12.876776895385909
-45780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876756526490176,12.876756526490176,3013.454111990169,8752.760999360493,5739.306887370323,55.62059532677488,54.51330905908527,12.151515846036984,12.876756526490176
-45840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876737367498007,12.876737367498007,3008.900398433345,8739.42432959777,5730.523931164425,55.61964967550272,54.51405066941903,12.152606538822706,12.876737367498007
-45900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876719700772377,12.876719700772377,3004.275799753369,8725.880679649015,5721.604879895647,55.61868934820958,54.51480378916346,12.153715921043966,12.876719700772377
-45960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87670329224764,12.87670329224764,2999.333206135866,8711.406514425915,5712.073308290049,55.61766304186743,54.51560865181351,12.154903961596228,12.87670329224764
-46020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876688237072155,12.876688237072155,2994.8743351567573,8698.349210372124,5703.474875215366,55.616737199734686,54.51633472717902,12.155975440269982,12.876688237072155
-46080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876674506113984,12.876674506113984,2990.352023154731,8685.10669368422,5694.754670529489,55.61579822503303,54.517071101530114,12.157063630402877,12.876674506113984
-46140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876662193021073,12.876662193021073,2985.909224956973,8672.097518266288,5686.188293309315,55.61487579577058,54.51779450041229,12.158133799876426,12.876662193021073
-46200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876651298823855,12.876651298823855,2981.089359796604,8657.984974909352,5676.89561511275,55.61387513118851,54.518579253964205,12.159297166101544,12.876651298823855
-46260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876641646963403,12.876641646963403,2976.7716374552447,8645.343037731593,5668.571400276348,55.61297874159645,54.51928223169407,12.160339395685895,12.876641646963403
-46320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87663354376251,12.87663354376251,2972.3397259582375,8632.367353359812,5660.027627401573,55.61205868744078,54.52000376794064,12.16141091779566,12.87663354376251
-46380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876626790171573,12.876626790171573,2967.5759063290807,8618.420565083443,5650.844658754361,55.61106977631229,54.52077930405384,12.162564560443801,12.876626790171573
-46440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87662115911861,12.87662115911861,2963.2649988563867,8605.800131146694,5642.535132290309,55.61017491180618,54.521481085761955,12.163608953918994,12.87662115911861
-46500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87661687676975,12.87661687676975,2958.449900482513,8591.704307285116,5633.254406802603,55.60917543344201,54.52226490904341,12.164777420222952,12.87661687676975
-46560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876613625401951,12.876613625401951,2953.747385756855,8577.938562441675,5624.191176684822,55.608199359802434,54.52303037758232,12.165919433752828,12.876613625401951
-46620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876611419386942,12.876611419386942,2949.5111756315123,8565.538250251004,5616.027074619491,55.60732010362669,54.5237199187326,12.166948875179866,12.876611419386942
-46680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876610329379606,12.876610329379606,2945.692607476236,8554.360848863744,5608.668241387509,55.60652755922819,54.52434145770072,12.167877675553695,12.876610329379606
-46740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876610717436769,12.876610717436769,2941.3434849499718,8541.630981864175,5600.287496914203,55.605624935876676,54.52504932414652,12.168937086283373,12.876610717436769
-46800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876612464240806,12.876612464240806,2937.011089124001,8528.950578368604,5591.9394892446035,55.604725819903535,54.525754439992674,12.169993718737981,12.876612464240806
-46860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876615688845286,12.876615688845286,2933.084512942129,8517.458465557114,5584.373952614986,55.60391096090719,54.52639347879064,12.170952952678075,12.876615688845286
-46920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876620308502392,12.876620308502392,2928.220330704832,8503.22264459217,5575.0023138873385,55.60290155685879,54.52718508611489,12.172141807322845,12.876620308502392
-46980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876625921884544,12.876625921884544,2923.867731017503,8490.484592805191,5566.616861787688,55.6019983536484,54.52789340730478,12.173207037201292,12.876625921884544
-47040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876632498910467,12.876632498910467,2919.9205680577697,8478.933549083218,5559.012981025449,55.60117931643613,54.52853572279489,12.174174468205118,12.876632498910467
-47100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876640150439055,12.876640150439055,2916.003732601015,8467.471667257605,5551.467934656589,55.60036660142829,54.52917308020769,12.175135538961424,12.876640150439055
-47160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87664926816902,12.87664926816902,2911.489280827671,8454.261316543956,5542.772035716285,55.599429909789116,54.529907664107284,12.176243501739226,12.87664926816902
-47220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876659261860555,12.876659261860555,2907.0805190289148,8441.360710917952,5534.280191889038,55.59851518102726,54.530625024007676,12.177326555128145,12.876659261860555
-47280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876670366513725,12.876670366513725,2903.0754988330327,8429.642072232242,5526.566573399209,55.597684260777214,54.5312766585606,12.178312379746925,12.876670366513725
-47340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87668229489526,12.87668229489526,2899.059803179981,8417.892566828468,5518.832763648487,55.59685115199972,54.531930009427604,12.17930157938024,12.87668229489526
-47400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876695441276786,12.876695441276786,2894.5086908995345,8404.576735656165,5510.068044756629,55.59590698167345,54.53267045835568,12.180422266380887,12.876695441276786
-47460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.8767092286545,12.8767092286545,2890.8459656058117,8393.86089636141,5503.0149307555985,55.595147166078064,54.533266330337135,12.181327309347461,12.8767092286545
-47520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876724263498378,12.876724263498378,2887.0870263182173,8382.863916532864,5495.776890214646,55.59436741606676,54.533877835532714,12.182256967560766,12.876724263498378
-47580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876740372974016,12.876740372974016,2882.419052889175,8369.207430427196,5486.788377538021,55.59339909167542,54.53463722686036,12.183408896526064,12.876740372974016
-47640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876757415978394,12.876757415978394,2879.096151308721,8359.487081713554,5480.390930404833,55.59270986243236,54.53517774273978,12.184234341933387,12.876757415978394
-47700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876775604087626,12.876775604087626,2875.182606448561,8348.038885249647,5472.856278801087,55.59189811882854,54.53581433834609,12.185204633715994,12.876775604087626
-47760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876794797063596,12.876794797063596,2870.76667486466,8335.121154563454,5464.354479698795,55.59098217683413,54.5365326497027,12.186298142619707,12.876794797063596
-47820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876815052184234,12.876815052184234,2867.2535883479604,8324.84542957657,5457.591841228609,55.590253568450315,54.537104047978794,12.187172946504106,12.876815052184234
-47880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876836296473508,12.876836296473508,2863.147163747378,8312.834078518676,5449.686914771298,55.58940189423216,54.53777195846524,12.188193083236365,12.876836296473508
-47940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876858305234096,12.876858305234096,2859.101990519554,8301.0023005504,5441.9003100308455,55.588562952890385,54.53842988341792,12.189199032718168,12.876858305234096
-48000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876881174767695,12.876881174767695,2855.3694840086528,8290.085644838291,5434.7161608296365,55.58778889909158,54.53903692145929,12.190129714236484,12.876881174767695
-48060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876904871094569,12.876904871094569,2851.1235093256055,8277.667138070665,5426.543628745059,55.586908355507575,54.539727472236784,12.191186118228881,12.876904871094569
-48120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876929265873876,12.876929265873876,2847.294652208611,8266.469285781171,5419.17463357256,55.58611436344926,54.540350146506604,12.19214168256062,12.876929265873876
-48180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876954310680865,12.876954310680865,2843.848314378425,8256.390790640577,5412.542476262152,55.585399740324284,54.54091057709008,12.193004787161385,12.876954310680865
-48240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87698030963916,12.87698030963916,2840.337640527992,8246.124406280522,5405.786765752529,55.58467179485451,54.541481455487535,12.1938844583926,12.87698030963916
-48300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87700736896575,12.87700736896575,2836.2041139135417,8234.03630987979,5397.832195966248,55.5838146796659,54.542153632959106,12.1949166822333,12.87700736896575
-48360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87703522293923,12.87703522293923,2832.493247730048,8223.18498421024,5390.691736480193,55.58304525869134,54.542757037789784,12.19584682649453,12.87703522293923
-48420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877063874891489,12.877063874891489,2829.133242152043,8213.360326212958,5384.227084060918,55.58234863439582,54.543303353108676,12.196692371030604,12.877063874891489
-48480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877093328585133,12.877093328585133,2825.267918537422,8202.057815043821,5376.789896506398,55.581547221970254,54.54393184667064,12.197661610421493,12.877093328585133
-48540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877123688053725,12.877123688053725,2821.2635864412323,8190.349046677083,5369.08546023585,55.58071700369675,54.54458293071085,12.198665525996391,12.877123688053725
-48600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877154544603467,12.877154544603467,2817.662252227228,8179.819377107031,5362.157124879803,55.57997039032262,54.54516844908309,12.199571867493813,12.877154544603467
-48660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877186207489586,12.877186207489586,2814.411514766112,8170.315510965859,5355.90399619975,55.579296512309284,54.54569692603131,12.200393693488646,12.877186207489586
-48720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877218623134224,12.877218623134224,2811.079136108309,8160.573114680838,5349.493978572532,55.57860572122655,54.54623866675593,12.201236097198123,12.877218623134224
-48780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877251932886065,12.877251932886065,2807.08394372414,8148.892357199829,5341.808413475691,55.577777489449474,54.54688819292137,12.20224057791682,12.877251932886065
-48840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877285943873305,12.877285943873305,2803.5075935984473,8138.436979702426,5334.929386103979,55.57703614413181,54.54746957991321,12.203143842559335,12.877285943873305
-48900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877320635503812,12.877320635503812,2799.864064024657,8127.785405778628,5327.921341753971,55.57628088746415,54.548061876636,12.204064090810206,12.877320635503812
-48960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877355839604409,12.877355839604409,2796.4852239269844,8117.908244652067,5321.423020725085,55.575580541108074,54.54861111091525,12.204920440858482,12.877355839604409
-49020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877391742297075,12.877391742297075,2793.081917744151,8107.959797340067,5314.877879595916,55.57487514023431,54.549164309110864,12.205783405748232,12.877391742297075
-49080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87742833879757,12.87742833879757,2789.5176306660137,8097.540813448466,5308.023182782452,55.57413637575032,54.54974367212942,12.206686180972426,12.87742833879757
-49140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877465536780882,12.877465536780882,2786.277084915903,8088.068904771425,5301.791819855522,55.573464764290044,54.55027037157336,12.207510790721825,12.877465536780882
-49200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877503528754385,12.877503528754385,2782.978190440762,8078.426622077509,5295.448431636747,55.57278107242573,54.550806544861146,12.208350350271587,12.877503528754385
-49260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877542298665668,12.877542298665668,2779.448909190894,8068.110852865878,5288.6619436749825,55.572049626671685,54.55138016829482,12.209246679411578,12.877542298665668
-49320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877581625628851,12.877581625628851,2775.841254390423,8057.566150235999,5281.724895845577,55.57130194834035,54.551966521840974,12.210162590838866,12.877581625628851
-49380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877621473251596,12.877621473251596,2772.574884255735,8048.019749812867,5275.444865557133,55.57062505528546,54.552497363282356,12.210995999586256,12.877621473251596
-49440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87766183432982,12.87766183432982,2769.6448427627006,8039.457106556741,5269.812263794039,55.57001791616112,54.55297350143381,12.211748110153408,12.87766183432982
-49500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877702935706415,12.877702935706415,2766.035320849961,8028.907714257692,5262.87239340773,55.56926990553401,54.553560115577056,12.212666152381955,12.877702935706415
-49560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877744598763385,12.877744598763385,2762.3683651063793,8018.190644615013,5255.822279508636,55.56851000573596,54.55415605359296,12.213598686998795,12.877744598763385
-49620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877786575367589,12.877786575367589,2759.034498320613,8008.447817372282,5249.413319051669,55.5678191852136,54.5546978174051,12.2144505165094,12.877786575367589
-49680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877828928613212,12.877828928613212,2755.521108794281,7998.18026288697,5242.659154092688,55.5670911586951,54.555268759363614,12.215346343978634,12.877828928613212
-49740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877871595551259,12.877871595551259,2752.8837798851887,7990.474577413274,5237.590797528087,55.56654478294028,54.55569724491407,12.216029459863167,12.877871595551259
-49800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87791483424707,12.87791483424707,2749.5425530141792,7980.710865558153,5231.168312543974,55.56585248178714,54.556240169884774,12.216884260294824,12.87791483424707
-49860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877958651589895,12.877958651589895,2745.55702846835,7969.063502762295,5223.506474293946,55.56502661946183,54.55688783784944,12.217896248737706,12.877958651589895
-49920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878002659442913,12.878002659442913,2742.5146050372773,7960.1739256842675,5217.65932064699,55.56439629943801,54.55738215521253,12.218679117138288,12.878002659442913
-49980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878047031150864,12.878047031150864,2739.758232098457,7952.120902863911,5212.362670765455,55.5638252957745,54.55782995476606,12.21939278556526,12.878047031150864
-50040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878091913735357,12.878091913735357,2736.328521996242,7942.099348548532,5205.7708265522915,55.56311471245619,54.55838721720241,12.220270630541501,12.878091913735357
-50100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878137269401696,12.878137269401696,2733.2500088348634,7933.104845462411,5199.854836627547,55.562476952783186,54.55888736897917,12.221063544975808,12.878137269401696
-50160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878183069181096,12.878183069181096,2729.992843312046,7923.588212109078,5193.595368797032,55.561802171272745,54.55941655447904,12.221900306653366,12.878183069181096
-50220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87822931679607,12.87822931679607,2726.5411484809624,7913.503056321969,5186.961907841006,55.561087078477534,54.559977353393144,12.222784775319045,12.87822931679607
-50280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878275785109187,12.878275785109187,2723.418565220558,7904.3802968439695,5180.9617316234135,55.56044022491904,54.56048463688922,12.223589440356983,12.878275785109187
-50340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878322502308931,12.878322502308931,2720.210776856883,7895.008608707012,5174.797831850129,55.559775721022085,54.56100576235198,12.224415042996545,12.878322502308931
-50400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878369468542239,12.878369468542239,2717.317977284675,7886.557977818812,5169.240000534137,55.559176525173605,54.561475671129415,12.225164309489616,12.878369468542239
-50460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878416905502718,12.878416905502718,2713.687480418991,7875.950894208549,5162.263413789557,55.558424425134724,54.56206549232173,12.22609332606632,12.878416905502718
-50520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878464491209808,12.878464491209808,2710.452360277723,7866.499871423054,5156.0475111453325,55.55775429618059,54.56259102913639,12.226926368398273,12.878464491209808
-50580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878512167039554,12.878512167039554,2707.5052192225558,7857.8908800789,5150.385660856346,55.557143871897146,54.563069743615934,12.22768948865617,12.878512167039554
-50640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878560147146294,12.878560147146294,2704.8815205866767,7850.2275830705275,5145.34606248385,55.55660050252979,54.563495871460034,12.228374282990833,12.878560147146294
-50700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878608702116615,12.878608702116615,2702.063415898421,7841.9961559913745,5139.932740092953,55.55601684970496,54.56395359089528,12.229106877315203,12.878608702116615
-50760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878657780183351,12.878657780183351,2698.5446629483567,7831.7167471016965,5133.17208415334,55.55528798393385,54.564525191022845,12.230010248950009,12.878657780183351
-50820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878707198892345,12.878707198892345,2695.360905158479,7822.416817108373,5127.055911949894,55.55462856859071,54.565042325877,12.230832521722471,12.878707198892345
-50880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878756813007294,12.878756813007294,2692.509017459248,7814.087162641767,5121.578145182518,55.55403795108636,54.56550550723933,12.231574318497591,12.878756813007294
-50940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878806679983427,12.878806679983427,2689.92345518272,7806.536154980001,5116.612699797282,55.55350254389249,54.5659253908893,12.23225162918731,12.878806679983427
-51000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878857045519307,12.878857045519307,2686.6316374576254,7796.920877128806,5110.2892396711795,55.55282076886414,54.566460060932286,12.233101042381326,12.878857045519307
-51060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878907780490179,12.878907780490179,2684.0910820258855,7789.501756989504,5105.4106749636185,55.55229471330304,54.56687261072916,12.233768242363587,12.878907780490179
-51120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878958982110019,12.878958982110019,2680.8777105977983,7780.116161945887,5099.238451348089,55.55162922414355,54.56739450886669,12.234599380697126,12.878958982110019
-51180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87901046714849,12.87901046714849,2678.043241471445,7771.838256929021,5093.7950154575765,55.55104227621865,54.567854812426035,12.235338709967413,12.87901046714849
-51240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879062342958452,12.879062342958452,2674.862612993164,7762.548732450738,5087.686119457572,55.550383599102275,54.56837136833888,12.236162520087356,12.879062342958452
-51300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879114213930876,12.879114213930876,2671.668196627244,7753.219050132404,5081.5508535051595,55.54972207464511,54.56889015722853,12.236989657603484,12.879114213930876
-51360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87916628695282,12.87916628695282,2669.4194302715437,7746.653482957634,5077.23405268609,55.54925654079886,54.569255243937846,12.237587208815222,12.87916628695282
-51420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879218561485018,12.879218561485018,2666.195145459138,7737.236800535944,5071.041655076806,55.548588847681465,54.569778870490474,12.23842196923862,12.879218561485018
-51480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879271247031234,12.879271247031234,2663.565416269478,7729.558036778191,5065.992620508712,55.54804438233629,54.57020585783586,12.239112660810804,12.879271247031234
-51540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879324192546866,12.879324192546866,2660.415657249444,7720.359525268881,5059.943868019437,55.5473921588206,54.57071735262617,12.23992994058162,12.879324192546866
-51600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879377281507551,12.879377281507551,2657.6103212427247,7712.167792593905,5054.55747135118,55.54681132134647,54.571172864172276,12.24066366592699,12.879377281507551
-51660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879430615324116,12.879430615324116,2655.047646420706,7704.685401299483,5049.637754878776,55.54628077999825,54.57158893186861,12.24133866457176,12.879430615324116
-51720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87948413998197,12.87948413998197,2651.788815904431,7695.168576769518,5043.3797608650875,55.54560598657166,54.572118126713505,12.242182964022028,12.87948413998197
-51780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879537851971072,12.879537851971072,2649.353743108548,7688.059359995116,5038.7056168865665,55.545101905372285,54.572513443504725,12.242827309310465,12.879537851971072
-51840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879591794173054,12.879591794173054,2646.153695509709,7678.714642019163,5032.560946509453,55.54443931533143,54.573033068059594,12.243657706256235,12.879591794173054
-51900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879645757256814,12.879645757256814,2643.79577535954,7671.831119484216,5028.035344124676,55.54395123713626,54.57341583477697,12.244283532335725,12.879645757256814
-51960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879700230903413,12.879700230903413,2641.333316083596,7664.642236930311,5023.308920846714,55.543441507337036,54.57381558138298,12.244935245417311,12.879700230903413
-52020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879754807908899,12.879754807908899,2637.7300974541117,7654.119758757682,5016.38966130357,55.542695408045425,54.57440069659508,12.245864157239135,12.879754807908899
-52080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879809621051198,12.879809621051198,2635.1448852809544,7646.572406365072,5011.427521084116,55.542160260940335,54.57482037627503,12.246545995913118,12.879809621051198
-52140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879864366173472,12.879864366173472,2632.8192078439347,7639.783563770606,5006.9643559266715,55.54167889621856,54.57519787806926,12.24716471415342,12.879864366173472
-52200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87991941441,12.87991941441,2629.820723005615,7631.028740357447,5001.208017351831,55.54105813314602,54.57568470056183,12.24794714593785,12.87991941441
-52260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879974541149723,12.879974541149723,2626.582234711243,7621.572720794038,4994.990486082796,55.54038765163969,54.57621051385933,12.248787934353583,12.879974541149723
-52320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880029609398802,12.880029609398802,2624.640126945087,7615.905036038131,4991.264909093045,55.5399857830224,54.57652567223553,12.249313771183624,12.880029609398802
-52380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880085055659508,12.880085055659508,2621.8736868025712,7607.82866211215,4985.954975309579,55.53941312573379,54.576974768615415,12.250040191522427,12.880085055659508
-52440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880140661642985,12.880140661642985,2619.2190374027523,7600.079074061596,4980.860036658844,55.53886363932464,54.57740569364167,12.250739603946235,12.880140661642985
-52500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880196640062795,12.880196640062795,2616.2986881232055,7591.553251224516,4975.254563101313,55.53825911385313,54.57787978208199,12.251503901958948,12.880196640062795
-52560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880252636881954,12.880252636881954,2613.371090937608,7583.006370207238,4969.635279269632,55.537653095301415,54.57835504144411,12.252269963511017,12.880252636881954
-52620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880308651110832,12.880308651110832,2611.7382513400203,7578.242818228826,4966.504566888806,55.53731533458371,54.57861992433062,12.252721576804364,12.880308651110832
-52680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880365064761667,12.880365064761667,2608.799610643324,7569.663905434985,4960.8642947916605,55.53670704489779,54.579096964789706,12.253490707313675,12.880365064761667
-52740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880421658033164,12.880421658033164,2605.608353029613,7560.347023278705,4954.738670249092,55.536046429395846,54.579615040847244,12.254321348482685,12.880421658033164
-52800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880478391837606,12.880478391837606,2603.2933761276854,7553.590638459449,4950.2972623317655,55.53556736654068,54.57999073744321,12.254939305929286,12.880478391837606
-52860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880535128796913,12.880535128796913,2600.724601119408,7546.092779214027,4945.368178094618,55.53503572932912,54.58040766455103,12.255618891252606,12.880535128796913
-52920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880591924308447,12.880591924308447,2598.332993599486,7539.112656824832,4940.779663225345,55.53454080239115,54.58079580227416,12.256255499448006,12.880591924308447
-52980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880649055476908,12.880649055476908,2596.156156997953,7532.760156778735,4936.603999780783,55.53409037716964,54.581149040310954,12.25684027372235,12.880649055476908
-53040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880706565460168,12.880706565460168,2593.301122549755,7524.426286106311,4931.125163556557,55.53349946253394,54.5816124546933,12.257590100823993,12.880706565460168
-53100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880764158800375,12.880764158800375,2590.162519124779,7515.26405180534,4925.101532680561,55.53284981268296,54.58212193113245,12.258408853697036,12.880764158800375
-53160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880821598063172,12.880821598063172,2587.7673710491463,7508.274009939079,4920.506638889933,55.53235418256508,54.58251062031204,12.259046911674465,12.880821598063172
-53220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880879018057525,12.880879018057525,2585.747497389454,7502.380432271783,4916.632934882329,55.53193629745798,54.58283833933793,12.259593818010199,12.880879018057525
-53280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880936546751046,12.880936546751046,2583.355646684556,7495.400174968228,4912.044528283673,55.531441361183994,54.583226484382685,12.260231145691908,12.880936546751046
-53340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88099451081476,12.88099451081476,2580.1366008684654,7486.003403184565,4905.8668023161,55.53077508161764,54.58374900238285,12.261069741378943,12.88099451081476
-53400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881052327568526,12.881052327568526,2577.8493761652207,7479.329025004173,4901.479648838951,55.530301833834045,54.58412013861148,12.261681925969029,12.881052327568526
-53460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881110138139439,12.881110138139439,2575.9311836014717,7473.732815409774,4897.801631808304,55.52990503378126,54.58443132205536,12.262204495101312,12.881110138139439
-53520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881168230294127,12.881168230294127,2572.754337962252,7464.459668927801,4891.7053309655485,55.529247520037266,54.584946965613916,12.263032929723417,12.881168230294127
-53580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881226247228934,12.881226247228934,2570.611840357609,7458.208339368461,4887.596499010852,55.52880426868002,54.585294577674176,12.26361014470356,12.881226247228934
-53640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881284421913685,12.881284421913685,2568.436322393317,7451.860627047924,4883.424304654605,55.52835418332037,54.5856475491803,12.264195524147814,12.881284421913685
-53700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881342728112148,12.881342728112148,2565.0195425148963,7441.886919583122,4876.867377068225,55.52764699636937,54.586202148075465,12.265082379471052,12.881342728112148
-53760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881400717407356,12.881400717407356,2562.8671884384453,7435.607011725269,4872.7398232868245,55.52720171877101,54.58655134917958,12.265661932638087,12.881400717407356
-53820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881458796511208,12.881458796511208,2561.4688117660653,7431.529705591778,4870.060893825713,55.526912616920484,54.58677807220759,12.266058521681394,12.881458796511208
-53880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881517348474732,12.881517348474732,2558.9396085367857,7424.149122014682,4865.2095134778965,55.52638929584271,54.58718847753414,12.266730103056164,12.881517348474732
-53940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88157623066476,12.88157623066476,2556.088509407709,7415.828363006478,4859.739853598769,55.52579931157346,54.58765116229302,12.26748014288452,12.88157623066476
-54000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888496406067796,12.888496406067796,2553.5842074399507,7409.424226510336,4855.840019070385,55.52534522565517,54.5880072711667,12.274891900090624,12.888496406067796
-54060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.901553969189091,12.901553969189091,2550.419447874126,7401.895742882334,4851.476295008208,55.52481141783421,54.58842590053667,12.288498587907501,12.901553969189091
-54120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912635239037929,12.912635239037929,2547.8448278534547,7395.828218883622,4847.983391030168,55.524381199520604,54.588763291662254,12.300019292173927,12.912635239037929
-54180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.921349337657892,12.921349337657892,2544.6271096981664,7387.567323648264,4842.940213950097,55.52379546007454,54.58922264749342,12.309369144192848,12.921349337657892
-54240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928522584496625,12.928522584496625,2541.541414644909,7379.487695485731,4837.9462808408225,55.52322257343472,54.58967192373791,12.317172194802337,12.928522584496625
-54300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934657748011306,12.934657748011306,2539.9295550115376,7375.579006474357,4835.649451462819,55.522945427565396,54.5898892704985,12.323596524399175,12.934657748011306
-54360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939985510393065,12.939985510393065,2537.292398131021,7368.565789207166,4831.2733910761435,55.522448154930544,54.59027924779306,12.329476339509167,12.939985510393065
-54420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944633974205306,12.944633974205306,2534.64212173414,7361.424082151669,4826.781960417529,55.52194177175687,54.59067636986702,12.334691555384019,12.944633974205306
-54480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94869809276235,12.94869809276235,2532.247526993258,7354.9526033008715,4822.705076307613,55.52148291118808,54.591036223176154,12.339270144796108,12.94869809276235
-54540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952257300383438,12.952257300383438,2530.104142937674,7349.148993708393,4819.044850770721,55.52107140595315,54.591358938899816,12.343291260872162,12.952257300383438
-54600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95537956987624,12.95537956987624,2527.572004433945,7342.150789761025,4814.578785327081,55.52057519797819,54.59174808125361,12.346977347249654,12.95537956987624
-54660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.958122383455455,12.958122383455455,2524.99901604985,7334.9829999208505,4809.983983871001,55.52006696554593,54.59214665357602,12.350300312771635,12.958122383455455
-54720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.960535698502467,12.960535698502467,2522.982585193833,7329.399518738592,4806.416933544759,55.51967106861081,54.592457128765794,12.353163964346328,12.960535698502467
-54780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.962662488532482,12.962662488532482,2520.714331922651,7323.041827549727,4802.327495627075,55.519220276315785,54.59281065467351,12.355807153872075,12.962662488532482
-54840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.964540162315618,12.964540162315618,2517.762903786282,7314.653178435688,4796.890274649405,55.518625478931455,54.59327711403302,12.358371586352481,12.964540162315618
-54900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966200960471433,12.966200960471433,2515.4301636915693,7308.045584253673,4792.615420562103,55.518156967330896,54.593644535993604,12.360572296702678,12.966200960471433
-54960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.967673309776158,12.967673309776158,2513.4643767672624,7302.48658483769,4789.022208070428,55.51776280638917,54.59395364976119,12.362498454320257,12.967673309776158
-55020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.968982101717355,12.968982101717355,2511.125118186719,7295.8137704931405,4784.68865230642,55.51728967041305,54.59432469830678,12.364354638369589,12.968982101717355
-55080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.970149031455893,12.970149031455893,2509.005958528686,7289.7661734974035,4780.760214968715,55.51686086550908,54.5946609809908,12.366017791507328,12.970149031455893
-55140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97119303676772,12.97119303676772,2507.101732061406,7284.33119612109,4777.229464059684,55.516475498426715,54.59496319832926,12.3675077872823,12.97119303676772
-55200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.972130802238574,12.972130802238574,2504.879891433021,7277.953311481358,4773.073420048337,55.51602327453124,54.59531784694438,12.368970578426847,12.972130802238574
-55260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.972976555524044,12.972976555524044,2502.476361268894,7271.0319662812235,4768.555605012329,55.515532516600715,54.595702715196964,12.370387089583806,12.972976555524044
-55320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97374262966332,12.97374262966332,2500.627225015215,7265.721875040103,4765.094650024889,55.51515600464479,54.595997988058656,12.371590383044305,12.97374262966332
-55380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.974440104138115,12.974440104138115,2498.465645560756,7259.48893522256,4761.0232896618045,55.51471405814872,54.59634457680453,12.372802224168884,12.974440104138115
-55440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.975078291189512,12.975078291189512,2496.1023423385304,7252.6582280565635,4756.555885718034,55.51422972700221,54.596724404965066,12.374004835274407,12.975078291189512
-55500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.975663163178213,12.975663163178213,2493.9712404754378,7246.4998048442185,4752.52856436878,55.51379306416531,54.59706685009442,12.3750985286094,12.975663163178213
-55560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97619270363408,12.97619270363408,2492.482236693826,7242.21239875284,4749.730162059014,55.51348906576536,54.597305255478624,12.375981604780753,12.97619270363408
-55620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.976668317528734,12.976668317528734,2490.0880085151744,7235.270180981649,4745.182172466475,55.5129968280525,54.59769128422439,12.377031854611955,12.976668317528734
-55680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977099855388696,12.977099855388696,2487.4881699839443,7227.7208656430785,4740.232695659136,55.5124615441487,54.59811107118629,12.378088771044517,12.977099855388696
-55740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977497102192187,12.977497102192187,2486.207711056377,7224.026376071452,4737.8186650150765,55.51219958652825,54.59831650683055,12.37879100457088,12.977497102192187
-55800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977867309317432,12.977867309317432,2484.4457281688533,7218.919921479873,4734.474193311019,55.51183751360714,54.59860045613382,12.379583780608685,12.977867309317432
-55860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978215400035365,12.978215400035365,2482.0800888209947,7212.044911984433,4729.964823163438,55.51135004141535,54.59898274760374,12.380501649402625,12.978215400035365
-55920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978544908994492,12.978544908994492,2479.951336957816,7205.860425610072,4725.909088652256,55.5109115307601,54.59932664185204,12.381343614932124,12.978544908994492
-55980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978859155664669,12.978859155664669,2478.3298330809807,7201.157681464125,4722.8278483831455,55.51057808297275,54.599588142398964,12.38204717647168,12.978859155664669
-56040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979160857987619,12.979160857987619,2475.824874067581,7193.869243693758,4718.044369626176,55.51006129676932,54.59999342286556,12.382953303530094,12.979160857987619
-56100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979452090892961,12.979452090892961,2474.03865804652,7188.681776309096,4714.6431182625765,55.509693479758084,54.60028187687022,12.38367429440347,12.979452090892961
-56160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979734892489214,12.979734892489214,2472.9779887325712,7185.615414339693,4712.637425607122,55.50947605958714,54.600452384805095,12.384210502159467,12.979734892489214
-56220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.980011218977346,12.980011218977346,2470.1628428328563,7177.4164871893845,4707.25364435653,55.50889471529271,54.6009082938161,12.385167116726699,12.980011218977346
-56280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.980281814418431,12.980281814418431,2468.25619903898,7171.87414989712,4703.61795085814,55.508501736325044,54.601216480641355,12.385897099749869,12.980281814418431
-56340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.980547731660119,12.980547731660119,2467.166924457595,7168.721939685187,4701.555015227592,55.50827822913083,54.6013917622169,12.386423659854753,12.980547731660119
-56400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.98081007885915,12.98081007885915,2464.673403428873,7161.462004429743,4696.788601000871,55.50776346407386,54.60179545763502,12.387288282604544,12.98081007885915
-56460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981069210541445,12.981069210541445,2462.451180559668,7154.995197834707,4692.544017275039,55.507304935766776,54.60215505037378,12.38808374801351,12.981069210541445
-56520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981325434232547,12.981325434232547,2460.8601740645418,7150.374244923053,4689.51407085851,55.506977287559,54.602412002702685,12.388722815208006,12.981325434232547
-56580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981579328882447,12.981579328882447,2459.0071090054003,7144.986518414769,4685.97940940937,55.506595271365775,54.60271159216544,12.389423333442712,12.981579328882447
-56640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981831153907494,12.981831153907494,2457.3377165213824,7140.135742488886,4682.798025967501,55.50625132761702,54.602981323985006,12.390077139569565,12.981831153907494
-56700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.982081294112515,12.982081294112515,2455.824845508218,7135.742547498809,4679.917701990591,55.505939828610934,54.603225611587284,12.390691217050884,12.982081294112515
-56760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.982330095107756,12.982330095107756,2453.852150363708,7130.004292568023,4676.152142204315,55.505532958300066,54.60354469245347,12.391415820754652,12.982330095107756
-56820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.982577212284255,12.982577212284255,2451.592017073505,7123.42514704624,4671.833129972735,55.50506646476841,54.603910531779135,12.392208679472482,12.982577212284255
-56880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.982822551596474,12.982822551596474,2450.055114312171,7118.961062724742,4668.905948412572,55.50474993941848,54.60415876120294,12.392823878332546,12.982822551596474
-56940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983066354210308,12.983066354210308,2448.4358264245457,7114.255827786803,4665.820001362257,55.50441631533001,54.60442040001091,12.393457603629189,12.983066354210308
-57000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983308693290839,12.983308693290839,2446.49940068764,7108.622869210876,4662.1234685232375,55.50401691113622,54.60473362570645,12.394167023996205,12.983308693290839
-57060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983549302651626,12.983549302651626,2444.9617085486543,7104.155880246487,4659.194171697834,55.50370017988281,54.60498201660643,12.39477776116784,12.983549302651626
-57120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983788364383544,12.983788364383544,2442.835991592444,7097.968905389441,4655.132913796998,55.503261493285216,54.60532604883442,12.395529994323306,12.983788364383544
-57180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984025545790224,12.984025545790224,2440.947346461373,7092.475068203744,4651.527721742371,55.50287195354265,54.60563153850804,12.396222715551415,12.984025545790224
-57240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984260889063293,12.984260889063293,2439.348545947293,7087.828704260697,4648.480158313404,55.50254250378735,54.60588990366885,12.396843132769128,12.984260889063293
-57300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984494323194616,12.984494323194616,2437.7108264343483,7083.068277602263,4645.357451167915,55.50220496644877,54.60615461137421,12.397471136957627,12.984494323194616
-57360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984725965550275,12.984725965550275,2436.217800560868,7078.7308036059585,4642.513003045089,55.50189741852019,54.60639580041364,12.398062186766484,12.984725965550275
-57420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.98495559402437,12.98495559402437,2434.663635916921,7074.214268677979,4639.550632761057,55.50157717431876,54.60664694628114,12.398666124635373,12.98495559402437
-57480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.985183582796436,12.985183582796436,2433.2520026214015,7070.114377016416,4636.862374395016,55.50128647215619,54.606874924325645,12.399233784224439,12.985183582796436
-57540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.985409672229835,12.985409672229835,2431.084611714799,7063.803964617537,4632.719352902738,55.50083903339903,54.60722582028042,12.399983379971983,12.985409672229835
-57600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978634684379067,12.978634684379067,2430.0703391060683,7059.98951674961,4629.919177643542,55.500568570612536,54.607437925951174,12.39356337988286,12.978634684379067
-57660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.96559769116392,12.96559769116392,2429.0740759389296,7055.4448027158915,4626.370726776961,55.500246328440326,54.607690638692034,12.38097697969375,12.96559769116392
-57720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95457456341333,12.95457456341333,2427.697448920991,7050.04152164277,4622.344072721778,55.49986320973911,54.60799109277721,12.370464533393655,12.95457456341333
-57780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945964605201672,12.945964605201672,2426.671565998236,7045.966492233785,4619.29492623555,55.499574270504816,54.60821768827631,12.362241325793535,12.945964605201672
-57840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938924050162065,12.938924050162065,2425.6327056992895,7042.050581270961,4616.41787557167,55.49929661354741,54.60843543584871,12.355565510034777,12.938924050162065
-57900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932940512462675,12.932940512462675,2424.458255803661,7037.8713145262755,4613.413058722615,55.499000283408755,54.608667827534205,12.349962678832824,12.932940512462675
-57960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.927778729681473,12.927778729681473,2423.4174077157336,7034.185700126234,4610.768292410501,55.498738955609596,54.60887276925222,12.345135966025824,12.927778729681473
-58020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923305505701284,12.923305505701284,2421.817213310477,7028.952626156573,4607.135412846095,55.49836790549689,54.6091637587597,12.341122559548426,12.923305505701284
-58080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.919420545825233,12.919420545825233,2420.205758690225,7023.760796826468,4603.5550381362455,55.49799977984791,54.60945245480807,12.337690683136447,12.919420545825233
-58140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916044235705524,12.916044235705524,2419.325208578589,7020.767851622168,4601.442643043581,55.49778756565947,54.60961888004297,12.334581869159017,12.916044235705524
-58200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.913109060901181,12.913109060901181,2417.644644677699,7015.4936665095665,4597.849021831868,55.49741360062247,54.60991215552844,12.332101291832275,12.913109060901181
-58260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.910557105387902,12.910557105387902,2416.6354246121,7012.228367647143,4595.592943035044,55.497182075272406,54.6100937252013,12.329834850685105,12.910557105387902
-58320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.908338422804265,12.908338422804265,2415.263118060798,7007.9445038328295,4592.681385772033,55.49687832879432,54.61033193302023,12.327984456120912,12.908338422804265
-58380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906409324355895,12.906409324355895,2413.681693317728,7003.086337792128,4589.4046444744,55.49653386155232,54.610602075380115,12.326469743531337,12.906409324355895
-58440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.904731906323653,12.904731906323653,2412.48188169414,6999.374150416427,4586.8922687222885,55.496270649698715,54.61080849463462,12.325110080186294,12.904731906323653
-58500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.903273378244323,12.903273378244323,2411.2901761977537,6995.713060380126,4584.4228841823715,55.496011060901225,54.61101207257124,12.323963837576384,12.903273378244323
-58560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902004996708493,12.902004996708493,2410.069726157535,6991.991855030306,4581.922128872771,55.49574720965077,54.61121899326143,12.323011673858286,12.902004996708493
-58620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.900901725087856,12.900901725087856,2408.363721831393,6986.8735936375415,4578.509871806149,55.4953843004646,54.611503598390826,12.322339774076527,12.900901725087856
-58680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899941450135966,12.899941450135966,2407.0204525783033,6982.832401244019,4575.811948665715,55.49509776063032,54.61172831220278,12.321720580444472,12.899941450135966
-58740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899105016497376,12.899105016497376,2406.017855878845,6979.801380002096,4573.783524123252,55.49488284676156,54.61189685461438,12.321140606494904,12.899105016497376
-58800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.898375962954626,12.898375962954626,2404.8038410978393,6976.166504773953,4571.3626636761155,55.494625116772994,54.61209897481289,12.320717584744337,12.898375962954626
-58860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89773969847981,12.89773969847981,2403.495951517893,6972.269161524682,4568.773210006791,55.49434877656106,54.61231568975087,12.320408640791804,12.89773969847981
-58920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.897183584141262,12.897183584141262,2402.43646668814,6969.107078223877,4566.670611535737,55.4941245697923,54.61249151995543,12.320118312365887,12.897183584141262
-58980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.8966966022699,12.8966966022699,2401.255604586127,6965.59926800589,4564.343663419762,55.49387584934704,54.612686574578454,12.319925454733205,12.8966966022699
-59040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896269060754426,12.896269060754426,2400.0780172761497,6962.108450957359,4562.03043368121,55.49362833380762,54.61288068427535,12.319790294038745,12.896269060754426
-59100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895895058502822,12.895895058502822,2399.033240198977,6959.012053791706,4559.978813592729,55.49340878452239,54.61305286193058,12.319675605523155,12.895895058502822
-59160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895576449201448,12.895576449201448,2397.4045334721422,6954.217848406883,4556.8133149347395,55.49306885257406,54.613319447566404,12.319757055457725,12.895576449201448
-59220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895312092649176,12.895312092649176,2395.95575474187,6949.955705812236,4553.9999510703665,55.49276664642097,54.613556447412606,12.319848251791846,12.895312092649176
-59280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895091228771072,12.895091228771072,2395.3274681673684,6948.094270810463,4552.766802643095,55.492634661842715,54.61365995399058,12.319783250487268,12.895091228771072
-59340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89490428206184,12.89490428206184,2394.0641663213887,6944.383248307105,4550.319081985716,55.492371532738005,54.61386630835069,12.319905639513355,12.89490428206184
-59400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89474408653161,12.89474408653161,2392.952441550598,6941.118066076564,4548.165624525966,55.49214001583282,54.61404787140082,12.320017590869524,12.89474408653161
-59460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894605915103366,12.894605915103366,2391.919640406511,6938.086032614698,4546.166392208185,55.4919250302882,54.61421647002295,12.32013207410102,12.894605915103366
-59520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894485643192615,12.894485643192615,2390.391771893028,6933.6110310522445,4543.219259159218,55.49160773147811,54.61446530601924,12.320384234840287,12.894485643192615
-59580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894379826958005,12.894379826958005,2389.3807783782177,6930.646715235234,4541.265936857018,55.49139754745222,54.61463013913498,12.320525266507547,12.894379826958005
-59640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894285787406142,12.894285787406142,2388.152426898656,6927.049373086409,4538.896946187754,55.49114247887126,54.614830172171494,12.320730598608856,12.894285787406142
-59700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894201023300848,12.894201023300848,2387.256224696617,6924.422796891375,4537.166572194756,55.490956242196255,54.614976224999616,12.320864506177635,12.894201023300848
-59760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894124000617952,12.894124000617952,2386.2330968815454,6921.426681846851,4535.1935849653055,55.49074380347537,54.61514282632015,12.321036811572073,12.894124000617952
-59820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894052977754946,12.894052977754946,2385.023084212224,6917.885793461765,4532.862709249541,55.49049273775794,54.61533972018153,12.321260340167044,12.894052977754946
-59880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893986674724124,12.893986674724124,2383.916420067765,6914.647198932102,4530.7307788643375,55.4902631061115,54.615519804750726,12.32146344819396,12.893986674724124
-59940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893924012058111,12.893924012058111,2382.937864174277,6911.783033508112,4528.845169333834,55.490060023263474,54.61567906889296,12.321639069783863,12.893924012058111
-60000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893864210468225,12.893864210468225,2382.038996999957,6909.1518552200905,4527.1128582201345,55.48987346030861,54.615825377600295,12.321798180505464,12.893864210468225
-60060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893806694862795,12.893806694862795,2381.2444774545497,6906.825568955294,4525.581091500744,55.48970851564105,54.61595473254707,12.32193423515201,12.893806694862795
-60120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893751001806592,12.893751001806592,2380.193062098959,6903.749640074102,4523.556577975142,55.48949041778275,54.616125771946315,12.322134377709466,12.893751001806592
-60180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893696702473154,12.893696702473154,2379.271960116635,6901.054288608252,4521.782328491617,55.48929930466317,54.6162756490401,12.32230428928214,12.893696702473154
-60240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893643682560327,12.893643682560327,2378.4131382369487,6898.540906326462,4520.127768089513,55.48912109402114,54.61641540759339,12.322460355617597,12.893643682560327
-60300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893591380340377,12.893591380340377,2377.6654147162535,6896.3519196043335,4518.686504888081,55.4889658845561,54.61653712787924,12.322590186345348,12.893591380340377
-60360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893540109921055,12.893540109921055,2376.6443045165092,6893.365072533166,4516.7207680166575,55.48875410304157,54.61670321379728,12.322787323509012,12.893540109921055
-60420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893489353754527,12.893489353754527,2375.255653901515,6889.305490220282,4514.049836318767,55.48846625956049,54.616928949971225,12.323074086365885,12.893489353754527
-60480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893439089167455,12.893439089167455,2374.495497827725,6887.080515157691,4512.585017329966,55.488308498368205,54.6170526714042,12.323208930987233,12.893439089167455
-60540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893389244842007,12.893389244842007,2373.816542951888,6885.092621588463,4511.276078636574,55.48816754737153,54.61716320973768,12.323324498074427,12.893389244842007
-60600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893340035024435,12.893340035024435,2372.691374355303,6881.802376665082,4509.111002309778,55.48793425354969,54.617346166303356,12.323548884887824,12.893340035024435
-60660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893291364481911,12.893291364481911,2372.2067234859664,6880.381799122684,4508.175075636718,55.487833527930924,54.6174251585936,12.323618490112267,12.893291364481911
-60720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893243687603043,12.893243687603043,2371.728487495849,6878.980073193972,4507.251585698124,55.48773413898159,54.6175031026244,12.32368751727432,12.893243687603043
-60780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893196788768673,12.893196788768673,2370.191631091367,6874.488517670877,4504.296886579509,55.4874156666175,54.617752858959726,12.32401399488922,12.893196788768673
-60840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893150604754643,12.893150604754643,2369.9492967941837,6873.77554905528,4503.826252261095,55.4873651137983,54.617792504116686,12.324027289832785,12.893150604754643
-60900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893105509617696,12.893105509617696,2369.6901998901208,6873.013788653441,4503.323588763321,55.48731110141302,54.61783486237735,12.324045720822356,12.893105509617696
-60960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893061620271444,12.893061620271444,2368.3489828729744,6869.0936943177385,4500.744711444764,55.4870331483456,54.61805284216881,12.32432771691734,12.893061620271444
-61020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893018686547734,12.893018686547734,2367.142549348367,6865.567151763041,4498.424602414673,55.48678309995448,54.61824893820997,12.324577969372001,12.893018686547734
-61080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892976536960768,12.892976536960768,2366.8864646938173,6864.814562373337,4497.928097679521,55.486729737841635,54.61829078650594,12.324598567172243,12.892976536960768
-61140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892935674935908,12.892935674935908,2366.3712957047783,6863.305930313243,4496.934634608466,55.486622768763425,54.61837467511914,12.324683250162884,12.892935674935908
-61200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892880192353001,12.892880192353001,2247.808806427432,6517.356261943371,4269.547455515937,55.462093362467826,54.63761142943395,12.35336141949076,12.892880192353001
-61260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892752181696034,12.892752181696034,2027.579637919801,5875.341431301229,3847.761793381428,55.41657182759427,54.673310890392884,12.406532115867538,12.892752181696034
-61320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892469263854398,12.892469263854398,1828.7241965855164,5296.274609603902,3467.5504130183863,55.37551383625289,54.70550989605064,12.454294412102744,12.892469263854398
-61380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891976329715355,12.891976329715355,1649.1893111796826,4773.984228628862,3124.7949174491805,55.33848172260225,54.73455167812521,12.497113618806779,12.891976329715355
-61440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891262105757114,12.891262105757114,1487.1138354919215,4302.903732938046,2815.789897446125,55.3050807354465,54.76074581328054,12.535446689365589,12.891262105757114
-61500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890342536376819,12.890342536376819,1340.8121932545168,3878.012280674727,2537.200087420211,55.27495483030633,54.784371523120754,12.569731020405106,12.890342536376819
-61560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.8892458133099,12.8892458133099,1214.839055428426,3512.416996755509,2297.577941327083,55.24903328613368,54.80470003701549,12.59891407361993,12.8892458133099
-61620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88801406538377,12.88801406538377,1128.9160141479026,3263.1748134855156,2134.2587993376137,55.23136150144308,54.81855882251975,12.6183201236481,12.88801406538377
-61680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.886696582715516,12.886696582715516,1062.409020495841,3070.319885197082,2007.9108647012408,55.21768772153579,54.82928224327692,12.632968594584437,12.886696582715516
-61740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.885338898659274,12.885338898659274,1000.0251889732269,2889.485143214964,1889.4599542417368,55.20486622109429,54.83933727889286,12.646578954305616,12.885338898659274
-61800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883979073079367,12.883979073079367,959.2714983672604,2771.36451090312,1812.0930125358589,55.19649127435958,54.845905183178594,12.654995623459632,12.883979073079367
-61860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882649749302006,12.882649749302006,927.893493833554,2680.426301039841,1752.5328072062869,55.19004361316576,54.850961647766276,12.661192654042894,12.882649749302006
-61920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88137941211724,12.88137941211724,903.2803184564857,2609.09667674824,1705.8163582917534,55.18498623569605,54.85492780686077,12.665825673733368,12.88137941211724
-61980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880190652060218,12.880190652060218,886.8315800761279,2561.419371417937,1674.5877913418085,55.181605845295714,54.85757881841954,12.668583151665075,12.880190652060218
-62040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879100066667904,12.879100066667904,871.3079548935239,2516.430598155359,1645.1226432618353,55.17841607730709,54.860080337713526,12.67121596325539,12.879100066667904
-62100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87811814536139,12.87811814536139,857.2624448486432,2475.730430230304,1618.4679853816604,55.175530378849146,54.86234339584029,12.673602285860875,12.87811814536139
-62160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877250278022109,12.877250278022109,846.1287447609267,2443.467203048108,1597.3384582871813,55.17324287210032,54.86413733266822,12.675404477292604,12.877250278022109
-62220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876498896752748,12.876498896752748,836.296775641037,2414.979182515384,1578.6824068743467,55.1712230332971,54.86572135563007,12.677010589031527,12.876498896752748
-62280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.875863657273026,12.875863657273026,827.7696214371189,2390.2743613078187,1562.5047398707002,55.169471428887434,54.86709502049906,12.678419656969476,12.875863657273026
-62340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.875342772977117,12.875342772977117,820.7023888862186,2369.800719746866,1549.0983308606476,55.168019821044425,54.86823341835106,12.679592886369223,12.875342772977117
-62400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.874932786498787,12.874932786498787,814.3467014338192,2351.391824191475,1537.0451227576552,55.1667146066513,54.86925700972159,12.680706011381993,12.874932786498787
-62460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.874629336536847,12.874629336536847,809.2115439491607,2336.5199253450096,1527.308381395849,55.165660170064704,54.87008393301979,12.681632949287234,12.874629336536847
-62520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.874427127398672,12.874427127398672,804.4768857678882,2322.811602848518,1518.3347170806298,55.164688232672326,54.87084615777979,12.682564696980808,12.874427127398672
-62580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.8743205047605,12.8743205047605,800.4559145757602,2311.172641473953,1510.7167268981934,55.163863015710405,54.8714933196296,12.683420717790735,12.8743205047605
-62640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.874303245418394,12.874303245418394,797.3333061964987,2302.136923972635,1504.8036177761364,55.16322237207515,54.87199573310289,12.68415066186038,12.874303245418394
-62700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.874369379203193,12.874369379203193,794.9626949109902,2295.2805439257518,1500.317849014762,55.16273624622336,54.87237696872939,12.684783630481613,12.874369379203193
-62760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.874512840351315,12.874512840351315,793.1207793970754,2289.9570632596437,1496.8362838625687,55.16235880486394,54.8726729704594,12.685367027387464,12.874512840351315
-62820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.874728005974548,12.874728005974548,791.4567133058708,2285.151085520191,1493.69437221432,55.162018055120036,54.87294019743698,12.685979205041466,12.874728005974548
-62880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.875009397451567,12.875009397451567,790.5080466648358,2282.417668114904,1491.9096214500673,55.16182425246552,54.873092183751105,12.686486109090554,12.875009397451567
-62940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.87535191899588,12.87535191899588,789.838250869747,2280.4935712134234,1490.6553203436767,55.16168783163308,54.87319916938319,12.686987110332394,12.87535191899588
-63000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.875750780482662,12.875750780482662,789.6947313152571,2280.0944313444793,1490.3997000292215,55.16165953212671,54.873221362772,12.687418251436545,12.875750780482662
-63060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876201461724039,12.876201461724039,789.5353163587108,2279.651387163164,1490.1160708044533,55.16162811975088,54.87324599737379,12.68790474881852,12.876201461724039
-63120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.876699289811276,12.876699289811276,789.622020368068,2279.922359186687,1490.3003388186194,55.161647331999674,54.873230930506494,12.688379265235627,12.876699289811276
-63180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877239939858839,12.877239939858839,790.2779030764619,2281.841945101793,1491.5640420253305,55.1617834329968,54.8731241956996,12.688760199733606,12.877239939858839
-63240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.877819346510003,12.877819346510003,790.8818381341828,2283.612832519311,1492.7309943851278,55.16190899109044,54.87302572897886,12.68919211449989,12.877819346510003
-63300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.878433518845847,12.878433518845847,791.5530250928994,2285.5797632435024,1494.026738150603,55.162048448898155,54.872916361652486,12.68964251844076,12.878433518845847
-63360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879078284237092,12.879078284237092,792.4708664248095,2288.2616925616862,1495.7908261368761,55.16223860099034,54.87276723822749,12.690064331923713,12.879078284237092
-63420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.879750140843994,12.879750140843994,794.0281300385435,2292.795038534825,1498.7669084962815,55.16256002081623,54.87251517039722,12.69036008271372,12.879750140843994
-63480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.880445813105691,12.880445813105691,795.1201756769856,2295.983306782801,1500.8631311058152,55.162786072980204,54.872337892974045,12.690790830265687,12.880445813105691
-63540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881161825693393,12.881161825693393,796.4239248590857,2299.785112556669,1503.3611876975826,55.16305562572396,54.87212650098825,12.691191139594274,12.881161825693393
-63600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.881895166190548,12.881895166190548,797.7757629491435,2303.726906385184,1505.9511434360404,55.16333510380589,54.871907325231064,12.691597163014537,12.881895166190548
-63660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.882642665372904,12.882642665372904,799.3168115730895,2308.216955768056,1508.9001441949665,55.163653453902356,54.87165766478197,12.691971973836,12.882642665372904
-63720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.883401923176447,12.883401923176447,801.3594593202698,2314.1592286668224,1512.7997693465525,55.164074768479146,54.87132725625494,12.692238417727115,12.883401923176447
-63780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884170657121501,12.884170657121501,803.2060434183973,2319.534707524212,1516.3286641058148,55.16445589667281,54.871028363190206,12.692561184028941,12.884170657121501
-63840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.884946622122149,12.884946622122149,804.6228208345593,2323.666797744509,1519.0439769099494,55.16474886706729,54.87079860632482,12.69299398834814,12.884946622122149
-63900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.885727424923527,12.885727424923527,806.320668626195,2328.6126813683222,1522.292012742127,55.165099536454676,54.87052360004177,12.693364312964736,12.885727424923527
-63960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.886511333494662,12.886511333494662,808.7042706794846,2335.543576792945,1526.8393061134598,55.165590945713575,54.87013822099641,12.693573563405106,12.886511333494662
-64020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88729672715265,12.88729672715265,810.5482930770381,2340.913124692441,1530.3648316154029,55.165971653481435,54.869839657643176,12.693913413461873,12.88729672715265
-64080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888082134632535,12.888082134632535,812.1860753882007,2345.68594693735,1533.4998715491492,55.16631005266054,54.86957427405461,12.694302620543196,12.888082134632535
-64140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888866064722965,12.888866064722965,814.3935071992332,2352.107673952947,1537.7141667537135,55.166765361316145,54.86921720627074,12.694553970858548,12.888866064722965
-64200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88964725183122,12.88964725183122,816.3686508966013,2357.8571865260574,1541.4885356294565,55.16717300913474,54.868897515657814,12.694858169077628,12.88964725183122
-64260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89042463928075,12.89042463928075,818.3989251997797,2363.766336346385,1545.3674111466055,55.167591975464966,54.86856894870176,12.695145361728015,12.89042463928075
-64320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891197325468235,12.891197325468235,820.4072616364481,2369.612012499138,1549.2047508626902,55.16800644145633,54.86824391105707,12.695433101805465,12.891197325468235
-64380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891964436199178,12.891964436199178,822.5343209995298,2375.8013410528447,1553.267020053315,55.168445272874976,54.86789976525572,12.695686843456091,12.891964436199178
-64440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892725234913824,12.892725234913824,824.8626219697467,2382.5731867328573,1557.7105647631106,55.168925405546176,54.8675232296754,12.695886093573248,12.892725234913824
-64500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893479201699755,12.893479201699755,826.9718982209339,2388.710967947437,1561.7390697265032,55.16936058225153,54.86718195001851,12.69613095815795,12.893479201699755
-64560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894225712995874,12.894225712995874,829.1619443474028,2395.082485726121,1565.9205413787179,55.169812331214615,54.86682767386073,12.696349037905323,12.894225712995874
-64620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894964362232072,12.894964362232072,831.0364107086016,2400.5403151809533,1569.5039044723524,55.17019929850212,54.866524201589634,12.696634835483822,12.894964362232072
-64680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895694577316876,12.895694577316876,833.2631033339983,2407.017691092632,1573.754587758634,55.17065855300365,54.86616403934568,12.696827873620526,12.895694577316876
-64740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896416125992275,12.896416125992275,835.5509119608888,2413.671877665532,1578.1209657046431,55.171130343647356,54.865794045853306,12.696997625917964,12.896416125992275
-64800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.897128796887305,12.897128796887305,837.5228821756089,2419.4115227749976,1581.8886405993885,55.171537292116525,54.865474903692856,12.697234155555387,12.897128796887305
-64860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.897832269083285,12.897832269083285,839.5930606162077,2425.4353143360295,1585.842253719822,55.17196438697359,54.86513996208295,12.697437990823083,12.897832269083285
-64920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.898526201760601,12.898526201760601,841.887429930511,2432.1080150197295,1590.2205850892187,55.17243749038501,54.86476893907566,12.697578617569265,12.898526201760601
-64980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899209683170564,12.899209683170564,843.9443578339725,2438.093023085308,1594.1486652513352,55.17286183549772,54.864436153904286,12.697765689255256,12.899209683170564
-65040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899882445869501,12.899882445869501,846.1087930096553,2444.389059246043,1598.2802662363874,55.1733082329494,54.864086074574956,12.697916324819179,12.899882445869501
-65100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.900544776587436,12.900544776587436,848.4706820231935,2451.256596927547,1602.785914904353,55.17379515066343,54.86370421794445,12.698009262393866,12.900544776587436
-65160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90119694978615,12.90119694978615,850.6058438515569,2457.467428741525,1606.8615848899676,55.174235507073504,54.86335887619547,12.6981463769491,12.90119694978615
-65220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.901839357153351,12.901839357153351,852.7213577692572,2463.6211539711467,1610.8997962018905,55.17467181457786,54.863016709729386,12.698278459504714,12.901839357153351
-65280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902472077551675,12.902472077551675,854.8594772007332,2469.84012328987,1614.9806460891366,55.17511274800608,54.862670915464115,12.698395467457544,12.902472077551675
-65340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.903095326423914,12.903095326423914,856.8435180001393,2475.612707501567,1618.769189501428,55.17552203214592,54.862349941595106,12.698539941491008,12.903095326423914
-65400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.903709429037587,12.903709429037587,858.6385446025934,2480.8377210715694,1622.1991764689762,55.17589249279774,54.86205941436194,12.698720578540405,12.903709429037587
-65460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.904314675754378,12.904314675754378,860.9138226724766,2487.453271903713,1626.5394492312366,55.17636154448439,54.86169156884835,12.698777331972801,12.904314675754378
-65520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.904911574879026,12.904911574879026,863.2458455600959,2494.233006927815,1630.9871613677192,55.17684223709112,54.86131459414847,12.698812161557651,12.904911574879026
-65580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.905500615194088,12.905500615194088,865.2523784450847,2500.06998770319,1634.8176092581048,55.17725608714317,54.860990039543324,12.698917133109953,12.905500615194088
-65640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906082123074624,12.906082123074624,867.3533601566223,2506.1803509677293,1638.8269908111072,55.177689320421294,54.86065028398496,12.698991961582065,12.906082123074624
-65700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906656332163381,12.906656332163381,869.2407545153823,2511.671999314177,1642.4312447987945,55.178078685972785,54.860344930917606,12.699110685428733,12.906656332163381
-65760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.907223450107873,12.907223450107873,871.1469077642478,2517.2178275849074,1646.0709198206596,55.178471892979786,54.86003656525652,12.699217842428038,12.907223450107873
-65820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.907783546940514,12.907783546940514,873.9029392321602,2525.2249976613352,1651.3220584291746,55.17903961261579,54.859591341143634,12.699114346097685,12.907783546940514
-65880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.908337330588784,12.908337330588784,875.9665832333503,2531.2267595373214,1655.2601763039709,55.17946514601759,54.85925762407749,12.699170456551686,12.908337330588784
-65940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.908884666276364,12.908884666276364,877.4042257884995,2535.415260589777,1658.0110348012774,55.17976211667966,54.85902473007281,12.699370147273168,12.908884666276364
-66000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90942550788002,12.90942550788002,879.7318132911743,2542.1812699868815,1662.449456695707,55.18024183636506,54.858648518369314,12.699350095256715,12.90942550788002
-66060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.909960048195119,12.909960048195119,881.8155266647158,2548.240819996944,1666.4252933322286,55.180671467104865,54.85831158803809,12.699382196749662,12.909960048195119
-66120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.910488221110613,12.910488221110613,883.9044355672999,2554.3153125653853,1670.4108769980846,55.181102157321156,54.85797382683112,12.699406699390554,12.910488221110613
-66180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.911010476243481,12.911010476243481,885.9946598254193,2560.393527479437,1674.3988676540187,55.18153311148494,54.857635858627994,12.699424980295758,12.911010476243481
-66240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.911526483827783,12.911526483827783,888.0870103904338,2566.477797172941,1678.3907867825073,55.181964494969165,54.85729755373787,12.699436517459555,12.911526483827783
-66300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912036603523074,12.912036603523074,889.9521433323195,2571.9037826203953,1681.951639288076,55.182349205175804,54.85699585154264,12.699496638715056,12.912036603523074
-66360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912540526311359,12.912540526311359,891.9491108118158,2577.7115363853477,1685.7624255735316,55.18276098333222,54.8566729217851,12.699518980401873,12.912540526311359
-66420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.91303859979485,12.91303859979485,894.1417175538153,2584.085928944373,1689.944211390557,55.18321293702941,54.856318485068215,12.699488591601238,12.91303859979485
-66480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.91353062657758,12.91353062657758,896.1346614927952,2589.8818213670597,1693.7471598742648,55.1836238742527,54.85599621479767,12.699500028152926,12.91353062657758
-66540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.914016900984068,12.914016900984068,898.1086452230423,2595.6226839226815,1697.514038699639,55.184030909803155,54.855677004345246,12.699510270494535,12.914016900984068
-66600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9144973126569,12.9144973126569,900.1909581775259,2601.6772690777093,1701.486310900184,55.18446018877162,54.8553403498845,12.699488695761039,12.9144973126569
-66660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.914971966913233,12.914971966913233,902.2742523705856,2607.73460071245,1705.4603483418646,55.18488966249717,54.85500354268894,12.699461140763354,12.914971966913233
-66720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915440851416864,12.915440851416864,904.1643575782564,2613.2321361068052,1709.0677785285484,55.18527944586956,54.85469786195292,12.699474142636287,12.915440851416864
-66780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915904089321318,12.915904089321318,906.0494745913013,2618.715103972919,1712.6656293816175,55.185668196405395,54.85439299120076,12.699482708632393,12.915904089321318
-66840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916361541288294,12.916361541288294,907.981119265276,2624.3327499959823,1716.3516307307066,55.18606649584537,54.8540806318889,12.699474349771018,12.916361541288294
-66900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916813306533367,12.916813306533367,910.2627853324224,2630.964400449405,1720.7016151169823,55.18653668973493,54.85371189062282,12.699376400030868,12.916813306533367
-66960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917259527774416,12.917259527774416,911.9515074079254,2635.8780014520057,1723.9264940440808,55.18688507138218,54.85343867845962,12.699415080752427,12.917259527774416
-67020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917700233298484,12.917700233298484,914.0088939671256,2641.8596397436736,1727.8507457765481,55.187309178492406,54.853106079937476,12.699359869549106,12.917700233298484
-67080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.918135512287495,12.918135512287495,916.3157290502459,2648.563952462193,1732.248223411947,55.18778452433352,54.85273329834425,12.699239432688973,12.918135512287495
-67140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.91856542269712,12.91856542269712,917.8961950284537,2653.16352370606,1735.2673286776064,55.18811064086252,54.8524775472074,12.699287805918393,12.91856542269712
-67200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.918989965874948,12.918989965874948,920.0279515830248,2659.360354879226,1739.3324032962012,55.1885500055515,54.8521329831982,12.699198637888466,12.918989965874948
-67260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.919409255073251,12.919409255073251,922.3772054545772,2666.187328397983,1743.8101229434055,55.189034048317964,54.85175338119462,12.699052072050707,12.919409255073251
-67320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.919823485764384,12.919823485764384,924.0543324005204,2671.066635781451,1747.0123033809307,55.18937999862595,54.85148207576636,12.699061631872608,12.919823485764384
-67380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.920232571035594,12.920232571035594,925.5741626350343,2675.490011240686,1749.9158486056513,55.1896936226832,54.8512361216302,12.699103783657833,12.920232571035594
-67440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.920636337218099,12.920636337218099,927.4543238741667,2680.9573911258553,1753.5030672516884,55.19008126826472,54.85093211741896,12.699054223941841,12.920636337218099
-67500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.921034731560342,12.921034731560342,929.7455176329686,2687.615749544862,1757.8702319118936,55.19055335607315,54.85056189088039,12.698900734422605,12.921034731560342
-67560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.921428225261113,12.921428225261113,931.7998238444065,2693.5875760976323,1761.7877522532249,55.19097676774935,54.850229837740144,12.698799163944896,12.921428225261113
-67620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92181698233014,12.92181698233014,933.470899245904,2698.4487476963172,1764.977848450414,55.19132143230303,54.849959540642026,12.698784778299364,12.92181698233014
-67680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922200722781456,12.922200722781456,935.6447666784293,2704.7668692975712,1769.1221026191424,55.19176939688256,54.84960823232032,12.698644803661466,12.922200722781456
-67740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922579860743749,12.922579860743749,937.6158375318738,2710.4972173227798,1772.8813797909054,55.192175687433775,54.849289606120394,12.698548874513511,12.922579860743749
-67800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92295426565767,12.92295426565767,939.4100674921312,2715.7149753812814,1776.3049078891504,55.19254563458392,54.84899948159186,12.698490639611995,12.92295426565767
-67860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923324048706096,12.923324048706096,941.3920771394652,2721.476838822797,1780.0847616833316,55.192954159674606,54.84867910299378,12.698382755776894,12.923324048706096
-67920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923689291469586,12.923689291469586,943.1838692053676,2726.687334894653,1783.5034656892847,55.19332359198172,54.8483893822218,12.698315968725627,12.923689291469586
-67980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924049851595033,12.924049851595033,945.3757267530144,2733.057200593783,1787.6814738407684,55.19377522543346,54.84803519665177,12.698148549384351,12.924049851595033
-68040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924406156878414,12.924406156878414,947.1997548959578,2738.360944026249,1791.1611891302912,55.194151269170554,54.847740290982436,12.69806511551885,12.924406156878414
-68100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924758013035504,12.924758013035504,949.151464524348,2744.034651336928,1794.8831868125799,55.194553543950974,54.847424814079936,12.697946616579205,12.924758013035504
-68160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925105644677597,12.925105644677597,951.3293223109604,2750.3637436481713,1799.034421337211,55.195002286588355,54.84707289558009,12.697769652550905,12.925105644677597
-68220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925449113428233,12.925449113428233,953.0183397197716,2755.275918802807,1802.2575790830356,55.19535056758309,54.84679976235186,12.69770580275188,12.925449113428233
-68280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925788357818911,12.925788357818911,954.6696727448327,2760.078764491569,1805.409091746737,55.1956910969632,54.846532708190686,12.697646782261605,12.925788357818911
-68340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926123316297842,12.926123316297842,956.5382242501573,2765.5111086634834,1808.9728844133256,55.19607625880558,54.84623065180808,12.697531378054194,12.926123316297842
-68400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926454253179447,12.926454253179447,958.6202216033473,2771.562057865993,1812.9418362626457,55.19650528075475,54.84589419891017,12.697360754240165,12.926454253179447
-68460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926781127011203,12.926781127011203,960.4958395763488,2777.0147332663337,1816.5188936899847,55.19689188416081,54.84559101200666,12.697235589530349,12.926781127011203
-68520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92710431416191,12.92710431416191,962.4753874646831,2782.76860046688,1820.2932130021966,55.197299842571496,54.845271077817365,12.697081811174964,12.92710431416191
-68580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.927424507402156,12.927424507402156,964.2490467449692,2787.925638209336,1823.6765914643665,55.19766548483782,54.844984329318066,12.6969744405108,12.927424507402156
-68640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.927741883572734,12.927741883572734,966.2661549195552,2793.788337865344,1827.5221829457885,55.19808115969257,54.84465834364358,12.69680584503374,12.927741883572734
-68700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928056499375527,12.928056499375527,968.060083499659,2799.004079754492,1830.943996254833,55.198450964220726,54.84436833096383,12.69668804029492,12.928056499375527
-68760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928367743580088,12.928367743580088,969.9886164372915,2804.6099567300093,1834.6213402927174,55.19884842997979,54.844056625451536,12.696534573790018,12.928367743580088
-68820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928675764605492,12.928675764605492,972.1005516491092,2810.7474527784643,1838.6469011293555,55.199283588419526,54.84371536011914,12.69633388158183,12.928675764605492
-68880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928980416738892,12.928980416738892,973.737822239147,2815.5089010926968,1841.771078853549,55.199621182859175,54.84345060763328,12.696243724524894,12.928980416738892
-68940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92928161658876,12.92928161658876,975.964663095177,2821.979412081504,1846.0147489863266,55.20007995265311,54.84309082551272,12.696008649891706,12.92928161658876
-69000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929579572418433,12.929579572418433,977.6688087724922,2826.934605879013,1849.2657971065207,55.20043128400538,54.84281530009537,12.695895764760413,12.929579572418433
-69060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929873994801573,12.929873994801573,979.4483020565807,2832.1081561217907,1852.6598540652094,55.20079809720684,54.84252763331082,12.695761274932813,12.929873994801573
-69120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.930165023100873,12.930165023100873,981.309088872452,2837.5173162721862,1856.208227399734,55.20118161555893,54.842226865806474,12.695603890873592,12.930165023100873
-69180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.930452532040324,12.930452532040324,983.0096375568316,2842.461856011272,1859.4522184544396,55.20153219157892,54.841951932745154,12.695481451112926,12.930452532040324
-69240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93073648855115,12.93073648855115,984.8961234308704,2847.9453767242694,1863.0492532933988,55.20192098226018,54.841647030509655,12.695310846448214,12.93073648855115
-69300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931017060322436,12.931017060322436,986.6073086133592,2852.920600787727,1866.313292174368,55.20227373388854,54.84137039126583,12.695178936490766,12.931017060322436
-69360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931294137183292,12.931294137183292,988.8598300605387,2859.465220301579,1870.6053902410406,55.20273775828271,54.84100648831771,12.69491362028807,12.931294137183292
-69420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931568078467011,12.931568078467011,990.8747773711998,2865.321020480144,1874.4462431089444,55.20315294426925,54.84068088602951,12.69470219059283,12.931568078467011
-69480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931838888290141,12.931838888290141,992.2723425829013,2869.3867708051985,1877.1144282222974,55.203441212754726,54.84045481655335,12.694635814677223,12.931838888290141
-69540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932106325428526,12.932106325428526,994.3374583042228,2875.38790863492,1881.0504503306972,55.203866703468044,54.84012113296489,12.694405855000829,12.932106325428526
-69600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932370638440972,12.932370638440972,996.1726855096344,2880.7224617862803,1884.5497762766456,55.204244932235135,54.83982451372432,12.694227954805525,12.932370638440972
-69660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932631768160125,12.932631768160125,997.768108571512,2885.3616473267384,1887.593538755226,55.204573858289564,54.83956655926669,12.694104439124407,12.932631768160125
-69720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932889695248955,12.932889695248955,999.7715353777556,2891.1837650376488,1891.4122296598928,55.20498665624665,54.83924282974847,12.693879796491707,12.932889695248955
-69780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933144428959755,12.933144428959755,1001.9536115892344,2897.523839773173,1895.5702281839394,55.205436178258715,54.838890300037775,12.693609083732696,12.933144428959755
-69840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933396463206934,12.933396463206934,1003.5312313995844,2902.1112191164643,1898.5799877168795,55.2057614312247,54.838635226134976,12.693480769826923,12.933396463206934
-69900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933645377255745,12.933645377255745,1005.2668382739148,2907.156623281372,1901.8897850074566,55.20611915894471,54.838354684479036,12.693311421350643,12.933645377255745
-69960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933891397600481,12.933891397600481,1007.3805036106793,2913.29822017769,1905.9177165670105,55.2065546086161,54.83801319075336,12.693048431642726,12.933891397600481
-70020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934134493936975,12.934134493936975,1009.0215717404006,2918.0693837436024,1909.0478120032012,55.206892892251865,54.8377478977776,12.692895973915114,12.934134493936975
-70080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934374727099328,12.934374727099328,1011.0601300386824,2923.993111000081,1912.9329809613992,55.20731289464328,54.837418518308795,12.692645237614606,12.934374727099328
-70140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934612256715507,12.934612256715507,1012.603460909489,2928.480746716925,1915.877285807436,55.207631075706594,54.83716899042098,12.692510691032307,12.934612256715507
-70200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934846823985161,12.934846823985161,1014.1998414479654,2933.1221388372223,1918.922297389257,55.20796015837839,54.83691091313895,12.692360456360085,12.934846823985161
-70260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93507853955525,12.93507853955525,1016.610809424309,2940.12567166164,1923.5148622373315,55.208456720913254,54.83652149272778,12.692011812141015,12.93507853955525
-70320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935307619655086,12.935307619655086,1018.390275422597,2945.297898281937,1926.9076228593397,55.20882344070914,54.83623389919491,12.691812146934815,12.935307619655086
-70380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935534226961757,12.935534226961757,1019.8697311006473,2949.600065981428,1929.7303348807807,55.20912847184097,54.83599468390895,12.691682043777929,12.935534226961757
-70440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935758053347067,12.935758053347067,1021.9005893021288,2955.501226722777,1933.6006374206488,55.209546874368115,54.8356665591055,12.691416780081342,12.935758053347067
-70500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935979353286431,12.935979353286431,1023.6268488668344,2960.5190142455376,1936.892165378703,55.20990264422327,54.83538755287055,12.691222127455369,12.935979353286431
-70560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936197958944812,12.936197958944812,1025.4781739763469,2965.899446522304,1940.4212725459568,55.21028412624276,54.83508838232415,12.690994758759706,12.936197958944812
-70620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936414182469587,12.936414182469587,1027.737444864855,2972.4629439105397,1944.7254990456847,55.21074948966874,54.834723429263924,12.690667059336315,12.936414182469587
-70680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93662809214317,12.93662809214317,1029.1619849092333,2976.605584724198,1947.4435998149645,55.21104321015303,54.83449308415386,12.690537478485627,12.93662809214317
-70740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936839569699366,12.936839569699366,1030.467873522286,2980.404047228071,1949.9361737057845,55.21131252780411,54.83428187653537,12.690433964573314,12.936839569699366
-70800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937048252788804,12.937048252788804,1032.7035009872166,2986.898878397044,1954.1953774098276,55.21177302274611,54.83392074149786,12.690104414423956,12.937048252788804
-70860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937254536286344,12.937254536286344,1034.703617652524,2992.7106589483697,1958.007041295846,55.21218508822609,54.833597586411905,12.689829018605128,12.937254536286344
-70920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93745863736578,12.93745863736578,1036.3383866973136,2997.4628019158004,1961.124415218486,55.212522023553475,54.8333333508232,12.689639175116895,12.93745863736578
-70980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937660431017795,12.937660431017795,1038.1679035424488,3002.77973599687,1964.6118324544213,55.212899003588284,54.8330377108789,12.689400263420543,12.937660431017795
-71040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937860004660234,12.937860004660234,1040.0956239378895,3008.381470900252,1968.2858469623623,55.21329617652841,54.83272623500469,12.689135552266908,12.937860004660234
-71100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938057305840365,12.938057305840365,1042.0386344158012,3014.027529486565,1971.9888950707639,55.21369649212021,54.83241229456133,12.688864899899334,12.938057305840365
-71160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938252565951677,12.938252565951677,1043.7894901073892,3019.116236148709,1975.3267460413206,55.21405729049028,54.832129344802226,12.688638355070756,12.938252565951677
-71220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938445663653125,12.938445663653125,1045.5789876675303,3024.316990819833,1978.7380031523026,55.214426033284006,54.83184016476897,12.688400371896545,12.938445663653125
-71280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938636656398856,12.938636656398856,1047.5500164968828,3030.044258543213,1982.4942420463306,55.214832106817,54.83152170876178,12.688116689884756,12.938636656398856
-71340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938825560104814,12.938825560104814,1049.3934235010734,3035.4013338137433,1986.00791031267,55.215211933064865,54.83122383672507,12.687861571625222,12.938825560104814
-71400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93901241686531,12.93901241686531,1051.4795980685035,3041.4625665229323,1989.9829684544281,55.21564168536453,54.83088681106267,12.687546102497274,12.93901241686531
-71460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939197428528207,12.939197428528207,1052.8493537633929,3045.445712454734,1992.5963586913406,55.21592409758952,54.83066533425552,12.687400856973364,12.939197428528207
-71520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939380225983248,12.939380225983248,1054.3981725092933,3049.9482014463288,1995.5500289370354,55.21624333218782,54.830414980151474,12.687210397516784,12.939380225983248
-71580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939560852449114,12.939560852449114,1056.6395476093765,3056.4595625113952,1999.820014902018,55.216704999469954,54.83005292572688,12.686851429526994,12.939560852449114
-71640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939739484551994,12.939739484551994,1058.183038376954,3060.94652585223,2002.763487475276,55.21702313330882,54.829803434874,12.686658093573653,12.939739484551994
-71700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93991597021059,12.93991597021059,1060.039942562473,3066.342590647803,2006.3026480853293,55.21740572410975,54.82950339478529,12.68638733652201,12.93991597021059
-71760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940090597981579,12.940090597981579,1061.9055895658237,3071.7640030253247,2009.858413459502,55.217790112122444,54.82920194526498,12.686112623393411,12.940090597981579
-71820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940263181629865,12.940263181629865,1063.5998968422114,3076.6883542675478,2013.088457425336,55.21813925761443,54.828928134070004,12.685877026393133,12.940263181629865
-71880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94043388656264,12.94043388656264,1065.297107851972,3081.6211009770477,2016.323993125076,55.21848899837872,54.82865385604325,12.685638856805069,12.94043388656264
-71940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940602599436744,12.940602599436744,1067.1134834910736,3086.8995045229663,2019.7860210318927,55.218863246865254,54.828360358267496,12.685370074322323,12.940602599436744
-72000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940769516360863,12.940769516360863,1069.334062973111,3093.3504862971117,2024.016423324001,55.21932063332603,54.82800166100159,12.685002399483546,12.940769516360863
-72060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940934803424165,12.940934803424165,1070.8698748128952,3097.8149564795003,2026.9450816666047,55.21963717248328,54.827753420749616,12.684797591201857,12.940934803424165
-72120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94109824802397,12.94109824802397,1072.4141627568317,3102.303977786123,2029.889815029292,55.21995545237563,54.82750381535686,12.684588909218819,12.94109824802397
-72180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941259806853413,12.941259806853413,1074.5612697654851,3108.5417973080043,2033.9805275425185,55.220397725313,54.827156970605174,12.68423352860189,12.941259806853413
-72240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941419555336266,12.941419555336266,1076.2178192523813,3113.3564462334048,2037.138626981023,55.22073909284378,54.82688925913911,12.683994188448525,12.941419555336266
-72300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94157765859415,12.94157765859415,1077.821358046604,3118.0172808097664,2040.1959227631626,55.22106955466886,54.826630100280454,12.683765941325829,12.94157765859415
-72360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941734050883626,12.941734050883626,1079.6132087113679,3123.224418333953,2043.6112096225852,55.22143875040658,54.826340565033846,12.683490745367784,12.941734050883626
-72420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941888858970499,12.941888858970499,1081.2315927805917,3127.9282779192517,2046.6966851386603,55.22177226281975,54.826079013805256,12.683255642281434,12.941888858970499
-72480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942041942313724,12.942041942313724,1083.3848403707236,3134.18389605684,2050.799055686116,55.222215797832774,54.825731179292966,12.682890313411086,12.942041942313724
-72540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942193841071802,12.942193841071802,1085.0243570640607,3138.949056438257,2053.924699374196,55.22255365662613,54.82546621949237,12.68264722523922,12.942193841071802
-72600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942344369512837,12.942344369512837,1086.3249387852811,3142.730840107191,2056.4059013219103,55.22282179218149,54.82525593891162,12.682484202461715,12.942344369512837
-72660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94249334006433,12.94249334006433,1088.391727730486,3148.7356394116664,2060.3439116811805,55.22324754373711,54.82492205076218,12.682135530555735,12.94249334006433
-72720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942641090380278,12.942641090380278,1090.4567656197048,3154.735387740235,2064.27862212053,55.22367293719619,54.82458844344365,12.68178605546126,12.942641090380278
-72780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942787689621975,12.942787689621975,1092.039644841385,3159.3362057249215,2067.296560883536,55.223999143876924,54.82433262160691,12.681551278289941,12.942787689621975
-72840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942933146932607,12.942933146932607,1093.476159569592,3163.512347933177,2070.036188363585,55.224295240257185,54.82410041324229,12.681350528381921,12.942933146932607
-72900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943077307293091,12.943077307293091,1095.4541318055865,3169.259519573619,2073.8053877680327,55.22470272561677,54.82378085003498,12.681018378489403,12.943077307293091
-72960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943220243285804,12.943220243285804,1097.2233879185073,3174.401110180892,2077.177722262384,55.22506727415468,54.82349495927289,12.680735154598823,12.943220243285804
-73020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943361970987263,12.943361970987263,1098.7754528862026,3178.912507570329,2080.1370546841267,55.22538714081313,54.8232441094868,12.680502911984336,12.943361970987263
-73080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943502551763306,12.943502551763306,1100.5765065095268,3184.146371029807,2083.5698645202806,55.22575823170978,54.822953087995245,12.68020969094652,12.943502551763306
-73140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943641851365696,12.943641851365696,1102.2974874843624,3189.147894957735,2086.8504074733733,55.22611284931003,54.82267498539588,12.679934430189086,12.943641851365696
-73200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943779912649347,12.943779912649347,1104.20422771406,3194.6884355345655,2090.484207820505,55.2265056842423,54.82236691152782,12.679613291366227,12.943779912649347
-73260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943917003581912,12.943917003581912,1105.4575109635953,3198.3328518855383,2092.875340921943,55.226764080350144,54.82216426893704,12.679448213418453,12.943917003581912
-73320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944052557532675,12.944052557532675,1107.1667334162557,3203.300244685753,2096.1335112694974,55.227116278041294,54.821888064108684,12.679172034339707,12.944052557532675
-73380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944186876633449,12.944186876633449,1109.4337134143668,3209.88613231125,2100.452418896884,55.22758323015315,54.82152186514961,12.678760579079535,12.944186876633449
-73440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944320113872767,12.944320113872767,1111.2192663254846,3215.0750478187047,2103.85578149322,55.2279511342754,54.82123334282968,12.678463735995948,12.944320113872767
-73500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944452405478268,12.944452405478268,1112.6814388940177,3219.325578126925,2106.644139232908,55.22825250509141,54.82099699808185,12.67824366318185,12.944452405478268
-73560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944583427151995,12.944583427151995,1114.423096881442,3224.387125142044,2109.9640282606024,55.22861137857757,54.82071555787901,12.67795515288249,12.944583427151995
-73620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944713348090062,12.944713348090062,1115.9665300270885,3228.8734459854436,2112.906915958356,55.22892946743024,54.820466102305744,12.677713182152074,12.944713348090062
-73680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944841771869715,12.944841771869715,1117.8390853829376,3234.314837010966,2116.475751628029,55.229315272632334,54.820163541379635,12.677390615636892,12.944841771869715
-73740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94496919022101,12.94496919022101,1119.6206941048385,3239.492322780029,2119.8716286751896,55.229682366459414,54.819875654519386,12.677088899874947,12.94496919022101
-73800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945095234231891,12.945095234231891,1121.0324577680174,3243.596502670774,2122.564044902757,55.22997336082323,54.8196474473212,12.676874703576555,12.945095234231891
-73860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945220106315013,12.945220106315013,1122.8270470309828,3248.8116444548095,2125.9845974238265,55.23034312457172,54.81935746662218,12.676567323535151,12.945220106315013
-73920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945343642503019,12.945343642503019,1124.591477562624,3253.939258835777,2129.347781273153,55.230706682476175,54.819072352746886,12.67626585713709,12.945343642503019
-73980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945466001993113,12.945466001993113,1126.1657357615288,3258.5149727047497,2132.349236943221,55.23103110956994,54.81881792651984,12.676008924352539,12.945466001993113
-74040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945587111413591,12.945587111413591,1127.876746879455,3263.4875502592854,2135.61080337983,55.2313836750958,54.81854143322363,12.675717872332847,12.945587111413591
-74100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945707006528515,12.945707006528515,1129.7472928087252,3268.923123982901,2139.175831174176,55.23176906798173,54.818239195649184,12.67538725878224,12.945707006528515
-74160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94582569721284,12.94582569721284,1131.4470459849929,3273.8630266963683,2142.415980711375,55.23211931683582,54.81796451916196,12.675096494530196,12.94582569721284
-74220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945943332691243,12.945943332691243,1132.9655089367407,3278.276783855584,2145.311274918844,55.23243226094703,54.81771909826146,12.674848253223452,12.945943332691243
-74280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94605965045196,12.94605965045196,1134.3493705147364,3282.2998678686163,2147.95049735388,55.23271750557237,54.81749540019428,12.674631053124097,12.94605965045196
-74340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94617465062819,12.94617465062819,1135.9938263899212,3287.079245983123,2151.085419593202,55.23305637296342,54.81722964941873,12.674349895759068,12.94617465062819
-74400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946288220414699,12.946288220414699,1137.926728171194,3292.695770761609,2154.769042590415,55.23345459573594,54.81691735023198,12.673997970790346,12.946288220414699
-74460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946400730059288,12.946400730059288,1139.6531165724714,3297.712934069856,2158.0598174973848,55.23381032260878,54.81663837770515,12.673694628504135,12.946400730059288
-74520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946512007630167,12.946512007630167,1141.1251313141906,3301.991795494972,2160.866664180781,55.23411370242241,54.81640045743637,12.67345120644994,12.946512007630167
-74580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94662218078885,12.94662218078885,1142.986709659229,3307.4013264177183,2164.414616758489,55.23449724897945,54.816099667812786,12.673113029208656,12.94662218078885
-74640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946731160233018,12.946731160233018,1144.6583901397034,3312.259688702643,2167.60129856294,55.234841716597,54.815829525158364,12.672819310784753,12.946731160233018
-74700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946839147380187,12.946839147380187,1145.6264345873578,3315.0757530601977,2169.44931847284,55.23504138120882,54.81567294170761,12.672693761930232,12.946839147380187
-74760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946945556171961,12.946945556171961,1147.2628888216275,3319.8318210642933,2172.5689322426656,55.23537859598429,54.815408486966675,12.672405948154072,12.946945556171961
-74820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947050672501993,12.947050672501993,1149.0539664298453,3325.03667515979,2175.9827087299436,55.2357476306147,54.815119078065656,12.672079669723669,12.947050672501993
-74880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947154406433206,12.947154406433206,1150.8957244846358,3330.388621312761,2179.492896828125,55.236127094389325,54.81482149029219,12.67173982579338,12.947154406433206
-74940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947257226574886,12.947257226574886,1152.7961448396825,3335.91086026604,2183.114715426357,55.23651863228953,54.814514433598674,12.671384961779225,12.947257226574886
-75000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947359113328078,12.947359113328078,1154.2581024216167,3340.1604136231103,2185.9023112014934,55.236819934225,54.814278142869206,12.67113458212999,12.947359113328078
-75060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947460047886258,12.947460047886258,1155.8346452125977,3344.7425633214257,2188.9079181088287,55.23714481792958,54.81402335855315,12.67085570106536,12.947460047886258
-75120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947559778071682,12.947559778071682,1157.2613860234194,3348.889864748195,2191.628478724775,55.23743887002365,54.81379275338394,12.67061163596761,12.947559778071682
-75180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947658360975128,12.947658360975128,1158.8930046516575,3353.6318508066997,2194.738846155043,55.23777508648177,54.813529081555785,12.670317165184663,12.947658360975128
-75240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947755712406911,12.947755712406911,1160.3578560560777,3357.8897348238575,2197.53187876778,55.238076979134796,54.813292327566494,12.670061563458068,12.947755712406911
-75300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947851878696587,12.947851878696587,1161.7433201227432,3361.917151123502,2200.17383100076,55.238362531169614,54.813068388418856,12.66982386814534,12.947851878696587
-75360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94794683838208,12.94794683838208,1163.6048092817869,3367.3263557354167,2203.7215464536303,55.23874605483498,54.81276761674768,12.669470508280574,12.94794683838208
-75420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94804071462747,12.94804071462747,1165.6186338563416,3373.177776176168,2207.559142319826,55.2391609325315,54.812442256230476,12.669079433896384,12.94804071462747
-75480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9481338071838,12.9481338071838,1167.0836396833765,3377.4360689056816,2210.352429222305,55.23946285422583,54.812205479466044,12.668819541417681,12.9481338071838
-75540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948225927464767,12.948225927464767,1168.415573626097,3381.308054079713,2212.892480453616,55.239737385933466,54.811990182815656,12.668590677202122,12.948225927464767
-75600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94831702241376,12.94831702241376,1169.9542556160445,3385.780195670683,2215.825940054639,55.24005446997877,54.81174151524487,12.668311074120279,12.94831702241376
-75660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94840707804859,12.94840707804859,1171.3430809441963,3389.817296330932,2218.474215386736,55.24034070873943,54.811517037544604,12.668066469498909,12.94840707804859
-75720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94849587287962,12.94849587287962,1173.268197314944,3395.411217295538,2222.143019980595,55.24073732928989,54.811205994872246,12.6676916435418,12.94849587287962
-75780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948583840090597,12.948583840090597,1174.980080329718,3400.3861389663048,2225.406058636588,55.24109006153172,54.810929370831964,12.667367265192704,12.948583840090597
-75840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948670746020401,12.948670746020401,1175.8733278510617,3402.9845091173934,2227.111181266332,55.24127429136007,54.81078489183796,12.667238693887859,12.948670746020401
-75900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9487565065255,12.9487565065255,1177.7954565467055,3408.5697553921523,2230.774298845447,55.241670296912545,54.810474331466935,12.666861552434813,12.9487565065255
-75960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948841298941455,12.948841298941455,1179.4913621745934,3413.4982644489014,2234.0069022743087,55.24201973845282,54.81020028810133,12.66653784547993,12.948841298941455
-76020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948925026364824,12.948925026364824,1180.689161977887,3416.980694600597,2236.2915326227103,55.242266650002826,54.810006652072474,12.66633286556576,12.948925026364824
-76080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94900785679153,12.94900785679153,1182.2855049147615,3421.6201405732786,2239.3346356585175,55.242595596398274,54.80974868166276,12.666031143231388,12.94900785679153
-76140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94908949311929,12.94908949311929,1183.7327020775122,3425.826567396347,2242.093865318834,55.242893840846946,54.80951478871338,12.665764098941393,12.94908949311929
-76200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94917016291261,12.94917016291261,1185.431938402031,3430.764706779635,2245.332768377604,55.24324396526166,54.80924020981554,12.665435473563594,12.94917016291261
-76260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949249908682154,12.949249908682154,1186.5566544565852,3434.034870577623,2247.4782161210373,55.24347582672747,54.80905837654983,12.66524410026764,12.949249908682154
-76320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949328461132117,12.949328461132117,1188.3347022143107,3439.201792838414,2250.867090624103,55.24384217235932,54.8087710764485,12.664894406327413,12.949328461132117
-76380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949406249976215,12.949406249976215,1190.1633916203384,3444.515760436856,2254.352368816517,55.2442189438352,54.80847560006285,12.664531766633358,12.949406249976215
-76440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949483117717323,12.949483117717323,1191.4499213185325,3448.255663481389,2256.805742162857,55.244484110837355,54.8082676475176,12.664298604036672,12.949483117717323
-76500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949559162829175,12.949559162829175,1192.7174516196308,3451.9403899720533,2259.222938352422,55.244745365715936,54.80806276298625,12.664069190443087,12.949559162829175
-76560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94963418925138,12.94963418925138,1194.1489502878626,3456.1011523490474,2261.952202061184,55.245040372555046,54.8078314090751,12.663799323365948,12.94963418925138
-76620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94970820664957,12.94970820664957,1196.0812503958894,3461.715930968714,2265.634680572825,55.245438472237005,54.80751920641993,12.663407992961107,12.94970820664957
-76680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949781373561626,12.949781373561626,1197.5008173274875,3465.8420346686626,2268.341217341176,55.24573102173307,54.807289779636704,12.663139138417284,12.949781373561626
-76740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94985379419637,12.94985379419637,1199.055972492092,3470.361811221018,2271.305838728926,55.24605148348337,54.807038463160346,12.662836924404425,12.94985379419637
-76800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949925459017448,12.949925459017448,1200.5004124899838,3474.560128742398,2274.059716252415,55.2463491531199,54.80680502099726,12.66256058558044,12.949925459017448
-76860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949996204426437,12.949996204426437,1202.1594302317317,3479.381465080843,2277.222034849112,55.246690996131285,54.80653693664394,12.662231714152774,12.949996204426437
-76920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9500662098261,12.9500662098261,1203.6296269996326,3483.654557974246,2280.0249309746137,55.246993967529825,54.80629933666749,12.661947521707427,12.9500662098261
-76980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950135398804546,12.950135398804546,1204.979948104554,3487.579575811992,2282.5996277074382,55.24727225967677,54.80608109095889,12.661691349645029,12.950135398804546
-77040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950203787285886,12.950203787285886,1206.5160993290594,3492.044159537049,2285.528060207989,55.24758880821154,54.80583284335278,12.661389676798981,12.950203787285886
-77100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950271184574273,12.950271184574273,1207.572232721008,3495.114934527537,2287.542701806529,55.24780653273475,54.805662096735,12.661202485359421,12.950271184574273
-77160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950337567084512,12.950337567084512,1209.360358773306,3500.31112393828,2290.9507651649733,55.24817495370832,54.805373169083516,12.660838197421818,12.950337567084512
-77220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95040319937383,12.95040319937383,1210.8922118838361,3504.763191961927,2293.870980078091,55.248490614895815,54.80512561736386,12.660534806998145,12.95040319937383
-77280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950467922055994,12.950467922055994,1212.130635329529,3508.3632153900544,2296.2325800605254,55.24874586430191,54.804925442518424,12.660301097230684,12.950467922055994
-77340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950531897626805,12.950531897626805,1213.622587750288,3512.699404760311,2299.0768170100228,55.24905330947007,54.80468433406704,12.660005651267975,12.950531897626805
-77400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950594873915193,12.950594873915193,1215.244483992598,3517.4129021683007,2302.168418175703,55.24938750660704,54.80442224585588,12.659677947546937,12.950594873915193
-77460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950657202309827,12.950657202309827,1216.6880735139666,3521.6086451899046,2304.9205716759375,55.24968499385492,54.80418894672788,12.659392490780554,12.950657202309827
-77520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950718729786315,12.950718729786315,1218.080781029798,3525.6566279148415,2307.575846885044,55.24997200459101,54.8039638636195,12.6591184753199,12.950718729786315
-77580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950779593413069,12.950779593413069,1219.5844484366628,3530.0268176877807,2310.4423692511177,55.25028186051801,54.80372086457302,12.658817101491525,12.950779593413069
-77640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950839579655929,12.950839579655929,1220.6115784227645,3533.0131979070848,2312.4016194843202,55.250493601356624,54.80355481055435,12.658629499136753,12.950839579655929
-77700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950898605468927,12.950898605468927,1222.2732674097917,3537.842225564218,2315.568958154426,55.25083598991173,54.80328629836798,12.658288274523834,12.950898605468927
-77760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95095685267216,12.95095685267216,1224.3539922932864,3543.88810380354,2319.5341115102538,55.25126465584231,54.80295012467138,12.657845454306585,12.95095685267216
-77820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951014756278866,12.951014756278866,1225.2291113772785,3546.4330226741536,2321.203911296875,55.2514450961394,54.80280861755042,12.657692346297758,12.951014756278866
-77880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951071698967896,12.951071698967896,1226.4416228234363,3549.9576716598863,2323.5160488364495,55.25169500144604,54.80261263372074,12.657457107471233,12.951071698967896
-77940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951127817626569,12.951127817626569,1228.3699324136485,3555.560968112453,2327.191035698805,55.25209228741458,54.802301069206,12.657048826172085,12.951127817626569
-78000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951183326979056,12.951183326979056,1229.5855083875506,3559.094501518414,2329.508993130863,55.252342822670315,54.80210459134983,12.656811418668644,12.951183326979056
-78060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951238087397444,12.951238087397444,1230.6861930745185,3562.294369080734,2331.608176006216,55.252569700295254,54.80192666657343,12.65660090806144,12.951238087397444
-78120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95129193046222,12.95129193046222,1232.2108911777707,3566.7255634894696,2334.514672311699,55.25288388170568,54.801680275342854,12.65628746279056,12.95129193046222
-78180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951345045446109,12.951345045446109,1233.9660449924654,3571.8260204625535,2337.859975470088,55.25324551531932,54.80139667055871,12.65591783899844,12.951345045446109
-78240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951397566657437,12.951397566657437,1234.8870296930097,3574.503974028237,2339.6169443352264,55.25343538812293,54.80124776616086,12.655748333735927,12.951397566657437
-78300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951449177423113,12.951449177423113,1235.9105854566114,3577.479767407111,2341.569181950499,55.25364637843137,54.80108230073225,12.65555324266702,12.951449177423113
-78360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951499879433177,12.951499879433177,1237.4687328200516,3582.008058964769,2344.539326144718,55.253967444294794,54.80083051049081,12.655228613604534,12.951499879433177
-78420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95154962180985,12.95154962180985,1239.0488110159165,3586.600026467216,2347.5512154513,55.254293024939,54.80057517961215,12.654897749794845,12.95154962180985
-78480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951598840250687,12.951598840250687,1240.4607552080945,3590.7037115499043,2350.2429563418095,55.25458398529399,54.800346999084795,12.6546068181241,12.951598840250687
-78540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951647355349257,12.951647355349257,1241.744208231218,3594.4342221804504,2352.690013949233,55.254848486765404,54.800139568470286,12.654346102936685,12.951647355349257
-78600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951695282337653,12.951695282337653,1242.890234985301,3597.765607180586,2354.875372195285,55.255084689353936,54.79995433075563,12.654117869719002,12.951695282337653
-78660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951742465664552,12.951742465664552,1244.2023642039485,3601.5793771167573,2357.3770129128093,55.25535509411507,54.79974227059026,12.653848925378993,12.951742465664552
-78720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951788792662775,12.951788792662775,1245.8995428118242,3606.511423062073,2360.611880250249,55.25570478714586,54.79946802999764,12.65348646947401,12.951788792662775
-78780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951834579300186,12.951834579300186,1246.9966884344076,3609.7007973069767,2362.70410887257,55.2559309208856,54.799290688600095,12.653267864530735,12.951834579300186
-78840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95187970516374,12.95187970516374,1248.5286985583625,3614.1531481684037,2365.6244496100408,55.256246602494144,54.79904312086559,12.65294395320916,12.95187970516374
-78900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951924274570615,12.951924274570615,1250.048264238233,3618.569363607703,2368.5210993694704,55.256559722035405,54.79879756238717,12.652622479215806,12.951924274570615
-78960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951968289555689,12.951968289555689,1251.1061433176785,3621.6446669249967,2370.5385236073175,55.25677776792006,54.79862656374734,12.652411555519599,12.951968289555689
-79020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952011726005486,12.952011726005486,1252.5777459676806,3625.921578670125,2373.343832702445,55.257081010542116,54.79838875106863,12.652100491052515,12.952011726005486
-79080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952054468132667,12.952054468132667,1253.8999815890647,3629.764658630286,2375.864677041221,55.2573534935307,54.79817506109004,12.651824679139583,12.952054468132667
-79140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952096645740385,12.952096645740385,1255.0007023236572,3632.964354491784,2377.9636521681264,55.25758035915217,54.79799714572714,12.651601612899542,12.952096645740385
-79200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952138162464976,12.952138162464976,1256.2587400271498,3636.620954873064,2380.3622148459144,55.257839620339524,54.79779382471299,12.651340027985025,12.952138162464976
-79260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952178943764546,12.952178943764546,1257.9436526013694,3641.517397107688,2383.5737445063182,55.258186789117325,54.797521563721276,12.650974975876668,12.952178943764546
-79320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952219327010866,12.952219327010866,1259.3250520417544,3645.532301093169,2386.207249051414,55.258471454862146,54.797298319630926,12.650682568774915,12.952219327010866
-79380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952259091785177,12.952259091785177,1260.1519929206004,3647.9367484347417,2387.784755514142,55.25864193560571,54.79716462311421,12.650522986074359,12.952259091785177
-79440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952298142256275,12.952298142256275,1261.62403738901,3652.2149085727474,2390.590871183737,55.25894526682642,54.79692674095356,12.65020743402757,12.952298142256275
-79500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952336588858518,12.952336588858518,1263.026003150248,3656.289518969623,2393.263515819375,55.25923416592339,54.79670017693146,12.6499081444299,12.952336588858518
-79560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952374380960732,12.952374380960732,1264.3097082436134,3660.020621164369,2395.710912920755,55.259498709522525,54.79649271327903,12.64963666413477,12.952374380960732
-79620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952411639418173,12.952411639418173,1265.782037946329,3664.2996055642134,2398.5175676178837,55.25980209922425,54.79625478525567,12.649319252091999,12.952411639418173
-79680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952448434318935,12.952448434318935,1266.9501922717136,3667.6950724219605,2400.744880150247,55.26004284553761,54.79606598420493,12.649074585996015,12.952448434318935
-79740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952484743491313,12.952484743491313,1268.0005639401897,3670.7484125101128,2402.747848569924,55.26025933429329,54.79589620671605,12.648857783799846,12.952484743491313
-79800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952520217487848,12.952520217487848,1269.1202416731371,3674.003032411166,2404.8827907380287,55.26049009425314,54.795715237286956,12.64862346942764,12.952520217487848
-79860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952554989020244,12.952554989020244,1270.7732268863986,3678.806739237992,2408.033512351593,55.260830688016995,54.79544813263397,12.64826009209888,12.952554989020244
-79920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952589292201655,12.952589292201655,1272.2492409337408,3683.0964067199684,2410.847165786228,55.26113483523426,54.79520961054242,12.647938840596753,12.952589292201655
-79980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952623209916545,12.952623209916545,1273.204940450149,3685.8746941092627,2412.6697536591137,55.26133182216008,54.7950551270197,12.647742441197105,12.952623209916545
-80040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952656494988195,12.952656494988195,1274.7867472259406,3690.471666010711,2415.6849187847697,55.26165775798726,54.794799517595045,12.647394707322832,12.952656494988195
-80100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952689414228688,12.952689414228688,1276.188034681791,3694.544282649842,2418.3562479680513,55.261946515839774,54.79457306434143,12.647090057007034,12.952689414228688
-80160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952721924792213,12.952721924792213,1277.1413120687544,3697.3155122492963,2420.1742001805414,55.262143002376064,54.794418973240354,12.646892836355967,12.952721924792213
-80220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952753789409432,12.952753789409432,1278.3219955900768,3700.747297550897,2422.425301960821,55.262386323835095,54.79422815267705,12.646640234189599,12.952753789409432
-80280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952785078386714,12.952785078386714,1279.3898063104075,3703.851189690576,2424.461383380169,55.26260639692357,54.794055564238356,12.646414227812484,12.952785078386714
-80340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952815625151839,12.952815625151839,1280.3526159363664,3706.650037905643,2426.297421969277,55.26280484170274,54.79389993741985,12.64621275800882,12.952815625151839
-80400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952845407509727,12.952845407509727,1281.488220982861,3709.9508074955797,2428.4625865127177,55.26303887386999,54.79371640181979,12.645968933344927,12.952845407509727
-80460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952874365772796,12.952874365772796,1282.8892944215006,3714.0227126503605,2431.13341822886,55.26332758133644,54.79348998808055,12.645660385230126,12.952874365772796
-80520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952902861941894,12.952902861941894,1284.2196687350788,3717.889244485011,2433.669575749933,55.26360172737241,54.793274993886364,12.645368393372125,12.952902861941894
-80580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952930793572865,12.952930793572865,1285.7503053457044,3722.337527365479,2436.5872220197753,55.26391712091489,54.7930276520626,12.6450276295968,12.952930793572865
-80640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952958549711669,12.952958549711669,1286.7840236524455,3725.3422930016322,2438.558269349187,55.264130165755184,54.792860575403616,12.644806308798886,12.952958549711669
-80700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952985679102815,12.952985679102815,1287.7373192657835,3728.1134080425413,2440.3760887767576,55.26432664423337,54.79270649062197,12.64460372418907,12.952985679102815
-80760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95301242877188,12.95301242877188,1289.1014508898807,3732.078005344088,2442.976554454207,55.264607743379656,54.79248604357362,12.644301859564596,12.95301242877188
-80820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953038569687765,12.953038569687765,1290.3365660461866,3735.667795225241,2445.331229179054,55.26486226782055,54.79228643726936,12.644030445995812,12.953038569687765
-80880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953064238107562,12.953064238107562,1291.5166527186946,3739.0977190637373,2447.581066345042,55.26510545739676,54.79209572013285,12.643771807931348,12.953064238107562
-80940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953089471592829,12.953089471592829,1292.515427787602,3742.0009121669655,2449.485484379364,55.26531130054588,54.79193429127314,12.643556384398794,12.953089471592829
-81000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953114083533244,12.953114083533244,1293.7999644854417,3745.734250591046,2451.9342861056048,55.26557600294004,54.79172670308852,12.643271547470857,12.953114083533244
-81060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953138277113785,12.953138277113785,1295.2761436692065,3750.024337024082,2454.748193354876,55.265880180078405,54.79148815753188,12.642940155081348,12.953138277113785
-81120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953162130761793,12.953162130761793,1296.2244723254644,3752.780950958864,2456.5564786334,55.266075630445826,54.79133487902796,12.642735499789831,12.953162130761793
-81180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953185420688273,12.953185420688273,1297.5707686881015,3756.6937073414992,2459.122938653397,55.26635305402341,54.79111731447957,12.642434472877117,12.953185420688273
-81240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95320841291058,12.95320841291058,1298.8249792184765,3760.3389480501255,2461.513968831649,55.266611510124505,54.79091462484012,12.642155316751154,12.95320841291058
-81300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953231074344867,12.953231074344867,1299.8146919442208,3763.21577194898,2463.401080004759,55.26681548368171,54.79075466217493,12.641939508383233,12.953231074344867
-81360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953253235234186,12.953253235234186,1301.2134535846328,3767.28096092174,2466.067507337107,55.267103715118616,54.79052862175345,12.641624719994695,12.953253235234186
-81420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953274902430278,12.953274902430278,1302.1168705713624,3769.9070496546633,2467.7901790833,55.26728991097836,54.79038260093398,12.64142869711865,12.953274902430278
-81480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953296195699153,12.953296195699153,1302.94317602289,3772.309098864264,2469.365922841374,55.26746022191421,54.79024903758594,12.641250867133607,12.953296195699153
-81540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953316740814627,12.953316740814627,1304.3709553257888,3776.4585605415746,2472.0876052157855,55.2677544285122,54.790018311249774,12.640927480714009,12.953316740814627
-81600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953336778617553,12.953336778617553,1306.0283907994612,3781.275245237367,2475.2468544379058,55.26809594280868,54.789750484685314,12.640548293196193,12.953336778617553
-81660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953356725265088,12.953356725265088,1306.8038008105354,3783.5293935222962,2476.725592711761,55.268255767240454,54.789625145193156,12.640381374952895,12.953356725265088
-81720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95337612321157,12.95337612321157,1308.0475802141532,3787.144288896307,2479.096708682153,55.26851207185938,54.789424142815676,12.640101141334714,12.95337612321157
-81780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953395322220695,12.953395322220695,1309.3187287512792,3790.8387147412013,2481.5199859899208,55.26877401538669,54.789218718223715,12.639814117343686,12.953395322220695
-81840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953414027779946,12.953414027779946,1309.9797638137675,3792.760522565957,2482.780758752189,55.26891027610935,54.7891118581549,12.639673501673407,12.953414027779946
-81900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953432152891494,12.953432152891494,1311.08545909131,3795.97421146198,2484.8887523706694,55.26913813426338,54.78893316441586,12.639425245198927,12.953432152891494
-81960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953449709999411,12.953449709999411,1312.413039478268,3799.832551455245,2487.419511976976,55.269411699717296,54.78871862553292,12.639122997274466,12.953449709999411
-82020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953466873531545,12.953466873531545,1313.599001015009,3803.2794300709243,2489.6804290559157,55.26965609159341,54.78852696551389,12.638854454885713,12.953466873531545
-82080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953483575885992,12.953483575885992,1314.3506075244225,3805.4643040100977,2491.113696485675,55.26981100434685,54.788405477918865,12.638690038620016,12.953483575885992
-82140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95349976651978,12.95349976651978,1315.7385355284812,3809.4979637836973,2493.7594282552163,55.270097000418,54.78818119054357,12.638371895696144,12.95349976651978
-82200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953515602393502,12.953515602393502,1317.2265533149853,3813.8224420493184,2496.5958887343318,55.27040361622551,54.78794073250365,12.638029296304753,12.953515602393502
-82260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953531315530329,12.953531315530329,1318.2016245221064,3816.656575108288,2498.454950586181,55.27060456301635,54.7877831435266,12.63781008471532,12.953531315530329
-82320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95354661889903,12.95354661889903,1319.5259304671988,3820.505408483125,2500.9794780159264,55.27087745448848,54.78756913320199,12.637506370776943,12.95354661889903
-82380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953561767102036,12.953561767102036,1320.6388405933628,3823.7400392181617,2503.101198624799,55.271106797536184,54.78738927496125,12.637253403008721,12.953561767102036
-82440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953576639689526,12.953576639689526,1321.6574384248236,3826.700641531957,2505.0432031071327,55.271316711321,54.787224653777315,12.637022869761918,12.953576639689526
-82500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953591097380553,12.953591097380553,1322.8903580145272,3830.2839633863014,2507.3936053717734,55.271570777419406,54.78702540692005,12.636740313818484,12.953591097380553
-82560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953605273159413,12.953605273159413,1324.0064586975932,3833.527861903887,2509.5214032062936,55.27180077759897,54.78684503333524,12.63648560574926,12.953605273159413
-82620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953619122239413,12.953619122239413,1325.2687860600688,3837.196638870165,2511.9278528100963,55.27206090268843,54.78664103482111,12.636195358734104,12.953619122239413
-82680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95363261314018,12.95363261314018,1326.4022638114,3840.4910269212983,2514.0887631098976,55.27229448271417,54.786457853805075,12.63593578153522,12.95363261314018
-82740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95364580379915,12.95364580379915,1327.5492125892854,3843.8245582963787,2516.275345707093,55.272530838103926,54.78627249625875,12.63567265999902,12.95364580379915
-82800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953659377992794,12.953659377992794,1328.455901920211,3846.460021166228,2518.0041192460158,55.27271769876411,54.78612595408125,12.635467773731827,12.953659377992794
-82860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953673002267587,12.953673002267587,1329.6144590538456,3849.827351961724,2520.212892907879,55.27295645062925,54.78593871714138,12.635202281558616,12.953673002267587
-82920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953686071550836,12.953686071550836,1331.0160415783705,3853.9008299773964,2522.884788399025,55.27324527004478,54.78571221560804,12.634877711313749,12.953686071550836
-82980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953698626975838,12.953698626975838,1331.9634711614328,3856.654656650259,2524.6911854888267,55.27344052300454,54.78555909191761,12.634661997341428,12.953698626975838
-83040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953710611586315,12.953710611586315,1333.4038382283788,3860.84081345073,2527.436975222352,55.273737331639396,54.785326324979884,12.634327004754605,12.953710611586315
-83100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953722381845155,12.953722381845155,1334.4210413752846,3863.79737030401,2529.376328928726,55.273946958674095,54.785161928674675,12.634093704409272,12.953722381845155
-83160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953733719133401,12.953733719133401,1335.3670378871886,3866.547003439877,2531.1799655526884,55.27414191432246,54.78500903814545,12.633877121237203,12.953733719133401
-83220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953744542135125,12.953744542135125,1336.7132555957235,3870.4595813400983,2533.746325744375,55.27441932558085,54.78479148325818,12.633563641042526,12.953744542135125
-83280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953755029501643,12.953755029501643,1337.4183819532195,3872.509266464436,2535.090884511217,55.27456465322983,54.7846775126123,12.633404220130307,12.953755029501643
-83340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953764946179993,12.953764946179993,1338.7658568258141,3876.4254807722737,2537.6596239464593,55.27484232233594,54.78445975551248,12.633089533035124,12.953764946179993
-83400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953774430821813,12.953774430821813,1340.4706507658295,3881.380016216317,2540.9093654504873,55.275193610949046,54.784184263612566,12.63268835802651,12.953774430821813
-83460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953783909193199,12.953783909193199,1341.3144870579679,3883.8327507876365,2542.518263729669,55.2753675158024,54.7840478817981,12.632494524522848,12.953783909193199
-83520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953793013845146,12.953793013845146,1342.5277496941055,3887.358987015576,2544.831237321471,55.27561753454508,54.78385180900822,12.632211345730473,12.953793013845146
-83580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953801944272428,12.953801944272428,1343.5963557596574,3890.464874862173,2546.868519102515,55.2758377495708,54.783679109257754,12.631962830964534,12.953801944272428
-83640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953810420682807,12.953810420682807,1344.8461153715816,3894.0971709032697,2549.251055531688,55.27609528823101,54.78347713910514,12.631670233566446,12.953810420682807
-83700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953818680193073,12.953818680193073,1346.2647484973434,3898.220216900775,2551.955468403432,55.276387622273724,54.78324788128742,12.631336744855215,12.953818680193073
-83760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953826700695164,12.953826700695164,1347.2421669859282,3901.061118014147,2553.8189510282173,55.276589049116545,54.78308991583806,12.631109282652512,12.953826700695164
-83820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953834476362868,12.953834476362868,1348.1114122302213,3903.587667359184,2555.4762551289623,55.276768187654675,54.78294942959864,12.630907629716148,12.953834476362868
-83880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953841763456376,12.953841763456376,1349.234789578998,3906.8527047910948,2557.6179152120967,55.276999686814406,54.78276788046505,12.630644281830914,12.953841763456376
-83940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953848572561517,12.953848572561517,1350.602182185057,3910.826844680412,2560.224662495355,55.27728146308795,54.78254690239161,12.630321684511905,12.953848572561517
-84000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953855122902374,12.953855122902374,1351.845326113168,3914.439923719076,2562.594597605907,55.27753763927121,54.782346000737526,12.630028753600707,12.953855122902374
-84060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953861470155935,12.953861470155935,1352.8360857920509,3917.319567974706,2564.483482182655,55.27774181313293,54.78218588098704,12.629796408340976,12.953861470155935
-84120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953867403617528,12.953867403617528,1354.118724410943,3921.0474238093325,2566.9286993983883,55.2780061272915,54.781978597269315,12.629493347461949,12.953867403617528
-84180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95387317434338,12.95387317434338,1355.313960621195,3924.521294106773,2569.2073334855772,55.278252433259475,54.781785436157506,12.629211174405134,12.95387317434338
-84240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95387855091852,12.95387855091852,1356.6081241056884,3928.282654777096,2571.674530671408,55.278519123013886,54.781576289420656,12.628904779155333,12.95387855091852
-84300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953883765855307,12.953883765855307,1357.7428478463605,3931.580676130749,2573.837828284389,55.278752960876005,54.78139290620097,12.628636625037696,12.953883765855307
-84360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953888438252115,12.953888438252115,1358.6070646923852,3934.092544494405,2575.485479802019,55.27893105855436,54.78125323623745,12.628433088874937,12.953888438252115
-84420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953892719125195,12.953892719125195,1360.2547045556896,3938.8811625141375,2578.626457958448,55.279270583426495,54.78098696984396,12.628040454610716,12.953892719125195
-84480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9538967902378,12.9538967902378,1361.3608490084607,3942.09611298085,2580.7352639723895,55.2794985313831,54.78080820567882,12.62777804269162,12.9538967902378
-84540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95390052038794,12.95390052038794,1362.375372227283,3945.0447880145475,2582.669415787265,55.279707599758346,54.78064424749241,12.627537360299113,12.95390052038794
-84600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953903932402211,12.953903932402211,1363.6475561644788,3948.742279272841,2585.0947231083614,55.27996976107096,54.78043865210618,12.627234294147188,12.953903932402211
-84660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953907084491195,12.953907084491195,1365.1219674015276,3953.027502326751,2587.905534925224,55.280273594040324,54.780200376458,12.62688225320017,12.953907084491195
-84720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953910056335607,12.953910056335607,1366.43403709798,3956.840937033473,2590.4068999354918,55.280543976054474,54.779988334131545,12.626569135766635,12.953910056335607
-84780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953912921050613,12.953912921050613,1367.3091189165425,3959.3843753539427,2592.0752564373997,55.28072431216931,54.7798469087137,12.62636117566885,12.953912921050613
-84840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95391551522362,12.95391551522362,1368.6751300956735,3963.354599695996,2594.679469600323,55.281005810978186,54.77962614823703,12.626034684026711,12.95391551522362
-84900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953917852055302,12.953917852055302,1369.8926782014084,3966.893352044165,2597.000673842757,55.28125671735649,54.77942937933454,12.62574369794297,12.953917852055302
-84960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953919918052225,12.953919918052225,1370.7475023293969,3969.3779062294398,2598.630403900044,55.281432878458176,54.77929122809711,12.625539820293719,12.953919918052225
-85020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95392145643956,12.95392145643956,1371.8876933453548,3972.6918142257978,2600.804120880443,55.28166784282524,54.779106961435815,12.625266673304493,12.95392145643956
-85080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953922630859815,12.953922630859815,1373.052885880013,3976.078380929721,2603.025495049708,55.28190795888497,54.77891865465036,12.624987140105159,12.953922630859815
-85140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953923437251436,12.953923437251436,1374.7988670242803,3981.152949658781,2606.354082634501,55.282267758531475,54.778636488122615,12.624567324112975,12.953923437251436
-85200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953924220711176,12.953924220711176,1376.0884229772657,3984.9009951088,2608.812572131534,55.282533504363926,54.7784280816399,12.624257436531035,12.953924220711176
-85260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953924877806823,12.953924877806823,1376.5905685398795,3986.360493992176,2609.7699254522963,55.282636986501934,54.778346927598065,12.624137116076989,12.953924877806823
-85320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953925071969705,12.953925071969705,1377.9871108900393,3990.4194853256263,2612.432374435587,55.282924779194616,54.778121231254026,12.623800865586144,12.953925071969705
-85380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953924913343993,12.953924913343993,1379.3878548039286,3994.4906937884584,2615.102838984529,55.283213438124974,54.777894855578346,12.62346324944028,12.953924913343993
-85440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95392451013296,12.95392451013296,1380.34666515504,3997.277436003468,2616.930770848428,55.283411025171574,54.77773990142146,12.623231856726154,12.95392451013296
-85500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953923816787348,12.953923816787348,1381.6875988173779,4001.174818362328,2619.4872195449498,55.283687359413406,54.77752319116542,12.622908113707215,12.953923816787348
-85560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953922845396571,12.953922845396571,1383.256393549201,4005.734495857356,2622.478102308155,55.28401065206581,54.777269654604,12.622529194712167,12.953922845396571
-85620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953921837280605,12.953921837280605,1384.6028313064985,4009.6479142370067,2625.045082930509,55.28428812332695,54.77705205266061,12.6222038060694,12.953921837280605
-85680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953920752798872,12.953920752798872,1385.7684268017097,4013.0357225580797,2627.26729575637,55.284528327514856,54.77686367676221,12.621921908203745,12.953920752798872
-85740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953919574252206,12.953919574252206,1386.9319043461514,4016.417389130377,2629.4854847842253,55.28476809624586,54.7766756423632,12.621640424755975,12.953919574252206
-85800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953918050062661,12.953918050062661,1388.2361458277414,4020.20819876853,2631.9720529407887,55.285036874267476,54.77646485793961,12.62132468153955,12.953918050062661
-85860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953916425780013,12.953916425780013,1389.4054979490395,4023.6069531235607,2634.201455174522,55.285277854583995,54.776275873376036,12.621041335424,12.953916425780013
-85920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953914446971982,12.953914446971982,1390.7222440751639,4027.434126746613,2636.711882671449,55.285549210925204,54.77606306695077,12.620722122609239,12.953914446971982
-85980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953912198205847,12.953912198205847,1392.2142425285735,4031.7707097975813,2639.556467269008,55.2858566857035,54.77582193527818,12.620360413564804,12.953912198205847
-86040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953909911062526,12.953909911062526,1392.7327790023685,4033.2777676840087,2640.5449886816396,55.28596353994757,54.775738136721614,12.62023321054711,12.953909911062526
-86100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953906995684926,12.953906995684926,1394.0560034076177,4037.123772094873,2643.067768687255,55.28623623146761,54.77552428320591,12.619911500308902,12.953906995684926
-86160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953903722002009,12.953903722002009,1395.570348028063,4041.5253123962793,2645.9549643682158,55.286548311912576,54.775279539620435,12.619543381829324,12.953903722002009
-86220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953900104754588,12.953900104754588,1396.9735477398056,4045.603792373712,2648.630244633905,55.286837486568785,54.77505275949584,12.619201698849967,12.953900104754588
-86280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953896461535404,12.953896461535404,1397.827823453672,4048.086704892554,2650.2588814388814,55.2870135314196,54.774914699426134,12.61899225068031,12.953896461535404
-86340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95389231163784,12.95389231163784,1399.0188859049072,4051.5485574241493,2652.529671519241,55.28725898562995,54.77472220629021,12.618701149153697,12.95389231163784
-86400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953888107529854,12.953888107529854,1402.0556109576025,4060.37542985398,2658.319818896377,55.2878848335319,54.77423139610985,12.617965264198698,12.953888107529854
-86460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953884400842098,12.953884400842098,1405.1019048744113,4069.23029557946,2664.1283907050483,55.288512666289336,54.77373902934156,12.617227548384891,12.953884400842098
-86520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953882022131278,12.953882022131278,1408.2098644855703,4078.264657773615,2670.054793288045,55.28915322586907,54.77323668178733,12.616476270546615,12.953882022131278
-86580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953881463556323,12.953881463556323,1411.1449450273528,4086.7967462216334,2675.6518011942803,55.28975817300132,54.77276226266703,12.615768437154873,12.953881463556323
-86640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953882606478775,12.953882606478775,1413.6528940440521,4094.0874144335853,2680.434520389533,55.290275100272396,54.77235687157061,12.615165203993099,12.953882606478775
-86700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953885373910149,12.953885373910149,1416.1707969868155,4101.407235195554,2685.236438208739,55.29079409457515,54.77194985944106,12.614561169117003,12.953885373910149
-86760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953889372184408,12.953889372184408,1418.888940471726,4109.309362155379,2690.420421683653,55.291354375945026,54.77151046865722,12.613910084624145,12.953889372184408
-86820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953894448730473,12.953894448730473,1421.5645435244917,4117.088012889644,2695.523469365153,55.291905902575095,54.77107794362369,12.613270305877574,12.953894448730473
-86880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953900618546973,12.953900618546973,1423.6036461942535,4123.016440599582,2699.412794405329,55.2923262435965,54.77074829859032,12.612784994299505,12.953900618546973
-86940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953907126355308,12.953907126355308,1425.7112173951887,4129.144010557116,2703.432793161928,55.29276070435164,54.77040758040472,12.6122835078848,12.953907126355308
-87000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953913971414336,12.953913971414336,1427.9557074003733,4135.669730574188,2707.714023173816,55.29322339501972,54.77004472340777,12.611749347779446,12.953913971414336
-87060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95392072000902,12.95392072000902,1429.6272833619494,4140.529910301962,2710.9026269400133,55.293567994532964,54.769774477316474,12.611353162684626,12.95392072000902
-87120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95392696985357,12.95392696985357,1431.8152883923267,4146.8915076553385,2715.076219263013,55.29401904852786,54.76942074617524,12.610832009228533,12.95392696985357
-87180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953932789628064,12.953932789628064,1434.016518802991,4153.291599737285,2719.2750809342942,55.29447283193113,54.76906487454364,12.610307232541116,12.953932789628064
-87240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953938105580358,12.953938105580358,1435.3353371347175,4157.126244170285,2721.790907035567,55.29474471834675,54.768851652416856,12.60999463156899,12.953938105580358
-87300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953942489497555,12.953942489497555,1436.9628628100384,4161.858375253864,2724.895512443827,55.29508023895098,54.76858852629985,12.609606696611063,12.953942489497555
-87360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953945643209703,12.953945643209703,1439.2764598846302,4168.585146088566,2729.308686203936,55.29555718481589,54.768214489916176,12.60905217222941,12.953945643209703
-87420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953947983504637,12.953947983504637,1440.989267082031,4173.565178134557,2732.575911052526,55.29591028229724,54.767937579443256,12.608641644182901,12.953947983504637
-87480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953949193657234,12.953949193657234,1442.3631130742222,4177.559655466286,2735.1965423920637,55.29619350134872,54.76771546989665,12.608311693931705,12.953949193657234
-87540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95394923868268,12.95394923868268,1444.1432440683639,4182.735343484262,2738.5920994158982,55.29656047139285,54.767427680111005,12.607882653941164,12.95394923868268
-87600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953948117531734,12.953948117531734,1445.3778460759593,4186.324862617781,2740.947016541822,55.296814977856855,54.7672280879048,12.607583950020395,12.953948117531734
-87660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953945398142848,12.953945398142848,1447.1881761526124,4191.5882336833865,2744.400057530776,55.297188164897186,54.76693542254951,12.607144881836904,12.953945398142848
-87720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953941592328016,12.953941592328016,1448.779153692611,4196.2137935124965,2747.434639819886,55.29751612943775,54.76667822214218,12.606757606541159,12.953941592328016
-87780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953936295928973,12.953936295928973,1449.89283975286,4199.451517880144,2749.558678127284,55.29774569274864,54.76649819116393,12.606483903161312,12.953936295928973
-87840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953929740224357,12.953929740224357,1451.4864489345869,4204.084590386017,2752.5981414514313,55.298074189985506,54.7662405729989,12.606093261451779,12.953929740224357
-87900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953921839475287,12.953921839475287,1452.933402773891,4208.291182424976,2755.3577796510854,55.298372448630225,54.76600666891655,12.605736635384028,12.953921839475287
-87960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953912879781377,12.953912879781377,1454.6527832215197,4213.289847333291,2758.6370641117715,55.298726867380616,54.76572872226167,12.605313284545913,12.953912879781377
-88020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953902875883074,12.953902875883074,1456.0800406600683,4217.439080331302,2761.3590396712343,55.299021059144366,54.765498007558975,12.604959314842546,12.953902875883074
-88080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953891850947745,12.953891850947745,1457.315612255779,4221.030903962933,2763.7152917071544,55.29927572909743,54.765298287139366,12.604650539445414,12.953891850947745
-88140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95387967718482,12.95387967718482,1458.851278322644,4225.495251868053,2766.643973545409,55.29959226338103,54.765050050709476,12.604268279328654,12.95387967718482
-88200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953866438826633,12.953866438826633,1460.4798278011224,4230.229635291784,2769.749807490661,55.299927943926214,54.764786799161605,12.603862568616275,12.953866438826633
-88260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953852315546035,12.953852315546035,1461.945285226407,4234.489758667566,2772.544473441159,55.300229998170174,54.76454991844746,12.603495294315154,12.953852315546035
-88320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953837348074893,12.953837348074893,1463.5792447690376,4239.2398175246335,2775.660572755597,55.30056679017807,54.764285795254544,12.603086557469721,12.953837348074893
-88380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953821605917915,12.953821605917915,1464.7270555941625,4242.576231430727,2777.8491758365635,55.300803350949366,54.76410027664137,12.602794250565214,12.953821605917915
-88440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953804882098673,12.953804882098673,1465.7860564493365,4245.654346956387,2779.868290507051,55.30102159767421,54.763929120496165,12.602522379773815,12.953804882098673
-88500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95378714772778,12.95378714772778,1467.0334718956628,4249.28028040744,2782.2468085117766,55.30127868618236,54.76372750336737,12.602204081958128,12.95378714772778
-88560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953768266438928,12.953768266438928,1468.532654731061,4253.6382526575735,2785.105597926512,55.30158767823833,54.763485181796504,12.601823947079012,12.953768266438928
-88620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953748566453335,12.953748566453335,1470.357176100321,4258.9422414579685,2788.5850653576476,55.30196374545364,54.763190257714776,12.601364560620803,12.953748566453335
-88680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953728271348504,12.953728271348504,1471.6477268282085,4262.693495729571,2791.0457689013615,55.30222971958536,54.7629816721924,12.601033316833597,12.953728271348504
-88740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953707383640266,12.953707383640266,1472.9902021649384,4266.595721217237,2793.6055190522984,55.30250639799821,54.7627646920263,12.600688964323965,12.953707383640266
-88800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953685931910028,12.953685931910028,1474.6875779370812,4271.529960645071,2796.84238270799,55.30285624902604,54.762490327527296,12.600258483325314,12.953685931910028
-88860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953663898065866,12.953663898065866,1475.9004107932637,4275.055160433532,2799.154749640269,55.303106195313156,54.7622943115594,12.599944245779062,12.953663898065866
-88920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953641342266955,12.953641342266955,1476.824147637653,4277.739654683624,2800.915507045971,55.303296533289156,54.76214504235829,12.59969919135144,12.953641342266955
-88980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953617980611757,12.953617980611757,1478.1469768367901,4281.584658100252,2803.437681263462,55.303569154544896,54.761931243946115,12.599357113504205,12.953617980611757
-89040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953593882228725,12.953593882228725,1479.6951809189634,4286.085024430933,2806.3898435119695,55.30388824283738,54.76168100457981,12.598959962886337,12.953593882228725
-89100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9535692247038,12.9535692247038,1481.3947873549876,4291.025666762279,2809.630879407292,55.304238547921145,54.761406283995456,12.59852574921071,12.9535692247038
-89160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953544324707813,12.953544324707813,1482.4997892852166,4294.23718089943,2811.7373916142133,55.304466253086204,54.7612277102353,12.598234658984108,12.953544324707813
-89220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953518917237696,12.953518917237696,1483.875002048868,4298.234467658083,2814.3594656092155,55.304749671697245,54.76100544418765,12.597877911554349,12.953518917237696
-89280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953493159099095,12.953493159099095,1485.1460306754252,4301.928775334582,2816.7827446591573,55.30501160826982,54.76080002504981,12.597545934535615,12.953493159099095
-89340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953466782927576,12.953466782927576,1486.3221714552005,4305.347112429778,2819.024940974577,55.30525397777853,54.760609951036756,12.597236222358715,12.953466782927576
-89400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953440051852033,12.953440051852033,1487.8524502999148,4309.795323302273,2821.942873002358,55.305569368185864,54.760362611671674,12.596840764903279,12.953440051852033
-89460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953412883543614,12.953412883543614,1489.2447494776147,4313.842265664332,2824.5975161867177,55.30585630756313,54.760137584525175,12.596478141177375,12.953412883543614
-89520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953385394246993,12.953385394246993,1490.847236529584,4318.500474613402,2827.653238083819,55.30618658744292,54.75987856835389,12.596064513554484,12.953385394246993
-89580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953357810223643,12.953357810223643,1492.239473881338,4322.547262077608,2830.30778819627,55.30647351586407,54.759653549799545,12.595701485928304,12.953357810223643
-89640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953329991626813,12.953329991626813,1493.4960443621628,4326.199508046277,2832.7034636841136,55.306732470212815,54.75945046941817,12.595370936859519,12.953329991626813
-89700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953301902093079,12.953301902093079,1494.6797123367212,4329.639736141424,2834.960023804703,55.30697639191665,54.759259178123465,12.595057696419804,12.953301902093079
-89760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95327341928734,12.95327341928734,1496.0569632812578,4333.642941791934,2837.585978510677,55.307260230300244,54.75903658287657,12.594697383622652,12.95327341928734
-89820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953244629439626,12.953244629439626,1497.597277767807,4338.120383993589,2840.5231062257817,55.307577693384935,54.75878761805081,12.594297441951868,12.953244629439626
-89880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953215752794053,12.953215752794053,1498.924220954464,4341.977303334992,2843.0530823805293,55.30785115968796,54.75857315692522,12.59394886384769,12.953215752794053
-89940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953186536645779,12.953186536645779,1500.1228471503064,4345.4610331054,2845.338185955095,55.3080981658226,54.758379446720035,12.593630889990811,12.953186536645779
-90000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953156959057473,12.953156959057473,1501.2644468356534,4348.7789015350645,2847.51445469941,55.308333411935166,54.758194959104785,12.593326307820835,12.953156959057473
-90060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95312695183724,12.95312695183724,1503.145643032292,4354.247764512437,2851.102121480146,55.30872116957022,54.75789086701754,12.592842942532481,12.95312695183724
-90120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953096946816066,12.953096946816066,1504.8111815094205,4359.089460337861,2854.2782788284408,55.30906445932416,54.75762164808189,12.592411580487756,12.953096946816066
-90180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953066995707793,12.953066995707793,1505.7360020804726,4361.776889948179,2856.0408878677067,55.30925500559553,54.75747221552882,12.592158897612224,12.953066995707793
-90240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953036806595106,12.953036806595106,1507.1668406221197,4365.936022861042,2858.769182238923,55.30954989975554,54.75724094998426,12.591783946416216,12.953036806595106
-90300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95300646956788,12.95300646956788,1508.4466388182373,4369.655879870284,2861.2092410520454,55.30981364803599,54.75703411004646,12.591445270665893,12.95300646956788
-90360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952975795848177,12.952975795848177,1510.1660573089368,4374.654350757464,2864.488293448527,55.31016805363796,54.75675617370301,12.591000237522614,12.952975795848177
-90420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952945155889706,12.952945155889706,1511.4377747401459,4378.35073250179,2866.912957761644,55.31043013748066,54.75655063907118,12.590663204234305,12.952945155889706
-90480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952914298812829,12.952914298812829,1512.3175039222815,4380.907021587089,2868.5895176648078,55.31061138555924,54.756408498461845,12.590420489241595,12.952914298812829
-90540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952883052379491,12.952883052379491,1514.2410690726786,4386.4993021678865,2872.2582330952096,55.31100789398226,54.756097543723456,12.58992564308393,12.952883052379491
-90600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952851767602734,12.952851767602734,1515.4211583470403,4389.929197666825,2874.508039319784,55.31125108323234,54.75590682684269,12.589610061277197,12.952851767602734
-90660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952820209673975,12.952820209673975,1516.8068879141854,4393.957206511252,2877.150318597067,55.31153668041432,54.75568285228918,12.589244610881028,12.952820209673975
-90720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952788599198605,12.952788599198605,1518.5108821519505,4398.910935556814,2880.4000534048637,55.311887913784965,54.75540740371221,12.588802345882517,12.952788599198605
-90780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95275686429348,12.95275686429348,1519.5297726107838,4401.871998823919,2882.342226213135,55.31209786153667,54.75524275589033,12.588525188588292,12.95275686429348
-90840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952724898879733,12.952724898879733,1521.1574987048828,4406.603927063449,2885.446428358567,55.31243336863199,54.75497964036745,12.588100959163828,12.952724898879733
-90900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952692840147007,12.952692840147007,1522.493822638475,4410.488298750116,2887.9944761116412,55.31270878158321,54.75476365261732,12.587746915754172,12.952692840147007
-90960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952660499065733,12.952660499065733,1523.7230669336584,4414.061213473655,2890.3381465399957,55.31296211136391,54.75456498320424,12.587418416490472,12.952660499065733
-91020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952628024914908,12.952628024914908,1525.1657755068577,4418.25503608739,2893.089260580533,55.31325946528615,54.754331788634516,12.587038296930338,12.952628024914908
-91080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95259525266425,12.95259525266425,1526.9179991062526,4423.349150201505,2896.4311510952534,55.31362065244795,54.75404853397235,12.586583224919998,12.95259525266425
-91140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952562517605017,12.952562517605017,1528.578197826845,4428.175633527886,2899.5974357010414,55.3139628638447,54.75378016071931,12.586150380818742,12.952562517605017
-91200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95252979822888,12.95252979822888,1529.548080042104,4430.994198357449,2901.446118315345,55.31416270811662,54.75362343637328,12.585884053228467,12.95252979822888
-91260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95249687309767,12.95249687309767,1530.9697964639574,4435.1270356163295,2904.157239152372,55.31445573805684,54.7533936328102,12.585508536564694,12.95249687309767
-91320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952463743435269,12.952463743435269,1532.4832359929349,4439.526686174097,2907.0434501811637,55.31476768583453,54.753148993266706,12.585110689854117,12.952463743435269
-91380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95243034176977,12.95243034176977,1533.854376863275,4443.512426602423,2909.6580497391487,55.31505028621566,54.7529273689014,12.584746893780409,12.95243034176977
-91440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952396777618288,12.952396777618288,1535.7440969114941,4449.006636667446,2913.2625397559527,55.31543984142243,54.752621867100245,12.584257846203716,12.952396777618288
-91500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952363324401016,12.952363324401016,1536.7707264062494,4451.9903005089445,2915.219574102694,55.31565139173145,54.75245596250106,12.58397709284276,12.952363324401016
-91560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95232956304618,12.95232956304618,1538.0392737797144,4455.677658844536,2917.6383850648213,55.31591283600415,54.75225092944072,12.583637678265696,12.95232956304618
-91620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952295553221473,12.952295553221473,1539.7359089820059,4460.610276929016,2920.8743679470117,55.316262572777596,54.75197665454372,12.58319475205904,12.952295553221473
-91680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952261350127394,12.952261350127394,1541.2945282300686,4465.141442164354,2923.846913934285,55.31658384540845,54.75172470214857,12.582784922221265,12.952261350127394
-91740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952227127521999,12.952227127521999,1542.9742690532528,4470.024972998394,2927.0507039451422,55.31693010178975,54.75145315668771,12.58234585137395,12.952227127521999
-91800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952192965370655,12.952192965370655,1544.2030206931968,4473.596638366031,2929.3936176728344,55.317183343147896,54.75125455661845,12.582015626940267,12.952192965370655
-91860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952158587926395,12.952158587926395,1545.547317431964,4477.50442327933,2931.9571058473657,55.31746041636064,54.75103726683752,12.58165731401274,12.952158587926395
-91920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952124060804735,12.952124060804735,1547.064177239215,4481.914204485821,2934.8500272466054,55.317773082571144,54.75079206387574,12.581257222093857,12.952124060804735
-91980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952089334998519,12.952089334998519,1548.7744500591077,4486.8866422487135,2938.112192189607,55.31812564277246,54.75051557475521,12.580810271490787,12.952089334998519
-92040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952054605904575,12.952054605904575,1550.3135022111744,4491.361030860961,2941.047528649787,55.31844288986621,54.75026677931655,12.58040461779176,12.952054605904575
-92100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952019898383925,12.952019898383925,1551.350003681422,4494.373502488061,2943.0234988066386,55.31865648282596,54.75009927280455,12.58012021746631,12.952019898383925
-92160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951984854513805,12.951984854513805,1552.6493850338306,4498.150696940168,2945.5013119063383,55.3189242968576,54.749889244373094,12.579772064679243,12.951984854513805
-92220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951949515815583,12.951949515815583,1554.3472258699853,4503.0870463344345,2948.7398204644487,55.319274298349704,54.749614761875144,12.579327490654777,12.951949515815583
-92280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95191394182359,12.95191394182359,1555.8820827553393,4507.549275362776,2951.6671926074373,55.31959068334825,54.749366642519405,12.57892199859937,12.95191394182359
-92340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9518782759755,12.9518782759755,1557.2618507487891,4511.56035248281,2954.298501734021,55.31987508037898,54.74914360916337,12.578553827161135,12.9518782759755
-92400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95184241385761,12.95184241385761,1558.5104094217966,4515.189729637849,2956.679320216053,55.32013241378279,54.74894179997948,12.578217113114018,12.95184241385761
-92460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95180633310826,12.95180633310826,1560.227957669198,4520.183483824258,2959.955526155061,55.32048648550544,54.748664125474996,12.577767033461877,12.95180633310826
-92520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95177013032132,12.95177013032132,1562.0606285649576,4525.5121835995915,2963.451555034633,55.32086430586706,54.7483678265192,12.577289053532553,12.95177013032132
-92580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951733985481367,12.951733985481367,1563.7164263737304,4530.326368059005,2966.6099416852753,55.32120564560998,54.748100136845295,12.576853798228084,12.951733985481367
-92640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951697927892596,12.951697927892596,1564.900111365668,4533.76709991204,2968.8669885463732,55.32144960356124,54.74790881712418,12.576532529348912,12.951697927892596
-92700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951661716474694,12.951661716474694,1566.2858843881293,4537.795765149415,2971.509880761286,55.3217352477203,54.747684805729726,12.576162348727786,12.951661716474694
-92760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951625360616156,12.951625360616156,1567.9953719185805,4542.7662236067345,2974.7708516881535,55.32208766779256,54.747408426502936,12.575713919232378,12.951625360616156
-92820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951588753344355,12.951588753344355,1569.063468289137,4545.870692263507,2976.80722397437,55.3223077837285,54.74723580446189,12.575419986626837,12.951588753344355
-92880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951551837859153,12.951551837859153,1570.9258680017988,4551.286040721236,2980.3601727194373,55.32269174783958,54.74693468737893,12.574934101360618,12.951551837859153
-92940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951514868487699,12.951514868487699,1572.7514002867408,4556.5941709910085,2983.842770704269,55.32306810988768,54.74663953207979,12.574457052203964,12.951514868487699
-93000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951477864505089,12.951477864505089,1573.8925991537685,4559.911354445994,2986.0187552922253,55.32330330796174,54.74645508213789,12.574145080630656,12.951477864505089
-93060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951440586452248,12.951440586452248,1575.2601424894974,4563.8870575013125,2988.626915011814,55.32358519702533,54.746234015610845,12.573778222557928,12.951440586452248
-93120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951403139737351,12.951403139737351,1576.737501950664,4568.18227184579,2991.4447698951262,55.323889740394364,54.74599518284425,12.573384697401973,12.951403139737351
-93180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951365407474148,12.951365407474148,1578.3633953688613,4572.909642223157,2994.5462468542964,55.3242249249172,54.74573232029315,12.572955046404159,12.951365407474148
-93240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951327371099556,12.951327371099556,1579.7693925312005,4576.997242424774,2997.227849893573,55.324514747858494,54.74550503176244,12.572578149338161,12.951327371099556
-93300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951289144019043,12.951289144019043,1581.3406669213969,4581.565723859426,3000.225056938029,55.32483866671606,54.74525100411064,12.572161179818242,12.951289144019043
-93360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9512507803604,12.9512507803604,1582.852874514587,4585.962371165972,3003.1094966513847,55.32515040204015,54.745006531180145,12.57175832375706,12.9512507803604
-93420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951212161152835,12.951212161152835,1584.7062301324122,4591.351608087154,3006.645377954742,55.325532514929456,54.7447068658852,12.571272891785588,12.951212161152835
-93480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951173537040582,12.951173537040582,1586.3487697810626,4596.127509222432,3009.7787394413695,55.32587114050989,54.74444130474536,12.570838319941885,12.951173537040582
-93540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951134907339403,12.951134907339403,1587.6148610312052,4599.808139403776,3012.1932783725706,55.32613210813721,54.744236645485756,12.570494577610946,12.951134907339403
-93600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951095982298913,12.951095982298913,1589.2787584632529,4604.64622062499,3015.367462161737,55.32647514250144,54.743967626834966,12.570054546316848,12.951095982298913
-93660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9510567455621,12.9510567455621,1590.720233037983,4608.83714658932,3018.1169135513373,55.32677229164529,54.7437345928591,12.56966787531611,12.9510567455621
-93720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951017307676153,12.951017307676153,1592.0799312185334,4612.790142839752,3020.710211621219,55.3270525708753,54.74351478881564,12.569300735744283,12.951017307676153
-93780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950977591487096,12.950977591487096,1593.3041661162436,4616.348987954925,3023.0448218386823,55.32730490362374,54.74331690130752,12.56896600738491,12.950977591487096
-93840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950937470836823,12.950937470836823,1595.2418486708095,4621.9837212951425,3026.7418726243327,55.32770442306725,54.74300358522941,12.568458707775502,12.950937470836823
-93900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95089725201852,12.95089725201852,1596.7749666795435,4626.441332107932,3029.6663654283893,55.32802048102057,54.742755722353174,12.568048935463116,12.95089725201852
-93960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950856717793624,12.950856717793624,1597.7884244966904,4629.386879986396,3031.598455489705,55.32822932919272,54.742591936857146,12.567764254241064,12.950856717793624
-94020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950815944518338,12.950815944518338,1599.8050479258523,4635.251371735622,3035.44632380977,55.32864513925265,54.74226584515039,12.567237243824373,12.950815944518338
-94080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95077498819534,12.95077498819534,1601.370732019751,4639.803771636733,3038.433039616981,55.32896791808186,54.742012711545776,12.566818871211504,12.95077498819534
-94140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950733907623773,12.950733907623773,1602.8031158769186,4643.968316921621,3041.165201044704,55.329263196867245,54.74178114436552,12.566432541515574,12.950733907623773
-94200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950692676817189,12.950692676817189,1604.4198189735087,4648.669210149357,3044.249391175849,55.32959650435057,54.74151975384957,12.566001576978886,12.950692676817189
-94260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950651255686035,12.950651255686035,1605.5404669447767,4651.926683872956,3046.386216928181,55.32982746905494,54.74133862385318,12.565690137254483,12.950651255686035
-94320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950609417270572,12.950609417270572,1606.8525772712203,4655.741263935396,3048.888686664176,55.33009793428793,54.741126516263826,12.565332075153794,12.950609417270572
-94380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950567132504926,12.950567132504926,1608.8500240422052,4661.550069058293,3052.700045016088,55.33050979611429,54.740803520889614,12.564808167110062,12.950567132504926
-94440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950524749188215,12.950524749188215,1610.633455156117,4666.736154499278,3056.1026993431615,55.33087750525603,54.740515151479705,12.564335807027028,12.950524749188215
-94500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950482322964742,12.950482322964742,1611.7786021409631,4670.064920644064,3058.286318503101,55.33111352485338,54.74033005727265,12.564017449234234,12.950482322964742
-94560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950439646230626,12.950439646230626,1613.2877708773426,4674.452961538449,3061.1651906611073,55.33142465025015,54.740086062666904,12.563610984292989,12.950439646230626
-94620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950396695899125,12.950396695899125,1614.6340775670064,4678.367086693939,3063.7330091269323,55.331702173597144,54.739868419876096,12.563243552552494,12.950396695899125
-94680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950353362774697,12.950353362774697,1616.506043303931,4683.810860017912,3067.304816713981,55.33208815365866,54.73956572181956,12.562748867504096,12.950353362774697
-94740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95030994459913,12.95030994459913,1617.8080125051094,4687.595978455422,3069.787965950312,55.33235653006454,54.73935525235604,12.562391667341005,12.95030994459913
-94800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950266142042944,12.950266142042944,1618.736650148574,4690.294684001908,3071.5580338533337,55.332547876499774,54.73920519228855,12.562124192419589,12.950266142042944
-94860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950221895318446,12.950221895318446,1621.0016194697973,4696.8821372688035,3075.8805177990057,55.33301494700472,54.738838900481774,12.561533733580813,12.950221895318446
-94920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950177597962707,12.950177597962707,1622.5064546493318,4701.257608471412,3078.7511538220815,55.33332518126071,54.73859560473746,12.561126689024256,12.950177597962707
-94980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95013313091535,12.95013313091535,1623.593042239905,4704.415957030063,3080.822914790158,55.33354911781728,54.73841998644206,12.560820425821955,12.95013313091535
-95040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950088352948699,12.950088352948699,1625.0328307295756,4708.602143412093,3083.5693126825176,55.333845931225525,54.73818721576089,12.560428600258666,12.950088352948699
-95100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95004321020764,12.95004321020764,1626.630798019725,4713.248645102354,3086.617847082629,55.33417538241143,54.737928849478166,12.559998230048793,12.95004321020764
-95160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949997760561669,12.949997760561669,1628.4052398769095,4718.408721013772,3090.003481136863,55.334541247599965,54.73764192615604,12.55952495488788,12.949997760561669
-95220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949952232961,12.949952232961,1629.6589112788786,4722.053298995137,3092.394387716259,55.33479965935508,54.73743927129414,12.559177301981572,12.949952232961
-95280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949906403061346,12.949906403061346,1630.8018721235235,4725.375682026551,3094.5738099030273,55.33503522650894,54.73725453190793,12.55885607135169,12.949906403061346
-95340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94986020274977,12.94986020274977,1632.168954864838,4729.350288873485,3097.181334008647,55.33531703834403,54.73703352594597,12.558480372636176,12.94986020274977
-95400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949813529431246,12.949813529431246,1633.6980653962075,4733.79641573748,3100.098350341273,55.33563228241092,54.736786301345795,12.558065091540037,12.949813529431246
-95460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949766481848178,12.949766481848178,1635.5391341142288,4739.150416123493,3103.611282009264,55.3360118975221,54.736488594889316,12.557574132524028,12.949766481848178
-95520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949719400268854,12.949719400268854,1636.8971913929363,4743.098762120688,3106.201570727752,55.33629184742324,54.73626904911622,12.557199730642937,12.949719400268854
-95580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949672030050586,12.949672030050586,1637.9594080897064,4746.186125223197,3108.22671713349,55.336510750991536,54.736097377853106,12.55689645519182,12.949672030050586
-95640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949624371921669,12.949624371921669,1640.0178520493494,4752.172802392834,3112.1549503434853,55.3369352248919,54.73576449168228,12.556352405549946,12.949624371921669
-95700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949576652657486,12.949576652657486,1641.5504096169018,4756.629022627975,3115.078613011073,55.337251184686544,54.735516705785244,12.555935238802618,12.949576652657486
-95760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94952883945343,12.94952883945343,1642.625306207778,4759.753309098828,3117.128002891051,55.3374727062675,54.73534298139188,12.55562845687978,12.94952883945343
-95820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949480795117244,12.949480795117244,1644.206821255538,4764.352034611481,3120.145213355943,55.33779877015352,54.73508727153936,12.555199143813525,12.949480795117244
-95880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949432439913268,12.949432439913268,1645.6384124783192,4768.514427837727,3122.876015359408,55.3380938967424,54.734855823716536,12.554805712343068,12.949432439913268
-95940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949383892535481,12.949383892535481,1647.3970861818677,4773.628774883847,3126.231688701979,55.338456519827346,54.73457144295697,12.554333125964039,12.949383892535481
-96000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949335197557886,12.949335197557886,1648.4981569247889,4776.829237580113,3128.331080655324,55.33868344257957,54.73439348279029,12.554019143817284,12.949335197557886
-96060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949286209171966,12.949286209171966,1649.5202140150855,4779.799723912771,3130.2795098976835,55.338894059299776,54.734228310341685,12.55372394492258,12.949286209171966
-96120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949236763071255,12.949236763071255,1651.5244194667248,4785.6286911643565,3134.1042716976312,55.339307351227276,54.733904193435876,12.553191182917882,12.949236763071255
-96180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949187122866533,12.949187122866533,1652.9781350076335,4789.855494960807,3136.8773599531733,55.33960704479326,54.733669164041814,12.552791123078412,12.949187122866533
-96240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949137306633279,12.949137306633279,1654.3569695740186,4793.86436728192,3139.5073977079014,55.33989128635069,54.733446252612936,12.552408964021538,12.949137306633279
-96300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949087430139384,12.949087430139384,1655.8692540040229,4798.261667087678,3142.3924130836554,55.34020306864284,54.73320174284857,12.55199452410906,12.949087430139384
-96360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94903731000283,12.94903731000283,1657.198191628558,4802.125333532615,3144.927141904057,55.34047701467482,54.732986905503985,12.551624105052397,12.94903731000283
-96420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948986933918032,12.948986933918032,1658.7761353510064,4806.713748763748,3147.9376134127415,55.34080234767652,54.7327317688346,12.551193312183216,12.948986933918032
-96480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94893645258063,12.94893645258063,1659.8547369886303,4809.848805010204,3149.9940680215736,55.34102463298632,54.73255744550036,12.55088296978752,12.94893645258063
-96540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948885498818404,12.948885498818404,1661.6024067317508,4814.931227505214,3153.3288207734636,55.34138499267983,54.732274839765616,12.55041062106696,12.948885498818404
-96600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948834562200648,12.948834562200648,1663.2458733740082,4819.710392621706,3156.4645192476974,55.34172385049193,54.73200909650218,12.549963443277528,12.948834562200648
-96660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948783408660068,12.948783408660068,1664.4210801498534,4823.126630146991,3158.705549997137,55.34196607246915,54.73181913818811,12.549629104556846,12.948783408660068
-96720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948732030712506,12.948732030712506,1666.0331575360285,4827.814449774692,3161.781292238664,55.34229845362813,54.731558474125656,12.549189061963869,12.948732030712506
-96780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948680576624506,12.948680576624506,1667.0232102336329,4830.691773444412,3163.66856321078,55.34250246493626,54.731398481854974,12.548899126102743,12.948680576624506
-96840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948628663201324,12.948628663201324,1668.3977475785584,4834.68818782052,3166.290440241962,55.34278582330956,54.731176263047686,12.548515901434332,12.948628663201324
-96900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94857643292978,12.94857643292978,1669.9023693465685,4839.063236993889,3169.1608676473197,55.34309602809701,54.73093299041355,12.548100951545296,12.94857643292978
-96960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94852386485822,12.94852386485822,1671.2770705656592,4843.0601187698885,3171.7830482042295,55.34337941963567,54.73071074559692,12.547717033968455,12.94852386485822
-97020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948471070250411,12.948471070250411,1673.3070283348031,4848.9643027282455,3175.657274393443,55.34379804494368,54.73038244608151,12.547174673384518,12.948471070250411
-97080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948418387955366,12.948418387955366,1674.3160468541187,4851.896805836198,3177.5807589820793,55.344005968694574,54.730219385546576,12.546878933316865,12.948418387955366
-97140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948365490828927,12.948365490828927,1675.2637902258405,4854.650941240638,3179.387151014797,55.3442012456167,54.7300662430641,12.54659777501492,12.948365490828927
-97200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948312081536491,12.948312081536491,1677.1839466894132,4860.235558461715,3183.0516117723023,55.3445972126809,54.729755712876795,12.5460813071565,12.948312081536491
-97260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94825826259855,12.94825826259855,1678.624254714778,4864.423421136004,3185.7991664212263,55.344894145435454,54.729522848600396,12.545680295836663,12.94825826259855
-97320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948204415190402,12.948204415190402,1679.9865673239954,4868.384271648739,3188.397704324744,55.34517498231948,54.729302607226636,12.54529808676974,12.948204415190402
-97380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948150501191538,12.948150501191538,1681.2028974875213,4871.920200301868,3190.717302814347,55.34542569090376,54.72910599344062,12.544951059697961,12.948150501191538
-97440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948096366473974,12.948096366473974,1682.546251683389,4875.825880000733,3193.279628317344,55.3457026160238,54.728888819798755,12.544573139405001,12.948096366473974
-97500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948042020009842,12.948042020009842,1683.7397475148568,4879.295337118661,3195.555589603805,55.34594861158427,54.72869590211856,12.544231194212463,12.948042020009842
-97560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947987203697885,12.947987203697885,1684.8381039047604,4882.487824989602,3197.649721084842,55.34617496915095,54.72851838518867,12.543911756411314,12.947987203697885
-97620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947932061387037,12.947932061387037,1686.4403504667084,4887.147094254211,3200.7067437875016,55.34650532620787,54.728259308492575,12.543470315572991,12.947932061387037
-97680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947876660548873,12.947876660548873,1688.346998035589,4892.692475526843,3204.3454774912543,55.346898511454754,54.72795095989648,12.542955107533462,12.947876660548873
-97740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947821409172091,12.947821409172091,1689.710295438521,4896.656223567426,3206.9459281289064,55.347179553867186,54.727730557340664,12.542571253027734,12.947821409172091
-97800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947766073912241,12.947766073912241,1690.837258631886,4899.932013879099,3209.094755247214,55.347411817885465,54.72754840838029,12.542244384688626,12.947766073912241
-97860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947710676892195,12.947710676892195,1692.2976979558484,4904.178570247378,3211.8808722915296,55.347712912336405,54.72731228036689,12.541836922585054,12.947710676892195
-97920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94765508497432,12.94765508497432,1693.6210436663848,4908.026048395984,3214.405004729599,55.347985710874816,54.727098342923895,12.541462371662927,12.94765508497432
-97980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947599240412242,12.947599240412242,1695.0984525807185,4912.322012486797,3217.2235599060773,55.34829030851787,54.72685946759387,12.54105036300215,12.947599240412242
-98040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947543329886962,12.947543329886962,1696.1377612743258,4915.342649624157,3219.2048883498323,55.34850448139478,54.72669150629206,12.540744085702464,12.947543329886962
-98100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947487105100446,12.947487105100446,1697.7160921155275,4919.932416771689,3222.216324656161,55.348829910643424,54.72643629414272,12.54030732319441,12.947487105100446
-98160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94743067454257,12.94743067454257,1698.7663756390634,4922.984986387441,3224.218610748377,55.34904634765317,54.72626655723465,12.53999787759908,12.94743067454257
-98220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947373925229789,12.947373925229789,1700.0975290619836,4926.85518855179,3226.757659489808,55.3493207574521,54.72605135618903,12.539620284548661,12.947373925229789
-98280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947316987565028,12.947316987565028,1701.9937520610144,4932.370399897327,3230.3766478363127,55.34971180371984,54.72574468504959,12.539106035137134,12.947316987565028
-98340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947259930722511,12.947259930722511,1703.2144040079047,4935.918935457821,3232.704531449917,55.34996340634517,54.72554737012765,12.538754818785133,12.947259930722511
-98400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947202965908685,12.947202965908685,1704.2992267878956,4939.072070358053,3234.7728435701574,55.35018697379537,54.725372041297405,12.538436495565493,12.947202965908685
-98460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947145637468115,12.947145637468115,1705.8131824337593,4943.474480413513,3237.661297979754,55.35049911890221,54.72512724700199,12.538014170376004,12.947145637468115
-98520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947088295002676,12.947088295002676,1707.4841616921155,4948.334048374836,3240.8498866827204,55.350843677999656,54.724857032606074,12.537553904298305,12.947088295002676
-98580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947030855814635,12.947030855814635,1708.6741171376214,4951.793259089484,3243.1191419518627,55.351088947246616,54.72466468452444,12.537209714336742,12.947030855814635
-98640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94697330561729,12.94697330561729,1709.7376447160848,4954.8844100946335,3245.146765378548,55.351308119875355,54.72449280225543,12.536895947522778,12.94697330561729
-98700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946915455182559,12.946915455182559,1711.0449950548395,4958.68538215895,3247.6403871041107,55.35157762112852,54.72428145065025,12.536522994011152,12.946915455182559
-98760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946857463708625,12.946857463708625,1712.4918483306112,4962.892495499517,3250.4006471689067,55.35187591912877,54.724047515704,12.53611620537428,12.946857463708625
-98820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946799131177144,12.946799131177144,1713.751055245298,4966.553304433972,3252.802249188673,55.35213548238314,54.72384395779913,12.535754398038106,12.946799131177144
-98880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946740700701426,12.946740700701426,1715.1629181470935,4970.658554611963,3255.49563646487,55.3524265579785,54.72361568689654,12.535355620943443,12.946740700701426
-98940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946682038466616,12.946682038466616,1716.4358672276176,4974.359379588927,3257.9235123613093,55.352688958522094,54.72340990389762,12.53499016383008,12.946682038466616
-99000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946623266567803,12.946623266567803,1717.5847111569071,4977.698896561573,3260.114185404666,55.35292574116035,54.72322421128921,12.53465457153217,12.946623266567803
-99060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946564195463464,12.946564195463464,1719.139146894076,4982.21923505502,3263.0800881609453,55.3532462479066,54.72297285952554,12.534220717134195,12.946564195463464
-99120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946505121519726,12.946505121519726,1720.5734563093438,4986.389864587517,3265.816408278173,55.353541959160296,54.72274095318964,12.533815871426507,12.946505121519726
-99180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946445821894395,12.946445821894395,1721.8809980844683,4990.191422784153,3268.310424699683,55.35381150206247,54.722529568921956,12.533441419105099,12.946445821894395
-99240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946386639416758,12.946386639416758,1722.9940014301435,4993.426622707724,3270.43262127758,55.35404088832042,54.72234967679436,12.533114069437511,12.946386639416758
-99300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946327108475625,12.946327108475625,1724.350368441191,4997.37034697977,3273.01997853858,55.354320511283156,54.72213038741693,12.532727590709136,12.946327108475625
-99360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946267492356105,12.946267492356105,1726.0060824897391,5002.185626567768,3276.1795440780293,55.3546619303872,54.721862635505474,12.532268718965595,12.946267492356105
-99420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946207860153663,12.946207860153663,1727.050406269658,5005.220875145637,3278.170468875981,55.35487713946786,54.72169386157915,12.531957507989464,12.946207860153663
-99480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946147988310218,12.946147988310218,1728.3309052136858,5008.943739205776,3280.6128339920897,55.35514110275128,54.7214868530291,12.531589010556786,12.946147988310218
-99540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946088027501107,12.946088027501107,1729.8844543540206,5013.4616068846835,3283.5771525306623,55.35546143441516,54.72123563857068,12.531154466846486,12.946088027501107
-99600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946027988606176,12.946027988606176,1731.2845802069753,5017.532795736158,3286.2482155291827,55.35575009509561,54.72100926152253,12.530756902695256,12.946027988606176
-99660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945967877675788,12.945967877675788,1732.2612289314986,5020.371018281123,3288.1097893496253,55.355951334416865,54.72085144313366,12.530461558693625,12.945967877675788
-99720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94590761234061,12.94590761234061,1733.7716493110706,5024.76335445068,3290.991705139609,55.35626276552189,54.720607208781594,12.530037123460708,12.94590761234061
-99780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945847239182715,12.945847239182715,1735.3887570376464,5029.466338591946,3294.0775815542993,55.35659622260767,54.72034570094254,12.529586806678758,12.945847239182715
-99840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94578680388123,12.94578680388123,1736.2480321346554,5031.962825824824,3295.7147936901692,55.35677323179254,54.720206884610846,12.529319490131913,12.94578680388123
-99900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945726225069425,12.945726225069425,1737.3586081455344,5035.191001232133,3297.832393086599,55.35700212009097,54.7200273829992,12.528991325335133,12.945726225069425
-99960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945665290164488,12.945665290164488,1738.3522686718618,5038.0787409277555,3299.7264722558944,55.35720687037971,54.71986681119599,12.528691049922154,12.945665290164488
-100020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945603905114712,12.945603905114712,1740.0035795965885,5042.881303910108,3302.87772431352,55.35754738798213,54.71959976627128,12.528231460137267,12.945603905114712
-100080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945542417670046,12.945542417670046,1741.7890166879536,5048.07442345438,3306.2854067664257,55.35791559735633,54.71931100456288,12.527739363823473,12.945542417670046
-100140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945481033971436,12.945481033971436,1742.6297163929198,5050.516792093617,3307.8870757006957,55.3580887693885,54.719175197450525,12.527475590500705,12.945481033971436
-100200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94541952173619,12.94541952173619,1743.8465500742407,5054.054348963014,3310.2077988887727,55.358339593904326,54.71897849274722,12.527120824441415,12.94541952173619
-100260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945357820179536,12.945357820179536,1745.2626032256326,5058.171978117866,3312.9093748922332,55.35863154748114,54.718749533303175,12.52671774213516,12.945357820179536
-100320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945296059515133,12.945296059515133,1746.8295227532851,5062.728910084793,3315.899387331508,55.35895464910064,54.71849614655593,12.526278152097692,12.945296059515133
-100380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945234263782382,12.945234263782382,1747.9408229407309,5065.959206910563,3318.018383969832,55.35918368788961,54.71831652692475,12.525948594043825,12.945234263782382
-100440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94517239269208,12.94517239269208,1749.2502482555271,5069.766407024472,3320.5161587689454,55.35945363105058,54.718104828761156,12.525571095861295,12.94517239269208
-100500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94511043259042,12.94511043259042,1750.3969140449437,5073.099693822171,3322.7027797772253,55.359689972188924,54.717919482391274,12.525232828037744,12.94511043259042
-100560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945048238120215,12.945048238120215,1751.467020368135,5076.210045632929,3324.7430252647937,55.35991050650156,54.71774653224568,12.524912822814036,12.945048238120215
-100620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944985868174177,12.944985868174177,1752.8562217494089,5080.249543605541,3327.3933218561324,55.36019692038553,54.717521917208025,12.524515552256277,12.944985868174177
-100680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944923186480196,12.944923186480196,1754.004096960165,5083.586328956229,3329.582231996064,55.36043350960931,54.7173363762815,12.524176273688564,12.944923186480196
-100740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94486046737783,12.94486046737783,1755.5353077794891,5088.039346023165,3332.504038243676,55.36074924340225,54.71708876762231,12.523744344375553,12.94486046737783
-100800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944797469236743,12.944797469236743,1756.7545043029868,5091.5838140969045,3334.829309793917,55.36100055804568,54.716891678545075,12.523387517937277,12.944797469236743
-100860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944734236152362,12.944734236152362,1757.792370293192,5094.600259969824,3336.807889676632,55.36121443415621,54.71672394997707,12.523074266727848,12.944734236152362
-100920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944670936965704,12.944670936965704,1759.1772181274862,5098.62709098962,3339.449872862135,55.36149994996679,54.71650003923765,12.5226771176333,12.944670936965704
-100980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944607526878151,12.944607526878151,1760.4163126258254,5102.22950884435,3341.813196218525,55.361755373472405,54.716299727857745,12.522315070865547,12.944607526878151
-101040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944544041669133,12.944544041669133,1761.543814892375,5105.506985025974,3343.9631701335998,55.361987757532304,54.71611748475683,12.521979909168087,12.944544041669133
-101100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944480462625716,12.944480462625716,1763.0079935393853,5109.764854471819,3346.756860932433,55.362289654776745,54.715880727166784,12.52156330956134,12.944480462625716
-101160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944416797376899,12.944416797376899,1764.4835446035943,5114.055856254146,3349.572311650553,55.362593901228955,54.71564212725199,12.52114387405291,12.944416797376899
-101220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944353240474666,12.944353240474666,1765.4803937160004,5116.952911154653,3351.4725174386517,55.3627993121688,54.7154810373448,12.520840202966948,12.944353240474666
-101280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944289542993145,12.944289542993145,1766.109071321684,5118.777844057428,3352.668772735744,55.36292870605501,54.715379562471384,12.520625346914564,12.944289542993145
-101340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944225436734472,12.944225436734472,1767.7447172173017,5123.535052685266,3355.790335467965,55.36326600817306,54.71511503923358,12.520166788254926,12.944225436734472
-101400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94416125360122,12.94416125360122,1769.4679853678906,5128.547445609293,3359.079460241404,55.363621403735856,54.7148363265308,12.519686978557756,12.94416125360122
-101460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944097047365807,12.944097047365807,1770.308951525817,5130.990548699142,3360.6815971733254,55.363794627991254,54.714700478463286,12.519420324100034,12.944097047365807
-101520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944032890025365,12.944032890025365,1771.5197763159006,5134.510717008403,3362.990940692503,55.36404421981408,54.71450474047775,12.519064351497615,12.944032890025365
-101580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943968610894425,12.943968610894425,1772.5977210096466,5137.643930223833,3365.046209214187,55.36426637522165,54.71433051901705,12.518740363633164,12.943968610894425
-101640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94390407358558,12.94390407358558,1773.868056766746,5141.337393737133,3367.469336970388,55.36452825427855,54.714125144984884,12.518369632643271,12.94390407358558
-101700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943839351605305,12.943839351605305,1774.9897791705362,5144.598077027339,3369.6082978568024,55.36475944776221,54.713943835572366,12.51803462611422,12.943839351605305
-101760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943774542309649,12.943774542309649,1775.7465026444052,5146.795839662842,3371.0493370184363,55.36491527657768,54.71382162957186,12.517787726031894,12.943774542309649
-101820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943709260274607,12.943709260274607,1777.480108864112,5151.838386776854,3374.3582779127423,55.365272810262745,54.7135412400844,12.517304313567822,12.943709260274607
-101880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943644041289096,12.943644041289096,1778.849259459079,5155.819617028312,3376.970357569233,55.36555509299786,54.713319864827426,12.516909023889596,12.943644041289096
-101940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943578823550427,12.943578823550427,1779.4969994216378,5157.699987966837,3378.2029885452002,55.36568841768256,54.7132153072946,12.516688051198207,12.943578823550427
-102000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943513446993064,12.943513446993064,1780.8598690065153,5161.662939341197,3380.803070334682,55.36596940440073,54.712994948416025,12.516294120114019,12.943513446993064
-102060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943447898012348,12.943447898012348,1782.3503029271449,5165.997389315409,3383.6470863882646,55.366276731645506,54.71275393244398,12.515869191588,12.943447898012348
-102120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943382411325462,12.943382411325462,1783.7034954070468,5169.932190448309,3386.228695041262,55.36655572244048,54.712535138832976,12.515477484793465,12.943382411325462
-102180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943317028402687,12.943317028402687,1784.9101974764123,5173.4404039566825,3388.5302064802704,55.366804466730564,54.71234006551006,12.51512127658858,12.943317028402687
-102240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943251695100825,12.943251695100825,1786.0085416095126,5176.633069830274,3390.624528220762,55.367030837626324,54.71216253812707,12.514791299787838,12.943251695100825
-102300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943186340399027,12.943186340399027,1787.3177098273447,5180.439723298697,3393.122013471351,55.36730074234601,54.711950870110385,12.514410355353005,12.943186340399027
-102360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943120942622304,12.943120942622304,1788.1685024207907,5182.911466951488,3394.7429645306984,55.36747599741073,54.71181342941647,12.514140132166135,12.943120942622304
-102420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943055273240766,12.943055273240766,1788.9492797586734,5185.179285897275,3396.230006138601,55.36763679352149,54.71168732790224,12.513886559045398,12.943055273240766
-102480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942989269381668,12.942989269381668,1790.2554712750025,5188.977247431529,3398.721776156527,55.36790608197783,54.711476143179205,12.513505687776465,12.942989269381668
-102540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942922993772425,12.942922993772425,1791.8736245801617,5193.68373854271,3401.8101139625483,55.36823978830215,54.71121443987924,12.513049158795233,12.942922993772425
-102600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942856840038854,12.942856840038854,1792.5917133049275,5195.768966619029,3403.177253314103,55.36838763811326,54.71109849127218,12.512810253002462,12.942856840038854
-102660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942790371688492,12.942790371688492,1793.5497907494516,5198.5531008795815,3405.0033101301287,55.368585042771244,54.71094368015036,12.512513040981956,12.942790371688492
-102720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942723802166267,12.942723802166267,1794.828800273946,5202.271906386025,3407.44310611208,55.368848718832005,54.710736896849596,12.512138171925885,12.942723802166267
-102780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942656900530913,12.942656900530913,1796.007458722653,5205.698436728551,3409.6909780058977,55.36909167159079,54.71054636543296,12.511787223526325,12.942656900530913
-102840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942590045163795,12.942590045163795,1797.3248718646296,5209.529094470255,3412.2042226056255,55.369363278379325,54.71033336259878,12.511402787261549,12.942590045163795
-102900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942523126911153,12.942523126911153,1798.1257810876386,5211.855489465089,3413.729708377451,55.369528227778815,54.710204003941094,12.511143107451653,12.942523126911153
-102960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942456111570232,12.942456111570232,1798.96709171388,5214.299545912586,3415.3324541987067,55.36970151978402,54.71006810274199,12.51087356751492,12.942456111570232
-103020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942388726955738,12.942388726955738,1800.0061481968698,5217.31949520451,3417.313347007639,55.369915644578136,54.70990017914827,12.510555873365554,12.942388726955738
-103080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942321087802243,12.942321087802243,1801.2680429919242,5220.988436019694,3419.7203930277697,55.370175785113176,54.70969616852121,12.510184073363526,12.942321087802243
-103140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942253303533187,12.942253303533187,1802.8500829739676,5225.589792855111,3422.739709881144,55.370502037168464,54.70944031110025,12.509734757948788,12.942253303533187
-103200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942185809360609,12.942185809360609,1803.812502682593,5228.38656707998,3424.574064397386,55.37070033810614,54.709284797086895,12.509435471771605,12.942185809360609
-103260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942118210583393,12.942118210583393,1804.7050194394085,5230.979747307722,3426.2747278683137,55.37088420353253,54.709140603868676,12.509152975037894,12.942118210583393
-103320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942050654235231,12.942050654235231,1805.9337584138705,5234.552187593827,3428.618429179955,55.3711375018845,54.70894195910302,12.508789262504873,12.942050654235231
-103380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941982988648588,12.941982988648588,1806.8823003191785,5237.308551972806,3430.426251653627,55.37133293764332,54.708788692055656,12.50849315771538,12.941982988648588
-103440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941915196021027,12.941915196021027,1807.7333696033804,5239.78101977324,3432.0476501698604,55.37150824415861,54.708651211012544,12.508220483590877,12.941915196021027
-103500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941847123573543,12.941847123573543,1808.679405324488,5242.530060678831,3433.850655354344,55.37170316066868,54.70849835117684,12.507924580750771,12.941847123573543
-103560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941778914029072,12.941778914029072,1810.1287267768357,5246.744945157774,3436.616218380939,55.37200201057002,54.708263983411896,12.507506906097689,12.941778914029072
-103620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941710614118072,12.941710614118072,1811.0969372287689,5249.558570710352,3438.4616334815832,55.37220150636985,54.70810753234897,12.507205416664243,12.941710614118072
-103680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941642330094252,12.941642330094252,1811.989839844636,5252.152865078167,3440.163025233532,55.37238545083404,54.70796327714675,12.506922142802484,12.941642330094252
-103740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941573998290187,12.941573998290187,1813.1032784538675,5255.389493456792,3442.286215002925,55.372614939013474,54.70778330508902,12.506585520180616,12.941573998290187
-103800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941505533253448,12.941505533253448,1814.1169097203533,5258.335420926917,3444.2185112065636,55.37282381549696,54.707619497390354,12.506272886838913,12.941505533253448
-103860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941436956691689,12.941436956691689,1815.2990319090839,5261.7720975515995,3446.4730656425154,55.373067487807255,54.707428401678136,12.505919419463112,12.941436956691689
-103920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941368409540893,12.941368409540893,1816.085816865668,5264.057316470645,3447.971499604977,55.37322951777146,54.707301332536076,12.505661529538147,12.941368409540893
-103980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941299768861208,12.941299768861208,1817.0819751468994,5266.952360777009,3449.8703856301095,55.373434786480885,54.7071403541706,12.505352942519432,12.941299768861208
-104040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941230926099573,12.941230926099573,1817.9626063136348,5269.51090375577,3451.548297442135,55.37361619608118,54.706998086890685,12.505072077112686,12.941230926099573
-104100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941161851753776,12.941161851753776,1818.9458301293523,5272.3682491699265,3453.422419040573,55.37381879181975,54.70683920475547,12.504766185885478,12.941161851753776
-104160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941092682946836,12.941092682946836,1820.087021127024,5275.68570182786,3455.598680700836,55.374054010771616,54.706654738440506,12.504422019945293,12.941092682946836
-104220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941023471956962,12.941023471956962,1820.6856887677811,5277.422959135035,3456.7372703672554,55.37417718837085,54.706558138580554,12.504208938439096,12.941023471956962
-104280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940954073716945,12.940954073716945,1821.9982084442745,5281.239436578984,3459.24122813471,55.37444778993397,54.70634592407668,12.503823133423614,12.940954073716945
-104340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94088462226038,12.94088462226038,1823.4304778385447,5285.404724246294,3461.974246407749,55.374743123371175,54.706114314036725,12.503408329720893,12.94088462226038
-104400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940815318605438,12.940815318605438,1823.6856882943196,5286.141588757533,3462.455900463214,55.37479536963888,54.70607334082263,12.5032781699959,12.940815318605438
-104460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940745640375773,12.940745640375773,1824.7078076593093,5289.112216296711,3464.4044086374024,55.3750059975119,54.70590815962759,12.502962275072642,12.940745640375773
-104520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940675906592949,12.940675906592949,1825.8645748617112,5292.475043039994,3466.610468178283,55.37524443368704,54.70572117026203,12.502613778845127,12.940675906592949
-104580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94060608386943,12.94060608386943,1826.6170092989264,5294.660148779554,3468.0431394806287,55.37539936532936,54.70559966785375,12.502362923771207,12.94060608386943
-104640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940536250377962,12.940536250377962,1827.5973602407928,5297.509125035773,3469.911764794981,55.375601367719504,54.70544125104155,12.502056968121474,12.940536250377962
-104700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940466315261268,12.940466315261268,1828.4951350915715,5300.11757353033,3471.622438438758,55.37578631585468,54.70529620872807,12.501770870607906,12.940466315261268
-104760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940396333962774,12.940396333962774,1829.2914093091845,5302.430373662569,3473.138964353385,55.37595030148968,54.705167605885684,12.501509260621031,12.940396333962774
-104820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940326189511865,12.940326189511865,1830.0237514218572,5304.556941259146,3474.5331898372883,55.37610108258876,54.70504935846774,12.501262942139777,12.940326189511865
-104880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940255919890474,12.940255919890474,1830.6726583107666,5306.440469604678,3475.767811293911,55.37623463135561,54.70494462520246,12.501036667050734,12.940255919890474
-104940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940185371442402,12.940185371442402,1831.5991692827247,5309.132582338235,3477.5334130555107,55.376425511596615,54.704794930739595,12.500743015262856,12.940185371442402
-105000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940114588292039,12.940114588292039,1832.806938325415,5312.643936035706,3479.836997710291,55.376674478905365,54.70459968251821,12.500381146009305,12.940114588292039
-105060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940043933261444,12.940043933261444,1833.4596263639976,5314.53845291674,3481.078826552744,55.37680880680949,54.70449433822825,12.500153574813352,12.940043933261444
-105120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939973166446581,12.939973166446581,1834.10144300637,5316.401294466185,3482.2998514598157,55.37694088882394,54.704390755237654,12.499928520765726,12.939973166446581
-105180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939902301330012,12.939902301330012,1835.121405163628,5319.365610606119,3484.244205442492,55.37715106926434,54.70422592493378,12.499611964163769,12.939902301330012
-105240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939831374580331,12.939831374580331,1835.9826641215946,5321.867648459746,3485.884984338153,55.37732847255347,54.70408679953274,12.499333707544222,12.939831374580331
-105300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939760432375301,12.939760432375301,1836.648349792868,5323.800009861061,3487.1516600681925,55.37746548378055,54.7039793508941,12.499102709434256,12.939760432375301
-105360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939689374496885,12.939689374496885,1837.6842079710004,5326.810631069734,3489.1264230987335,55.37767894743004,54.70381194579139,12.498782117449807,12.939689374496885
-105420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939618397510555,12.939618397510555,1838.6091267446438,5329.498114093851,3490.888987349207,55.37786949944967,54.703662508730346,12.498488421086586,12.939618397510555
-105480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939547515606241,12.939547515606241,1839.0080508691035,5330.653441814369,3491.6453909452657,55.3779514162592,54.70359826691707,12.49832196438316,12.939547515606241
-105540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939476437171313,12.939476437171313,1839.8220034796868,5333.017688513584,3493.195685033898,55.37811904969057,54.7034668033547,12.498054990348043,12.939476437171313
-105600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939405304565529,12.939405304565529,1840.5357645169195,5335.090084893326,3494.554320376407,55.37826598990818,54.7033515680803,12.49781218132093,12.939405304565529
-105660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93933399514332,12.93933399514332,1841.47747213397,5337.826458220312,3496.348986086342,55.37846000843977,54.70319941246839,12.497514096060552,12.93933399514332
-105720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939262765201292,12.939262765201292,1842.619778702747,5341.147178279781,3498.5273995770335,55.3786954592257,54.70301476434167,12.497167597579608,12.939262765201292
-105780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939191656692627,12.939191656692627,1843.0680555802069,5342.44624918581,3499.378193605603,55.37878756794546,54.70294252970253,12.496988986581881,12.939191656692627
-105840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939120585577495,12.939120585577495,1843.74764845735,5344.419134952323,3500.6714864949718,55.37892745252335,54.70283282768917,12.496754496136408,12.939120585577495
-105900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939049429378125,12.939049429378125,1844.6763009618548,5347.117515276813,3502.4412143149584,55.37911877723583,54.702682784657384,12.496459715416755,12.939049429378125
-105960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938978324107168,12.938978324107168,1844.9114852436446,5347.795857658552,3502.8843724149074,55.37916687411168,54.70264506553068,12.496332619020155,12.938978324107168
-106020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938906909453607,12.938906909453607,1845.4238647210989,5349.281629127215,3503.8577644061156,55.37927222056891,54.70256244942937,12.496138209714882,12.938906909453607
-106080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93883535438474,12.93883535438474,1846.1839521414608,5351.488953688056,3505.3050015465947,55.37942872769796,54.70243971147338,12.495883782073927,12.93883535438474
-106140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938763454033895,12.938763454033895,1847.3321289874027,5354.826747281985,3507.4946182945823,55.379665389092224,54.7022541139484,12.495535197620327,12.938763454033895
-106200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938691918440833,12.938691918440833,1847.8836034826995,5356.426395456362,3508.542791973664,55.37977880981961,54.70216516574313,12.495331217543757,12.938691918440833
-106260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938620186317888,12.938620186317888,1848.106544239257,5357.069008620842,3508.9624643815837,55.379824373372,54.702129433330676,12.49520646219039,12.938620186317888
-106320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938548439064984,12.938548439064984,1849.3153300733609,5360.583385685446,3511.2680556120854,55.380073555175144,54.70193401689585,12.494843375604965,12.938548439064984
-106380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938476746465017,12.938476746465017,1849.6915812385284,5361.672595084496,3511.981013845968,55.38015078398803,54.70187345156127,12.494681598409159,12.938476746465017
-106440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93840503054526,12.93840503054526,1850.051550996028,5362.714373755152,3512.6628227591245,55.38022464979471,54.70181552360498,12.494523734116592,12.93840503054526
-106500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938333141691215,12.938333141691215,1851.0750544691114,5365.6890212334665,3514.6139667643574,55.38043556286724,54.701650118747274,12.494205296067516,12.938333141691215
-106560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938261329729528,12.938261329729528,1851.9928972632788,5368.355891519669,3516.36299425639,55.38062465344926,54.7015018277929,12.493912475573836,12.938261329729528
-106620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93818971111234,12.93818971111234,1852.1051919047927,5368.676193748562,3516.571001843769,55.38064736401609,54.70148401743136,12.4938145809825,12.93818971111234
-106680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938118026749356,12.938118026749356,1852.9440604364786,5371.113024940983,3518.168964504505,55.380820144014024,54.70134851776494,12.493540977548625,12.938118026749356
-106740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938046460038487,12.938046460038487,1853.9798692575955,5374.123569522039,3520.1437002644448,55.38103360233775,54.70118111683885,12.493219880439925,12.938046460038487
-106800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937975025863452,12.937975025863452,1854.1789307231052,5374.696640522123,3520.517709799017,55.381074235111676,54.70114925130245,12.493101193272267,12.937975025863452
-106860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937903712541544,12.937903712541544,1854.7934418673526,5376.479950436108,3521.686508568756,55.38120067813444,54.70105009059167,12.492882192589125,12.937903712541544
-106920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93783224779337,12.93783224779337,1855.665129469928,5379.01241961314,3523.3472901432124,55.38138023922061,54.70090927297638,12.492600870595705,12.93783224779337
-106980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937761026648605,12.937761026648605,1855.6813392934173,5379.052848570482,3523.371509277065,55.38138310577774,54.70090702492949,12.492526598062494,12.937761026648605
-107040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937689522850265,12.937689522850265,1856.1704594722096,5380.470869608672,3524.300410136463,55.381483648522966,54.7008281760546,12.492337721886766,12.937689522850265
-107100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937617936603978,12.937617936603978,1857.1685627767324,5383.371590321448,3526.2030275447164,55.38168931996399,54.70066688185397,12.492025718600244,12.937617936603978
-107160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93754642212163,12.93754642212163,1857.8171606824012,5385.2541850506705,3527.437024368271,55.38182280264605,54.7005622004145,12.4917982779942,12.93754642212163
-107220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93747508242099,12.93747508242099,1858.384294521759,5386.8994857563175,3528.5151912345586,55.38193946033754,54.70047071367721,12.491590703763535,12.93747508242099
-107280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937403940823188,12.937403940823188,1858.8595674122064,5388.2772062889835,3529.417638876776,55.38203714564143,54.70039410570029,12.491405532552374,12.937403940823188
-107340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937332892863548,12.937332892863548,1859.0012954417327,5388.683286847907,3529.6819914061743,55.382065938202935,54.70037152564168,12.491301088500853,12.937332892863548
-107400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937261571677817,12.937261571677817,1859.479458004444,5390.069406925264,3530.5899489208196,55.38216421906641,54.70029445060767,12.491115041471831,12.937261571677817
-107460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937190212097516,12.937190212097516,1860.427998218263,5392.825783731001,3532.3977855127373,55.38235965602956,54.70014118261582,12.490815241940501,12.937190212097516
-107520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93711900263074,12.93711900263074,1860.7473446502895,5393.749266995241,3533.0019223449513,55.38242513429358,54.70008983244197,12.490667699230693,12.93711900263074
-107580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937047777395899,12.937047777395899,1861.038333341276,5394.590138684687,3533.551805343412,55.38248475510224,54.70004307587418,12.490526996597508,12.937047777395899
-107640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936976589023988,12.936976589023988,1861.847204149618,5396.939664584549,3535.092460434931,55.38265134489027,54.6999124307707,12.490261130929069,12.936976589023988
-107700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93690550688332,12.93690550688332,1862.2872614600158,5398.214804082882,3535.927542622866,55.38274175684224,54.69984152679177,12.490084531902795,12.93690550688332
-107760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936834498840867,12.936834498840867,1862.7078213560028,5399.433151995032,3536.725330639029,55.38282814206874,54.69977378070128,12.489912719684293,12.936834498840867
-107820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936763588409116,12.936763588409116,1863.0635924464466,5400.462770698343,3537.399178251897,55.3829011457199,54.69971652887527,12.48975666691888,12.936763588409116
-107880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936692639185829,12.936692639185829,1863.4102726593908,5401.465902127473,3538.0556294680823,55.38297227132928,54.6996607498704,12.489602773683071,12.936692639185829
-107940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936621676037538,12.936621676037538,1864.142325124666,5403.591673378978,3539.4493482543126,55.383122996123454,54.69954254660858,12.489355700990592,12.936621676037538
-108000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936550378991251,12.936550378991251,1861.4657027443545,5395.7875359439095,3534.3218331995563,55.382569654849206,54.69997649474482,12.489932356519024,12.936550378991251
-108060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936477148932882,12.936477148932882,1856.2146826282096,5380.484053416153,3524.269370787944,55.381484583301905,54.700827442970706,12.49112942501474,12.936477148932882
-108120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936399881133015,12.936399881133015,1851.1922643870948,5365.846557507466,3514.654293120371,55.38044673274885,54.70164135896461,12.492267185682481,12.936399881133015
-108180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936317253892259,12.936317253892259,1846.6757875316666,5352.682717228966,3506.0069296972997,55.3795133697625,54.70237333242692,12.493277301390446,12.936317253892259
-108240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936228485920068,12.936228485920068,1842.8685054819587,5341.584382125159,3498.715876643201,55.378726458523815,54.70299045368879,12.494109885627324,12.936228485920068
-108300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936134398969312,12.936134398969312,1839.159406832212,5330.771786992029,3491.612380159817,55.37795980734968,54.70359168635233,12.494913450745257,12.936134398969312
-108360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936035290047107,12.936035290047107,1835.8199453709894,5321.03559803559,3485.215652664601,55.377269477249676,54.70413306555939,12.495622682938306,12.936035290047107
-108420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935932255731453,12.935932255731453,1833.084245343129,5313.0577715985555,3479.9735262554273,55.376703821300744,54.704576671262075,12.496182087921001,12.935932255731453
-108480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935826071529338,12.935826071529338,1830.6126277045655,5305.848954002941,3475.236326298376,55.376192690824205,54.7049775163246,12.496674537864564,12.935826071529338
-108540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935717800748597,12.935717800748597,1828.1080688558286,5298.544120830699,3470.4360519748698,55.375674752546146,54.70538370028539,12.497172871907173,12.935717800748597
-108600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935608023031376,12.935608023031376,1825.855746607601,5291.9739080481,3466.118161440498,55.375208901463225,54.70574903578196,12.497608742283676,12.935608023031376
-108660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935497591446886,12.935497591446886,1824.4247382333206,5287.795777505459,3463.371039272138,55.37491265740065,54.70598135996381,12.497845467225222,12.935497591446886
-108720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935387302445813,12.935387302445813,1822.7934728876073,5283.034474182401,3460.2410012947935,55.37457506436517,54.70624611134848,12.498130722223546,12.935387302445813
-108780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935277887869962,12.935277887869962,1821.3474093474415,5278.812694482832,3457.465285135391,55.3742757254533,54.70648086261132,12.498372077307158,12.935277887869962
-108840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935169756025227,12.935169756025227,1820.340208823812,5275.8692178443325,3455.5290090205212,55.37406702269683,54.70664453406764,12.49850863832217,12.935169756025227
-108900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935063613965413,12.935063613965413,1819.1220310192346,5272.311513292822,3453.1894822735862,55.373814769048465,54.706842359542904,12.49869814599544,12.935063613965413
-108960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934959563871068,12.934959563871068,1818.0189987910019,5269.089382768627,3451.070383977625,55.37358630877606,54.70702152548267,12.498861890711467,12.934959563871068
-109020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934857966823133,12.934857966823133,1817.353645975144,5267.1421715997385,3449.7885256245963,55.373448244728536,54.70712979977721,12.498922289561634,12.934857966823133
-109080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934759088162894,12.934759088162894,1816.4141741910184,5264.396911725286,3447.9827375342684,55.3732535962557,54.707282449409426,12.49905161330842,12.934759088162894
-109140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934663035922265,12.934663035922265,1815.5944076048545,5262.0005537030875,3446.4061460982343,55.37308368614227,54.707415698419545,12.499154800466249,12.934663035922265
-109200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934569878210617,12.934569878210617,1815.1544025428448,5260.710450117145,3445.5560475743014,55.37299221331547,54.70748743437086,12.499169077848348,12.934569878210617
-109260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934479675794208,12.934479675794208,1814.7728496207324,5259.590856937019,3444.818007316287,55.37291283026991,54.707549689124434,12.49917214980774,12.934479675794208
-109320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934392706718093,12.934392706718093,1814.088552140717,5257.589905059063,3443.501352918347,55.372770955833474,54.70766095164925,12.499251571793756,12.934392706718093
-109380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934308723129748,12.934308723129748,1813.4995359558081,5255.866725575315,3442.3671896195083,55.37264877642679,54.707756768694345,12.499310918236358,12.934308723129748
-109440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934227665905409,12.934227665905409,1813.2687227319648,5255.186994027537,3441.918271295573,55.37260058110125,54.707794565028465,12.499286599080039,12.934227665905409
-109500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934149493440568,12.934149493440568,1813.0768344197265,5254.620891577549,3441.5440571578224,55.37256044247336,54.70782604303958,12.499255724260285,12.934149493440568
-109560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934074295025823,12.934074295025823,1812.8875096094666,5254.062533703795,3441.1750240943293,55.372520852963,54.707857090414905,12.499227168406868,12.934074295025823
-109620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934001914309144,12.934001914309144,1813.0090568385795,5254.409762396962,3441.4007055583834,55.37254547268195,54.70783778283449,12.499126278272517,12.934001914309144
-109680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933932594398987,12.933932594398987,1813.0912361818325,5254.64262828386,3441.5513921020283,55.37256198368124,54.707824834374456,12.499037925363483,12.933932594398987
-109740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93386612406417,12.93386612406417,1812.9094680917394,5254.107092021476,3441.197623929737,55.37252401230229,54.70785461275878,12.499016167538107,12.93386612406417
-109800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933802385531148,12.933802385531148,1812.7297790471066,5253.5778665179405,3440.848087470833,55.37248648837826,54.70788404023448,12.498996606428271,12.933802385531148
-109860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93374110613419,12.93374110613419,1812.5845869518514,5253.149333164084,3440.5647462122333,55.3724561038771,54.7079078687437,12.49897113933225,12.93374110613419
-109920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93368208384816,12.93368208384816,1812.7179223164728,5253.532133600999,3440.814211284527,55.372483245755824,54.70788658320394,12.498880600528846,12.93368208384816
-109980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933625335904226,12.933625335904226,1812.8440741785626,5253.894225659021,3441.0501514804578,55.37250891933876,54.70786644914927,12.498794044867955,12.933625335904226
-110040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933570719630902,12.933570719630902,1812.672902742084,5253.390657114495,3440.717754372411,55.372473214582186,54.70789444997496,12.498781439048903,12.933570719630902
-110100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933518041113675,12.933518041113675,1812.5350636833655,5252.984340040962,3440.449276357596,55.372444405292406,54.70791704315243,12.498762693551733,12.933518041113675
-110160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933467065049582,12.933467065049582,1812.6755542966698,5253.388725626292,3440.7131713296217,55.37247307763298,54.70789455737496,12.49867837652278,12.933467065049582
-110220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933417743178108,12.933417743178108,1812.8090045883469,5253.772762222921,3440.9637576345754,55.3725003071598,54.70787320309874,12.498597395242472,12.933417743178108
-110280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933370057116392,12.933370057116392,1812.6452024978146,5253.291301858071,3440.646099360257,55.372466169949895,54.707899974603606,12.498589856283507,12.933370057116392
-110340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933323675712225,12.933323675712225,1812.7924212812525,5253.715707784482,3440.92328650323,55.372496261802205,54.707876375599106,12.498508453667158,12.933323675712225
-110400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933278671142508,12.933278671142508,1812.9011511174551,5254.028155403412,3441.127004285956,55.37251841542224,54.70785900201327,12.498437711733219,12.933278671142508
-110460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933234863205163,12.933234863205163,1812.7464536465438,5253.573571045019,3440.827117398475,55.372486183814324,54.707884279083366,12.498431804717615,12.933234863205163
-110520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933192112294464,12.933192112294464,1812.871469151639,5253.933654568086,3441.062185416447,55.37251171498519,54.70786425671286,12.498359354563151,12.933192112294464
-110580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933150313533213,12.933150313533213,1813.312770468445,5255.21490211987,3441.902131651426,55.37260255988185,54.707793013204686,12.498211420489366,12.933150313533213
-110640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933109542815206,12.933109542815206,1813.691060230396,5256.312746293259,3442.6216860628633,55.37268040084365,54.707731967803106,12.498079727748296,12.933109542815206
-110700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933069927224008,12.933069927224008,1813.7236431481308,5256.40394172169,3442.6802985735603,55.37268686691605,54.707726896899864,12.498032710476165,12.933069927224008
-110760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933031215545242,12.933031215545242,1813.746420930588,5256.466667086682,3442.720246156095,55.37269131436214,54.7077234090687,12.497988955613408,12.933031215545242
-110820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932993215712246,12.932993215712246,1813.7747571220796,5256.545645700201,3442.770888578122,55.37269691421997,54.70771901747895,12.497944561045346,12.932993215712246
-110880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932955752770216,12.932955752770216,1814.1179233680512,5257.541511284151,3443.4235879160997,55.37276752454682,54.70766364257529,12.497824623870963,12.932955752770216
-110940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932918885701664,12.932918885701664,1814.421600911115,5258.422435087257,3444.000834176142,55.372829985103074,54.70761465898557,12.497714817189307,12.932918885701664
-111000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932882636643448,12.932882636643448,1814.3765564776645,5258.287878991379,3443.9113225137153,55.37282044460865,54.70762214095007,12.497689883868475,12.932882636643448
-111060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932846811732404,12.932846811732404,1814.3427998601007,5258.186234617015,3443.843434756914,55.37281323766958,54.70762779286493,12.497662642118685,12.932846811732404
-111120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932811238804119,12.932811238804119,1814.6304310405687,5259.0205482926785,3444.3901172521087,55.372872393406325,54.70758140102159,12.497557991634507,12.932811238804119
-111180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932775988999937,12.932775988999937,1814.8850018056653,5259.7586147701895,3444.8736129645226,55.372924724882964,54.707540360983906,12.49746164888627,12.932775988999937
-111240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932740972186346,12.932740972186346,1814.7965997001345,5259.497907916265,3444.70130821613,55.37290623986151,54.707554857536,12.497448409874597,12.932740972186346
-111300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932706187471604,12.932706187471604,1815.0457296030047,5260.220172483976,3445.174442880971,55.372957450928105,54.70751469616012,12.497353841441836,12.932706187471604
-111360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9326715215066,12.9326715215066,1815.2536382326068,5260.822404813407,3445.5687665808,55.37300015129238,54.70748120915245,12.497269350758508,12.9326715215066
-111420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93263701770424,12.93263701770424,1815.4136855098425,5261.285271731297,3445.871586221454,55.37303297016502,54.707455471530345,12.497196585205215,12.93263701770424
-111480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932602694752774,12.932602694752774,1815.586134072821,5261.784270022442,3446.198135949621,55.373068350877745,54.70742772483033,12.49712100180876,12.932602694752774
-111540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93256844867008,12.93256844867008,1815.7553319981607,5262.2738089165005,3446.5184769183393,55.37310306088651,54.70740050411805,12.497046279847345,12.93256844867008
-111600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932585687380135,12.932585687380135,2217.617941877132,6433.833096163644,4216.215154286513,55.45617120333066,54.64225577830086,12.39980015624576,12.932585687380135
-111660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93284488311476,12.93284488311476,2842.848715174847,8261.670260566472,5418.821545391626,55.58577408502037,54.54061700386371,12.248090945286775,12.93284488311476
-111720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933522143879484,12.933522143879484,3007.3052999056895,8743.577822158142,5736.272522252451,55.61994418345722,54.51381970674932,12.208653105933884,12.933522143879484
-111780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934587248853186,12.934587248853186,2982.420368282323,8670.808988167737,5688.3886198854125,55.614784431195964,54.517866151468716,12.215768882237954,12.934587248853186
-111840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935883207773237,12.935883207773237,3050.5632845344567,8870.75428311307,5820.190998578613,55.62896177648077,54.506747818444545,12.200409241368241,12.935883207773237
-111900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937274656062849,12.937274656062849,3096.8506011248055,9006.700013638434,5909.849412513629,55.63860117812257,54.49918828769641,12.190470621194644,12.937274656062849
-111960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93869234276851,12.93869234276851,3123.133961117121,9084.01369156432,5960.8797304472,55.64408320713702,54.494889103116606,12.18543950468956,12.93869234276851
-112020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940090208036025,12.940090208036025,3145.072829353819,9148.594154172166,6003.521324818346,55.6486623740636,54.49129797220739,12.18144861612442,12.940090208036025
-112080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94143299241693,12.94143299241693,3164.442788220657,9205.639453867285,6041.196665646628,55.65270725246937,54.4881258476485,12.178030220761595,12.94143299241693
-112140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942695554898103,12.942695554898103,3179.5616799747304,9250.206506113038,6070.644826138308,55.655867344634956,54.485647601095415,12.175571254985275,12.942695554898103
-112200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943860326657825,12.943860326657825,3193.555154129323,9291.460488483575,6097.905334354253,55.658792520059784,54.48335358385354,12.173290962787256,12.943860326657825
-112260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944916461720686,12.944916461720686,3205.4734520911843,9326.6111072962,6121.137655205017,55.66128492836046,54.481398956596976,12.171411082731154,12.944916461720686
-112320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945857556801554,12.945857556801554,3214.5077700237193,9353.281758518093,6138.773988494372,55.663176052232245,54.47991587605024,12.170123330820037,12.945857556801554
-112380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946679978261766,12.946679978261766,3222.3337107073357,9376.388074635308,6154.054363927972,55.664814441831425,54.47863099789985,12.169014644317649,12.946679978261766
-112440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94738299892621,12.94738299892621,3229.403417695809,9397.256341411623,6167.852923715815,55.666294139376504,54.47747057119435,12.167973834443734,12.94738299892621
-112500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947968080733617,12.947968080733617,3234.5603436673164,9412.491409010923,6177.931065343609,55.66737440620921,54.47662339098116,12.167285247215743,12.947968080733617
-112560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948438159398048,12.948438159398048,3238.5564480335906,9424.30037680402,6185.743928770428,55.66821174007641,54.47596672666207,12.166767937250608,12.948438159398048
-112620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948797287707471,12.948797287707471,3241.969620638764,9434.379963652791,6192.410343014029,55.6689264494876,54.47540622841014,12.166284574225696,12.948797287707471
-112680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949050416226905,12.949050416226905,3244.1899602172157,9440.940386232149,6196.750426014932,55.669391626904506,54.47504142122426,12.165989205200255,12.949050416226905
-112740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9492029443279,12.9492029443279,3245.517389134903,9444.862798057684,6199.345408922782,55.669669751900386,54.47482330660095,12.165813780340875,12.9492029443279
-112800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949260902413403,12.949260902413403,3246.736013336161,9448.449965677966,6201.713952341805,55.66992410587029,54.47462383398555,12.165572421027667,12.949260902413403
-112860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949230748665713,12.949230748665713,3246.929189074328,9449.011997871325,6202.082808796993,55.669963957680366,54.474592580906275,12.16549566297718,12.949230748665713
-112920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949118425371143,12.949118425371143,3246.8082339081734,9448.638053745291,6201.82981983712,55.66993744256168,54.4746133749205,12.165415334221423,12.949118425371143
-112980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948930730178185,12.948930730178185,3246.6736885221308,9448.211558739917,6201.537870217784,55.66990720123726,54.47463709114589,12.165264573811138,12.948930730178185
-113040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948673821916971,12.948673821916971,3245.332702852013,9444.231814448443,6198.8991115964345,55.66962501097961,54.47485839387908,12.165341173708105,12.948673821916971
-113100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948353639872797,12.948353639872797,3244.151240401773,9440.709808294123,6196.5585678923535,55.66937527740082,54.47505424303422,12.165316829624546,12.948353639872797
-113160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947976033968347,12.947976033968347,3242.1828305850563,9434.868138135618,6192.685307550562,55.66896106429097,54.47537908236102,12.165428758372805,12.947976033968347
-113220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947545138486051,12.947545138486051,3240.104327430401,9428.69450363465,6188.5901762042495,55.66852331273826,54.47572238129655,12.165515446414242,12.947545138486051
-113280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94706509879394,12.94706509879394,3238.207882394262,9423.047214225733,6184.839331831469,55.6681228825619,54.476036411600816,12.165509494834268,12.94706509879394
-113340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946539886848697,12.946539886848697,3235.634396137893,9415.405175834512,6179.7707796966215,55.667581011525606,54.47646136440524,12.165624894883894,12.946539886848697
-113400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945973591140563,12.945973591140563,3232.962457318839,9407.467531959875,6174.505074641039,55.66701818015317,54.47690275498361,12.165724133652466,12.945973591140563
-113460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945370289513145,12.945370289513145,3230.57143421942,9400.348517255818,6169.777083036398,55.66651339503572,54.47729862381016,12.165718425697095,12.945370289513145
-113520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944734385082901,12.944734385082901,3227.144142517788,9390.182744986736,6163.038602468949,55.665792574769114,54.47786391439269,12.165934180003696,12.944734385082901
-113580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944069261637145,12.944069261637145,3224.118922097451,9381.192600703727,6157.073678606277,55.665155114341395,54.47836383149161,12.166022970040949,12.944069261637145
-113640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943378950860096,12.943378950860096,3221.345409087372,9372.937361558716,6151.591952471345,55.664569763580815,54.478822882503,12.16602551819874,12.943378950860096
-113700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942666799877346,12.942666799877346,3217.997319864056,9362.992517621096,6144.99519775704,55.66386460879402,54.479375887709246,12.166147132657555,12.942666799877346
-113760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94193633707232,12.94193633707232,3214.9565941014093,9353.947094089239,6138.99049998783,55.663223228889215,54.479878878588956,12.16617562305601,12.94193633707232
-113820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941190581749813,12.941190581749813,3210.965784930277,9342.111339323656,6131.145554393378,55.66238399627672,54.48053703196556,12.166421369034476,12.941190581749813
-113880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94043195993092,12.94043195993092,3207.406981842505,9331.541761398521,6124.134779556016,55.661634543993046,54.48112477670255,12.166548840027955,12.94043195993092
-113940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939663387370858,12.939663387370858,3204.1904582809802,9321.975426000366,6117.784967719387,55.66095622824632,54.48165673386493,12.16658283879109,12.939663387370858
-114000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938886989465034,12.938886989465034,3200.954412771071,9312.350934877508,6111.396522106438,55.66027378894799,54.48219192484992,12.166613895584824,12.938886989465034
-114060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938105555732264,12.938105555732264,3197.678644354987,9302.60948343482,6104.9308390798315,55.65958305647002,54.4827336196148,12.166649677491007,12.938105555732264
-114120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937320976924756,12.937320976924756,3194.182065214136,9292.220052942137,6098.037987728,55.65884637812769,54.48331134661356,12.1667362942046,12.937320976924756
-114180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936535103676047,12.936535103676047,3190.1044926515833,9280.126210602648,6090.021717951065,55.65798884597825,54.483983851079294,12.166963578234148,12.936535103676047
-114240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93574932037491,12.93574932037491,3186.118400687333,9268.30138558008,6082.182984892746,55.657150389014475,54.48464139616708,12.167168517139814,12.93574932037491
-114300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934964616925411,12.934964616925411,3183.0849583763575,9259.272273103728,6076.187314727371,55.656510166315314,54.48514347952866,12.167141634880807,12.934964616925411
-114360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93418298760632,12.93418298760632,3179.7859908667383,9249.46506744562,6069.679076578882,55.65581477182718,54.48568883039279,12.167182596844347,12.93418298760632
-114420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933405627676539,12.933405627676539,3175.545996641307,9236.898329999049,6061.352333357741,55.654923708743674,54.486387630902264,12.167457623849756,12.933405627676539
-114480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932633137100927,12.932633137100927,3171.7568632291172,9225.655656789511,6053.898793560395,55.65412653049189,54.4870128038881,12.167627175595449,12.932633137100927
-114540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931866544247502,12.931866544247502,3168.3273037417193,9215.469288235148,6047.141984493429,55.65340425115497,54.48757923872079,12.1677145804154,12.931866544247502
-114600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931106590359265,12.931106590359265,3165.2640053031732,9206.358856028946,6041.094850725772,55.652758262722244,54.48808584375725,12.167718943702296,12.931106590359265
-114660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.930354349713134,12.930354349713134,3162.472287136029,9198.04670700887,6035.5744198728435,55.65216887777329,54.48854805850973,12.167664461003833,12.930354349713134
-114720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929610784749892,12.929610784749892,3158.3188881557867,9185.742216360079,6027.423328204293,55.651296410162345,54.48923227584779,12.167951077149306,12.929610784749892
-114780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928875886636028,12.928875886636028,3154.620566028137,9174.774525358149,6020.153959330012,55.650518730349724,54.48984215752656,12.168134938300948,12.928875886636028
-114840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928150036881807,12.928150036881807,3151.6190926930317,9165.85267972734,6014.233587034308,55.64988611419532,54.49033827558957,12.16815737859824,12.928150036881807
-114900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92743357691129,12.92743357691129,3147.6753389376454,9154.169093673356,6006.49375473571,55.64905767299882,54.490987965988474,12.168419123560511,12.92743357691129
-114960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926726618434554,12.926726618434554,3144.148838725865,9143.711327245072,5999.562488519209,55.64831615036423,54.49156949203802,12.168588192597653,12.926726618434554
-115020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926029529903305,12.926029529903305,3140.9529924568124,9134.225344040551,5993.272351583741,55.64764353345697,54.492096979986016,12.168686112401401,12.926029529903305
-115080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925342359924025,12.925342359924025,3137.740767396652,9124.693332733515,5986.9525653368655,55.64696765293112,54.492627027369366,12.16879769494122,12.925342359924025
-115140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924665628696317,12.924665628696317,3134.2547934174236,9114.360622595888,5980.105829178462,55.64623499781786,54.49320159922168,12.16898630196955,12.924665628696317
-115200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923986703411169,12.923986703411169,3036.1880375100177,8826.743869311425,5790.555831801407,55.62584116616496,54.50919510205321,12.192260107595624,12.923986703411169
-115260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9232585211156,12.9232585211156,2855.2531648666886,8296.582944863587,5441.329779996898,55.588249595094176,54.53867562874357,12.235662200238595,12.9232585211156
-115320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922413289861089,12.922413289861089,2690.8464345506227,7815.2883366837805,5124.441902133158,55.5541231208123,54.56543871438372,12.274860818781598,12.922413289861089
-115380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.921405677868748,12.921405677868748,2542.079425871314,7380.127786259888,4838.048360388574,55.523267959117206,54.589636330816795,12.310043635682465,12.921405677868748
-115440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.920225997842248,12.920225997842248,2406.757900924181,6984.581267604386,4577.823366680205,55.49522176360325,54.61163106505804,12.341747593407336,12.920225997842248
-115500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.918886623784315,12.918886623784315,2283.804689936593,6625.420626360463,4341.61593642387,55.469755608135394,54.631602448391746,12.370256872388953,12.918886623784315
-115560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917409589278607,12.917409589278607,2172.2015438287326,6299.606309174026,4127.4047653452935,55.44665394587089,54.64971951962823,12.395848924996194,12.917409589278607
-115620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915820630053613,12.915820630053613,2071.012257964066,6004.351449460525,3933.3391914964586,55.42571915214162,54.66613726242836,12.41878334292734,12.915820630053613
-115680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.914146527674587,12.914146527674587,1979.712404206732,5738.08002849193,3758.367624285198,55.40683946076383,54.680943327450784,12.439219789636278,12.914146527674587
-115740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912413724084518,12.912413724084518,1896.3532446651307,5495.075120999461,3598.7218763343303,55.389609503393096,54.69445561767097,12.457660872846994,12.912413724084518
-115800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.910646807645223,12.910646807645223,1819.8521799917285,5272.15486739589,3452.3026874041607,55.373803662308795,54.70685106980761,12.474396452809115,12.910646807645223
-115860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9088683305496,12.9088683305496,1750.8318638620667,5071.106984810428,3320.2751209483617,55.359548682480536,54.718030286353425,12.48930185779048,12.9088683305496
-115920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.907098976615565,12.907098976615565,1688.2551119103134,4888.890026709954,3200.634914799641,55.34662890568426,54.72816239346753,12.502651040229276,12.907098976615565
-115980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.905357112218844,12.905357112218844,1631.141064646159,4722.632515172072,3091.4914505259135,55.33484072755914,54.73740706427935,12.514701274648392,12.905357112218844
-116040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.903658800801212,12.903658800801212,1579.1326768991416,4571.281476963439,2992.1488000642967,55.324109483189325,54.745822853432436,12.525556565859876,12.903658800801212
-116100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902017402316641,12.902017402316641,1531.361607995676,4432.300288342619,2900.938680346943,55.31425531361752,54.75355081214228,12.535441086821045,12.902017402316641
-116160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.900443927465,12.900443927465,1487.9822775604077,4306.127469531527,2818.14519197112,55.30530930724614,54.76056655987751,12.544329948845006,12.900443927465
-116220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.898947503162146,12.898947503162146,1448.8365215746564,4192.293846520402,2743.457324945747,55.29723819473004,54.76689618753537,12.552271580647526,12.898947503162146
-116280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.897535260292393,12.897535260292393,1412.3628636846577,4086.2560774974627,2673.893213812805,55.28971983818914,54.77279232606743,12.559649916486025,12.897535260292393
-116340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896212256300752,12.896212256300752,1379.1782292782807,3989.8001489777284,2610.621919699448,55.282880866689304,54.77815566886192,12.566322286909053,12.896212256300752
-116400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89498215139692,12.89498215139692,1348.856527423557,3901.683165237021,2552.826637813464,55.2766331537881,54.78305532752717,12.572395568409679,12.89498215139692
-116460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89384702418288,12.89384702418288,1321.037949950129,3820.855906015578,2499.8179560654494,55.27090230560061,54.78754964415555,12.577958957881131,12.89384702418288
-116520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892807988913903,12.892807988913903,1295.6197942990566,3747.0163085529175,2451.396514253861,55.26566690383956,54.7916554156611,12.583038762647314,12.892807988913903
-116580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891864935022205,12.891864935022205,1271.8422441382575,3677.9560659017097,2406.113821763453,55.26077037333711,54.79549543335804,12.587817910757577,12.891864935022205
-116640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89101653878464,12.89101653878464,1250.4002327299906,3615.688848001568,2365.2886152715773,55.25635548704168,54.79895773007936,12.592128438124957,12.89101653878464
-116700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890261341947589,12.890261341947589,1230.740010968813,3558.605245425873,2327.86523445706,55.2523081333415,54.80213179584423,12.596102285225134,12.890261341947589
-116760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88959694890276,12.88959694890276,1211.8321286932758,3503.716992650526,2291.884863957251,55.24841643711568,54.80518378997982,12.599984581588323,12.88959694890276
-116820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88902031126476,12.88902031126476,1194.8003586325078,3454.28213818618,2259.481779553672,55.24491140060796,54.807932553050186,12.603502583371974,12.88902031126476
-116880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888528639950902,12.888528639950902,1178.9084631795295,3408.163536311253,2229.2550731317237,55.24164149513585,54.81049691875239,12.606830526934564,12.888528639950902
-116940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88811868591576,12.88811868591576,1163.925899307161,3364.6913393007612,2200.765439993601,55.23855922678008,54.812914133355044,12.610020676280673,12.88811868591576
-117000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887787194195834,12.887787194195834,1150.394751602532,3325.4362616255626,2175.0415100230307,55.235775962100156,54.815096859597794,12.612939795032075,12.887787194195834
-117060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887530610650082,12.887530610650082,1137.699851189853,3288.613375395318,2150.913524205465,55.233165145786245,54.81714434625062,12.61573214530488,12.887530610650082
-117120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887345460267188,12.887345460267188,1125.5530877835724,3253.3865413265253,2127.8334535429535,55.230667493721064,54.819103085837014,12.618463503838294,12.887345460267188
-117180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887227785810564,12.887227785810564,1114.3038591722866,3220.7679568669073,2106.4640976946202,55.22835477253558,54.820916796642216,12.621046159756675,12.887227785810564
-117240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887173738692036,12.887173738692036,1103.9490215472767,3190.7476897093043,2086.7986681620278,55.22622627781777,54.822586031088974,12.623477122764287,12.887173738692036
-117300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887179539267189,12.887179539267189,1093.9302449330787,3161.7065998686103,2067.776354935531,55.22416720930286,54.824200819260405,12.62588666203983,12.887179539267189
-117360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887241217391725,12.887241217391725,1084.580810884346,3134.6102277503683,2050.0294168660216,55.222246025547406,54.82570747374083,12.628190912980063,12.887241217391725
-117420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887354988864967,12.887354988864967,1075.9608230943609,3109.632202403305,2033.6713793089448,55.220475037053326,54.827096340236174,12.630371746222231,12.887354988864967
-117480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887517231461771,12.887517231461771,1067.4828576520308,3085.0694851436906,2017.5866274916605,55.21873349513452,54.82846211377417,12.63256651364836,12.887517231461771
-117540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887724060006486,12.887724060006486,1059.2828036084532,3061.315571498551,2002.0327678900974,55.21704929931516,54.82978291464496,12.634738778206424,12.887724060006486
-117600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.887971927503363,12.887971927503363,1051.8824887656265,3039.882379461704,1987.9998906960773,55.2155296472574,54.83097467497242,12.636759881249109,12.887971927503363
-117660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88825739844368,12.88825739844368,1044.5693871181452,3018.704590727923,1974.1352036097776,55.21402810409569,54.83215223371749,12.638797332086506,12.88825739844368
-117720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888577121647565,12.888577121647565,1037.1528204481283,2997.229408099773,1960.0765876516439,55.21250547551942,54.8333463283271,12.6408935387167,12.888577121647565
-117780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.888927712525994,12.888927712525994,1030.4752540935049,2977.8978783104108,1947.4226242169063,55.211134836032755,54.8344212281735,12.642843113309233,12.888927712525994
-117840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.889306277972596,12.889306277972596,1024.054618288242,2959.3127565885893,1935.2581383003478,55.20981711845745,54.835454624944155,12.644758808365154,12.889306277972596
-117900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.88970995957046,12.88970995957046,1017.9660191537916,2941.691430895975,1923.7254117421828,55.20856773594372,54.83643443114787,12.646619786341438,12.88970995957046
-117960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890136329277311,12.890136329277311,1011.9385127928523,2924.248615934744,1912.3101031418921,55.20733101038062,54.837404311361254,12.648488613755555,12.890136329277311
-118020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.890582619363284,12.890582619363284,1006.2081035067675,2907.6679438258693,1901.4598403191012,55.20615541244037,54.8383262533144,12.650305958910355,12.890582619363284
-118080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891046777008732,12.891046777008732,1000.6266267382463,2891.519944035209,1890.8933172969626,55.205010491904886,54.83922413705384,12.652105316163215,12.891046777008732
-118140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.891526317860803,12.891526317860803,995.102775302016,2875.5399004992,1880.4371251971845,55.203877479945895,54.84011268170217,12.653906114035824,12.891526317860803
-118200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892019392201819,12.892019392201819,989.7810657211443,2860.1463983824187,1870.3653326612744,55.20278605494193,54.840968612514416,12.655671870438493,12.892019392201819
-118260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.892523866394631,12.892523866394631,984.6196869009766,2845.2181490785997,1860.5984621776236,55.20172761730994,54.841798673561925,12.657410494998539,12.892523866394631
-118320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893038154060886,12.893038154060886,979.4235747520212,2830.1899064979198,1850.7663317458987,55.2006620901585,54.84263429444001,12.659167179265244,12.893038154060886
-118380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.893560456401707,12.893560456401707,974.441871567961,2815.783370193244,1841.3414986252828,55.1996406431659,54.84343534623089,12.660880410150876,12.893560456401707
-118440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.894089378726315,12.894089378726315,969.9279956524292,2802.732601530631,1832.804605878202,55.1987153224522,54.84416101268271,12.662488056852405,12.894089378726315
-118500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89462363974056,12.89462363974056,964.9558153163949,2788.3544481204144,1823.3986328040194,55.197695888150776,54.84496048605604,12.664210863080823,12.89462363974056
-118560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895161927595506,12.895161927595506,960.1555100408784,2774.474516850061,1814.3190068091828,55.19671177875168,54.84573225649765,12.665896457571789,12.895161927595506
-118620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.895703056311648,12.895703056311648,955.8259065055188,2761.9584024308683,1806.1324959253495,55.19582436628029,54.84642819407894,12.667472035051965,12.895703056311648
-118680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896246078985452,12.896246078985452,950.6618858012796,2747.0252168703587,1796.3633310690786,55.194765579765104,54.847258528731935,12.669249497988876,12.896246078985452
-118740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.896789613589766,12.896789613589766,946.04828101136,2733.686640871332,1787.6383598599716,55.193819853736365,54.848000197692244,12.67089552416307,12.896789613589766
-118800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.897332501317994,12.897332501317994,941.8458007277308,2721.5390475866143,1779.6932468588834,55.19295857037297,54.84867564398136,12.672442357411434,12.897332501317994
-118860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89787386902743,12.89787386902743,937.564424334926,2709.162875529303,1771.598451194377,55.19208108053154,54.8493637999151,12.674006585636885,12.89787386902743
-118920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.89841421394906,12.89841421394906,933.3451056063184,2696.9664624968327,1763.6213568905148,55.19121633599743,54.85004196056633,12.675554918172615,12.89841421394906
-118980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.898952791361511,12.898952791361511,928.8480185845982,2683.9653980346507,1755.1173794500528,55.19029454055684,54.85076486238489,12.67716806300734,12.898952791361511
-119040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.899488986781034,12.899488986781034,925.1117869966913,2673.168212642992,1748.0564256463003,55.18952900362448,54.851365221223965,12.678596479180118,12.899488986781034
-119100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.900022534207304,12.900022534207304,920.4687813362842,2659.744335654853,1739.275554318568,55.18857723036936,54.85211163261491,12.68023958457964,12.900022534207304
-119160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90055245311303,12.90055245311303,916.3246426726573,2647.76536806823,1731.4407253955728,55.18772790349879,54.852777702235386,12.681759515688169,12.90055245311303
-119220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90107890326107,12.90107890326107,912.5442164997207,2636.8397842539653,1724.2955677542452,55.18695326322094,54.85338520021262,12.683188828458526,12.90107890326107
-119280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.901601339310869,12.901601339310869,908.3063746188487,2624.589121984385,1716.2827473655361,55.18608467300038,54.854066376775634,12.684723769603119,12.901601339310869
-119340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90211989941191,12.90211989941191,904.469355076292,2613.4992979178587,1709.0299428415674,55.18529838803679,54.8546830068923,12.686158796144138,12.90211989941191
-119400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.902634368155127,12.902634368155127,900.2844833802817,2601.401776458415,1701.117293078133,55.184440655940215,54.85535566816307,12.687673113028106,12.902634368155127
-119460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90314471975618,12.90314471975618,895.9770178824092,2588.9490347527003,1692.9720168702909,55.183557738320026,54.85604808073658,12.689212709103082,12.90314471975618
-119520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.903651016361964,12.903651016361964,892.0998696681278,2577.742519258137,1685.642649590009,55.182763180062864,54.85667119903785,12.690645148576596,12.903651016361964
-119580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.904153092623984,12.904153092623984,887.853938296828,2565.4677270778047,1677.6137887809762,55.18189287954272,54.85735371687314,12.692161759592324,12.904153092623984
-119640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.904651087705613,12.904651087705613,883.7859188424417,2553.7080915611605,1669.9221727187185,55.18105910448172,54.858007590261224,12.693631674094851,12.904651087705613
-119700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.905145173615253,12.905145173615253,880.0942866183403,2543.038437080219,1662.944150461878,55.18030261073307,54.85860085714295,12.695007506773054,12.905145173615253
-119760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.905635411635206,12.905635411635206,876.106203782614,2531.510047333536,1655.4038435509217,55.17948523152351,54.85924187237369,12.696450545060758,12.905635411635206
-119820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906121875538672,12.906121875538672,872.5790171903819,2521.316372034229,1648.737354843847,55.17876248554774,54.859808673159655,12.697779389798917,12.906121875538672
-119880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.906605017740633,12.906605017740633,868.0927429216174,2508.344904604177,1640.2521616825595,55.17784279029999,54.86052992793903,12.69933473365636,12.906605017740633
-119940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90708419921294,12.90708419921294,864.0228527736765,2496.5792389071,1632.5563861334228,55.177008588197296,54.861184136227024,12.700786362631614,12.90708419921294
-120000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.907559637792295,12.907559637792295,860.3832775444224,2486.059684096568,1625.6764065521454,55.17626273718229,54.86176905673256,12.702131161205225,12.907559637792295
-120060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.908031492406302,12.908031492406302,856.5913260707277,2475.098710895089,1618.5073848243608,55.175485589080374,54.8623785214266,12.70350890105446,12.908031492406302
-120120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.908499854489195,12.908499854489195,852.7329012828944,2463.9451159205373,1611.2122146376419,55.17469478392235,54.86299869642606,12.704899089566164,12.908499854489195
-120180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.90896476941035,12.90896476941035,848.5380524197992,2451.817142915912,1603.2790904961123,55.173834894134046,54.86367304982849,12.706366446399665,12.90896476941035
-120240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.909425999974255,12.909425999974255,845.1576349883835,2442.047614391945,1596.889979403561,55.17314222134918,54.86421626624484,12.707635010158956,12.909425999974255
-120300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.909884019920533,12.909884019920533,841.2089620339972,2430.6323523956544,1589.4233903616573,55.17233286392656,54.864850990530634,12.709036519209508,12.909884019920533
-120360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9103384427441,12.9103384427441,837.2653646991645,2419.231688718272,1581.966324019107,55.171524541642434,54.865484903027294,12.71043322825494,12.9103384427441
-120420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.910789535250304,12.910789535250304,833.2693299049838,2407.6790888276137,1574.40975892263,55.1707054469778,54.866127263573425,12.711839180582485,12.910789535250304
-120480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.911236971078957,12.911236971078957,829.5566059343912,2396.946801038147,1567.3901951037558,55.16994451362,54.86672401214033,12.713173618489337,12.911236971078957
-120540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.911681026963226,12.911681026963226,825.8363172933182,2386.192506494412,1560.3561892010935,55.169182020041426,54.86732198428285,12.714506501845241,12.911681026963226
-120600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912121488984045,12.912121488984045,821.6854738392094,2374.191340898251,1552.505867059041,55.16833112177394,54.86798928624367,12.715938945640962,12.912121488984045
-120660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912558604777686,12.912558604777686,818.3509117207753,2364.5537977130107,1546.2028859922364,55.16764780749168,54.86852516341938,12.71717251372865,12.912558604777686
-120720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.912992378898178,12.912992378898178,814.4342365595284,2353.230542486641,1538.7963059271121,55.166844974133966,54.869154771322314,12.718542196950407,12.912992378898178
-120780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.913422766271653,12.913422766271653,810.5135563128554,2341.895611189333,1531.3820548764775,55.16604131302464,54.869785028374864,12.71990946319078,12.913422766271653
-120840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.91384982503355,12.91384982503355,806.9581968298033,2331.6184172186304,1524.6602203888276,55.16531264692674,54.870356471912224,12.72118590390985,12.91384982503355
-120900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.91427348913655,12.91427348913655,802.8613338185709,2319.773179940556,1516.9118461219855,55.16447280466678,54.871015103394114,12.72258866923592,12.91427348913655
-120960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.914693753218035,12.914693753218035,798.7507377473949,2307.888119734595,1509.1373819872003,55.16363013901729,54.87167594906942,12.723991331814965,12.914693753218035
-121020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915110363491607,12.915110363491607,795.0472750365142,2297.181827912552,1502.1345528760376,55.162871049613344,54.87227125154804,12.725292833208785,12.915110363491607
-121080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915523562585474,12.915523562585474,791.3584159813547,2286.5177342152015,1495.1593182338474,55.1621149521948,54.87286420761487,12.726587436837919,12.915523562585474
-121140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.915933370658607,12.915933370658607,787.4762792168343,2275.2939441065337,1487.8176648896995,55.16131917170181,54.87348828443302,12.72792495242057,12.915933370658607
-121200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916339980482796,12.916339980482796,783.9788154860283,2265.1838547625853,1481.2050392765566,55.16060235404114,54.874050436042424,12.729167146377552,12.916339980482796
-121260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.916743376788066,12.916743376788066,780.0412010402722,2253.799306504895,1473.7581054646218,55.159795175781916,54.87468345135775,12.730511554752054,12.916743376788066
-121320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917143482223935,12.917143482223935,775.9516101866698,2241.974690923561,1466.0230807368914,55.15895679631996,54.8753409356661,12.731889077336302,12.917143482223935
-121380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917540382752463,12.917540382752463,772.2519600851895,2231.27900409058,1459.02704400539,55.15819845935441,54.87593564805816,12.733170012977052,12.917540382752463
-121440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.917933963229684,12.917933963229684,768.1423090403691,2219.3962167093587,1451.2539076689895,55.15735595564392,54.876596366735676,12.734545827367107,12.917933963229684
-121500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.918324147486155,12.918324147486155,764.4512040638173,2208.725141708983,1444.2739376451657,55.156599363868246,54.877189710493354,12.735818017225018,12.918324147486155
-121560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.918711199103846,12.918711199103846,760.5320726248959,2197.393844900058,1436.8617722751624,55.15579596168338,54.87781976448896,12.737141689311313,12.918711199103846
-121620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.919095022174366,12.919095022174366,756.6786571585183,2186.252755767785,1429.5740986092665,55.15500604553943,54.878439242294796,12.738446401788517,12.919095022174366
-121680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.919475831675543,12.919475831675543,753.1804215136607,2176.139883705626,1422.959462191965,55.1542890312596,54.879001548099325,12.739663052462554,12.919475831675543
-121740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.919853645583675,12.919853645583675,749.0352774220554,2164.154151780204,1415.1188743581486,55.153439229157655,54.87966799041163,12.741031625683748,12.919853645583675
-121800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92022844418286,12.92022844418286,744.956000347059,2152.3590897907284,1407.403089443669,55.152602945878,54.880323830825965,12.742381413195439,12.92022844418286
-121860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92060017859518,12.92060017859518,741.2776911170287,2141.724774602172,1400.4470834851434,55.151848960953615,54.880915130206496,12.743632127115731,12.92060017859518
-121920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.920968961047587,12.920968961047587,737.9597888794951,2132.133748453028,1394.173959573533,55.15116894647032,54.88144841957307,12.744793596742351,12.920968961047587
-121980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92133512462195,12.92133512462195,733.938793937264,2120.5073273884905,1386.5685334512266,55.15034462030357,54.882094882832476,12.746120804723136,12.92133512462195
-122040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.921698572198784,12.921698572198784,729.9899985678622,2109.0899050076064,1379.0999064397445,55.149535112474794,54.88272972507164,12.747428010364333,12.921698572198784
-122100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922059354765695,12.922059354765695,726.4059492297183,2098.728325402752,1372.3223761730333,55.14880046514746,54.8833058592827,12.748645220573636,12.922059354765695
-122160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922417471272052,12.922417471272052,722.169107009781,2086.477063757248,1364.3079567474667,55.14793183740097,54.88398706527475,12.750016065102125,12.922417471272052
-122220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.922772750404079,12.922772750404079,718.4485574951497,2075.7203126992085,1357.2717552040588,55.147169172170365,54.88458517203237,12.751260459635658,12.922772750404079
-122280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923125406235881,12.923125406235881,714.6234000880388,2064.6607417559603,1350.0373416679215,55.14638503677485,54.88520011638818,12.752527278333519,12.923125406235881
-122340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923475466299536,12.923475466299536,710.3995601100527,2052.4471423821697,1342.0475822721176,55.145519079637864,54.885879228001855,12.753886951232193,12.923475466299536
-122400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.923822780849061,12.923822780849061,706.4529560383555,2041.0360358016285,1334.5830797632727,55.144710020191845,54.886513718604746,12.755177504595668,12.923822780849061
-122460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924167559799587,12.924167559799587,702.9016250807576,2030.7690544420368,1327.8674293612794,55.14398208051001,54.88708459246311,12.756370893579348,12.924167559799587
-122520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92450979553407,12.92450979553407,699.2352221906607,2020.1689787030305,1320.9337565123694,55.14323052417282,54.88767398726697,12.757589290160242,12.92450979553407
-122580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.924849876881154,12.924849876881154,695.2928341867586,2008.7700866630566,1313.4772524762984,55.142422331027916,54.888307798488476,12.758871600479026,12.924849876881154
-122640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925187520147214,12.925187520147214,691.7354871410338,1998.485664460276,1306.7501773192419,55.1416931550224,54.8888796419119,12.76005929832479,12.925187520147214
-122700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925522865538852,12.925522865538852,687.7770533991728,1987.0403503832267,1299.2632969840536,55.14088167069474,54.889516034185455,12.761340711787119,12.925522865538852
-122760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.925855698625364,12.925855698625364,683.574078051005,1974.8872777678025,1291.3131997167973,55.14002000568003,54.89019177977791,12.762678147923285,12.925855698625364
-122820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926185928874586,12.926185928874586,679.781945787469,1963.9233240706994,1284.1413782832306,55.13924265048257,54.89080140688297,12.763914634242756,12.926185928874586
-122880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926513540123889,12.926513540123889,675.8837490654852,1952.6523996505482,1276.7686505850627,55.13844353085071,54.8914281023619,12.765173889497815,12.926513540123889
-122940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.926838528907675,12.926838528907675,671.9156311372644,1941.1791241125463,1269.2634929752824,55.137630064423846,54.892066049061796,12.766447257171086,12.926838528907675
-123000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.927160871202615,12.927160871202615,668.1562627794265,1930.3100141322232,1262.1537513527967,55.13685943401588,54.89267040236929,12.767668011660989,12.927160871202615
-123060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92748090420201,12.92748090420201,664.1732459259317,1918.7936620661756,1254.6204161402436,55.13604291361535,54.893310744094194,12.768939984803927,12.92748090420201
-123120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92779849234459,12.92779849234459,660.2290311938908,1907.389634972684,1247.160603778793,55.13523435726158,54.89394484015586,12.77020022261165,12.92779849234459
-123180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92811357981466,12.92811357981466,656.6679471193733,1897.0944112561774,1240.4264641368045,55.13450441620474,54.89451728355729,12.771366259912089,12.92811357981466
-123240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.928426589569922,12.928426589569922,652.3884057061417,1884.7200179971292,1232.3316122909876,55.133627060175044,54.89520533455153,12.772702167067491,12.928426589569922
-123300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.92873720575576,12.92873720575576,648.1943254544369,1872.5930049432075,1224.3986794887705,55.13276724374477,54.895879630424226,12.774015219931178,12.92873720575576
-123360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929045501456182,12.929045501456182,644.3921467338532,1861.600156507286,1217.2080097734329,55.131987840729636,54.89649086349418,12.775232155993582,12.929045501456182
-123420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929351420250583,12.929351420250583,640.9832161153503,1851.7453188873471,1210.7621027719968,55.13128912380036,54.89703881992421,12.77635260294274,12.929351420250583
-123480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929655544288472,12.929655544288472,636.9165947316675,1839.987284924204,1203.0706901925364,55.130455468619225,54.89769259929862,12.777628644571552,12.929655544288472
-123540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.929957704617154,12.929957704617154,632.5123425456187,1827.2523052144852,1194.7399626688668,55.12955254722376,54.89840069948011,12.778983510248844,12.929957704617154
-123600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.930257792632663,12.930257792632663,628.6331215638343,1816.036687313192,1187.4035657493575,55.128757350034,54.899024318852994,12.78021065455516,12.930257792632663
-123660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.930555821374176,12.930555821374176,625.3423960140707,1806.5240058457282,1181.1816098316567,55.12808289261197,54.89955325019228,12.781294912653685,12.930555821374176
-123720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93085226901549,12.93085226901549,621.356573609792,1795.0000087774265,1173.6434351676344,55.127265831249034,54.900194016157386,12.782543914846457,12.93085226901549
-123780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931146960156887,12.931146960156887,616.9711120378618,1782.3197055616129,1165.348593523751,55.1263667868955,54.900899075837145,12.783886777587517,12.931146960156887
-123840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.931439892792698,12.931439892792698,613.3586434516461,1771.876160748774,1158.517517297128,55.12562633071865,54.901479765536,12.785042912201273,12.931439892792698
-123900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93173114937507,12.93173114937507,609.133753823395,1759.6606427369654,1150.5268889135705,55.12476024024481,54.90215898171673,12.786343898712287,12.93173114937507
-123960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932020577434606,12.932020577434606,605.0898533387318,1747.9688902594366,1142.8790369207047,55.12393128529208,54.9028090750199,12.787599741728284,12.932020577434606
-124020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932308374534964,12.932308374534964,601.4383669609592,1737.4126134631895,1135.97424650223,55.12318283659594,54.903396032711065,12.788760056426673,12.932308374534964
-124080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932594578448866,12.932594578448866,597.5216880121887,1726.0890982929698,1128.567410280781,55.12237999016224,54.90402565086862,12.789982219582855,12.932594578448866
-124140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.932879465044,12.932879465044,593.3857090424015,1714.13116960834,1120.7454605659384,55.12153216339942,54.904690544056045,12.791255521793207,12.932879465044
-124200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933162796458557,12.933162796458557,589.6593377788953,1703.3584217166215,1113.699083937726,55.12076836700052,54.905289537912466,12.792429263093336,12.933162796458557
-124260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933444685176456,12.933444685176456,585.4160607893315,1691.090235022884,1105.6741742335523,55.11989854290698,54.9059716821186,12.79372521507484,12.933444685176456
-124320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.933725164413334,12.933725164413334,581.0035212255989,1678.3324627533555,1097.3289415277563,55.118994006931096,54.906681048506314,12.795060235690642,12.933725164413334
-124380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934003982280748,12.934003982280748,577.3228428602453,1667.6921414013598,1090.3692985411149,55.118239599965904,54.907272678864906,12.796218503904742,12.934003982280748
-124440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934281418155653,12.934281418155653,573.62507137734,1657.0024311592672,1083.377359781927,55.11748169137639,54.90786705531063,12.797379471405199,12.934281418155653
-124500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934557727193154,12.934557727193154,569.67546626515,1645.5842400526815,1075.9087737875313,55.11667213303448,54.90850193716384,12.798599544210619,12.934557727193154
-124560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.934832830029759,12.934832830029759,565.6016465959701,1633.806795923638,1068.205149327668,55.11583710348591,54.90915679436167,12.799848111861374,12.934832830029759
-124620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935106832334087,12.935106832334087,561.2344824279553,1621.1808462702827,1059.946363842327,55.11494191438072,54.90985883063088,12.801165732610546,12.935106832334087
-124680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935379370425169,12.935379370425169,557.3130894845369,1609.8445692247665,1052.5314797402295,55.114138164113214,54.91048915760416,12.802375248981273,12.935379370425169
-124740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93565080583325,12.93565080583325,553.7597641758081,1599.5731330128478,1045.8133688370401,55.11340991191707,54.911060276546365,12.803495614455535,12.93565080583325
-124800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.935921170389573,12.935921170389573,549.5575426630286,1587.4246629134366,1037.867120250408,55.11254857677439,54.9117357634425,12.804770104037555,12.935921170389573
-124860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936190454818913,12.936190454818913,545.2633564058217,1575.0102906593402,1029.7469342535185,55.111668389095364,54.912426035107785,12.806065493456535,12.936190454818913
-124920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93645854414803,12.93645854414803,541.3908144325467,1563.8157191375522,1022.4249047050054,55.110874686241395,54.91304848257417,12.807258828163164,12.93645854414803
-124980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936725579823287,12.936725579823287,537.5809867214512,1552.802650044923,1015.2216633234717,55.11009385212725,54.91366083795832,12.808436098613608,12.936725579823287
-125040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.936991721489253,12.936991721489253,533.7649290250547,1541.7716542408316,1008.0067252157768,55.10931174708868,54.9142741900425,12.809613953295088,12.936991721489253
-125100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937257033302254,12.937257033302254,529.4475877735548,1529.2907848121108,999.843197038556,55.108426845143384,54.914968158787964,12.810910847825514,12.937257033302254
-125160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.937521229409056,12.937521229409056,525.2640100077593,1517.1969593506296,991.9329493428701,55.10756938498489,54.915640606796096,12.812174620802908,12.937521229409056
-125220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.93778450662989,12.93778450662989,521.3698740853781,1505.9404496819695,984.5705755965912,55.106771291164435,54.9162664978005,12.813368242428453,12.93778450662989
-125280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938046712597888,12.938046712597888,517.0004357641496,1493.3092911924664,976.3088554283167,55.10587573396671,54.916968822739804,12.814674439815168,12.938046712597888
-125340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938307932025928,12.938307932025928,513.3423977852327,1482.735874597061,969.393476811828,55.10512607207496,54.91755673185823,12.815809519005583,12.938307932025928
-125400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938568318021245,12.938568318021245,509.6283670385628,1472.000597015601,962.3722299770379,55.10436493422365,54.918153640795566,12.816957143071447,12.938568318021245
-125460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.938828016148973,12.938828016148973,505.4300922729668,1459.8648701105087,954.434777837542,55.10350450374971,54.918828418221175,12.818219856677633,12.938828016148973
-125520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939087001920726,12.939087001920726,501.3192398010637,1447.9821238376576,946.6628840365936,55.102662009865206,54.91948912919285,12.819460937145564,12.939087001920726
-125580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939345222392705,12.939345222392705,497.22998077051597,1436.1619589689346,938.9319781984186,55.101823953145654,54.920146360396146,12.820696072997508,12.939345222392705
-125640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939602534500466,12.939602534500466,493.21810371308914,1424.5657138432196,931.3476101301303,55.101001772571436,54.92079114101245,12.821911783256164,12.939602534500466
-125700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.939859042766097,12.939859042766097,489.30667304331774,1413.2600833781833,923.9534103348656,55.10020019684455,54.92141976264058,12.823102659019007,12.939859042766097
-125760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940114913135028,12.940114913135028,485.7776238764135,1403.0604106070298,917.2827867306163,55.09947703423934,54.92198689016086,12.824201461539822,12.940114913135028
-125820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940370272409488,12.940370272409488,481.5127548974085,1390.7328753524068,909.2201204549987,55.09860300507754,54.922672332117614,12.825475660127836,12.940370272409488
-125880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940625019355535,12.940625019355535,477.3757050668698,1378.7751305929496,901.3994255260798,55.09775519437867,54.923337212707175,12.826718669575815,12.940625019355535
-125940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.940879137333946,12.940879137333946,473.6197198179801,1367.9195021801781,894.299782362198,55.096985524430025,54.923940812791386,12.82786993369885,12.940879137333946
-126000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941132623790855,12.941132623790855,469.2235151675535,1355.2125955886052,885.9890804210513,55.09608459796621,54.924647348482935,12.829173603274805,12.941132623790855
-126060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941385381256895,12.941385381256895,465.2688193328495,1343.782580638521,878.5137613056717,55.095274203905745,54.92528288573367,12.830370979924554,12.941385381256895
-126120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941637448274953,12.941637448274953,461.69188062109015,1333.445044933829,871.7531643127388,55.09454126728213,54.925857678355506,12.831477349595811,12.941637448274953
-126180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.941889120488069,12.941889120488069,457.6174740095408,1321.6690996108596,864.0516256013188,55.093706346771405,54.926512450042345,12.832702227796984,12.941889120488069
-126240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942140215751266,12.942140215751266,453.40133069726824,1309.4834446936948,856.0821139964266,55.09284237775225,54.92719000250966,12.833960391916557,12.942140215751266
-126300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942390788212128,12.942390788212128,449.59865254507713,1298.4934959416814,848.8948433966043,55.09206318499332,54.92780107068989,12.835119184582489,12.942390788212128
-126360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942640856937187,12.942640856937187,445.63343940601095,1287.0336889946725,841.4002495886614,55.09125067915482,54.92843826406529,12.83631630892284,12.942640856937187
-126420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.942890593559465,12.942890593559465,441.8704081593568,1276.1586140154182,834.2882058560614,55.09047963118636,54.92904294483725,12.837464759905306,12.942890593559465
-126480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943140205417386,12.943140205417386,438.13089584597685,1265.3516598386634,827.2207639926867,55.08971341310341,54.92964383785665,12.838607450086467,12.943140205417386
-126540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943389755522714,12.943389755522714,434.44836525953934,1254.7095781050525,820.2612128455133,55.0889588846395,54.930235563498485,12.839736444902437,12.943389755522714
-126600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.943639409448169,12.943639409448169,430.70087412189275,1243.8797900817344,813.1789159598418,55.088191047801416,54.930837725998046,12.840881054577615,12.943639409448169
-126660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9438890743557,12.9438890743557,427.0113572519934,1233.2177414744456,806.2063842224524,55.087435103849714,54.93143056171122,12.842011804753524,12.9438890743557
-126720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94413890326734,12.94413890326734,423.6682325222025,1223.5573136499609,799.8890811277588,55.086750175327566,54.9319677048261,12.843059920268884,12.94413890326734
-126780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944389142373225,12.944389142373225,419.9157360205163,1212.713403745074,792.7976677245576,55.0859813374965,54.93257065233677,12.844206267504216,12.944389142373225
-126840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.944639644748552,12.944639644748552,416.54089666791685,1202.9614850622904,786.4205883943733,55.08528992238392,54.93311288244581,12.845262610399539,12.944639644748552
-126900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94489062206814,12.94489062206814,413.1453220975601,1193.149716198353,780.0043941007929,55.08459426394082,54.933658440311966,12.846324371153694,12.94489062206814
-126960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945142010756664,12.945142010756664,409.3471863326909,1182.174209097752,772.8270227650612,55.0838160960647,54.93426870474594,12.847482730497367,12.945142010756664
-127020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945393704378846,12.945393704378846,405.92278261020147,1172.2793031744561,766.3565205642543,55.08311454332533,54.934818885110005,12.848552070463505,12.945393704378846
-127080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.945645729266564,12.945645729266564,402.4913730034678,1162.3642413525579,759.8728683490899,55.082411561598846,54.93537018613203,12.84962340352273,12.945645729266564
-127140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94589807993206,12.94589807993206,398.9884130102688,1152.242428836879,753.2540158266106,55.081693921244465,54.93593298292446,12.85071214723353,12.94589807993206
-127200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946150718070552,12.946150718070552,395.48616227567436,1142.122769872854,746.6366075971796,55.08097643365495,54.93649565991375,12.851800996020524,12.946150718070552
-127260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946403696780305,12.946403696780305,392.3371019779921,1133.0242450862536,740.6871431082616,55.08033134492484,54.937001559374295,12.852805779890751,12.946403696780305
-127320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946657000093735,12.946657000093735,388.7112973900966,1122.547605031026,733.8363076409296,55.07958854739622,54.937584085236985,12.853924791416947,12.946657000093735
-127380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.946910463918798,12.946910463918798,385.13589496581403,1112.216777668397,727.080882702583,55.07885608812071,54.938158503507005,12.855031906895967,12.946910463918798
-127440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947164157976635,12.947164157976635,381.88352918773376,1102.819877934013,720.9363487462794,55.07818984471077,54.93868099315213,12.856062056656738,12.947164157976635
-127500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947417901080783,12.947417901080783,378.2025335376883,1092.184008149839,713.9814746121506,55.07743575798024,54.93927237237234,12.85719465532056,12.947417901080783
-127560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947671622810025,12.947671622810025,374.88099028944237,1082.5873097718663,707.7063194824239,55.076755348923705,54.93980597117602,12.858241339109748,12.947671622810025
-127620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.947925480595524,12.947925480595524,371.31979699124116,1072.2979550058624,700.9781580146213,55.076025830379656,54.94037808322925,12.859345403840997,12.947925480595524
-127680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94817917379633,12.94817917379633,368.1252560290764,1063.0685430262856,694.9432869972093,55.0753714621861,54.940891259945346,12.860361695500098,12.94817917379633
-127740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948432970256862,12.948432970256862,364.6541874934906,1053.0398860070268,688.3856985135361,55.07466042734228,54.94144887648261,12.861444144454145,12.948432970256862
-127800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948686706512234,12.948686706512234,360.7767981058911,1041.8368447532403,681.0600466473494,55.07386612838743,54.94207179143061,12.86262359074038,12.948686706512234
-127860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.948940143138804,12.948940143138804,357.48631648756964,1032.3303678699624,674.8440513823925,55.07319211642494,54.942600373426075,12.863662514204163,12.948940143138804
-127920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949193327110615,12.949193327110615,354.1721786866272,1022.7555899914703,668.5834113048433,55.072513261971004,54.94313275306009,12.864706826739088,12.949193327110615
-127980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949446367320636,12.949446367320636,350.74704834697235,1012.8600788661283,662.113030519156,55.071811667511966,54.94368296614206,12.865777499817376,12.949446367320636
-128040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.949699258356679,12.949699258356679,347.3113622874282,1002.9341460607884,655.6227837733601,55.071107916221635,54.94423487068096,12.866850534234686,12.949699258356679
-128100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.94995193713243,12.94995193713243,343.9906617912153,993.3406463915007,649.3499846002857,55.070427734600145,54.94476829112271,12.867895878435615,12.94995193713243
-128160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950204437728152,12.950204437728152,340.4199549417945,983.024637577262,642.6046826354676,55.06969632696978,54.945341884658546,12.869000753084793,12.950204437728152
-128220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950456570012374,12.950456570012374,336.8621412436041,972.745989496368,635.883848252764,55.06896756830467,54.94591340079011,12.870102167672131,12.950456570012374
-128280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950708424391149,12.950708424391149,333.42287177529187,962.8100548273784,629.3871830520866,55.068263108180076,54.94646586121978,12.871174977011023,12.950708424391149
-128340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.950959841005005,12.950959841005005,329.9763318475326,952.8531923060433,622.8768604585105,55.067557164340435,54.9470194852268,12.872249074550258,12.950959841005005
-128400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951210893072718,12.951210893072718,326.4082370479348,942.5451087797676,616.1368717318327,55.06682631892964,54.947592637851855,12.873351829776672,12.951210893072718
-128460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951461426968468,12.951461426968468,322.8459775536512,932.2539842619856,609.4080067083345,55.06609667599623,54.948164847455246,12.874452661301508,12.951461426968468
-128520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95171155937463,12.95171155937463,319.62838185254816,922.9590469831646,603.3306651306166,55.06543766302014,54.94868166676014,12.875470760714807,12.95171155937463
-128580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.951961354384244,12.951961354384244,315.90866630173537,912.2130543514933,596.3043880497578,55.064675770000505,54.94927916792491,12.876608436538072,12.951961354384244
-128640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95221060932736,12.95221060932736,312.4491006383932,902.2189906263902,589.7698899879971,55.06396718896839,54.949834860103635,12.877683428019632,12.95221060932736
-128700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95245950097169,12.95245950097169,309.07351001171406,892.4676967516397,583.3941867399258,55.063275820437724,54.95037705368161,12.878737989975185,12.95245950097169
-128760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952707905366706,12.952707905366706,305.4634391055348,882.0388647504353,576.5754256449006,55.062536414408534,54.9509569198207,12.87984805250234,12.952707905366706
-128820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.952955854404895,12.952955854404895,301.9604581894343,871.9196053654189,569.9591471759846,55.06181895721082,54.95151957297574,12.880932072770088,12.952955854404895
-128880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95320331063947,12.95320331063947,298.81561731950177,862.8353884706299,564.0197711511281,55.06117488476608,54.952024675432405,12.881930062517931,12.95320331063947
-128940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953450512371012,12.953450512371012,295.59688794886847,853.5377192142416,557.9408312653732,55.06051567857885,54.952541646259746,12.882945434083029,12.953450512371012
-129000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953697526032508,12.953697526032508,291.88394857148626,842.8119953482594,550.9280467767733,55.05975522318006,54.95313801999572,12.884078624453759,12.953697526032508
-129060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.953944148107897,12.953944148107897,288.16578459328025,832.0712852866177,543.9055006933374,55.05899370534471,54.95373522692884,12.885212656911152,12.953944148107897
-129120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.954190273929006,12.954190273929006,284.8237055813112,822.4174324318457,537.5937268505345,55.05830924591053,54.95427200216975,12.88625637536851,12.954190273929006
-129180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.954435897674148,12.954435897674148,281.3070362422992,812.2591637856044,530.9521275433052,55.05758902340641,54.95483682396759,12.887341270801908,12.954435897674148
-129240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.954681020956173,12.954681020956173,277.7948701118961,802.1140010033737,524.3191308914777,55.05686973018732,54.95540091699003,12.888424578811266,12.954681020956173
-129300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.954925771382566,12.954925771382566,274.60933579472743,792.9127404149284,518.303404620201,55.05621735981046,54.95591252695362,12.889429511705842,12.954925771382566
-129360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95517017163678,12.95517017163678,271.13768715417285,782.8848295336819,511.74714237950906,55.055506379910575,54.95647010040207,12.89050240026035,12.95517017163678
-129420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.955414286442672,12.955414286442672,267.6377048907824,772.7751440574198,505.13743916663736,55.05478960226037,54.95703222063399,12.891581756644838,12.955414286442672
-129480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95565806004692,12.95565806004692,264.2412442356081,762.9646685303187,498.7234242947107,55.05409403869735,54.95757770409213,12.892636043467407,12.95565806004692
-129540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.955901499682508,12.955901499682508,260.549032397965,752.2997506574162,491.7507182594514,55.053337895180434,54.95817069631078,12.893760596385288,12.955901499682508
-129600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.956144925033088,12.956144925033088,260.47942965920157,752.1018779589523,491.6224482997509,55.05332386599135,54.95818169845492,12.89402022645048,12.956144925033088
-129660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.956390167645182,12.956390167645182,264.1546284606656,762.7242651152817,498.56963665461615,55.054076994075345,54.957591071036354,12.893387571479115,12.956390167645182
-129720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.956639769071947,12.956639769071947,267.24489017624853,771.6568373378512,504.4119471616027,55.05471031421361,54.95709440088642,12.892898894888914,12.956639769071947
-129780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.956895832121091,12.956895832121091,269.68465545026817,778.7100839524621,509.0254285021939,55.05521039004726,54.95670222523265,12.892571962796485,12.956895832121091
-129840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.957158657979493,12.957158657979493,271.6612384444851,784.4251731490973,512.7639347046122,55.05561559042442,54.95638445398251,12.892362361040895,12.957158657979493
-129900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.957428076750231,12.957428076750231,273.087305472746,788.549682765636,515.46237729289,55.05590801857071,54.956155122365715,12.89229078144158,12.957428076750231
-129960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.957703040326251,12.957703040326251,274.3829212560222,792.2973812383631,517.9144599823408,55.05617373078015,54.95594674225124,12.892255878188246,12.957703040326251
-130020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.95798274853107,12.95798274853107,275.08453942888883,794.3287433483649,519.244203919476,55.05631775456835,54.955833794135195,12.892367545726637,12.95798274853107
-130080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.958266301945029,12.958266301945029,275.38308347144886,795.1954233493187,519.8123398778698,55.05637920227292,54.95578560485651,12.892579300308054,12.958266301945029
-130140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.958552487381153,12.958552487381153,275.63947305988023,795.9403359262343,520.3008628663539,55.056432016654576,54.955744186109065,12.892803747284315,12.958552487381153
-130200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.958840530155992,12.958840530155992,275.5205194203403,795.6006416771277,520.0801222567874,55.05640793229581,54.955763073842704,12.893119678912358,12.958840530155992
-130260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.959129532250593,12.959129532250593,274.940329280323,793.9281045703813,518.9877752900583,55.05628934923642,54.95585607051584,12.893546711946039,12.959129532250593
-130320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9594184862273,12.9594184862273,274.06716181714097,791.4089268038057,517.3417649866648,55.056110739267865,54.95599614223391,12.894043661551148,12.9594184862273
-130380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.959706754111256,12.959706754111256,272.9103463654171,788.070057551975,515.1597111865577,55.05587401309422,54.95618179056098,12.894607663219075,12.959706754111256
-130440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.959993382174305,12.959993382174305,271.4103723143866,783.7395168849879,512.3291445706012,55.05556697732764,54.956422577946384,12.895251975646586,12.959993382174305
-130500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.960277776650662,12.960277776650662,269.6886579026974,778.768169380734,509.0795114780365,55.055214508309625,54.95669899555802,12.895947010691113,12.960277776650662
-130560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.960559383539415,12.960559383539415,268.14733249838014,774.3180497436059,506.17071724522583,55.054898994413506,54.956946431766994,12.89659618753506,12.960559383539415
-130620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.96083794257028,12.96083794257028,266.74340880895727,770.2649298499623,503.5215210410048,55.05461162784914,54.95717179392745,12.89720951204982,12.96083794257028
-130680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.961113293681462,12.961113293681462,264.6313914731263,764.1655894268224,499.5341979536962,55.054179184088824,54.95751093032039,12.8979887236543,12.961113293681462
-130740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.961385240249205,12.961385240249205,262.3700809917293,757.6348057896105,495.26472479788123,55.053716150998646,54.957874055855825,12.898800185278056,12.961385240249205
-130800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.961653449664107,12.961653449664107,260.325376031524,751.7298997117053,491.40452368018117,55.05329749270593,54.95820238123892,12.899556191467545,12.961653449664107
-130860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.961917868849545,12.961917868849545,257.62032084773466,743.9167915505417,486.296470702807,55.0527435427799,54.95863680669957,12.900466094732002,12.961917868849545
-130920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.962178133548127,12.962178133548127,254.8333975082111,735.8671031539708,481.03370564575965,55.05217281934646,54.95908438648764,12.901391394166108,12.962178133548127
-130980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.962434336437186,12.962434336437186,252.30632476994117,728.5682600675045,476.26193529756347,55.051655330936796,54.959490217647065,12.90225058647481,12.962434336437186
-131040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.96268635442378,12.96268635442378,249.78640890167938,721.29007510846,471.50366620678057,55.051139307229604,54.95989490013944,12.903103887928726,12.96268635442378
-131100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.962934521256402,12.962934521256402,246.8770527686113,712.8865845526994,466.0095317840882,55.05054349934443,54.96036215196641,12.904046327423417,12.962934521256402
-131160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.963178826122409,12.963178826122409,243.9023141639809,704.294180910361,460.3918667463802,55.04993429756736,54.960839907716895,12.905000515300312,12.963178826122409
-131220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.963419280729475,12.963419280729475,241.3252623277878,696.8508821115704,455.52561978378264,55.049406567416675,54.961253770781106,12.905855898672659,12.963419280729475
-131280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.963656256674785,12.963656256674785,238.2467556779729,687.9586706556797,449.7119149777069,55.04877610936162,54.961748196392755,12.90682753088842,12.963656256674785
-131340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.963889771680613,12.963889771680613,235.21835351246526,679.2112583988875,443.99290488642237,55.04815591763223,54.96223457081954,12.907783736036455,12.963889771680613
-131400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.964119939372528,12.964119939372528,232.21890840614563,670.5475410751412,438.32863266899574,55.047541659932364,54.962716291588315,12.908729676961006,12.964119939372528
-131460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.964346915189704,12.964346915189704,229.0352116179757,661.3514945945516,432.316282976576,55.04688966014851,54.96322761092089,12.90971641165493,12.964346915189704
-131520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.96457083055048,12.96457083055048,225.616032434618,651.4751236310317,425.85909119641383,55.04618942542327,54.96377675765561,12.91075629939382,12.96457083055048
-131580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.964791670386283,12.964791670386283,222.5498048826268,642.6185736293812,420.0687687467546,55.04556149606925,54.96426920017806,12.911708841484375,12.964791670386283
-131640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.965009793078186,12.965009793078186,219.76477500278315,634.5745013433519,414.809726340569,55.04499117143274,54.96471646721665,12.912591530296476,12.965009793078186
-131700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.965225436423689,12.965225436423689,215.94528672750923,623.5417490136745,407.59646228616515,55.04420894949339,54.96532991097821,12.913718689034171,12.965225436423689
-131760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.965438586214043,12.965438586214043,212.52585712921046,613.6649183531148,401.1390612239043,55.0435086824572,54.96587908305224,12.914747838211253,12.965438586214043
-131820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.965649320053698,12.965649320053698,209.41478565244742,604.6790327349731,395.2642470825258,55.04287158346516,54.966378716701605,12.915700951793985,12.965649320053698
-131880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.965857905670548,12.965857905670548,206.24723479432876,595.5300347203703,389.2827999260415,55.04222291987218,54.966887419685314,12.916665392171906,12.965857905670548
-131940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966064684041028,12.966064684041028,203.07872660137488,586.3783379878599,383.2996113864852,55.041574065003346,54.96739627267373,12.917628245472331,12.966064684041028
-132000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966269800406703,12.966269800406703,199.55466002478016,576.1995198314825,376.64485980670236,55.040852387347925,54.96796223564831,12.918674300321001,12.966269800406703
-132060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966473342416306,12.966473342416306,196.375231636489,567.0164296963987,370.64119805990964,55.04020130682226,54.96847283406885,12.919636504626839,12.966473342416306
-132120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966675527077106,12.966675527077106,192.7633777966196,556.5841939784676,363.820816181848,55.03946166202877,54.969052887454616,12.920700558216515,12.966675527077106
-132180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.966876263380687,12.966876263380687,189.529996218872,547.2454085040356,357.71541228516367,55.038799542851784,54.9695721427428,12.921672813893068,12.966876263380687
-132240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.967075963097935,12.967075963097935,186.1872020168556,537.5906367924131,351.4034347755576,55.03811502034383,54.970108967448205,12.922670137189488,12.967075963097935
-132300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.967274515065437,12.967274515065437,182.46669741218483,526.8448489114476,344.37815149926286,55.03735314496325,54.970706454779865,12.92375645121372,12.967274515065437
-132360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.967472118439026,12.967472118439026,179.09677301497712,517.1119075574894,338.0151345425125,55.03666308038418,54.971247625756796,12.924758128086252,12.967472118439026
-132420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.967668745023547,12.967668745023547,176.07000517884757,508.3703250736245,332.300319894777,55.0360433031118,54.971733675152976,12.925676916825653,12.967668745023547
-132480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.967864865882467,12.967864865882467,172.91992059288106,499.27260142109617,326.35268082821517,55.035398275529474,54.97223952665946,12.926624621275392,12.967864865882467
-132540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.968060583160666,12.968060583160666,169.70431380210826,489.9856962012163,320.281382399108,55.034739835059675,54.9727558969864,12.927587548710525,12.968060583160666
-132600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.968256138204234,12.968256138204234,166.78914926513403,481.56672492163847,314.7775756565045,55.03414293105868,54.97322400842287,12.928478601707413,12.968256138204234
-132660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.96845165242146,12.96845165242146,164.17216544222617,474.00912506517835,309.83695962295224,55.03360709822836,54.973644225870714,12.929298445162997,12.96845165242146
-132720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.968647549776328,12.968647549776328,161.38580500578453,465.9623382118212,304.57653320603663,55.03303658215199,54.974091643042634,12.930159085344407,12.968647549776328
-132780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.968843820950784,12.968843820950784,158.49327143470643,457.6089409122062,299.11566947749975,55.032444327488996,54.974556108317756,12.931045428106597,12.968843820950784
-132840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.969040724652908,12.969040724652908,155.8690529726147,450.03062542554864,294.1615724529339,55.03190702606018,54.97497747748808,12.931868364802735,12.969040724652908
-132900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.969238159050699,12.969238159050699,153.1038553558847,442.04516332385003,288.9413079679654,55.03134085804442,54.975421484770145,12.932725467085206,12.969238159050699
-132960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.969436212532385,12.969436212532385,150.1920336635341,433.6362640922532,283.44423042871915,55.030744668454254,54.97588903594253,12.933618168600853,12.969436212532385
-133020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.969634811174858,12.969634811174858,147.57842996327733,426.08878990844664,278.5103599451694,55.030209553805506,54.976308690169134,12.934440244467476,12.969634811174858
-133080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.969834039639373,12.969834039639373,145.2056346355727,419.23689827850296,274.0312636429303,55.029723755879886,54.97668966862532,12.935205481690149,12.969834039639373
-133140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.970034052312975,12.970034052312975,142.2394530046739,410.67118979761716,268.4317367929434,55.02911644868722,54.97716593858139,12.936113088835429,12.970034052312975
-133200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.970234390612392,12.970234390612392,137.39362820597188,396.6767404873175,259.2831122813456,55.0281242448639,54.977944056932465,12.937469511198135,12.970234390612392
-133260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97043403351341,12.97043403351341,130.85700213053624,377.7992988810343,246.94229675049806,55.02678583803935,54.978993678882006,12.939228626547164,12.97043403351341
-133320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.970631355531546,12.970631355531546,124.5111903664731,359.4734375478452,234.9622471813721,55.025486538402575,54.98001263170919,12.940939832223927,12.970631355531546
-133380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97082542221106,12.97082542221106,118.31111151793577,341.568910969339,223.2577994514033,55.02421711155405,54.98100815732898,12.942612955722515,12.97082542221106
-133440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.971015728577125,12.971015728577125,112.25903643433004,324.0922401850553,211.8332037507253,55.02297801981678,54.98197989317272,12.944246954977315,12.971015728577125
-133500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97120249365299,12.97120249365299,106.31270739715994,306.9213622436926,200.60865484653263,55.0217606089425,54.98293462618202,12.945852133765682,12.97120249365299
-133560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9713857885974,12.9713857885974,100.4787176436082,290.0752942313792,189.59657658777093,55.0205662272255,54.983871298980816,12.947426993270039,12.9713857885974
-133620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97156603507416,12.97156603507416,95.2152204344485,274.87698861343375,179.66176817898534,55.01948867160522,54.9847163529735,12.948862672852318,12.97156603507416
-133680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.971743897581089,12.971743897581089,89.96621770040927,259.72085125547744,169.75463355506812,55.01841410587621,54.98555906219667,12.950292471549051,12.971743897581089
-133740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.971919847929714,12.971919847929714,84.74741513528807,244.6522329613707,159.90481782608262,55.01734574539504,54.986396905063636,12.951713114994746,12.971919847929714
-133800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.972094420947554,12.972094420947554,80.03938142417441,231.05873421145813,151.01935278728374,55.01638197059044,54.98715272845812,12.953010518886714,12.972094420947554
-133860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.972268120812476,12.972268120812476,75.2727864511388,217.2963987180954,142.0236122669566,55.01540622545552,54.98791793937306,12.95432098495392,12.972268120812476
-133920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.972441519081896,12.972441519081896,70.4710635797141,203.43289937825335,132.96183579853928,55.014423307981,54.98868877506886,12.955639494323005,12.972441519081896
-133980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97261487170561,12.97261487170561,66.13957314866137,190.9273373958475,124.78776424718616,55.01353666793602,54.989384106888345,12.95684578130418,12.97261487170561
-134040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97278863424762,12.97278863424762,62.23222433109869,179.64656074329852,117.41433641219984,55.01273686485101,54.990011338353355,12.957951303130466,12.97278863424762
-134100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.972963422114045,12.972963422114045,58.16217647138589,167.89621646597058,109.73403999458472,55.01190376968906,54.990664678542615,12.95909662852199,12.972963422114045
-134160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.973139525924015,12.973139525924015,54.24038018019064,156.5740700939906,102.33368991379992,55.011101033702296,54.99129421008409,12.96020789388685,12.973139525924015
-134220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.973317198380814,12.973317198380814,50.69337433498322,146.33412483809553,95.64075050311232,55.010375025457314,54.99186356924717,12.961231334406994,12.973317198380814
-134280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.973496716485903,12.973496716485903,46.94032767032822,135.49947336024834,88.5591456899201,55.00960685285224,54.99246599506609,12.96230573525795,12.973496716485903
-134340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.973678244979341,12.973678244979341,43.2783123143748,124.92777438038256,81.64946206600777,55.00885732356302,54.993053800193316,12.963360421363628,12.973678244979341
-134400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97386186052346,12.97386186052346,39.67535346293871,114.52670621102548,74.85135274808678,55.008119892013205,54.99363211788176,12.964403095258527,12.97386186052346
-134460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.974047508158607,12.974047508158607,36.43552738090104,105.17408381082213,68.73855642992108,55.00745679491639,54.994152140086314,12.965361200154268,12.974047508158607
-134520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.974235445278275,12.974235445278275,33.18201072949064,95.78204168122045,62.600030951729835,55.00679090304326,54.9946743540449,12.966324845937018,12.974235445278275
-134580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97442562506756,12.97442562506756,29.968580206227873,86.50582165391909,56.53724144769123,55.00613322297421,54.99519012804098,12.967281163914294,12.97442562506756
-134640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.974618172842044,12.974618172842044,26.676183451590642,77.00174494770962,50.32556149611897,55.00545938803046,54.995718571212635,12.968258664847708,12.974618172842044
-134700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.974812926678569,12.974812926678569,23.40930422954909,67.57143277712176,44.162128547572664,55.00479078302782,54.996242912895205,12.969232275079849,12.974812926678569
-134760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.975009771125764,12.975009771125764,20.449765439114703,59.02840814709229,38.57864270797759,55.00418508638107,54.996717919809036,12.97013468961746,12.975009771125764
-134820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.975208736647286,12.975208736647286,17.410301519602747,50.25474531519095,32.8444437955882,55.003563037645655,54.997205750560035,12.971058270521768,12.975208736647286
-134880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97540980699456,12.97540980699456,14.668838192054155,42.34136968871388,27.672531496659733,55.003001982934656,54.99764574782302,12.9719129016453,12.97540980699456
-134940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.975613034457645,12.975613034457645,12.196162578422403,35.20392727037103,23.00776469194863,55.002495941573585,54.99804260183649,12.972705603306242,12.975613034457645
-135000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.975818544528073,12.975818544528073,9.965924821614804,28.766335238913932,18.80041041729912,55.00203951931366,54.998400542944886,12.973442785611141,12.975818544528073
-135060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.976026492842893,12.976026492842893,7.954357640071505,22.95997093614437,15.005613296072859,55.00162785083087,54.9987233866928,12.974130272445292,12.976026492842893
-135120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.976237024218207,12.976237024218207,6.140023320554419,17.72294037634399,11.58291705578957,55.001256547862965,54.9990145744975,12.974773320970847,12.976237024218207
-135180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97645025366774,12.97645025366774,4.503585468936339,12.999418479208744,8.495833010272404,55.00092165243199,54.99927721033343,12.975376657175063,12.97645025366774
-135240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.976666259490983,12.976666259490983,3.0276031059140815,8.739053995465058,5.711450889550977,55.0006195946533,54.999514093819606,12.975944518136695,12.976666259490983
-135300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.976885081812545,12.976885081812545,1.6963449253077332,4.896432781046331,3.2000878557385968,55.00034715468185,54.99972775006279,12.976480694918157,12.976885081812545
-135360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977106723655615,12.977106723655615,0.4956217436499092,1.4305936980118987,0.9349719543619894,55.00010142838943,54.99992045657426,12.976988573640355,12.977106723655615
-135420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977331226138336,12.977331226138336,0.0,0.0,0.0,55.00009450257543,55.00009450257543,12.977331226138336,12.977331226138336
-135480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977558806284623,12.977558806284623,0.0,0.0,0.0,55.00025254195438,55.00025254195438,12.977558806284623,12.977558806284623
-135540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.977789730187853,12.977789730187853,0.0,0.0,0.0,55.00039737948058,55.00039737948058,12.977789730187853,12.977789730187853
-135600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978024113816636,12.978024113816636,0.0,0.0,0.0,55.00053148114922,55.00053148114922,12.978024113816636,12.978024113816636
-135660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978261862715287,12.978261862715287,0.0,0.0,0.0,55.00065685232826,55.00065685232826,12.978261862715287,12.978261862715287
-135720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.97850275100496,12.97850275100496,0.0,0.0,0.0,55.000775123799755,55.000775123799755,12.97850275100496,12.97850275100496
-135780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9787464902154,12.9787464902154,0.0,0.0,0.0,55.00088762172939,55.00088762172939,12.9787464902154,12.9787464902154
-135840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.978992763592212,12.978992763592212,0.0,0.0,0.0,55.000995424566185,55.000995424566185,12.978992763592212,12.978992763592212
-135900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979241243308197,12.979241243308197,0.0,0.0,0.0,55.00109940931396,55.00109940931396,12.979241243308197,12.979241243308197
-135960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979491600954859,12.979491600954859,0.0,0.0,0.0,55.001200289159534,55.001200289159534,12.979491600954859,12.979491600954859
-136020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979743514684115,12.979743514684115,0.0,0.0,0.0,55.001298644072506,55.001298644072506,12.979743514684115,12.979743514684115
-136080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.979996674211774,12.979996674211774,0.0,0.0,0.0,55.001394945688936,55.001394945688936,12.979996674211774,12.979996674211774
-136140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.980250784391036,12.980250784391036,0.0,0.0,0.0,55.001489577547225,55.001489577547225,12.980250784391036,12.980250784391036
-136200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.980505567673159,12.980505567673159,0.0,0.0,0.0,55.0015828515441,55.0015828515441,12.980505567673159,12.980505567673159
-136260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.980760765506286,12.980760765506286,0.0,0.0,0.0,55.0016750213165,55.0016750213165,12.980760765506286,12.980760765506286
-136320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.98101613886312,12.98101613886312,0.0,0.0,0.0,55.00176629312418,55.00176629312418,12.98101613886312,12.98101613886312
-136380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981271468198836,12.981271468198836,0.0,0.0,0.0,55.001856834699275,55.001856834699275,12.981271468198836,12.981271468198836
-136440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981526552955026,12.981526552955026,0.0,0.0,0.0,55.00194678244295,55.00194678244295,12.981526552955026,12.981526552955026
-136500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.981781210687279,12.981781210687279,0.0,0.0,0.0,55.00203624727782,55.00203624727782,12.981781210687279,12.981781210687279
-136560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.982035276121875,12.982035276121875,0.0,0.0,0.0,55.00212531940704,55.00212531940704,12.982035276121875,12.982035276121875
-136620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9822886002314,12.9822886002314,0.0,0.0,0.0,55.00221407218461,55.00221407218461,12.9822886002314,12.9822886002314
-136680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.98254104920155,12.98254104920155,0.0,0.0,0.0,55.002302565262596,55.002302565262596,12.98254104920155,12.98254104920155
-136740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.982792503416357,12.982792503416357,0.0,0.0,0.0,55.002390847150565,55.002390847150565,12.982792503416357,12.982792503416357
-136800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983042891986225,12.983042891986225,0.0,0.0,0.0,55.002478957296894,55.002478957296894,12.983042891986225,12.983042891986225
-136860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983292116411805,12.983292116411805,0.0,0.0,0.0,55.00256692778135,55.00256692778135,12.983292116411805,12.983292116411805
-136920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983540051793856,12.983540051793856,0.0,0.0,0.0,55.00265478469148,55.00265478469148,12.983540051793856,12.983540051793856
-136980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.983786624645404,12.983786624645404,0.0,0.0,0.0,55.00274254924186,55.00274254924186,12.983786624645404,12.983786624645404
-137040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984031776774767,12.984031776774767,0.0,0.0,0.0,55.00283023868439,55.00283023868439,12.984031776774767,12.984031776774767
-137100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984275456076805,12.984275456076805,0.0,0.0,0.0,55.00291786704844,55.00291786704844,12.984275456076805,12.984275456076805
-137160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984517616530823,12.984517616530823,0.0,0.0,0.0,55.003005445742815,55.003005445742815,12.984517616530823,12.984517616530823
-137220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984758219389025,12.984758219389025,0.0,0.0,0.0,55.003092984045274,55.003092984045274,12.984758219389025,12.984758219389025
-137280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.984997234021508,12.984997234021508,0.0,0.0,0.0,55.00318048950056,55.00318048950056,12.984997234021508,12.984997234021508
-137340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.985234637944595,12.985234637944595,0.0,0.0,0.0,55.003267968244096,55.003267968244096,12.985234637944595,12.985234637944595
-137400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.98547041586756,12.98547041586756,0.0,0.0,0.0,55.003355425265255,55.003355425265255,12.98547041586756,12.98547041586756
-137460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.985704558447447,12.985704558447447,0.0,0.0,0.0,55.003442864621505,55.003442864621505,12.985704558447447,12.985704558447447
-137520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.985937061305922,12.985937061305922,0.0,0.0,0.0,55.00353028961234,55.00353028961234,12.985937061305922,12.985937061305922
-137580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.986167924317385,12.986167924317385,0.0,0.0,0.0,55.00361770292096,55.00361770292096,12.986167924317385,12.986167924317385
-137640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.986397150967367,12.986397150967367,0.0,0.0,0.0,55.003705106729385,55.003705106729385,12.986397150967367,12.986397150967367
-137700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.986624747724454,12.986624747724454,0.0,0.0,0.0,55.003792502812026,55.003792502812026,12.986624747724454,12.986624747724454
-137760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.986850723586695,12.986850723586695,0.0,0.0,0.0,55.00387989261185,55.00387989261185,12.986850723586695,12.986850723586695
-137820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.987075089721507,12.987075089721507,0.0,0.0,0.0,55.003967277302294,55.003967277302294,12.987075089721507,12.987075089721507
-137880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.987297859079824,12.987297859079824,0.0,0.0,0.0,55.00405465783764,55.00405465783764,12.987297859079824,12.987297859079824
-137940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.987519046136706,12.987519046136706,0.0,0.0,0.0,55.00414203499387,55.00414203499387,12.987519046136706,12.987519046136706
-138000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.987738666675241,12.987738666675241,0.0,0.0,0.0,55.004229409402036,55.004229409402036,12.987738666675241,12.987738666675241
-138060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.98795673742768,12.98795673742768,0.0,0.0,0.0,55.004316781575326,55.004316781575326,12.98795673742768,12.98795673742768
-138120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.988173275774466,12.988173275774466,0.0,0.0,0.0,55.00440415193107,55.00440415193107,12.988173275774466,12.988173275774466
-138180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.988388299649706,12.988388299649706,0.0,0.0,0.0,55.00449152080859,55.00449152080859,12.988388299649706,12.988388299649706
-138240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.988601827435856,12.988601827435856,0.0,0.0,0.0,55.004578888483906,55.004578888483906,12.988601827435856,12.988601827435856
-138300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.988813877826693,12.988813877826693,0.0,0.0,0.0,55.004666255181434,55.004666255181434,12.988813877826693,12.988813877826693
-138360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.989024469798125,12.989024469798125,0.0,0.0,0.0,55.00475362108371,55.00475362108371,12.989024469798125,12.989024469798125
-138420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.989233622645164,12.989233622645164,0.0,0.0,0.0,55.00484098633908,55.00484098633908,12.989233622645164,12.989233622645164
-138480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.989441355864251,12.989441355864251,0.0,0.0,0.0,55.004928351068294,55.004928351068294,12.989441355864251,12.989441355864251
-138540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.989647688921346,12.989647688921346,0.0,0.0,0.0,55.00501571536949,55.00501571536949,12.989647688921346,12.989647688921346
-138600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.989852641154725,12.989852641154725,0.0,0.0,0.0,55.005103079322474,55.005103079322474,12.989852641154725,12.989852641154725
-138660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.990056231787426,12.990056231787426,0.0,0.0,0.0,55.00519044299215,55.00519044299215,12.990056231787426,12.990056231787426
-138720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.990258479956006,12.990258479956006,0.0,0.0,0.0,55.005277806431295,55.005277806431295,12.990258479956006,12.990258479956006
-138780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.990459404675619,12.990459404675619,0.0,0.0,0.0,55.005365169682854,55.005365169682854,12.990459404675619,12.990459404675619
-138840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.990659024737651,12.990659024737651,0.0,0.0,0.0,55.005452532781725,55.005452532781725,12.990659024737651,12.990659024737651
-138900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.990857358613356,12.990857358613356,0.0,0.0,0.0,55.00553989575629,55.00553989575629,12.990857358613356,12.990857358613356
-138960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.991054424357419,12.991054424357419,0.0,0.0,0.0,55.005627258629616,55.005627258629616,12.991054424357419,12.991054424357419
-139020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.991250239513672,12.991250239513672,0.0,0.0,0.0,55.005714621420495,55.005714621420495,12.991250239513672,12.991250239513672
-139080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.991444821063919,12.991444821063919,0.0,0.0,0.0,55.00580198414421,55.00580198414421,12.991444821063919,12.991444821063919
-139140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.991638185422325,12.991638185422325,0.0,0.0,0.0,55.00588934681311,55.00588934681311,12.991638185422325,12.991638185422325
-139200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99183034845804,12.99183034845804,0.0,0.0,0.0,55.00597670943736,55.00597670943736,12.99183034845804,12.99183034845804
-139260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.992021325519627,12.992021325519627,0.0,0.0,0.0,55.00606407202514,55.00606407202514,12.992021325519627,12.992021325519627
-139320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.992211131456456,12.992211131456456,0.0,0.0,0.0,55.00615143458312,55.00615143458312,12.992211131456456,12.992211131456456
-139380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.992399780653107,12.992399780653107,0.0,0.0,0.0,55.00623879711673,55.00623879711673,12.992399780653107,12.992399780653107
-139440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.992587286988366,12.992587286988366,0.0,0.0,0.0,55.0063261596304,55.0063261596304,12.992587286988366,12.992587286988366
-139500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.992773663655708,12.992773663655708,0.0,0.0,0.0,55.0064135221277,55.0064135221277,12.992773663655708,12.992773663655708
-139560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.992958923078994,12.992958923078994,0.0,0.0,0.0,55.00650088461157,55.00650088461157,12.992958923078994,12.992958923078994
-139620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.993143077075224,12.993143077075224,0.0,0.0,0.0,55.006588247084366,55.006588247084366,12.993143077075224,12.993143077075224
-139680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99332613707891,12.99332613707891,0.0,0.0,0.0,55.006675609548026,55.006675609548026,12.99332613707891,12.99332613707891
-139740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.993508114292052,12.993508114292052,0.0,0.0,0.0,55.00676297200414,55.00676297200414,12.993508114292052,12.993508114292052
-139800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.993689019767322,12.993689019767322,0.0,0.0,0.0,55.00685033445394,55.00685033445394,12.993689019767322,12.993689019767322
-139860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.993868864439035,12.993868864439035,0.0,0.0,0.0,55.0069376968985,55.0069376968985,12.993868864439035,12.993868864439035
-139920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9940476591399,12.9940476591399,0.0,0.0,0.0,55.007025059338645,55.007025059338645,12.9940476591399,12.9940476591399
-139980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994225414644804,12.994225414644804,0.0,0.0,0.0,55.00711242177509,55.00711242177509,12.994225414644804,12.994225414644804
-140040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994402141717096,12.994402141717096,0.0,0.0,0.0,55.00719978420835,55.00719978420835,12.994402141717096,12.994402141717096
-140100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994577851109483,12.994577851109483,0.0,0.0,0.0,55.00728714663893,55.00728714663893,12.994577851109483,12.994577851109483
-140160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994752553541412,12.994752553541412,0.0,0.0,0.0,55.007374509067155,55.007374509067155,12.994752553541412,12.994752553541412
-140220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.994926259689608,12.994926259689608,0.0,0.0,0.0,55.00746187149336,55.00746187149336,12.994926259689608,12.994926259689608
-140280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995098980178184,12.995098980178184,0.0,0.0,0.0,55.00754923391775,55.00754923391775,12.995098980178184,12.995098980178184
-140340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99527072557222,12.99527072557222,0.0,0.0,0.0,55.00763659634056,55.00763659634056,12.99527072557222,12.99527072557222
-140400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995441543806555,12.995441543806555,0.0,0.0,0.0,55.00772395876193,55.00772395876193,12.995441543806555,12.995441543806555
-140460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995611445788553,12.995611445788553,0.0,0.0,0.0,55.00781132118201,55.00781132118201,12.995611445788553,12.995611445788553
-140520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995780401571519,12.995780401571519,0.0,0.0,0.0,55.00789868360089,55.00789868360089,12.995780401571519,12.995780401571519
-140580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.995948417862401,12.995948417862401,0.0,0.0,0.0,55.00798604601865,55.00798604601865,12.995948417862401,12.995948417862401
-140640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996115507193716,12.996115507193716,0.0,0.0,0.0,55.00807340843538,55.00807340843538,12.996115507193716,12.996115507193716
-140700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996281680164769,12.996281680164769,0.0,0.0,0.0,55.00816077085114,55.00816077085114,12.996281680164769,12.996281680164769
-140760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996446945715284,12.996446945715284,0.0,0.0,0.0,55.008248133265965,55.008248133265965,12.996446945715284,12.996446945715284
-140820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996611312145589,12.996611312145589,0.0,0.0,0.0,55.00833549567989,55.00833549567989,12.996611312145589,12.996611312145589
-140880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996774787609887,12.996774787609887,0.0,0.0,0.0,55.008422858092935,55.008422858092935,12.996774787609887,12.996774787609887
-140940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.996937380272596,12.996937380272596,0.0,0.0,0.0,55.00851022050515,55.00851022050515,12.996937380272596,12.996937380272596
-141000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997099098331885,12.997099098331885,0.0,0.0,0.0,55.008597582916565,55.008597582916565,12.997099098331885,12.997099098331885
-141060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997259950042215,12.997259950042215,0.0,0.0,0.0,55.00868494532716,55.00868494532716,12.997259950042215,12.997259950042215
-141120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997419943724251,12.997419943724251,0.0,0.0,0.0,55.00877230773696,55.00877230773696,12.997419943724251,12.997419943724251
-141180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997579087756154,12.997579087756154,0.0,0.0,0.0,55.00885967014599,55.00885967014599,12.997579087756154,12.997579087756154
-141240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.997737390574567,12.997737390574567,0.0,0.0,0.0,55.008947032554254,55.008947032554254,12.997737390574567,12.997737390574567
-141300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.99789486068281,12.99789486068281,0.0,0.0,0.0,55.00903439496176,55.00903439496176,12.99789486068281,12.99789486068281
-141360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998051506647544,12.998051506647544,0.0,0.0,0.0,55.0091217573685,55.0091217573685,12.998051506647544,12.998051506647544
-141420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998207337084436,12.998207337084436,0.0,0.0,0.0,55.0092091197745,55.0092091197745,12.998207337084436,12.998207337084436
-141480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998362360636705,12.998362360636705,0.0,0.0,0.0,55.00929648217976,55.00929648217976,12.998362360636705,12.998362360636705
-141540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998516585937926,12.998516585937926,0.0,0.0,0.0,55.00938384458426,55.00938384458426,12.998516585937926,12.998516585937926
-141600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998670021567564,12.998670021567564,0.0,0.0,0.0,55.00947120698802,55.00947120698802,12.998670021567564,12.998670021567564
-141660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998822676040662,12.998822676040662,0.0,0.0,0.0,55.00955856939106,55.00955856939106,12.998822676040662,12.998822676040662
-141720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.998974557827404,12.998974557827404,0.0,0.0,0.0,55.009645931793344,55.009645931793344,12.998974557827404,12.998974557827404
-141780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999125675349381,12.999125675349381,0.0,0.0,0.0,55.00973329419489,55.00973329419489,12.999125675349381,12.999125675349381
-141840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999276036728725,12.999276036728725,0.0,0.0,0.0,55.00982065659571,55.00982065659571,12.999276036728725,12.999276036728725
-141900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999425647928872,12.999425647928872,0.0,0.0,0.0,55.00990801899579,55.00990801899579,12.999425647928872,12.999425647928872
-141960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999574509644072,12.999574509644072,0.0,0.0,0.0,55.00999538139514,55.00999538139514,12.999574509644072,12.999574509644072
-142020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.9997226180851,12.9997226180851,0.0,0.0,0.0,55.01008274379375,55.01008274379375,12.9997226180851,12.9997226180851
-142080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,12.999869970305618,12.999869970305618,0.0,0.0,0.0,55.010170106191644,55.010170106191644,12.999869970305618,12.999869970305618
-142140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000016567306911,13.000016567306911,0.0,0.0,0.0,55.01025746858881,55.01025746858881,13.000016567306911,13.000016567306911
-142200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000162412993332,13.000162412993332,0.0,0.0,0.0,55.01034483098522,55.01034483098522,13.000162412993332,13.000162412993332
-142260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000307512695684,13.000307512695684,0.0,0.0,0.0,55.01043219338093,55.01043219338093,13.000307512695684,13.000307512695684
-142320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00045187270965,13.00045187270965,0.0,0.0,0.0,55.01051955577589,55.01051955577589,13.00045187270965,13.00045187270965
-142380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000595500117429,13.000595500117429,0.0,0.0,0.0,55.01060691817012,55.01060691817012,13.000595500117429,13.000595500117429
-142440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000738402599199,13.000738402599199,0.0,0.0,0.0,55.01069428056362,55.01069428056362,13.000738402599199,13.000738402599199
-142500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.000880588272805,13.000880588272805,0.0,0.0,0.0,55.0107816429564,55.0107816429564,13.000880588272805,13.000880588272805
-142560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001022065546945,13.001022065546945,0.0,0.0,0.0,55.01086900534843,55.01086900534843,13.001022065546945,13.001022065546945
-142620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001162842991764,13.001162842991764,0.0,0.0,0.0,55.01095636773975,55.01095636773975,13.001162842991764,13.001162842991764
-142680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001302929275436,13.001302929275436,0.0,0.0,0.0,55.01104373013033,55.01104373013033,13.001302929275436,13.001302929275436
-142740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001442333126962,13.001442333126962,0.0,0.0,0.0,55.01113109252017,55.01113109252017,13.001442333126962,13.001442333126962
-142800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001581063257008,13.001581063257008,0.0,0.0,0.0,55.0112184549093,55.0112184549093,13.001581063257008,13.001581063257008
-142860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00171912827907,13.00171912827907,0.0,0.0,0.0,55.011305817297675,55.011305817297675,13.00171912827907,13.00171912827907
-142920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00185653667524,13.00185653667524,0.0,0.0,0.0,55.01139317968534,55.01139317968534,13.00185653667524,13.00185653667524
-142980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.001993296789095,13.001993296789095,0.0,0.0,0.0,55.01148054207228,55.01148054207228,13.001993296789095,13.001993296789095
-143040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002129416818152,13.002129416818152,0.0,0.0,0.0,55.011567904458474,55.011567904458474,13.002129416818152,13.002129416818152
-143100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002264904796945,13.002264904796945,0.0,0.0,0.0,55.01165526684394,55.01165526684394,13.002264904796945,13.002264904796945
-143160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002399768579064,13.002399768579064,0.0,0.0,0.0,55.01174262922868,55.01174262922868,13.002399768579064,13.002399768579064
-143220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002534015822967,13.002534015822967,0.0,0.0,0.0,55.01182999161269,55.01182999161269,13.002534015822967,13.002534015822967
-143280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00266765399534,13.00266765399534,0.0,0.0,0.0,55.01191735399598,55.01191735399598,13.00266765399534,13.00266765399534
-143340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002800690374169,13.002800690374169,0.0,0.0,0.0,55.01200471637853,55.01200471637853,13.002800690374169,13.002800690374169
-143400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.002933132025984,13.002933132025984,0.0,0.0,0.0,55.01209207876035,55.01209207876035,13.002933132025984,13.002933132025984
-143460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00306498579566,13.00306498579566,0.0,0.0,0.0,55.012179441141434,55.012179441141434,13.00306498579566,13.00306498579566
-143520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003196258333643,13.003196258333643,0.0,0.0,0.0,55.0122668035218,55.0122668035218,13.003196258333643,13.003196258333643
-143580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003326956110506,13.003326956110506,0.0,0.0,0.0,55.01235416590142,55.01235416590142,13.003326956110506,13.003326956110506
-143640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003457085395956,13.003457085395956,0.0,0.0,0.0,55.01244152828033,55.01244152828033,13.003457085395956,13.003457085395956
-143700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003586652249119,13.003586652249119,0.0,0.0,0.0,55.0125288906585,55.0125288906585,13.003586652249119,13.003586652249119
-143760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003715662538392,13.003715662538392,0.0,0.0,0.0,55.01261625303594,55.01261625303594,13.003715662538392,13.003715662538392
-143820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003844121959697,13.003844121959697,0.0,0.0,0.0,55.012703615412654,55.012703615412654,13.003844121959697,13.003844121959697
-143880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.003972036045804,13.003972036045804,0.0,0.0,0.0,55.01279097778864,55.01279097778864,13.003972036045804,13.003972036045804
-143940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004099410179089,13.004099410179089,0.0,0.0,0.0,55.0128783401639,55.0128783401639,13.004099410179089,13.004099410179089
-144000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004226301438921,13.004226301438921,0.0,0.0,0.0,55.01296570253842,55.01296570253842,13.004226301438921,13.004226301438921
-144060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004352715076175,13.004352715076175,0.0,0.0,0.0,55.013053064912214,55.013053064912214,13.004352715076175,13.004352715076175
-144120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004478599788506,13.004478599788506,0.0,0.0,0.0,55.01314042728527,55.01314042728527,13.004478599788506,13.004478599788506
-144180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004603955959336,13.004603955959336,0.0,0.0,0.0,55.01322778965761,55.01322778965761,13.004603955959336,13.004603955959336
-144240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004728793039465,13.004728793039465,0.0,0.0,0.0,55.01331515202921,55.01331515202921,13.004728793039465,13.004728793039465
-144300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004853118938003,13.004853118938003,0.0,0.0,0.0,55.013402514400084,55.013402514400084,13.004853118938003,13.004853118938003
-144360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.004976940038723,13.004976940038723,0.0,0.0,0.0,55.01348987677022,55.01348987677022,13.004976940038723,13.004976940038723
-144420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005100262118676,13.005100262118676,0.0,0.0,0.0,55.01357723913964,55.01357723913964,13.005100262118676,13.005100262118676
-144480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005223090732565,13.005223090732565,0.0,0.0,0.0,55.01366460150833,55.01366460150833,13.005223090732565,13.005223090732565
-144540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005345431302244,13.005345431302244,0.0,0.0,0.0,55.01375196387629,55.01375196387629,13.005345431302244,13.005345431302244
-144600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005467289079386,13.005467289079386,0.0,0.0,0.0,55.0138393262435,55.0138393262435,13.005467289079386,13.005467289079386
-144660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00558866911085,13.00558866911085,0.0,0.0,0.0,55.01392668860999,55.01392668860999,13.00558866911085,13.00558866911085
-144720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005709576248243,13.005709576248243,0.0,0.0,0.0,55.01401405097576,55.01401405097576,13.005709576248243,13.005709576248243
-144780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005830015163152,13.005830015163152,0.0,0.0,0.0,55.014101413340796,55.014101413340796,13.005830015163152,13.005830015163152
-144840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.005949990346515,13.005949990346515,0.0,0.0,0.0,55.0141887757051,55.0141887757051,13.005949990346515,13.005949990346515
-144900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006069506117635,13.006069506117635,0.0,0.0,0.0,55.014276138068674,55.014276138068674,13.006069506117635,13.006069506117635
-144960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006188566627946,13.006188566627946,0.0,0.0,0.0,55.01436350043153,55.01436350043153,13.006188566627946,13.006188566627946
-145020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006307175850365,13.006307175850365,0.0,0.0,0.0,55.01445086279364,55.01445086279364,13.006307175850365,13.006307175850365
-145080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006425337588869,13.006425337588869,0.0,0.0,0.0,55.01453822515502,55.01453822515502,13.006425337588869,13.006425337588869
-145140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006543055503139,13.006543055503139,0.0,0.0,0.0,55.01462558751568,55.01462558751568,13.006543055503139,13.006543055503139
-145200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006660333120234,13.006660333120234,0.0,0.0,0.0,55.014712949875616,55.014712949875616,13.006660333120234,13.006660333120234
-145260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006777173847619,13.006777173847619,0.0,0.0,0.0,55.01480031223481,55.01480031223481,13.006777173847619,13.006777173847619
-145320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.006893580996115,13.006893580996115,0.0,0.0,0.0,55.014887674593275,55.014887674593275,13.006893580996115,13.006893580996115
-145380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007009557792133,13.007009557792133,0.0,0.0,0.0,55.01497503695101,55.01497503695101,13.007009557792133,13.007009557792133
-145440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007125107430275,13.007125107430275,0.0,0.0,0.0,55.01506239930802,55.01506239930802,13.007125107430275,13.007125107430275
-145500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00724023351038,13.00724023351038,0.0,0.0,0.0,55.01514976166428,55.01514976166428,13.00724023351038,13.00724023351038
-145560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007354940925868,13.007354940925868,0.0,0.0,0.0,55.01523712401984,55.01523712401984,13.007354940925868,13.007354940925868
-145620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007469236373318,13.007469236373318,0.0,0.0,0.0,55.015324486374645,55.015324486374645,13.007469236373318,13.007469236373318
-145680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007583127805528,13.007583127805528,0.0,0.0,0.0,55.01541184872874,55.01541184872874,13.007583127805528,13.007583127805528
-145740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007696623493251,13.007696623493251,0.0,0.0,0.0,55.01549921108211,55.01549921108211,13.007696623493251,13.007696623493251
-145800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007809731470596,13.007809731470596,0.0,0.0,0.0,55.015586573434724,55.015586573434724,13.007809731470596,13.007809731470596
-145860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.007922459298381,13.007922459298381,0.0,0.0,0.0,55.015673935786616,55.015673935786616,13.007922459298381,13.007922459298381
-145920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008034813952136,13.008034813952136,0.0,0.0,0.0,55.01576129813779,55.01576129813779,13.008034813952136,13.008034813952136
-145980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008146801759267,13.008146801759267,0.0,0.0,0.0,55.015848660488224,55.015848660488224,13.008146801759267,13.008146801759267
-146040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008258428376406,13.008258428376406,0.0,0.0,0.0,55.015936022837934,55.015936022837934,13.008258428376406,13.008258428376406
-146100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008369698799706,13.008369698799706,0.0,0.0,0.0,55.01602338518691,55.01602338518691,13.008369698799706,13.008369698799706
-146160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0084806173917,13.0084806173917,0.0,0.0,0.0,55.01611074753517,55.01611074753517,13.0084806173917,13.0084806173917
-146220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008591187913884,13.008591187913884,0.0,0.0,0.0,55.01619810988269,55.01619810988269,13.008591187913884,13.008591187913884
-146280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008701413569508,13.008701413569508,0.0,0.0,0.0,55.016285472229484,55.016285472229484,13.008701413569508,13.008701413569508
-146340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00881129705178,13.00881129705178,0.0,0.0,0.0,55.01637283457554,55.01637283457554,13.00881129705178,13.00881129705178
-146400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00892084057464,13.00892084057464,0.0,0.0,0.0,55.016460196920875,55.016460196920875,13.00892084057464,13.00892084057464
-146460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009030045888407,13.009030045888407,0.0,0.0,0.0,55.01654755926547,55.01654755926547,13.009030045888407,13.009030045888407
-146520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009138914321477,13.009138914321477,0.0,0.0,0.0,55.016634921609345,55.016634921609345,13.009138914321477,13.009138914321477
-146580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009247446862831,13.009247446862831,0.0,0.0,0.0,55.016722283952475,55.016722283952475,13.009247446862831,13.009247446862831
-146640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009355644251013,13.009355644251013,0.0,0.0,0.0,55.01680964629489,55.01680964629489,13.009355644251013,13.009355644251013
-146700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009463507040724,13.009463507040724,0.0,0.0,0.0,55.01689700863657,55.01689700863657,13.009463507040724,13.009463507040724
-146760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009571035650554,13.009571035650554,0.0,0.0,0.0,55.01698437097753,55.01698437097753,13.009571035650554,13.009571035650554
-146820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009678230402265,13.009678230402265,0.0,0.0,0.0,55.017071733317735,55.017071733317735,13.009678230402265,13.009678230402265
-146880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009785091555734,13.009785091555734,0.0,0.0,0.0,55.01715909565724,55.01715909565724,13.009785091555734,13.009785091555734
-146940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009891619338232,13.009891619338232,0.0,0.0,0.0,55.017246457995995,55.017246457995995,13.009891619338232,13.009891619338232
-147000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009997813965903,13.009997813965903,0.0,0.0,0.0,55.01733382033403,55.01733382033403,13.009997813965903,13.009997813965903
-147060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010103675662744,13.010103675662744,0.0,0.0,0.0,55.01742118267133,55.01742118267133,13.010103675662744,13.010103675662744
-147120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010209204676098,13.010209204676098,0.0,0.0,0.0,55.0175085450079,55.0175085450079,13.010209204676098,13.010209204676098
-147180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010314401284456,13.010314401284456,0.0,0.0,0.0,55.01759590734375,55.01759590734375,13.010314401284456,13.010314401284456
-147240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010419265804543,13.010419265804543,0.0,0.0,0.0,55.01768326967886,55.01768326967886,13.010419265804543,13.010419265804543
-147300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010523798599337,13.010523798599337,0.0,0.0,0.0,55.017770632013246,55.017770632013246,13.010523798599337,13.010523798599337
-147360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010628000083944,13.010628000083944,0.0,0.0,0.0,55.0178579943469,55.0178579943469,13.010628000083944,13.010628000083944
-147420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01073187073233,13.01073187073233,0.0,0.0,0.0,55.017945356679824,55.017945356679824,13.01073187073233,13.01073187073233
-147480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010835411083765,13.010835411083765,0.0,0.0,0.0,55.01803271901201,55.01803271901201,13.010835411083765,13.010835411083765
-147540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010938621744804,13.010938621744804,0.0,0.0,0.0,55.018120081343476,55.018120081343476,13.010938621744804,13.010938621744804
-147600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011041548017495,13.011041548017495,0.0,0.0,0.0,55.0182074436742,55.0182074436742,13.011041548017495,13.011041548017495
-147660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011144187636486,13.011144187636486,0.0,0.0,0.0,55.01829480600421,55.01829480600421,13.011144187636486,13.011144187636486
-147720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011246490160074,13.011246490160074,0.0,0.0,0.0,55.018382168333474,55.018382168333474,13.011246490160074,13.011246490160074
-147780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011348453423555,13.011348453423555,0.0,0.0,0.0,55.018469530662024,55.018469530662024,13.011348453423555,13.011348453423555
-147840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011450083158364,13.011450083158364,0.0,0.0,0.0,55.01855689298984,55.01855689298984,13.011450083158364,13.011450083158364
-147900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011551383261011,13.011551383261011,0.0,0.0,0.0,55.01864425531693,55.01864425531693,13.011551383261011,13.011551383261011
-147960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011652356041017,13.011652356041017,0.0,0.0,0.0,55.01873161764328,55.01873161764328,13.011652356041017,13.011652356041017
-148020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011753003235652,13.011753003235652,0.0,0.0,0.0,55.0188189799689,55.0188189799689,13.011753003235652,13.011753003235652
-148080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011853326454332,13.011853326454332,0.0,0.0,0.0,55.018906342293796,55.018906342293796,13.011853326454332,13.011853326454332
-148140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011953327305006,13.011953327305006,0.0,0.0,0.0,55.018993704617955,55.018993704617955,13.011953327305006,13.011953327305006
-148200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012053007388205,13.012053007388205,0.0,0.0,0.0,55.019081066941396,55.019081066941396,13.012053007388205,13.012053007388205
-148260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012152368293071,13.012152368293071,0.0,0.0,0.0,55.0191684292641,55.0191684292641,13.012152368293071,13.012152368293071
-148320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012251411603707,13.012251411603707,0.0,0.0,0.0,55.019255791586076,55.019255791586076,13.012251411603707,13.012251411603707
-148380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012350138904596,13.012350138904596,0.0,0.0,0.0,55.01934315390732,55.01934315390732,13.012350138904596,13.012350138904596
-148440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01244855178345,13.01244855178345,0.0,0.0,0.0,55.01943051622785,55.01943051622785,13.01244855178345,13.01244855178345
-148500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012546651832375,13.012546651832375,0.0,0.0,0.0,55.01951787854762,55.01951787854762,13.012546651832375,13.012546651832375
-148560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012644440647454,13.012644440647454,0.0,0.0,0.0,55.01960524086668,55.01960524086668,13.012644440647454,13.012644440647454
-148620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012741919828223,13.012741919828223,0.0,0.0,0.0,55.01969260318499,55.01969260318499,13.012741919828223,13.012741919828223
-148680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012839090977051,13.012839090977051,0.0,0.0,0.0,55.01977996550261,55.01977996550261,13.012839090977051,13.012839090977051
-148740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012935955696596,13.012935955696596,0.0,0.0,0.0,55.01986732781947,55.01986732781947,13.012935955696596,13.012935955696596
-148800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013032515588383,13.013032515588383,0.0,0.0,0.0,55.01995469013561,55.01995469013561,13.013032515588383,13.013032515588383
-148860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013128772254387,13.013128772254387,0.0,0.0,0.0,55.02004205245101,55.02004205245101,13.013128772254387,13.013128772254387
-148920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01322472729612,13.01322472729612,0.0,0.0,0.0,55.02012941476569,55.02012941476569,13.01322472729612,13.01322472729612
-148980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01332038231383,13.01332038231383,0.0,0.0,0.0,55.02021677707964,55.02021677707964,13.01332038231383,13.01332038231383
-149040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013415738908794,13.013415738908794,0.0,0.0,0.0,55.02030413939286,55.02030413939286,13.013415738908794,13.013415738908794
-149100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013510798670561,13.013510798670561,0.0,0.0,0.0,55.02039150170534,55.02039150170534,13.013510798670561,13.013510798670561
-149160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013605563131744,13.013605563131744,0.0,0.0,0.0,55.02047886401711,55.02047886401711,13.013605563131744,13.013605563131744
-149220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013700033831801,13.013700033831801,0.0,0.0,0.0,55.020566226328135,55.020566226328135,13.013700033831801,13.013700033831801
-149280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013794212367992,13.013794212367992,0.0,0.0,0.0,55.02065358863842,55.02065358863842,13.013794212367992,13.013794212367992
-149340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013888100334633,13.013888100334633,0.0,0.0,0.0,55.02074095094799,55.02074095094799,13.013888100334633,13.013888100334633
-149400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013981699304903,13.013981699304903,0.0,0.0,0.0,55.02082831325683,55.02082831325683,13.013981699304903,13.013981699304903
-149460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01407501083745,13.01407501083745,0.0,0.0,0.0,55.020915675564936,55.020915675564936,13.01407501083745,13.01407501083745
-149520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014168036479113,13.014168036479113,0.0,0.0,0.0,55.021003037872326,55.021003037872326,13.014168036479113,13.014168036479113
-149580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014260777762905,13.014260777762905,0.0,0.0,0.0,55.021090400178956,55.021090400178956,13.014260777762905,13.014260777762905
-149640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014353236207805,13.014353236207805,0.0,0.0,0.0,55.02117776248488,55.02117776248488,13.014353236207805,13.014353236207805
-149700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01444541331898,13.01444541331898,0.0,0.0,0.0,55.02126512479007,55.02126512479007,13.01444541331898,13.01444541331898
-149760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0145373105895,13.0145373105895,0.0,0.0,0.0,55.02135248709454,55.02135248709454,13.0145373105895,13.0145373105895
-149820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0146289295009,13.0146289295009,0.0,0.0,0.0,55.02143984939826,55.02143984939826,13.0146289295009,13.0146289295009
-149880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01472027152214,13.01472027152214,0.0,0.0,0.0,55.02152721170126,55.02152721170126,13.01472027152214,13.01472027152214
-149940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014811338110235,13.014811338110235,0.0,0.0,0.0,55.021614574003536,55.021614574003536,13.014811338110235,13.014811338110235
-150000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014902130709492,13.014902130709492,0.0,0.0,0.0,55.02170193630508,55.02170193630508,13.014902130709492,13.014902130709492
-150060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014992650750393,13.014992650750393,0.0,0.0,0.0,55.02178929860588,55.02178929860588,13.014992650750393,13.014992650750393
-150120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015082899650464,13.015082899650464,0.0,0.0,0.0,55.02187666090596,55.02187666090596,13.015082899650464,13.015082899650464
-150180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015172878817776,13.015172878817776,0.0,0.0,0.0,55.02196402320532,55.02196402320532,13.015172878817776,13.015172878817776
-150240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015262589655006,13.015262589655006,0.0,0.0,0.0,55.02205138550394,55.02205138550394,13.015262589655006,13.015262589655006
-150300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015352033557336,13.015352033557336,0.0,0.0,0.0,55.02213874780182,55.02213874780182,13.015352033557336,13.015352033557336
-150360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015441211908106,13.015441211908106,0.0,0.0,0.0,55.02222611009897,55.02222611009897,13.015441211908106,13.015441211908106
-150420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015530126079746,13.015530126079746,0.0,0.0,0.0,55.02231347239542,55.02231347239542,13.015530126079746,13.015530126079746
-150480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015618777437426,13.015618777437426,0.0,0.0,0.0,55.02240083469111,55.02240083469111,13.015618777437426,13.015618777437426
-150540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015707167339029,13.015707167339029,0.0,0.0,0.0,55.022488196986096,55.022488196986096,13.015707167339029,13.015707167339029
-150600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01579529713284,13.01579529713284,0.0,0.0,0.0,55.02257555928033,55.02257555928033,13.01579529713284,13.01579529713284
-150660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015883168159313,13.015883168159313,0.0,0.0,0.0,55.02266292157384,55.02266292157384,13.015883168159313,13.015883168159313
-150720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01597078175358,13.01597078175358,0.0,0.0,0.0,55.022750283866614,55.022750283866614,13.01597078175358,13.01597078175358
-150780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016058139244194,13.016058139244194,0.0,0.0,0.0,55.02283764615868,55.02283764615868,13.016058139244194,13.016058139244194
-150840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016145241950815,13.016145241950815,0.0,0.0,0.0,55.02292500845,55.02292500845,13.016145241950815,13.016145241950815
-150900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0162320911849,13.0162320911849,0.0,0.0,0.0,55.023012370740595,55.023012370740595,13.0162320911849,13.0162320911849
-150960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016318688249926,13.016318688249926,0.0,0.0,0.0,55.023099733030456,55.023099733030456,13.016318688249926,13.016318688249926
-151020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016405034439776,13.016405034439776,0.0,0.0,0.0,55.02318709531959,55.02318709531959,13.016405034439776,13.016405034439776
-151080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016491131040327,13.016491131040327,0.0,0.0,0.0,55.023274457607975,55.023274457607975,13.016491131040327,13.016491131040327
-151140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016576979330466,13.016576979330466,0.0,0.0,0.0,55.02336181989566,55.02336181989566,13.016576979330466,13.016576979330466
-151200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016662625379855,13.016662625379855,0.0,0.0,0.0,55.023449182182596,55.023449182182596,13.016662625379855,13.016662625379855
-151260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016748065195591,13.016748065195591,0.0,0.0,0.0,55.023536544468826,55.023536544468826,13.016748065195591,13.016748065195591
-151320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016833246588831,13.016833246588831,0.0,0.0,0.0,55.023623906754295,55.023623906754295,13.016833246588831,13.016833246588831
-151380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016918168405125,13.016918168405125,0.0,0.0,0.0,55.02371126903906,55.02371126903906,13.016918168405125,13.016918168405125
-151440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017002837465565,13.017002837465565,0.0,0.0,0.0,55.02379863132308,55.02379863132308,13.017002837465565,13.017002837465565
-151500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017087258404276,13.017087258404276,0.0,0.0,0.0,55.023885993606385,55.023885993606385,13.017087258404276,13.017087258404276
-151560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01717143402912,13.01717143402912,0.0,0.0,0.0,55.02397335588894,55.02397335588894,13.01717143402912,13.01717143402912
-151620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01725536643658,13.01725536643658,0.0,0.0,0.0,55.02406071817077,55.02406071817077,13.01725536643658,13.01725536643658
-151680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017339057492244,13.017339057492244,0.0,0.0,0.0,55.02414808045188,55.02414808045188,13.017339057492244,13.017339057492244
-151740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017422508969224,13.017422508969224,0.0,0.0,0.0,55.024235442732255,55.024235442732255,13.017422508969224,13.017422508969224
-151800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017505722554137,13.017505722554137,0.0,0.0,0.0,55.0243228050119,55.0243228050119,13.017505722554137,13.017505722554137
-151860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017588699851096,13.017588699851096,0.0,0.0,0.0,55.024410167290824,55.024410167290824,13.017588699851096,13.017588699851096
-151920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017671442394386,13.017671442394386,0.0,0.0,0.0,55.024497529569004,55.024497529569004,13.017671442394386,13.017671442394386
-151980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017753951659492,13.017753951659492,0.0,0.0,0.0,55.02458489184646,55.02458489184646,13.017753951659492,13.017753951659492
-152040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017836229072014,13.017836229072014,0.0,0.0,0.0,55.02467225412319,55.02467225412319,13.017836229072014,13.017836229072014
-152100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017918276016912,13.017918276016912,0.0,0.0,0.0,55.02475961639918,55.02475961639918,13.017918276016912,13.017918276016912
-152160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01800009384259,13.01800009384259,0.0,0.0,0.0,55.02484697867445,55.02484697867445,13.01800009384259,13.01800009384259
-152220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018081683859744,13.018081683859744,0.0,0.0,0.0,55.024934340948974,55.024934340948974,13.018081683859744,13.018081683859744
-152280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018163047344286,13.018163047344286,0.0,0.0,0.0,55.02474307567005,55.02474307567005,13.018163047344286,13.018163047344286
-152340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018244185545006,13.018244185545006,0.0,0.0,0.0,55.023513133403156,55.023513133403156,13.018244185545006,13.018244185545006
-152400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018325099687187,13.018325099687187,0.0,0.0,0.0,55.02202384623464,55.02202384623464,13.018325099687187,13.018325099687187
-152460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018405790973823,13.018405790973823,0.0,0.0,0.0,55.02079890461871,55.02079890461871,13.018405790973823,13.018405790973823
-152520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018486260587975,13.018486260587975,0.0,0.0,0.0,55.019352113739394,55.019352113739394,13.018486260587975,13.018486260587975
-152580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018566509693274,13.018566509693274,0.0,0.0,0.0,55.01789187041335,55.01789187041335,13.018566509693274,13.018566509693274
-152640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018646539435654,13.018646539435654,0.0,0.0,0.0,55.01614488124844,55.01614488124844,13.018646539435654,13.018646539435654
-152700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018726350932374,13.018726350932374,0.0,0.0,0.0,55.014192002566006,55.014192002566006,13.018726350932374,13.018726350932374
-152760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018805945238805,13.018805945238805,0.0,0.0,0.0,55.01224179993024,55.01224179993024,13.018805945238805,13.018805945238805
-152820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018885323418743,13.018885323418743,0.0,0.0,0.0,55.01035410968886,55.01035410968886,13.018885323418743,13.018885323418743
-152880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01896448658749,13.01896448658749,0.0,0.0,0.0,55.00839816906055,55.00839816906055,13.01896448658749,13.01896448658749
-152940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019043435849786,13.019043435849786,0.0,0.0,0.0,55.00641017966276,55.00641017966276,13.019043435849786,13.019043435849786
-153000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019122172284675,13.019122172284675,0.0,0.0,0.0,55.00449890196018,55.00449890196018,13.019122172284675,13.019122172284675
-153060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019200696954481,13.019200696954481,0.0,0.0,0.0,55.002503939185935,55.002503939185935,13.019200696954481,13.019200696954481
-153120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01927901091092,13.01927901091092,0.0,0.0,0.0,55.000577205363406,55.000577205363406,13.01927901091092,13.01927901091092
-153180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019358252746057,13.019358252746057,8.316719346194777,24.02429397028975,15.707574624094976,55.00170331082869,54.99866420852024,13.017373302669268,13.019358252746057
-153240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019441987117373,13.019441987117373,20.803195552497886,60.09572665251754,39.29253110001965,55.004260758785406,54.99665857506041,13.014476630188492,13.019441987117373
-153300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019535056550545,13.019535056550545,32.95040568181952,95.1894771298436,62.23907144802409,55.006748890465744,54.99470730166796,13.011669968599913,13.019535056550545
-153360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01964069128071,13.01964069128071,44.81816001022776,129.47818747518977,84.66002746496198,55.00917994604687,54.99280078919976,13.008942289672522,13.01964069128071
-153420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019760118964296,13.019760118964296,57.04962876351974,164.8201663136684,107.77053755014866,55.01168567886232,54.990835712427476,13.006141265223913,13.019760118964296
-153480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019893429785904,13.019893429785904,68.33216135430571,197.42249653915118,129.09033518484551,55.013997172471434,54.98902296432738,13.003580414175989,13.019893429785904
-153540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020039645693993,13.020039645693993,79.47892605594386,229.6346249053592,150.15569884941533,55.01628100169466,54.987231911534074,13.001064620504243,13.020039645693993
-153600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020197826570477,13.020197826570477,90.6206698104121,261.8343603453516,171.2136905349395,55.01856395304536,54.985441547196785,12.998561723093257,13.020197826570477
-153660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020366490758894,13.020366490758894,101.32169127871572,292.7624442153679,191.4407529366522,55.020756745426425,54.98372188844152,12.996174312390687,13.020366490758894
-153720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020544313208985,13.020544313208985,111.7330652934155,322.8553219942358,211.12225670082032,55.02289032262455,54.98204866814921,12.993865001340778,13.020544313208985
-153780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020729644483188,13.020729644483188,121.22677906384706,350.2975590873577,229.07078002351062,55.024835970683505,54.9805228279702,12.991782193843772,13.020729644483188
-153840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02092073963727,13.02092073963727,131.00810036033084,378.57277401421095,247.56467365388008,55.0268406772659,54.97895067218566,12.989636232017505,13.02092073963727
-153900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021116165662816,13.021116165662816,140.49305194189614,405.99291258476876,265.4998606428725,55.02878475969652,54.97742605982307,12.987565203985158,13.021116165662816
-153960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021314441050484,13.021314441050484,149.0766761078646,430.8089053628022,281.7322292549375,55.03054420919139,54.976046242584346,12.985712208562305,13.021314441050484
-154020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021514065883606,13.021514065883606,157.69918285732388,455.73862282818175,298.03943997085787,55.03231172221396,54.97466010166623,12.983851104611569,13.021514065883606
-154080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02171377536161,13.02171377536161,166.11132247963891,480.06142493808153,313.9501024584426,55.0340362054855,54.97330770607155,12.982040196495246,13.02171377536161
-154140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021912441788185,13.021912441788185,173.86741755947085,502.4885833141451,328.62116575467417,55.035626288276355,54.97206071168368,12.98038489210147,13.021912441788185
-154200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022108781866724,13.022108781866724,181.68806269479768,525.1034449100016,343.41538221520386,55.037229679586595,54.97080328032421,12.978711698426288,13.022108781866724
-154260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022302034406419,13.022302034406419,189.10166066662327,546.5423299598862,357.440669293263,55.03874969463935,54.96961123532432,12.977132585940435,13.022302034406419
-154320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022491239038255,13.022491239038255,195.92688297310497,566.2807159090303,370.3538329359253,55.04014914476276,54.968513741244145,12.975689963427651,13.022491239038255
-154380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022675607218993,13.022675607218993,202.60822613990052,585.6038154851776,382.9955893452771,55.041519151397154,54.967439337700995,12.974276801839936,13.022675607218993
-154440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022854464257293,13.022854464257293,209.4012032020339,605.2505082332932,395.8493050312594,55.04291210105721,54.966346941494564,12.972831343916948,13.022854464257293
-154500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023027356149214,13.023027356149214,215.83928526240413,623.8715743286116,408.0322890662075,55.04423233410088,54.965311572012176,12.971464680528516,13.023027356149214
-154560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023193868624181,13.023193868624181,221.9825200563676,641.6405588587651,419.65803880239736,55.04549215483017,54.96432357982198,12.970162054871228,13.023193868624181
-154620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023353789461567,13.023353789461567,227.99820981033542,659.0412502169738,431.0430404066385,55.04672586380996,54.96335606531087,12.968883260668168,13.023353789461567
-154680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023506812858663,13.023506812858663,233.49937882992612,674.954315228068,441.45493639814185,55.04785410028477,54.96247126575178,12.96772053950676,13.023506812858663
-154740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023652558600615,13.023652558600615,238.75388303325528,690.1543678883817,451.40048485512636,55.048931784354785,54.96162611102468,12.966609472625521,13.023652558600615
-154800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023790864416814,13.023790864416814,244.20444503819562,705.9219385978865,461.71749355969115,55.05004970565111,54.96074940096241,12.965444024728136,13.023790864416814
-154860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023921685395598,13.023921685395598,249.56664342162895,721.4343400130487,471.8676965914198,55.051149535618755,54.95988687870562,12.96429217110711,13.023921685395598
-154920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024045110979367,13.024045110979367,254.690921605894,736.258915170602,481.5679935647081,55.05220059884292,54.95906260090742,12.963189776366992,13.024045110979367
-154980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024161196658358,13.024161196658358,259.3371697909987,749.7010043534409,490.36383456244215,55.05315364387586,54.95831519214715,12.962194337096223,13.024161196658358
-155040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024269705011983,13.024269705011983,263.5808350901255,761.9787486835971,498.3979135934716,55.054024136898974,54.95763252334479,12.961287583776148,13.024269705011983
-155100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024370569159233,13.024370569159233,268.3131527775142,775.6703638782898,507.35721110077554,55.05499487360985,54.9568712401981,12.960256267249978,13.024370569159233
-155160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024464079672976,13.024464079672976,273.0120616998663,789.2656152686914,516.2535535688252,55.05595877825843,54.956115314975754,12.959225552737653,13.024464079672976
-155220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02455046941093,13.02455046941093,277.2772976948017,801.6064830218638,524.3291853270622,55.05683374710554,54.95542913608735,12.958291430048735,13.02455046941093
-155280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024629920176306,13.024629920176306,281.381958393483,813.4829940839377,532.1010356904548,55.05767579312189,54.9547687763484,12.957388757071428,13.024629920176306
-155340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024702572540534,13.024702572540534,285.53742286723235,825.5066852342983,539.969262367066,55.05852827433195,54.95410023299279,12.956467106786775,13.024702572540534
-155400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024768585510321,13.024768585510321,289.7090929023692,837.5774612971602,547.868368394791,55.059384093977854,54.95342907152775,12.955534915000058,13.024768585510321
-155460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02482833152474,13.02482833152474,293.5084951133486,848.5713267707887,555.0628316574404,55.06016356061377,54.95281778856431,12.954685501468624,13.02482833152474
-155520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024881814951641,13.024881814951641,297.3645559927215,859.7292797550646,562.364723762343,55.060954661170854,54.95219738190336,12.953816249752073,13.024881814951641
-155580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024929471167955,13.024929471167955,301.04370466058094,870.3754971588958,569.3317924983147,55.061709479685256,54.951605428794544,12.952983482269767,13.024929471167955
-155640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024971379880691,13.024971379880691,304.6200319645557,880.7243314252986,576.1042994607427,55.06244321376962,54.951030010778176,12.952169553990874,13.024971379880691
-155700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025007773548207,13.025007773548207,308.2715367540482,891.2908244721041,583.0192877180557,55.063192379981324,54.9504424903881,12.951332105518533,13.025007773548207
-155760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025038908489211,13.025038908489211,311.5827107373646,900.8726484455724,589.2899377082078,55.06387173305568,54.94990971971982,12.950570822911578,13.025038908489211
-155820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025064925078828,13.025064925078828,315.20749278615455,911.3620615221248,596.1545687359702,55.064615434443,54.949326485021885,12.949729361152905,13.025064925078828
-155880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025086320220208,13.025086320220208,318.7000802974104,921.4690691734419,602.7689888760317,55.06533202329125,54.9487645128546,12.948914896978849,13.025086320220208
-155940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025103228162687,13.025103228162687,322.2690690404154,931.7972896482843,609.528220607869,55.066064296252115,54.948190240698544,12.948077645972376,13.025103228162687
-156000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025116124923846,13.025116124923846,325.474587430402,941.0738046118847,615.5992171814828,55.066722003143994,54.947674445667154,12.94732335557961,13.025116124923846
-156060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025124997330934,13.025124997330934,328.394606842146,949.5242007972693,621.1295939551231,55.06732113809455,54.94720458464785,12.946633358599621,13.025124997330934
-156120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025130071198886,13.025130071198886,332.26320822770657,960.719839787863,628.4566315601564,55.068114911447495,54.946582081893865,12.945712520603141,13.025130071198886
-156180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025131782680118,13.025131782680118,335.737021398092,970.7731196233459,635.0360982252539,55.06882769135684,54.94602309681975,12.944882790223053,13.025131782680118
-156240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025130523619607,13.025130523619607,338.89576321177935,979.9146894788173,641.0189262670377,55.069475830879895,54.94551480482863,12.944125486104348,13.025130523619607
-156300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025126366294321,13.025126366294321,342.74641174591443,991.0588352575445,648.3124235116303,55.07026595360753,54.94489516501318,12.943199655594174,13.025126366294321
-156360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025119814858682,13.025119814858682,346.20928643088723,1001.0808693543432,654.8715829234561,55.070976518415776,54.94433791709303,12.942364228703813,13.025119814858682
-156420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025110946652374,13.025110946652374,349.5725125259565,1010.8146358003644,661.2421232744078,55.071666645045525,54.94379669745392,12.941550320737742,13.025110946652374
-156480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025100039008732,13.025100039008732,352.9865381696203,1020.6955649368864,667.7090267672662,55.07236720562226,54.94324729517591,12.940722196056395,13.025100039008732
-156540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025087173630235,13.025087173630235,356.4113217091583,1030.607770454476,674.1964487453175,55.073069983776904,54.942696153801506,12.939889520788936,13.025087173630235
-156600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025072489279788,13.025072489279788,359.7071240281854,1040.14679434182,680.4396703136347,55.07374630331913,54.94216576212733,12.93908588600598,13.025072489279788
-156660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025056084065854,13.025056084065854,363.088297675587,1049.9330510941704,686.8447534185832,55.07444015181401,54.94162162368114,12.938260076099391,13.025056084065854
-156720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025038154511039,13.025038154511039,366.11503247078684,1058.693525544595,692.5784930738084,55.07506127210189,54.941134521048724,12.937517579018298,13.025038154511039
-156780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.025018481964011,13.025018481964011,369.40814705756827,1068.2251503865632,698.817003328995,55.075737067251474,54.94060454062022,12.936709551550631,13.025018481964011
-156840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024997369703168,13.024997369703168,372.55899001800384,1077.3450886898825,704.7860986718787,55.07638367376225,54.94009745086696,12.935934130155644,13.024997369703168
-156900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024974741325131,13.024974741325131,375.8293271833532,1086.8110363408896,710.9817091575363,55.077054812511555,54.93957112213824,12.935128568159538,13.024974741325131
-156960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02495093909234,13.02495093909234,379.0667790847875,1096.1819249965934,717.1151459118056,55.0777192116139,54.93905007885881,12.934329689192507,13.02495093909234
-157020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02492581801023,13.02492581801023,381.9306098429061,1104.471405716197,722.5407958732909,55.0783069385914,54.93858916434118,12.93361893385424,13.02492581801023
-157080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024899541881645,13.024899541881645,385.1905602235338,1113.9076613309812,728.7171011074473,55.078975972358634,54.93806448640754,12.93281216382314,13.024899541881645
-157140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024871966997775,13.024871966997775,388.1418678963005,1122.4505774743773,734.3087095780768,55.07958166810812,54.93758948019736,12.932077982729465,13.024871966997775
-157200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024843422640885,13.024843422640885,391.0149938245575,1130.7672735336726,739.7522797091151,55.080171324827184,54.937127052313954,12.931361539682289,13.024843422640885
-157260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024813640520476,13.024813640520476,393.9246931916496,1139.1899398288735,745.265246637224,55.08076849492696,54.93665873219421,12.93063508930056,13.024813640520476
-157320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024782708251195,13.024782708251195,397.1472183793006,1148.5183214466804,751.3711030673794,55.08142988063453,54.9361400521165,12.929832565859053,13.024782708251195
-157380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024750808635886,13.024750808635886,400.0467251612197,1156.9116922421706,756.8649670809506,55.08202497378496,54.93567336080765,12.929106412084534,13.024750808635886
-157440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024717998872893,13.024717998872893,403.3593086551119,1166.501041239431,763.1417325843194,55.08270486230533,54.935140170225274,12.928280413590812,13.024717998872893
-157500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024684437469444,13.024684437469444,406.53484429109926,1175.6937645269209,769.1589202358217,55.0833566299759,54.93462903292346,12.927486466129166,13.024684437469444
-157560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024650244242046,13.024650244242046,409.03365297346687,1182.9273983231612,773.8937453496943,55.08386949748139,54.93422682562664,12.926853937958851,13.024650244242046
-157620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024615066768556,13.024615066768556,411.88350909542885,1191.1774423448835,779.2939332494548,55.084454428923166,54.933768103458604,12.926136344243197,13.024615066768556
-157680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024578972274096,13.024578972274096,414.8328793868043,1199.7156967690687,784.8828173822644,55.08505979465253,54.93329335606089,12.925393988161497,13.024578972274096
-157740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024541965742646,13.024541965742646,417.79199717603996,1208.282275902315,790.4902787262748,55.085667168670575,54.932817033698164,12.924648372496932,13.024541965742646
-157800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024504182942096,13.024504182942096,420.67094036355536,1216.6168313724766,795.9458910089211,55.08625809216768,54.93235361236643,12.923921169638946,13.024504182942096
-157860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024465637375016,13.024465637375016,423.2677196121818,1224.1345238602605,800.8668042480788,55.086791099779816,54.93193561054612,12.923260773519493,13.024465637375016
-157920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024426240361985,13.024426240361985,426.28695675445465,1232.8754697388165,806.5885129843616,55.087410836634035,54.93144959284717,12.922498330140975,13.024426240361985
-157980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02438603777233,13.02438603777233,429.20302768926064,1241.3178148645666,812.1147871753058,55.08800940262004,54.93098017802827,12.921759778124276,13.02438603777233
-158040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02434516886182,13.02434516886182,431.84857335186484,1248.9769653030874,817.1283919512223,55.088552439804424,54.9305543106928,12.921085345422693,13.02434516886182
-158100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024303546723614,13.024303546723614,434.8186870776722,1257.5759859036498,822.7572988259775,55.08916211425546,54.930076184256095,12.920332404326045,13.024303546723614
-158160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024261295181073,13.024261295181073,437.7765626153943,1266.139678799256,828.3631161838617,55.08976928401165,54.92960002208215,12.919581751663555,13.024261295181073
-158220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024218470792475,13.024218470792475,440.4391183253413,1273.8483527796413,833.4092344543,55.09031583258167,54.92917140100442,12.918901254886963,13.024218470792475
-158280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024175037597608,13.024175037597608,443.0611906864943,1281.4398851636365,838.3786944771422,55.09085407580182,54.92874929325086,12.918229836575644,13.024175037597608
-158340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024130841393461,13.024130841393461,446.0875088150193,1290.202058377695,844.1145495626756,55.09147531806198,54.928262094963856,12.917460806604376,13.024130841393461
-158400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024086246533065,13.024086246533065,448.736773959818,1297.8725097557544,849.1357357959364,55.09201915677075,54.927835599047,12.916781690098901,13.024086246533065
-158460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.024040961299253,13.024040961299253,451.42284841315865,1305.6496316120586,854.2267831988997,55.09257055851328,54.92740317195432,12.916093054961454,13.024040961299253
-158520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023995122614588,13.023995122614588,454.48856808944356,1314.5262144718317,860.0376463823883,55.0931999126343,54.92690961208347,12.915312903905127,13.023995122614588
-158580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02394883096318,13.02394883096318,456.58758847231104,1320.6035128135009,864.0159243411897,55.093630796130846,54.92657169929987,12.91476388213336,13.02394883096318
-158640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023901723552632,13.023901723552632,459.09573708665647,1327.8656289758555,868.7698918891988,55.09414568384089,54.92616790769324,12.914116021416886,13.023901723552632
-158700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023853850647829,13.023853850647829,462.1948094682285,1336.8390715820144,874.644262113786,55.09478190551654,54.925668962063796,12.913325810928376,13.023853850647829
-158760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023805456327677,13.023805456327677,464.41093395233185,1343.2556616496965,878.8447276973648,55.095236845075185,54.92531218373772,12.912746608941825,13.023805456327677
-158820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023756360890285,13.023756360890285,467.2848588877922,1351.5772758508604,884.2924169630679,55.09582685187766,54.92484948130756,12.91200909530046,13.023756360890285
-158880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0237068546716,13.0237068546716,470.05305609102913,1359.592802410688,889.5397463196588,55.096395156955516,54.92440379807223,12.911296490217946,13.0237068546716
-158940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023656738816712,13.023656738816712,472.57855148261496,1366.9055383330406,894.3269868504256,55.09691363384727,54.92399719171314,12.910641416561921,13.023656738816712
-159000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023606284001069,13.023606284001069,475.20563797614403,1374.5125687404868,899.3069307643428,55.097452976418346,54.92357422181301,12.90996165221525,13.023606284001069
-159060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023555343064555,13.023555343064555,477.8634527863025,1382.2086730896806,904.345220303378,55.097998634424464,54.9231462991443,12.90927402869622,13.023555343064555
-159120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023503970794973,13.023503970794973,480.4463032904744,1389.6877518047586,909.2414485142843,55.09852890523727,54.92273044361061,12.908603926042412,13.023503970794973
-159180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023452180787046,13.023452180787046,482.7943282815123,1396.4868054138597,913.6924771323472,55.099010961930965,54.92235239914958,12.907989665163727,13.023452180787046
-159240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023399854250462,13.023399854250462,485.4798381527865,1404.2633561015625,918.783517948776,55.09956232375554,54.92192000336185,12.907293990012908,13.023399854250462
-159300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023347013995744,13.023347013995744,487.9008895894426,1411.2740441942417,923.3731546047987,55.10005938552978,54.921530191430996,12.90666116318177,13.023347013995744
-159360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023293837868007,13.023293837868007,490.6349892029449,1419.1914874711765,928.5564982682316,55.10062073680702,54.92108996159118,12.905952974276936,13.023293837868007
-159420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02324027460644,13.02324027460644,493.3947972068248,1427.183481643551,933.7886844367263,55.101187373833504,54.920645586495716,12.905238226087251,13.02324027460644
-159480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0231864234446,13.0231864234446,495.5167408165953,1433.3280641015526,937.8113232849576,55.101623028329676,54.920303932139795,12.904676039447965,13.0231864234446
-159540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023132138361609,13.023132138361609,498.0790138252218,1440.7480726625702,942.6690588373483,55.10214911132176,54.91989136083067,12.904007888490865,13.023132138361609
-159600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023077481487146,13.023077481487146,500.94950703312804,1449.0609070671258,948.1114000339979,55.10273849624307,54.91942914609985,12.903265489680404,13.023077481487146
-159660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.023022570802093,13.023022570802093,503.1706209888693,1455.492916661171,952.3222956723016,55.10319452959837,54.91907150998303,12.902678453763848,13.023022570802093
-159720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022967227364829,13.022967227364829,505.1811210797628,1461.3149295517364,956.1338084719736,55.1036073138468,54.91874779121558,12.902141454778247,13.022967227364829
-159780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02291137995576,13.02291137995576,507.57030560940603,1468.2338610662146,960.6635554568086,55.10409787032483,54.91836308094858,12.901513189244726,13.02291137995576
-159840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022854944050287,13.022854944050287,510.3531811410006,1476.293215270505,965.9400341295044,55.10466928351489,54.917914960231066,12.90078997144248,13.022854944050287
-159900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022798193902247,13.022798193902247,512.4810802586603,1482.4554369693203,969.9743567106599,55.105106188871794,54.91757232490968,12.900223409574876,13.022798193902247
-159960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02274105392936,13.02274105392936,515.2623179083854,1490.510207896496,975.2478899881108,55.10567727719102,54.91712445896638,12.899499859977666,13.02274105392936
-160020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022683735865648,13.022683735865648,517.7200650815928,1497.628019747048,979.9079546654553,55.10618193456378,54.91672869032135,12.898853655788756,13.022683735865648
-160080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022626120003304,13.022626120003304,519.9300534914818,1504.0282101377356,984.0981566462536,55.1066357121527,54.91637282324954,12.89826652995329,13.022626120003304
-160140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022568358294851,13.022568358294851,522.5150727300805,1511.5148362612772,988.9997635311968,55.10716651876858,54.915956547521745,12.897589358704453,13.022568358294851
-160200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022510282211895,13.022510282211895,524.7658617449656,1518.033341268378,993.2674795234126,55.10762868500793,54.915594101798746,12.896991977326527,13.022510282211895
-160260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022451913318903,13.022451913318903,526.8760199201242,1524.1445186847347,997.2684987646106,55.10806197148563,54.915254304519564,12.896428005391554,13.022451913318903
-160320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022393096644983,13.022393096644983,529.1692924226685,1530.7861970466556,1001.616904623987,55.108532870859435,54.91488500998991,12.895819686780387,13.022393096644983
-160380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022333965687125,13.022333965687125,531.7804295879099,1538.3487559136945,1006.5683263257843,55.10906906130854,54.91446451208585,12.895134851357431,13.022333965687125
-160440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022274582458827,13.022274582458827,534.147457475818,1545.204227596822,1011.0567701210038,55.1095551188437,54.91408333003544,12.894508269786055,13.022274582458827
-160500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022215021502507,13.022215021502507,536.3763320292534,1551.659540378924,1015.2832083496708,55.11001280487709,54.913724397834976,12.89391461991402,13.022215021502507
-160560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022155122323447,13.022155122323447,538.3956425948959,1557.5078005410955,1019.1121579461997,55.110427450497106,54.91339921931971,12.893370862120536,13.022155122323447
-160620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.022094922608444,13.022094922608444,540.8387359519689,1564.5838123734072,1023.745076421438,55.1109291445794,54.913005774582956,12.892725207017484,13.022094922608444
-160680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02203438713645,13.02203438713645,543.494233311494,1572.2752397981533,1028.7810064866596,55.111474472091246,54.91257811109857,12.892028287990264,13.02203438713645
-160740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02197382931266,13.02197382931266,545.5180650235221,1578.1367602119244,1032.6186951884024,55.11189005796326,54.912252195207245,12.89148276727842,13.02197382931266
-160800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021912930261614,13.021912930261614,547.6713581345971,1584.373387187208,1036.702029052611,55.11233223917968,54.91190542238606,12.890905863419285,13.021912930261614
-160860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02185189303616,13.02185189303616,550.2135446510184,1591.7367536537563,1041.523209002738,55.11285430705218,54.911495999863654,12.890235580490069,13.02185189303616
-160920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021790641149185,13.021790641149185,552.5113082197513,1598.3920566293286,1045.880748409578,55.11332617275927,54.911125947504146,12.889623672749007,13.021790641149185
-160980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021729265260868,13.021729265260868,554.4667124752654,1604.0555317572864,1049.5888192820207,55.113727717193925,54.910811043362436,12.889093713758239,13.021729265260868
-161040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021667549653401,13.021667549653401,556.6039435718899,1610.2458411909656,1053.641897619076,55.1141666145851,54.9104668458233,12.88851981680986,13.021667549653401
-161100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021605542981167,13.021605542981167,559.2873239008873,1618.0185481221731,1058.731224221286,55.11471770513789,54.91003466277568,12.887814679112394,13.021605542981167
-161160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021543466727335,13.021543466727335,561.3374768891226,1623.9566839823956,1062.6192070932727,55.11513872330328,54.90970448670407,12.887261284527593,13.021543466727335
-161220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021481213920893,13.021481213920893,563.568073389893,1630.4176735705234,1066.8496001806304,55.1155968122097,54.90934523855754,12.88666444336082,13.021481213920893
-161280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021418822619786,13.021418822619786,566.0643357791165,1637.6484565050546,1071.584120725938,55.116109480066996,54.90894318783129,12.886003757616987,13.021418822619786
-161340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021356368260491,13.021356368260491,567.8133093577827,1642.7141141698928,1074.9008048121104,55.116468638965,54.90866152379922,12.885522179478926,13.021356368260491
-161400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02129357768835,13.02129357768835,570.0129316890118,1649.0855224814036,1079.0725907923916,55.116920376583025,54.90830725653863,12.884932206747875,13.02129357768835
-161460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021230601483044,13.021230601483044,572.6352845508842,1656.6818347898015,1084.046550238917,55.1174589608512,54.907884881324165,12.88424067851826,13.021230601483044
-161520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0211674863521,13.0211674863521,574.750936329908,1662.8100620162757,1088.0591256863677,55.11789345681225,54.907544135528994,12.883670500562985,13.0211674863521
-161580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021104346365588,13.021104346365588,576.5140891141249,1667.9169674325485,1091.4028783184233,55.118255540303494,54.90726017793626,12.883184816266194,13.021104346365588
-161640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.021040873294046,13.021040873294046,578.5102017970373,1673.6989129314636,1095.1887111344265,55.1186654846755,54.90693868629183,12.88264293366701,13.021040873294046
-161700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020977030266195,13.020977030266195,580.8624327646286,1680.5127785338989,1099.6503457692704,55.119148593006905,54.90655981710246,12.882015280722099,13.020977030266195
-161760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020912972679275,13.020912972679275,583.2305853890027,1687.3728423634686,1104.1422569744657,55.11963497686367,54.90617837914012,12.881383587226505,13.020912972679275
-161820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020848831441658,13.020848831441658,585.1594941914152,1692.960199535607,1107.8007053441918,55.12003112485554,54.90586770706349,12.880857133992135,13.020848831441658
-161880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020784550028708,13.020784550028708,587.1100480005123,1698.610317207434,1111.5002692069218,55.12043172263986,54.90555354531563,12.880325344880312,13.020784550028708
-161940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020720004986234,13.020720004986234,589.2580216304,1704.8325363375677,1115.574514707168,55.120872882895135,54.90520757316523,12.879745944014546,13.020720004986234
-162000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.02065528956931,13.02065528956931,591.4065459581003,1711.056402854534,1119.6498568964337,55.12131415998064,54.904861509392774,12.879166234212768,13.02065528956931
-162060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020590370834059,13.020590370834059,593.5349595995102,1717.2220439733571,1123.6870843738468,55.1217513088679,54.904518683087,12.878591137638741,13.020590370834059
-162120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020525329433742,13.020525329433742,595.6596391653787,1723.3769163104196,1127.717277145041,55.122187694268526,54.90417645553216,12.878016807392536,13.020525329433742
-162180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020460244205939,13.020460244205939,597.7236773477038,1729.3561147475407,1131.6324373998368,55.122611624275635,54.90384399590002,12.877456969885205,13.020460244205939
-162240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020394934507651,13.020394934507651,599.7910353751532,1735.3449784842585,1135.5539431091051,55.12303623958734,54.90351099882985,12.876896106066265,13.020394934507651
-162300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020329634909267,13.020329634909267,601.7863984251308,1741.1252619017237,1139.3388634765925,55.12344606641034,54.90318959937114,12.876352512519569,13.020329634909267
-162360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020263988972347,13.020263988972347,603.6504486479862,1746.525050821037,1142.8746021730508,55.12382891588492,54.90288935642221,12.875840061506652,13.020263988972347
-162420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020198204956145,13.020198204956145,605.9287626713486,1753.125383699292,1147.1966210279436,55.12429688494325,54.902522359940775,12.875228110996812,13.020198204956145
-162480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020132336799753,13.020132336799753,607.8648962648974,1758.7341526478594,1150.8692563829625,55.12469455132492,54.90221049709375,12.87469813831518,13.020132336799753
-162540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.020066231602984,13.020066231602984,609.5809478136345,1763.7051646013192,1154.1242167876849,55.12504700022522,54.901934095259065,12.874220709785915,13.020066231602984
-162600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019999890838823,13.019999890838823,611.7236794097809,1769.9127252673406,1158.1890458575604,55.125487121488426,54.901588937919854,12.873640703424256,13.019999890838823
-162660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019933387166569,13.019933387166569,613.6497093428333,1775.4923268893963,1161.8426175465634,55.12588271995296,54.90127869680037,12.873112504362393,13.019933387166569
-162720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01986668500451,13.01986668500451,615.7501220097683,1781.577338807661,1165.8272167978926,55.12631415246087,54.9009403534643,12.872542275217455,13.01986668500451
-162780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019799913882785,13.019799913882785,618.0716708072707,1788.303276128849,1170.2316053215782,55.126791027156116,54.900566372894176,12.871918928789,13.019799913882785
-162840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019733172309207,13.019733172309207,619.8118867973388,1793.3445051303806,1173.5326183330415,55.12714845461632,54.900286066711686,12.871435044374255,13.019733172309207
-162900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019666400706788,13.019666400706788,621.4997876710341,1798.2341510560789,1176.7343633850446,55.127495134724725,54.90001418895032,12.870963674339123,13.019666400706788
-162960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01959936791379,13.01959936791379,623.5012179497071,1804.0324824762838,1180.5312645265767,55.12790624144089,54.89969178575799,12.870416833870928,13.01959936791379
-163020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019532074905904,13.019532074905904,625.6987113451305,1810.399083848484,1184.7003725033533,55.12835763901765,54.899337785168726,12.869822697819504,13.019532074905904
-163080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019464831086395,13.019464831086395,627.7836711718155,1816.4395975285468,1188.6559263567312,55.12878591672158,54.89900191593203,12.869255597590788,13.019464831086395
-163140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019397584124805,13.019397584124805,629.5183605501047,1821.4649897252268,1191.946629175122,55.12914222144531,54.898722490235826,12.868772510782964,13.019397584124805
-163200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019330220360812,13.019330220360812,631.47971599918,1827.1473541709445,1195.6676381717646,55.12954510610189,54.89840653504874,12.868234929844341,13.019330220360812
-163260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01926277657541,13.01926277657541,633.4792403743457,1832.940387007652,1199.4611466333065,55.12995583727014,54.89808442637322,12.867688107223257,13.01926277657541
-163320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019195213039074,13.019195213039074,635.0413726297437,1837.46575579823,1202.4243831684864,55.13027668995034,54.89783280331696,12.867246085480902,13.019195213039074
-163380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019127443973002,13.019127443973002,637.0069257224707,1843.1604006263776,1206.153474903907,55.13068044536559,54.89751616525271,12.866707077903405,13.019127443973002
-163440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.019059526877507,13.019059526877507,639.248376101592,1849.6547429771435,1210.4063668755514,55.131140900080794,54.89715506176236,12.866101730228925,13.019059526877507
-163500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018991640488567,13.018991640488567,641.030655889507,1854.8182813221229,1213.7876254326154,55.13150699961745,54.896867954656855,12.865606560688608,13.018991640488567
-163560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018923644277233,13.018923644277233,642.6408176819517,1859.4829799586826,1216.8421622767305,55.1318377309851,54.896608584414174,12.865152568829613,13.018923644277233
-163620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01885553095109,13.01885553095109,644.5323309160108,1864.9631881407404,1220.4308572247294,55.132226282740724,54.89630386955187,12.864630958874631,13.01885553095109
-163680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018787241431214,13.018787241431214,646.5805653511688,1870.8976863852347,1224.317121034066,55.13264704410146,54.89597389487479,12.86407156928612,13.018787241431214
-163740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018718849111693,13.018718849111693,648.4275364274614,1876.2488671083677,1227.8213306809062,55.13302644773844,54.89567635426322,12.86356035670513,13.018718849111693
-163800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018650459814104,13.018650459814104,650.0931904796345,1881.0745338546365,1230.9813433750014,55.133368591969436,54.89540803368372,12.863092642969976,13.018650459814104
-163860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018581948931466,13.018581948931466,651.792809671248,1885.9986774230692,1234.2058677518214,55.133717718316234,54.89513423750304,12.86261665539757,13.018581948931466
-163920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018513227526775,13.018513227526775,653.5611960421186,1891.122173587884,1237.5609775457656,55.134080978966416,54.894849356744174,12.862123955387462,13.018513227526775
-163980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018444203169413,13.018444203169413,655.7022041123882,1897.3257787671482,1241.6235746547595,55.13452082037828,54.894504418873474,12.861541548032859,13.018444203169413
-164040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018375378826535,13.018375378826535,657.6154983821738,1902.8693865528066,1245.253888170633,55.134913867381904,54.894196178692205,12.861013967922435,13.018375378826535
-164100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018306486368356,13.018306486368356,659.3574008618921,1907.916228486497,1248.5588276246049,55.13527169323977,54.89391556007339,12.860527436891598,13.018306486368356
-164160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01823769455507,13.01823769455507,661.1503763461492,1913.1111526136938,1251.9607762675448,55.135640018285024,54.893626707652,12.860028747569928,13.01823769455507
-164220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018168784163803,13.018168784163803,662.776502257881,1917.822461902272,1255.0459596443907,55.13597405459736,54.893364745564725,12.859569968980393,13.018168784163803
-164280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018099759349342,13.018099759349342,664.9784575718794,1924.202970225615,1259.2245126537357,55.13642643873652,54.893009971281316,12.858972908040311,13.018099759349342
-164340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.018030842906954,13.018030842906954,666.5549801099503,1928.770562097387,1262.215581987437,55.13675028538517,54.8927560002581,12.85852601652394,13.018030842906954
-164400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017961809316402,13.017961809316402,668.2013409301708,1933.5406226342402,1265.3392817040692,55.13708848727335,54.89249077139145,12.8580622475211,13.017961809316402
-164460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01789272957978,13.01789272957978,670.2844666574678,1939.576806522653,1269.2923398651849,55.13751645855168,54.892155142463615,12.857493627258899,13.01789272957978
-164520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01782361240606,13.01782361240606,671.7868342896269,1943.9295227164585,1272.1426884268312,55.1378250703586,54.891913119096365,12.857064317799649,13.01782361240606
-164580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017754417421186,13.017754417421186,673.4895283739199,1948.8629758299498,1275.3734474560304,55.13817485699458,54.89163880509554,12.85658685848902,13.017754417421186
-164640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017684974946803,13.017684974946803,675.4059344934348,1954.41597672078,1279.010042227345,55.138568570193996,54.891330042461966,12.856057866695107,13.017684974946803
-164700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017615556205937,13.017615556205937,677.3702506279883,1960.1079076633575,1282.7376570353697,55.13897213369423,54.89101355490371,12.855517396549061,13.017615556205937
-164760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017546189012014,13.017546189012014,678.9409968529121,1964.658956729516,1285.717959876604,55.13929480756527,54.890760503610636,12.855071414963165,13.017546189012014
-164820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017476736640523,13.017476736640523,680.7580089450255,1969.9239403930549,1289.1659314480291,55.13966810012345,54.89046775550486,12.854566249433274,13.017476736640523
-164880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01740728963176,13.01740728963176,682.7205906888519,1975.6109642781905,1292.8903735893387,55.14007131577497,54.890151540740796,12.854026152000714,13.01740728963176
-164940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017337837378735,13.017337837378735,683.7657682580788,1978.638486640538,1294.8727183824597,55.1402859701325,54.889983201846285,12.853706196268512,13.017337837378735
-165000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01726802783752,13.01726802783752,685.4570980687449,1983.5392023200188,1298.0821042512744,55.140633435780686,54.88971070803921,12.853230823446937,13.01726802783752
-165060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017198016370287,13.017198016370287,687.49085752053,1989.4326572624561,1301.9417997419266,55.1410512876605,54.88938301507122,12.852673069816786,13.017198016370287
-165120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.017127896238149,13.017127896238149,689.2740812333406,1994.5998392909376,1305.3257580575976,55.14141764608219,54.88909570493969,12.852175325926332,13.017127896238149
-165180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01705777594563,13.01705777594563,690.8204294283937,1999.0803363187854,1308.2599068903914,55.14173531786047,54.88884657644967,12.851734423817707,13.01705777594563
-165240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016987550468675,13.016987550468675,692.2324977075565,2003.1715647457709,1310.9390670382145,55.14202539011382,54.88861909240037,12.85132563918095,13.016987550468675
-165300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016917147256164,13.016917147256164,694.0749488025006,2008.5105380194732,1314.4355892169729,55.14240392876385,54.88832223013956,12.850813387702386,13.016917147256164
-165360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016846609800417,13.016846609800417,695.6936271308579,2013.2007959332489,1317.507168802391,55.142736472851,54.888061438303566,12.850354701525367,13.016846609800417
-165420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01677598667886,13.01677598667886,697.3941305348384,2018.1283038105425,1320.7341732757045,55.14308583822129,54.887787454672925,12.849876288833368,13.01677598667886
-165480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016705238534744,13.016705238534744,698.9160977116862,2022.5382296338025,1323.6221319221165,55.14339850650778,54.887542250083115,12.84944059598175,13.016705238534744
-165540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016634385083165,13.016634385083165,700.8796292239526,2028.2283633161687,1327.348734092216,55.143801942872756,54.88722586222842,12.848898819404276,13.016634385083165
-165600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016563612602663,13.016563612602663,702.381798746934,2032.5809483061826,1330.199149559248,55.14411054566811,54.88698384592831,12.848467846538437,13.016563612602663
-165660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016492720790195,13.016492720790195,703.6247442146381,2036.1819978498693,1332.5572536352317,55.14436586383078,54.88678361716176,12.848098967194892,13.016492720790195
-165720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016421654363633,13.016421654363633,705.5308138222481,2041.7056300280808,1336.1748162058325,55.14475749512332,54.886476487226936,12.847570756914976,13.016421654363633
-165780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016350461839654,13.016350461839654,707.1291014505092,2046.3369487271045,1339.207847276595,55.14508586047562,54.88621897249007,12.84711628714416,13.016350461839654
-165840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016279256998935,13.016279256998935,708.4546185093965,2050.1774476003457,1341.7228290909488,55.145358155885276,54.88600542961696,12.846727270367674,13.016279256998935
-165900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016207823328141,13.016207823328141,710.3204237147687,2055.584429790753,1345.264006075984,55.14574151662864,54.88570478571447,12.846208345672279,13.016207823328141
-165960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016136473514788,13.016136473514788,711.8533199172678,2060.026232684805,1348.1729127675376,55.14605644515778,54.8854578085692,12.845769404122555,13.016136473514788
-166020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.016064901956053,13.016064901956053,713.2683759801773,2064.126389812102,1350.8580138319248,55.1463471506535,54.88522982791075,12.845358522913944,13.016064901956053
-166080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015993453911095,13.015993453911095,714.9404136277432,2068.9716626405616,1354.031249012818,55.14669068566023,54.8849604166399,12.844886080279364,13.015993453911095
-166140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015921787535884,13.015921787535884,716.466842766646,2073.3947785949013,1356.9279358282547,55.14700428931021,54.884714478507775,12.844448366440249,13.015921787535884
-166200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015850118190595,13.015850118190595,717.9768782184766,2077.770386688584,1359.7935084701069,55.14731452461657,54.88447118193971,12.844014581508455,13.015850118190595
-166260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015778369335873,13.015778369335873,719.7759684349949,2082.9841176631417,1363.208149228147,55.14768418375287,54.88418128328095,12.84351133198315,13.015778369335873
-166320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015706682844579,13.015706682844579,721.2194109251233,2087.1666940191767,1365.947283094053,55.147980732931956,54.88394871981685,12.84309350785895,13.015706682844579
-166380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015634957740163,13.015634957740163,722.4717270163022,2090.795120482897,1368.323393466595,55.14823799229613,54.883746968697224,12.84272151999492,13.015634957740163
-166440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015563125989775,13.015563125989775,724.5722160418633,2096.8828483091493,1372.3106322672868,55.14866961881147,54.88340847321425,12.84214582907882,13.015563125989775
-166500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01549141523416,13.01549141523416,726.1195782198894,2101.3668162830913,1375.2472380632018,55.14898753702914,54.88315915145847,12.84170302643911,13.01549141523416
-166560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015419855177491,13.015419855177491,727.0664794630702,2104.109744370928,1377.0432649078577,55.14918201362832,54.88300663661514,12.84140450813433,13.015419855177491
-166620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01534805031311,13.01534805031311,728.9186746134767,2109.4776339504656,1380.5589593369891,55.1495626028825,54.882708166204175,12.840888432666214,13.01534805031311
-166680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015276263760494,13.015276263760494,730.5557189955963,2114.221712069076,1383.6659930734802,55.149898963238535,54.88244438152663,12.840424017498927,13.015276263760494
-166740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015204495070885,13.015204495070885,731.5323639207447,2117.0509154482374,1385.518551527493,55.15009955687767,54.88228706950258,12.840118146774564,13.015204495070885
-166800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015132472953038,13.015132472953038,733.1220303400021,2121.6576503524443,1388.5356200124427,55.15042617947481,54.88203092149071,12.839664864885638,13.015132472953038
-166860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.015060390912234,13.015060390912234,734.8895614195503,2126.7801561097303,1391.8905946901793,55.15078937081437,54.88174609508749,12.839168822286481,13.015060390912234
-166920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014988382445068,13.014988382445068,736.4116982077197,2131.1911356197106,1394.7794374119906,55.1511021141697,54.881500831626255,12.838731757817644,13.014988382445068
-166980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014916351493609,13.014916351493609,737.7067530376816,2134.943670834482,1397.2369177968005,55.15136817310339,54.881292179599406,12.838349181626935,13.014916351493609
-167040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014844354584465,13.014844354584465,739.0236759448284,2138.7596346393843,1399.735958694556,55.15163872920579,54.881080000747325,12.837961387537081,13.014844354584465
-167100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014772193562038,13.014772193562038,740.6732352137544,2143.5401637998098,1402.8669285860556,55.15197767408638,54.88081418920196,12.837493573242188,13.014772193562038
-167160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014700112378867,13.014700112378867,742.3390840853727,2148.3679615091824,1406.0288774238095,55.1523199703776,54.880545749371926,12.837021924026445,13.014700112378867
-167220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014628085957773,13.014628085957773,743.8469115959738,2152.7375658231094,1408.8906542271357,55.15262978025654,54.88030278643782,12.836588261966842,13.014628085957773
-167280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014556253582578,13.014556253582578,745.5392276618788,2157.6421798337606,1412.1029521718815,55.15297752294415,54.88003007536746,12.836110499022373,13.014556253582578
-167340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014484600625114,13.014484600625114,746.717770458161,2161.0569866279857,1414.3392161698248,55.153219636623646,54.87984020198394,12.835756255738568,13.014484600625114
-167400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014412845767383,13.014412845767383,747.9880832912118,2164.737919129776,1416.7498358385642,55.1534806189279,54.87963553121422,12.835379877455455,13.014412845767383
-167460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014341054589453,13.014341054589453,749.7933103318793,2169.9700333354976,1420.1767230036185,55.15385158179818,54.879344610125074,12.834875038371178,13.014341054589453
-167520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014269349676173,13.014269349676173,751.0815316999899,2173.7029396129747,1422.621407912985,55.154116249127455,54.87913704943947,12.834494405274448,13.014269349676173
-167580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014197640542193,13.014197640542193,752.4840120759793,2177.7671993595463,1425.2831872835666,55.15440440980901,54.87891106450664,12.834086334006347,13.014197640542193
-167640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014125891417407,13.014125891417407,753.7299366386261,2181.377481577948,1427.6475449393215,55.154660382973134,54.87871032206671,12.833715807583687,13.014125891417407
-167700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.014054023498414,13.014054023498414,754.834013469301,2184.576428051152,1429.7424145818516,55.15488719196775,54.87853245111242,12.833379217257015,13.014054023498414
-167760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013981943948796,13.013981943948796,756.6092181948567,2189.721600410924,1433.1123822160669,55.15525199063871,54.8782463641879,12.832881282745912,13.013981943948796
-167820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013909881381053,13.013909881381053,758.2007753874667,2194.3342389901572,1436.1334636026907,55.15557903206568,54.87798988771613,12.832427453561433,13.013909881381053
-167880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013837972830661,13.013837972830661,759.4168204437573,2197.8579356952428,1438.441115251485,55.15582886626117,54.8777939596541,12.832063933642841,13.013837972830661
-167940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013766030987297,13.013766030987297,760.9298345032297,2202.242851375672,1441.313016872442,55.156139761896924,54.87755014523436,12.831629076869689,13.013766030987297
-168000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013694202096632,13.013694202096632,762.2816131693094,2206.1602115933238,1443.8785984240142,55.15641750731734,54.8773323282864,12.831233042348101,13.013694202096632
-168060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013622327270383,13.013622327270383,763.5136753714594,2209.7304076872547,1446.2167323157946,55.156670638405494,54.87713381469445,12.830865704186664,13.013622327270383
-168120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013550423678815,13.013550423678815,765.1773111611315,2214.5521980898043,1449.3748869286728,55.157012509012525,54.876865708699725,12.830394712269532,13.013550423678815
-168180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013478656542521,13.013478656542521,766.4419714053737,2218.2169699145393,1451.7749985091657,55.15727234565417,54.8766619363957,12.830019649775178,13.013478656542521
-168240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01340684405838,13.01340684405838,767.4487615901872,2221.133913047541,1453.6851514573532,55.15747916036742,54.87649974560398,12.829706457411525,13.01340684405838
-168300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013334952754052,13.013334952754052,769.1427344795437,2226.0437524017607,1456.9010179222173,55.157827273790986,54.87622674379046,12.829228184850182,13.013334952754052
-168360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013263082843233,13.013263082843233,770.1963234359343,2229.09643925173,1458.900115815796,55.158043712912274,54.87605700522648,12.828903695224366,13.013263082843233
-168420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01319106027978,13.01319106027978,771.7413711146843,2233.5744203430318,1461.8330492283485,55.15836120709983,54.875808016008854,12.828461045337287,13.01319106027978
-168480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013119162938164,13.013119162938164,773.5001602812248,2238.672313914802,1465.1721536335772,55.15872265383828,54.87552455777829,12.82796719336118,13.013119162938164
-168540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.013047349661546,13.013047349661546,774.5622066669741,2241.7495739846386,1467.187367317664,55.158940835259344,54.875353452846404,12.827640723871493,13.013047349661546
-168600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012975739386102,13.012975739386102,776.0656766906814,2246.1070593902373,1470.0413826995564,55.15924978620078,54.87511116351889,12.82720845906726,13.012975739386102
-168660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012904209788553,13.012904209788553,777.4215420732017,2250.036488660049,1472.6149465868473,55.15952838746109,54.87489267539359,12.826811715253283,13.012904209788553
-168720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012832766366456,13.012832766366456,778.6443275384395,2253.579979220895,1474.9356516824548,55.15977962521282,54.874695646617326,12.826447011069595,13.012832766366456
-168780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012761340924499,13.012761340924499,779.7476637099388,2256.777054229211,1477.0293905192716,55.16000630169247,54.87451787958558,12.826111006315953,13.012761340924499
-168840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012689754643215,13.012689754643215,780.9316573525126,2260.208059727703,1479.2764023751902,55.160249564134986,54.87432710530492,12.8257554718254,13.012689754643215
-168900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012618068972408,13.012618068972408,782.3296730927046,2264.259793760705,1481.9301206680009,55.160536836993344,54.874101816631786,12.825348442986753,13.012618068972408
-168960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012546225768723,13.012546225768723,784.0354248270273,2269.204062267852,1485.1686374408246,55.16088739164546,54.87382690032784,12.82486735639829,13.012546225768723
-169020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01247470675733,13.01247470675733,784.9998233895778,2271.9982290885855,1486.998405699008,55.16108550148046,54.87367153618339,12.824564615753616,13.01247470675733
-169080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012403007824231,13.012403007824231,786.421164180969,2276.117669847294,1489.6965056663248,55.161377574864524,54.8734424827826,12.824151965238647,13.012403007824231
-169140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012331579485526,13.012331579485526,788.2187448929343,2281.3283637114573,1493.1096188185236,55.16174701944568,54.87315275238493,12.82364923001741,13.012331579485526
-169200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012260677567523,13.012260677567523,789.0817582116222,2283.8285392218468,1494.7467810102248,55.16192428496083,54.87301373503072,12.823371445848856,13.012260677567523
-169260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012190233502581,13.012190233502581,790.3091686866275,2287.3856211022267,1497.0764524155989,55.162176486444146,54.87281595046496,12.82300660801846,13.012190233502581
-169320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012119632936358,13.012119632936358,791.7386296026808,2291.5287338587314,1499.7901042560507,55.162470238249895,54.87258558079158,12.822593090594516,13.012119632936358
-169380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.012048895986096,13.012048895986096,793.4049617929437,2296.358883865133,1502.953922072189,55.16281270186058,54.87231700974421,12.822122549914866,13.012048895986096
-169440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011978364119285,13.011978364119285,794.5169131403686,2299.581135431063,1505.0642222906945,55.16304116349254,54.87213784273822,12.821785345979194,13.011978364119285
-169500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01190775777012,13.01190775777012,795.5477024205104,2302.567990172805,1507.0202877522952,55.163252935204724,54.87197176450749,12.821467558022269,13.01190775777012
-169560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011837155497975,13.011837155497975,797.0507797153889,2306.924699082406,1509.873919367017,55.16356183129145,54.87172951819881,12.821036349883457,13.011837155497975
-169620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011766425446739,13.011766425446739,798.4139794699188,2310.875716619968,1512.4617371500494,55.16384196336712,54.871509829558576,12.820638604535038,13.011766425446739
-169680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01169588441566,13.01169588441566,799.4099428079276,2313.761598799424,1514.3516559914965,55.16404657602366,54.871349365690996,12.820329240788658,13.01169588441566
-169740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01162518807431,13.01162518807431,800.6575642680017,2317.377414770975,1516.7198505029728,55.164302941908026,54.871148315267156,12.8199592826788,13.01162518807431
-169800,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011554405904795,13.011554405904795,802.2068813365124,2321.868313501933,1519.6614321654208,55.164621352270544,54.87089860755547,12.819516780574146,13.011554405904795
-169860,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011483791394427,13.011483791394427,803.2818654590573,2324.983428148733,1521.7015626896753,55.164842217821864,54.87072539764177,12.819188361332145,13.011483791394427
-169920,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011413077937029,13.011413077937029,804.5845261644284,2328.758933939441,1524.174407775012,55.16510990594672,54.8705154679505,12.818805161588733,13.011413077937029
-169980,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011342453023186,13.011342453023186,806.4525076929797,2334.174208882715,1527.721701189735,55.16549385579249,54.87021436205485,12.818286273776403,13.011342453023186
-170040,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011272117138828,13.011272117138828,807.6029890980278,2337.5083643440007,1529.905375245972,55.16573025164461,54.870028972776645,12.817939993774528,13.011272117138828
-170100,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011201970633213,13.011201970633213,808.6702029359683,2340.601014239264,1531.9308113032955,55.165949524453204,54.86985701194335,12.817613899478724,13.011201970633213
-170160,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011131909784114,13.011131909784114,810.123374042793,2344.813189240328,1534.6898151975347,55.166248173026396,54.86962280206644,12.817195190849175,13.011131909784114
-170220,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.011061911549493,13.011061911549493,811.2616400111066,2348.111965737688,1536.8503257265813,55.166482060491504,54.8694393799465,12.816852175656841,13.011061911549493
-170280,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010991936832427,13.010991936832427,812.4687132167177,2351.610340172832,1539.1416269561137,55.16673009971419,54.869244859560254,12.816492656144796,13.010991936832427
-170340,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010921926287706,13.010921926287706,813.7805531813707,2355.412619485648,1541.632066304277,55.16699968619192,54.86903344111921,12.816107935999975,13.010921926287706
-170400,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010851886343463,13.010851886343463,815.1416128001443,2359.3576849661067,1544.2160721659625,55.16727939640352,54.868814083318405,12.815711362594485,13.010851886343463
-170460,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010782017670286,13.010782017670286,816.5150980390257,2363.338819309219,1546.8237212701931,55.167561663955716,54.86859271996835,12.815311972698636,13.010782017670286
-170520,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010712218010106,13.010712218010106,817.4142790126183,2365.944157619069,1548.52987860645,55.167746385803746,54.86844785511657,12.815026572131913,13.010712218010106
-170580,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010642327823868,13.010642327823868,818.8359372001797,2370.0650575680843,1551.2291203679038,55.16803856293809,54.86821872035146,12.814615586307184,13.010642327823868
-170640,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01057250184051,13.01057250184051,820.5596600540716,2375.06219326376,1554.5025332096882,55.16839286633696,54.867940864159,12.814132107468195,13.01057250184051
-170700,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010502939882148,13.010502939882148,821.8029372900049,2378.665713709635,1556.86277641963,55.168648360619656,54.86774049727338,12.813764288671765,13.010502939882148
-170760,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010433550642814,13.010433550642814,823.09860058351,2382.4212166804655,1559.3226160969555,55.16891463067133,54.867531679680994,12.813384056725367,13.010433550642814
-170820,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010364395904114,13.010364395904114,824.2708232363202,2385.818670433268,1561.5478471969473,55.16915551457629,54.86734277072648,12.813033706447316,13.010364395904114
-170880,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.01029528249574,13.01029528249574,825.3248272531366,2388.873209493891,1563.548382240754,55.16937208538948,54.86717292888543,12.812711792044555,13.01029528249574
-170940,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.0102260105034,13.0102260105034,826.6115158463251,2392.602727467215,1565.99121162089,55.169636513099654,54.86696555611689,12.812333826941964,13.0102260105034
-171000,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010156787341925,13.010156787341925,828.200920724994,2397.210395381801,1569.0094746568066,55.16996320280557,54.86670935547614,12.81188319391124,13.010156787341925
-171060,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010087703605912,13.010087703605912,829.190257726039,2400.077384837808,1570.8871271117691,55.170166476130994,54.86654994195536,12.811576837718187,13.010087703605912
-171120,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.010018564800966,13.010018564800966,830.2825198833366,2403.2429521767335,1572.960432293397,55.170390919028435,54.866373926571065,12.811245702100733,13.010018564800966
-171180,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009949432239097,13.009949432239097,831.6909496508389,2407.325695684468,1575.6347460336292,55.170680390936525,54.86614691333194,12.810838624106724,13.009949432239097
-171240,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009880273489143,13.009880273489143,832.9674897489223,2411.025859602416,1578.058369853494,55.17094273745715,54.86594117269958,12.810463199281314,13.009880273489143
-171300,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00981117047945,13.00981117047945,834.1121742902942,2414.343539988707,1580.2313656984131,55.171177965397774,54.86575669933536,12.810119501718301,13.00981117047945
-171360,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009742009458947,13.009742009458947,835.663515938705,2418.840915000873,1583.1773990621687,55.1714968352656,54.86550663126474,12.80967805847038,13.009742009458947
-171420,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009673148766925,13.009673148766925,837.0383703426317,2422.8263474109867,1585.7879770683548,55.171779407735045,54.86528502878871,12.809279306579883,13.009673148766925
-171480,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009604340097836,13.009604340097836,837.9723001601911,2425.532693357503,1587.5603931973121,55.17197129127634,54.865134547505285,12.808986524082089,13.009604340097836
-171540,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009535615035901,13.009535615035901,839.1320719771398,2428.894212261992,1589.7621402848513,55.172209627462884,54.864947636554014,12.808639571235785,13.009535615035901
-171600,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009466749183865,13.009466749183865,840.5096215031514,2432.88750975123,1592.3778882480785,55.17249275760718,54.86472559673129,12.808240160901196,13.009466749183865
-171660,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009398021815135,13.009398021815135,841.5955644235719,2436.034878416244,1594.4393139926722,55.17271591027252,54.86455059318878,12.807910937984607,13.009398021815135
-171720,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009329110411803,13.009329110411803,843.0303940183903,2440.194378964028,1597.163984945638,55.173010824459105,54.864319311938715,12.80749771767924,13.009329110411803
-171780,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.00926039665547,13.00926039665547,844.6206639734892,2444.804849673347,1600.1841856998574,55.17333771305229,54.864062955324144,12.807047349333555,13.00926039665547
-171840,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009191874774151,13.009191874774151,845.6369011383321,2447.750049370819,1602.1131482324865,55.17354653169253,54.86389919298802,12.8067350711186,13.009191874774151
-171900,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009123494264387,13.009123494264387,846.9506271080919,2451.558301678329,1604.6076745702374,55.17381654193932,54.863687442213575,12.806351464768849,13.009123494264387
-171960,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.009055200342937,13.009055200342937,848.1286354873259,2454.972845631489,1606.8442101441624,55.17405863773981,54.86349758285136,12.806000546946388,13.009055200342937
-172020,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008986853974232,13.008986853974232,849.4171355103093,2458.7079487356336,1609.2908132253244,55.17432346162922,54.86328989938622,12.8056230307545,13.008986853974232
-172080,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008918653760249,13.008918653760249,850.5645911598285,2462.033887437317,1611.4692962774886,55.174559275214946,54.86310496674015,12.80527954267231,13.008918653760249
-172140,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008850394521325,13.008850394521325,851.9415258979891,2466.0255867637184,1614.0840608657293,55.17484229214711,54.86288301570207,12.80488086329566,13.008850394521325
-172200,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008782239440505,13.008782239440505,853.1574706663904,2469.550252899761,1616.392782233371,55.175092195798406,54.86268703317054,12.804520962334273,13.008782239440505
-172260,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008714047135207,13.008714047135207,854.1361786496542,2472.386667418877,1618.2504887692228,55.17529330147526,54.86252931958994,12.80421801826933,13.008714047135207
-172320,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008645886933039,13.008645886933039,855.5453252227773,2476.471872538073,1620.926547315296,55.17558294812783,54.86230216931055,12.803811692329026,13.008645886933039
-172380,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008577673363119,13.008577673363119,857.1456721779157,2481.1118078740624,1623.966135696147,55.175911925929746,54.862044174270856,12.803359374287293,13.008577673363119
-172440,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008509706642528,13.008509706642528,858.2472564167674,2484.304759397906,1626.0575029811387,55.176138310597146,54.861866636087726,12.803027128449088,13.008509706642528
-172500,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008441779945555,13.008441779945555,859.4472886071388,2487.783344429307,1628.3360558221677,55.176384947082965,54.8616732157731,12.80267126826992,13.008441779945555
-172560,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008374038353967,13.008374038353967,861.0440011894739,2492.412822243485,1631.3688210540113,55.176713183471676,54.861415802173674,12.802220284451026,13.008374038353967
-172620,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008306429397297,13.008306429397297,862.2774786657851,2495.988488877399,1633.7110102116142,55.176966703199255,54.861216983798094,12.801856700387109,13.008306429397297
-172680,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008238954025819,13.008238954025819,863.3846835066063,2499.197823081315,1635.8131395747089,55.177194249457294,54.86103853465797,12.801523585925016,13.008238954025819
-172740,0.0,0.0,0.0,6.6715710476410335,6.6715710476410335,13.008171504968926,13.008171504968926,864.6069913981747,2502.741118329585,1638.1341269314105,55.17744547402678,54.86084151621965,12.801162841014946,13.008171504968926
diff --git a/Buildings/Resources/Documentation/userGuide/Makefile b/Buildings/Resources/Documentation/userGuide/Makefile
index ae2e194413d..d65d093f969 100644
--- a/Buildings/Resources/Documentation/userGuide/Makefile
+++ b/Buildings/Resources/Documentation/userGuide/Makefile
@@ -115,4 +115,9 @@ doctest:
 dist:	html, linkcheck, copytowww
 
 copytowww:
-	scp -r build/html/* simulationresearch.lbl.gov:/usr/local/www/simulationresearch/modelica/userGuide/
+	rsync --delete --links --archive \
+	  --recursive --backup --update \
+	  --rsh=ssh --compress --times --checksum --verbose \
+	  --exclude "*~" \
+	  --exclude ".DS_Store" \
+	  build/html/* simulationresearch.lbl.gov:/usr/local/www/simulationresearch/modelica/userGuide/
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/.buildinfo b/Buildings/Resources/Documentation/userGuide/build/html/.buildinfo
index 527ad25479f..1951bf657c2 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/.buildinfo
+++ b/Buildings/Resources/Documentation/userGuide/build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 4845ab498150134ee9a2dc4da13e3ed1
+config: ef20bdfc82d3e06e0e24af1430aed761
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.png
deleted file mode 100644
index 9d147b64da4..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.svg
new file mode 100644
index 00000000000..550c4023e5f
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/Merkel.svg
@@ -0,0 +1,2146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 2025.000000 1459.000000"
+   version="1.1"
+   id="svg512"
+   sodipodi:docname="Merkel.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata518">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs516" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1605"
+     inkscape:window-height="1130"
+     id="namedview514"
+     showgrid="false"
+     inkscape:zoom="0.55604938"
+     inkscape:cx="1012.5"
+     inkscape:cy="729.5"
+     inkscape:window-x="67"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg512" />
+  <rect
+     fill="rgb(240,240,245)"
+     stroke="blue"
+     stroke-opacity="1"
+     x="930.332"
+     y="711.638"
+     width="178.625"
+     height="178.625"
+     id="rect2" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="928.387"
+     y="709.692"
+     width="1.94533"
+     height="180.57"
+     id="rect4" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="928.387"
+     y="890.262"
+     width="180.57"
+     height="1.94533"
+     id="rect6" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1108.96"
+     y="711.638"
+     width="1.94533"
+     height="180.57"
+     id="rect8" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="930.332"
+     y="709.692"
+     width="180.57"
+     height="1.94533"
+     id="rect10" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="930.332"
+     y="711.638"
+     width="2.918"
+     height="178.625"
+     id="rect12" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="930.332"
+     y="711.638"
+     width="178.625"
+     height="2.918"
+     id="rect14" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="1107.01"
+     y="711.638"
+     width="1.94533"
+     height="178.625"
+     id="rect16" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="930.332"
+     y="888.317"
+     width="178.625"
+     height="1.94533"
+     id="rect18" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1105.07"
+     y="713.583"
+     width="1.94533"
+     height="174.734"
+     id="rect20" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="932.278"
+     y="886.372"
+     width="174.734"
+     height="1.94533"
+     id="rect22" />
+  <ellipse
+     fill="rgb(0,0,0)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="71.45"
+     ry="71.45"
+     id="ellipse24" />
+  <ellipse
+     fill="rgb(12,15,18)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="71.276"
+     ry="71.276"
+     id="ellipse26" />
+  <ellipse
+     fill="rgb(24,30,36)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="70.7547"
+     ry="70.7547"
+     id="ellipse28" />
+  <ellipse
+     fill="rgb(36,45,54)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="69.8886"
+     ry="69.8886"
+     id="ellipse30" />
+  <ellipse
+     fill="rgb(47,60,71)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="68.6821"
+     ry="68.6821"
+     id="ellipse32" />
+  <ellipse
+     fill="rgb(59,74,89)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="67.141"
+     ry="67.141"
+     id="ellipse34" />
+  <ellipse
+     fill="rgb(70,88,105)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="65.2728"
+     ry="65.2728"
+     id="ellipse36" />
+  <ellipse
+     fill="rgb(81,102,122)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="63.0866"
+     ry="63.0866"
+     id="ellipse38" />
+  <ellipse
+     fill="rgb(91,115,137)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="60.593"
+     ry="60.593"
+     id="ellipse40" />
+  <ellipse
+     fill="rgb(101,127,152)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="57.8043"
+     ry="57.8043"
+     id="ellipse42" />
+  <ellipse
+     fill="rgb(111,139,166)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="54.7339"
+     ry="54.7339"
+     id="ellipse44" />
+  <ellipse
+     fill="rgb(120,150,180)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="51.3968"
+     ry="51.3968"
+     id="ellipse46" />
+  <ellipse
+     fill="rgb(128,160,192)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="47.8094"
+     ry="47.8094"
+     id="ellipse48" />
+  <ellipse
+     fill="rgb(136,170,204)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="43.989"
+     ry="43.989"
+     id="ellipse50" />
+  <ellipse
+     fill="rgb(143,179,214)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="39.9543"
+     ry="39.9543"
+     id="ellipse52" />
+  <ellipse
+     fill="rgb(149,186,223)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="35.725"
+     ry="35.725"
+     id="ellipse54" />
+  <ellipse
+     fill="rgb(154,193,231)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="31.3216"
+     ry="31.3216"
+     id="ellipse56" />
+  <ellipse
+     fill="rgb(159,199,238)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="26.7656"
+     ry="26.7656"
+     id="ellipse58" />
+  <ellipse
+     fill="rgb(163,204,244)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="22.0793"
+     ry="22.0793"
+     id="ellipse60" />
+  <ellipse
+     fill="rgb(166,208,249)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="17.2853"
+     ry="17.2853"
+     id="ellipse62" />
+  <ellipse
+     fill="rgb(168,210,252)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="12.4072"
+     ry="12.4072"
+     id="ellipse64" />
+  <ellipse
+     fill="rgb(169,212,254)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="7.46856"
+     ry="7.46856"
+     id="ellipse66" />
+  <ellipse
+     fill="rgb(170,213,255)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="2.49357"
+     ry="2.49357"
+     id="ellipse68" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="10"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1019.64"
+     y="799.521"
+     id="text70">V=m_flow_nominal*tau/rho_default</text>
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1018.22"
+     y="886.69"
+     id="text72">vol</text>
+  <ellipse
+     fill="rgb(0,0,0)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="71.45"
+     ry="71.45"
+     id="ellipse74" />
+  <ellipse
+     fill="rgb(12,15,18)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="71.276"
+     ry="71.276"
+     id="ellipse76" />
+  <ellipse
+     fill="rgb(24,30,36)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="70.7547"
+     ry="70.7547"
+     id="ellipse78" />
+  <ellipse
+     fill="rgb(36,45,54)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="69.8886"
+     ry="69.8886"
+     id="ellipse80" />
+  <ellipse
+     fill="rgb(47,60,71)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="68.6821"
+     ry="68.6821"
+     id="ellipse82" />
+  <ellipse
+     fill="rgb(59,74,89)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="67.141"
+     ry="67.141"
+     id="ellipse84" />
+  <ellipse
+     fill="rgb(70,88,105)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="65.2728"
+     ry="65.2728"
+     id="ellipse86" />
+  <ellipse
+     fill="rgb(81,102,122)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="63.0866"
+     ry="63.0866"
+     id="ellipse88" />
+  <ellipse
+     fill="rgb(91,115,137)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="60.593"
+     ry="60.593"
+     id="ellipse90" />
+  <ellipse
+     fill="rgb(101,127,152)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.64"
+     cy="799.521"
+     rx="57.8043"
+     ry="57.8043"
+     id="ellipse92" />
+  <ellipse
+     fill="rgb(111,139,166)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="54.7339"
+     ry="54.7339"
+     id="ellipse94" />
+  <ellipse
+     fill="rgb(120,150,180)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="51.3968"
+     ry="51.3968"
+     id="ellipse96" />
+  <ellipse
+     fill="rgb(128,160,192)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="47.8094"
+     ry="47.8094"
+     id="ellipse98" />
+  <ellipse
+     fill="rgb(136,170,204)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="43.989"
+     ry="43.989"
+     id="ellipse100" />
+  <ellipse
+     fill="rgb(143,179,214)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="39.9543"
+     ry="39.9543"
+     id="ellipse102" />
+  <ellipse
+     fill="rgb(149,186,223)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="35.725"
+     ry="35.725"
+     id="ellipse104" />
+  <ellipse
+     fill="rgb(154,193,231)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="31.3216"
+     ry="31.3216"
+     id="ellipse106" />
+  <ellipse
+     fill="rgb(159,199,238)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="26.7656"
+     ry="26.7656"
+     id="ellipse108" />
+  <ellipse
+     fill="rgb(163,204,244)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="22.0793"
+     ry="22.0793"
+     id="ellipse110" />
+  <ellipse
+     fill="rgb(166,208,249)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="17.2853"
+     ry="17.2853"
+     id="ellipse112" />
+  <ellipse
+     fill="rgb(168,210,252)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="12.4072"
+     ry="12.4072"
+     id="ellipse114" />
+  <ellipse
+     fill="rgb(169,212,254)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="7.46856"
+     ry="7.46856"
+     id="ellipse116" />
+  <ellipse
+     fill="rgb(170,213,255)"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="799.521"
+     rx="2.49357"
+     ry="2.49357"
+     id="ellipse118" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="10"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1019.64"
+     y="799.521"
+     id="text120">V=m_flow_nominal*tau/rho_default</text>
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1018.22"
+     y="886.69"
+     id="text122">vol</text>
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="655.965"
+     y="825.243"
+     id="text124">preDro</text>
+  <rect
+     fill="rgb(0,0,0)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="700.92"
+     width="142.9"
+     height="57.16"
+     id="rect126" />
+  <rect
+     fill="rgb(13,13,13)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="700.99"
+     width="142.9"
+     height="57.0208"
+     id="rect128" />
+  <rect
+     fill="rgb(27,27,27)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="701.198"
+     width="142.9"
+     height="56.6037"
+     id="rect130" />
+  <rect
+     fill="rgb(40,40,40)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="701.545"
+     width="142.9"
+     height="55.9109"
+     id="rect132" />
+  <rect
+     fill="rgb(54,54,54)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="702.027"
+     width="142.9"
+     height="54.9457"
+     id="rect134" />
+  <rect
+     fill="rgb(67,67,67)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="702.644"
+     width="142.9"
+     height="53.7128"
+     id="rect136" />
+  <rect
+     fill="rgb(79,79,79)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="703.391"
+     width="142.9"
+     height="52.2183"
+     id="rect138" />
+  <rect
+     fill="rgb(92,92,92)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="704.265"
+     width="142.9"
+     height="50.4693"
+     id="rect140" />
+  <rect
+     fill="rgb(103,103,103)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="705.263"
+     width="142.9"
+     height="48.4744"
+     id="rect142" />
+  <rect
+     fill="rgb(115,115,115)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="706.378"
+     width="142.9"
+     height="46.2434"
+     id="rect144" />
+  <rect
+     fill="rgb(125,125,125)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="707.606"
+     width="142.9"
+     height="43.7871"
+     id="rect146" />
+  <rect
+     fill="rgb(135,135,135)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="708.941"
+     width="142.9"
+     height="41.1175"
+     id="rect148" />
+  <rect
+     fill="rgb(145,145,145)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="710.376"
+     width="142.9"
+     height="38.2475"
+     id="rect150" />
+  <rect
+     fill="rgb(153,153,153)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="711.904"
+     width="142.9"
+     height="35.1912"
+     id="rect152" />
+  <rect
+     fill="rgb(161,161,161)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="713.518"
+     width="142.9"
+     height="31.9635"
+     id="rect154" />
+  <rect
+     fill="rgb(168,168,168)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="715.21"
+     width="142.9"
+     height="28.58"
+     id="rect156" />
+  <rect
+     fill="rgb(174,174,174)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="716.971"
+     width="142.9"
+     height="25.0573"
+     id="rect158" />
+  <rect
+     fill="rgb(179,179,179)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="718.794"
+     width="142.9"
+     height="21.4125"
+     id="rect160" />
+  <rect
+     fill="rgb(184,184,184)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="720.668"
+     width="142.9"
+     height="17.6634"
+     id="rect162" />
+  <rect
+     fill="rgb(187,187,187)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="722.586"
+     width="142.9"
+     height="13.8283"
+     id="rect164" />
+  <rect
+     fill="rgb(190,190,190)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="724.537"
+     width="142.9"
+     height="9.92573"
+     id="rect166" />
+  <rect
+     fill="rgb(191,191,191)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="726.513"
+     width="142.9"
+     height="5.97485"
+     id="rect168" />
+  <rect
+     fill="rgb(192,192,192)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="728.503"
+     width="142.9"
+     height="1.99486"
+     id="rect170" />
+  <rect
+     fill="rgb(0,0,0)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="713.781"
+     width="142.9"
+     height="32.867"
+     id="rect172" />
+  <rect
+     fill="rgb(0,11,22)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="713.84"
+     width="142.9"
+     height="32.7486"
+     id="rect174" />
+  <rect
+     fill="rgb(0,22,44)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="714.017"
+     width="142.9"
+     height="32.3942"
+     id="rect176" />
+  <rect
+     fill="rgb(0,32,65)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="714.311"
+     width="142.9"
+     height="31.8065"
+     id="rect178" />
+  <rect
+     fill="rgb(0,43,87)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="714.72"
+     width="142.9"
+     height="30.9896"
+     id="rect180" />
+  <rect
+     fill="rgb(0,53,107)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="715.24"
+     width="142.9"
+     height="29.9493"
+     id="rect182" />
+  <rect
+     fill="rgb(0,63,127)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="715.868"
+     width="142.9"
+     height="28.6934"
+     id="rect184" />
+  <rect
+     fill="rgb(0,72,146)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="716.599"
+     width="142.9"
+     height="27.2306"
+     id="rect186" />
+  <rect
+     fill="rgb(0,81,163)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="717.429"
+     width="142.9"
+     height="25.5717"
+     id="rect188" />
+  <rect
+     fill="rgb(0,89,180)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="718.35"
+     width="142.9"
+     height="23.7285"
+     id="rect190" />
+  <rect
+     fill="rgb(0,97,195)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="719.357"
+     width="142.9"
+     height="21.7144"
+     id="rect192" />
+  <rect
+     fill="rgb(0,104,208)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="720.443"
+     width="142.9"
+     height="19.5438"
+     id="rect194" />
+  <rect
+     fill="rgb(0,109,220)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="721.598"
+     width="142.9"
+     height="17.2324"
+     id="rect196" />
+  <rect
+     fill="rgb(0,115,231)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="722.816"
+     width="142.9"
+     height="14.7968"
+     id="rect198" />
+  <rect
+     fill="rgb(0,119,239)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="724.087"
+     width="142.9"
+     height="12.2547"
+     id="rect200" />
+  <rect
+     fill="rgb(0,122,246)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="725.402"
+     width="142.9"
+     height="9.62421"
+     id="rect202" />
+  <rect
+     fill="rgb(0,125,251)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="726.752"
+     width="142.9"
+     height="6.9244"
+     id="rect204" />
+  <rect
+     fill="rgb(0,126,254)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="728.127"
+     width="142.9"
+     height="4.17469"
+     id="rect206" />
+  <rect
+     fill="rgb(0,127,255)"
+     stroke="none"
+     stroke-opacity="1"
+     x="583.8"
+     y="729.517"
+     width="142.9"
+     height="1.39492"
+     id="rect208" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1019.645000,729.500000 1727.000000,729.500000"
+     id="polyline210" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     points="1019.645000,729.500000 1727.000000,729.500000"
+     id="polyline212" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="298.000000,729.500000 369.450000,729.500000 369.450000,729.500000 440.900000,729.500000 440.900000,729.500000 583.800000,729.500000"
+     id="polyline214" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     points="298.000000,729.500000 369.450000,729.500000 369.450000,729.500000 440.900000,729.500000 440.900000,729.500000 583.800000,729.500000"
+     id="polyline216" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="726.700000,729.500000 1019.645000,729.500000"
+     id="polyline218" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     points="726.700000,729.500000 1019.645000,729.500000"
+     id="polyline220" />
+  <polyline
+     fill="none"
+     stroke="rgb(191,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     points="755.280000,1172.490000 826.730000,1172.490000"
+     id="polyline222" />
+  <polyline
+     fill="none"
+     stroke="rgb(191,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     points="755.280000,1143.910000 826.730000,1143.910000"
+     id="polyline224" />
+  <polyline
+     fill="none"
+     stroke="rgb(191,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     points="740.990000,1158.200000 755.280000,1172.490000"
+     id="polyline226" />
+  <polyline
+     fill="none"
+     stroke="rgb(191,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     points="740.990000,1158.200000 755.280000,1143.910000"
+     id="polyline228" />
+  <polygon
+     fill="rgb(191,0,0)"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     points="826.730000,1158.200000 826.730000,1129.620000 848.165000,1143.910000 826.730000,1158.200000"
+     id="polygon230" />
+  <polygon
+     fill="rgb(191,0,0)"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     points="826.730000,1186.780000 826.730000,1158.200000 848.165000,1172.490000 826.730000,1186.780000"
+     id="polygon232" />
+  <rect
+     fill="rgb(191,0,0)"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     x="848.165"
+     y="1129.62"
+     width="14.29"
+     height="57.16"
+     id="rect234" />
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="798.15"
+     y="1101.04"
+     id="text236">preHea</text>
+  <ellipse
+     fill="rgb(191,0,0)"
+     stroke="rgb(0,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     cx="1226.85"
+     cy="1214.65"
+     rx="14.29"
+     ry="13.5755"
+     id="ellipse238" />
+  <rect
+     fill="rgb(191,0,0)"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     x="1218.28"
+     y="1129.62"
+     width="17.148"
+     height="77.166"
+     id="rect240" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,255)"
+     stroke-opacity="1"
+     points="1235.424000,1158.200000 1291.155000,1158.200000"
+     id="polyline242" />
+  <polyline
+     fill="none"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     points="1162.545000,1158.200000 1218.276000,1158.200000"
+     id="polyline244" />
+  <polygon
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     points="1218.276000,1129.620000 1218.276000,1101.040000 1219.705000,1096.753000 1222.563000,1095.324000 1226.850000,1093.895000 1231.137000,1095.324000 1233.995000,1096.753000 1235.424000,1101.040000 1235.424000,1129.620000 1218.276000,1129.620000"
+     id="polygon246" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     points="1218.276000,1129.620000 1218.276000,1203.928000"
+     id="polyline248" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="2"
+     stroke-opacity="1"
+     points="1235.424000,1129.620000 1235.424000,1203.928000"
+     id="polyline250" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     points="1198.270000,1172.490000 1218.276000,1172.490000"
+     id="polyline252" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     points="1198.270000,1143.910000 1218.276000,1143.910000"
+     id="polyline254" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     points="1198.270000,1115.330000 1218.276000,1115.330000"
+     id="polyline256" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="71"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1281.15"
+     y="1208.22"
+     id="text258">K</text>
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1226.85"
+     y="1079.61"
+     id="text260">TVol</text>
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="869.600000,1158.200000 898.180000,1158.200000 898.180000,800.950000 948.195000,800.950000"
+     id="polyline262" />
+  <polyline
+     fill="none"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     points="869.600000,1158.200000 898.180000,1158.200000 898.180000,800.950000 948.195000,800.950000"
+     id="polyline264" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1155.400000,1158.200000 898.180000,1158.200000 898.180000,800.950000 948.195000,800.950000"
+     id="polyline266" />
+  <polyline
+     fill="none"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     points="1155.400000,1158.200000 898.180000,1158.200000 898.180000,800.950000 948.195000,800.950000"
+     id="polyline268" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1298.300000,1158.200000 1798.450000,1158.200000"
+     id="polyline270" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="1298.300000,1158.200000 1798.450000,1158.200000"
+     id="polyline272" />
+  <rect
+     fill="rgb(240,240,245)"
+     stroke="blue"
+     stroke-opacity="1"
+     x="1123.25"
+     y="68.5875"
+     width="178.625"
+     height="178.625"
+     id="rect274" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1121.3"
+     y="66.6422"
+     width="1.94533"
+     height="180.57"
+     id="rect276" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1121.3"
+     y="247.213"
+     width="180.57"
+     height="1.94533"
+     id="rect278" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1301.87"
+     y="68.5875"
+     width="1.94533"
+     height="180.57"
+     id="rect280" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1123.25"
+     y="66.6422"
+     width="180.57"
+     height="1.94533"
+     id="rect282" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="1123.25"
+     y="244.294"
+     width="178.625"
+     height="2.918"
+     id="rect284" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="1298.95"
+     y="68.5875"
+     width="2.918"
+     height="178.625"
+     id="rect286" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1123.25"
+     y="68.5875"
+     width="1.94533"
+     height="176.68"
+     id="rect288" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1123.25"
+     y="68.5875"
+     width="176.68"
+     height="1.94533"
+     id="rect290" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="1125.19"
+     y="70.5328"
+     width="1.94533"
+     height="172.789"
+     id="rect292" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="1125.19"
+     y="70.5328"
+     width="172.789"
+     height="1.94533"
+     id="rect294" />
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1212.56"
+     y="100.74"
+     id="text296">UACor</text>
+  <rect
+     fill="rgb(255,215,136)"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     rx="17.8625"
+     ry="17.8625"
+     x="1141.11"
+     y="122.175"
+     width="142.9"
+     height="107.175"
+     id="rect298" />
+  <polyline
+     fill="none"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     points="1141.110000,157.900000 1284.010000,157.900000"
+     id="polyline300" />
+  <polyline
+     fill="none"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     points="1141.110000,193.625000 1284.010000,193.625000"
+     id="polyline302" />
+  <polyline
+     fill="none"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     points="1212.560000,122.175000 1212.560000,229.350000"
+     id="polyline304" />
+  <rect
+     fill="rgb(240,240,245)"
+     stroke="blue"
+     stroke-opacity="1"
+     x="1409.05"
+     y="68.5875"
+     width="178.625"
+     height="178.625"
+     id="rect306" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1407.1"
+     y="66.6422"
+     width="1.94533"
+     height="180.57"
+     id="rect308" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1407.1"
+     y="247.213"
+     width="180.57"
+     height="1.94533"
+     id="rect310" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1587.67"
+     y="68.5875"
+     width="1.94533"
+     height="180.57"
+     id="rect312" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1409.05"
+     y="66.6422"
+     width="180.57"
+     height="1.94533"
+     id="rect314" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="1409.05"
+     y="244.294"
+     width="178.625"
+     height="2.918"
+     id="rect316" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="1584.75"
+     y="68.5875"
+     width="2.918"
+     height="178.625"
+     id="rect318" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1409.05"
+     y="68.5875"
+     width="1.94533"
+     height="176.68"
+     id="rect320" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="1409.05"
+     y="68.5875"
+     width="176.68"
+     height="1.94533"
+     id="rect322" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="1410.99"
+     y="70.5328"
+     width="1.94533"
+     height="172.789"
+     id="rect324" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="1410.99"
+     y="70.5328"
+     width="172.789"
+     height="1.94533"
+     id="rect326" />
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1498.36"
+     y="100.74"
+     id="text328">fanRelPow</text>
+  <rect
+     fill="rgb(255,215,136)"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     rx="17.8625"
+     ry="17.8625"
+     x="1426.91"
+     y="122.175"
+     width="142.9"
+     height="107.175"
+     id="rect330" />
+  <polyline
+     fill="none"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     points="1426.910000,157.900000 1569.810000,157.900000"
+     id="polyline332" />
+  <polyline
+     fill="none"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     points="1426.910000,193.625000 1569.810000,193.625000"
+     id="polyline334" />
+  <polyline
+     fill="none"
+     stroke="rgb(64,64,64)"
+     stroke-opacity="1"
+     points="1498.360000,122.175000 1498.360000,229.350000"
+     id="polyline336" />
+  <rect
+     fill="rgb(235,235,235)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     x="512.35"
+     y="382.253"
+     width="142.9"
+     height="51.444"
+     id="rect338" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="510.405"
+     y="380.308"
+     width="1.94533"
+     height="53.3893"
+     id="rect340" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="510.405"
+     y="433.697"
+     width="144.845"
+     height="1.94533"
+     id="rect342" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="655.25"
+     y="382.253"
+     width="1.94533"
+     height="53.3893"
+     id="rect344" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="512.35"
+     y="380.308"
+     width="144.845"
+     height="1.94533"
+     id="rect346" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="512.35"
+     y="382.253"
+     width="2.918"
+     height="51.444"
+     id="rect348" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="512.35"
+     y="382.253"
+     width="142.9"
+     height="2.918"
+     id="rect350" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="653.305"
+     y="382.253"
+     width="1.94533"
+     height="51.444"
+     id="rect352" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="512.35"
+     y="431.752"
+     width="142.9"
+     height="1.94533"
+     id="rect354" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="651.359"
+     y="384.198"
+     width="1.94533"
+     height="47.5533"
+     id="rect356" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="514.295"
+     y="429.806"
+     width="139.009"
+     height="1.94533"
+     id="rect358" />
+  <text
+     fill="rgb(0,0,255)"
+     font-size="26"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="583.8"
+     y="362.962"
+     id="text362">TWatIn</text>
+  <rect
+     fill="rgb(235,235,235)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     x="512.35"
+     y="496.573"
+     width="142.9"
+     height="51.444"
+     id="rect364" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="510.405"
+     y="494.628"
+     width="1.94533"
+     height="53.3893"
+     id="rect366" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="510.405"
+     y="548.017"
+     width="144.845"
+     height="1.94533"
+     id="rect368" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="655.25"
+     y="496.573"
+     width="1.94533"
+     height="53.3893"
+     id="rect370" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="512.35"
+     y="494.628"
+     width="144.845"
+     height="1.94533"
+     id="rect372" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="512.35"
+     y="496.573"
+     width="2.918"
+     height="51.444"
+     id="rect374" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="none"
+     x="512.35"
+     y="496.573"
+     width="142.9"
+     height="2.918"
+     id="rect376" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="653.305"
+     y="496.573"
+     width="1.94533"
+     height="51.444"
+     id="rect378" />
+  <rect
+     fill="rgb(113,111,100)"
+     stroke="none"
+     x="512.35"
+     y="546.072"
+     width="142.9"
+     height="1.94533"
+     id="rect380" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="651.359"
+     y="498.518"
+     width="1.94533"
+     height="47.5533"
+     id="rect382" />
+  <rect
+     fill="rgb(172,168,153)"
+     stroke="none"
+     x="514.295"
+     y="544.126"
+     width="139.009"
+     height="1.94533"
+     id="rect384" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="19"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="583.8"
+     y="522.295"
+     id="text386">port_a.m_flow</text>
+  <text
+     fill="rgb(0,0,255)"
+     font-size="26"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="583.8"
+     y="477.282"
+     id="text388">mWat_flow</text>
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     x="869.6"
+     y="300.8"
+     width="142.9"
+     height="142.9"
+     id="rect390" />
+  <text
+     fill="rgb(0,0,255)"
+     font-size="29"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="941.05"
+     y="279.365"
+     id="text392">per</text>
+  <rect
+     fill="rgb(215,215,215)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     x="893.893"
+     y="316.519"
+     width="95.743"
+     height="82.882"
+     id="rect394" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="27"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="942.479"
+     y="422.265"
+     id="text396">Merkel</text>
+  <ellipse
+     fill="rgb(0,0,0)"
+     stroke="rgb(255,255,255)"
+     stroke-opacity="1"
+     cx="921.759"
+     cy="332.238"
+     rx="19.2915"
+     ry="4.287"
+     id="ellipse398" />
+  <ellipse
+     fill="rgb(0,0,0)"
+     stroke="rgb(255,255,255)"
+     stroke-opacity="1"
+     cx="960.341"
+     cy="332.238"
+     rx="19.2915"
+     ry="4.287"
+     id="ellipse400" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="855.310000,315.090000 726.700000,315.090000 726.700000,157.900000 155.100000,157.900000"
+     id="polyline402" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="855.310000,315.090000 726.700000,315.090000 726.700000,157.900000 155.100000,157.900000"
+     id="polyline404" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="855.310000,343.670000 440.900000,343.670000 440.900000,443.700000 155.100000,443.700000"
+     id="polyline406" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="855.310000,343.670000 440.900000,343.670000 440.900000,443.700000 155.100000,443.700000"
+     id="polyline408" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1019.645000,372.250000 1098.240000,372.250000 1098.240000,643.760000 440.900000,643.760000 440.900000,1158.200000 726.700000,1158.200000"
+     id="polyline410" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="1019.645000,372.250000 1098.240000,372.250000 1098.240000,643.760000 440.900000,643.760000 440.900000,1158.200000 726.700000,1158.200000"
+     id="polyline412" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="855.310000,429.410000 769.570000,429.410000 769.570000,522.295000 662.395000,522.295000"
+     id="polyline414" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="855.310000,429.410000 769.570000,429.410000 769.570000,522.295000 662.395000,522.295000"
+     id="polyline416" />
+  <polyline
+     fill="none"
+     stroke="rgb(255,255,255)"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="662.395000,407.975000 726.700000,407.975000 726.700000,400.830000 855.310000,400.830000"
+     id="polyline418" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="662.395000,407.975000 726.700000,407.975000 726.700000,400.830000 855.310000,400.830000"
+     id="polyline420" />
+  <ellipse
+     fill="rgb(191,0,0)"
+     stroke="rgb(191,0,0)"
+     cx="898.18"
+     cy="1158.2"
+     rx="3"
+     ry="3"
+     id="ellipse422" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="298"
+     cy="729.5"
+     rx="28.58"
+     ry="28.58"
+     id="ellipse424" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="43"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="298"
+     y="672.34"
+     id="text426">port_a</text>
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     transform=" rotate(-180, 1727, 729.5)"
+     cx="1727"
+     cy="729.5"
+     rx="28.58"
+     ry="28.58"
+     id="ellipse428" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     transform=" rotate(-180, 1727, 729.5)"
+     cx="1727"
+     cy="729.5"
+     rx="21.435"
+     ry="21.435"
+     id="ellipse430" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="43"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1727"
+     y="672.34"
+     id="text432">port_b</text>
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     x="991.065"
+     y="722.355"
+     width="57.16"
+     height="14.29"
+     id="rect434" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="1001.35"
+     cy="729.5"
+     rx="6.8592"
+     ry="7.145"
+     id="ellipse436" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="729.5"
+     rx="6.8592"
+     ry="7.145"
+     id="ellipse438" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="1037.94"
+     cy="729.5"
+     rx="6.8592"
+     ry="7.145"
+     id="ellipse440" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     cx="1001.35"
+     cy="729.402"
+     rx="4.0012"
+     ry="4.13517"
+     id="ellipse442" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="729.402"
+     rx="4.0012"
+     ry="4.13517"
+     id="ellipse444" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     cx="1037.94"
+     cy="729.437"
+     rx="4.0012"
+     ry="4.13517"
+     id="ellipse446" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     x="991.065"
+     y="722.355"
+     width="57.16"
+     height="14.29"
+     id="rect448" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="1001.35"
+     cy="729.5"
+     rx="6.8592"
+     ry="7.145"
+     id="ellipse450" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="729.5"
+     rx="6.8592"
+     ry="7.145"
+     id="ellipse452" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="1037.94"
+     cy="729.5"
+     rx="6.8592"
+     ry="7.145"
+     id="ellipse454" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     cx="1001.35"
+     cy="729.402"
+     rx="4.0012"
+     ry="4.13517"
+     id="ellipse456" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     cx="1019.65"
+     cy="729.402"
+     rx="4.0012"
+     ry="4.13517"
+     id="ellipse458" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     cx="1037.94"
+     cy="729.437"
+     rx="4.0012"
+     ry="4.13517"
+     id="ellipse460" />
+  <rect
+     fill="rgb(191,0,0)"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     x="941.05"
+     y="793.805"
+     width="14.29"
+     height="14.29"
+     id="rect462" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     cx="583.8"
+     cy="729.5"
+     rx="7.145"
+     ry="7.145"
+     id="ellipse464" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     cx="583.8"
+     cy="729.5"
+     rx="7.145"
+     ry="7.145"
+     id="ellipse466" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     transform=" rotate(-180, 726.7, 729.5)"
+     cx="726.7"
+     cy="729.5"
+     rx="7.145"
+     ry="7.145"
+     id="ellipse468" />
+  <ellipse
+     fill="rgb(0,127,255)"
+     stroke="rgb(0,0,0)"
+     stroke-opacity="1"
+     transform=" rotate(-180, 726.7, 729.5)"
+     cx="726.7"
+     cy="729.5"
+     rx="7.145"
+     ry="7.145"
+     id="ellipse470" />
+  <ellipse
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,127,255)"
+     stroke-opacity="1"
+     transform=" rotate(-180, 726.7, 729.5)"
+     cx="726.7"
+     cy="729.5"
+     rx="5.716"
+     ry="5.716"
+     id="ellipse472" />
+  <polygon
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="1727.000000,1122.475000 1798.450000,1158.200000 1727.000000,1193.925000 1727.000000,1122.475000"
+     id="polygon474" />
+  <text
+     fill="rgb(0,0,127)"
+     font-size="36"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1819.89"
+     y="1097.47"
+     id="text476">TLvg</text>
+  <polygon
+     fill="rgb(0,0,127)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="712.410000,1172.490000 740.990000,1158.200000 712.410000,1143.910000 712.410000,1172.490000"
+     id="polygon478" />
+  <rect
+     fill="rgb(255,255,255)"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     x="862.455"
+     y="1151.06"
+     width="14.29"
+     height="14.29"
+     id="rect480" />
+  <polygon
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="1291.155000,1151.055000 1305.445000,1158.200000 1291.155000,1165.345000 1291.155000,1151.055000"
+     id="polygon482" />
+  <rect
+     fill="rgb(191,0,0)"
+     stroke="rgb(191,0,0)"
+     stroke-opacity="1"
+     x="1148.26"
+     y="1151.06"
+     width="14.29"
+     height="14.29"
+     id="rect484" />
+  <polygon
+     fill="rgb(0,0,127)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="155.100000,372.250000 298.000000,443.700000 155.100000,515.150000 155.100000,372.250000"
+     id="polygon486" />
+  <text
+     fill="rgb(0,0,127)"
+     font-size="36"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="140.81"
+     y="340.098"
+     id="text488">TAir</text>
+  <polygon
+     fill="rgb(0,0,127)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="155.100000,86.450000 298.000000,157.900000 155.100000,229.350000 155.100000,86.450000"
+     id="polygon490" />
+  <text
+     fill="rgb(0,0,127)"
+     font-size="36"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="140.81"
+     y="54.2975"
+     id="text492">y</text>
+  <polygon
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="1727.000000,122.175000 1798.450000,157.900000 1727.000000,193.625000 1727.000000,122.175000"
+     id="polygon494" />
+  <text
+     fill="rgb(0,0,127)"
+     font-size="36"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1819.89"
+     y="97.1675"
+     id="text496">PFan</text>
+  <polygon
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="655.250000,401.544500 669.540000,407.975000 655.250000,414.405500 655.250000,401.544500"
+     id="polygon498" />
+  <polygon
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="655.250000,515.864500 669.540000,522.295000 655.250000,528.725500 655.250000,515.864500"
+     id="polygon500" />
+  <polygon
+     fill="rgb(0,0,127)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="841.020000,300.800000 869.600000,315.090000 841.020000,329.380000 841.020000,300.800000"
+     id="polygon502" />
+  <polygon
+     fill="rgb(0,0,127)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="841.020000,415.120000 869.600000,429.410000 841.020000,443.700000 841.020000,415.120000"
+     id="polygon504" />
+  <polygon
+     fill="rgb(0,0,127)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="841.020000,386.540000 869.600000,400.830000 841.020000,415.120000 841.020000,386.540000"
+     id="polygon506" />
+  <polygon
+     fill="rgb(0,0,127)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="841.020000,329.380000 869.600000,343.670000 841.020000,357.960000 841.020000,329.380000"
+     id="polygon508" />
+  <polygon
+     fill="rgb(255,255,255)"
+     stroke="rgb(0,0,127)"
+     stroke-opacity="1"
+     points="1012.500000,365.105000 1026.790000,372.250000 1012.500000,379.395000 1012.500000,365.105000"
+     id="polygon510" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.png
deleted file mode 100644
index 2cf6cf77872..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.svg
new file mode 100644
index 00000000000..e5deea24f6e
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/MixingVolumeInitialization.svg
@@ -0,0 +1,1181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 614.96002 211.86137"
+   version="1.1"
+   id="svg256"
+   sodipodi:docname="MixingVolumeInitialization.svg"
+   width="614.96002"
+   height="211.86137"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata262">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs260" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2070"
+     inkscape:window-height="1258"
+     id="namedview258"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.68613537"
+     inkscape:cx="552.26001"
+     inkscape:cy="149.16138"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg256" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-177.16138"
+     width="41"
+     height="56"
+     id="rect2" />
+  <rect
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-177.16138"
+     width="41"
+     height="56"
+     id="rect4" />
+  <rect
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-177.16138"
+     width="41"
+     height="56"
+     id="rect6" />
+  <rect
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-176.66138"
+     width="41"
+     height="55"
+     id="rect8" />
+  <rect
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-176.16138"
+     width="41"
+     height="54"
+     id="rect10" />
+  <rect
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-175.66138"
+     width="41"
+     height="53"
+     id="rect12" />
+  <rect
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-175.16138"
+     width="41"
+     height="52"
+     id="rect14" />
+  <rect
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-174.16138"
+     width="41"
+     height="50"
+     id="rect16" />
+  <rect
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-173.16138"
+     width="41"
+     height="48"
+     id="rect18" />
+  <rect
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-172.16138"
+     width="41"
+     height="46"
+     id="rect20" />
+  <rect
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-170.66138"
+     width="41"
+     height="43"
+     id="rect22" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-169.66138"
+     width="41"
+     height="41"
+     id="rect24" />
+  <rect
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-168.16138"
+     width="41"
+     height="38"
+     id="rect26" />
+  <rect
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-166.66138"
+     width="41"
+     height="35"
+     id="rect28" />
+  <rect
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-165.16138"
+     width="41"
+     height="32"
+     id="rect30" />
+  <rect
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-163.16138"
+     width="41"
+     height="28"
+     id="rect32" />
+  <rect
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-161.66138"
+     width="41"
+     height="25"
+     id="rect34" />
+  <rect
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-159.66138"
+     width="41"
+     height="21"
+     id="rect36" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-157.66138"
+     width="41"
+     height="17"
+     id="rect38" />
+  <rect
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-156.16138"
+     width="41"
+     height="14"
+     id="rect40" />
+  <rect
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-154.16138"
+     width="41"
+     height="10"
+     id="rect42" />
+  <rect
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-152.16138"
+     width="41"
+     height="6"
+     id="rect44" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-150.16138"
+     width="41"
+     height="2"
+     id="rect46" />
+  <circle
+     fill="#ffffff"
+     stroke="#0000ff"
+     stroke-opacity="1"
+     cx="50.66"
+     cy="149.16138"
+     id="ellipse48"
+     r="50.16" />
+  <polygon
+     fill="#0000ff"
+     stroke="#0000ff"
+     stroke-opacity="1"
+     points="389.32,684.636 389.32,598.11 464.56,642 "
+     id="polygon50"
+     transform="translate(-363.73999,-492.83862)" />
+  <text
+     fill="#ff0000"
+     font-size="39px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="51.287014"
+     y="148.53436"
+     id="text52">m</text>
+  <circle
+     fill="#ff0000"
+     stroke="#ff0000"
+     stroke-opacity="1"
+     cx="49.406002"
+     cy="132.85938"
+     id="ellipse54"
+     r="2.5079999" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="56.303005"
+     y="67.651367"
+     id="text56">sou</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="552.26001"
+     y="67.651367"
+     id="text58">sin</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse60"
+     r="62.700001" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse62"
+     r="62.547298" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse64"
+     r="62.089802" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse66"
+     r="61.329899" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse68"
+     r="60.271099" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse70"
+     r="58.918701" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse72"
+     r="57.279301" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse74"
+     r="55.360802" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse76"
+     r="53.1726" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse78"
+     r="50.725399" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse80"
+     r="48.030998" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse82"
+     r="45.1026" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse84"
+     r="41.954498" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse86"
+     r="38.602001" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse88"
+     r="35.061401" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse90"
+     r="31.35" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse92"
+     r="27.485901" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse94"
+     r="23.487801" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse96"
+     r="19.375401" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse98"
+     r="15.1685" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse100"
+     r="10.8877" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse102"
+     r="6.5539298" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse104"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="551.00598"
+     y="147.2804"
+     id="text106" />
+  <text
+     fill="#ffffff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="300.20599"
+     y="112.79535"
+     id="text108">V=0.1 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="300.20599"
+     y="11.221375"
+     id="text110">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse112"
+     r="62.700001" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse114"
+     r="62.547298" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse116"
+     r="62.089802" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse118"
+     r="61.329899" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse120"
+     r="60.271099" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse122"
+     r="58.918701" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse124"
+     r="57.279301" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse126"
+     r="55.360802" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse128"
+     r="53.1726" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse130"
+     r="50.725399" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse132"
+     r="48.030998" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse134"
+     r="45.1026" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse136"
+     r="41.954498" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse138"
+     r="38.602001" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse140"
+     r="35.061401" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse142"
+     r="31.35" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse144"
+     r="27.485901" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse146"
+     r="23.487801" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse148"
+     r="19.375401" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse150"
+     r="15.1685" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse152"
+     r="10.8877" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse154"
+     r="6.5539298" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse156"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="302.71399"
+     y="84.580383"
+     id="text158" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="300.20599"
+     y="11.221375"
+     id="text160">vol</text>
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="853.300000,642.000000 652.660000,642.000000"
+     id="polyline162"
+     transform="translate(-363.73999,-492.83862)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="853.300000,642.000000 652.660000,642.000000"
+     id="polyline164"
+     transform="translate(-363.73999,-492.83862)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="489.640000,642.000000 677.740000,642.000000"
+     id="polyline166"
+     transform="translate(-363.73999,-492.83862)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="489.640000,642.000000 677.740000,642.000000"
+     id="polyline168"
+     transform="translate(-363.73999,-492.83862)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="119.40002"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect170" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse172"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse174"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse176"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse178"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse180"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse182"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="119.40002"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect184" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse186"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse188"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse190"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse192"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse194"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse196"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-496.06"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect198" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse200"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse202"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse204"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse206"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse208"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse210"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-496.06"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect212" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse214"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse216"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse218"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse220"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse222"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse224"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="276.45999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect226" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse228" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse230" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse232" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse234" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse236" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse238" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="276.45999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect240" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse242" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse244" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse246" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse248" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse250" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse252" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="232.26001"
+     y="-92.96138"
+     width="13"
+     height="13"
+     id="rect254" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.png
deleted file mode 100644
index e47fab8b18c..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.svg
new file mode 100644
index 00000000000..85b1ac281ea
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/fanStepSchematics.svg
@@ -0,0 +1,1063 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 644.98609 647.25202"
+   version="1.1"
+   id="svg876"
+   sodipodi:docname="fanStepSchematics.svg"
+   width="644.98608"
+   height="647.25201"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata882">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs880" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2769"
+     inkscape:window-height="2010"
+     id="namedview878"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.750088"
+     inkscape:cx="318.52443"
+     inkscape:cy="323.62603"
+     inkscape:window-x="67"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg876"
+     inkscape:document-rotation="0" />
+  <polyline
+     points="769.250000,541.000000 532.550000,541.000000"
+     id="polyline973"
+     transform="matrix(0.34259954,0,0,1,-180.93436,-444.41422)"
+     style="fill:none;stroke:#ff00ff;stroke-opacity:1" />
+  <text
+     font-size="26px"
+     dominant-baseline="central"
+     x="382.64407"
+     y="639.40002"
+     id="text2"
+     style="font-size:26px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">fanC</text>
+  <polyline
+     points="821.850000,757.975000 887.600000,757.975000"
+     id="polyline4"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="821.850000,744.825000 887.600000,744.825000"
+     id="polyline6"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.79504"
+     width="132"
+     height="21"
+     id="rect8"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.79504"
+     width="132"
+     height="21"
+     id="rect10"
+     style="fill:#001021;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.29504"
+     width="132"
+     height="20"
+     id="rect12"
+     style="fill:#002041;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.29504"
+     width="132"
+     height="20"
+     id="rect14"
+     style="fill:#003061;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-566.29504"
+     width="132"
+     height="18"
+     id="rect16"
+     style="fill:#003f7f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-565.79504"
+     width="132"
+     height="17"
+     id="rect18"
+     style="fill:#004d9b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-564.79504"
+     width="132"
+     height="15"
+     id="rect20"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-563.79504"
+     width="132"
+     height="13"
+     id="rect22"
+     style="fill:#0064ca;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-562.79504"
+     width="132"
+     height="11"
+     id="rect24"
+     style="fill:#006ddc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-561.79504"
+     width="132"
+     height="9"
+     id="rect26"
+     style="fill:#0075eb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-560.79504"
+     width="132"
+     height="7"
+     id="rect28"
+     style="fill:#007af6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-559.29504"
+     width="132"
+     height="4"
+     id="rect30"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-557.79504"
+     width="132"
+     height="1"
+     id="rect32"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse34"
+     r="38.134998"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse36"
+     r="38.042099"
+     style="fill:#00070e;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse38"
+     r="37.763901"
+     style="fill:#000e1c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse40"
+     r="37.301701"
+     style="fill:#00152a;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse42"
+     r="36.6577"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse44"
+     r="35.835201"
+     style="fill:#002245;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse46"
+     r="34.8381"
+     style="fill:#002952;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse48"
+     r="33.6712"
+     style="fill:#002f5f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse50"
+     r="32.340302"
+     style="fill:#00366b;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse52"
+     r="30.8519"
+     style="fill:#003b77;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse54"
+     r="29.2131"
+     style="fill:#004182;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse56"
+     r="27.431999"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse58"
+     r="25.5173"
+     style="fill:#004b96;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse60"
+     r="23.4783"
+     style="fill:#00509f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse62"
+     r="21.3248"
+     style="fill:#0054a7;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse64"
+     r="19.067499"
+     style="fill:#0057ae;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse66"
+     r="16.7173"
+     style="fill:#005ab5;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse68"
+     r="14.2856"
+     style="fill:#005dba;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse70"
+     r="11.7844"
+     style="fill:#005fbe;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse72"
+     r="9.2256899"
+     style="fill:#0061c2;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse74"
+     r="6.6220698"
+     style="fill:#0062c4;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse76"
+     r="3.9861901"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse78"
+     r="1.3308901"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="821.85,771.125 821.85,836.875 857.355,804 "
+     id="polygon80"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse82"
+     r="10.52"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse84"
+     r="10.437"
+     style="fill:#000d19;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse86"
+     r="10.1895"
+     style="fill:#001933;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse88"
+     r="9.78125"
+     style="fill:#00264c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse90"
+     r="9.21875"
+     style="fill:#003163;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse92"
+     r="8.5108604"
+     style="fill:#003c79;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse94"
+     r="7.6687498"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse96"
+     r="6.7056999"
+     style="fill:#004f9d;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse98"
+     r="5.6368999"
+     style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse100"
+     r="4.4791999"
+     style="fill:#005cb7;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse102"
+     r="3.25086"
+     style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse104"
+     r="1.9712501"
+     style="fill:#0063c5;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse106"
+     r="0.66055602"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="440.50406"
+     y="492.20303"
+     id="text108"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">P</text>
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="426.03909"
+     y="505.353"
+     id="text110"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y_actual</text>
+  <polyline
+     points="821.850000,738.250000 821.850000,771.125000"
+     id="polyline112"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     x="361.14407"
+     y="491.76999"
+     width="43"
+     height="39"
+     id="rect114"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     cx="382.64407"
+     cy="511.26999"
+     rx="21.6975"
+     ry="19.725"
+     id="ellipse116"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="30px"
+     font-weight="bold"
+     dominant-baseline="central"
+     x="382.64407"
+     y="511.92706"
+     id="text118"
+     style="font-weight:bold;font-size:30px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <text
+     font-size="33px"
+     dominant-baseline="central"
+     x="316.23605"
+     y="490.88699"
+     id="text120"
+     style="font-size:33px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y</text>
+  <text
+     font-size="26px"
+     dominant-baseline="central"
+     x="395.7941"
+     y="376.39999"
+     id="text122"
+     style="font-size:26px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">fanS</text>
+  <polyline
+     points="835.000000,494.975000 900.750000,494.975000"
+     id="polyline124"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="835.000000,481.825000 900.750000,481.825000"
+     id="polyline126"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="835.000000,475.250000 835.000000,514.700000"
+     id="polyline128"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.79501"
+     width="132"
+     height="21"
+     id="rect130"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.79501"
+     width="132"
+     height="21"
+     id="rect132"
+     style="fill:#001021;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.29501"
+     width="132"
+     height="20"
+     id="rect134"
+     style="fill:#002041;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.29501"
+     width="132"
+     height="20"
+     id="rect136"
+     style="fill:#003061;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-303.29501"
+     width="132"
+     height="18"
+     id="rect138"
+     style="fill:#003f7f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-302.79501"
+     width="132"
+     height="17"
+     id="rect140"
+     style="fill:#004d9b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-301.79501"
+     width="132"
+     height="15"
+     id="rect142"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-300.79501"
+     width="132"
+     height="13"
+     id="rect144"
+     style="fill:#0064ca;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-299.79501"
+     width="132"
+     height="11"
+     id="rect146"
+     style="fill:#006ddc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-298.79501"
+     width="132"
+     height="9"
+     id="rect148"
+     style="fill:#0075eb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-297.79501"
+     width="132"
+     height="7"
+     id="rect150"
+     style="fill:#007af6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-296.29501"
+     width="132"
+     height="4"
+     id="rect152"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-294.79501"
+     width="132"
+     height="1"
+     id="rect154"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse156"
+     r="38.134998"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse158"
+     r="38.042099"
+     style="fill:#00070e;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse160"
+     r="37.763901"
+     style="fill:#000e1c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse162"
+     r="37.301701"
+     style="fill:#00152a;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse164"
+     r="36.6577"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse166"
+     r="35.835201"
+     style="fill:#002245;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse168"
+     r="34.8381"
+     style="fill:#002952;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse170"
+     r="33.6712"
+     style="fill:#002f5f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse172"
+     r="32.340302"
+     style="fill:#00366b;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse174"
+     r="30.8519"
+     style="fill:#003b77;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse176"
+     r="29.2131"
+     style="fill:#004182;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse178"
+     r="27.431999"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse180"
+     r="25.5173"
+     style="fill:#004b96;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse182"
+     r="23.4783"
+     style="fill:#00509f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse184"
+     r="21.3248"
+     style="fill:#0054a7;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse186"
+     r="19.067499"
+     style="fill:#0057ae;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse188"
+     r="16.7173"
+     style="fill:#005ab5;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse190"
+     r="14.2856"
+     style="fill:#005dba;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse192"
+     r="11.7844"
+     style="fill:#005fbe;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse194"
+     r="9.2256899"
+     style="fill:#0061c2;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse196"
+     r="6.6220698"
+     style="fill:#0062c4;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse198"
+     r="3.9861901"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse200"
+     r="1.3308901"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="835,508.125 835,573.875 870.505,541 "
+     id="polygon202"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="453.65408"
+     y="229.20299"
+     id="text204"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">P</text>
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="439.18906"
+     y="242.35301"
+     id="text206"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y_actual</text>
+  <polyline
+     points="835.000000,475.250000 835.000000,508.125000"
+     id="polyline208"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="33px"
+     dominant-baseline="central"
+     x="329.38608"
+     y="227.88701"
+     id="text210"
+     style="font-size:33px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y</text>
+  <rect
+     transform="scale(1,-1)"
+     x="92.436073"
+     y="-163.045"
+     width="132"
+     height="132"
+     id="rect274"
+     style="fill:#d2d2d2;stroke:#000000;stroke-opacity:1" />
+  <rect
+     x="90.893105"
+     y="29.502007"
+     width="1.79333"
+     height="133.293"
+     id="rect276"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="90.893105"
+     y="162.795"
+     width="133.293"
+     height="1.79333"
+     id="rect278"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="224.18608"
+     y="31.295006"
+     width="1.79333"
+     height="133.293"
+     id="rect280"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="92.686073"
+     y="29.502007"
+     width="133.293"
+     height="1.79333"
+     id="rect282"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="92.686073"
+     y="31.295006"
+     width="2.6900001"
+     height="131.5"
+     id="rect284"
+     style="fill:#ffffff;stroke:none" />
+  <rect
+     x="92.686073"
+     y="31.295006"
+     width="131.5"
+     height="2.6900001"
+     id="rect286"
+     style="fill:#ffffff;stroke:none" />
+  <rect
+     x="222.39311"
+     y="31.295006"
+     width="1.79333"
+     height="131.5"
+     id="rect288"
+     style="fill:#716f64;stroke:none" />
+  <rect
+     x="92.686073"
+     y="161.002"
+     width="131.5"
+     height="1.79333"
+     id="rect290"
+     style="fill:#716f64;stroke:none" />
+  <rect
+     x="220.59911"
+     y="33.088005"
+     width="1.79333"
+     height="127.913"
+     id="rect292"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="94.479103"
+     y="159.20799"
+     width="127.913"
+     height="1.79333"
+     id="rect294"
+     style="fill:#aca899;stroke:none" />
+  <circle
+     cx="107.15111"
+     cy="97.045006"
+     id="ellipse296"
+     r="4.6025"
+     style="fill:#ebebeb;stroke:#ebebeb;stroke-opacity:1" />
+  <text
+     font-size="26px"
+     dominant-baseline="central"
+     x="158.43608"
+     y="11.570001"
+     id="text298"
+     style="font-size:26px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">booToInt</text>
+  <text
+     font-size="32px"
+     dominant-baseline="central"
+     x="159.09306"
+     y="137.81001"
+     id="text300"
+     style="font-size:32px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">0</text>
+  <text
+     font-size="32px"
+     dominant-baseline="central"
+     x="159.09306"
+     y="100.36002"
+     id="text302"
+     style="font-size:32px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">1</text>
+  <text
+     font-size="34px"
+     dominant-baseline="central"
+     x="118.98606"
+     y="62.855003"
+     id="text304"
+     style="font-size:34px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ff00ff">B</text>
+  <polygon
+     points="602.245,318.765 602.245,325.34 615.395,312.19 602.245,299.04 602.245,305.615 581.205,305.615 581.205,318.765 "
+     id="polygon306"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="38px"
+     dominant-baseline="central"
+     x="197.88609"
+     y="62.198021"
+     id="text308"
+     style="font-size:38px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">R</text>
+  <polyline
+     points="677.200000,343.750000 835.000000,343.750000 835.000000,462.100000"
+     id="polyline734"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="677.200000,343.750000 835.000000,343.750000 835.000000,462.100000"
+     id="polyline736"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="677.200000,343.750000 703.500000,343.750000 703.500000,672.500000 821.850000,672.500000 821.850000,725.100000"
+     id="polyline738"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="677.200000,343.750000 703.500000,343.750000 703.500000,672.500000 821.850000,672.500000 821.850000,725.100000"
+     id="polyline740"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="1084.850000,541.000000 900.750000,541.000000"
+     id="polyline742"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1084.850000,541.000000 900.750000,541.000000"
+     id="polyline744"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="887.600000,804.000000 1071.700000,804.000000"
+     id="polyline746"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="887.600000,804.000000 1071.700000,804.000000"
+     id="polyline748"
+     transform="matrix(1.0647915,0,0,1,-497.37286,-246.46156)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="756.100000,804.000000 519.400000,804.000000"
+     id="polyline750"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="756.100000,804.000000 519.400000,804.000000"
+     id="polyline752"
+     transform="matrix(1.329424,0,0,1,-688.94136,-246.70499)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="769.250000,541.000000 532.550000,541.000000"
+     id="polyline754"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="769.250000,541.000000 532.550000,541.000000"
+     id="polyline756"
+     transform="matrix(1.0531989,0,0,1,-480.78718,-246.70499)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="263.63608"
+     cy="97.045006"
+     id="ellipse758"
+     r="3"
+     style="fill:#00007f;stroke:#00007f" />
+  <circle
+     cx="316.23605"
+     cy="557.29504"
+     id="ellipse760"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="316.23605"
+     cy="557.29504"
+     id="ellipse762"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-447.73608"
+     cy="-557.29504"
+     id="ellipse764"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-447.73608"
+     cy="-557.29504"
+     id="ellipse766"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-447.73608"
+     cy="-557.29504"
+     id="ellipse768"
+     r="5.2600002"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="887.6,751.4 900.75,757.975 887.6,764.55 "
+     id="polygon770"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="887.6,738.25 900.75,744.825 887.6,751.4 "
+     id="polygon772"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="375.48608"
+     y="-608.505"
+     width="13"
+     height="13"
+     id="rect774"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="835,711.95 821.85,738.25 808.7,711.95 "
+     id="polygon776"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     cx="329.38608"
+     cy="294.29501"
+     id="ellipse778"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="329.38608"
+     cy="294.29501"
+     id="ellipse780"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-460.88605"
+     cy="-294.29501"
+     id="ellipse782"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-460.88605"
+     cy="-294.29501"
+     id="ellipse784"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-460.88605"
+     cy="-294.29501"
+     id="ellipse786"
+     r="5.2600002"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="900.75,488.4 913.9,494.975 900.75,501.55 "
+     id="polygon788"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="900.75,475.25 913.9,481.825 900.75,488.4 "
+     id="polygon790"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="388.63608"
+     y="-345.505"
+     width="13"
+     height="13"
+     id="rect792"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="848.15,448.95 835,475.25 821.85,448.95 "
+     id="polygon794"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="519.4,337.175 532.55,343.75 519.4,350.325 "
+     id="polygon800"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ff00ff;stroke:#ff00ff;stroke-opacity:1" />
+  <polygon
+     points="664.05,337.175 677.2,343.75 664.05,350.325 "
+     id="polygon802"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     transform="matrix(1.3915761,0,0,1,-741.08385,-246.70499)"
+     id="polyline967"
+     points="769.250000,541.000000 532.550000,541.000000"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuit.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuit.svg
new file mode 100644
index 00000000000..6a68ca486a3
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuit.svg
@@ -0,0 +1,1501 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 880.29999 508.6012"
+   version="1.1"
+   id="svg408"
+   sodipodi:docname="flowCircuit.svg"
+   inkscape:export-filename="flowCircuitWithBoundary.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   width="880.29999"
+   height="508.6012"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata414">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs412" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1587"
+     inkscape:window-height="1149"
+     id="namedview410"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.62326136"
+     inkscape:cx="131.33301"
+     inkscape:cy="546.04967"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg408"
+     inkscape:document-rotation="0" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="316.62701"
+     y="496.51935"
+     id="text2">pump</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,472.710000 916.000000,472.710000"
+     id="polyline4"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,460.170000 916.000000,460.170000"
+     id="polyline6"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,491.520000"
+     id="polyline8"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect10" />
+  <rect
+     fill="#001021"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect12" />
+  <rect
+     fill="#002041"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect14" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect16" />
+  <rect
+     fill="#003f7f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-421.50137"
+     width="125"
+     height="18"
+     id="rect18" />
+  <rect
+     fill="#004d9b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect20" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.00137"
+     width="125"
+     height="15"
+     id="rect22" />
+  <rect
+     fill="#0064ca"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-419.00137"
+     width="125"
+     height="13"
+     id="rect24" />
+  <rect
+     fill="#006ddc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-418.00137"
+     width="125"
+     height="11"
+     id="rect26" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect28" />
+  <rect
+     fill="#007af6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-415.50137"
+     width="125"
+     height="6"
+     id="rect30" />
+  <rect
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-414.50137"
+     width="125"
+     height="4"
+     id="rect32" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-413.00137"
+     width="125"
+     height="1"
+     id="rect34" />
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse36"
+     r="36.366001" />
+  <circle
+     fill="#00070e"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse38"
+     r="36.277401" />
+  <circle
+     fill="#000e1c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse40"
+     r="36.0121" />
+  <circle
+     fill="#00152a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse42"
+     r="35.571301" />
+  <circle
+     fill="#001c38"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse44"
+     r="34.957199" />
+  <circle
+     fill="#002245"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse46"
+     r="34.172901" />
+  <circle
+     fill="#002952"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse48"
+     r="33.222" />
+  <circle
+     fill="#002f5f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse50"
+     r="32.109299" />
+  <circle
+     fill="#00366b"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse52"
+     r="30.840099" />
+  <circle
+     fill="#003b77"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse54"
+     r="29.4207" />
+  <circle
+     fill="#004182"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse56"
+     r="27.858" />
+  <circle
+     fill="#00468c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse58"
+     r="26.1595" />
+  <circle
+     fill="#004b96"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse60"
+     r="24.333599" />
+  <circle
+     fill="#00509f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse62"
+     r="22.389099" />
+  <circle
+     fill="#0054a7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse64"
+     r="20.3356" />
+  <circle
+     fill="#0057ae"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse66"
+     r="18.183001" />
+  <circle
+     fill="#005ab5"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse68"
+     r="15.9418" />
+  <circle
+     fill="#005dba"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse70"
+     r="13.6229" />
+  <circle
+     fill="#005fbe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse72"
+     r="11.2377" />
+  <circle
+     fill="#0061c2"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse74"
+     r="8.7977304" />
+  <circle
+     fill="#0062c4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse76"
+     r="6.3148899" />
+  <circle
+     fill="#0063c6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse78"
+     r="3.80128" />
+  <circle
+     fill="#0064c7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse80"
+     r="1.26916" />
+  <polygon
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     points="887.158,516.6 853.3,485.25 853.3,547.95 "
+     id="polygon82"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="371.80304"
+     y="350.42838"
+     id="text84">P</text>
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="358.00903"
+     y="362.96835"
+     id="text86">y_actual</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,485.250000"
+     id="polyline88"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="253.29997"
+     y="349.17438"
+     id="text90">y</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="567.42999"
+     y="496.51935"
+     id="text92">res</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect94" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect96" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect98" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.00137"
+     width="125"
+     height="49"
+     id="rect100" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.50137"
+     width="125"
+     height="48"
+     id="rect102" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.00137"
+     width="125"
+     height="47"
+     id="rect104" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-435.50137"
+     width="125"
+     height="46"
+     id="rect106" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.50137"
+     width="125"
+     height="44"
+     id="rect108" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.00137"
+     width="125"
+     height="43"
+     id="rect110" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-433.00137"
+     width="125"
+     height="41"
+     id="rect112" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-431.50137"
+     width="125"
+     height="38"
+     id="rect114" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-430.50137"
+     width="125"
+     height="36"
+     id="rect116" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-429.50137"
+     width="125"
+     height="34"
+     id="rect118" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-428.00137"
+     width="125"
+     height="31"
+     id="rect120" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.50137"
+     width="125"
+     height="28"
+     id="rect122" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.00137"
+     width="125"
+     height="25"
+     id="rect124" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.50137"
+     width="125"
+     height="22"
+     id="rect126" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect128" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect130" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-418.50137"
+     width="125"
+     height="12"
+     id="rect132" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect134" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.00137"
+     width="125"
+     height="5"
+     id="rect136" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.50137"
+     width="125"
+     height="2"
+     id="rect138" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect140" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect142" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect144" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect146" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.62839"
+     width="125"
+     height="27"
+     id="rect148" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.12839"
+     width="125"
+     height="26"
+     id="rect150" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.12839"
+     width="125"
+     height="24"
+     id="rect152" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-424.62839"
+     width="125"
+     height="23"
+     id="rect154" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.62839"
+     width="125"
+     height="21"
+     id="rect156" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.62839"
+     width="125"
+     height="19"
+     id="rect158" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-421.62839"
+     width="125"
+     height="17"
+     id="rect160" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.12839"
+     width="125"
+     height="14"
+     id="rect162" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-419.12839"
+     width="125"
+     height="12"
+     id="rect164" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.62839"
+     width="125"
+     height="9"
+     id="rect166" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-416.62839"
+     width="125"
+     height="7"
+     id="rect168" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.12839"
+     width="125"
+     height="4"
+     id="rect170" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.62839"
+     width="125"
+     height="1"
+     id="rect172" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect174" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect176" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="112.79537"
+     id="text178">V=1 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text180">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse182"
+     r="62.700001" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse184"
+     r="62.547298" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse186"
+     r="62.089802" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse188"
+     r="61.329899" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse190"
+     r="60.271099" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse192"
+     r="58.918701" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse194"
+     r="57.279301" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse196"
+     r="55.360802" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse198"
+     r="53.1726" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse200"
+     r="50.725399" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse202"
+     r="48.030998" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse204"
+     r="45.1026" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse206"
+     r="41.954498" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse208"
+     r="38.602001" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse210"
+     r="35.061401" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse212"
+     r="31.35" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse214"
+     r="27.485901" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse216"
+     r="23.487801" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse218"
+     r="19.375401" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse220"
+     r="15.1685" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse222"
+     r="10.8877" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse224"
+     r="6.5539298" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse226"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="442.65399"
+     y="84.580376"
+     id="text228" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text230">vol</text>
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="65.400009"
+     y="224.60138"
+     width="125"
+     height="125"
+     id="rect232" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="205.59137"
+     id="text234">con</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="615.040000,348.564000 615.040000,441.360000"
+     id="polyline236"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="620.056,348.564 615.04,334.77 610.024,348.564 "
+     id="polygon238"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="608.770000,435.090000 716.614000,435.090000"
+     id="polyline240"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="707.836,440.106 721.63,435.09 707.836,430.074 "
+     id="polygon242"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="615.040000,391.200000 715.360000,391.200000"
+     id="polyline244"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="368.61136"
+     id="text246">k=1</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="231.98198"
+     y="265.15637"
+     id="text248" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="816.35004"
+     y="172.36038"
+     id="text298" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline300"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline302"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline304"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline306"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline308"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline310"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline312"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline314"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1292.200000,278.340000 995.420209,278.340000 995.420209,253.260000"
+     id="polyline316"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse320"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse322"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse324"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse326"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse328"
+     r="5.0159998" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,478.98 916,466.44 928.54,472.71 "
+     id="polygon330"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,466.44 916,453.9 928.54,460.17 "
+     id="polygon332"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="309.5"
+     y="-461.63736"
+     width="13"
+     height="13"
+     id="rect334" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="840.76,428.82 865.84,428.82 853.3,453.9 "
+     id="polygon336"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse338"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse340"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse342"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse344"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse346"
+     r="5.0159998" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect348" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse350" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse352" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse354" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse356" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse358" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse360" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect362" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse364" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse366" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse368" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse370" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse372" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse374" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="372.20001"
+     y="-92.961372"
+     width="13"
+     height="13"
+     id="rect376" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="727.9,397.47 727.9,384.93 740.44,391.2 "
+     id="polygon378"
+     transform="translate(-537.3,-104.09863)" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitNoExpansion.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitNoExpansion.png
deleted file mode 100644
index d3678229e01..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitNoExpansion.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.png
deleted file mode 100644
index 825bc9f5464..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.svg
new file mode 100644
index 00000000000..ac588bb221b
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithBoundary.svg
@@ -0,0 +1,1851 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 880.29999 508.6012"
+   version="1.1"
+   id="svg408"
+   sodipodi:docname="FlowCircuit.svg"
+   inkscape:export-filename="flowCircuitWithBoundary.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   width="880.29999"
+   height="508.6012"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata414">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs412" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1587"
+     inkscape:window-height="1149"
+     id="namedview410"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.68613537"
+     inkscape:cx="378.7"
+     inkscape:cy="537.90137"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg408" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="316.62701"
+     y="496.51935"
+     id="text2">pump</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,472.710000 916.000000,472.710000"
+     id="polyline4"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,460.170000 916.000000,460.170000"
+     id="polyline6"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,491.520000"
+     id="polyline8"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect10" />
+  <rect
+     fill="#001021"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect12" />
+  <rect
+     fill="#002041"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect14" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect16" />
+  <rect
+     fill="#003f7f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-421.50137"
+     width="125"
+     height="18"
+     id="rect18" />
+  <rect
+     fill="#004d9b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect20" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.00137"
+     width="125"
+     height="15"
+     id="rect22" />
+  <rect
+     fill="#0064ca"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-419.00137"
+     width="125"
+     height="13"
+     id="rect24" />
+  <rect
+     fill="#006ddc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-418.00137"
+     width="125"
+     height="11"
+     id="rect26" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect28" />
+  <rect
+     fill="#007af6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-415.50137"
+     width="125"
+     height="6"
+     id="rect30" />
+  <rect
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-414.50137"
+     width="125"
+     height="4"
+     id="rect32" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-413.00137"
+     width="125"
+     height="1"
+     id="rect34" />
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse36"
+     r="36.366001" />
+  <circle
+     fill="#00070e"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse38"
+     r="36.277401" />
+  <circle
+     fill="#000e1c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse40"
+     r="36.0121" />
+  <circle
+     fill="#00152a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse42"
+     r="35.571301" />
+  <circle
+     fill="#001c38"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse44"
+     r="34.957199" />
+  <circle
+     fill="#002245"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse46"
+     r="34.172901" />
+  <circle
+     fill="#002952"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse48"
+     r="33.222" />
+  <circle
+     fill="#002f5f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse50"
+     r="32.109299" />
+  <circle
+     fill="#00366b"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse52"
+     r="30.840099" />
+  <circle
+     fill="#003b77"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse54"
+     r="29.4207" />
+  <circle
+     fill="#004182"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse56"
+     r="27.858" />
+  <circle
+     fill="#00468c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse58"
+     r="26.1595" />
+  <circle
+     fill="#004b96"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse60"
+     r="24.333599" />
+  <circle
+     fill="#00509f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse62"
+     r="22.389099" />
+  <circle
+     fill="#0054a7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse64"
+     r="20.3356" />
+  <circle
+     fill="#0057ae"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse66"
+     r="18.183001" />
+  <circle
+     fill="#005ab5"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse68"
+     r="15.9418" />
+  <circle
+     fill="#005dba"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse70"
+     r="13.6229" />
+  <circle
+     fill="#005fbe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse72"
+     r="11.2377" />
+  <circle
+     fill="#0061c2"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse74"
+     r="8.7977304" />
+  <circle
+     fill="#0062c4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse76"
+     r="6.3148899" />
+  <circle
+     fill="#0063c6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse78"
+     r="3.80128" />
+  <circle
+     fill="#0064c7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse80"
+     r="1.26916" />
+  <polygon
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     points="887.158,516.6 853.3,485.25 853.3,547.95 "
+     id="polygon82"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="371.80304"
+     y="350.42838"
+     id="text84">P</text>
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="358.00903"
+     y="362.96835"
+     id="text86">y_actual</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,485.250000"
+     id="polyline88"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="253.29997"
+     y="349.17438"
+     id="text90">y</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="567.42999"
+     y="496.51935"
+     id="text92">res</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect94" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect96" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect98" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.00137"
+     width="125"
+     height="49"
+     id="rect100" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.50137"
+     width="125"
+     height="48"
+     id="rect102" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.00137"
+     width="125"
+     height="47"
+     id="rect104" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-435.50137"
+     width="125"
+     height="46"
+     id="rect106" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.50137"
+     width="125"
+     height="44"
+     id="rect108" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.00137"
+     width="125"
+     height="43"
+     id="rect110" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-433.00137"
+     width="125"
+     height="41"
+     id="rect112" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-431.50137"
+     width="125"
+     height="38"
+     id="rect114" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-430.50137"
+     width="125"
+     height="36"
+     id="rect116" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-429.50137"
+     width="125"
+     height="34"
+     id="rect118" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-428.00137"
+     width="125"
+     height="31"
+     id="rect120" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.50137"
+     width="125"
+     height="28"
+     id="rect122" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.00137"
+     width="125"
+     height="25"
+     id="rect124" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.50137"
+     width="125"
+     height="22"
+     id="rect126" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect128" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect130" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-418.50137"
+     width="125"
+     height="12"
+     id="rect132" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect134" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.00137"
+     width="125"
+     height="5"
+     id="rect136" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.50137"
+     width="125"
+     height="2"
+     id="rect138" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect140" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect142" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect144" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect146" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.62839"
+     width="125"
+     height="27"
+     id="rect148" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.12839"
+     width="125"
+     height="26"
+     id="rect150" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.12839"
+     width="125"
+     height="24"
+     id="rect152" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-424.62839"
+     width="125"
+     height="23"
+     id="rect154" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.62839"
+     width="125"
+     height="21"
+     id="rect156" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.62839"
+     width="125"
+     height="19"
+     id="rect158" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-421.62839"
+     width="125"
+     height="17"
+     id="rect160" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.12839"
+     width="125"
+     height="14"
+     id="rect162" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-419.12839"
+     width="125"
+     height="12"
+     id="rect164" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.62839"
+     width="125"
+     height="9"
+     id="rect166" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-416.62839"
+     width="125"
+     height="7"
+     id="rect168" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.12839"
+     width="125"
+     height="4"
+     id="rect170" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.62839"
+     width="125"
+     height="1"
+     id="rect172" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect174" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect176" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="112.79537"
+     id="text178">V=1 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text180">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse182"
+     r="62.700001" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse184"
+     r="62.547298" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse186"
+     r="62.089802" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse188"
+     r="61.329899" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse190"
+     r="60.271099" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse192"
+     r="58.918701" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse194"
+     r="57.279301" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse196"
+     r="55.360802" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse198"
+     r="53.1726" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse200"
+     r="50.725399" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse202"
+     r="48.030998" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse204"
+     r="45.1026" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse206"
+     r="41.954498" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse208"
+     r="38.602001" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse210"
+     r="35.061401" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse212"
+     r="31.35" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse214"
+     r="27.485901" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse216"
+     r="23.487801" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse218"
+     r="19.375401" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse220"
+     r="15.1685" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse222"
+     r="10.8877" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse224"
+     r="6.5539298" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse226"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="442.65399"
+     y="84.580376"
+     id="text228" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text230">vol</text>
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="65.400009"
+     y="224.60138"
+     width="125"
+     height="125"
+     id="rect232" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="205.59137"
+     id="text234">con</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="615.040000,348.564000 615.040000,441.360000"
+     id="polyline236"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="620.056,348.564 615.04,334.77 610.024,348.564 "
+     id="polygon238"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="608.770000,435.090000 716.614000,435.090000"
+     id="polyline240"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="707.836,440.106 721.63,435.09 707.836,430.074 "
+     id="polygon242"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="615.040000,391.200000 715.360000,391.200000"
+     id="polyline244"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="368.61136"
+     id="text246">k=1</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="231.98198"
+     y="265.15637"
+     id="text248" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="817.60004"
+     y="92.731377"
+     id="text250">bou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse252"
+     r="62.700001" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse254"
+     r="62.547298" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse256"
+     r="62.089802" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse258"
+     r="61.329899" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse260"
+     r="60.271099" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse262"
+     r="58.918701" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse264"
+     r="57.279301" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse266"
+     r="55.360802" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse268"
+     r="53.1726" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse270"
+     r="50.725399" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse272"
+     r="48.030998" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse274"
+     r="45.1026" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse276"
+     r="41.954498" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse278"
+     r="38.602001" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse280"
+     r="35.061401" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse282"
+     r="31.35" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse284"
+     r="27.485901" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse286"
+     r="23.487801" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse288"
+     r="19.375401" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse290"
+     r="15.1685" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse292"
+     r="10.8877" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse294"
+     r="6.5539298" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse296"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="816.35004"
+     y="172.36038"
+     id="text298" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline300"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline302"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline304"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline306"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline308"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline310"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline312"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline314"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1292.200000,278.340000 995.420209,278.340000 995.420209,253.260000"
+     id="polyline316"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="1292.200000,278.340000 995.420209,278.340000 995.420209,253.260000"
+     id="polyline318"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse320"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse322"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse324"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse326"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse328"
+     r="5.0159998" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,478.98 916,466.44 928.54,472.71 "
+     id="polygon330"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,466.44 916,453.9 928.54,460.17 "
+     id="polygon332"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="309.5"
+     y="-461.63736"
+     width="13"
+     height="13"
+     id="rect334" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="840.76,428.82 865.84,428.82 853.3,453.9 "
+     id="polygon336"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse338"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse340"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse342"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse344"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse346"
+     r="5.0159998" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect348" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse350" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse352" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse354" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse356" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse358" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse360" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect362" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse364" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse366" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse368" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse370" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse372" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse374" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="372.20001"
+     y="-92.961372"
+     width="13"
+     height="13"
+     id="rect376" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="727.9,397.47 727.9,384.93 740.44,391.2 "
+     id="polygon378"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-761.40002"
+     y="149.24138"
+     width="13"
+     height="50"
+     id="rect380" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse382"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse384"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse386"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse388"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse390"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse392"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-761.40002"
+     y="149.24138"
+     width="13"
+     height="50"
+     id="rect394" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse396"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse398"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse400"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse402"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse404"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse406"
+     r="3.7620001" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithExpansionVessel.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithExpansionVessel.png
deleted file mode 100644
index c577ae48f25..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/flowCircuitWithExpansionVessel.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.png
deleted file mode 100644
index d2ab3b039b3..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.svg
new file mode 100644
index 00000000000..961f65ef4f1
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixing.svg
@@ -0,0 +1,2044 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 413.1954 400.40726"
+   version="1.1"
+   id="svg560"
+   sodipodi:docname="fluidJunctionMixing.svg"
+   width="413.1954"
+   height="400.40726"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata566">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs564" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3293"
+     inkscape:window-height="2038"
+     id="namedview562"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="4.5154026"
+     inkscape:cx="201.95941"
+     inkscape:cy="155.91079"
+     inkscape:window-x="67"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg560" />
+  <g
+     id="g1389"
+     transform="translate(-1166.5828,-646.63279)">
+    <polyline
+       id="polyline1385"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       id="polyline1387"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(-1433.9876,-646.63279)"
+     id="g1401">
+    <polyline
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       id="polyline1397" />
+    <polyline
+       style="fill:none;stroke:#007fff;stroke-opacity:1"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       id="polyline1399" />
+  </g>
+  <polygon
+     points="1234.1626,712.53478 1232.7043,695.52174 1216.1774,695.52174 1212.7748,744.13044 1236.593,744.13044 1235.1348,727.60348 1249.7174,727.60348 1249.7174,712.53478 "
+     id="polygon2"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1231.7322,715.4513 1230.2739,695.52174 1220.0661,695.52174 1216.1774,744.13044 1233.6765,744.13044 1232.2183,724.20087 1249.7174,724.20087 1249.7174,715.4513 "
+     id="polygon4"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text6"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="-73.436195"
+     y="29.144512">spl</text>
+  <rect
+     transform="rotate(-90)"
+     x="-97.4972"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect8"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-97.4972"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect10"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-73.193199"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect12"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-73.193199"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect14"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-75.624199"
+     y="58.794514"
+     width="0"
+     height="0"
+     id="rect16"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-75.624199"
+     y="58.794514"
+     width="0"
+     height="0"
+     id="rect18"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-73.193161"
+     cy="58.794502"
+     id="ellipse20"
+     r="8.5065203"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1484.0113,727.11739 1485.4696,744.13044 1501.9965,744.13044 1505.3991,695.52174 1481.5809,695.52174 1483.0391,712.0487 1468.4565,712.0487 1468.4565,727.11739 "
+     id="polygon22"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1486.4417,724.20087 1487.9,744.13044 1498.1078,744.13044 1501.9965,695.52174 1484.4974,695.52174 1485.9557,715.4513 1468.4565,715.4513 1468.4565,724.20087 "
+     id="polygon24"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text26"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="72.950195"
+     y="-355.79449">mix2</text>
+  <rect
+     transform="rotate(90)"
+     x="48.889202"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect28"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="48.889202"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect30"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="73.193199"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect32"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="73.193199"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect34"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="70.763199"
+     y="-326.1445"
+     width="0"
+     height="0"
+     id="rect36"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="70.763199"
+     y="-326.1445"
+     width="0"
+     height="0"
+     id="rect38"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="73.193207"
+     cy="-326.1445"
+     id="ellipse40"
+     r="8.5065203"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text42"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="-291.68921"
+     y="91.36451">pumBoi</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect48"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect50"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect52"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect54"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect56"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect58"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect60"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect62"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect64"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.794514"
+     width="49"
+     height="6"
+     id="rect66"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.794514"
+     width="49"
+     height="6"
+     id="rect68"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.794514"
+     width="49"
+     height="6"
+     id="rect70"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.294514"
+     width="49"
+     height="5"
+     id="rect72"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.294514"
+     width="49"
+     height="5"
+     id="rect74"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.794514"
+     width="49"
+     height="4"
+     id="rect76"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.794514"
+     width="49"
+     height="4"
+     id="rect78"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.294514"
+     width="49"
+     height="3"
+     id="rect80"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.294514"
+     width="49"
+     height="3"
+     id="rect82"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.794514"
+     width="49"
+     height="2"
+     id="rect84"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.794514"
+     width="49"
+     height="2"
+     id="rect86"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.294514"
+     width="49"
+     height="1"
+     id="rect88"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.294514"
+     width="49"
+     height="1"
+     id="rect90"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-58.794514"
+     width="49"
+     height="0"
+     id="rect92"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse94"
+     r="14.0965"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse96"
+     r="14.0327"
+     style="fill:#000913;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse98"
+     r="13.8418"
+     style="fill:#001326;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse100"
+     r="13.5255"
+     style="fill:#001d39;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse102"
+     r="13.0868"
+     style="fill:#00264c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse104"
+     r="12.5295"
+     style="fill:#002f5d;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse106"
+     r="11.8587"
+     style="fill:#00376e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse108"
+     r="11.0806"
+     style="fill:#003f7e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse110"
+     r="10.2021"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse112"
+     r="9.2312603"
+     style="fill:#004d99;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse114"
+     r="8.1767797"
+     style="fill:#0053a5;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse116"
+     r="7.0482602"
+     style="fill:#0058af;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse118"
+     r="5.8559098"
+     style="fill:#005cb7;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse120"
+     r="4.6105199"
+     style="fill:#005fbe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse122"
+     r="3.32338"
+     style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse124"
+     r="2.00614"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse126"
+     r="0.67074001"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1237.5652,938.56522 1225.413,925.44087 1213.2609,938.56522 "
+     id="polygon128"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse130"
+     r="3.8887"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse132"
+     r="3.73118"
+     style="fill:#001e3d;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse134"
+     r="3.2713799"
+     style="fill:#003a74;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse136"
+     r="2.54655"
+     style="fill:#0050a0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse138"
+     r="1.61542"
+     style="fill:#005fbd;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse140"
+     r="0.55341899"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="1201.108696,938.565217 1213.260870,938.565217"
+     id="polyline146"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="rotate(-90)"
+     x="-299.68921"
+     y="34.284512"
+     width="16"
+     height="15"
+     id="rect148"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-291.68918"
+     cy="41.784534"
+     rx="8.0204296"
+     ry="7.2912998"
+     id="ellipse150"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text152"
+     style="font-weight:bold;font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="-291.68921"
+     y="42.024509">M</text>
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text154"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f"
+     x="-316.23721"
+     y="34.254513">m_flow</text>
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     x="204.38451"
+     y="397.41727"
+     id="text156"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+  <rect
+     transform="scale(-1)"
+     x="-221.62451"
+     y="-379.3472"
+     width="34"
+     height="29"
+     id="rect158"
+     style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1)"
+     x="-229.24451"
+     y="-365.7272"
+     width="49"
+     height="2"
+     id="rect160"
+     style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-204.47452"
+     y="363.7272"
+     width="24"
+     height="2"
+     id="rect162"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1374.1557,1024.1165 1367.8365,1024.1165 1371.2391,1019.7417 "
+     id="polygon164"
+     style="fill:#ffff00;stroke:none;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1395.543478,992.034783 1390.682609,992.034783 1390.682609,1022.172174 1372.697391,1022.172174"
+     id="polyline166"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1346.934783,992.034783 1351.795652,992.034783 1351.795652,1010.506087"
+     id="polyline168"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     x="180.31456"
+     y="335.92325"
+     id="text170"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     x="228.44456"
+     y="335.43723"
+     id="text172"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     x="379.61447"
+     y="333.25021"
+     id="text174"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse176"
+     r="24.3043"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse178"
+     r="24.2451"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse180"
+     r="24.067801"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse182"
+     r="23.773199"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse184"
+     r="23.362801"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse186"
+     r="22.8386"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse188"
+     r="22.2031"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse190"
+     r="21.459499"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse192"
+     r="20.6113"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse194"
+     r="19.6626"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse196"
+     r="18.6182"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse198"
+     r="17.483101"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse200"
+     r="16.2628"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse202"
+     r="14.9633"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse204"
+     r="13.5908"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse206"
+     r="12.1522"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse208"
+     r="10.6543"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse210"
+     r="9.1045704"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse212"
+     r="7.5104599"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse214"
+     r="5.8797498"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse216"
+     r="4.2204099"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse218"
+     r="2.5404999"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse220"
+     r="0.84820998"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     x="379.12448"
+     y="364.11722"
+     id="text222"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <polyline
+     points="1504.426957,817.043478 1519.009565,817.043478"
+     id="polyline224"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1509.773913,817.043478 1509.773913,826.765217"
+     id="polyline226"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="rotate(90)"
+     x="162.65421"
+     y="-350.65451"
+     width="16"
+     height="15"
+     id="rect228"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(90)"
+     cx="170.65422"
+     cy="-343.15451"
+     rx="8.0204296"
+     ry="7.2912998"
+     id="ellipse230"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text232"
+     style="font-weight:bold;font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="170.65421"
+     y="-343.40451">M</text>
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text234"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="146.1062"
+     y="-350.69449" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect236"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect238"
+     style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect240"
+     style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect242"
+     style="fill:#282828;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect244"
+     style="fill:#363636;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="317.1445"
+     width="49"
+     height="18"
+     id="rect246"
+     style="fill:#434343;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="317.1445"
+     width="49"
+     height="18"
+     id="rect248"
+     style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="317.6445"
+     width="49"
+     height="17"
+     id="rect250"
+     style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="318.1445"
+     width="49"
+     height="16"
+     id="rect252"
+     style="fill:#676767;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="318.1445"
+     width="49"
+     height="16"
+     id="rect254"
+     style="fill:#737373;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="318.6445"
+     width="49"
+     height="15"
+     id="rect256"
+     style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="319.1445"
+     width="49"
+     height="14"
+     id="rect258"
+     style="fill:#878787;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="319.6445"
+     width="49"
+     height="13"
+     id="rect260"
+     style="fill:#919191;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.1445"
+     width="49"
+     height="12"
+     id="rect262"
+     style="fill:#999999;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect264"
+     style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect266"
+     style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect268"
+     style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.6445"
+     width="49"
+     height="7"
+     id="rect270"
+     style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.1445"
+     width="49"
+     height="6"
+     id="rect272"
+     style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.6445"
+     width="49"
+     height="5"
+     id="rect274"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.6445"
+     width="49"
+     height="3"
+     id="rect276"
+     style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.1445"
+     width="49"
+     height="2"
+     id="rect278"
+     style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.6445"
+     width="49"
+     height="1"
+     id="rect280"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect282"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect284"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect286"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect288"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect290"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect292"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect294"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect296"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect298"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect300"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.1445"
+     width="49"
+     height="8"
+     id="rect302"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.1445"
+     width="49"
+     height="8"
+     id="rect304"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.6445"
+     width="49"
+     height="7"
+     id="rect306"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.6445"
+     width="49"
+     height="7"
+     id="rect308"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.1445"
+     width="49"
+     height="6"
+     id="rect310"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.6445"
+     width="49"
+     height="5"
+     id="rect312"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.6445"
+     width="49"
+     height="5"
+     id="rect314"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.1445"
+     width="49"
+     height="4"
+     id="rect316"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.6445"
+     width="49"
+     height="3"
+     id="rect318"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.6445"
+     width="49"
+     height="3"
+     id="rect320"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.1445"
+     width="49"
+     height="2"
+     id="rect322"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.6445"
+     width="49"
+     height="1"
+     id="rect324"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="326.1445"
+     width="49"
+     height="0"
+     id="rect326"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="155.9102"
+     y="316.6445"
+     width="29"
+     height="19"
+     id="rect328"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1507.3435,798.57217 1478.1783,798.57217 1492.7609,817.04348 "
+     id="polygon330"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1507.3435,835.51478 1478.1783,835.51478 1492.7609,817.04348 "
+     id="polygon332"
+     style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="160.9102"
+     y="301.68451"
+     width="19"
+     height="11"
+     id="rect334"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="160.9102"
+     y="301.68451"
+     width="19"
+     height="11"
+     id="rect336"
+     style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="161.4102"
+     y="301.68451"
+     width="18"
+     height="11"
+     id="rect338"
+     style="fill:#535353;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="162.4102"
+     y="301.68451"
+     width="16"
+     height="11"
+     id="rect340"
+     style="fill:#777777;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="163.9102"
+     y="301.68451"
+     width="13"
+     height="11"
+     id="rect342"
+     style="fill:#969696;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.4102"
+     y="301.68451"
+     width="10"
+     height="11"
+     id="rect344"
+     style="fill:#acacac;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="167.4102"
+     y="301.68451"
+     width="6"
+     height="11"
+     id="rect346"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="169.4102"
+     y="301.68451"
+     width="2"
+     height="11"
+     id="rect348"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="164.9102"
+     y="301.68451"
+     width="11"
+     height="11"
+     id="rect350"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.4102"
+     y="301.68451"
+     width="10"
+     height="11"
+     id="rect352"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.4102"
+     y="301.68451"
+     width="10"
+     height="11"
+     id="rect354"
+     style="fill:#00376e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.9102"
+     y="301.68451"
+     width="9"
+     height="11"
+     id="rect356"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="166.9102"
+     y="301.68451"
+     width="7"
+     height="11"
+     id="rect358"
+     style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="167.9102"
+     y="301.68451"
+     width="5"
+     height="11"
+     id="rect360"
+     style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="168.9102"
+     y="301.68451"
+     width="3"
+     height="11"
+     id="rect362"
+     style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="169.9102"
+     y="301.68451"
+     width="1"
+     height="11"
+     id="rect364"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1474.2896,831.62609 1474.2896,802.46087 1492.7609,817.04348 "
+     id="polygon366"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1502.482609,809.752174 1502.482609,824.334783"
+     id="polyline368"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1502.482609,817.043478 1492.760870,817.043478"
+     id="polyline370"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="11"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text372"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff"
+     x="157.52921"
+     y="-326.63449" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text374"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="292.1752"
+     y="-293.57449">temRet</text>
+  <polyline
+     points="1507.343478,951.203478 1510.746087,952.661739 1513.662609,954.606087 1515.120870,957.036522 1516.093043,959.953043 1516.093043,962.383478"
+     id="polyline376"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,914.260870 1492.760870,960.925217"
+     id="polyline378"
+     style="fill:none;stroke:#0080ff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <ellipse
+     transform="rotate(90)"
+     cx="291.93222"
+     cy="-316.66449"
+     rx="4.8608699"
+     ry="4.6178298"
+     id="ellipse380"
+     style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="1507.343478,928.843478 1507.343478,935.648696"
+     id="polyline382"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1500.052174,928.843478 1500.052174,935.648696"
+     id="polyline384"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,928.843478 1492.760870,935.648696"
+     id="polyline386"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="288.93222"
+     y="320.52451"
+     width="6"
+     height="20"
+     id="rect388"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="1514.6348,938.56522 1514.1487,940.02348 1513.6626,940.99565 1512.2043,941.48174 1507.3435,941.48174 1507.3435,935.6487 1512.2043,935.6487 1513.6626,936.13478 1514.1487,937.10696 "
+     id="polygon390"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text392"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="302.1402"
+     y="-354.09448">T</text>
+  <polyline
+     points="1507.343478,935.648696 1486.684783,935.648696"
+     id="polyline394"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1507.343478,941.481739 1486.927826,941.481739"
+     id="polyline396"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1517.065217,938.565217 1504.913043,938.565217"
+     id="polyline398"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text400"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="272.4892"
+     y="-349.2345" />
+  <polyline
+     points="1346.934783,1011.478261 1225.413043,1011.478261 1225.413043,962.869565"
+     id="polyline402"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1346.934783,1011.478261 1225.413043,1011.478261 1225.413043,962.869565"
+     id="polyline404"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,841.347826 1492.760870,914.260870"
+     id="polyline406"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,841.347826 1492.760870,914.260870"
+     id="polyline408"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,962.869565 1492.760870,1011.478261 1395.543478,1011.478261"
+     id="polyline410"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,962.869565 1492.760870,1011.478261 1395.543478,1011.478261"
+     id="polyline412"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1395.543478,1011.478261 1521.926087,1011.478261"
+     id="polyline414"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1395.543478,1011.478261 1521.926087,1011.478261"
+     id="polyline416"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,744.130435 1492.760870,792.739130"
+     id="polyline418"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,744.130435 1492.760870,792.739130"
+     id="polyline420"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1249.717391,719.826087 1468.456522,719.826087"
+     id="polyline422"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1249.717391,719.826087 1468.456522,719.826087"
+     id="polyline424"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,914.260870 1225.413043,744.130435"
+     id="polyline426"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,914.260870 1225.413043,744.130435"
+     id="polyline428"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,817.043478 1468.456522,817.043478"
+     id="polyline430"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,817.043478 1468.456522,817.043478"
+     id="polyline432"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     cx="58.794548"
+     cy="170.41023"
+     id="ellipse434"
+     r="3"
+     style="fill:#007fff;stroke:#007fff" />
+  <circle
+     cx="326.1445"
+     cy="364.8472"
+     id="ellipse436"
+     r="3"
+     style="fill:#007fff;stroke:#007fff" />
+  <circle
+     transform="rotate(-90)"
+     cx="-97.497162"
+     cy="58.794518"
+     id="ellipse438"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-97.497162"
+     cy="58.794518"
+     id="ellipse440"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-73.19323"
+     cy="83.1045"
+     id="ellipse448"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-73.19323"
+     cy="83.1045"
+     id="ellipse450"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(90)"
+     cx="49.691422"
+     cy="-326.1445"
+     rx="1.6282153"
+     ry="2.4304299"
+     id="ellipse452"
+     style="fill:#007fff;stroke:#007fff;stroke-width:0.81849188;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(90)"
+     cx="48.907242"
+     cy="-326.1445"
+     rx="2.3386657"
+     ry="2.3567023"
+     id="ellipse454"
+     style="fill:#007fff;stroke:#000000;stroke-width:0.96594709;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="97.497208"
+     cy="-326.1445"
+     id="ellipse456"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="97.497208"
+     cy="-326.1445"
+     id="ellipse458"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="97.497208"
+     cy="-326.1445"
+     id="ellipse460"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="73.193161"
+     cy="-301.84451"
+     id="ellipse462"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="73.193161"
+     cy="-301.84451"
+     id="ellipse464"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="58.794506"
+     id="ellipse466"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="58.794506"
+     id="ellipse468"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.62823"
+     cy="-58.794525"
+     id="ellipse470"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.62823"
+     cy="-58.794525"
+     id="ellipse472"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.62823"
+     cy="-58.794525"
+     id="ellipse474"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-294.43222"
+     y="-77.824509"
+     width="5"
+     height="5"
+     id="rect480"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="1201.1087,938.56522 1191.387,943.42609 1191.387,933.70435 "
+     id="polygon482"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     transform="scale(-1)"
+     cx="-228.92447"
+     cy="-364.84723"
+     id="ellipse486"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-228.92447"
+     cy="-364.84723"
+     id="ellipse488"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="180.31456"
+     cy="364.8472"
+     id="ellipse490"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="180.31456"
+     cy="364.8472"
+     id="ellipse492"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="180.31456"
+     cy="364.8472"
+     id="ellipse494"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="1395.5435,992.03478 1405.2652,996.89565 1405.2652,987.17391 "
+     id="polygon496"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1342.0739,992.03478 1346.9348,994.46522 1346.9348,989.60435 "
+     id="polygon498"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="scale(-1)"
+     x="-207.12451"
+     y="-349.84619"
+     width="5"
+     height="5"
+     id="rect500"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-357.81448"
+     y="355.3472"
+     width="5"
+     height="19"
+     id="rect502"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse504"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse506"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse508"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse510"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse512"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse514"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-357.81448"
+     y="355.3472"
+     width="5"
+     height="19"
+     id="rect516"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse518"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse520"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse522"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse524"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse526"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse528"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="146.10622"
+     cy="-326.14447"
+     id="ellipse530"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="146.10622"
+     cy="-326.14447"
+     id="ellipse532"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="194.71521"
+     cy="-326.14447"
+     id="ellipse534"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="194.71521"
+     cy="-326.14447"
+     id="ellipse536"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="194.71521"
+     cy="-326.14447"
+     id="ellipse538"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="170.41017"
+     cy="-301.84445"
+     id="ellipse540"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="170.41017"
+     cy="-301.84445"
+     id="ellipse542"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1517.0652,817.04348 1526.787,812.18261 1526.787,821.90435 "
+     id="polygon544"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1509.7739,831.62609 1507.3435,826.76522 1512.2043,826.76522 "
+     id="polygon546"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     transform="rotate(90)"
+     cx="267.6282"
+     cy="-326.1445"
+     id="ellipse548"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.6282"
+     cy="-326.1445"
+     id="ellipse550"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="326.1445"
+     id="ellipse552"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="326.1445"
+     id="ellipse554"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="326.1445"
+     id="ellipse556"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="1521.9261,938.56522 1517.0652,936.13478 1517.0652,940.99565 "
+     id="polygon558"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     id="ellipse1391"
+     cy="-58.794548"
+     cx="49.62825"
+     transform="rotate(90)"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     id="ellipse1393"
+     cy="-58.794548"
+     cx="49.62825"
+     transform="rotate(90)"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     id="ellipse1395"
+     cy="-58.794548"
+     cx="49.62825"
+     transform="rotate(90)"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     transform="rotate(90,925.07417,13.491051)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     id="polyline1403"
+     points="1203.539130,938.565217 1203.539130,914.260870" />
+  <polyline
+     points="1203.539130,938.565217 1203.539130,914.260870"
+     id="polyline1407"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="matrix(0,1,-10.829397,0,10164.095,-956.08767)" />
+  <polyline
+     points="1203.539130,938.565217 1203.539130,914.260870"
+     id="polyline1409"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="rotate(90,1017.8619,159.60034)" />
+  <polyline
+     transform="matrix(-1,0,0,-4.0231012,1466.7406,4023.4415)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     id="polyline1411"
+     points="1203.539130,938.565217 1203.539130,914.260870" />
+  <polyline
+     points="1203.539130,938.565217 1203.539130,914.260870"
+     id="polyline1413"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="matrix(0,1,-2.184576,0,2410.4678,-1033.3885)" />
+  <polyline
+     transform="matrix(0,-1,-2.3668185,0,2577.0849,1495.0522)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     id="polyline1417"
+     points="1203.539130,938.565217 1203.539130,914.260870" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.png
deleted file mode 100644
index cf54076e082..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.svg
new file mode 100644
index 00000000000..792516cf644
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/fluidJunctionMixingSplitter.svg
@@ -0,0 +1,8204 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1648.4141 944.49182"
+   version="1.1"
+   id="svg1454"
+   sodipodi:docname="fluidJunctionMixingSplitter.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="1648.4141"
+   height="944.49182">
+  <metadata
+     id="metadata1460">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs1458">
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect5803"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect4976"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3293"
+     inkscape:window-height="2038"
+     id="namedview1456"
+     showgrid="false"
+     inkscape:zoom="0.97034195"
+     inkscape:cx="891.33175"
+     inkscape:cy="914.39918"
+     inkscape:window-x="67"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1454"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1225.0927"
+     y="-87.234009"
+     id="text52"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1051.7126"
+     y="-232.2616"
+     id="text106"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text156"
+     x="-126.219"
+     y="871.51764"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-897.41565"
+     width="55"
+     height="0"
+     id="rect232"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-322.49698"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect306"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-322.49698"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect308"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-295.23599"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect310"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-295.23599"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect312"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-297.96198"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect314"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-297.96198"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect316"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-540.58405"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect326"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-540.58405"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect328"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-513.323"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect330"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-513.323"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect332"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-516.04901"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect334"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-516.04901"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect336"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="267.97498"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect346"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="267.97498"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect348"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="295.23599"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect350"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="295.23599"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect352"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="292.50998"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect354"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="292.50998"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect356"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="486.06198"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect366"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="486.06198"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect368"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="513.323"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect370"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="513.323"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect372"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="510.59702"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect374"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="510.59702"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect376"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="377.01898"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect386"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="377.01898"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect388"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="404.28"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect390"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="404.28"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect392"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="401.55399"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect394"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="401.55399"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect396"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-897.41565"
+     width="55"
+     height="0"
+     id="rect450"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text546"
+     x="-431.54099"
+     y="869.88165"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.78"
+     y="-897.41565"
+     width="55"
+     height="0"
+     id="rect638"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="12px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text684"
+     x="-418.728"
+     y="896.86969"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1256.7126"
+     y="839.638"
+     id="text734"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <text
+     font-size="12px"
+     dominant-baseline="central"
+     x="26.021662"
+     y="-175.14999"
+     id="text794"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <polyline
+     points="648.843478,696.521739 965.069565,696.521739"
+     id="polyline1076"
+     transform="translate(-100.36733,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="583.417391,843.730435 479.826087,843.730435 479.826087,1110.886957 1131.360870,1110.886957"
+     id="polyline1080"
+     transform="translate(-100.36733,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="967.795652,396.652174 561.608696,396.652174 561.608696,712.878261 583.417391,712.878261"
+     id="polyline1096"
+     transform="translate(-100.36733,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <rect
+     x="51.828663"
+     y="-195.4594"
+     width="1"
+     height="0"
+     id="rect1388"
+     style="fill:none;stroke:#ffcc33;stroke-width:2;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="51.841663"
+     y="195.4594"
+     width="1"
+     height="0"
+     id="rect1402"
+     style="fill:none;stroke:#ffcc33;stroke-width:2;stroke-opacity:1" />
+  <g
+     id="g1883"
+     transform="translate(-859.45217,-292.242)">
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1099.62"
+       y="351.39899"
+       id="text108"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">rad</text>
+    <ellipse
+       cx="1099.35"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse110"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1073.35"
+       y="-316.09698"
+       width="55"
+       height="3"
+       id="rect112"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       x="1071.67"
+       y="313.09698"
+       width="27"
+       height="3"
+       id="rect114"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <ellipse
+       cx="1099.35"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse116"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1077.35"
+       y="-331.37"
+       width="44"
+       height="33"
+       id="rect118"
+       style="fill:#5f5f5f;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,306.691304 1179.340000,306.691304"
+       id="polyline120"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,314.324348 1179.340000,314.324348"
+       id="polyline122"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,323.047826 1179.340000,323.047826"
+       id="polyline124"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,298.513043 1143.355652,331.226087"
+       id="polyline126"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1179.340000,298.513043 1179.340000,331.226087"
+       id="polyline128"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text130"
+       x="-396.38"
+       y="972.31012"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">temSup</text>
+    <polyline
+       points="981.426087,382.476522 977.609565,380.840870 974.338261,378.660000 972.702609,375.933913 971.612174,372.662609 971.612174,369.936522"
+       id="polyline132"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="997.782609,423.913043 997.782609,371.572174"
+       id="polyline134"
+       transform="translate(-62)"
+       style="fill:none;stroke:#0080ff;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-396.65204"
+       cy="946.40997"
+       rx="5.4521699"
+       ry="5.1795702"
+       id="ellipse136"
+       style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,407.556522 981.426087,399.923478"
+       id="polyline138"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="989.604348,407.556522 989.604348,399.923478"
+       id="polyline140"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="997.782609,407.556522 997.782609,399.923478"
+       id="polyline142"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-400.15201"
+       y="-942.37598"
+       width="7"
+       height="23"
+       id="rect144"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="981.42609,393.38087 981.42609,399.92348 975.97391,399.92348 974.33826,399.37826 973.79304,398.28783 973.24783,396.65217 973.79304,395.01652 974.33826,393.92609 975.97391,393.38087 "
+       id="polygon146"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text148"
+       x="-385.203"
+       y="904.43298"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <polyline
+       points="981.426087,399.923478 1004.597826,399.923478"
+       id="polyline150"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,393.380870 1004.325217,393.380870"
+       id="polyline152"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="970.521739,396.652174 984.152174,396.652174"
+       id="polyline154"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text182"
+       x="-478.16199"
+       y="972.31012"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumRad</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect188"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect190"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect192"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect194"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect196"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect198"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect200"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect202"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect204"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect206"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect208"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect210"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect212"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect214"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect216"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect218"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect220"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect222"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect224"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect226"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect228"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect230"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse234"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse236"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse238"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse240"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse242"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse244"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse246"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse248"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse250"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse252"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse254"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse256"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse258"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse260"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse262"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse264"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse266"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse268"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="997.78261,463.71391 984.15217,478.43478 1011.413,478.43478 "
+       id="polygon270"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse272"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse274"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse276"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse278"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse280"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse282"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse284"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,478.434783 984.152174,478.434783"
+       id="polyline290"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-487.16199"
+       y="908.70001"
+       width="18"
+       height="16"
+       id="rect292"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-478.16199"
+       cy="916.70001"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse294"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text296"
+       x="-478.16199"
+       y="916.97302"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text298"
+       x="-505.69601"
+       y="908.24902"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <polygon
+       points="1025.0435,596.20174 1025.0435,579.3 1007.5965,579.3 1005.9609,560.21739 987.42348,560.21739 983.60696,614.73913 1010.3226,614.73913 1008.687,596.20174 "
+       id="polygon300"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1025.0435,592.38522 1025.0435,582.5713 1004.8704,582.5713 1003.2348,560.21739 991.78522,560.21739 987.42348,614.73913 1007.0513,614.73913 1005.4157,592.38522 "
+       id="polygon302"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text304"
+       x="-587.75098"
+       y="902.52399"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="935.78302"
+       id="ellipse318"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1025.0435,814.2887 1025.0435,797.38696 1007.5965,797.38696 1005.9609,778.30435 987.42348,778.30435 983.60696,832.82609 1010.3226,832.82609 1008.687,814.2887 "
+       id="polygon320"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1025.0435,810.47217 1025.0435,800.65826 1004.8704,800.65826 1003.2348,778.30435 991.78522,778.30435 987.42348,832.82609 1007.0513,832.82609 1005.4157,810.47217 "
+       id="polygon322"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text324"
+       x="-805.83801"
+       y="902.52399"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-805.565"
+       cy="935.78302"
+       id="ellipse338"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,578.75478 1270.3913,595.65652 1287.8383,595.65652 1289.4739,614.73913 1308.0113,614.73913 1311.8278,560.21739 1285.1122,560.21739 1286.7478,578.75478 "
+       id="polygon340"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,582.5713 1270.3913,592.38522 1290.5643,592.38522 1292.2,614.73913 1303.6496,614.73913 1308.0113,560.21739 1288.3835,560.21739 1290.0191,582.5713 "
+       id="polygon342"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text344"
+       x="587.20599"
+       y="-1268.91"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl2</text>
+    <circle
+       transform="rotate(90)"
+       cx="587.47803"
+       cy="-1235.65"
+       id="ellipse358"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,796.84174 1270.3913,813.74348 1287.8383,813.74348 1289.4739,832.82609 1308.0113,832.82609 1311.8278,778.30435 1285.1122,778.30435 1286.7478,796.84174 "
+       id="polygon360"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,800.65826 1270.3913,810.47217 1290.5643,810.47217 1292.2,832.82609 1303.6496,832.82609 1308.0113,778.30435 1288.3835,778.30435 1290.0191,800.65826 "
+       id="polygon362"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text364"
+       x="805.29303"
+       y="-1268.91"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix2</text>
+    <circle
+       transform="rotate(90)"
+       cx="805.565"
+       cy="-1235.65"
+       id="ellipse378"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,687.79826 1270.3913,704.7 1287.8383,704.7 1289.4739,723.78261 1308.0113,723.78261 1311.8278,669.26087 1285.1122,669.26087 1286.7478,687.79826 "
+       id="polygon380"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,691.61478 1270.3913,701.4287 1290.5643,701.4287 1292.2,723.78261 1303.6496,723.78261 1308.0113,669.26087 1288.3835,669.26087 1290.0191,691.61478 "
+       id="polygon382"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text384"
+       x="696.24902"
+       y="-1268.91"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl4</text>
+    <circle
+       transform="rotate(90)"
+       cx="696.52203"
+       cy="-1235.65"
+       id="ellipse398"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text400"
+       x="-1050.64"
+       y="972.31012"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumBoi</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect406"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect408"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect410"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect412"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect414"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect416"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect418"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect420"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect422"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect424"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect426"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect428"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect430"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect432"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect434"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect436"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect438"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect440"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect442"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect444"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect446"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect448"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse452"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse454"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse456"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse458"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse460"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse462"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse464"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse466"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse468"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse470"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse472"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse474"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse476"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse478"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse480"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse482"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse484"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse486"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="997.78261,1036.1922 984.15217,1050.913 1011.413,1050.913 "
+       id="polygon488"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse490"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse492"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse494"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse496"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse498"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse500"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse502"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,1050.913043 984.152174,1050.913043"
+       id="polyline508"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-1059.64"
+       y="908.70001"
+       width="18"
+       height="16"
+       id="rect510"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-1050.64"
+       cy="916.70001"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse512"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text514"
+       x="-1050.64"
+       y="916.97302"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text516"
+       x="-1078.17"
+       y="908.24902"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1099.08"
+       y="1169.23"
+       id="text518"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+    <rect
+       transform="scale(-1)"
+       x="-1118.35"
+       y="-1149.2"
+       width="38"
+       height="33"
+       id="rect520"
+       style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-1126.98"
+       y="-1133.5601"
+       width="55"
+       height="2"
+       id="rect522"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1099.22"
+       y="1131.5601"
+       width="27"
+       height="2"
+       id="rect524"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1157.5313,1146.8713 1161.3478,1141.9643 1164.6191,1146.8713 "
+       id="polygon526"
+       transform="translate(-62)"
+       style="fill:#ffff00;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1110.886957 1183.156522,1110.886957 1183.156522,1144.690435 1162.983478,1144.690435"
+       id="polyline528"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1110.886957 1139.539130,1110.886957 1139.539130,1131.605217"
+       id="polyline530"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="1072.09"
+       y="1100.26"
+       id="text532"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="1126.0601"
+       y="1099.71"
+       id="text534"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+    <polyline
+       points="984.697391,696.521739 968.340870,696.521739"
+       id="polyline536"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-705.24902"
+       y="908.70001"
+       width="18"
+       height="16"
+       id="rect540"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-696.24896"
+       cy="916.70001"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse542"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text544"
+       x="-696.24902"
+       y="916.427"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.78302"
+       width="55"
+       height="22"
+       id="rect548"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.78302"
+       width="55"
+       height="22"
+       id="rect550"
+       style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.78302"
+       width="55"
+       height="22"
+       id="rect552"
+       style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.28302"
+       width="55"
+       height="21"
+       id="rect554"
+       style="fill:#282828;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.28302"
+       width="55"
+       height="21"
+       id="rect556"
+       style="fill:#363636;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-945.78302"
+       width="55"
+       height="20"
+       id="rect558"
+       style="fill:#434343;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-945.78302"
+       width="55"
+       height="20"
+       id="rect560"
+       style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-945.28302"
+       width="55"
+       height="19"
+       id="rect562"
+       style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-944.78302"
+       width="55"
+       height="18"
+       id="rect564"
+       style="fill:#676767;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-944.78302"
+       width="55"
+       height="18"
+       id="rect566"
+       style="fill:#737373;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-944.28302"
+       width="55"
+       height="17"
+       id="rect568"
+       style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-943.78302"
+       width="55"
+       height="16"
+       id="rect570"
+       style="fill:#878787;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-943.28302"
+       width="55"
+       height="15"
+       id="rect572"
+       style="fill:#919191;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-942.28302"
+       width="55"
+       height="13"
+       id="rect574"
+       style="fill:#999999;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect576"
+       style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect578"
+       style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.78302"
+       width="55"
+       height="10"
+       id="rect580"
+       style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect582"
+       style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect584"
+       style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect586"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect588"
+       style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect590"
+       style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect592"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect594"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect596"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect598"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect600"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect602"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect604"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect606"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect608"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.78302"
+       width="55"
+       height="10"
+       id="rect610"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.78302"
+       width="55"
+       height="10"
+       id="rect612"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect614"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect616"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect618"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect620"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect622"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect624"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect626"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect628"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect630"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect632"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect634"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect636"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-713.02197"
+       y="-946.78302"
+       width="33"
+       height="22"
+       id="rect640"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1014.1391,717.24 997.78261,696.52174 981.42609,717.24 "
+       id="polygon642"
+       transform="translate(-62)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1014.1391,675.80348 997.78261,696.52174 981.42609,675.80348 "
+       id="polygon644"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.52197"
+       y="-963.04999"
+       width="22"
+       height="12"
+       id="rect646"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.02197"
+       y="-963.04999"
+       width="21"
+       height="12"
+       id="rect648"
+       style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-706.52197"
+       y="-963.04999"
+       width="20"
+       height="12"
+       id="rect650"
+       style="fill:#535353;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-705.52197"
+       y="-963.04999"
+       width="18"
+       height="12"
+       id="rect652"
+       style="fill:#777777;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-704.02197"
+       y="-963.04999"
+       width="15"
+       height="12"
+       id="rect654"
+       style="fill:#969696;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-963.04999"
+       width="11"
+       height="12"
+       id="rect656"
+       style="fill:#acacac;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.02197"
+       y="-963.04999"
+       width="7"
+       height="12"
+       id="rect658"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.52197"
+       y="-963.04999"
+       width="2"
+       height="12"
+       id="rect660"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-963.04999"
+       width="12"
+       height="12"
+       id="rect662"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-963.04999"
+       width="12"
+       height="12"
+       id="rect664"
+       style="fill:#001c38;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-963.04999"
+       width="11"
+       height="12"
+       id="rect666"
+       style="fill:#00376e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-701.52197"
+       y="-963.04999"
+       width="10"
+       height="12"
+       id="rect668"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.52197"
+       y="-963.04999"
+       width="8"
+       height="12"
+       id="rect670"
+       style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-699.52197"
+       y="-963.04999"
+       width="6"
+       height="12"
+       id="rect672"
+       style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-698.52197"
+       y="-963.04999"
+       width="4"
+       height="12"
+       id="rect674"
+       style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.02197"
+       y="-963.04999"
+       width="1"
+       height="12"
+       id="rect676"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1018.5009,712.87826 997.78261,696.52174 1018.5009,680.16522 "
+       id="polygon678"
+       transform="translate(-62)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,704.700000 986.878261,688.343478"
+       id="polyline680"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,696.521739 997.782609,696.521739"
+       id="polyline682"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1295.63"
+       y="1097.26"
+       id="text686"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse688"
+       r="27.2609"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse690"
+       r="27.1945"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse692"
+       r="26.9956"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse694"
+       r="26.665199"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse696"
+       r="26.2048"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse698"
+       r="25.6168"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse700"
+       r="24.903999"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse702"
+       r="24.069901"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse704"
+       r="23.1185"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse706"
+       r="22.054501"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse708"
+       r="20.882999"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse710"
+       r="19.6098"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse712"
+       r="18.2411"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse714"
+       r="16.783501"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse716"
+       r="15.2441"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse718"
+       r="13.6304"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse720"
+       r="11.9504"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse722"
+       r="10.2121"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse724"
+       r="8.4240704"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse726"
+       r="6.5949998"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse728"
+       r="4.7337999"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse730"
+       r="2.84954"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse732"
+       r="0.95139098"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline822"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline824"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline838"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline840"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline842"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline844"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline846"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline848"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline850"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline852"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline854"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline856"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,723.782609 1297.652174,778.304348"
+       id="polyline858"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,723.782609 1297.652174,778.304348"
+       id="polyline860"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,614.739130 1297.652174,669.260870"
+       id="polyline862"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,614.739130 1297.652174,669.260870"
+       id="polyline864"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline866"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline868"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline870"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline872"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline874"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline876"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline878"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline880"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline882"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline884"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline906"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline908"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline910"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline912"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1064"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline1068"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline1070"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline1072"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline1074"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       cx="1235.65"
+       cy="1132.7"
+       id="ellipse1106"
+       r="3"
+       style="fill:#007fff;stroke:#007fff" />
+    <circle
+       cx="1072.09"
+       cy="314.87"
+       id="ellipse1182"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="314.87"
+       id="ellipse1184"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-314.87"
+       id="ellipse1186"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-314.87"
+       id="ellipse1188"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-314.87"
+       id="ellipse1190"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1091.4"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect1192"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1102.3"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect1194"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="935.78302"
+       id="ellipse1196"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="935.78302"
+       id="ellipse1198"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-935.78302"
+       id="ellipse1200"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-935.78302"
+       id="ellipse1202"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-935.78302"
+       id="ellipse1204"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="970.52174,399.37826 970.52174,393.92609 965.06957,396.65217 "
+       id="polygon1206"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="935.78302"
+       id="ellipse1212"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="935.78302"
+       id="ellipse1214"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-935.78296"
+       id="ellipse1216"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-935.78296"
+       id="ellipse1218"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-935.78296"
+       id="ellipse1220"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-480.935"
+       y="-956.82001"
+       width="5"
+       height="5"
+       id="rect1226"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1066"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="970.52174,478.43478 959.61739,483.88696 959.61739,472.98261 "
+       id="polygon1228"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="935.78302"
+       id="ellipse1232"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="935.78302"
+       id="ellipse1234"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="935.78296"
+       id="ellipse1236"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="935.78296"
+       id="ellipse1238"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="935.78296"
+       id="ellipse1240"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="963.03998"
+       id="ellipse1242"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="963.03998"
+       id="ellipse1244"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="935.78296"
+       id="ellipse1246"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="935.78296"
+       id="ellipse1248"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="935.78302"
+       id="ellipse1250"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="935.78302"
+       id="ellipse1252"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="935.78302"
+       id="ellipse1254"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="963.03998"
+       id="ellipse1256"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="963.03998"
+       id="ellipse1258"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21704"
+       cy="-1235.65"
+       id="ellipse1260"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21704"
+       cy="-1235.65"
+       id="ellipse1262"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73901"
+       cy="-1235.65"
+       id="ellipse1264"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73901"
+       cy="-1235.65"
+       id="ellipse1266"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73901"
+       cy="-1235.65"
+       id="ellipse1268"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47803"
+       cy="-1208.39"
+       id="ellipse1270"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47803"
+       cy="-1208.39"
+       id="ellipse1272"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="778.30402"
+       cy="-1235.65"
+       id="ellipse1274"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="778.30402"
+       cy="-1235.65"
+       id="ellipse1276"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="832.82605"
+       cy="-1235.65"
+       id="ellipse1278"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="832.82605"
+       cy="-1235.65"
+       id="ellipse1280"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="832.82605"
+       cy="-1235.65"
+       id="ellipse1282"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="805.565"
+       cy="-1208.39"
+       id="ellipse1284"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="805.565"
+       cy="-1208.39"
+       id="ellipse1286"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="669.26105"
+       cy="-1235.65"
+       id="ellipse1288"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="669.26105"
+       cy="-1235.65"
+       id="ellipse1290"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="723.78302"
+       cy="-1235.65"
+       id="ellipse1292"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="723.78302"
+       cy="-1235.65"
+       id="ellipse1294"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="723.78302"
+       cy="-1235.65"
+       id="ellipse1296"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="696.52203"
+       cy="-1208.39"
+       id="ellipse1298"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="696.52203"
+       cy="-1208.39"
+       id="ellipse1300"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.1699"
+       cy="935.78302"
+       id="ellipse1302"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.1699"
+       cy="935.78302"
+       id="ellipse1304"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-935.78296"
+       id="ellipse1306"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-935.78296"
+       id="ellipse1308"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-935.78296"
+       id="ellipse1310"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1053.41"
+       y="-956.82001"
+       width="5"
+       height="5"
+       id="rect1316"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="959.61739,1056.3652 959.61739,1045.4609 970.52174,1050.913 "
+       id="polygon1318"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-1132.7001"
+       id="ellipse1322"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-1132.7001"
+       id="ellipse1324"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="1132.7"
+       id="ellipse1326"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="1132.7"
+       id="ellipse1328"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="1132.7"
+       id="ellipse1330"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="1199.513,1116.3391 1199.513,1105.4348 1188.6087,1110.887 "
+       id="polygon1332"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1134.087,1113.613 1134.087,1108.1609 1128.6348,1110.887 "
+       id="polygon1334"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-1101.85"
+       y="-1115.5699"
+       width="5"
+       height="5"
+       id="rect1336"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="935.78302"
+       id="ellipse1338"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="935.78302"
+       id="ellipse1340"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="935.78296"
+       id="ellipse1342"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="935.78296"
+       id="ellipse1344"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="935.78296"
+       id="ellipse1346"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52197"
+       cy="963.03998"
+       id="ellipse1348"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52197"
+       cy="963.03998"
+       id="ellipse1350"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="959.61739,701.97391 959.61739,691.06957 970.52174,696.52174 "
+       id="polygon1352"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1270.87"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect1356"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1358"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1360"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1362"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1364"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1366"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1368"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1270.87"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect1370"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1372"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1374"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1376"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1378"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1380"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1382"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1474"
+       transform="matrix(1,0,0,-1,-62,1174.9565)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1478"
+       transform="translate(-62,-81.782609)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  </g>
+  <g
+     id="g3849"
+     transform="translate(-110.36733,-292.242)">
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="951.87738"
+       y="351.39899"
+       id="text1885"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">rad</text>
+    <ellipse
+       cx="951.60742"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse1887"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="925.60748"
+       y="-316.09698"
+       width="55"
+       height="3"
+       id="rect1889"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       x="923.92749"
+       y="313.09698"
+       width="27"
+       height="3"
+       id="rect1891"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <ellipse
+       cx="951.60742"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse1893"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="929.60748"
+       y="-331.37"
+       width="44"
+       height="33"
+       id="rect1895"
+       style="fill:#5f5f5f;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,306.691304 1179.340000,306.691304"
+       id="polyline1897"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,314.324348 1179.340000,314.324348"
+       id="polyline1899"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,323.047826 1179.340000,323.047826"
+       id="polyline1901"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,298.513043 1143.355652,331.226087"
+       id="polyline1903"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1179.340000,298.513043 1179.340000,331.226087"
+       id="polyline1905"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text1907"
+       x="-396.38"
+       y="824.5675"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">temSup</text>
+    <polyline
+       points="981.426087,382.476522 977.609565,380.840870 974.338261,378.660000 972.702609,375.933913 971.612174,372.662609 971.612174,369.936522"
+       id="polyline1909"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="997.782609,423.913043 997.782609,371.572174"
+       id="polyline1911"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#0080ff;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-396.65204"
+       cy="798.66748"
+       rx="5.4521699"
+       ry="5.1795702"
+       id="ellipse1913"
+       style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,407.556522 981.426087,399.923478"
+       id="polyline1915"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="989.604348,407.556522 989.604348,399.923478"
+       id="polyline1917"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="997.782609,407.556522 997.782609,399.923478"
+       id="polyline1919"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-400.15201"
+       y="-794.63348"
+       width="7"
+       height="23"
+       id="rect1921"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="973.24783,396.65217 973.79304,395.01652 974.33826,393.92609 975.97391,393.38087 981.42609,393.38087 981.42609,399.92348 975.97391,399.92348 974.33826,399.37826 973.79304,398.28783 "
+       id="polygon1923"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text1925"
+       x="-385.203"
+       y="756.69049"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <polyline
+       points="981.426087,399.923478 1004.597826,399.923478"
+       id="polyline1927"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,393.380870 1004.325217,393.380870"
+       id="polyline1929"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="970.521739,396.652174 984.152174,396.652174"
+       id="polyline1931"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text1933"
+       x="-478.16199"
+       y="824.5675"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumRad</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1939"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1941"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1943"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1945"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1947"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1949"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1951"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1953"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect1955"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect1957"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect1959"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect1961"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect1963"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect1965"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect1967"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect1969"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect1971"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect1973"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect1975"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect1977"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect1979"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect1981"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1983"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1985"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1987"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1989"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1991"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1993"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1995"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1997"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1999"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2001"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2003"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2005"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2007"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2009"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2011"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2013"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2015"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2017"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1011.413,478.43478 997.78261,463.71391 984.15217,478.43478 "
+       id="polygon2019"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2021"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2023"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2025"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2027"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2029"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2031"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2033"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,478.434783 984.152174,478.434783"
+       id="polyline2039"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-487.16199"
+       y="760.95752"
+       width="18"
+       height="16"
+       id="rect2041"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-478.16199"
+       cy="768.95746"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse2043"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2045"
+       x="-478.16199"
+       y="769.23053"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2047"
+       x="-505.69601"
+       y="760.50647"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <polygon
+       points="987.42348,560.21739 983.60696,614.73913 1010.3226,614.73913 1008.687,596.20174 1025.0435,596.20174 1025.0435,579.3 1007.5965,579.3 1005.9609,560.21739 "
+       id="polygon2049"
+       transform="translate(-209.7425)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="991.78522,560.21739 987.42348,614.73913 1007.0513,614.73913 1005.4157,592.38522 1025.0435,592.38522 1025.0435,582.5713 1004.8704,582.5713 1003.2348,560.21739 "
+       id="polygon2051"
+       transform="translate(-209.7425)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2053"
+       x="-587.75098"
+       y="754.78149"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="788.04053"
+       id="circle2055"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="987.42348,778.30435 983.60696,832.82609 1010.3226,832.82609 1008.687,814.2887 1025.0435,814.2887 1025.0435,797.38696 1007.5965,797.38696 1005.9609,778.30435 "
+       id="polygon2057"
+       transform="translate(-209.7425)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="991.78522,778.30435 987.42348,832.82609 1007.0513,832.82609 1005.4157,810.47217 1025.0435,810.47217 1025.0435,800.65826 1004.8704,800.65826 1003.2348,778.30435 "
+       id="polygon2059"
+       transform="translate(-209.7425)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2061"
+       x="-805.83801"
+       y="754.78149"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-805.565"
+       cy="788.04053"
+       id="circle2063"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1308.0113,614.73913 1311.8278,560.21739 1285.1122,560.21739 1286.7478,578.75478 1270.3913,578.75478 1270.3913,595.65652 1287.8383,595.65652 1289.4739,614.73913 "
+       id="polygon2065"
+       transform="translate(-209.7425)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1303.6496,614.73913 1308.0113,560.21739 1288.3835,560.21739 1290.0191,582.5713 1270.3913,582.5713 1270.3913,592.38522 1290.5643,592.38522 1292.2,614.73913 "
+       id="polygon2067"
+       transform="translate(-209.7425)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text2069"
+       x="587.20599"
+       y="-1121.1675"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl2</text>
+    <circle
+       transform="rotate(90)"
+       cx="587.47797"
+       cy="-1087.9075"
+       id="circle2071"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2089"
+       x="-1050.6399"
+       y="824.56744"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumBoi</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2095"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2097"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2099"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2101"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2103"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2105"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2107"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2109"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2111"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2113"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2115"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect2117"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect2119"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2121"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2123"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2125"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2127"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect2129"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect2131"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2133"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2135"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect2137"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2139"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2141"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2143"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2145"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2147"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2149"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2151"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2153"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2155"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2157"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2159"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2161"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2163"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2165"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2167"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2169"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2171"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2173"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1011.413,1050.913 997.78261,1036.1922 984.15217,1050.913 "
+       id="polygon2175"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2177"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2179"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2181"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2183"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2185"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2187"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2189"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,1050.913043 984.152174,1050.913043"
+       id="polyline2195"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-1059.64"
+       y="760.95752"
+       width="18"
+       height="16"
+       id="rect2197"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-1050.64"
+       cy="768.95746"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse2199"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2201"
+       x="-1050.64"
+       y="769.23053"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2203"
+       x="-1078.1699"
+       y="760.50647"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="951.3374"
+       y="1169.23"
+       id="text2205"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+    <rect
+       transform="scale(-1)"
+       x="-970.60748"
+       y="-1149.2"
+       width="38"
+       height="33"
+       id="rect2207"
+       style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-979.23749"
+       y="-1133.5601"
+       width="55"
+       height="2"
+       id="rect2209"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-951.47748"
+       y="1131.5601"
+       width="27"
+       height="2"
+       id="rect2211"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1164.6191,1146.8713 1157.5313,1146.8713 1161.3478,1141.9643 "
+       id="polygon2213"
+       transform="translate(-209.7425)"
+       style="fill:#ffff00;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1110.886957 1183.156522,1110.886957 1183.156522,1144.690435 1162.983478,1144.690435"
+       id="polyline2215"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1110.886957 1139.539130,1110.886957 1139.539130,1131.605217"
+       id="polyline2217"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="924.34741"
+       y="1100.26"
+       id="text2219"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="978.3175"
+       y="1099.71"
+       id="text2221"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+    <polyline
+       points="984.697391,696.521739 968.340870,696.521739"
+       id="polyline2223"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-705.24902"
+       y="760.95752"
+       width="18"
+       height="16"
+       id="rect2227"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-696.24896"
+       cy="768.95752"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse2229"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2231"
+       x="-696.24902"
+       y="768.68451"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-799.04053"
+       width="55"
+       height="22"
+       id="rect2233"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-799.04053"
+       width="55"
+       height="22"
+       id="rect2235"
+       style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-799.04053"
+       width="55"
+       height="22"
+       id="rect2237"
+       style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.54053"
+       width="55"
+       height="21"
+       id="rect2239"
+       style="fill:#282828;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.54053"
+       width="55"
+       height="21"
+       id="rect2241"
+       style="fill:#363636;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.04053"
+       width="55"
+       height="20"
+       id="rect2243"
+       style="fill:#434343;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.04053"
+       width="55"
+       height="20"
+       id="rect2245"
+       style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-797.54053"
+       width="55"
+       height="19"
+       id="rect2247"
+       style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-797.04053"
+       width="55"
+       height="18"
+       id="rect2249"
+       style="fill:#676767;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-797.04053"
+       width="55"
+       height="18"
+       id="rect2251"
+       style="fill:#737373;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-796.54053"
+       width="55"
+       height="17"
+       id="rect2253"
+       style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-796.04053"
+       width="55"
+       height="16"
+       id="rect2255"
+       style="fill:#878787;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-795.54053"
+       width="55"
+       height="15"
+       id="rect2257"
+       style="fill:#919191;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.54053"
+       width="55"
+       height="13"
+       id="rect2259"
+       style="fill:#999999;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2261"
+       style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2263"
+       style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.04053"
+       width="55"
+       height="10"
+       id="rect2265"
+       style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2267"
+       style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2269"
+       style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2271"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2273"
+       style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2275"
+       style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect2277"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2279"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2281"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2283"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2285"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2287"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2289"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2291"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2293"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.04053"
+       width="55"
+       height="10"
+       id="rect2295"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.04053"
+       width="55"
+       height="10"
+       id="rect2297"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2299"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2301"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2303"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2305"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2307"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect2309"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2311"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2313"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2315"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect2317"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2319"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect2321"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-713.02197"
+       y="-799.04053"
+       width="33"
+       height="22"
+       id="rect2323"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="981.42609,717.24 1014.1391,717.24 997.78261,696.52174 "
+       id="polygon2325"
+       transform="translate(-209.7425)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="981.42609,675.80348 1014.1391,675.80348 997.78261,696.52174 "
+       id="polygon2327"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.52197"
+       y="-815.3075"
+       width="22"
+       height="12"
+       id="rect2329"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.02197"
+       y="-815.3075"
+       width="21"
+       height="12"
+       id="rect2331"
+       style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-706.52197"
+       y="-815.3075"
+       width="20"
+       height="12"
+       id="rect2333"
+       style="fill:#535353;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-705.52197"
+       y="-815.3075"
+       width="18"
+       height="12"
+       id="rect2335"
+       style="fill:#777777;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-704.02197"
+       y="-815.3075"
+       width="15"
+       height="12"
+       id="rect2337"
+       style="fill:#969696;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-815.3075"
+       width="11"
+       height="12"
+       id="rect2339"
+       style="fill:#acacac;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.02197"
+       y="-815.3075"
+       width="7"
+       height="12"
+       id="rect2341"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.52197"
+       y="-815.3075"
+       width="2"
+       height="12"
+       id="rect2343"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-815.3075"
+       width="12"
+       height="12"
+       id="rect2345"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-815.3075"
+       width="12"
+       height="12"
+       id="rect2347"
+       style="fill:#001c38;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-815.3075"
+       width="11"
+       height="12"
+       id="rect2349"
+       style="fill:#00376e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-701.52197"
+       y="-815.3075"
+       width="10"
+       height="12"
+       id="rect2351"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.52197"
+       y="-815.3075"
+       width="8"
+       height="12"
+       id="rect2353"
+       style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-699.52197"
+       y="-815.3075"
+       width="6"
+       height="12"
+       id="rect2355"
+       style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-698.52197"
+       y="-815.3075"
+       width="4"
+       height="12"
+       id="rect2357"
+       style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.02197"
+       y="-815.3075"
+       width="1"
+       height="12"
+       id="rect2359"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1018.5009,680.16522 1018.5009,712.87826 997.78261,696.52174 "
+       id="polygon2361"
+       transform="translate(-209.7425)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,704.700000 986.878261,688.343478"
+       id="polyline2363"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,696.521739 997.782609,696.521739"
+       id="polyline2365"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1147.8875"
+       y="1097.26"
+       id="text2367"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2369"
+       r="27.2609"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2371"
+       r="27.1945"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2373"
+       r="26.9956"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2375"
+       r="26.665199"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2377"
+       r="26.2048"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2379"
+       r="25.6168"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2381"
+       r="24.903999"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2383"
+       r="24.069901"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2385"
+       r="23.1185"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2387"
+       r="22.054501"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2389"
+       r="20.882999"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2391"
+       r="19.6098"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2393"
+       r="18.2411"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2395"
+       r="16.783501"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2397"
+       r="15.2441"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2399"
+       r="13.6304"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2401"
+       r="11.9504"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2403"
+       r="10.2121"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2405"
+       r="8.4240704"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2407"
+       r="6.5949998"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2409"
+       r="4.7337999"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2411"
+       r="2.84954"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2413"
+       r="0.95139098"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline2415"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline2417"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline2419"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline2421"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline2423"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline2425"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline2427"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline2429"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline2431"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline2433"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline2435"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline2437"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,614.739130 1297.652174,669.260870"
+       id="polyline2443"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline2447"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline2449"
+       transform="matrix(1.1078478,0,0,1,-320.29123,0)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline2451"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline2453"
+       transform="matrix(1.1096196,0,0,1,-322.1074,-0.11050075)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline2455"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline2457"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline2459"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline2461"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline2463"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline2465"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline2467"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline2469"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline2471"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline2473"
+       transform="matrix(1,0,0,1.7272727,-209.7425,-823.77866)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2475"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline2477"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline2479"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline2481"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline2483"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       cx="1087.9075"
+       cy="1132.7"
+       id="circle2485"
+       r="3"
+       style="fill:#007fff;stroke:#007fff" />
+    <circle
+       cx="924.34741"
+       cy="314.87"
+       id="circle2487"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="314.87"
+       id="circle2489"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-314.87"
+       id="circle2491"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-314.87"
+       id="circle2493"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-314.87"
+       id="circle2495"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="943.65747"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect2497"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="954.5575"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect2499"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="788.04047"
+       id="circle2501"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="788.04047"
+       id="circle2503"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-788.04053"
+       id="circle2505"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-788.04053"
+       id="circle2507"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-788.04053"
+       id="circle2509"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="965.06957,396.65217 970.52174,399.37826 970.52174,393.92609 "
+       id="polygon2511"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="788.04053"
+       id="circle2513"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="788.04053"
+       id="circle2515"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-788.04047"
+       id="circle2517"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-788.04047"
+       id="circle2519"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-788.04047"
+       id="circle2521"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-480.935"
+       y="-809.07751"
+       width="5"
+       height="5"
+       id="rect2527"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2529"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="959.61739,472.98261 970.52174,478.43478 959.61739,483.88696 "
+       id="polygon2531"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="788.04053"
+       id="circle2535"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="788.04053"
+       id="circle2537"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="788.04047"
+       id="circle2539"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="788.04047"
+       id="circle2541"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="788.04047"
+       id="circle2543"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47803"
+       cy="815.29761"
+       id="circle2545"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47803"
+       cy="815.29761"
+       id="circle2547"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="788.04047"
+       id="circle2549"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="788.04047"
+       id="circle2551"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="788.04053"
+       id="circle2553"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="788.04053"
+       id="circle2555"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="788.04053"
+       id="circle2557"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="815.29742"
+       id="circle2559"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="815.29742"
+       id="circle2561"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21698"
+       cy="-1087.9076"
+       id="circle2563"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21698"
+       cy="-1087.9076"
+       id="circle2565"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73895"
+       cy="-1087.9076"
+       id="circle2567"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73895"
+       cy="-1087.9076"
+       id="circle2569"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73895"
+       cy="-1087.9076"
+       id="circle2571"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47797"
+       cy="-1060.6476"
+       id="circle2573"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47797"
+       cy="-1060.6476"
+       id="circle2575"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="805.90991"
+       cy="-1087.9076"
+       id="circle2581"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="696.52197"
+       cy="-1087.1224"
+       id="circle2601"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.17"
+       cy="788.04047"
+       id="circle2605"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.17"
+       cy="788.04047"
+       id="circle2607"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-788.04041"
+       id="circle2609"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-788.04041"
+       id="circle2611"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-788.04041"
+       id="circle2613"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1053.41"
+       y="-809.07751"
+       width="5"
+       height="5"
+       id="rect2619"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="970.52174,1050.913 959.61739,1056.3652 959.61739,1045.4609 "
+       id="polygon2621"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-1132.7001"
+       id="circle2625"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-1132.7001"
+       id="circle2627"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="1132.7"
+       id="circle2629"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="1132.7"
+       id="circle2631"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="1132.7"
+       id="circle2633"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="1188.6087,1110.887 1199.513,1116.3391 1199.513,1105.4348 "
+       id="polygon2635"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1128.6348,1110.887 1134.087,1113.613 1134.087,1108.1609 "
+       id="polygon2637"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-954.10748"
+       y="-1115.5699"
+       width="5"
+       height="5"
+       id="rect2639"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="788.04053"
+       id="circle2641"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="788.04053"
+       id="circle2643"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="788.04047"
+       id="circle2645"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="788.04047"
+       id="circle2647"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="788.04047"
+       id="circle2649"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52191"
+       cy="815.29742"
+       id="circle2651"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52191"
+       cy="815.29742"
+       id="circle2653"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="970.52174,696.52174 959.61739,701.97391 959.61739,691.06957 "
+       id="polygon2655"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1123.1274"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect2659"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2661"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2663"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2665"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2667"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2669"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2671"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1123.1274"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect2673"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2675"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2677"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2679"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2681"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2683"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2685"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2687"
+       transform="matrix(1,0,0,-1,-209.7425,1174.9565)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2689"
+       transform="translate(-209.7425,-81.782609)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  </g>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     x="1425.1431"
+     y="59.156994"
+     id="text3851"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">rad</text>
+  <ellipse
+     cx="1424.873"
+     cy="22.354982"
+     rx="5.4521699"
+     ry="5.7247801"
+     id="ellipse3853"
+     style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1398.8732"
+     y="-23.854982"
+     width="55"
+     height="3"
+     id="rect3855"
+     style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+  <rect
+     x="1397.1931"
+     y="20.854982"
+     width="27"
+     height="3"
+     id="rect3857"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <ellipse
+     cx="1424.873"
+     cy="22.354982"
+     rx="5.4521699"
+     ry="5.7247801"
+     id="ellipse3859"
+     style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1402.8732"
+     y="-39.128002"
+     width="44"
+     height="33"
+     id="rect3861"
+     style="fill:#5f5f5f;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,306.691304 1179.340000,306.691304"
+     id="polyline3863"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,314.324348 1179.340000,314.324348"
+     id="polyline3865"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,323.047826 1179.340000,323.047826"
+     id="polyline3867"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,298.513043 1143.355652,331.226087"
+     id="polyline3869"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1179.340000,298.513043 1179.340000,331.226087"
+     id="polyline3871"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text3873"
+     x="-104.13801"
+     y="1297.8331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">temSup</text>
+  <polyline
+     points="981.426087,382.476522 977.609565,380.840870 974.338261,378.660000 972.702609,375.933913 971.612174,372.662609 971.612174,369.936522"
+     id="polyline3875"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="997.782609,423.913043 997.782609,371.572174"
+     id="polyline3877"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#0080ff;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-104.41004"
+     cy="1271.9331"
+     rx="5.4521699"
+     ry="5.1795702"
+     id="ellipse3879"
+     style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="981.426087,407.556522 981.426087,399.923478"
+     id="polyline3881"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="989.604348,407.556522 989.604348,399.923478"
+     id="polyline3883"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="997.782609,407.556522 997.782609,399.923478"
+     id="polyline3885"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-107.91001"
+     y="-1267.8992"
+     width="7"
+     height="23"
+     id="rect3887"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="981.42609,393.38087 981.42609,399.92348 975.97391,399.92348 974.33826,399.37826 973.79304,398.28783 973.24783,396.65217 973.79304,395.01652 974.33826,393.92609 975.97391,393.38087 "
+     id="polygon3889"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text3891"
+     x="-92.961006"
+     y="1229.9562"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+  <polyline
+     points="981.426087,399.923478 1004.597826,399.923478"
+     id="polyline3893"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="981.426087,393.380870 1004.325217,393.380870"
+     id="polyline3895"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="970.521739,396.652174 984.152174,396.652174"
+     id="polyline3897"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text3899"
+     x="-185.92"
+     y="1297.8331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumRad</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3901"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3903"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3905"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3907"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3909"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3911"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3913"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3915"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect3917"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect3919"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect3921"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect3923"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect3925"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect3927"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect3929"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect3931"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect3933"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect3935"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect3937"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect3939"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect3941"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect3943"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3945"
+     r="15.8113"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3947"
+     r="15.7477"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3949"
+     r="15.5572"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3951"
+     r="15.2415"
+     style="fill:#001b36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3953"
+     r="14.8031"
+     style="fill:#002447;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3955"
+     r="14.2455"
+     style="fill:#002c58;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3957"
+     r="13.5732"
+     style="fill:#003468;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3959"
+     r="12.7916"
+     style="fill:#003c77;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3961"
+     r="11.907"
+     style="fill:#004386;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3963"
+     r="10.9266"
+     style="fill:#004993;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3965"
+     r="9.8581896"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3967"
+     r="8.7103996"
+     style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3969"
+     r="7.4924798"
+     style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3971"
+     r="6.2142401"
+     style="fill:#005db9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3973"
+     r="4.8859601"
+     style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3975"
+     r="3.5183499"
+     style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3977"
+     r="2.1224"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3979"
+     r="0.70937097"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="997.78261,463.71391 984.15217,478.43478 1011.413,478.43478 "
+     id="polygon3981"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3983"
+     r="4.3617401"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3985"
+     r="4.2349901"
+     style="fill:#001933;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3987"
+     r="3.8621299"
+     style="fill:#003163;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3989"
+     r="3.2648101"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3991"
+     r="2.4777501"
+     style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3993"
+     r="1.54669"
+     style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3995"
+     r="0.52574998"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="970.521739,478.434783 984.152174,478.434783"
+     id="polyline3997"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-194.92"
+     y="1234.2231"
+     width="18"
+     height="16"
+     id="rect3999"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-185.92"
+     cy="1242.2231"
+     rx="8.9960899"
+     ry="8.1782598"
+     id="ellipse4001"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="13px"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4003"
+     x="-185.92"
+     y="1242.4962"
+     style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4005"
+     x="-213.45403"
+     y="1233.7721"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+  <polygon
+     points="1008.687,596.20174 1025.0435,596.20174 1025.0435,579.3 1007.5965,579.3 1005.9609,560.21739 987.42348,560.21739 983.60696,614.73913 1010.3226,614.73913 "
+     id="polygon4007"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1005.4157,592.38522 1025.0435,592.38522 1025.0435,582.5713 1004.8704,582.5713 1003.2348,560.21739 991.78522,560.21739 987.42348,614.73913 1007.0513,614.73913 "
+     id="polygon4009"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4011"
+     x="-295.50897"
+     y="1228.0471"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix</text>
+  <circle
+     transform="rotate(-90)"
+     cx="-295.23596"
+     cy="1261.3062"
+     id="circle4013"
+     r="9.5412998"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1008.687,814.2887 1025.0435,814.2887 1025.0435,797.38696 1007.5965,797.38696 1005.9609,778.30435 987.42348,778.30435 983.60696,832.82609 1010.3226,832.82609 "
+     id="polygon4015"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1005.4157,810.47217 1025.0435,810.47217 1025.0435,800.65826 1004.8704,800.65826 1003.2348,778.30435 991.78522,778.30435 987.42348,832.82609 1007.0513,832.82609 "
+     id="polygon4017"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4019"
+     x="-513.59601"
+     y="1228.0471"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl</text>
+  <circle
+     transform="rotate(-90)"
+     cx="-513.323"
+     cy="1261.3062"
+     id="circle4021"
+     r="9.5412998"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1286.7478,578.75478 1270.3913,578.75478 1270.3913,595.65652 1287.8383,595.65652 1289.4739,614.73913 1308.0113,614.73913 1311.8278,560.21739 1285.1122,560.21739 "
+     id="polygon4023"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1290.0191,582.5713 1270.3913,582.5713 1270.3913,592.38522 1290.5643,592.38522 1292.2,614.73913 1303.6496,614.73913 1308.0113,560.21739 1288.3835,560.21739 "
+     id="polygon4025"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text4027"
+     x="294.96399"
+     y="-1594.4331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl2</text>
+  <circle
+     transform="rotate(90)"
+     cx="295.23596"
+     cy="-1561.1731"
+     id="circle4029"
+     r="9.5412998"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4031"
+     x="-758.39789"
+     y="1297.8331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumBoi</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4037"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4039"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4041"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4043"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4045"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4047"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4049"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4051"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4053"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4055"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4057"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect4059"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect4061"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4063"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4065"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4067"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4069"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect4071"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect4073"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4075"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4077"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect4079"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4081"
+     r="15.8113"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4083"
+     r="15.7477"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4085"
+     r="15.5572"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4087"
+     r="15.2415"
+     style="fill:#001b36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4089"
+     r="14.8031"
+     style="fill:#002447;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4091"
+     r="14.2455"
+     style="fill:#002c58;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4093"
+     r="13.5732"
+     style="fill:#003468;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4095"
+     r="12.7916"
+     style="fill:#003c77;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4097"
+     r="11.907"
+     style="fill:#004386;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4099"
+     r="10.9266"
+     style="fill:#004993;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4101"
+     r="9.8581896"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4103"
+     r="8.7103996"
+     style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4105"
+     r="7.4924798"
+     style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4107"
+     r="6.2142401"
+     style="fill:#005db9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4109"
+     r="4.8859601"
+     style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4111"
+     r="3.5183499"
+     style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4113"
+     r="2.1224"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4115"
+     r="0.70937097"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="997.78261,1036.1922 984.15217,1050.913 1011.413,1050.913 "
+     id="polygon4117"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4119"
+     r="4.3617401"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4121"
+     r="4.2349901"
+     style="fill:#001933;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4123"
+     r="3.8621299"
+     style="fill:#003163;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4125"
+     r="3.2648101"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4127"
+     r="2.4777501"
+     style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4129"
+     r="1.54669"
+     style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4131"
+     r="0.52574998"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="970.521739,1050.913043 984.152174,1050.913043"
+     id="polyline4137"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-767.39801"
+     y="1234.2231"
+     width="18"
+     height="16"
+     id="rect4139"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-758.39801"
+     cy="1242.2231"
+     rx="8.9960899"
+     ry="8.1782598"
+     id="ellipse4141"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="13px"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4143"
+     x="-758.39801"
+     y="1242.4962"
+     style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4145"
+     x="-785.92792"
+     y="1233.7721"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     x="1424.603"
+     y="876.98798"
+     id="text4147"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+  <rect
+     transform="scale(-1)"
+     x="-1443.8732"
+     y="-856.95795"
+     width="38"
+     height="33"
+     id="rect4149"
+     style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1)"
+     x="-1452.5032"
+     y="-841.31805"
+     width="55"
+     height="2"
+     id="rect4151"
+     style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-1424.7432"
+     y="839.31805"
+     width="27"
+     height="2"
+     id="rect4153"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1157.5313,1146.8713 1161.3478,1141.9643 1164.6191,1146.8713 "
+     id="polygon4155"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffff00;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,1110.886957 1183.156522,1110.886957 1183.156522,1144.690435 1162.983478,1144.690435"
+     id="polyline4157"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1134.086957,1110.886957 1139.539130,1110.886957 1139.539130,1131.605217"
+     id="polyline4159"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1397.613"
+     y="808.01801"
+     id="text4161"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1451.5831"
+     y="807.46796"
+     id="text4163"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+  <polyline
+     points="984.697391,696.521739 968.340870,696.521739"
+     id="polyline4165"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-413.00702"
+     y="1234.2231"
+     width="18"
+     height="16"
+     id="rect4167"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-404.00696"
+     cy="1242.2231"
+     rx="8.9960899"
+     ry="8.1782598"
+     id="ellipse4169"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="13px"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4171"
+     x="-404.00702"
+     y="1241.9502"
+     style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1272.3062"
+     width="55"
+     height="22"
+     id="rect4173"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1272.3062"
+     width="55"
+     height="22"
+     id="rect4175"
+     style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1272.3062"
+     width="55"
+     height="22"
+     id="rect4177"
+     style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.8062"
+     width="55"
+     height="21"
+     id="rect4179"
+     style="fill:#282828;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.8062"
+     width="55"
+     height="21"
+     id="rect4181"
+     style="fill:#363636;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.3062"
+     width="55"
+     height="20"
+     id="rect4183"
+     style="fill:#434343;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.3062"
+     width="55"
+     height="20"
+     id="rect4185"
+     style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1270.8062"
+     width="55"
+     height="19"
+     id="rect4187"
+     style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1270.3062"
+     width="55"
+     height="18"
+     id="rect4189"
+     style="fill:#676767;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1270.3062"
+     width="55"
+     height="18"
+     id="rect4191"
+     style="fill:#737373;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1269.8062"
+     width="55"
+     height="17"
+     id="rect4193"
+     style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1269.3062"
+     width="55"
+     height="16"
+     id="rect4195"
+     style="fill:#878787;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1268.8062"
+     width="55"
+     height="15"
+     id="rect4197"
+     style="fill:#919191;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.8062"
+     width="55"
+     height="13"
+     id="rect4199"
+     style="fill:#999999;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4201"
+     style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4203"
+     style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.3062"
+     width="55"
+     height="10"
+     id="rect4205"
+     style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4207"
+     style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4209"
+     style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4211"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4213"
+     style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4215"
+     style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect4217"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4219"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4221"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4223"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4225"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4227"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4229"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4231"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4233"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.3062"
+     width="55"
+     height="10"
+     id="rect4235"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.3062"
+     width="55"
+     height="10"
+     id="rect4237"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4239"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4241"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4243"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4245"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4247"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect4249"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4251"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4253"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4255"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect4257"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4259"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect4261"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-420.77997"
+     y="-1272.3062"
+     width="33"
+     height="22"
+     id="rect4263"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1014.1391,717.24 997.78261,696.52174 981.42609,717.24 "
+     id="polygon4265"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1014.1391,675.80348 997.78261,696.52174 981.42609,675.80348 "
+     id="polygon4267"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-415.27997"
+     y="-1288.5731"
+     width="22"
+     height="12"
+     id="rect4269"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-414.77997"
+     y="-1288.5731"
+     width="21"
+     height="12"
+     id="rect4271"
+     style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-414.27997"
+     y="-1288.5731"
+     width="20"
+     height="12"
+     id="rect4273"
+     style="fill:#535353;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-413.27997"
+     y="-1288.5731"
+     width="18"
+     height="12"
+     id="rect4275"
+     style="fill:#777777;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-411.77997"
+     y="-1288.5731"
+     width="15"
+     height="12"
+     id="rect4277"
+     style="fill:#969696;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-409.77997"
+     y="-1288.5731"
+     width="11"
+     height="12"
+     id="rect4279"
+     style="fill:#acacac;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-407.77997"
+     y="-1288.5731"
+     width="7"
+     height="12"
+     id="rect4281"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-405.27997"
+     y="-1288.5731"
+     width="2"
+     height="12"
+     id="rect4283"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-410.27997"
+     y="-1288.5731"
+     width="12"
+     height="12"
+     id="rect4285"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-410.27997"
+     y="-1288.5731"
+     width="12"
+     height="12"
+     id="rect4287"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-409.77997"
+     y="-1288.5731"
+     width="11"
+     height="12"
+     id="rect4289"
+     style="fill:#00376e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-409.27997"
+     y="-1288.5731"
+     width="10"
+     height="12"
+     id="rect4291"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-408.27997"
+     y="-1288.5731"
+     width="8"
+     height="12"
+     id="rect4293"
+     style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-407.27997"
+     y="-1288.5731"
+     width="6"
+     height="12"
+     id="rect4295"
+     style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-406.27997"
+     y="-1288.5731"
+     width="4"
+     height="12"
+     id="rect4297"
+     style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-404.77997"
+     y="-1288.5731"
+     width="1"
+     height="12"
+     id="rect4299"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1018.5009,712.87826 997.78261,696.52174 1018.5009,680.16522 "
+     id="polygon4301"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="986.878261,704.700000 986.878261,688.343478"
+     id="polyline4303"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="986.878261,696.521739 997.782609,696.521739"
+     id="polyline4305"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     x="1621.1531"
+     y="805.01801"
+     id="text4307"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4309"
+     r="27.2609"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4311"
+     r="27.1945"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4313"
+     r="26.9956"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4315"
+     r="26.665199"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4317"
+     r="26.2048"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4319"
+     r="25.6168"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4321"
+     r="24.903999"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4323"
+     r="24.069901"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4325"
+     r="23.1185"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4327"
+     r="22.054501"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4329"
+     r="20.882999"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4331"
+     r="19.6098"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4333"
+     r="18.2411"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4335"
+     r="16.783501"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4337"
+     r="15.2441"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4339"
+     r="13.6304"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4341"
+     r="11.9504"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4343"
+     r="10.2121"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4345"
+     r="8.4240704"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4347"
+     r="6.5949998"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4349"
+     r="4.7337999"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4351"
+     r="2.84954"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4353"
+     r="0.95139098"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+     id="polyline4355"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+     id="polyline4357"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,451.173913 997.782609,423.913043"
+     id="polyline4359"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,451.173913 997.782609,423.913043"
+     id="polyline4361"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+     id="polyline4363"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+     id="polyline4365"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,778.304348 997.782609,723.782609"
+     id="polyline4367"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,778.304348 997.782609,723.782609"
+     id="polyline4369"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,669.260870 997.782609,614.739130"
+     id="polyline4371"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,669.260870 997.782609,614.739130"
+     id="polyline4373"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,1132.695652 1330.365217,1132.695652"
+     id="polyline4375"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,1132.695652 1330.365217,1132.695652"
+     id="polyline4377"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1297.652174,614.739130 1297.652174,669.260870"
+     id="polyline4379"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1025.043478,587.478261 1270.391304,587.478261"
+     id="polyline4389"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1025.043478,587.478261 1270.391304,587.478261"
+     id="polyline4391"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,560.217391 997.782609,505.695652"
+     id="polyline4393"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,560.217391 997.782609,505.695652"
+     id="polyline4395"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+     id="polyline4397"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+     id="polyline4399"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,1023.652174 997.782609,832.826087"
+     id="polyline4401"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,1023.652174 997.782609,832.826087"
+     id="polyline4403"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+     id="polyline4405"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+     id="polyline4407"
+     transform="matrix(1,0,0,1.7272727,263.52311,-1116.0206)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4409"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="921.452174,1050.913043 965.069565,1050.913043"
+     id="polyline4411"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="921.452174,1050.913043 965.069565,1050.913043"
+     id="polyline4413"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+     id="polyline4415"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+     id="polyline4417"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     cx="1561.1731"
+     cy="840.45795"
+     id="circle4419"
+     r="3"
+     style="fill:#007fff;stroke:#007fff" />
+  <circle
+     cx="1397.613"
+     cy="22.627993"
+     id="circle4421"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="22.627993"
+     id="circle4423"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-22.627993"
+     id="circle4425"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-22.627993"
+     id="circle4427"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-22.627993"
+     id="circle4429"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1416.9231"
+     y="-5.5000019"
+     width="5"
+     height="5"
+     id="rect4431"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1427.8231"
+     y="-5.5000019"
+     width="5"
+     height="5"
+     id="rect4433"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-131.67101"
+     cy="1261.3062"
+     id="circle4435"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-131.67101"
+     cy="1261.3062"
+     id="circle4437"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="77.149025"
+     cy="-1261.3062"
+     id="circle4439"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="77.149025"
+     cy="-1261.3062"
+     id="circle4441"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="77.149025"
+     cy="-1261.3062"
+     id="circle4443"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="970.52174,399.37826 970.52174,393.92609 965.06957,396.65217 "
+     id="polygon4445"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-213.45399"
+     cy="1261.3062"
+     id="circle4447"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-213.45399"
+     cy="1261.3062"
+     id="circle4449"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="158.93202"
+     cy="-1261.3062"
+     id="circle4451"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="158.93202"
+     cy="-1261.3062"
+     id="circle4453"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="158.93202"
+     cy="-1261.3062"
+     id="circle4455"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-188.69301"
+     y="-1282.3431"
+     width="5"
+     height="5"
+     id="rect4457"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4459"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="970.52174,478.43478 959.61739,483.88696 959.61739,472.98261 "
+     id="polygon4461"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-322.49695"
+     cy="1261.3062"
+     id="circle4463"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-322.49695"
+     cy="1261.3062"
+     id="circle4465"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-267.97498"
+     cy="1261.3062"
+     id="circle4467"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-267.97498"
+     cy="1261.3062"
+     id="circle4469"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-267.97498"
+     cy="1261.3062"
+     id="circle4471"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-295.23602"
+     cy="1288.5632"
+     id="circle4473"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-295.23602"
+     cy="1288.5632"
+     id="circle4475"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-540.58398"
+     cy="1261.3062"
+     id="circle4477"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-540.58398"
+     cy="1261.3062"
+     id="circle4479"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-486.06192"
+     cy="1261.3062"
+     id="circle4481"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-486.06192"
+     cy="1261.3062"
+     id="circle4483"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-486.06192"
+     cy="1261.3062"
+     id="circle4485"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-513.32294"
+     cy="1288.5631"
+     id="circle4487"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-513.32294"
+     cy="1288.5631"
+     id="circle4489"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.97498"
+     cy="-1561.1732"
+     id="circle4491"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.97498"
+     cy="-1561.1732"
+     id="circle4493"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="322.49695"
+     cy="-1561.1732"
+     id="circle4495"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="322.49695"
+     cy="-1561.1732"
+     id="circle4497"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="322.49695"
+     cy="-1561.1732"
+     id="circle4499"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="295.23596"
+     cy="-1533.9132"
+     id="circle4501"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="295.23596"
+     cy="-1533.9132"
+     id="circle4503"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-785.92804"
+     cy="1261.3062"
+     id="circle4509"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-785.92804"
+     cy="1261.3062"
+     id="circle4511"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="731.40802"
+     cy="-1261.306"
+     id="circle4513"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="731.40802"
+     cy="-1261.306"
+     id="circle4515"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="731.40802"
+     cy="-1261.306"
+     id="circle4517"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-761.16803"
+     y="-1282.3431"
+     width="5"
+     height="5"
+     id="rect4523"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="959.61739,1056.3652 959.61739,1045.4609 970.52174,1050.913 "
+     id="polygon4525"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-840.45807"
+     id="circle4529"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-840.45807"
+     id="circle4531"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="840.45795"
+     id="circle4533"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="840.45795"
+     id="circle4535"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="840.45795"
+     id="circle4537"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="1199.513,1116.3391 1199.513,1105.4348 1188.6087,1110.887 "
+     id="polygon4539"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1134.087,1113.613 1134.087,1108.1609 1128.6348,1110.887 "
+     id="polygon4541"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(-1)"
+     x="-1427.3732"
+     y="-823.32794"
+     width="5"
+     height="5"
+     id="rect4543"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-431.54092"
+     cy="1261.3062"
+     id="circle4545"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-431.54092"
+     cy="1261.3062"
+     id="circle4547"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-377.01898"
+     cy="1261.3062"
+     id="circle4549"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-377.01898"
+     cy="1261.3062"
+     id="circle4551"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-377.01898"
+     cy="1261.3062"
+     id="circle4553"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-404.27991"
+     cy="1288.5631"
+     id="circle4555"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-404.27991"
+     cy="1288.5631"
+     id="circle4557"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="959.61739,701.97391 959.61739,691.06957 970.52174,696.52174 "
+     id="polygon4559"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-1596.3931"
+     y="829.45795"
+     width="5"
+     height="22"
+     id="rect4561"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4563"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4565"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4567"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4569"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4571"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4573"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-1596.3931"
+     y="829.45795"
+     width="5"
+     height="22"
+     id="rect4575"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4577"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4579"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4581"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4583"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4585"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4587"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4589"
+     transform="matrix(1,0,0,-1,263.52311,882.7145)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4591"
+     transform="translate(263.52311,-374.02461)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <path
+     style="fill:none;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1288.5666,404.27974 c 78.4585,0.26724 156.9146,0.53446 202.3497,-13.09602 45.4351,-13.63049 57.8468,-41.15802 70.259,-68.68659"
+     id="path4974"
+     inkscape:path-effect="#path-effect4976"
+     inkscape:original-d="m 1288.5666,404.27974 c 78.4585,0.26823 156.9146,0.53546 235.3728,0.8017 12.4132,-27.52768 24.8249,-55.05521 37.2359,-82.58431"
+     sodipodi:nodetypes="ccc"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1288.5666,513.32322 c 79.0553,0.3065 158.108,0.61299 203.5431,-31.1916 45.4351,-31.80459 57.2502,-95.71851 69.0656,-159.63449"
+     id="path5801"
+     inkscape:path-effect="#path-effect5803"
+     inkscape:original-d="m 1288.5666,513.32322 c 79.0553,0.3075 158.108,0.61399 237.1628,0.91949 11.8166,-63.91546 23.6316,-127.82939 35.4459,-191.74558"
+     sodipodi:nodetypes="ccc"
+     inkscape:connector-curvature="0" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+     x="212.67993"
+     y="939.21838"
+     id="text6534"
+     inkscape:transform-center-x="14.477778"
+     inkscape:transform-center-y="45.588803"><tspan
+       sodipodi:role="line"
+       id="tspan6532"
+       x="212.67993"
+       y="939.21838">(a)</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+     x="815.57019"
+     y="939.21838"
+     id="text6538"
+     inkscape:transform-center-x="14.477778"
+     inkscape:transform-center-y="45.588803"><tspan
+       sodipodi:role="line"
+       id="tspan6536"
+       x="815.57019"
+       y="939.21838">(b)</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+     x="1397.2368"
+     y="939.21838"
+     id="text6542"
+     inkscape:transform-center-x="14.477778"
+     inkscape:transform-center-y="45.588803"><tspan
+       sodipodi:role="line"
+       id="tspan6540"
+       x="1397.2368"
+       y="939.21838">(c)</tspan></text>
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.png
deleted file mode 100644
index 0a7f4747bfd..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.svg
new file mode 100644
index 00000000000..d77a4ee0987
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/resistanceValveSeries.svg
@@ -0,0 +1,2016 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1076.5896 364.54218"
+   version="1.1"
+   id="svg446"
+   sodipodi:docname="resistanceValveSeries.svg"
+   width="1076.5896"
+   height="364.54218"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata452">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs450" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2085"
+     inkscape:window-height="1376"
+     id="namedview448"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.6929368"
+     inkscape:cx="578.58965"
+     inkscape:cy="522.98915"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg446"
+     inkscape:document-rotation="0" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="5.6396484"
+     y="161.68916"
+     width="125"
+     height="125"
+     id="rect2" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="143.26414"
+     id="text4">P</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="77.250000,331.370000 77.250000,423.500000"
+     id="polyline6"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="82.23,331.37 77.25,317.675 72.27,331.37 "
+     id="polygon8"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="71.025000,417.275000 178.095000,417.275000"
+     id="polyline10"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="169.38,422.255 183.075,417.275 169.38,412.295 "
+     id="polygon12"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="77.250000,417.275000 102.150000,417.275000 146.347500,350.045000"
+     id="polyline14"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="305.11414"
+     id="text16">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="146.347500,350.045000 180.585000,350.045000"
+     id="polyline18"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="516.96167"
+     y="351.40414"
+     id="text20">res1</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect22" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect24" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect26" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect28" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-297.98914"
+     width="125"
+     height="48"
+     id="rect30" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-297.48914"
+     width="125"
+     height="47"
+     id="rect32" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-296.48914"
+     width="125"
+     height="45"
+     id="rect34" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-295.98914"
+     width="125"
+     height="44"
+     id="rect36" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-294.98914"
+     width="125"
+     height="42"
+     id="rect38" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-293.98914"
+     width="125"
+     height="40"
+     id="rect40" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-292.98914"
+     width="125"
+     height="38"
+     id="rect42" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-291.98914"
+     width="125"
+     height="36"
+     id="rect44" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-290.48914"
+     width="125"
+     height="33"
+     id="rect46" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-289.48914"
+     width="125"
+     height="31"
+     id="rect48" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-287.98914"
+     width="125"
+     height="28"
+     id="rect50" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-286.48914"
+     width="125"
+     height="25"
+     id="rect52" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-284.98914"
+     width="125"
+     height="22"
+     id="rect54" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-283.48914"
+     width="125"
+     height="19"
+     id="rect56" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-281.48914"
+     width="125"
+     height="15"
+     id="rect58" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-279.98914"
+     width="125"
+     height="12"
+     id="rect60" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-278.48914"
+     width="125"
+     height="9"
+     id="rect62" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-276.48914"
+     width="125"
+     height="5"
+     id="rect64" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-274.98914"
+     width="125"
+     height="2"
+     id="rect66" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect68" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect70" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-288.61215"
+     width="125"
+     height="28"
+     id="rect72" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect74" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect76" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-287.11215"
+     width="125"
+     height="25"
+     id="rect78" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-286.61215"
+     width="125"
+     height="24"
+     id="rect80" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-286.11215"
+     width="125"
+     height="23"
+     id="rect82" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-285.11215"
+     width="125"
+     height="21"
+     id="rect84" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-284.11215"
+     width="125"
+     height="19"
+     id="rect86" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-283.11115"
+     width="125"
+     height="17"
+     id="rect88" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-281.61215"
+     width="125"
+     height="14"
+     id="rect90" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-280.61215"
+     width="125"
+     height="12"
+     id="rect92" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-279.11215"
+     width="125"
+     height="9"
+     id="rect94" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-278.11115"
+     width="125"
+     height="7"
+     id="rect96" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-276.61215"
+     width="125"
+     height="4"
+     id="rect98" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-275.11215"
+     width="125"
+     height="1"
+     id="rect100" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect102" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect104" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="198.86464"
+     y="203.02415"
+     id="text106">p</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="267.33966"
+     y="193.06416"
+     id="text108">sou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse110"
+     r="62.25" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse112"
+     r="62.0984" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse114"
+     r="61.644199" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse116"
+     r="60.889702" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse118"
+     r="59.838501" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse120"
+     r="58.495899" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse122"
+     r="56.868198" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse124"
+     r="54.963501" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse126"
+     r="52.791" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse128"
+     r="50.361301" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse130"
+     r="47.686298" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse132"
+     r="44.7789" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse134"
+     r="41.6534" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse136"
+     r="38.324902" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse138"
+     r="34.809799" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse140"
+     r="31.125" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse142"
+     r="27.288601" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse144"
+     r="23.3193" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse146"
+     r="19.2363" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse148"
+     r="15.0596" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse150"
+     r="10.8096" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse152"
+     r="6.5068998" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse154"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="268.58466"
+     y="272.12112"
+     id="text156" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="237.88414"
+     id="text158">V=10 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text160">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse162"
+     r="62.25" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse164"
+     r="62.0984" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse166"
+     r="61.644199" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse168"
+     r="60.889702" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse170"
+     r="59.838501" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse172"
+     r="58.495899" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse174"
+     r="56.868198" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse176"
+     r="54.963501" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse178"
+     r="52.791" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse180"
+     r="50.361301" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse182"
+     r="47.686298" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse184"
+     r="44.7789" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse186"
+     r="41.6534" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse188"
+     r="38.324902" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse190"
+     r="34.809799" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse192"
+     r="31.125" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse194"
+     r="27.288601" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse196"
+     r="23.3193" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse198"
+     r="19.2363" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse200"
+     r="15.0596" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse202"
+     r="10.8096" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse204"
+     r="6.5068998" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse206"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1015.5797"
+     y="209.87114"
+     id="text208" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text210">vol</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="351.40414"
+     id="text212">val</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect214" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect216" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect218" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect220" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.98914"
+     width="125"
+     height="48"
+     id="rect222" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.48914"
+     width="125"
+     height="47"
+     id="rect224" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-296.48914"
+     width="125"
+     height="45"
+     id="rect226" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-295.98914"
+     width="125"
+     height="44"
+     id="rect228" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-294.98914"
+     width="125"
+     height="42"
+     id="rect230" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-293.98914"
+     width="125"
+     height="40"
+     id="rect232" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-292.98914"
+     width="125"
+     height="38"
+     id="rect234" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-291.98914"
+     width="125"
+     height="36"
+     id="rect236" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-290.48914"
+     width="125"
+     height="33"
+     id="rect238" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.48914"
+     width="125"
+     height="31"
+     id="rect240" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.98914"
+     width="125"
+     height="28"
+     id="rect242" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.48914"
+     width="125"
+     height="25"
+     id="rect244" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.98914"
+     width="125"
+     height="22"
+     id="rect246" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.48914"
+     width="125"
+     height="19"
+     id="rect248" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.48914"
+     width="125"
+     height="15"
+     id="rect250" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.98914"
+     width="125"
+     height="12"
+     id="rect252" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.48914"
+     width="125"
+     height="9"
+     id="rect254" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.48914"
+     width="125"
+     height="5"
+     id="rect256" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-274.98914"
+     width="125"
+     height="2"
+     id="rect258" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect260" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect262" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.61215"
+     width="125"
+     height="28"
+     id="rect264" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect266" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect268" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.11215"
+     width="125"
+     height="25"
+     id="rect270" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.61215"
+     width="125"
+     height="24"
+     id="rect272" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.11215"
+     width="125"
+     height="23"
+     id="rect274" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-285.11215"
+     width="125"
+     height="21"
+     id="rect276" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.11215"
+     width="125"
+     height="19"
+     id="rect278" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.11115"
+     width="125"
+     height="17"
+     id="rect280" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.61215"
+     width="125"
+     height="14"
+     id="rect282" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-280.61215"
+     width="125"
+     height="12"
+     id="rect284" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.11215"
+     width="125"
+     height="9"
+     id="rect286" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.11115"
+     width="125"
+     height="7"
+     id="rect288" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.61215"
+     width="125"
+     height="4"
+     id="rect290" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-275.11215"
+     width="125"
+     height="1"
+     id="rect292" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect294" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect296" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,393.620000 824.250000,356.270000"
+     id="polyline298"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,379.925000 849.150000,379.925000"
+     id="polyline300"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="745.46167"
+     y="211.91414"
+     width="41"
+     height="37"
+     id="rect302" />
+  <ellipse
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="765.96167"
+     cy="230.41414"
+     rx="20.5425"
+     ry="18.674999"
+     id="ellipse304" />
+  <text
+     fill="#000000"
+     font-size="29px"
+     font-family="helvetica"
+     font-weight="bold"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="229.79216"
+     id="text306">M</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="703.08966"
+     y="211.11617"
+     id="text308" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="727.83966"
+     y="-298.98914"
+     width="75"
+     height="50"
+     id="rect310" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="776.94,460.85 824.25,423.5 776.94,386.15 "
+     id="polygon312"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="871.56,460.85 824.25,423.5 871.56,386.15 "
+     id="polygon314"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="805.575000,398.600000 842.925000,398.600000"
+     id="polyline316"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,398.600000 824.250000,423.500000"
+     id="polyline318"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="578.33966"
+     y="24.739151"
+     width="125"
+     height="125"
+     id="rect320" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="6.3141475"
+     id="text322">y</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="649.950000,194.420000 649.950000,286.550000"
+     id="polyline324"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="654.93,194.42 649.95,180.725 644.97,194.42 "
+     id="polygon326"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="643.725000,280.325000 750.795000,280.325000"
+     id="polyline328"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="742.08,285.305 755.775,280.325 742.08,275.345 "
+     id="polygon330"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="649.950000,280.325000 674.850000,280.325000 719.047500,213.095000"
+     id="polyline332"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="168.16414"
+     id="text334">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="719.047500,213.095000 753.285000,213.095000"
+     id="polyline336"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline338"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline340"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline342"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline344"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline346"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline348"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline350"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline352"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline354"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline356"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="189.3,379.925 189.3,367.475 201.75,373.7 "
+     id="polygon358"
+     transform="translate(-58.910355,-149.51085)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="273.98914"
+     id="ellipse360"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="273.98914"
+     id="ellipse362"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-273.98914"
+     id="ellipse364"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-273.98914"
+     id="ellipse366"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-273.98914"
+     id="ellipse368"
+     r="4.98" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect370" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse372"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse374"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse376"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse378"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse380"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse382"
+     r="3.7349999" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect384" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse386"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse388"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse390"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse392"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse394"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse396"
+     r="3.7349999" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="239.1,386.15 239.1,361.25 264,373.7 "
+     id="polygon398"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect400" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse402" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse404" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse406" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse408" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse410" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse412" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect414" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse416" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse418" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse420" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse422" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse424" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse426" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="946.08966"
+     y="-217.73915"
+     width="12"
+     height="12"
+     id="rect428" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse430"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse432"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse434"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse436"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse438"
+     r="4.98" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="811.8,336.35 836.7,336.35 824.25,361.25 "
+     id="polygon440"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="849.15,386.15 849.15,373.7 861.6,379.925 "
+     id="polygon442"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="762,242.975 762,230.525 774.45,236.75 "
+     id="polygon444"
+     transform="translate(-58.910355,-149.51085)" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.png
deleted file mode 100644
index 5f92fbc1bc8..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.svg
new file mode 100644
index 00000000000..1e0c2c136c2
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/resistancesSeries.svg
@@ -0,0 +1,1822 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1076.5896 238.7244"
+   version="1.1"
+   id="svg396"
+   sodipodi:docname="resistancesSeries.svg"
+   width="1076.5896"
+   height="238.7244"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata402">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs400" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1486"
+     inkscape:window-height="1163"
+     id="namedview398"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.6929368"
+     inkscape:cx="235.2687"
+     inkscape:cy="401.00875"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg396"
+     inkscape:document-rotation="0" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="5.6396484"
+     y="35.871399"
+     width="125"
+     height="125"
+     id="rect2" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="17.446381"
+     id="text4">P</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="77.250000,331.370000 77.250000,423.500000"
+     id="polyline6"
+     transform="translate(-58.910355,-275.32861)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="82.23,331.37 77.25,317.675 72.27,331.37 "
+     id="polygon8"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="71.025000,417.275000 178.095000,417.275000"
+     id="polyline10"
+     transform="translate(-58.910355,-275.32861)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="169.38,422.255 183.075,417.275 169.38,412.295 "
+     id="polygon12"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="77.250000,417.275000 102.150000,417.275000 146.347500,350.045000"
+     id="polyline14"
+     transform="translate(-58.910355,-275.32861)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="179.29639"
+     id="text16">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="146.347500,350.045000 180.585000,350.045000"
+     id="polyline18"
+     transform="translate(-58.910355,-275.32861)" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="516.96167"
+     y="225.5864"
+     id="text20">res1</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect22" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect24" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect26" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect28" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-172.17139"
+     width="125"
+     height="48"
+     id="rect30" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-171.67139"
+     width="125"
+     height="47"
+     id="rect32" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-170.67139"
+     width="125"
+     height="45"
+     id="rect34" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-170.17139"
+     width="125"
+     height="44"
+     id="rect36" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-169.17139"
+     width="125"
+     height="42"
+     id="rect38" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-168.17139"
+     width="125"
+     height="40"
+     id="rect40" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-167.17139"
+     width="125"
+     height="38"
+     id="rect42" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-166.17139"
+     width="125"
+     height="36"
+     id="rect44" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-164.67139"
+     width="125"
+     height="33"
+     id="rect46" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-163.67139"
+     width="125"
+     height="31"
+     id="rect48" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.17139"
+     width="125"
+     height="28"
+     id="rect50" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-160.67139"
+     width="125"
+     height="25"
+     id="rect52" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-159.17139"
+     width="125"
+     height="22"
+     id="rect54" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-157.67139"
+     width="125"
+     height="19"
+     id="rect56" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-155.67139"
+     width="125"
+     height="15"
+     id="rect58" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-154.17139"
+     width="125"
+     height="12"
+     id="rect60" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-152.67139"
+     width="125"
+     height="9"
+     id="rect62" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-150.67139"
+     width="125"
+     height="5"
+     id="rect64" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-149.17139"
+     width="125"
+     height="2"
+     id="rect66" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect68" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect70" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.79439"
+     width="125"
+     height="28"
+     id="rect72" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect74" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect76" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-161.29439"
+     width="125"
+     height="25"
+     id="rect78" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-160.79439"
+     width="125"
+     height="24"
+     id="rect80" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-160.29439"
+     width="125"
+     height="23"
+     id="rect82" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-159.29439"
+     width="125"
+     height="21"
+     id="rect84" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-158.29439"
+     width="125"
+     height="19"
+     id="rect86" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-157.29338"
+     width="125"
+     height="17"
+     id="rect88" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-155.79439"
+     width="125"
+     height="14"
+     id="rect90" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-154.79439"
+     width="125"
+     height="12"
+     id="rect92" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-153.29439"
+     width="125"
+     height="9"
+     id="rect94" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-152.29338"
+     width="125"
+     height="7"
+     id="rect96" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-150.79439"
+     width="125"
+     height="4"
+     id="rect98" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-149.29439"
+     width="125"
+     height="1"
+     id="rect100" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect102" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect104" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="198.86464"
+     y="77.20639"
+     id="text106">p</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="267.33966"
+     y="67.246399"
+     id="text108">sou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse110"
+     r="62.25" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse112"
+     r="62.0984" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse114"
+     r="61.644199" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse116"
+     r="60.889702" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse118"
+     r="59.838501" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse120"
+     r="58.495899" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse122"
+     r="56.868198" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse124"
+     r="54.963501" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse126"
+     r="52.791" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse128"
+     r="50.361301" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse130"
+     r="47.686298" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse132"
+     r="44.7789" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse134"
+     r="41.6534" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse136"
+     r="38.324902" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse138"
+     r="34.809799" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse140"
+     r="31.125" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse142"
+     r="27.288601" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse144"
+     r="23.3193" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse146"
+     r="19.2363" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse148"
+     r="15.0596" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse150"
+     r="10.8096" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse152"
+     r="6.5068998" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse154"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="268.58466"
+     y="146.30338"
+     id="text156" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="112.06638"
+     id="text158">V=10 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="11.221375"
+     id="text160">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse162"
+     r="62.25" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse164"
+     r="62.0984" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse166"
+     r="61.644199" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse168"
+     r="60.889702" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse170"
+     r="59.838501" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse172"
+     r="58.495899" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse174"
+     r="56.868198" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse176"
+     r="54.963501" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse178"
+     r="52.791" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse180"
+     r="50.361301" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse182"
+     r="47.686298" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse184"
+     r="44.7789" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse186"
+     r="41.6534" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse188"
+     r="38.324902" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse190"
+     r="34.809799" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse192"
+     r="31.125" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse194"
+     r="27.288601" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse196"
+     r="23.3193" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse198"
+     r="19.2363" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse200"
+     r="15.0596" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse202"
+     r="10.8096" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse204"
+     r="6.5068998" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse206"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1015.5797"
+     y="84.053375"
+     id="text208" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="11.221375"
+     id="text210">vol</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="225.5864"
+     id="text212">res2</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect214" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect216" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect218" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect220" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-172.17139"
+     width="125"
+     height="48"
+     id="rect222" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-171.67139"
+     width="125"
+     height="47"
+     id="rect224" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-170.67139"
+     width="125"
+     height="45"
+     id="rect226" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-170.17139"
+     width="125"
+     height="44"
+     id="rect228" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-169.17139"
+     width="125"
+     height="42"
+     id="rect230" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-168.17139"
+     width="125"
+     height="40"
+     id="rect232" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-167.17139"
+     width="125"
+     height="38"
+     id="rect234" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-166.17139"
+     width="125"
+     height="36"
+     id="rect236" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-164.67139"
+     width="125"
+     height="33"
+     id="rect238" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-163.67139"
+     width="125"
+     height="31"
+     id="rect240" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.17139"
+     width="125"
+     height="28"
+     id="rect242" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-160.67139"
+     width="125"
+     height="25"
+     id="rect244" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-159.17139"
+     width="125"
+     height="22"
+     id="rect246" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-157.67139"
+     width="125"
+     height="19"
+     id="rect248" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-155.67139"
+     width="125"
+     height="15"
+     id="rect250" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-154.17139"
+     width="125"
+     height="12"
+     id="rect252" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-152.67139"
+     width="125"
+     height="9"
+     id="rect254" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-150.67139"
+     width="125"
+     height="5"
+     id="rect256" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-149.17139"
+     width="125"
+     height="2"
+     id="rect258" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect260" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect262" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.79439"
+     width="125"
+     height="28"
+     id="rect264" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect266" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect268" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-161.29439"
+     width="125"
+     height="25"
+     id="rect270" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-160.79439"
+     width="125"
+     height="24"
+     id="rect272" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-160.29439"
+     width="125"
+     height="23"
+     id="rect274" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-159.29439"
+     width="125"
+     height="21"
+     id="rect276" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-158.29439"
+     width="125"
+     height="19"
+     id="rect278" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-157.29338"
+     width="125"
+     height="17"
+     id="rect280" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-155.79439"
+     width="125"
+     height="14"
+     id="rect282" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-154.79439"
+     width="125"
+     height="12"
+     id="rect284" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-153.29439"
+     width="125"
+     height="9"
+     id="rect286" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-152.29338"
+     width="125"
+     height="7"
+     id="rect288" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-150.79439"
+     width="125"
+     height="4"
+     id="rect290" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-149.29439"
+     width="125"
+     height="1"
+     id="rect292" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect294" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect296" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline298"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline300"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline302"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline304"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline306"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline308"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline310"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline312"
+     transform="translate(-58.910355,-275.32861)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="189.3,379.925 189.3,367.475 201.75,373.7 "
+     id="polygon314"
+     transform="translate(-58.910355,-275.32861)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="148.17139"
+     id="ellipse316"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="148.17139"
+     id="ellipse318"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-148.17139"
+     id="ellipse320"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-148.17139"
+     id="ellipse322"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-148.17139"
+     id="ellipse324"
+     r="4.98" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="123.17139"
+     width="12"
+     height="50"
+     id="rect326" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse328"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse330"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse332"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse334"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse336"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse338"
+     r="3.7349999" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="123.17139"
+     width="12"
+     height="50"
+     id="rect340" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse342"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse344"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse346"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse348"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse350"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse352"
+     r="3.7349999" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="239.1,386.15 239.1,361.25 264,373.7 "
+     id="polygon354"
+     transform="translate(-58.910355,-275.32861)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-154.17139"
+     width="50"
+     height="12"
+     id="rect356" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse358" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse360" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse362" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse364" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse366" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.22537"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse368" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-154.17139"
+     width="50"
+     height="12"
+     id="rect370" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse372" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse374" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse376" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse378" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse380" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.22537"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse382" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="946.08966"
+     y="-91.921387"
+     width="12"
+     height="12"
+     id="rect384" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="148.17139"
+     id="ellipse386"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="148.17139"
+     id="ellipse388"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-148.17139"
+     id="ellipse390"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-148.17139"
+     id="ellipse392"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-148.17139"
+     id="ellipse394"
+     r="4.98" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.png b/Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.png
deleted file mode 100644
index 409ac853a6e..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.svg b/Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.svg
new file mode 100644
index 00000000000..1d2c49d486a
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_images/valveNoResistance.svg
@@ -0,0 +1,1531 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1076.5896 364.54218"
+   version="1.1"
+   id="svg346"
+   sodipodi:docname="valveNoResistance.svg"
+   width="1076.5896"
+   height="364.54218"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs350" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2525"
+     inkscape:window-height="1347"
+     id="namedview348"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.6929368"
+     inkscape:cx="232.95928"
+     inkscape:cy="522.98915"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg346"
+     inkscape:document-rotation="0" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="5.6396484"
+     y="161.68916"
+     width="125"
+     height="125"
+     id="rect2" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="143.26414"
+     id="text4">P</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="77.250000,331.370000 77.250000,423.500000"
+     id="polyline6"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="82.23,331.37 77.25,317.675 72.27,331.37 "
+     id="polygon8"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="71.025000,417.275000 178.095000,417.275000"
+     id="polyline10"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="169.38,422.255 183.075,417.275 169.38,412.295 "
+     id="polygon12"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="77.250000,417.275000 102.150000,417.275000 146.347500,350.045000"
+     id="polyline14"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="305.11414"
+     id="text16">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="146.347500,350.045000 180.585000,350.045000"
+     id="polyline18"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="198.86464"
+     y="203.02415"
+     id="text20">p</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="267.33966"
+     y="193.06416"
+     id="text22">sou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse24"
+     r="62.25" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse26"
+     r="62.0984" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse28"
+     r="61.644199" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse30"
+     r="60.889702" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse32"
+     r="59.838501" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse34"
+     r="58.495899" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse36"
+     r="56.868198" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse38"
+     r="54.963501" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse40"
+     r="52.791" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse42"
+     r="50.361301" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse44"
+     r="47.686298" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse46"
+     r="44.7789" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse48"
+     r="41.6534" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse50"
+     r="38.324902" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse52"
+     r="34.809799" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse54"
+     r="31.125" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse56"
+     r="27.288601" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse58"
+     r="23.3193" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse60"
+     r="19.2363" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse62"
+     r="15.0596" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse64"
+     r="10.8096" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse66"
+     r="6.5068998" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse68"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="268.58466"
+     y="272.12112"
+     id="text70" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="237.88414"
+     id="text72">V=10 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text74">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse76"
+     r="62.25" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse78"
+     r="62.0984" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse80"
+     r="61.644199" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse82"
+     r="60.889702" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse84"
+     r="59.838501" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse86"
+     r="58.495899" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse88"
+     r="56.868198" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse90"
+     r="54.963501" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse92"
+     r="52.791" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse94"
+     r="50.361301" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse96"
+     r="47.686298" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse98"
+     r="44.7789" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse100"
+     r="41.6534" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse102"
+     r="38.324902" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse104"
+     r="34.809799" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse106"
+     r="31.125" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse108"
+     r="27.288601" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse110"
+     r="23.3193" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse112"
+     r="19.2363" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse114"
+     r="15.0596" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse116"
+     r="10.8096" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse118"
+     r="6.5068998" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse120"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1015.5797"
+     y="209.87114"
+     id="text122" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text124">vol</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="351.40414"
+     id="text126">val</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect128" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect130" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect132" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect134" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.98914"
+     width="125"
+     height="48"
+     id="rect136" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.48914"
+     width="125"
+     height="47"
+     id="rect138" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-296.48914"
+     width="125"
+     height="45"
+     id="rect140" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-295.98914"
+     width="125"
+     height="44"
+     id="rect142" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-294.98914"
+     width="125"
+     height="42"
+     id="rect144" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-293.98914"
+     width="125"
+     height="40"
+     id="rect146" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-292.98914"
+     width="125"
+     height="38"
+     id="rect148" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-291.98914"
+     width="125"
+     height="36"
+     id="rect150" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-290.48914"
+     width="125"
+     height="33"
+     id="rect152" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.48914"
+     width="125"
+     height="31"
+     id="rect154" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.98914"
+     width="125"
+     height="28"
+     id="rect156" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.48914"
+     width="125"
+     height="25"
+     id="rect158" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.98914"
+     width="125"
+     height="22"
+     id="rect160" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.48914"
+     width="125"
+     height="19"
+     id="rect162" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.48914"
+     width="125"
+     height="15"
+     id="rect164" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.98914"
+     width="125"
+     height="12"
+     id="rect166" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.48914"
+     width="125"
+     height="9"
+     id="rect168" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.48914"
+     width="125"
+     height="5"
+     id="rect170" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-274.98914"
+     width="125"
+     height="2"
+     id="rect172" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect174" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect176" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.61215"
+     width="125"
+     height="28"
+     id="rect178" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect180" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect182" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.11215"
+     width="125"
+     height="25"
+     id="rect184" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.61215"
+     width="125"
+     height="24"
+     id="rect186" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.11215"
+     width="125"
+     height="23"
+     id="rect188" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-285.11215"
+     width="125"
+     height="21"
+     id="rect190" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.11215"
+     width="125"
+     height="19"
+     id="rect192" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.11115"
+     width="125"
+     height="17"
+     id="rect194" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.61215"
+     width="125"
+     height="14"
+     id="rect196" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-280.61215"
+     width="125"
+     height="12"
+     id="rect198" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.11215"
+     width="125"
+     height="9"
+     id="rect200" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.11115"
+     width="125"
+     height="7"
+     id="rect202" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.61215"
+     width="125"
+     height="4"
+     id="rect204" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-275.11215"
+     width="125"
+     height="1"
+     id="rect206" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect208" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect210" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,393.620000 824.250000,356.270000"
+     id="polyline212"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,379.925000 849.150000,379.925000"
+     id="polyline214"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="745.46167"
+     y="211.91414"
+     width="41"
+     height="37"
+     id="rect216" />
+  <ellipse
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="765.96167"
+     cy="230.41414"
+     rx="20.5425"
+     ry="18.674999"
+     id="ellipse218" />
+  <text
+     fill="#000000"
+     font-size="29px"
+     font-family="helvetica"
+     font-weight="bold"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="229.79216"
+     id="text220">M</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="703.08966"
+     y="211.11617"
+     id="text222" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="727.83966"
+     y="-298.98914"
+     width="75"
+     height="50"
+     id="rect224" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="776.94,460.85 824.25,423.5 776.94,386.15 "
+     id="polygon226"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="871.56,460.85 824.25,423.5 871.56,386.15 "
+     id="polygon228"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="805.575000,398.600000 842.925000,398.600000"
+     id="polyline230"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,398.600000 824.250000,423.500000"
+     id="polyline232"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="578.33966"
+     y="24.739151"
+     width="125"
+     height="125"
+     id="rect234" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="6.3141475"
+     id="text236">y</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="649.950000,194.420000 649.950000,286.550000"
+     id="polyline238"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="654.93,194.42 649.95,180.725 644.97,194.42 "
+     id="polygon240"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="643.725000,280.325000 750.795000,280.325000"
+     id="polyline242"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="742.08,285.305 755.775,280.325 742.08,275.345 "
+     id="polygon244"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="649.950000,280.325000 674.850000,280.325000 719.047500,213.095000"
+     id="polyline246"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="168.16414"
+     id="text248">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="719.047500,213.095000 753.285000,213.095000"
+     id="polyline250"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline252"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline254"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline256"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline258"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline260"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline262"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="388.500000,423.500000 762.000000,423.500000"
+     id="polyline264"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="388.500000,423.500000 762.000000,423.500000"
+     id="polyline266"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="189.3,379.925 189.3,367.475 201.75,373.7 "
+     id="polygon268"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect270" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse272"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse274"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse276"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse278"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse280"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse282"
+     r="3.7349999" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect284" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse286"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse288"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse290"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse292"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse294"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse296"
+     r="3.7349999" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="239.1,386.15 239.1,361.25 264,373.7 "
+     id="polygon298"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect300" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse302" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse304" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse306" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse308" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse310" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse312" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect314" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse316" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse318" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse320" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse322" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse324" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse326" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="946.08966"
+     y="-217.73915"
+     width="12"
+     height="12"
+     id="rect328" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse330"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse332"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse334"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse336"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse338"
+     r="4.98" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="811.8,336.35 836.7,336.35 824.25,361.25 "
+     id="polygon340"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="849.15,386.15 849.15,373.7 861.6,379.925 "
+     id="polygon342"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="762,242.975 762,230.525 774.45,236.75 "
+     id="polygon344"
+     transform="translate(-58.910355,-149.51085)" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt
index efa85ccb0f6..52448269e9d 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt
@@ -1,30 +1,50 @@
 Best Practice
 =============
 
-This section explains to library users best practice in creating new system models. The selected topics are based on problems that are often observed with new users of Modelica. Experienced users of Modelica may skip this section.
+This section explains to library users best practice in creating system models.
+The selected topics are based on problems that are often observed with new users of Modelica.
+Experienced users of Modelica may skip this section.
 
 Organization of packages
 ------------------------
 
-When developing models, one should distinguish between a library which contains widely applicable models, such as the `Buildings` library, and an application-specific model which may be created for a specific building and is of limited use for other applications.
-It is recommended that users store application-specific models outside of the `Buildings` library. This will allow users to replace the `Buildings` library with a new version without having to change the application-specific model.
-If during the course of the development of application-specific models, some models turn out to be of interest for other applications, then they can be contributed to the development of the `Buildings` library, as described in the section :ref:`Development`.
+When developing models, one should distinguish between a library which contains widely applicable models,
+such as the `Buildings` library, and an application-specific model which may be
+created for a specific building and is of limited use for other applications.
+It is recommended that users store application-specific models outside of the `Buildings` library.
+This will allow users to replace the `Buildings` library with a new version without having to change the application-specific model.
+
+The declare the dependency of your library on ``Buildings`` version 7.0.0, use
+the declaration
+
+.. code-block:: modelica
+
+   within;
+   package MyLibrary
+
+     annotation (
+       uses(
+         Buildings(
+           version="7.0.0")
+         )
+      );
+   end MyLibrary;
+
+
+If during the course of the development of application-specific models,
+some models turn out to be of interest for other applications, then they can be contributed to
+the development of the `Buildings` library, as described in the section :ref:`Development`.
 
 
 Building large system models
 ----------------------------
 
-<<<<<<< HEAD
-When creating a large system model, it is typically easier to build the system model through the composition of subsystem models that can be tested in isolation. For example, the package `Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
-contains small test models that are used to test individual components in the large system model `Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
-=======
 When creating a large system model, it is typically easier to build the system model
 through the composition of subsystem models that can be tested in isolation. For example,
 the package
 `Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
 contains small test models that are used to test individual components in the large system model
 `Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
->>>>>>> master
 Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models.
 
 
@@ -33,36 +53,38 @@ Propagating parameters and media packages
 
 Consider a model with a pump ``pum`` and a mass flow sensor ``sen``.
 Suppose that both models have a parameter ``m_flow_nominal`` for the nominal mass flow rate that needs to be set to the same value.
-Rather than setting these parameters individually to a numeric value, it is recommended to propagate the parameter to the top-level of the model. Thus, instead of using the declaration
+Rather than setting these parameters individually to a numeric value, it is recommended to propagate the parameter to the top-level of the model.
+This allows to change the value of ``m_flow_nominal`` at one location, and then have the value be propagated to all models that reference it.
+The effort for the additional declaration typically pays off as changes to the model are easier and more robust.
+
+To propagate parameters, instead of using the declaration
 
 .. code-block:: modelica
 
    Pump pum(m_flow_nominal=0.1) "Pump";
    TemperatureSensor sen(m_flow_nominal=0.1) "Sensor";
 
-we recommend to use
+use
 
 .. code-block:: modelica
 
-   Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1
-                                 "Nominal mass flow rate";
+   Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1 "Nominal mass flow rate";
    Pump pum(m_flow_nominal=m_flow_nominal) "Pump";
    TemperatureSensor sen(m_flow_nominal=m_flow_nominal) "Sensor";
 
-This allows to change the value of ``m_flow_nominal`` at one location, and then have the value be propagated to all models that reference it. The effort for the additional declaration typically pays off as changes to the model are easier and more robust.
-
-Propagating parameters and packages is particularly important for medium definitions. This allows the user to change the medium declaration at one location and then have it propagated to all models that reference it. This can be done by using the declaration
+Propagating parameters and packages is also recommended for medium definitions.
+This can be done by using the declaration
 
 .. code-block:: modelica
 
    replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
      "Medium model for air" annotation (choicesAllMatching=true);
 
-Here, the optional annotation ``annotation (choicesAllMatching=true)`` is added which causes a GUI to show a drop-down menu with all medium models that extend from ``Modelica.Media.Interfaces.PartialMedium``.
+Here, the optional annotation ``annotation (choicesAllMatching=true)`` is added which causes a GUI to show
+a drop-down menu with all medium models that extend from ``Modelica.Media.Interfaces.PartialMedium``.
 
 If the above sensor requires a medium model, which is likely the case, its declaration would be
 
-
 .. code-block:: modelica
 
    TemperatureSensor sen(redeclare package Medium = Medium,
@@ -88,10 +110,12 @@ Overdetermined initialization problem and inconsistent equations
 We will now explain how state variables, such as temperature and pressure, can be initialized.
 
 Consider a model consisting of a mass flow source ``Modelica.Fluid.Sources.MassFlowSource_T``, a fluid volume ``Buildings.Fluid.MixingVolumes.MixingVolume`` and
-a fixed boundary condition ``Buildings.Fluid.Sources.FixedBoundary``, connected in series as shown in the figure below. Note that the instance ``bou`` implements an equation that sets the medium pressure at its port, i.e., the port pressure ``bou.ports.p`` is fixed.
+a fixed boundary condition ``Buildings.Fluid.Sources.Boundary_pT``,
+connected in series as shown in the figure below. Note that the instance ``bou``
+implements an equation that sets the medium pressure at its port, i.e., the port pressure ``bou.ports.p`` is fixed.
 
-.. figure:: img/MixingVolumeInitialization.png
-   :scale: 100%
+.. figure:: img/MixingVolumeInitialization.*
+   :width: 300px
 
    Schematic diagram of a flow source, a fluid volume, and a pressure source.
 
@@ -130,7 +154,11 @@ Then, the equations for the mass balance of the fluid volume can be configured a
    at the value ``p(start=Medium.p_default)``, where ``Medium`` is the
    name of the instance of the medium model.
 
-Since the model ``Buildings.Fluid.Sources.FixedBoundary`` fixes the pressure at its port, the initial conditions :math:`p(t_0)=p_0` and :math:`dp(t_0)/dt = 0` lead to an overspecified system for the model shown above. To avoid such situation, use different initial conditions, or add a flow resistance between the mixing volume and the pressure source. The flow resistance introduces an equation that relates the pressure of the mixing volume and the pressure source as a function of the mass flow rate, thereby removing the inconsistency.
+Since the model ``Buildings.Fluid.Sources.Boundary_pT`` fixes the pressure at its port,
+the initial conditions :math:`p(t_0)=p_0` and :math:`dp(t_0)/dt = 0` lead to an overspecified system for the model shown above.
+To avoid such situation, use different initial conditions, or add a flow resistance between the mixing volume and the pressure source.
+The flow resistance introduces an equation that relates the pressure of the mixing volume and
+the pressure source as a function of the mass flow rate, thereby removing the inconsistency.
 
 .. warning::
 
@@ -232,33 +260,25 @@ Therefore, energy, mass fraction and trace substances have identical equations a
 Modeling of fluid junctions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 In Modelica, connecting fluid ports as shown below leads to ideal mixing at the junction.
-In some situation, such as the configuration below, connecting multiple connectors to a fluid port represents the physical phenomena that was intended to model.
+In some situation, such as the configuration below, connecting multiple connectors to
+a fluid port represents the physical phenomena that was intended to model.
 
-.. figure:: img/fluidJunctionMixing.png
-   :scale: 100%
+.. figure:: img/fluidJunctionMixing.*
+   :width: 300px
 
-   Connection of three components without explicitly introducing a mixer or splitter model.
+   Connection of three components without explicitly introducing a flow junction model.
 
-<<<<<<< HEAD
-However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix. This may be achieved by using an instance of the model
-`PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop>`_ as shown in the left figure below, which is the test model
-`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
-=======
 However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix.
 This may be achieved by using an instance of the model
 `Junction <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
 as shown in the left figure below, which is derived from the test model
 `BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
->>>>>>> master
 
-.. figure:: img/fluidJunctionMixingSplitter.png
+.. _fig_flu_cor_wro:
 
-   Correct (left) and wrong (right) connection of components with use of a mixer or splitter model.
+.. figure:: img/fluidJunctionMixingSplitter.*
+   :width: 1200px
 
-<<<<<<< HEAD
-In the figure on the left, the mixing points have been correctly defined by use of the three-way model that mixes or splits flow. By setting the nominal pressure drop of the mixer or splitter model to zero, the mixer or splitter model can be simplified so that no equation for the flow resistance is introduced. In addition, in the branch of the splitter that connects to the valve, a pressure drop can be modelled, which then affects the valve authority.
-However, in the figure on the right, the flow that leaves port A is mixing at port B with the return from the volume ``vol``, and then it flows to port C. Thus, the valve is exposed to the wrong temperature.
-=======
    Correct (a) and wrong (b) and (c) connection of components with use of a flow junction model.
 
 In :numref:`fig_flu_cor_wro` (a), the mixing points have been correctly defined by
@@ -273,18 +293,10 @@ e.g., the system model is wrong.
 The overhead for the simulation of these flow junctions can be reduced by
 setting the nominal pressure drop of flow junction model to zero,
 which will remove the pressure drop equation.
->>>>>>> master
 
 
 Use of sensors in fluid flow systems
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<<<<<<< HEAD
-When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on the direction of the flow or not. If the quantity depends on the flow direction, such as temperature or relative humidity, then sensors with two ports from the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_ library should be used. These sensors have a more efficient implementation than sensors with one port for situations where the flow reverses its direction.
-The proper use sensors is described in the
-`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors_UsersGuide.html>`_ of the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_ package.
-=======
 
 When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on
 the direction of the flow or not. If the quantity depends on the flow direction,
@@ -297,7 +309,6 @@ The proper use sensors is described in the
 of the
 `Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
 package.
->>>>>>> master
 
 
 .. _ReferencePressureIncompressibleFluids:
@@ -305,39 +316,33 @@ package.
 Reference pressure for incompressible fluids such as water
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD
-This section explains how to set a reference pressure for incompressible fluids. For fluids that model density as a function of temperature, the section also shows how to account for the thermal expansion of the fluid.
-=======
 This section explains how to set a reference pressure for fluids that model
 the flow as :term:`incompressible flow`,
 such as
 `Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
 and
 `Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
->>>>>>> master
 
-Consider the flow circuit shown below that consists of a pump or fan, a flow resistance and a volume.
+Consider the flow circuit shown in :numref:`fig_flow_cir` that consists of a pump or fan,
+a flow resistance and a volume.
+
+.. _fig_flow_cir:
 
-.. figure:: img/flowCircuitNoExpansion.png
-   :scale: 60%
+.. figure:: img/flowCircuit.*
+   :width: 400pt
 
    Schematic diagram of a flow circuit without means
    to set a reference pressure, or to account for
    thermal expansion of the fluid.
 
 When this model is used with a medium model that models
-:term:`compressible flow`, such as
-the medium model `Buildings.Media.Air <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Air.html#Buildings.Media.Air>`_,
-then the model is well defined because the gas medium implements the
-equation :math:`p=\rho \, R \, T`,
-where :math:`p` is the static pressure, :math:`\rho` is the mass density,
-:math:`R` is the gas constant and :math:`T` is the absolute temperature.
+:term:`compressible flow`,
+then the model is well defined because the gas medium implements
+an equation that relates density to pressure.
 
 However, when the medium model is changed to a model that models
-:term:`incompressible flow`, such as
-`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Water.html#Buildings.Media.Water>`_,
-then the density is constant. Consequently, there is no equation that
-can be used to compute the pressure based on the volume.
+:term:`incompressible flow`,
+then there is no equation that can be used to compute the pressure.
 In this situation, attempting to translate the model leads, in Dymola, to the following error message:
 
 .. code-block:: none
@@ -348,12 +353,8 @@ In this situation, attempting to translate the model leads, in Dymola, to the fo
    The number of scalar Real unknown elements are 58.
    The number of scalar Real equation elements are 58.
 
-<<<<<<< HEAD
-Similarly, if the medium model `Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
-=======
 Similarly, if the medium model
 `Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
->>>>>>> master
 which models density as a function of pressure and enthalpy, is used, then
 the model is well-defined, but the pressure increases the longer the pump runs.
 The reason is that the pump adds heat to the water. When the water temperature
@@ -363,55 +364,18 @@ the pressure increases from :math:`1 \, \mathrm{bars}` to :math:`150 \, \mathrm{
 To avoid this singularity or increase in pressure,
 use a model that imposes a pressure source and that accounts for the expansion of the fluid.
 For example, use
-<<<<<<< HEAD
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
-to form the system model shown below.
-=======
 `Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
 
 .. _fig_flow_cir_wit_bou:
->>>>>>> master
 
-.. figure:: img/flowCircuitWithExpansionVessel.png
-   :scale: 60%
+.. figure:: img/flowCircuitWithBoundary.*
+   :width: 400pt
 
-   Schematic diagram of a flow circuit with expansion vessel that
-   adds a pressure source and accounts for the thermal expansion
-   of the medium.
+   Schematic diagram of a flow circuit with a model that
+   provides a reference presssure.
 
 Alternatively, you may use
-<<<<<<< HEAD
-`Buildings.Fluid.Sources.FixedBoundary <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_, which sets the pressure to a constant value
-and adds or removes fluid as needed to maintain the pressure.
-The model `Buildings.Fluid.Sources.FixedBoundary <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_ usually leads to simpler equations than
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
-Note that the medium that flows out of the fluid port of
-`Buildings.Fluid.Sources.FixedBoundary <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_
-is at a fixed temperature, while the model
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_ conserves energy.
-However, since the thermal expansion of the fluid is usually small, this effect can be neglected in most building HVAC applications.
-
-.. figure:: img/flowCircuitWithBoundary.png
-   :scale: 60%
-
-   Schematic diagram of a flow circuit with a boundary model that adds
-   a fixed pressure source and accounts for any thermal expansion
-   of the medium.
-
-
-.. note::
-
-   In each water circuit, there must be one, and only one, instance of
-   `Buildings.Fluid.Storage.ExpansionVessel
-   <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
-   or instance of
-   `Buildings.Fluid.Sources.FixedBoundary
-   <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_.
-   If there is no such device, then the absolute pressure
-   may not be defined, or it may raise to an unrealistically large
-   value if the medium density changes.
-=======
 `Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
 but
 `Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
@@ -434,12 +398,32 @@ this effect can be neglected in most building HVAC applications.
    `Buildings.Fluid.Storage.ExpansionVessel
    <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
 
->>>>>>> master
    If there is more than one such device, then there are multiple
    points in the system that set the reference static pressure.
    This will affect the distribution of the mass flow rate.
 
 
+.. note::
+
+   If Dymola fails to translate a model with the error message::
+
+      Error: The initialization problem is overspecified for variables
+      of element type Real
+      The initial equation
+      ...
+      refers to variables, which are all knowns.
+      To correct it you can remove this equation.
+
+   then the initialization problem is overspecified. To avoid this, set
+
+   .. code-block:: modelica
+
+      energyDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
+      massDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
+
+   in the instances of the components that contain fluid volumes.
+
+
 Nominal Values
 ~~~~~~~~~~~~~~
 
@@ -498,111 +482,6 @@ parameters in various model to help the user understand how they are used.
 +---------------------+---------------------------+--------------------------------------------------------------------------+
 
 
-
-
-
-
-Start values of iteration variables
------------------------------------
-
-When computing numerical solutions to systems of nonlinear equations, a Newton-based solver is typically used. Such solvers have a higher success of convergence if good start values are provided for the iteration variables. In Dymola, to see what start values are used, one can enter on the simulation tab the command
-
-.. code-block:: none
-
-   Advanced.LogStartValuesForIterationVariables = true;
-
-Then, when a model is translated, for example using
-
-.. code-block:: none
-
-   translateModel("Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop");
-
-an output of the form
-
-.. code-block:: none
-
-   Start values for iteration variables:
-    val.res1.dp(start = 3000.0)
-    val.res3.dp(start = 3000.0)
-
-is produced. This shows the iteration variables and their start values. These start values can be overwritten in the model.
-
-
-Avoiding events
----------------
-
-In Modelica, the time integration is halted whenever a Real elementary
-operation such as :math:`x>y`, where :math:`x` and :math:`y` are variables of type ``Real``,
-changes its value. In this situation,
-an event occurs and the solver determines a small interval in time in which
-the relation changes its value. Determining this time interval
-often requires an iterative solution, which can significantly
-increase the computing time if the iteration require
-the evaluation of a large system of equations.
-An example where such an event occurs is the following relation
-that computes the enthalpy of the medium that streams through ``port_a`` as
-
-.. code-block:: modelica
-
-		if port_a.m_flow > 0 then
-		  h_a = inStream(port_a.h_outflow);
-		else
-		  h_a = port_a.h_outflow;
-		end if;
-
-or, equivalently,
-
-.. code-block:: modelica
-
-		h_a = if port_a.m_flow > 0 then inStream(port_a.h_outflow) else port_a.h_outflow;
-
-When simulating a model that contains such code, a time integrator
-will iterate to find the time instant where ``port_a.m_flow`` crosses zero.
-If the modeling assumptions allow approximating this equation in
-a neighborhood around ``port_a.m_flow=0``, then replacing this equation
-with an approximation that does not require an event iteration can
-reduce computing time. For example, the above equation could be
-approximated as
-
-.. code-block:: modelica
-
-		T_a = Modelica.Fluid.Utilities.regStep(
-		  port_a.m_flow, inStream(port_a.h_outflow), port_a.h_outflow,
-		  m_flow_nominal*1E-4);
-
-
-where ``m_flow_nominal`` is a parameter that is set to a value that
-is close to the mass flow rate that the model has at full load.
-If the magnitude of the flow rate is larger than 1E-4 times the
-typical flow rate, the approximate equation is the same as the exact equation,
-and below that value, an approximation is used. However, for such small
-flow rates, not much energy is transported and hence the error introduced
-by the approximation is generally negligible.
-
-In some cases, adding dynamics to the model can further improve
-the computing time, because the return value of the function
-`Modelica.Fluid.Utilities.regStep() <https://simulationresearch.lbl.gov/modelica/releases/msl/3.2/help/Modelica_Fluid_Utilities.html#Modelica.Fluid.Utilities.regStep>`_
-above can change abruptly if its argument ``port_a.m_flow`` oscillates in the range of
-``+/- 1E-4*m_flow_nominal``,
-for example due to :term:`numerical noise`.
-Adding dynamics may be achieved using a formulation such as
-
-.. code-block:: modelica
-
-		hMed = Modelica.Fluid.Utilities.regStep(
-		  port_a.m_flow, inStream(port_a.h_outflow), port_a.h_outflow,
-		  m_flow_nominal*1E-4);
-		der(h)=(hMed-h)/tau;
-
-where ``tau``>0 is a time constant. See, for example,
-`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort>`_
-for a robust implementation.
-
-.. note::
-   In the package
-   `Buildings.Utilities.Math <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math>`_
-   the functions and blocks whose names start with ``smooth`` can be used to avoid events.
-
 .. _sec_bes_pra_con:
 
 Controls
@@ -673,181 +552,35 @@ because the ``if-then-else`` construct triggers an event iteration whenever
    See :ref:`sec-example-event-debugging` for what can happen in
    such tests.
 
-.. _sec-example-event-debugging:
-
-Examples for how to debug and correct slow simulations
-------------------------------------------------------
-
-State events
-~~~~~~~~~~~~
-
-This section shows how a simulation that stalls due to events can be debugged
-to find the root cause, and then corrected.
-While the details may differ from one tool to another, the principle is the same.
-In our situation, we attempted to simulate ``Buildings.Examples.DualFanDualDuct``
-for one year in Dymola 2016 FD01 using the model from Buildings version 3.0.0.
-We run
-
-.. code-block:: modelica
-
-   simulateModel("Buildings.Examples.DualFanDualDuct.ClosedLoop",
-                  stopTime=31536000, method="radau",
-                  tolerance=1e-06, resultFile="DualFanDualDuctClosedLoop");
 
-and plotted the computing time and the number of events. Around :math:`t=0.95e7` seconds,
-there was a spike as shown in the figure below.
-
-.. figure:: img/DualFanDualDuct-cpu-events.*
-   :scale: 60%
-
-   Computing time and number of events.
-
-As the number of events increased drastically, we enabled in Dymola in
-`Simulation -> Setup`, under the tab `Debug` the entry `Events during simulation`
-and simulated the model from
-:math:`t=0.9e7` to :math:`t=1.0e7` seconds. It turned out that setting the start time
-to :math:`t=0.9e7` seconds was sufficient to reproduce the behavior;
-otherwise we would
-have had to set it to an earlier time.
-Inspecting Dymola's log file ``dslog.txt`` when the simulation stalls shows that its last entries
-are
-
-.. code-block:: modelica
-
-   Expression TRet.T > amb.x_pTphi.T became true ( (TRet.T)-(amb.x_pTphi.T) = 2.9441e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.854873843
-   Expression TRet.T > amb.x_pTphi.T became false ( (TRet.T)-(amb.x_pTphi.T) = -2.94411e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.855016639
-   Expression TRet.T > amb.x_pTphi.T became true ( (TRet.T)-(amb.x_pTphi.T) = 2.94407e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.855208419
-   Expression TRet.T > amb.x_pTphi.T became false ( (TRet.T)-(amb.x_pTphi.T) = -2.94406e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.855351238
-
-Hence, there is an event every few milliseconds, which explains
-why the simulation does not appear to be progessing.
-The solver does the right thing, it stops
-the integration, handles the event, and restarts the integration, just to encounter
-another event a few milliseconds later.
-Hence, we go back to our system model and
-follow the output signal of ``TRet.T`` of the
-return air temperature sensor,
-which shows that it is used in the economizer control
-to switch the sign of the control gain because the economizer can provide heating or cooling,
-depending on the ambient and return air temperature. The problematic model is
-shown in the figure below.
-
-.. _fig-dualfan-eco-con-bad:
-
-.. figure:: img/EconomizerTemperatureControl-bad.*
-   :scale: 100%
-
-   Block diagram of part of the economizer control that computes the outside air damper
-   control signal. This implementation triggers many events.
-
-The events are triggered by the inequality block which changes the control, which then in turn
-seems to cause a slight change in the return air temperature, possibly due
-to :term:`numerical noise` or maybe because the return fan may change its operating point
-as the dampers are adjusted, and hence change the heat
-added to the medium. Regardless, this is a bad implementation that also
-would cause oscillatory behavior in a real system if the sensor signal had
-measurement noise.
-Therefore, this equality comparison must be replaced by a block with hysteresis,
-which we did as shown in the figure below.
-We selected a hysteresis of :math:`0.2` Kelvin, and now the model runs fine
-for the whole year.
-
-.. _fig-dualfan-eco-con-revised:
-
-.. figure:: img/EconomizerTemperatureControl-revised.*
-   :scale: 100%
-
-   Block diagram of part of the revised economizer control that computes the outside air damper
-   control signal.
-
-
-State variables that dominate the error control
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Start values of iteration variables
+-----------------------------------
 
-In a development version of the model
-``Buildings.Examples.DualFanDualDuct.ClosedLoop``
-(commit `ef410ee <https://github.com/lbl-srg/modelica-buildings/commit/ef410ee8a5d1816f8b8e171da7743e15caaa3163>`_),
-the simulation time was very slow during part of the
-simulation, as shown in :numref:`fig-dualfan-filtered-speed`.
+When computing numerical solutions to systems of nonlinear equations, a Newton-based solver
+is typically used. Such solvers have a higher success of convergence
+if good start values are provided for the iteration variables. In Dymola,
+to see what start values are used, one can enter on the simulation tab the command
 
+.. code-block:: none
 
-.. _fig-dualfan-filtered-speed:
+   Advanced.LogStartValuesForIterationVariables = true;
 
-.. figure:: img/DualFanDualDuctWithFilteredSpeed.*
-   :scale: 100%
+Then, when a model is translated, for example using
 
-   Computing time and number of events.
+.. code-block:: none
 
-The number of state events did not increase in that time interval.
-To isolate the problem, we enabled in Dymola under `Simulation -> Setup` the
-option to log which states dominate the error (see `Debug` tab).
+   translateModel("Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop");
 
-Running the simulation again gave the following output:
+an output of the form
 
 .. code-block:: none
 
-   Integration terminated successfully at T = 1.66e+07
-     Limit stepsize, Dominate error, Exceeds 10% of error Component (#number)
-         0     1     6 cooCoi.temSen_1.T (#  1)
-        36     0   140 cooCoi.temSen_2.T (#  2)
-        37     0     0 cooCoi.ele[1].mas.T (#  3)
-        45     0     0 cooCoi.ele[2].mas.T (#  4)
-        51     0     0 cooCoi.ele[3].mas.T (#  5)
-        53     0     0 cooCoi.ele[4].mas.T (#  6)
-     13555 13201 19064 fanSupHot.filter.x[1] (#  7)
-     11905  2170 12394 fanSupHot.filter.x[2] (#  8)
-       400    47   419 fanSupCol.filter.x[1] (#  9)
-       420    71   521 fanSupCol.filter.x[2] (# 10)
-      5082  2736  6732 fanRet.filter.x[1] (# 11)
-      1979    25  4974 fanRet.filter.x[2] (# 12)
-        38     0     3 TPreHeaCoi.T (# 13)
-        30     0     1 TRet.T (# 14)
-        38     0     3 TMix.T (# 15)
-        80     0     0 TCoiCoo.T (# 16)
-       305    22   275 cor.vavHot.filter.x[1] (# 18)
-
-Hence, the state variables
-
-.. code-block:: none
+   Start values for iteration variables:
+    val.res1.dp(start = 3000.0)
+    val.res3.dp(start = 3000.0)
 
-     13555 13201 19064 fanSupHot.filter.x[1] (#  7)
-     11905  2170 12394 fanSupHot.filter.x[2] (#  8)
-       400    47   419 fanSupCol.filter.x[1] (#  9)
-       420    71   521 fanSupCol.filter.x[2] (# 10)
-      5082  2736  6732 fanRet.filter.x[1] (# 11)
-      1979    25  4974 fanRet.filter.x[2] (# 12)
-
-limit the step size significantly more often than other variables.
-Therefore, we removed these state variables
-by setting in the fan models the parameter ``filteredSpeed=false``.
-After this change, the model simulates without problems.
-
-
-Numerical solvers
------------------
-Dymola 2017 is configured to use dassl as a default solver with a tolerance of
-1E-4.
-We recommend to change this setting to radau with a tolerance of around
-1E-6, as this generally leads to faster and more robust
-simulation for thermo-fluid flow systems.
-
-Note that this is the error tolerance of the local integration time step.
-Most ordinary differential equation solvers only control the local
-integration error and not the global integration error.
-As a rule of thumb, the global integration error is one
-order of magnitude larger than the local integration error.
-However, the actual magnitude of the global integration error
-depends on the stability of the differential equation.
-As an extreme case, if a system is chaotic
-and uncontrolled, then the global integration error will grow rapidly.
+is produced. This shows the iteration variables and their start values.
+These start values can be overwritten in the model.
 
 
 .. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt
index 1564ed61f23..0006c7e928f 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt
@@ -14,26 +14,18 @@ welcome.
 Contributions are ideally made by first opening an issue at https://github.com/lbl-srg/modelica-buildings
 and by providing a pull request with the new code.
 
-
-
 .. _sec_dev_gui_con:
 
 Guidelines for contributions
 ----------------------------
 
-Models that are contributed need to adhere to the following guidelines, as this is needed to integrate them in the library, make them accessible to users and further maintain them:
+Models, blocks and functions that are contributed need to adhere to the following guidelines, as this is needed to integrate them in the library, make them accessible to users and further maintain them:
 
  * They should be of general interest to other users and well documented and tested.
  * They need to follow the coding conventions described in
 
-<<<<<<< HEAD
-   - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_,
-   - the `Modelica Standard Library user guide <https://simulationresearch.lbl.gov/modelica/releases/msl/3.2/help/Modelica_UsersGuide_Conventions.html#Modelica.UsersGuide.Conventions>`_, and
-   - the `Buildings library style guide <https://github.com/lbl-srg/modelica-buildings/wiki/Style-Guide>`_.
-=======
    - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_ and
    - the `Style Guide` provided in subsections of :numref:`sec_sty_gui`
->>>>>>> master
 
  * They need to be made available under the `Modelica Buildings Library license <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License>`_.
  * For models of thermofluid flow components, they need to be based on the base classes in
@@ -41,7 +33,372 @@ Models that are contributed need to adhere to the following guidelines, as this
    which are described in the `user guide <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ of this package.
    Otherwise, it becomes difficult to ensure that the implementation is numerically robust.
 
+.. _sec_sty_gui:
+
+Style guide
+-----------
+
+General
+~~~~~~~
+
+1. Classes declared as ``partial`` and base classes that are not of interest to the user
+   should be stored in a subdirectory called ``BaseClasses``.
+   Each other class, except for constants, must have an icon.
+2. Examples and validation models should be in directories such as ``Valves.Examples`` and
+   ``Valves.Validations``. A script for the regression tests must be added as described below.
+3. Do not copy sections of code. Use object inheritance.
+4. Implement components of fluid flow systems by extending the
+   classes in ``Buildings.Fluid.Interfaces``.
+5. Use the full package names when instantiating a class.
+6. Models, functions and blocks must be implemented as
+   one model, function or block per file. An exception are the ``Buildings.Media`` packages.
+
+Type declarations
+~~~~~~~~~~~~~~~~~
+
+#. Declare all public parameters before protected ones.
+#. Declare variables and final parameters that are not of interest to
+   users as protected.
+#. Set default parameter values as follows:
+
+   #. If a parameter value can range over a large region, do not provide a
+      default value. Examples are nominal mass flow rates.
+   #. If a parameter value does not vary significantly but need to be verified
+      by the user, provide a default value by using its start attribute.
+      For example, for a heat exchanger, use
+
+      .. code-block:: modelica
+
+         parameter Real eps(start=0.8, min=0, max=1, unit="1")
+           "Heat exchanger effectiveness";
+
+      Do not use ``parameter Real eps=0.8`` as this can lead to errors
+      that are difficult to detect if a modeler forgets to overwrite
+      the default value of ``0.8`` with the actual value. The model will simulate,
+      but gives wrong results due to unsuited parameter values and there will be no warning.
+      On the other hand, using ``parameter Real eps(start=0.8)`` will give a warning
+      and hence users can assign better values.
+
+   #. If a parameter value can be precomputed based on other parameters,
+      set its value to this equation. For example,
+
+      .. code-block:: modelica
+
+         parameter Medium.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal
+         ...
+
+   #. If a parameter assignment should not be changed by a user,
+      use the ``final`` keyword.
+
+#. For parameters and variables, provide values for the ``min`` and
+   ``max`` attribute where applicable.
+   Be aware, that these bounds are not enforced by the simulator.
+   If the ``min`` and ``max`` attribute are set, each violation of these bounds
+   during the simulation may raise a warning.
+
+   Simulators may allow to suppress these warnings. In Dymola, violation of
+   bounds can be checked using
+
+   .. code-block::
+
+      Advanced.AssertAllInsideMinMax=true;
+
+#. For any variable or parameter that may need to be solved numerically,
+   provide a value for the ``start`` and ``nominal`` attribute.
+#. Use types from ``Modelica.SIunits`` where possible,
+   except in the package ``Buildings.Controls.OBC`` where the units should be declared
+   as shown in :numref:`cod_uni_dec_cdl`.
+
+Equations and algorithms
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Avoid events where possible.
+#. Only divide by quantities that cannot take on zero. For example, if
+   ``x`` may take on zero, use ``y=x``, not ``1=y/x``, as the second
+   version indicates to a simulator that it is safe to divide by ``x``.
+#. Use the ``assert`` function together with ``"In " + getInstanceName() + ":...``
+   to check for invalid values of parameters or variables. For example, use
+
+   .. code-block:: modelica
+
+      assert(phi>=0, "In " + getInstanceName() + ": Relative humidity must not be negative.");
+
+   Note the use of ``getInstanceName()``, which will write the instance name as part of the error message.
+   Otherwise, OPTIMICA will not write the instance name.
+#. Use either graphical modeling or textual code. When using graphical
+   schematic modeling, do not add textual equations. For example, avoid
+   the following, as on the graphical editor, the model looks appears
+   to be singular:
+
+   .. code-block:: modelica
+
+      model Avoid
+        Modelica.Blocks.Continuous.Integrator integrator "Integrator"
+          annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+        equation
+        integrator.u = 1;
+      end Avoid;
+
+
+#. For computational efficiency, equations shall were possible be
+   differentiable and have a continuous first derivative.
+#. Avoid equations where the first derivative with respect to another
+   variable is zero. For example, avoid
+
+   .. math::
+
+      f(x) = \begin{cases}
+        0, & \text{for } x < 0 \\
+        x^2, & \text{otherwise.}
+          \end{cases}
+
+   because any :math:`x \le 0` is a solution, which
+   can cause instability in the solver.
+   Note that this problem do not exist for functions that assign a value
+   to a constant as these will be evaluated during the model translation.
+#. Do not replace an equation by a constant for a single value, unless
+   the derivative of the original equation is zero for this value. For
+   example, if computing a pressure drop ``dp`` may involve computing a
+   long equation, but one knows that the result is always zero if the
+   volume flow rate ``V_flow`` is zero, one may be inclined to use a
+   construct of the form
+
+   .. code-block:: modelica
+
+      dp = smooth(1, if V_flow == 0 then 0 else f(V_flow));
+
+   The problem with this formulation is that for ``V_flow=0``, the
+   derivative is ``dp/dV_flow = 0``. However, the limit ``dp/dV_flow``,
+   as ``|V_flow|`` tends to zero, may be non-zero. Hence, the first
+   derivative has a discontinuity at ``V_flow=0``, which can cause a
+   solver to fail to solve the equation because the ``smooth``
+   statement declared that the first derivative exists and is
+   continuous.
+#. Make sure that the derivatives of equations are bounded on compact
+   sets. For example, instead of using ``y=sign(x) * sqrt(abs(x))``,
+   approximate the equation with a differentiable function that has a
+   finite derivative near zero. Use functions form
+   ``Buildings.Utilities.Math`` for this approximation.
+#. Whenever possible, a Modelica tool should not have to do numerical
+   differentiation. For example, in Dymola, if your model translation
+   log shows
+
+   .. code-block::
+
+       Number of numerical Jacobians: 1
+
+   (or any number other than zero), then enter on the command line
+
+   .. code-block::
+
+       Hidden.PrintFailureToDifferentiate = true;
+
+
+   Next, translate the model again to see what functions cannot be
+   differentiated symbolically. Then, implement symbolic derivatives for
+   this function.
+   See `implementation of function derivatives <https://github.com/lbl-srg/modelica-buildings/wiki/Function-Derivatives>`__.
+
+Functions
+~~~~~~~~~
+
+1. Use the ``smoothOrder`` annotation if a function is differentiable.
+2. If a function is invertible, also implement its inverse function and
+   use the ``inverse`` annotation. See
+   ``Buildings.Fluid.BaseClasses.FlowModels`` for an example.
+3. If a model allows a linearized implementation of an equation, then
+   implement the linearized equation in an ``equation`` section and not
+   in the ``algorithm`` section of a ``function``. Otherwise, a symbolic
+   processor cannot invert the linear equation, which can lead to
+   coupled systems of equations. See
+   ``Buildings.Fluid.BaseClasses.FlowModels`` for an example.
+
+Package order
+~~~~~~~~~~~~~
+
+1. Packages are first sorted alphabetically by the function
+   ``_sort_package_order``. That function is part of BuildingsPy
+   and can be invoked as
+
+   .. code-block:: python
+
+      import buildingspy.development.refactor as r
+      r.write_package_order(".", True)
 
+2. After alphabetical sorting, the following packages, if they exist,
+   are moved to the front:
+
+   .. code-block:: modelica
+
+      Tutorial
+      UsersGuide
+
+   and the following packages, if they exist, are moved to the end:
+
+   .. code-block:: modelica
+
+      Data
+      Types
+      Examples
+      Validation
+      Benchmarks
+      Experimental
+      Interfaces
+      BaseClasses
+      Internal
+      Obsolete
+
+   The remaining classes are ordered as follows and inserted between the above list:
+   First, models, blocks and records are listed, then functions, and then packages.
+
+Documentation
+~~~~~~~~~~~~~
+
+1.  Add a description string to all parameters and variables, including
+    protected ones.
+2.  Group similar variables using the ``group`` and ``tab`` annotation.
+    For example, use
+
+    .. code-block:: modelica
+
+       parameter Modelica.SIunits.Time tau = 60
+         "Time constant at nominal flow"
+         annotation (Dialog(group="Nominal condition"));
+
+    or use
+
+    .. code-block:: modelica
+
+       parameter Types.Dynamics substanceDynamics=energyDynamics
+         "Formulation of substance balance"
+         annotation(Evaluate=true, Dialog(tab = "Assumptions", group="Dynamics"));
+
+3.  Add model documentation to the ``info`` section. This applies to validation tests as well. To document
+    equations, use the format
+
+    .. code-block:: html
+
+       <p>
+       The polynomial has the form
+       </p>
+       <p align="center" style="font-style:italic;">
+       y = a<sub>1</sub> + a<sub>2</sub> x + a<sub>3</sub> x<sup>2</sup> + ...,
+       </p>
+       <p>
+       where <i>a<sub>1</sub></i> is ...
+
+    To denote time derivatives, such as for mass flow rate,
+    use ``<code>m&#775;</code>``.
+
+    To refer to parameters of the model, use the ``<code>...</code>`` section as in
+
+    .. code-block:: html
+
+       To linearize the equation, set <code>linearize=true</code>.
+
+    To format tables, use
+
+    .. code-block:: html
+
+       <p>
+       <table summary="summary" border="1" cellspacing="0" cellpadding="2" style="border-collapse:collapse;">
+       <tr><th>Header 1</th>       <th>Header 2</th>     </tr>
+       <tr><td>Data 1</td>         <td>Data 2</td>       </tr>
+       </table>
+       </p>
+
+    To include figures, place the figure into a directory in
+    ``Buildings/Resources/Images/`` that has the same name as the full
+    package. For example, use
+
+    .. code:: html
+
+       </p>
+       <p align="center">
+       <img alt="Image of ..."
+       src="modelica://Buildings/Resources/Images/Fluid/FixedResistances/FixedResistanceDpM.png"/>
+       </p>
+       <p>
+
+
+    To create new figures, put the source file for the figure,
+    preferably in ``svg`` format, in the same directory as the ``png``
+    file. ``svg`` files can be created with https://inkscape.org/, which
+    works on any operating system. See for example the file in
+    ``Resources/Images/Examples/Tutorial/SpaceCooling/schematics.svg``.
+4.  Add author information to the ``revision`` section.
+5.  Run a spell check.
+6.  Start headings with ``<h4>``.
+7.  Add hyperlinks to other models using their full name. For example,
+    use
+
+    .. code-block:: html
+
+       See
+       <a href="modelica://Buildings.Fluid.Sensors.Density">
+       Buildings.Fluid.Sensors.Density</a>.
+
+8.  Add a default component name, such as
+
+    .. code-block:: modelica
+
+       annotation(defaultComponentName="senDen", ...
+
+    to objects that will be used as drag and drop elements, as this
+    automatically assigns them this name.
+9.  Keep the line length to no more than around 80 characters.
+10. For complex packages, provide a User's Guide, and reference the
+    User's Guide in ``Buildings.UsersGuide``.
+11. Use the string ``fixme`` within development branches to mark passages
+    that still need to be revised (e.g., to improve code or to fix bugs).
+    Before merging a branch into the master, all ``fixme`` strings must
+    be removed. Within the master branch, no ``fixme`` are allowed.
+12. A suggested template for the documentation of classes is below.
+    Except for the short introduction, the sections are optional.
+
+    .. code-block:: html
+
+       <p>
+       A short introduction.
+       </p>
+       <h4>Main equations</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Assumption and limitations</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Typical use and important parameters</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Options</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Dynamics</h4>
+       <p>
+       Describe which states and dynamics are present in the model
+       and which parameters may be used to influence them.
+       This need not be added in partial classes.
+       </p>
+       <h4>Validation</h4>
+       <p>
+       Describe whether the validation was done using
+       analytical validation, comparative model validation
+       or empirical validation.
+       </p>
+       <h4>Implementation</h4>
+       <p>
+       xxx
+       </p>
+       <h4>References</h4>
+       <p>
+       Add references, if applicable.
+       </p>
+
+13. Always use lower case html tags.
 
 
 Adding a new class
@@ -78,8 +435,8 @@ Alternatively, simple models such as the models below may be used as a starting
 
 .. _fig_merkel:
 
-.. figure:: img/Merkel.png
-   :scale: 10%
+.. figure:: img/Merkel.*
+   :width: 700px
 
    Schematic diagram of the cooling tower model based on the Merkel theory.
 
@@ -92,8 +449,6 @@ thermodynamic calculations. The model shows that the cooling tower performance o
 the control signal `y`, the air inlet temperature `TAir`, the water inlet temperature `TWatIn` and the
 water mass flow rate `mWat_flow`.
 
-
-
 Pressure drop
 ~~~~~~~~~~~~~
 
@@ -146,8 +501,7 @@ to lump the pressure drop of the heating coil into the pressure drop model
 of the cooling coil.
 This often reduces the size of the system of nonlinear equations.
 
-
-Control Sequences using the Control Description Language
+Control sequences using the Control Description Language
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To implement reusable control sequences, such as done within
@@ -160,42 +514,52 @@ The following rules need to be followed, in addition to the guidelines described
 
 #. The naming of parameters, inputs, outputs and instances must follow the naming
    conventions in
-<<<<<<< HEAD
-   `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
-
-#. Each block must have an ``info`` section that explains its functionality.
-   In this ``info`` section, names of ``parameters``, ``inputs`` and ``outputs``
-   need to be referenced using the html ``<code>...</code>`` element.
-   In the ``info`` section, units need to be provided in SI units, or in dual units. For SI units,
-   use Kelvin for temperature *differences* and degree Celsius for actual temperatures.
-=======
    `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
    Avoid providing duplicate information in the instance name, for example if the block is within the ``Boilers`` package,
    the instance name must not contain ``boi``. Ensure that the instance name is unambiguous when viewed in a top level
    controller block.
    Consider whether the block can be used to control other equipment as well, and if so, make sure the instance name
    is also applicable for these applications.
->>>>>>> master
 
 #. Parameters that can be grouped together, such as parameters relating to temperature setpoints
    or to the configuration of the trim and respond logic, should be grouped together with the
    ``Dialog(group=STRING))`` annotation. See for example
    `G36_PR1.TerminalUnits.Controller <https://github.com/lbl-srg/modelica-buildings/blob/94d5919dbe1b2f2e317e7b69800f3b3ad07be930/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo>`_.
    Do not use ``Dialog(tab=STRING))``, unless the parameter is declared with a default value
-   and this parameter and its value is of no interest to typical users.
+   and is of no interest to typical users.
+
+#. In the source code, the instances must be ordered as follows:
 
-#. Each block must have a ``defaultComponentName`` annotation.
+     - First, list `Boolean` parameters,, then `Integer` parameters and then `Real` parameters.
+     - Next, list inputs, then outputs, followed by blocks.
+     - Protected instances are below all the public instances and follow the same instance ordering rules.
+     - Within the above order, list scalar values before arrays,
+       but prioritize groupings based on model specific similarities.
+
+#. Each block must have a ``defaultComponentName`` annotation and a ``%name`` label placed above the icon.
+   See for example the `CDL.Continuous.Constant <https://github.com/lbl-srg/modelica-buildings/blob/64f35506a2b725e071a900a90e3fa3a291a48dca/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo#L21>`_
+   block.
 
 #. To aid readability, the formatting of the Modelica source code file must be consistent with other
    implemented blocks, e.g., use two spaces for indentation (no tabulators),
-   assign each parameter value on a new line, list first all parameters, then all inputs, all
-   outputs, and finally all instances of other blocks.
+   assign each parameter value on a new line. It is recommended to add an empty line between instances.
    See for example
    `G36_PR1.AHUs.SingleZone.VAV.SetPoints.ExhaustDamper <https://github.com/lbl-srg/modelica-buildings/blob/94d5919dbe1b2f2e317e7b69800f3b3ad07be930/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ExhaustDamper.mo>`_.
 
 #. For parameters, where generally valid values can be provided, provide them
    as default values.
 
+#. Add comments to all instances. The comments should be concise. The comments
+   should not contain redundant information and must not contain hard coded parameters as those can change.
+   If the functionality of an instance is obvious the developer may use
+   comments that closely resemble the class names, such as "Logical And".
+
+#. Each block must have an ``info`` section that explains its functionality.
+   In this ``info`` section, names of ``parameters``, ``inputs`` and ``outputs``
+   need to be referenced using the html ``<code>...</code>`` element.
+   In the ``info`` section, units need to be provided in SI units, or in dual units. For SI units,
+   use Kelvin for temperature *differences* and degree Celsius for actual temperatures.
+
 #. For PI controllers, normalize the inputs for setpoint and measured value so
    that the control error is of the order of one.
    As control errors for temperature tracking are usually in the order of one,
@@ -229,65 +593,91 @@ The following rules need to be followed, in addition to the guidelines described
    in which graphical annotations are omitted.
 
    .. code-block:: modelica
+      :caption: Unit declaration for CDL.
+      :name: cod_uni_dec_cdl
 
+      Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
+        final unit="K",
+        displayUnit="degC") "Measured zone air temperature";
 
-    Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
-      final unit="K",
-      displayUnit="degC") "Measured zone air temperature";
-
-    Buildings.Controls.OBC.CDL.Interfaces.RealInput dTSup(
-      final unit="K") "Temperature difference supply air minus exhaust air";
+      Buildings.Controls.OBC.CDL.Interfaces.RealInput dTSup(
+        final unit="K") "Temperature difference supply air minus exhaust air";
 
-    Buildings.Controls.OBC.CDL.Interfaces.RealOutput yDam(
-      min=0,
-      max=1,
-      final unit="1") "Exhaust damper position";
-
-   Here, units are declared as ``final`` to avoid users to be able to change them, as
-   a change in unit may cause the control logic to be incorrect.
+      Buildings.Controls.OBC.CDL.Interfaces.RealOutput yDam(
+        final min=0,
+        final max=1,
+        final unit="1") "Exhaust damper position";
 
    Conversion of these units to non-SI units can be done programmatically by tools that
    process CDL.
 
+#. Units, quantities and value limits must be declared as ``final`` to avoid users to be able to change them, as
+   a change in unit may cause the control logic to be incorrect.
+
 #. If the block diagram does not fit into the drawing pane, enlarge the drawing pane rather
    than making the blocks smaller.
 
+#. The size of the icon should be such that it provides a good fit for all the input and output interfaces. The minimum
+   recommended icon size is 100 by a 100. If there are many interfaces the icon size should be extended in vertical direction.
+   Icons should be symmetrical with reference to the grid origin. E.g, the default specification is
+
+   .. code-block:: modelica
+
+      Icon(
+        coordinateSystem(
+          preserveAspectRatio=true,
+          extent={{-100,-100},{100,100}}))
+
 #. For simple, small controllers, provide a unit test in a ``Validation`` or ``Examples`` package
    that is in the hierarchy one level below the implemented controller.
    See :numref:`sec_val` for unit test implementation.
    Because some control logic errors may only be noticed
    when used in a closed loop test,
    for equipment and system controllers, provide also closed loop examples that test the sequence
-   for all modes of operation. If the closed loop examples include HVAC models, then put them
+   for all modes of operation. If the closed loop examples include HVAC models, put them
    outside of the ``Buildings.Controls.OBC`` package.
    Make sure sequences are tested for all modes of operation, and as applicable, for winter, shoulder
    and summer days.
 
+#. For general rules on validation models see :numref:`sec_val`. If there are multiple instances of
+   the validated block, preferably list them together as opposed to far apart in the Modelica file.
+
+#. Run the following command to detect various warnings, such as missing comments:
+
+    .. code-block::
+
+       $ node app.js -f Buildings/Controls/OBC/ASHRAE/PrimarySystem/{path to package} -o json -m cdl
 
 
 .. _sec_val:
 
-Validation
-----------
+Validation and unit tests
+-------------------------
+
+The developer that introduces a new model, block or a function must:
 
-All models that are implemented need to be validated for all
-realistic operating modes.
-These validations need to be part of the
-`unit tests <https://github.com/lbl-srg/modelica-buildings/wiki/Unit-Tests>`_.
+1. Implement at least one example or validation model that serves as a unit test for each model, block and function,
+   and run the unit tests.
+   Unit tests should cover all branches of ``if-then`` constructs and
+   all realistic operating modes of the system represented by the model.
 
-Add a couple of sentences that explain to others the intent of the unit test.
-For example, an air handler unit controller test could describe
-"This model verifies that as the cooling load of the room increases, the controller
-first increases the mass flow rate setpoint and then reduces the supply temperature setpoint."
+2. In the `info` section of the validation model, describe to others the intent of the unit test.
+   For example, an air handler unit controller test could describe
+   "This model verifies that as the cooling load of the room increases, the controller
+   first increases the mass flow rate setpoint and then reduces the supply temperature setpoint."
+
+The validation models are part of automated unit tests as described at the
+`unit tests wiki page <https://github.com/lbl-srg/modelica-buildings/wiki/Unit-Tests>`_.
 
 For simple models, the validation can be against analytic solutions.
 This is for example done in
 `Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop>`_
 which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.
+
 For complex thermofluid flow devices, a comparative model validation needs to be done, for example
 by comparing the result of the Modelica model against the results from EnergyPlus.
 An example is
-`Buildings.Fluid.HeatExchangers.CoolingTowers.Validation.MerkelEnergyPlus`.
+``Buildings.Fluid.HeatExchangers.CoolingTowers.Validation.MerkelEnergyPlus``.
 For such validations, the following files also need to be added to the repository:
 
  - The EnergyPlus input data file. Please make sure it only requires a weather data file that already exists in the Buildings library.
@@ -301,4 +691,6 @@ For such validations, the following files also need to be added to the repositor
  - A Python script that converts the EnergyPlus output file to the data file that can
    be read by the Modelica data reader.
 
-See for example `Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation` for an implementation.
+See for example
+`Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation <https://github.com/lbl-srg/modelica-buildings/tree/master/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus>`_
+for an implementation.
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt
index 9f955858aa3..90601c837d1 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt
@@ -10,7 +10,7 @@ Literature for Users
 --------------------
 The following books are useful for new users to get started:
 
-* The online book with interactive examples of Michael Tiller at http://book.xogeny.com/.
+* The online book with interactive examples of Michael Tiller at https://mbe.modelica.university/.
 * The books by Michael Tiller [Til2001]_ and Peter Fritzson ([Fri2011]_ and [Fri2004]_).
 * The tutorials that are listed at https://modelica.org/publications.
 
@@ -27,50 +27,46 @@ as well as tools for workflow automation.
 It also contains numerous examples that apply these technologies to the
 design and operation of building and community energy systems.
 
-An interactive web-based tour of Modelica is available at
-http://modelica.university/res/lesson/training.json.
 
-Spoken tutorials for beginners are available at http://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&search_language=English.
+Spoken tutorials for beginners are available at https://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&search_language=English.
 
 
+Running the First Simulations
+-----------------------------
+
+To start using Modelica, run some of the example models of the `Buildings` library.
+Make variations in these examples by changing values of model parameters
+or by replacing existing component models by new ones.
+The example models can be found in the packages `Examples`.
 
-<<<<<<< HEAD
-Literature for Developers
--------------------------
-=======
 Study the detailed tutorials with step-by-step instructions for how to build system models,
 which can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_Tutorial.html>`_.
->>>>>>> master
 
-It is essential that users who develop new thermo-fluid models to  understand the concept of stream connectors. Stream connectors are explained in the Modelica language definition, available at https://www.modelica.org/documents, and in the paper Franke et al. [Fra2009a]_.
-The `Buildings` library uses similar modeling principles, and the same base classes, as the `Modelica.Fluid` library. Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b]_.
+Note that heat transfer models, which can be found in `Buildings.HeatTransfer.*.Examples` are easier to understand than fluid flow models because;
 
-Xogeny's `Modelica Web Reference <http://modref.xogeny.com/>`_ gives a concise overview, explanation and further links about the Modelica language.
+* handling fluid flow adds more complexity due to flow reversal (i.e., if the mass flow rate changes its direction),
+* fluid flow models may need to handle multiple species such as air and water vapor, as well as trace substances such as CO2, and
+* fluid flow models use packages that define medium models, such as dry air, moist air, water or other fluids.
 
 
 Software Requirements
 ---------------------
+
 Check the software requirements for the different versions of the Buildings library at https://simulationresearch.lbl.gov/modelica/download.html
 
 
-Running the First Simulations
------------------------------
+Literature for Developers
+-------------------------
 
-<<<<<<< HEAD
-To start using Modelica, run the example models of the `Buildings` library. Make variations in these examples by changing values of model parameters or by replacing existing component models by new ones. The example models can be found in the packages `Examples`, and detailed tutorials with step-by-step instructions for how to build system models can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_Tutorial.html>`_.
-=======
 It is essential that users who develop new thermo-fluid models to understand the concept of stream connectors.
 Stream connectors are explained in the Modelica language definition, available at https://modelica.org/documents,
 and in the paper Franke et al. [Fra2009a]_.
 The `Buildings` library uses similar modeling principles, and the same base classes, as the `Modelica.Fluid` library.
 Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b]_.
->>>>>>> master
 
-Note that heat transfer models, which can be found in `Buildings.HeatTransfer.*.Examples` are easier to understand than fluid flow models because;
+The `Modelica Web Reference <https://webref.modelica.university>`_ gives a concise overview, explanation and further links about the Modelica language.
 
-* handling fluid flow adds more complexity due to flow reversal (i.e., if the mass flow rate changes its direction),
-* fluid flow models may need to handle multiple species such as air and water vapor, as well as trace substances such as CO2, and
-* fluid flow models use packages that define medium models, such as dry air, moist air, water or other fluids.
+See :numref:`sec_sty_gui` for conventions and guidelines of the `Buildings` library.
 
 
 References
@@ -80,10 +76,12 @@ References
 
 .. [Fri2011] Peter Fritzson. *Introduction to Modeling and Simulation of Technical and Physical Systems with Modelica.* Wiley-IEEE Press, ISBN 978-1-1180-1068-6, 2011.
 
-.. [Fra2009a] R. Franke, F. Casella, M. Otter, M. Sielemann, H. Elmqvist, S. E. Mattsson, and H. Olsson. `Stream connectors – an extension of modelica for device-oriented modeling of convective transport phenomena <https://www.modelica.org/events/modelica2009/Proceedings/memorystick/pages/papers/0078/0078.pdf>`_. In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
+.. [Fra2009a] R. Franke, F. Casella, M. Otter, M. Sielemann, H. Elmqvist, S. E. Mattsson, and H. Olsson.
+              `Stream connectors – an extension of modelica for device-oriented modeling of convective transport phenomena <http://dx.doi.org/10.3384/ecp09430078>`_.
+              In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
 
-.. [Fra2009b] R. Franke, F. Casella, M. Otter, K. Proelss, M. Sielemann, and M. Wetter. `Standardization of thermo-fluid modeling in Modelica.Fluid     <https://www.modelica.org/events/modelica2009/Proceedings/memorystick/pages/papers/0077/0077.pdf>`_.     In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
+.. [Fra2009b] R. Franke, F. Casella, M. Otter, K. Proelss, M. Sielemann, and M. Wetter. `Standardization of thermo-fluid modeling in Modelica.Fluid
+              <http://dx.doi.org/10.3384/ecp09430077>`_.
+              In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
 
 .. [Til2001] Michael M. Tiller. *Introduction to Physical Modeling with Modelica.* Kluwer Academic Publisher, 2001.
-
-.. ###############################################################################################################
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/index.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/index.rst.txt
index d8ec71ed39c..324adb5889c 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/index.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/index.rst.txt
@@ -32,7 +32,7 @@ Contents
 
    gettingStarted
    bestPractice
-   workArounds
+   performance
    prePostProcessing
    development
    help
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/legal.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/legal.rst.txt
index fc3858aae60..723047436f5 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/legal.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/legal.rst.txt
@@ -1,7 +1,7 @@
 Copyright and License
 =====================
 
-Copyright (c) 2012-2019, The Regents of the University of California, Department
+Copyright (c) 2012-2020, The Regents of the University of California, Department
 of Energy contract-operators of the Lawrence Berkeley National Laboratory.
 All rights reserved.
 
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/workArounds.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/workArounds.rst.txt
deleted file mode 100644
index ada178fe79d..00000000000
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/workArounds.rst.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-Work-Arounds
-============
-
-This section describes work-arounds that often help if there are problems during the model translation, initialization or simulation.
-
-Avoiding step changes
----------------------
-
-All flow machines (fans and pumps) have a boolean parameter
-``filteredSpeed``, and all actuators have a boolean parameter
-``filteredOpening``.
-If set to ``true``, which is the default setting, then the control input signal is sent to
-a :term:`2nd order low pass filter` that changes a step signal to a smooth signal.
-This typically improves the robustness of the simulation.
-
-To see the effect of the filter, consider the model below
-in which ``fanS`` is configured with
-``filteredSpeed=false``, and ``fanC`` is configured with
-``filteredSpeed=true``.
-Both fans are connected to a step input signal.
-The configuration of ``fanS`` causes the fan speed to instantly change from 0 to 1. In large system models, this can lead to high computing time or to convergence problems. The ``fanC`` avoids this problem because the speed of the fan varies continuously, thereby making it easier for the solver to compute a solution. In this model, we set the parameter
-``raiseTime=30`` seconds.
-
-.. _FigureFilteredResponse:
-
-.. figure:: img/fanStepSchematics.png
-
-   Schematic diagram of fans that are configured with ``filteredSpeed=false`` (``fanS``) and ``filteredSpeed=true`` (``fanC``).
-
-.. figure:: img/fanStepResponse.png
-
-   Mass flow rate of the two fans for a step input signal at 0 seconds.
-
-
-For fans and pumps, the dynamics introduced by the filter can be thought of as approximating
-the rotational inertia of the fan rotor and the inertia of the fluid in the duct or piping network.
-The default value is ``raiseTime=30`` seconds.
-
-For actuators, the raise time approximates the travel time of the valve lift.
-The default value is ``raiseTime=120`` seconds.
-
-.. note:: When changing ``filteredSpeed`` (or ``filteredOpening``),
-          or when changing the value of ``raiseTime``, the dynamic
-          response of the closed loop control changes. Therefore,
-          control gains may need to be retuned to ensure satisfactory
-          closed loop control performance.
-
-For further information, see the
-`User's Guide of the flow machine package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers_UsersGuide.html>`_, and the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
-
-
-
-Breaking algebraic loops
-------------------------
-
-In fluid flow systems, flow junctions where mass flow rates separate and mix can couple non-linear systems of equations. This leads to larger systems of coupled equations that need to be solved, which often causes larger computing time and can sometimes cause convergence problems.
-To decouple these systems of equations, in the model of a flow splitter or mixer (model `Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop>`_), or in models for fans or pumps (such as the model `Buildings.Fluid.Movers.SpeedControlled_y <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y>`_), the parameter ``dynamicBalance`` can be set to ``true``. This adds a control volume at the fluid junction that can decouple the system of equations.
-
-Reducing nonlinear equations of serially connected flow resistances
--------------------------------------------------------------------
-
-In fluid flow systems, if multiple components are connected in series,
-then computing the pressure drop due to flow friction in the
-individual components can lead to coupled nonlinear systems of equations.
-While this is no problem for small models, the iterative solution can lead to higher computing time, particularly in large models where other equations may
-be part of the residual function.
-
-For illustration, consider the simple system shown below in which the flow resistances ``res1`` and ``res2`` compute the mass flow rate as
-:math:`\dot m = k \, \sqrt{\Delta p}` if the parameter ``from_dp`` is set to ``true``, or otherwise compute the pressure drop between their inlet and outlet as :math:`\Delta p = (\dot m / k)^2`. (Both formulations are implemented using :term:`regularization` near zero.)
-
-.. figure:: img/resistancesSeries.png
-
-   Schematic diagram of two flow resistances in series that connect a source and a volume.
-
-Depending on the configuration of the individual component models, simulating this system model may require the iterative solution of a nonlinear equation to compute the mass flow rate or the pressure drop.
-To avoid a nonlinear equation, use any of the measures below.
-
- - Set the parameter ``res2(dp_nominal=0)``, and add the pressure drop to the parameter ``dp_nominal`` of the model ``res1``. This will eliminate the equation that computes the flow friction in ``res2``, thereby avoiding a nonlinear equation. The same applies if there are multiple components in series, such as a pre-heat coil, a heating coil and a cooling coil.
- - Set ``from_dp=false`` in all components, which is the default setting. This will cause Modelica to use a function that computes the pressure drop as a function of the mass flow rate. Therefore, a code translator is likely to generate an equation that solves for the mass flow rate, and it then uses the mass flow rate to compute the pressure drop of the components that are connected in series.
-
-
-Control valves also allow lumping the pressure drop into the model of the valve. Consider the situation where a fixed flow resistance is in series with a control valve as shown below.
-
-.. figure:: img/resistanceValveSeries.png
-
-   Schematic diagram of a fixed flow resistance and a valve in series  that connect a source and a volume.
-
-Suppose the parameters are
-
-.. code-block:: modelica
-
-   Buildings.Fluid.FixedResistances.PressureDrop res(
-     redeclare package Medium = Medium,
-     m_flow_nominal=0.2,
-     dp_nominal=10000);
-
-   Buildings.Fluid.Actuators.Valves.TwoWayLinear val(
-     redeclare package Medium = Medium,
-     m_flow_nominal=0.2,
-     dpValve_nominal=5000);
-
-To avoid a nonlinear equation, the flow resistance could be deleted as shown below.
-
-.. figure:: img/valveNoResistance.png
-
-   Schematic diagram of a valve that connects a source and a volume.
-
-
-If the valve is configured as
-
-.. code-block:: modelica
-
-   Buildings.Fluid.Actuators.Valves.TwoWayLinear val(
-     redeclare package Medium = Medium,
-     m_flow_nominal=0.2,
-     dpValve_nominal=5000,
-     dpFixed_nominal=10000);
-
-then the valve will compute the composite flow coefficient
-:math:`\bar k` as
-
-.. math::
-
-    \bar k = \frac{1}{\sqrt{1/k_v(y) + 1/k_f}}
-
-where :math:`k_v(y) = \dot m(y)/\sqrt{\Delta p}` is the flow coefficient of the valve at the lift :math:`y`, and
-:math:`k_f` is equal to the ratio ``m_flow_nominal/sqrt(dpFixed_nominal)``.
-The valve model then computes the pressure drop using :math:`\bar k` and the same equations as described above for the fixed resistances.
-Thus, the composite model has the same :term:`valve authority` and mass flow rate, but a nonlinear equation can be avoided.
-
-For more details, see the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
-
-
-
-Prescribed mass flow rate
--------------------------
-For some system models, the mass flow rate can be prescribed by using an idealized pump or fan (model `Buildings.Fluid.Movers.FlowControlled_m_flow <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow>`_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T>`_). Using these models avoids having to compute the intersection of the fan curve and the flow resistance. In some situations, this can lead to faster and more robust simulation.
-
-
-Avoiding overspecified initialization problems
-----------------------------------------------
-
-If in thermofluid flow systems, Dymola fails to translate a model with the error message::
-
-   Error: The initialization problem is overspecified for variables
-   of element type Real
-   The initial equation
-   ...
-   refers to variables, which are all knowns.
-   To correct it you can remove this equation.
-
-then the initialization problem is overspecified. To avoid this, set
-
-.. code-block:: modelica
-
-   energyDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
-   massDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
-
-in the instances of the components that contain fluid volumes.
-See also the section :ref:`ReferencePressureIncompressibleFluids`.
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/acknowledgments.html b/Buildings/Resources/Documentation/userGuide/build/html/acknowledgments.html
index 4b7a73fa095..06896fb677f 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/acknowledgments.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/acknowledgments.html
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -190,7 +187,7 @@ <h1>8. Acknowledgments<a class="headerlink" href="#acknowledgments" title="Perma
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html b/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html
index 3e907b1a64e..5511eae4689 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html
@@ -22,7 +22,7 @@
     <link rel="shortcut icon" href="_static/lbl-icon.ico"/>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="3. Work-Arounds" href="workArounds.html" />
+    <link rel="next" title="3. Simulation Performance" href="performance.html" />
     <link rel="prev" title="1. Getting Started" href="gettingStarted.html" />
 <meta charset='utf-8'>
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -131,15 +128,8 @@
 <li><a class="reference internal" href="#nominal-values">2.4.5. Nominal Values</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li><a class="reference internal" href="#avoiding-events">2.6. Avoiding events</a></li>
-<li><a class="reference internal" href="#controls">2.7. Controls</a></li>
-<li><a class="reference internal" href="#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a><ul>
-<li><a class="reference internal" href="#state-events">2.8.1. State events</a></li>
-<li><a class="reference internal" href="#state-variables-that-dominate-the-error-control">2.8.2. State variables that dominate the error control</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#numerical-solvers">2.9. Numerical solvers</a></li>
+<li><a class="reference internal" href="#controls">2.5. Controls</a></li>
+<li><a class="reference internal" href="#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
 </ul>
@@ -155,7 +145,7 @@
     </a>
   </li>
   <li>
-    <a href="workArounds.html" title="Next Chapter: 3. Work-Arounds"><span class="glyphicon glyphicon-chevron-right visible-sm"></span><span class="hidden-sm hidden-tablet">3. Work-Arounds &raquo;</span>
+    <a href="performance.html" title="Next Chapter: 3. Simulation Performance"><span class="glyphicon glyphicon-chevron-right visible-sm"></span><span class="hidden-sm hidden-tablet">3. Simulation... &raquo;</span>
     </a>
   </li>
               
@@ -187,51 +177,70 @@
       
   <div class="section" id="best-practice">
 <h1>2. Best Practice<a class="headerlink" href="#best-practice" title="Permalink to this headline">¶</a></h1>
-<p>This section explains to library users best practice in creating new system models. The selected topics are based on problems that are often observed with new users of Modelica. Experienced users of Modelica may skip this section.</p>
+<p>This section explains to library users best practice in creating system models.
+The selected topics are based on problems that are often observed with new users of Modelica.
+Experienced users of Modelica may skip this section.</p>
 <div class="section" id="organization-of-packages">
 <h2>2.1. Organization of packages<a class="headerlink" href="#organization-of-packages" title="Permalink to this headline">¶</a></h2>
-<p>When developing models, one should distinguish between a library which contains widely applicable models, such as the <cite>Buildings</cite> library, and an application-specific model which may be created for a specific building and is of limited use for other applications.
-It is recommended that users store application-specific models outside of the <cite>Buildings</cite> library. This will allow users to replace the <cite>Buildings</cite> library with a new version without having to change the application-specific model.
-If during the course of the development of application-specific models, some models turn out to be of interest for other applications, then they can be contributed to the development of the <cite>Buildings</cite> library, as described in the section <a class="reference internal" href="development.html#development"><span class="std std-ref">Development</span></a>.</p>
+<p>When developing models, one should distinguish between a library which contains widely applicable models,
+such as the <cite>Buildings</cite> library, and an application-specific model which may be
+created for a specific building and is of limited use for other applications.
+It is recommended that users store application-specific models outside of the <cite>Buildings</cite> library.
+This will allow users to replace the <cite>Buildings</cite> library with a new version without having to change the application-specific model.</p>
+<p>The declare the dependency of your library on <code class="docutils literal notranslate"><span class="pre">Buildings</span></code> version 7.0.0, use
+the declaration</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">within</span><span class="p">;</span>
+<span class="kr">package</span> <span class="nc">MyLibrary</span>
+
+  <span class="kr">annotation</span> <span class="p">(</span>
+    <span class="n">uses</span><span class="p">(</span>
+      <span class="n">Buildings</span><span class="p">(</span>
+        <span class="n">version</span><span class="o">=</span><span class="s2">&quot;7.0.0&quot;</span><span class="p">)</span>
+      <span class="p">)</span>
+   <span class="p">);</span>
+<span class="kr">end</span> <span class="nc">MyLibrary</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>If during the course of the development of application-specific models,
+some models turn out to be of interest for other applications, then they can be contributed to
+the development of the <cite>Buildings</cite> library, as described in the section <a class="reference internal" href="development.html#development"><span class="std std-ref">Development</span></a>.</p>
 </div>
 <div class="section" id="building-large-system-models">
 <h2>2.2. Building large system models<a class="headerlink" href="#building-large-system-models" title="Permalink to this headline">¶</a></h2>
-<<<<<<< HEAD
-<p>When creating a large system model, it is typically easier to build the system model through the composition of subsystem models that can be tested in isolation. For example, the package <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples">Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples</a>
-contains small test models that are used to test individual components in the large system model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant">Buildings.Examples.ChillerPlant</a>.
-=======
 <p>When creating a large system model, it is typically easier to build the system model
 through the composition of subsystem models that can be tested in isolation. For example,
 the package
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples">Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples</a>
 contains small test models that are used to test individual components in the large system model
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant">Buildings.Examples.ChillerPlant</a>.
->>>>>>> master
 Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models.</p>
 </div>
 <div class="section" id="propagating-parameters-and-media-packages">
 <h2>2.3. Propagating parameters and media packages<a class="headerlink" href="#propagating-parameters-and-media-packages" title="Permalink to this headline">¶</a></h2>
 <p>Consider a model with a pump <code class="docutils literal notranslate"><span class="pre">pum</span></code> and a mass flow sensor <code class="docutils literal notranslate"><span class="pre">sen</span></code>.
 Suppose that both models have a parameter <code class="docutils literal notranslate"><span class="pre">m_flow_nominal</span></code> for the nominal mass flow rate that needs to be set to the same value.
-Rather than setting these parameters individually to a numeric value, it is recommended to propagate the parameter to the top-level of the model. Thus, instead of using the declaration</p>
+Rather than setting these parameters individually to a numeric value, it is recommended to propagate the parameter to the top-level of the model.
+This allows to change the value of <code class="docutils literal notranslate"><span class="pre">m_flow_nominal</span></code> at one location, and then have the value be propagated to all models that reference it.
+The effort for the additional declaration typically pays off as changes to the model are easier and more robust.</p>
+<p>To propagate parameters, instead of using the declaration</p>
 <div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Pump</span> <span class="n">pum</span><span class="p">(</span><span class="n">m_flow_nominal</span><span class="o">=</span><span class="mf">0.1</span><span class="p">)</span> <span class="s2">&quot;Pump&quot;</span><span class="p">;</span>
 <span class="n">TemperatureSensor</span> <span class="n">sen</span><span class="p">(</span><span class="n">m_flow_nominal</span><span class="o">=</span><span class="mf">0.1</span><span class="p">)</span> <span class="s2">&quot;Sensor&quot;</span><span class="p">;</span>
 </pre></div>
 </div>
-<p>we recommend to use</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Modelica</span><span class="o">.</span><span class="n">SIunits</span><span class="o">.</span><span class="n">MassFlowRate</span> <span class="n">m_flow_nominal</span> <span class="o">=</span> <span class="mf">0.1</span>
-                              <span class="s2">&quot;Nominal mass flow rate&quot;</span><span class="p">;</span>
+<p>use</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Modelica</span><span class="o">.</span><span class="n">SIunits</span><span class="o">.</span><span class="n">MassFlowRate</span> <span class="n">m_flow_nominal</span> <span class="o">=</span> <span class="mf">0.1</span> <span class="s2">&quot;Nominal mass flow rate&quot;</span><span class="p">;</span>
 <span class="n">Pump</span> <span class="n">pum</span><span class="p">(</span><span class="n">m_flow_nominal</span><span class="o">=</span><span class="n">m_flow_nominal</span><span class="p">)</span> <span class="s2">&quot;Pump&quot;</span><span class="p">;</span>
 <span class="n">TemperatureSensor</span> <span class="n">sen</span><span class="p">(</span><span class="n">m_flow_nominal</span><span class="o">=</span><span class="n">m_flow_nominal</span><span class="p">)</span> <span class="s2">&quot;Sensor&quot;</span><span class="p">;</span>
 </pre></div>
 </div>
-<p>This allows to change the value of <code class="docutils literal notranslate"><span class="pre">m_flow_nominal</span></code> at one location, and then have the value be propagated to all models that reference it. The effort for the additional declaration typically pays off as changes to the model are easier and more robust.</p>
-<p>Propagating parameters and packages is particularly important for medium definitions. This allows the user to change the medium declaration at one location and then have it propagated to all models that reference it. This can be done by using the declaration</p>
+<p>Propagating parameters and packages is also recommended for medium definitions.
+This can be done by using the declaration</p>
 <div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">replaceable</span> <span class="kr">package</span> <span class="nc">Medium</span> <span class="o">=</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">Media</span><span class="o">.</span><span class="n">Interfaces</span><span class="o">.</span><span class="n">PartialMedium</span>
   <span class="s2">&quot;Medium model for air&quot;</span> <span class="kr">annotation</span> <span class="p">(</span><span class="n">choicesAllMatching</span><span class="o">=</span><span class="kc">true</span><span class="p">);</span>
 </pre></div>
 </div>
-<p>Here, the optional annotation <code class="docutils literal notranslate"><span class="pre">annotation</span> <span class="pre">(choicesAllMatching=true)</span></code> is added which causes a GUI to show a drop-down menu with all medium models that extend from <code class="docutils literal notranslate"><span class="pre">Modelica.Media.Interfaces.PartialMedium</span></code>.</p>
+<p>Here, the optional annotation <code class="docutils literal notranslate"><span class="pre">annotation</span> <span class="pre">(choicesAllMatching=true)</span></code> is added which causes a GUI to show
+a drop-down menu with all medium models that extend from <code class="docutils literal notranslate"><span class="pre">Modelica.Media.Interfaces.PartialMedium</span></code>.</p>
 <p>If the above sensor requires a medium model, which is likely the case, its declaration would be</p>
 <div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">TemperatureSensor</span> <span class="n">sen</span><span class="p">(</span><span class="kr">redeclare</span> <span class="kr">package</span> <span class="nc">Medium</span> <span class="o">=</span> <span class="n">Medium</span><span class="p">,</span>
                       <span class="n">m_flow_nominal</span><span class="o">=</span><span class="n">m_flow_nominal</span><span class="p">)</span> <span class="s2">&quot;Sensor&quot;</span><span class="p">;</span>
@@ -251,9 +260,11 @@ <h2>2.4. Thermo-fluid systems<a class="headerlink" href="#thermo-fluid-systems"
 <h3>2.4.1. Overdetermined initialization problem and inconsistent equations<a class="headerlink" href="#overdetermined-initialization-problem-and-inconsistent-equations" title="Permalink to this headline">¶</a></h3>
 <p>We will now explain how state variables, such as temperature and pressure, can be initialized.</p>
 <p>Consider a model consisting of a mass flow source <code class="docutils literal notranslate"><span class="pre">Modelica.Fluid.Sources.MassFlowSource_T</span></code>, a fluid volume <code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.MixingVolumes.MixingVolume</span></code> and
-a fixed boundary condition <code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.Sources.FixedBoundary</span></code>, connected in series as shown in the figure below. Note that the instance <code class="docutils literal notranslate"><span class="pre">bou</span></code> implements an equation that sets the medium pressure at its port, i.e., the port pressure <code class="docutils literal notranslate"><span class="pre">bou.ports.p</span></code> is fixed.</p>
+a fixed boundary condition <code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.Sources.Boundary_pT</span></code>,
+connected in series as shown in the figure below. Note that the instance <code class="docutils literal notranslate"><span class="pre">bou</span></code>
+implements an equation that sets the medium pressure at its port, i.e., the port pressure <code class="docutils literal notranslate"><span class="pre">bou.ports.p</span></code> is fixed.</p>
 <div class="figure align-default" id="id9">
-<a class="reference internal image-reference" href="_images/MixingVolumeInitialization.png"><img alt="_images/MixingVolumeInitialization.png" src="_images/MixingVolumeInitialization.png" style="width: 371.0px; height: 161.0px;" /></a>
+<a class="reference internal image-reference" href="_images/MixingVolumeInitialization.svg"><img alt="_images/MixingVolumeInitialization.svg" src="_images/MixingVolumeInitialization.svg" width="300px" /></a>
 <p class="caption"><span class="caption-number">Fig. 2.1 </span><span class="caption-text">Schematic diagram of a flow source, a fluid volume, and a pressure source.</span><a class="headerlink" href="#id9" title="Permalink to this image">¶</a></p>
 </div>
 <p>The volume allows configuring balance equations for energy and mass in four different ways.
@@ -318,7 +329,11 @@ <h3>2.4.1. Overdetermined initialization problem and inconsistent equations<a cl
 at the value <code class="docutils literal notranslate"><span class="pre">p(start=Medium.p_default)</span></code>, where <code class="docutils literal notranslate"><span class="pre">Medium</span></code> is the
 name of the instance of the medium model.</p></li>
 </ol>
-<p>Since the model <code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.Sources.FixedBoundary</span></code> fixes the pressure at its port, the initial conditions <span class="math notranslate nohighlight">\(p(t_0)=p_0\)</span> and <span class="math notranslate nohighlight">\(dp(t_0)/dt = 0\)</span> lead to an overspecified system for the model shown above. To avoid such situation, use different initial conditions, or add a flow resistance between the mixing volume and the pressure source. The flow resistance introduces an equation that relates the pressure of the mixing volume and the pressure source as a function of the mass flow rate, thereby removing the inconsistency.</p>
+<p>Since the model <code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.Sources.Boundary_pT</span></code> fixes the pressure at its port,
+the initial conditions <span class="math notranslate nohighlight">\(p(t_0)=p_0\)</span> and <span class="math notranslate nohighlight">\(dp(t_0)/dt = 0\)</span> lead to an overspecified system for the model shown above.
+To avoid such situation, use different initial conditions, or add a flow resistance between the mixing volume and the pressure source.
+The flow resistance introduces an equation that relates the pressure of the mixing volume and
+the pressure source as a function of the mass flow rate, thereby removing the inconsistency.</p>
 <div class="admonition warning">
 <p class="admonition-title">Warning</p>
 <p>The setting <code class="docutils literal notranslate"><span class="pre">FixedInitial</span></code> should be used with caution: Since the pressure dynamics is fast, this setting
@@ -453,35 +468,12 @@ <h3>2.4.1. Overdetermined initialization problem and inconsistent equations<a cl
 <div class="section" id="modeling-of-fluid-junctions">
 <h3>2.4.2. Modeling of fluid junctions<a class="headerlink" href="#modeling-of-fluid-junctions" title="Permalink to this headline">¶</a></h3>
 <p>In Modelica, connecting fluid ports as shown below leads to ideal mixing at the junction.
-In some situation, such as the configuration below, connecting multiple connectors to a fluid port represents the physical phenomena that was intended to model.</p>
+In some situation, such as the configuration below, connecting multiple connectors to
+a fluid port represents the physical phenomena that was intended to model.</p>
 <div class="figure align-default" id="id10">
-<a class="reference internal image-reference" href="_images/fluidJunctionMixing.png"><img alt="_images/fluidJunctionMixing.png" src="_images/fluidJunctionMixing.png" style="width: 201.0px; height: 240.0px;" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.2 </span><span class="caption-text">Connection of three components without explicitly introducing a mixer or splitter model.</span><a class="headerlink" href="#id10" title="Permalink to this image">¶</a></p>
+<a class="reference internal image-reference" href="_images/fluidJunctionMixing.svg"><img alt="_images/fluidJunctionMixing.svg" src="_images/fluidJunctionMixing.svg" width="300px" /></a>
+<p class="caption"><span class="caption-number">Fig. 2.2 </span><span class="caption-text">Connection of three components without explicitly introducing a flow junction model.</span><a class="headerlink" href="#id10" title="Permalink to this image">¶</a></p>
 </div>
-<<<<<<< HEAD
-<p>However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix. This may be achieved by using an instance of the model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop">PressureDrop</a> as shown in the left figure below, which is the test model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop">BoilerPolynomialClosedLoop</a></p>
-<div class="figure align-default" id="id11">
-<img alt="_images/fluidJunctionMixingSplitter.png" src="_images/fluidJunctionMixingSplitter.png" />
-<p class="caption"><span class="caption-number">Fig. 2.3 </span><span class="caption-text">Correct (left) and wrong (right) connection of components with use of a mixer or splitter model.</span><a class="headerlink" href="#id11" title="Permalink to this image">¶</a></p>
-</div>
-<p>In the figure on the left, the mixing points have been correctly defined by use of the three-way model that mixes or splits flow. By setting the nominal pressure drop of the mixer or splitter model to zero, the mixer or splitter model can be simplified so that no equation for the flow resistance is introduced. In addition, in the branch of the splitter that connects to the valve, a pressure drop can be modelled, which then affects the valve authority.
-However, in the figure on the right, the flow that leaves port A is mixing at port B with the return from the volume <code class="docutils literal notranslate"><span class="pre">vol</span></code>, and then it flows to port C. Thus, the valve is exposed to the wrong temperature.</p>
-</div>
-<div class="section" id="use-of-sensors-in-fluid-flow-systems">
-<h3>2.4.3. Use of sensors in fluid flow systems<a class="headerlink" href="#use-of-sensors-in-fluid-flow-systems" title="Permalink to this headline">¶</a></h3>
-<p>When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on the direction of the flow or not. If the quantity depends on the flow direction, such as temperature or relative humidity, then sensors with two ports from the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a> library should be used. These sensors have a more efficient implementation than sensors with one port for situations where the flow reverses its direction.
-The proper use sensors is described in the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors_UsersGuide.html">User’s Guide</a> of the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a> package.</p>
-</div>
-<div class="section" id="reference-pressure-for-incompressible-fluids-such-as-water">
-<span id="referencepressureincompressiblefluids"></span><h3>2.4.4. Reference pressure for incompressible fluids such as water<a class="headerlink" href="#reference-pressure-for-incompressible-fluids-such-as-water" title="Permalink to this headline">¶</a></h3>
-<p>This section explains how to set a reference pressure for incompressible fluids. For fluids that model density as a function of temperature, the section also shows how to account for the thermal expansion of the fluid.</p>
-<p>Consider the flow circuit shown below that consists of a pump or fan, a flow resistance and a volume.</p>
-=======
 <p>However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix.
 This may be achieved by using an instance of the model
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction">Junction</a>
@@ -527,25 +519,19 @@ <h3>2.4.3. Use of sensors in fluid flow systems<a class="headerlink" href="#use-
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater">Buildings.Media.Antifreeze.PropyleneGlycolWater</a>.</p>
 <p>Consider the flow circuit shown in <a class="reference internal" href="#fig-flow-cir"><span class="std std-numref">Fig. 2.4</span></a> that consists of a pump or fan,
 a flow resistance and a volume.</p>
->>>>>>> master
 <div class="figure align-default" id="id12">
-<a class="reference internal image-reference" href="_images/flowCircuitNoExpansion.png"><img alt="_images/flowCircuitNoExpansion.png" src="_images/flowCircuitNoExpansion.png" style="width: 449.4px; height: 370.8px;" /></a>
+<span id="fig-flow-cir"></span><a class="reference internal image-reference" href="_images/flowCircuit.svg"><img alt="_images/flowCircuit.svg" src="_images/flowCircuit.svg" width="400pt" /></a>
 <p class="caption"><span class="caption-number">Fig. 2.4 </span><span class="caption-text">Schematic diagram of a flow circuit without means
 to set a reference pressure, or to account for
 thermal expansion of the fluid.</span><a class="headerlink" href="#id12" title="Permalink to this image">¶</a></p>
 </div>
 <p>When this model is used with a medium model that models
-<a class="reference internal" href="glossary.html#term-compressible-flow"><span class="xref std std-term">compressible flow</span></a>, such as
-the medium model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Air.html#Buildings.Media.Air">Buildings.Media.Air</a>,
-then the model is well defined because the gas medium implements the
-equation <span class="math notranslate nohighlight">\(p=\rho \, R \, T\)</span>,
-where <span class="math notranslate nohighlight">\(p\)</span> is the static pressure, <span class="math notranslate nohighlight">\(\rho\)</span> is the mass density,
-<span class="math notranslate nohighlight">\(R\)</span> is the gas constant and <span class="math notranslate nohighlight">\(T\)</span> is the absolute temperature.</p>
+<a class="reference internal" href="glossary.html#term-compressible-flow"><span class="xref std std-term">compressible flow</span></a>,
+then the model is well defined because the gas medium implements
+an equation that relates density to pressure.</p>
 <p>However, when the medium model is changed to a model that models
-<a class="reference internal" href="glossary.html#term-incompressible-flow"><span class="xref std std-term">incompressible flow</span></a>, such as
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Water.html#Buildings.Media.Water">Buildings.Media.Water</a>,
-then the density is constant. Consequently, there is no equation that
-can be used to compute the pressure based on the volume.
+<a class="reference internal" href="glossary.html#term-incompressible-flow"><span class="xref std std-term">incompressible flow</span></a>,
+then there is no equation that can be used to compute the pressure.
 In this situation, attempting to translate the model leads, in Dymola, to the following error message:</p>
 <div class="highlight-none notranslate"><div class="highlight"><pre><span></span>The DAE has 151 scalar unknowns and 151 scalar equations.
 Error: The model FlowCircuit is structurally singular.
@@ -554,12 +540,8 @@ <h3>2.4.3. Use of sensors in fluid flow systems<a class="headerlink" href="#use-
 The number of scalar Real equation elements are 58.
 </pre></div>
 </div>
-<<<<<<< HEAD
-<p>Similarly, if the medium model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity">Buildings.Media.Specialized.Water.TemperatureDependentDensity</a>,
-=======
 <p>Similarly, if the medium model
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity">Buildings.Media.Specialized.Water.TemperatureDependentDensity</a>,
->>>>>>> master
 which models density as a function of pressure and enthalpy, is used, then
 the model is well-defined, but the pressure increases the longer the pump runs.
 The reason is that the pump adds heat to the water. When the water temperature
@@ -568,47 +550,14 @@ <h3>2.4.3. Use of sensors in fluid flow systems<a class="headerlink" href="#use-
 <p>To avoid this singularity or increase in pressure,
 use a model that imposes a pressure source and that accounts for the expansion of the fluid.
 For example, use
-<<<<<<< HEAD
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>
-to form the system model shown below.</p>
-=======
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
 to form the system model shown in <a class="reference internal" href="#fig-flow-cir-wit-bou"><span class="std std-numref">Fig. 2.5</span></a>.</p>
->>>>>>> master
 <div class="figure align-default" id="id13">
-<a class="reference internal image-reference" href="_images/flowCircuitWithExpansionVessel.png"><img alt="_images/flowCircuitWithExpansionVessel.png" src="_images/flowCircuitWithExpansionVessel.png" style="width: 459.59999999999997px; height: 404.4px;" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.5 </span><span class="caption-text">Schematic diagram of a flow circuit with expansion vessel that
-adds a pressure source and accounts for the thermal expansion
-of the medium.</span><a class="headerlink" href="#id13" title="Permalink to this image">¶</a></p>
+<span id="fig-flow-cir-wit-bou"></span><a class="reference internal image-reference" href="_images/flowCircuitWithBoundary.svg"><img alt="_images/flowCircuitWithBoundary.svg" src="_images/flowCircuitWithBoundary.svg" width="400pt" /></a>
+<p class="caption"><span class="caption-number">Fig. 2.5 </span><span class="caption-text">Schematic diagram of a flow circuit with a model that
+provides a reference presssure.</span><a class="headerlink" href="#id13" title="Permalink to this image">¶</a></p>
 </div>
 <p>Alternatively, you may use
-<<<<<<< HEAD
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary">Buildings.Fluid.Sources.FixedBoundary</a>, which sets the pressure to a constant value
-and adds or removes fluid as needed to maintain the pressure.
-The model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary">Buildings.Fluid.Sources.FixedBoundary</a> usually leads to simpler equations than
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>.
-Note that the medium that flows out of the fluid port of
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary">Buildings.Fluid.Sources.FixedBoundary</a>
-is at a fixed temperature, while the model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a> conserves energy.
-However, since the thermal expansion of the fluid is usually small, this effect can be neglected in most building HVAC applications.</p>
-<div class="figure align-default" id="id14">
-<a class="reference internal image-reference" href="_images/flowCircuitWithBoundary.png"><img alt="_images/flowCircuitWithBoundary.png" src="_images/flowCircuitWithBoundary.png" style="width: 475.2px; height: 415.2px;" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.6 </span><span class="caption-text">Schematic diagram of a flow circuit with a boundary model that adds
-a fixed pressure source and accounts for any thermal expansion
-of the medium.</span><a class="headerlink" href="#id14" title="Permalink to this image">¶</a></p>
-</div>
-<div class="admonition note">
-<p class="admonition-title">Note</p>
-<p>In each water circuit, there must be one, and only one, instance of
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>,
-or instance of
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary">Buildings.Fluid.Sources.FixedBoundary</a>.
-If there is no such device, then the absolute pressure
-may not be defined, or it may raise to an unrealistically large
-value if the medium density changes.
-If there is more than one such device, then there are multiple
-=======
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>,
 but
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
@@ -628,10 +577,27 @@ <h3>2.4.3. Use of sensors in fluid flow systems<a class="headerlink" href="#use-
 or instance of
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>.</p>
 <p>If there is more than one such device, then there are multiple
->>>>>>> master
 points in the system that set the reference static pressure.
 This will affect the distribution of the mass flow rate.</p>
 </div>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>If Dymola fails to translate a model with the error message:</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">Error</span><span class="p">:</span> <span class="n">The</span> <span class="n">initialization</span> <span class="n">problem</span> <span class="ow">is</span> <span class="n">overspecified</span> <span class="k">for</span> <span class="n">variables</span>
+<span class="n">of</span> <span class="n">element</span> <span class="nb">type</span> <span class="n">Real</span>
+<span class="n">The</span> <span class="n">initial</span> <span class="n">equation</span>
+<span class="o">...</span>
+<span class="n">refers</span> <span class="n">to</span> <span class="n">variables</span><span class="p">,</span> <span class="n">which</span> <span class="n">are</span> <span class="nb">all</span> <span class="n">knowns</span><span class="o">.</span>
+<span class="n">To</span> <span class="n">correct</span> <span class="n">it</span> <span class="n">you</span> <span class="n">can</span> <span class="n">remove</span> <span class="n">this</span> <span class="n">equation</span><span class="o">.</span>
+</pre></div>
+</div>
+<p>then the initialization problem is overspecified. To avoid this, set</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">energyDynamics</span> <span class="o">=</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Types</span><span class="o">.</span><span class="n">Dynamics</span><span class="o">.</span><span class="n">DynamicsFreeInitial</span><span class="p">;</span>
+<span class="n">massDynamics</span> <span class="o">=</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Types</span><span class="o">.</span><span class="n">Dynamics</span><span class="o">.</span><span class="n">DynamicsFreeInitial</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>in the instances of the components that contain fluid volumes.</p>
+</div>
 </div>
 <div class="section" id="nominal-values">
 <h3>2.4.5. Nominal Values<a class="headerlink" href="#nominal-values" title="Permalink to this headline">¶</a></h3>
@@ -723,99 +689,16 @@ <h3>2.4.5. Nominal Values<a class="headerlink" href="#nominal-values" title="Per
 </table>
 </div>
 </div>
-<div class="section" id="start-values-of-iteration-variables">
-<h2>2.5. Start values of iteration variables<a class="headerlink" href="#start-values-of-iteration-variables" title="Permalink to this headline">¶</a></h2>
-<p>When computing numerical solutions to systems of nonlinear equations, a Newton-based solver is typically used. Such solvers have a higher success of convergence if good start values are provided for the iteration variables. In Dymola, to see what start values are used, one can enter on the simulation tab the command</p>
-<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>Advanced.LogStartValuesForIterationVariables = true;
-</pre></div>
-</div>
-<p>Then, when a model is translated, for example using</p>
-<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>translateModel(&quot;Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop&quot;);
-</pre></div>
-</div>
-<p>an output of the form</p>
-<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>Start values for iteration variables:
- val.res1.dp(start = 3000.0)
- val.res3.dp(start = 3000.0)
-</pre></div>
-</div>
-<p>is produced. This shows the iteration variables and their start values. These start values can be overwritten in the model.</p>
-</div>
-<div class="section" id="avoiding-events">
-<h2>2.6. Avoiding events<a class="headerlink" href="#avoiding-events" title="Permalink to this headline">¶</a></h2>
-<p>In Modelica, the time integration is halted whenever a Real elementary
-operation such as <span class="math notranslate nohighlight">\(x&gt;y\)</span>, where <span class="math notranslate nohighlight">\(x\)</span> and <span class="math notranslate nohighlight">\(y\)</span> are variables of type <code class="docutils literal notranslate"><span class="pre">Real</span></code>,
-changes its value. In this situation,
-an event occurs and the solver determines a small interval in time in which
-the relation changes its value. Determining this time interval
-often requires an iterative solution, which can significantly
-increase the computing time if the iteration require
-the evaluation of a large system of equations.
-An example where such an event occurs is the following relation
-that computes the enthalpy of the medium that streams through <code class="docutils literal notranslate"><span class="pre">port_a</span></code> as</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">if</span> <span class="n">port_a</span><span class="o">.</span><span class="n">m_flow</span> <span class="o">&gt;</span> <span class="mi">0</span> <span class="kr">then</span>
-  <span class="n">h_a</span> <span class="o">=</span> <span class="nb">inStream</span><span class="p">(</span><span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">);</span>
-<span class="kr">else</span>
-  <span class="n">h_a</span> <span class="o">=</span> <span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">;</span>
-<span class="kr">end</span> <span class="kr">if</span><span class="p">;</span>
-</pre></div>
-</div>
-<p>or, equivalently,</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">h_a</span> <span class="o">=</span> <span class="kr">if</span> <span class="n">port_a</span><span class="o">.</span><span class="n">m_flow</span> <span class="o">&gt;</span> <span class="mi">0</span> <span class="kr">then</span> <span class="nb">inStream</span><span class="p">(</span><span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">)</span> <span class="kr">else</span> <span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">;</span>
-</pre></div>
-</div>
-<p>When simulating a model that contains such code, a time integrator
-will iterate to find the time instant where <code class="docutils literal notranslate"><span class="pre">port_a.m_flow</span></code> crosses zero.
-If the modeling assumptions allow approximating this equation in
-a neighborhood around <code class="docutils literal notranslate"><span class="pre">port_a.m_flow=0</span></code>, then replacing this equation
-with an approximation that does not require an event iteration can
-reduce computing time. For example, the above equation could be
-approximated as</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">T_a</span> <span class="o">=</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Utilities</span><span class="o">.</span><span class="n">regStep</span><span class="p">(</span>
-  <span class="n">port_a</span><span class="o">.</span><span class="n">m_flow</span><span class="p">,</span> <span class="nb">inStream</span><span class="p">(</span><span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">),</span> <span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">,</span>
-  <span class="n">m_flow_nominal</span><span class="o">*</span><span class="mf">1E-4</span><span class="p">);</span>
-</pre></div>
-</div>
-<p>where <code class="docutils literal notranslate"><span class="pre">m_flow_nominal</span></code> is a parameter that is set to a value that
-is close to the mass flow rate that the model has at full load.
-If the magnitude of the flow rate is larger than 1E-4 times the
-typical flow rate, the approximate equation is the same as the exact equation,
-and below that value, an approximation is used. However, for such small
-flow rates, not much energy is transported and hence the error introduced
-by the approximation is generally negligible.</p>
-<p>In some cases, adding dynamics to the model can further improve
-the computing time, because the return value of the function
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/msl/3.2/help/Modelica_Fluid_Utilities.html#Modelica.Fluid.Utilities.regStep">Modelica.Fluid.Utilities.regStep()</a>
-above can change abruptly if its argument <code class="docutils literal notranslate"><span class="pre">port_a.m_flow</span></code> oscillates in the range of
-<code class="docutils literal notranslate"><span class="pre">+/-</span> <span class="pre">1E-4*m_flow_nominal</span></code>,
-for example due to <a class="reference internal" href="glossary.html#term-numerical-noise"><span class="xref std std-term">numerical noise</span></a>.
-Adding dynamics may be achieved using a formulation such as</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">hMed</span> <span class="o">=</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Utilities</span><span class="o">.</span><span class="n">regStep</span><span class="p">(</span>
-  <span class="n">port_a</span><span class="o">.</span><span class="n">m_flow</span><span class="p">,</span> <span class="nb">inStream</span><span class="p">(</span><span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">),</span> <span class="n">port_a</span><span class="o">.</span><span class="n">h_outflow</span><span class="p">,</span>
-  <span class="n">m_flow_nominal</span><span class="o">*</span><span class="mf">1E-4</span><span class="p">);</span>
-<span class="kr">der</span><span class="p">(</span><span class="n">h</span><span class="p">)</span><span class="o">=</span><span class="p">(</span><span class="n">hMed</span><span class="o">-</span><span class="n">h</span><span class="p">)</span><span class="o">/</span><span class="n">tau</span><span class="p">;</span>
-</pre></div>
-</div>
-<p>where <code class="docutils literal notranslate"><span class="pre">tau</span></code>&gt;0 is a time constant. See, for example,
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort">Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort</a>
-for a robust implementation.</p>
-<div class="admonition note">
-<p class="admonition-title">Note</p>
-<p>In the package
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math">Buildings.Utilities.Math</a>
-the functions and blocks whose names start with <code class="docutils literal notranslate"><span class="pre">smooth</span></code> can be used to avoid events.</p>
-</div>
-</div>
 <div class="section" id="controls">
-<span id="sec-bes-pra-con"></span><h2>2.7. Controls<a class="headerlink" href="#controls" title="Permalink to this headline">¶</a></h2>
-<div class="figure align-default" id="id15">
+<span id="sec-bes-pra-con"></span><h2>2.5. Controls<a class="headerlink" href="#controls" title="Permalink to this headline">¶</a></h2>
+<div class="figure align-default" id="id14">
 <a class="reference internal image-reference" href="_images/controlHysteresis.png"><img alt="_images/controlHysteresis.png" src="_images/controlHysteresis.png" style="width: 270.0px; height: 401.0px;" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.7 </span><span class="caption-text">Schematic diagram of a controller that switches a coil on and off.
+<p class="caption"><span class="caption-number">Fig. 2.6 </span><span class="caption-text">Schematic diagram of a controller that switches a coil on and off.
 In the top configuration, the hysteresis avoids numerical problems
 (and short-cycling) if the control input remains close to the
 set point. The bottom configuration can cause the integration to
 stall if the input signal to the threshold block is the solution
-of an iterative solver and remains around 293.15 Kelvin.</span><a class="headerlink" href="#id15" title="Permalink to this image">¶</a></p>
+of an iterative solver and remains around 293.15 Kelvin.</span><a class="headerlink" href="#id14" title="Permalink to this image">¶</a></p>
 </div>
 <p>When implementing an on/off controller, always use a controller with
 hysteresis such as shown in the top configuration of the model above.
@@ -864,155 +747,31 @@ <h2>2.6. Avoiding events<a class="headerlink" href="#avoiding-events" title="Per
 </ul>
 <p>An exception is a sampled value because the output of a sampler remains constant
 until the next sampling instant.</p>
-<p>See <a class="reference internal" href="#sec-example-event-debugging"><span class="std std-ref">Examples for how to debug and correct slow simulations</span></a> for what can happen in
+<p>See <a class="reference internal" href="performance.html#sec-example-event-debugging"><span class="std std-ref">Examples for how to debug and correct slow simulations</span></a> for what can happen in
 such tests.</p>
 </div>
 </div>
-<div class="section" id="examples-for-how-to-debug-and-correct-slow-simulations">
-<span id="sec-example-event-debugging"></span><h2>2.8. Examples for how to debug and correct slow simulations<a class="headerlink" href="#examples-for-how-to-debug-and-correct-slow-simulations" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="state-events">
-<h3>2.8.1. State events<a class="headerlink" href="#state-events" title="Permalink to this headline">¶</a></h3>
-<p>This section shows how a simulation that stalls due to events can be debugged
-to find the root cause, and then corrected.
-While the details may differ from one tool to another, the principle is the same.
-In our situation, we attempted to simulate <code class="docutils literal notranslate"><span class="pre">Buildings.Examples.DualFanDualDuct</span></code>
-for one year in Dymola 2016 FD01 using the model from Buildings version 3.0.0.
-We run</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">simulateModel</span><span class="p">(</span><span class="s2">&quot;Buildings.Examples.DualFanDualDuct.ClosedLoop&quot;</span><span class="p">,</span>
-               <span class="n">stopTime</span><span class="o">=</span><span class="mi">31536000</span><span class="p">,</span> <span class="n">method</span><span class="o">=</span><span class="s2">&quot;radau&quot;</span><span class="p">,</span>
-               <span class="n">tolerance</span><span class="o">=</span><span class="mf">1e-06</span><span class="p">,</span> <span class="n">resultFile</span><span class="o">=</span><span class="s2">&quot;DualFanDualDuctClosedLoop&quot;</span><span class="p">);</span>
-</pre></div>
-</div>
-<p>and plotted the computing time and the number of events. Around <span class="math notranslate nohighlight">\(t=0.95e7\)</span> seconds,
-there was a spike as shown in the figure below.</p>
-<div class="figure align-default" id="id16">
-<a class="reference internal image-reference" href="_images/DualFanDualDuct-cpu-events.png"><img alt="_images/DualFanDualDuct-cpu-events.png" src="_images/DualFanDualDuct-cpu-events.png" style="width: 352.8px; height: 244.2px;" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.8 </span><span class="caption-text">Computing time and number of events.</span><a class="headerlink" href="#id16" title="Permalink to this image">¶</a></p>
-</div>
-<p>As the number of events increased drastically, we enabled in Dymola in
-<cite>Simulation -&gt; Setup</cite>, under the tab <cite>Debug</cite> the entry <cite>Events during simulation</cite>
-and simulated the model from
-<span class="math notranslate nohighlight">\(t=0.9e7\)</span> to <span class="math notranslate nohighlight">\(t=1.0e7\)</span> seconds. It turned out that setting the start time
-to <span class="math notranslate nohighlight">\(t=0.9e7\)</span> seconds was sufficient to reproduce the behavior;
-otherwise we would
-have had to set it to an earlier time.
-Inspecting Dymola’s log file <code class="docutils literal notranslate"><span class="pre">dslog.txt</span></code> when the simulation stalls shows that its last entries
-are</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Expression</span> <span class="n">TRet</span><span class="o">.</span><span class="n">T</span> <span class="o">&gt;</span> <span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span> <span class="n">became</span> <span class="kc">true</span> <span class="p">(</span> <span class="p">(</span><span class="n">TRet</span><span class="o">.</span><span class="n">T</span><span class="p">)</span><span class="o">-</span><span class="p">(</span><span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span><span class="p">)</span> <span class="o">=</span> <span class="mf">2.9441e-08</span> <span class="p">)</span>
-<span class="n">Iterating</span> <span class="n">to</span> <span class="n">find</span> <span class="n">consistent</span> <span class="n">restart</span> <span class="n">conditions</span><span class="o">.</span>
-      <span class="n">during</span> <span class="n">event</span> <span class="n">at</span> <span class="n">Time</span> <span class="o">:</span>  <span class="mf">9267949.854873843</span>
-<span class="n">Expression</span> <span class="n">TRet</span><span class="o">.</span><span class="n">T</span> <span class="o">&gt;</span> <span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span> <span class="n">became</span> <span class="kc">false</span> <span class="p">(</span> <span class="p">(</span><span class="n">TRet</span><span class="o">.</span><span class="n">T</span><span class="p">)</span><span class="o">-</span><span class="p">(</span><span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span><span class="p">)</span> <span class="o">=</span> <span class="o">-</span><span class="mf">2.94411e-08</span> <span class="p">)</span>
-<span class="n">Iterating</span> <span class="n">to</span> <span class="n">find</span> <span class="n">consistent</span> <span class="n">restart</span> <span class="n">conditions</span><span class="o">.</span>
-      <span class="n">during</span> <span class="n">event</span> <span class="n">at</span> <span class="n">Time</span> <span class="o">:</span>  <span class="mf">9267949.855016639</span>
-<span class="n">Expression</span> <span class="n">TRet</span><span class="o">.</span><span class="n">T</span> <span class="o">&gt;</span> <span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span> <span class="n">became</span> <span class="kc">true</span> <span class="p">(</span> <span class="p">(</span><span class="n">TRet</span><span class="o">.</span><span class="n">T</span><span class="p">)</span><span class="o">-</span><span class="p">(</span><span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span><span class="p">)</span> <span class="o">=</span> <span class="mf">2.94407e-08</span> <span class="p">)</span>
-<span class="n">Iterating</span> <span class="n">to</span> <span class="n">find</span> <span class="n">consistent</span> <span class="n">restart</span> <span class="n">conditions</span><span class="o">.</span>
-      <span class="n">during</span> <span class="n">event</span> <span class="n">at</span> <span class="n">Time</span> <span class="o">:</span>  <span class="mf">9267949.855208419</span>
-<span class="n">Expression</span> <span class="n">TRet</span><span class="o">.</span><span class="n">T</span> <span class="o">&gt;</span> <span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span> <span class="n">became</span> <span class="kc">false</span> <span class="p">(</span> <span class="p">(</span><span class="n">TRet</span><span class="o">.</span><span class="n">T</span><span class="p">)</span><span class="o">-</span><span class="p">(</span><span class="n">amb</span><span class="o">.</span><span class="n">x_pTphi</span><span class="o">.</span><span class="n">T</span><span class="p">)</span> <span class="o">=</span> <span class="o">-</span><span class="mf">2.94406e-08</span> <span class="p">)</span>
-<span class="n">Iterating</span> <span class="n">to</span> <span class="n">find</span> <span class="n">consistent</span> <span class="n">restart</span> <span class="n">conditions</span><span class="o">.</span>
-      <span class="n">during</span> <span class="n">event</span> <span class="n">at</span> <span class="n">Time</span> <span class="o">:</span>  <span class="mf">9267949.855351238</span>
+<div class="section" id="start-values-of-iteration-variables">
+<h2>2.6. Start values of iteration variables<a class="headerlink" href="#start-values-of-iteration-variables" title="Permalink to this headline">¶</a></h2>
+<p>When computing numerical solutions to systems of nonlinear equations, a Newton-based solver
+is typically used. Such solvers have a higher success of convergence
+if good start values are provided for the iteration variables. In Dymola,
+to see what start values are used, one can enter on the simulation tab the command</p>
+<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>Advanced.LogStartValuesForIterationVariables = true;
 </pre></div>
 </div>
-<p>Hence, there is an event every few milliseconds, which explains
-why the simulation does not appear to be progessing.
-The solver does the right thing, it stops
-the integration, handles the event, and restarts the integration, just to encounter
-another event a few milliseconds later.
-Hence, we go back to our system model and
-follow the output signal of <code class="docutils literal notranslate"><span class="pre">TRet.T</span></code> of the
-return air temperature sensor,
-which shows that it is used in the economizer control
-to switch the sign of the control gain because the economizer can provide heating or cooling,
-depending on the ambient and return air temperature. The problematic model is
-shown in the figure below.</p>
-<div class="figure align-default" id="id17">
-<span id="fig-dualfan-eco-con-bad"></span><a class="reference internal image-reference" href="_images/EconomizerTemperatureControl-bad.svg"><img alt="_images/EconomizerTemperatureControl-bad.svg" src="_images/EconomizerTemperatureControl-bad.svg" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.9 </span><span class="caption-text">Block diagram of part of the economizer control that computes the outside air damper
-control signal. This implementation triggers many events.</span><a class="headerlink" href="#id17" title="Permalink to this image">¶</a></p>
-</div>
-<p>The events are triggered by the inequality block which changes the control, which then in turn
-seems to cause a slight change in the return air temperature, possibly due
-to <a class="reference internal" href="glossary.html#term-numerical-noise"><span class="xref std std-term">numerical noise</span></a> or maybe because the return fan may change its operating point
-as the dampers are adjusted, and hence change the heat
-added to the medium. Regardless, this is a bad implementation that also
-would cause oscillatory behavior in a real system if the sensor signal had
-measurement noise.
-Therefore, this equality comparison must be replaced by a block with hysteresis,
-which we did as shown in the figure below.
-We selected a hysteresis of <span class="math notranslate nohighlight">\(0.2\)</span> Kelvin, and now the model runs fine
-for the whole year.</p>
-<div class="figure align-default" id="id18">
-<span id="fig-dualfan-eco-con-revised"></span><a class="reference internal image-reference" href="_images/EconomizerTemperatureControl-revised.svg"><img alt="_images/EconomizerTemperatureControl-revised.svg" src="_images/EconomizerTemperatureControl-revised.svg" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.10 </span><span class="caption-text">Block diagram of part of the revised economizer control that computes the outside air damper
-control signal.</span><a class="headerlink" href="#id18" title="Permalink to this image">¶</a></p>
-</div>
-</div>
-<div class="section" id="state-variables-that-dominate-the-error-control">
-<h3>2.8.2. State variables that dominate the error control<a class="headerlink" href="#state-variables-that-dominate-the-error-control" title="Permalink to this headline">¶</a></h3>
-<p>In a development version of the model
-<code class="docutils literal notranslate"><span class="pre">Buildings.Examples.DualFanDualDuct.ClosedLoop</span></code>
-(commit <a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/commit/ef410ee8a5d1816f8b8e171da7743e15caaa3163">ef410ee</a>),
-the simulation time was very slow during part of the
-simulation, as shown in <a class="reference internal" href="#fig-dualfan-filtered-speed"><span class="std std-numref">Fig. 2.11</span></a>.</p>
-<div class="figure align-default" id="id19">
-<span id="fig-dualfan-filtered-speed"></span><a class="reference internal image-reference" href="_images/DualFanDualDuctWithFilteredSpeed.svg"><img alt="_images/DualFanDualDuctWithFilteredSpeed.svg" src="_images/DualFanDualDuctWithFilteredSpeed.svg" /></a>
-<p class="caption"><span class="caption-number">Fig. 2.11 </span><span class="caption-text">Computing time and number of events.</span><a class="headerlink" href="#id19" title="Permalink to this image">¶</a></p>
-</div>
-<p>The number of state events did not increase in that time interval.
-To isolate the problem, we enabled in Dymola under <cite>Simulation -&gt; Setup</cite> the
-option to log which states dominate the error (see <cite>Debug</cite> tab).</p>
-<p>Running the simulation again gave the following output:</p>
-<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>Integration terminated successfully at T = 1.66e+07
-  Limit stepsize, Dominate error, Exceeds 10% of error Component (#number)
-      0     1     6 cooCoi.temSen_1.T (#  1)
-     36     0   140 cooCoi.temSen_2.T (#  2)
-     37     0     0 cooCoi.ele[1].mas.T (#  3)
-     45     0     0 cooCoi.ele[2].mas.T (#  4)
-     51     0     0 cooCoi.ele[3].mas.T (#  5)
-     53     0     0 cooCoi.ele[4].mas.T (#  6)
-  13555 13201 19064 fanSupHot.filter.x[1] (#  7)
-  11905  2170 12394 fanSupHot.filter.x[2] (#  8)
-    400    47   419 fanSupCol.filter.x[1] (#  9)
-    420    71   521 fanSupCol.filter.x[2] (# 10)
-   5082  2736  6732 fanRet.filter.x[1] (# 11)
-   1979    25  4974 fanRet.filter.x[2] (# 12)
-     38     0     3 TPreHeaCoi.T (# 13)
-     30     0     1 TRet.T (# 14)
-     38     0     3 TMix.T (# 15)
-     80     0     0 TCoiCoo.T (# 16)
-    305    22   275 cor.vavHot.filter.x[1] (# 18)
+<p>Then, when a model is translated, for example using</p>
+<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>translateModel(&quot;Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop&quot;);
 </pre></div>
 </div>
-<p>Hence, the state variables</p>
-<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>13555 13201 19064 fanSupHot.filter.x[1] (#  7)
-11905  2170 12394 fanSupHot.filter.x[2] (#  8)
-  400    47   419 fanSupCol.filter.x[1] (#  9)
-  420    71   521 fanSupCol.filter.x[2] (# 10)
- 5082  2736  6732 fanRet.filter.x[1] (# 11)
- 1979    25  4974 fanRet.filter.x[2] (# 12)
+<p>an output of the form</p>
+<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>Start values for iteration variables:
+ val.res1.dp(start = 3000.0)
+ val.res3.dp(start = 3000.0)
 </pre></div>
 </div>
-<p>limit the step size significantly more often than other variables.
-Therefore, we removed these state variables
-by setting in the fan models the parameter <code class="docutils literal notranslate"><span class="pre">filteredSpeed=false</span></code>.
-After this change, the model simulates without problems.</p>
-</div>
-</div>
-<div class="section" id="numerical-solvers">
-<h2>2.9. Numerical solvers<a class="headerlink" href="#numerical-solvers" title="Permalink to this headline">¶</a></h2>
-<p>Dymola 2017 is configured to use dassl as a default solver with a tolerance of
-1E-4.
-We recommend to change this setting to radau with a tolerance of around
-1E-6, as this generally leads to faster and more robust
-simulation for thermo-fluid flow systems.</p>
-<p>Note that this is the error tolerance of the local integration time step.
-Most ordinary differential equation solvers only control the local
-integration error and not the global integration error.
-As a rule of thumb, the global integration error is one
-order of magnitude larger than the local integration error.
-However, the actual magnitude of the global integration error
-depends on the stability of the differential equation.
-As an extreme case, if a system is chaotic
-and uncontrolled, then the global integration error will grow rapidly.</p>
+<p>is produced. This shows the iteration variables and their start values.
+These start values can be overwritten in the model.</p>
 </div>
 </div>
 
@@ -1032,7 +791,7 @@ <h2>2.9. Numerical solvers<a class="headerlink" href="#numerical-solvers" title=
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/development.html b/Buildings/Resources/Documentation/userGuide/build/html/development.html
index c1b249c297c..86f1174d848 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/development.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/development.html
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -122,13 +119,22 @@
 <li><a class="reference internal" href="#">5. Development</a><ul>
 <li><a class="reference internal" href="#contributing">5.1. Contributing</a></li>
 <li><a class="reference internal" href="#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li><a class="reference internal" href="#adding-a-new-class">5.3. Adding a new class</a><ul>
-<li><a class="reference internal" href="#thermofluid-flow-device">5.3.1. Thermofluid flow device</a></li>
-<li><a class="reference internal" href="#pressure-drop">5.3.2. Pressure drop</a></li>
-<li><a class="reference internal" href="#control-sequences-using-the-control-description-language">5.3.3. Control Sequences using the Control Description Language</a></li>
+<li><a class="reference internal" href="#style-guide">5.3. Style guide</a><ul>
+<li><a class="reference internal" href="#general">5.3.1. General</a></li>
+<li><a class="reference internal" href="#type-declarations">5.3.2. Type declarations</a></li>
+<li><a class="reference internal" href="#equations-and-algorithms">5.3.3. Equations and algorithms</a></li>
+<li><a class="reference internal" href="#functions">5.3.4. Functions</a></li>
+<li><a class="reference internal" href="#package-order">5.3.5. Package order</a></li>
+<li><a class="reference internal" href="#documentation">5.3.6. Documentation</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#validation">5.4. Validation</a></li>
+<li><a class="reference internal" href="#adding-a-new-class">5.4. Adding a new class</a><ul>
+<li><a class="reference internal" href="#thermofluid-flow-device">5.4.1. Thermofluid flow device</a></li>
+<li><a class="reference internal" href="#pressure-drop">5.4.2. Pressure drop</a></li>
+<li><a class="reference internal" href="#control-sequences-using-the-control-description-language">5.4.3. Control sequences using the Control Description Language</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 </ul>
@@ -187,20 +193,14 @@ <h2>5.1. Contributing<a class="headerlink" href="#contributing" title="Permalink
 </div>
 <div class="section" id="guidelines-for-contributions">
 <span id="sec-dev-gui-con"></span><h2>5.2. Guidelines for contributions<a class="headerlink" href="#guidelines-for-contributions" title="Permalink to this headline">¶</a></h2>
-<p>Models that are contributed need to adhere to the following guidelines, as this is needed to integrate them in the library, make them accessible to users and further maintain them:</p>
+<p>Models, blocks and functions that are contributed need to adhere to the following guidelines, as this is needed to integrate them in the library, make them accessible to users and further maintain them:</p>
 <blockquote>
 <div><ul class="simple">
 <li><p>They should be of general interest to other users and well documented and tested.</p></li>
 <li><p>They need to follow the coding conventions described in</p>
 <ul>
-<<<<<<< HEAD
-<li><p>the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings library user guide</a>,</p></li>
-<li><p>the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/msl/3.2/help/Modelica_UsersGuide_Conventions.html#Modelica.UsersGuide.Conventions">Modelica Standard Library user guide</a>, and</p></li>
-<li><p>the <a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/wiki/Style-Guide">Buildings library style guide</a>.</p></li>
-=======
 <li><p>the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings library user guide</a> and</p></li>
 <li><p>the <cite>Style Guide</cite> provided in subsections of <a class="reference internal" href="#sec-sty-gui"><span class="std std-numref">Section 5.3</span></a></p></li>
->>>>>>> master
 </ul>
 </li>
 <li><p>They need to be made available under the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License">Modelica Buildings Library license</a>.</p></li>
@@ -211,8 +211,346 @@ <h2>5.1. Contributing<a class="headerlink" href="#contributing" title="Permalink
 </ul>
 </div></blockquote>
 </div>
+<div class="section" id="style-guide">
+<span id="sec-sty-gui"></span><h2>5.3. Style guide<a class="headerlink" href="#style-guide" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="general">
+<h3>5.3.1. General<a class="headerlink" href="#general" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li><p>Classes declared as <code class="docutils literal notranslate"><span class="pre">partial</span></code> and base classes that are not of interest to the user
+should be stored in a subdirectory called <code class="docutils literal notranslate"><span class="pre">BaseClasses</span></code>.
+Each other class, except for constants, must have an icon.</p></li>
+<li><p>Examples and validation models should be in directories such as <code class="docutils literal notranslate"><span class="pre">Valves.Examples</span></code> and
+<code class="docutils literal notranslate"><span class="pre">Valves.Validations</span></code>. A script for the regression tests must be added as described below.</p></li>
+<li><p>Do not copy sections of code. Use object inheritance.</p></li>
+<li><p>Implement components of fluid flow systems by extending the
+classes in <code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.Interfaces</span></code>.</p></li>
+<li><p>Use the full package names when instantiating a class.</p></li>
+<li><p>Models, functions and blocks must be implemented as
+one model, function or block per file. An exception are the <code class="docutils literal notranslate"><span class="pre">Buildings.Media</span></code> packages.</p></li>
+</ol>
+</div>
+<div class="section" id="type-declarations">
+<h3>5.3.2. Type declarations<a class="headerlink" href="#type-declarations" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic">
+<li><p>Declare all public parameters before protected ones.</p></li>
+<li><p>Declare variables and final parameters that are not of interest to
+users as protected.</p></li>
+<li><p>Set default parameter values as follows:</p>
+<ol class="arabic">
+<li><p>If a parameter value can range over a large region, do not provide a
+default value. Examples are nominal mass flow rates.</p></li>
+<li><p>If a parameter value does not vary significantly but need to be verified
+by the user, provide a default value by using its start attribute.
+For example, for a heat exchanger, use</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">parameter</span> <span class="nb">Real</span> <span class="n">eps</span><span class="p">(</span><span class="n">start</span><span class="o">=</span><span class="mf">0.8</span><span class="p">,</span> <span class="nb">min</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="nb">max</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span> <span class="n">unit</span><span class="o">=</span><span class="s2">&quot;1&quot;</span><span class="p">)</span>
+  <span class="s2">&quot;Heat exchanger effectiveness&quot;</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>Do not use <code class="docutils literal notranslate"><span class="pre">parameter</span> <span class="pre">Real</span> <span class="pre">eps=0.8</span></code> as this can lead to errors
+that are difficult to detect if a modeler forgets to overwrite
+the default value of <code class="docutils literal notranslate"><span class="pre">0.8</span></code> with the actual value. The model will simulate,
+but gives wrong results due to unsuited parameter values and there will be no warning.
+On the other hand, using <code class="docutils literal notranslate"><span class="pre">parameter</span> <span class="pre">Real</span> <span class="pre">eps(start=0.8)</span></code> will give a warning
+and hence users can assign better values.</p>
+</li>
+<li><p>If a parameter value can be precomputed based on other parameters,
+set its value to this equation. For example,</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">parameter</span> <span class="n">Medium</span><span class="o">.</span><span class="n">MassFlowRate</span> <span class="n">m_flow_small</span><span class="p">(</span><span class="nb">min</span><span class="o">=</span><span class="mi">0</span><span class="p">)</span> <span class="o">=</span> <span class="mf">1E-4</span><span class="o">*</span><span class="n">m_flow_nominal</span>
+<span class="o">...</span>
+</pre></div>
+</div>
+</li>
+<li><p>If a parameter assignment should not be changed by a user,
+use the <code class="docutils literal notranslate"><span class="pre">final</span></code> keyword.</p></li>
+</ol>
+</li>
+<li><p>For parameters and variables, provide values for the <code class="docutils literal notranslate"><span class="pre">min</span></code> and
+<code class="docutils literal notranslate"><span class="pre">max</span></code> attribute where applicable.
+Be aware, that these bounds are not enforced by the simulator.
+If the <code class="docutils literal notranslate"><span class="pre">min</span></code> and <code class="docutils literal notranslate"><span class="pre">max</span></code> attribute are set, each violation of these bounds
+during the simulation may raise a warning.</p>
+<p>Simulators may allow to suppress these warnings. In Dymola, violation of
+bounds can be checked using</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">Advanced</span><span class="o">.</span><span class="n">AssertAllInsideMinMax</span><span class="o">=</span><span class="n">true</span><span class="p">;</span>
+</pre></div>
+</div>
+</li>
+<li><p>For any variable or parameter that may need to be solved numerically,
+provide a value for the <code class="docutils literal notranslate"><span class="pre">start</span></code> and <code class="docutils literal notranslate"><span class="pre">nominal</span></code> attribute.</p></li>
+<li><p>Use types from <code class="docutils literal notranslate"><span class="pre">Modelica.SIunits</span></code> where possible,
+except in the package <code class="docutils literal notranslate"><span class="pre">Buildings.Controls.OBC</span></code> where the units should be declared
+as shown in <a class="reference internal" href="#cod-uni-dec-cdl"><span class="std std-numref">Listing 5.1</span></a>.</p></li>
+</ol>
+</div>
+<div class="section" id="equations-and-algorithms">
+<h3>5.3.3. Equations and algorithms<a class="headerlink" href="#equations-and-algorithms" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic">
+<li><p>Avoid events where possible.</p></li>
+<li><p>Only divide by quantities that cannot take on zero. For example, if
+<code class="docutils literal notranslate"><span class="pre">x</span></code> may take on zero, use <code class="docutils literal notranslate"><span class="pre">y=x</span></code>, not <code class="docutils literal notranslate"><span class="pre">1=y/x</span></code>, as the second
+version indicates to a simulator that it is safe to divide by <code class="docutils literal notranslate"><span class="pre">x</span></code>.</p></li>
+<li><p>Use the <code class="docutils literal notranslate"><span class="pre">assert</span></code> function together with <code class="docutils literal notranslate"><span class="pre">&quot;In</span> <span class="pre">&quot;</span> <span class="pre">+</span> <span class="pre">getInstanceName()</span> <span class="pre">+</span> <span class="pre">&quot;:...</span></code>
+to check for invalid values of parameters or variables. For example, use</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="nb">assert</span><span class="p">(</span><span class="n">phi</span><span class="o">&gt;=</span><span class="mi">0</span><span class="p">,</span> <span class="s2">&quot;In &quot;</span> <span class="o">+</span> <span class="nb">getInstanceName</span><span class="p">()</span> <span class="o">+</span> <span class="s2">&quot;: Relative humidity must not be negative.&quot;</span><span class="p">);</span>
+</pre></div>
+</div>
+<p>Note the use of <code class="docutils literal notranslate"><span class="pre">getInstanceName()</span></code>, which will write the instance name as part of the error message.
+Otherwise, OPTIMICA will not write the instance name.</p>
+</li>
+<li><p>Use either graphical modeling or textual code. When using graphical
+schematic modeling, do not add textual equations. For example, avoid
+the following, as on the graphical editor, the model looks appears
+to be singular:</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">model</span> <span class="nc">Avoid</span>
+  <span class="n">Modelica</span><span class="o">.</span><span class="n">Blocks</span><span class="o">.</span><span class="n">Continuous</span><span class="o">.</span><span class="n">Integrator</span> <span class="n">integrator</span> <span class="s2">&quot;Integrator&quot;</span>
+    <span class="kr">annotation</span> <span class="p">(</span><span class="n">Placement</span><span class="p">(</span><span class="n">transformation</span><span class="p">(</span><span class="n">extent</span><span class="o">=</span><span class="p">{{</span><span class="o">-</span><span class="mi">10</span><span class="p">,</span><span class="o">-</span><span class="mi">10</span><span class="p">},{</span><span class="mi">10</span><span class="p">,</span><span class="mi">10</span><span class="p">}})));</span>
+  <span class="kr">equation</span>
+  <span class="n">integrator</span><span class="o">.</span><span class="n">u</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span>
+<span class="kr">end</span> <span class="nc">Avoid</span><span class="p">;</span>
+</pre></div>
+</div>
+</li>
+<li><p>For computational efficiency, equations shall were possible be
+differentiable and have a continuous first derivative.</p></li>
+<li><p>Avoid equations where the first derivative with respect to another
+variable is zero. For example, avoid</p>
+<div class="math notranslate nohighlight">
+\[\begin{split}f(x) = \begin{cases}
+  0, &amp; \text{for } x &lt; 0 \\
+  x^2, &amp; \text{otherwise.}
+    \end{cases}\end{split}\]</div>
+<p>because any <span class="math notranslate nohighlight">\(x \le 0\)</span> is a solution, which
+can cause instability in the solver.
+Note that this problem do not exist for functions that assign a value
+to a constant as these will be evaluated during the model translation.</p>
+</li>
+<li><p>Do not replace an equation by a constant for a single value, unless
+the derivative of the original equation is zero for this value. For
+example, if computing a pressure drop <code class="docutils literal notranslate"><span class="pre">dp</span></code> may involve computing a
+long equation, but one knows that the result is always zero if the
+volume flow rate <code class="docutils literal notranslate"><span class="pre">V_flow</span></code> is zero, one may be inclined to use a
+construct of the form</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">dp</span> <span class="o">=</span> <span class="nb">smooth</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="kr">if</span> <span class="n">V_flow</span> <span class="o">==</span> <span class="mi">0</span> <span class="kr">then</span> <span class="mi">0</span> <span class="kr">else</span> <span class="n">f</span><span class="p">(</span><span class="n">V_flow</span><span class="p">));</span>
+</pre></div>
+</div>
+<p>The problem with this formulation is that for <code class="docutils literal notranslate"><span class="pre">V_flow=0</span></code>, the
+derivative is <code class="docutils literal notranslate"><span class="pre">dp/dV_flow</span> <span class="pre">=</span> <span class="pre">0</span></code>. However, the limit <code class="docutils literal notranslate"><span class="pre">dp/dV_flow</span></code>,
+as <code class="docutils literal notranslate"><span class="pre">|V_flow|</span></code> tends to zero, may be non-zero. Hence, the first
+derivative has a discontinuity at <code class="docutils literal notranslate"><span class="pre">V_flow=0</span></code>, which can cause a
+solver to fail to solve the equation because the <code class="docutils literal notranslate"><span class="pre">smooth</span></code>
+statement declared that the first derivative exists and is
+continuous.</p>
+</li>
+<li><p>Make sure that the derivatives of equations are bounded on compact
+sets. For example, instead of using <code class="docutils literal notranslate"><span class="pre">y=sign(x)</span> <span class="pre">*</span> <span class="pre">sqrt(abs(x))</span></code>,
+approximate the equation with a differentiable function that has a
+finite derivative near zero. Use functions form
+<code class="docutils literal notranslate"><span class="pre">Buildings.Utilities.Math</span></code> for this approximation.</p></li>
+<li><p>Whenever possible, a Modelica tool should not have to do numerical
+differentiation. For example, in Dymola, if your model translation
+log shows</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">Number</span> <span class="n">of</span> <span class="n">numerical</span> <span class="n">Jacobians</span><span class="p">:</span> <span class="mi">1</span>
+</pre></div>
+</div>
+<p>(or any number other than zero), then enter on the command line</p>
+<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">Hidden</span><span class="o">.</span><span class="n">PrintFailureToDifferentiate</span> <span class="o">=</span> <span class="n">true</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>Next, translate the model again to see what functions cannot be
+differentiated symbolically. Then, implement symbolic derivatives for
+this function.
+See <a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/wiki/Function-Derivatives">implementation of function derivatives</a>.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="functions">
+<h3>5.3.4. Functions<a class="headerlink" href="#functions" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li><p>Use the <code class="docutils literal notranslate"><span class="pre">smoothOrder</span></code> annotation if a function is differentiable.</p></li>
+<li><p>If a function is invertible, also implement its inverse function and
+use the <code class="docutils literal notranslate"><span class="pre">inverse</span></code> annotation. See
+<code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.BaseClasses.FlowModels</span></code> for an example.</p></li>
+<li><p>If a model allows a linearized implementation of an equation, then
+implement the linearized equation in an <code class="docutils literal notranslate"><span class="pre">equation</span></code> section and not
+in the <code class="docutils literal notranslate"><span class="pre">algorithm</span></code> section of a <code class="docutils literal notranslate"><span class="pre">function</span></code>. Otherwise, a symbolic
+processor cannot invert the linear equation, which can lead to
+coupled systems of equations. See
+<code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.BaseClasses.FlowModels</span></code> for an example.</p></li>
+</ol>
+</div>
+<div class="section" id="package-order">
+<h3>5.3.5. Package order<a class="headerlink" href="#package-order" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic">
+<li><p>Packages are first sorted alphabetically by the function
+<code class="docutils literal notranslate"><span class="pre">_sort_package_order</span></code>. That function is part of BuildingsPy
+and can be invoked as</p>
+<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">buildingspy.development.refactor</span> <span class="kn">as</span> <span class="nn">r</span>
+<span class="n">r</span><span class="o">.</span><span class="n">write_package_order</span><span class="p">(</span><span class="s2">&quot;.&quot;</span><span class="p">,</span> <span class="bp">True</span><span class="p">)</span>
+</pre></div>
+</div>
+</li>
+<li><p>After alphabetical sorting, the following packages, if they exist,
+are moved to the front:</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Tutorial</span>
+<span class="n">UsersGuide</span>
+</pre></div>
+</div>
+<p>and the following packages, if they exist, are moved to the end:</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Data</span>
+<span class="n">Types</span>
+<span class="n">Examples</span>
+<span class="n">Validation</span>
+<span class="n">Benchmarks</span>
+<span class="n">Experimental</span>
+<span class="n">Interfaces</span>
+<span class="n">BaseClasses</span>
+<span class="n">Internal</span>
+<span class="n">Obsolete</span>
+</pre></div>
+</div>
+<p>The remaining classes are ordered as follows and inserted between the above list:
+First, models, blocks and records are listed, then functions, and then packages.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="documentation">
+<h3>5.3.6. Documentation<a class="headerlink" href="#documentation" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic">
+<li><p>Add a description string to all parameters and variables, including
+protected ones.</p></li>
+<li><p>Group similar variables using the <code class="docutils literal notranslate"><span class="pre">group</span></code> and <code class="docutils literal notranslate"><span class="pre">tab</span></code> annotation.
+For example, use</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">parameter</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">SIunits</span><span class="o">.</span><span class="n">Time</span> <span class="n">tau</span> <span class="o">=</span> <span class="mi">60</span>
+  <span class="s2">&quot;Time constant at nominal flow&quot;</span>
+  <span class="kr">annotation</span> <span class="p">(</span><span class="n">Dialog</span><span class="p">(</span><span class="n">group</span><span class="o">=</span><span class="s2">&quot;Nominal condition&quot;</span><span class="p">));</span>
+</pre></div>
+</div>
+<p>or use</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">parameter</span> <span class="n">Types</span><span class="o">.</span><span class="n">Dynamics</span> <span class="n">substanceDynamics</span><span class="o">=</span><span class="n">energyDynamics</span>
+  <span class="s2">&quot;Formulation of substance balance&quot;</span>
+  <span class="kr">annotation</span><span class="p">(</span><span class="n">Evaluate</span><span class="o">=</span><span class="kc">true</span><span class="p">,</span> <span class="n">Dialog</span><span class="p">(</span><span class="n">tab</span> <span class="o">=</span> <span class="s2">&quot;Assumptions&quot;</span><span class="p">,</span> <span class="n">group</span><span class="o">=</span><span class="s2">&quot;Dynamics&quot;</span><span class="p">));</span>
+</pre></div>
+</div>
+</li>
+<li><p>Add model documentation to the <code class="docutils literal notranslate"><span class="pre">info</span></code> section. This applies to validation tests as well. To document
+equations, use the format</p>
+<div class="highlight-html notranslate"><div class="highlight"><pre><span></span><span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+The polynomial has the form
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span> <span class="na">align</span><span class="o">=</span><span class="s">&quot;center&quot;</span> <span class="na">style</span><span class="o">=</span><span class="s">&quot;font-style:italic;&quot;</span><span class="p">&gt;</span>
+y = a<span class="p">&lt;</span><span class="nt">sub</span><span class="p">&gt;</span>1<span class="p">&lt;/</span><span class="nt">sub</span><span class="p">&gt;</span> + a<span class="p">&lt;</span><span class="nt">sub</span><span class="p">&gt;</span>2<span class="p">&lt;/</span><span class="nt">sub</span><span class="p">&gt;</span> x + a<span class="p">&lt;</span><span class="nt">sub</span><span class="p">&gt;</span>3<span class="p">&lt;/</span><span class="nt">sub</span><span class="p">&gt;</span> x<span class="p">&lt;</span><span class="nt">sup</span><span class="p">&gt;</span>2<span class="p">&lt;/</span><span class="nt">sup</span><span class="p">&gt;</span> + ...,
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+where <span class="p">&lt;</span><span class="nt">i</span><span class="p">&gt;</span>a<span class="p">&lt;</span><span class="nt">sub</span><span class="p">&gt;</span>1<span class="p">&lt;/</span><span class="nt">sub</span><span class="p">&gt;&lt;/</span><span class="nt">i</span><span class="p">&gt;</span> is ...
+</pre></div>
+</div>
+<p>To denote time derivatives, such as for mass flow rate,
+use <code class="docutils literal notranslate"><span class="pre">&lt;code&gt;m&amp;#775;&lt;/code&gt;</span></code>.</p>
+<p>To refer to parameters of the model, use the <code class="docutils literal notranslate"><span class="pre">&lt;code&gt;...&lt;/code&gt;</span></code> section as in</p>
+<div class="highlight-html notranslate"><div class="highlight"><pre><span></span>To linearize the equation, set <span class="p">&lt;</span><span class="nt">code</span><span class="p">&gt;</span>linearize=true<span class="p">&lt;/</span><span class="nt">code</span><span class="p">&gt;</span>.
+</pre></div>
+</div>
+<p>To format tables, use</p>
+<div class="highlight-html notranslate"><div class="highlight"><pre><span></span><span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">table</span> <span class="na">summary</span><span class="o">=</span><span class="s">&quot;summary&quot;</span> <span class="na">border</span><span class="o">=</span><span class="s">&quot;1&quot;</span> <span class="na">cellspacing</span><span class="o">=</span><span class="s">&quot;0&quot;</span> <span class="na">cellpadding</span><span class="o">=</span><span class="s">&quot;2&quot;</span> <span class="na">style</span><span class="o">=</span><span class="s">&quot;border-collapse:collapse;&quot;</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">tr</span><span class="p">&gt;&lt;</span><span class="nt">th</span><span class="p">&gt;</span>Header 1<span class="p">&lt;/</span><span class="nt">th</span><span class="p">&gt;</span>       <span class="p">&lt;</span><span class="nt">th</span><span class="p">&gt;</span>Header 2<span class="p">&lt;/</span><span class="nt">th</span><span class="p">&gt;</span>     <span class="p">&lt;/</span><span class="nt">tr</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">tr</span><span class="p">&gt;&lt;</span><span class="nt">td</span><span class="p">&gt;</span>Data 1<span class="p">&lt;/</span><span class="nt">td</span><span class="p">&gt;</span>         <span class="p">&lt;</span><span class="nt">td</span><span class="p">&gt;</span>Data 2<span class="p">&lt;/</span><span class="nt">td</span><span class="p">&gt;</span>       <span class="p">&lt;/</span><span class="nt">tr</span><span class="p">&gt;</span>
+<span class="p">&lt;/</span><span class="nt">table</span><span class="p">&gt;</span>
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+</pre></div>
+</div>
+<p>To include figures, place the figure into a directory in
+<code class="docutils literal notranslate"><span class="pre">Buildings/Resources/Images/</span></code> that has the same name as the full
+package. For example, use</p>
+<div class="highlight-html notranslate"><div class="highlight"><pre><span></span><span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span> <span class="na">align</span><span class="o">=</span><span class="s">&quot;center&quot;</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">img</span> <span class="na">alt</span><span class="o">=</span><span class="s">&quot;Image of ...&quot;</span>
+<span class="na">src</span><span class="o">=</span><span class="s">&quot;modelica://Buildings/Resources/Images/Fluid/FixedResistances/FixedResistanceDpM.png&quot;</span><span class="p">/&gt;</span>
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+</pre></div>
+</div>
+<p>To create new figures, put the source file for the figure,
+preferably in <code class="docutils literal notranslate"><span class="pre">svg</span></code> format, in the same directory as the <code class="docutils literal notranslate"><span class="pre">png</span></code>
+file. <code class="docutils literal notranslate"><span class="pre">svg</span></code> files can be created with <a class="reference external" href="https://inkscape.org/">https://inkscape.org/</a>, which
+works on any operating system. See for example the file in
+<code class="docutils literal notranslate"><span class="pre">Resources/Images/Examples/Tutorial/SpaceCooling/schematics.svg</span></code>.</p>
+</li>
+<li><p>Add author information to the <code class="docutils literal notranslate"><span class="pre">revision</span></code> section.</p></li>
+<li><p>Run a spell check.</p></li>
+<li><p>Start headings with <code class="docutils literal notranslate"><span class="pre">&lt;h4&gt;</span></code>.</p></li>
+<li><p>Add hyperlinks to other models using their full name. For example,
+use</p>
+<div class="highlight-html notranslate"><div class="highlight"><pre><span></span>See
+<span class="p">&lt;</span><span class="nt">a</span> <span class="na">href</span><span class="o">=</span><span class="s">&quot;modelica://Buildings.Fluid.Sensors.Density&quot;</span><span class="p">&gt;</span>
+Buildings.Fluid.Sensors.Density<span class="p">&lt;/</span><span class="nt">a</span><span class="p">&gt;</span>.
+</pre></div>
+</div>
+</li>
+<li><p>Add a default component name, such as</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="kr">annotation</span><span class="p">(</span><span class="n">defaultComponentName</span><span class="o">=</span><span class="s2">&quot;senDen&quot;</span><span class="p">,</span> <span class="o">...</span>
+</pre></div>
+</div>
+<p>to objects that will be used as drag and drop elements, as this
+automatically assigns them this name.</p>
+</li>
+<li><p>Keep the line length to no more than around 80 characters.</p></li>
+<li><p>For complex packages, provide a User’s Guide, and reference the
+User’s Guide in <code class="docutils literal notranslate"><span class="pre">Buildings.UsersGuide</span></code>.</p></li>
+<li><p>Use the string <code class="docutils literal notranslate"><span class="pre">fixme</span></code> within development branches to mark passages
+that still need to be revised (e.g., to improve code or to fix bugs).
+Before merging a branch into the master, all <code class="docutils literal notranslate"><span class="pre">fixme</span></code> strings must
+be removed. Within the master branch, no <code class="docutils literal notranslate"><span class="pre">fixme</span></code> are allowed.</p></li>
+<li><p>A suggested template for the documentation of classes is below.
+Except for the short introduction, the sections are optional.</p>
+<div class="highlight-html notranslate"><div class="highlight"><pre><span></span><span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+A short introduction.
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>Main equations<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+xxx
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>Assumption and limitations<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+xxx
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>Typical use and important parameters<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+xxx
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>Options<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+xxx
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>Dynamics<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+Describe which states and dynamics are present in the model
+and which parameters may be used to influence them.
+This need not be added in partial classes.
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>Validation<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+Describe whether the validation was done using
+analytical validation, comparative model validation
+or empirical validation.
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>Implementation<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+xxx
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">h4</span><span class="p">&gt;</span>References<span class="p">&lt;/</span><span class="nt">h4</span><span class="p">&gt;</span>
+<span class="p">&lt;</span><span class="nt">p</span><span class="p">&gt;</span>
+Add references, if applicable.
+<span class="p">&lt;/</span><span class="nt">p</span><span class="p">&gt;</span>
+</pre></div>
+</div>
+</li>
+<li><p>Always use lower case html tags.</p></li>
+</ol>
+</div>
+</div>
 <div class="section" id="adding-a-new-class">
-<h2>5.3. Adding a new class<a class="headerlink" href="#adding-a-new-class" title="Permalink to this headline">¶</a></h2>
+<h2>5.4. Adding a new class<a class="headerlink" href="#adding-a-new-class" title="Permalink to this headline">¶</a></h2>
 <p>Adding a new class, such as a model or a function, is usually easiest by extending, or copying and modifying, an existing class.
 In many cases, the similar component already exists.
 In this situation, it is recommended to copy and modify a similar component.
@@ -221,7 +559,7 @@ <h2>5.3. Adding a new class<a class="headerlink" href="#adding-a-new-class" titl
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a>.</p>
 <p>The next sections give guidance that is specific to the implementation of thermofluid flow devices, pressure drop models and control sequences.</p>
 <div class="section" id="thermofluid-flow-device">
-<h3>5.3.1. Thermofluid flow device<a class="headerlink" href="#thermofluid-flow-device" title="Permalink to this headline">¶</a></h3>
+<h3>5.4.1. Thermofluid flow device<a class="headerlink" href="#thermofluid-flow-device" title="Permalink to this headline">¶</a></h3>
 <p>To add a component of a thermofluid flow device, the package
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Interfaces.html">Buildings.Fluid.Interface</a>  contains basic classes that can be extended.
 See <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide">Buildings.Fluid.Interface.UsersGuide</a> for a description of these classes.
@@ -237,7 +575,7 @@ <h3>5.3.1. Thermofluid flow device<a class="headerlink" href="#thermofluid-flow-
 </dd>
 </dl>
 <div class="figure align-default" id="id2">
-<span id="fig-merkel"></span><a class="reference internal image-reference" href="_images/Merkel.png"><img alt="_images/Merkel.png" src="_images/Merkel.png" style="width: 546.7px; height: 369.90000000000003px;" /></a>
+<span id="fig-merkel"></span><a class="reference internal image-reference" href="_images/Merkel.svg"><img alt="_images/Merkel.svg" src="_images/Merkel.svg" width="700px" /></a>
 <p class="caption"><span class="caption-number">Fig. 5.1 </span><span class="caption-text">Schematic diagram of the cooling tower model based on the Merkel theory.</span><a class="headerlink" href="#id2" title="Permalink to this image">¶</a></p>
 </div>
 <p>If models involve complex calculations, then these models are generally easiest to understand
@@ -250,7 +588,7 @@ <h3>5.3.1. Thermofluid flow device<a class="headerlink" href="#thermofluid-flow-
 water mass flow rate <cite>mWat_flow</cite>.</p>
 </div>
 <div class="section" id="pressure-drop">
-<h3>5.3.2. Pressure drop<a class="headerlink" href="#pressure-drop" title="Permalink to this headline">¶</a></h3>
+<h3>5.4.2. Pressure drop<a class="headerlink" href="#pressure-drop" title="Permalink to this headline">¶</a></h3>
 <p>When implementing equations for pressure drop, it is recommended
 to expand the base class
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_BaseClasses.html#Buildings.Fluid.BaseClasses.PartialResistance">Buildings.Fluid.BaseClasses.PartialResistance</a>.
@@ -294,7 +632,7 @@ <h3>5.3.2. Pressure drop<a class="headerlink" href="#pressure-drop" title="Perma
 This often reduces the size of the system of nonlinear equations.</p>
 </div>
 <div class="section" id="control-sequences-using-the-control-description-language">
-<h3>5.3.3. Control Sequences using the Control Description Language<a class="headerlink" href="#control-sequences-using-the-control-description-language" title="Permalink to this headline">¶</a></h3>
+<h3>5.4.3. Control sequences using the Control Description Language<a class="headerlink" href="#control-sequences-using-the-control-description-language" title="Permalink to this headline">¶</a></h3>
 <p>To implement reusable control sequences, such as done within
 the <a class="reference external" href="https://obc.lbl.gov">OpenBuildingControl</a> project, the
 sequences need to comply with the
@@ -303,36 +641,48 @@ <h3>5.3.3. Control Sequences using the Control Description Language<a class="hea
 <ol class="arabic">
 <li><p>The naming of parameters, inputs, outputs and instances must follow the naming
 conventions in
-<<<<<<< HEAD
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings.UsersGuide.Conventions</a>.</p></li>
-<li><p>Each block must have an <code class="docutils literal notranslate"><span class="pre">info</span></code> section that explains its functionality.
-In this <code class="docutils literal notranslate"><span class="pre">info</span></code> section, names of <code class="docutils literal notranslate"><span class="pre">parameters</span></code>, <code class="docutils literal notranslate"><span class="pre">inputs</span></code> and <code class="docutils literal notranslate"><span class="pre">outputs</span></code>
-need to be referenced using the html <code class="docutils literal notranslate"><span class="pre">&lt;code&gt;...&lt;/code&gt;</span></code> element.
-In the <code class="docutils literal notranslate"><span class="pre">info</span></code> section, units need to be provided in SI units, or in dual units. For SI units,
-use Kelvin for temperature <em>differences</em> and degree Celsius for actual temperatures.</p></li>
-=======
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings.UsersGuide.Conventions</a>.
 Avoid providing duplicate information in the instance name, for example if the block is within the <code class="docutils literal notranslate"><span class="pre">Boilers</span></code> package,
 the instance name must not contain <code class="docutils literal notranslate"><span class="pre">boi</span></code>. Ensure that the instance name is unambiguous when viewed in a top level
 controller block.
 Consider whether the block can be used to control other equipment as well, and if so, make sure the instance name
 is also applicable for these applications.</p></li>
->>>>>>> master
 <li><p>Parameters that can be grouped together, such as parameters relating to temperature setpoints
 or to the configuration of the trim and respond logic, should be grouped together with the
 <code class="docutils literal notranslate"><span class="pre">Dialog(group=STRING))</span></code> annotation. See for example
 <a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/blob/94d5919dbe1b2f2e317e7b69800f3b3ad07be930/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo">G36_PR1.TerminalUnits.Controller</a>.
 Do not use <code class="docutils literal notranslate"><span class="pre">Dialog(tab=STRING))</span></code>, unless the parameter is declared with a default value
-and this parameter and its value is of no interest to typical users.</p></li>
-<li><p>Each block must have a <code class="docutils literal notranslate"><span class="pre">defaultComponentName</span></code> annotation.</p></li>
+and is of no interest to typical users.</p></li>
+<li><p>In the source code, the instances must be ordered as follows:</p>
+<blockquote>
+<div><ul class="simple">
+<li><p>First, list <cite>Boolean</cite> parameters,, then <cite>Integer</cite> parameters and then <cite>Real</cite> parameters.</p></li>
+<li><p>Next, list inputs, then outputs, followed by blocks.</p></li>
+<li><p>Protected instances are below all the public instances and follow the same instance ordering rules.</p></li>
+<li><p>Within the above order, list scalar values before arrays,
+but prioritize groupings based on model specific similarities.</p></li>
+</ul>
+</div></blockquote>
+</li>
+<li><p>Each block must have a <code class="docutils literal notranslate"><span class="pre">defaultComponentName</span></code> annotation and a <code class="docutils literal notranslate"><span class="pre">%name</span></code> label placed above the icon.
+See for example the <a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/blob/64f35506a2b725e071a900a90e3fa3a291a48dca/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo#L21">CDL.Continuous.Constant</a>
+block.</p></li>
 <li><p>To aid readability, the formatting of the Modelica source code file must be consistent with other
 implemented blocks, e.g., use two spaces for indentation (no tabulators),
-assign each parameter value on a new line, list first all parameters, then all inputs, all
-outputs, and finally all instances of other blocks.
+assign each parameter value on a new line. It is recommended to add an empty line between instances.
 See for example
 <a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/blob/94d5919dbe1b2f2e317e7b69800f3b3ad07be930/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ExhaustDamper.mo">G36_PR1.AHUs.SingleZone.VAV.SetPoints.ExhaustDamper</a>.</p></li>
 <li><p>For parameters, where generally valid values can be provided, provide them
 as default values.</p></li>
+<li><p>Add comments to all instances. The comments should be concise. The comments
+should not contain redundant information and must not contain hard coded parameters as those can change.
+If the functionality of an instance is obvious the developer may use
+comments that closely resemble the class names, such as “Logical And�.</p></li>
+<li><p>Each block must have an <code class="docutils literal notranslate"><span class="pre">info</span></code> section that explains its functionality.
+In this <code class="docutils literal notranslate"><span class="pre">info</span></code> section, names of <code class="docutils literal notranslate"><span class="pre">parameters</span></code>, <code class="docutils literal notranslate"><span class="pre">inputs</span></code> and <code class="docutils literal notranslate"><span class="pre">outputs</span></code>
+need to be referenced using the html <code class="docutils literal notranslate"><span class="pre">&lt;code&gt;...&lt;/code&gt;</span></code> element.
+In the <code class="docutils literal notranslate"><span class="pre">info</span></code> section, units need to be provided in SI units, or in dual units. For SI units,
+use Kelvin for temperature <em>differences</em> and degree Celsius for actual temperatures.</p></li>
 <li><p>For PI controllers, normalize the inputs for setpoint and measured value so
 that the control error is of the order of one.
 As control errors for temperature tracking are usually in the order of one,
@@ -342,7 +692,7 @@ <h3>5.3.3. Control Sequences using the Control Description Language<a class="hea
 <li><p>Never use an inequality comparison without a hysteresis or a time delay if the variable that is used in the inequality test
 is computed using an iterative solver, or is obtained from a measurement and hence can contain measurement noise.
 An exception is a sampled value because the output of a sampler remains constant until the next sampling instant.
-See <a class="reference internal" href="bestPractice.html#sec-bes-pra-con"><span class="std std-numref">Section 2.7</span></a>.</p></li>
+See <a class="reference internal" href="bestPractice.html#sec-bes-pra-con"><span class="std std-numref">Section 2.5</span></a>.</p></li>
 <li><p>CDL uses the following units, which also need to be used in controllers, including
 their parameters:</p>
 <table class="docutils align-default">
@@ -395,6 +745,8 @@ <h3>5.3.3. Control Sequences using the Control Description Language<a class="hea
 <p>Hence, for example, a controller that takes as an input a temperature and a temperature difference
 and produces as an output a damper position signal, use a declaration such as shown in the code snippet below
 in which graphical annotations are omitted.</p>
+<div class="literal-block-wrapper docutils container" id="cod-uni-dec-cdl">
+<div class="code-block-caption"><span class="caption-number">Listing 5.1 </span><span class="caption-text">Unit declaration for CDL.</span><a class="headerlink" href="#cod-uni-dec-cdl" title="Permalink to this code">¶</a></div>
 <div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Buildings</span><span class="o">.</span><span class="n">Controls</span><span class="o">.</span><span class="n">OBC</span><span class="o">.</span><span class="n">CDL</span><span class="o">.</span><span class="n">Interfaces</span><span class="o">.</span><span class="n">RealInput</span> <span class="n">TZon</span><span class="p">(</span>
   <span class="kr">final</span> <span class="n">unit</span><span class="o">=</span><span class="s2">&quot;K&quot;</span><span class="p">,</span>
   <span class="n">displayUnit</span><span class="o">=</span><span class="s2">&quot;degC&quot;</span><span class="p">)</span> <span class="s2">&quot;Measured zone air temperature&quot;</span><span class="p">;</span>
@@ -403,55 +755,74 @@ <h3>5.3.3. Control Sequences using the Control Description Language<a class="hea
   <span class="kr">final</span> <span class="n">unit</span><span class="o">=</span><span class="s2">&quot;K&quot;</span><span class="p">)</span> <span class="s2">&quot;Temperature difference supply air minus exhaust air&quot;</span><span class="p">;</span>
 
 <span class="n">Buildings</span><span class="o">.</span><span class="n">Controls</span><span class="o">.</span><span class="n">OBC</span><span class="o">.</span><span class="n">CDL</span><span class="o">.</span><span class="n">Interfaces</span><span class="o">.</span><span class="n">RealOutput</span> <span class="n">yDam</span><span class="p">(</span>
-  <span class="nb">min</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span>
-  <span class="nb">max</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
+  <span class="kr">final</span> <span class="nb">min</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span>
+  <span class="kr">final</span> <span class="nb">max</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
   <span class="kr">final</span> <span class="n">unit</span><span class="o">=</span><span class="s2">&quot;1&quot;</span><span class="p">)</span> <span class="s2">&quot;Exhaust damper position&quot;</span><span class="p">;</span>
 </pre></div>
 </div>
-<p>Here, units are declared as <code class="docutils literal notranslate"><span class="pre">final</span></code> to avoid users to be able to change them, as
-a change in unit may cause the control logic to be incorrect.</p>
+</div>
 <p>Conversion of these units to non-SI units can be done programmatically by tools that
 process CDL.</p>
 </li>
+<li><p>Units, quantities and value limits must be declared as <code class="docutils literal notranslate"><span class="pre">final</span></code> to avoid users to be able to change them, as
+a change in unit may cause the control logic to be incorrect.</p></li>
 <li><p>If the block diagram does not fit into the drawing pane, enlarge the drawing pane rather
 than making the blocks smaller.</p></li>
+<li><p>The size of the icon should be such that it provides a good fit for all the input and output interfaces. The minimum
+recommended icon size is 100 by a 100. If there are many interfaces the icon size should be extended in vertical direction.
+Icons should be symmetrical with reference to the grid origin. E.g, the default specification is</p>
+<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Icon</span><span class="p">(</span>
+  <span class="n">coordinateSystem</span><span class="p">(</span>
+    <span class="n">preserveAspectRatio</span><span class="o">=</span><span class="kc">true</span><span class="p">,</span>
+    <span class="n">extent</span><span class="o">=</span><span class="p">{{</span><span class="o">-</span><span class="mi">100</span><span class="p">,</span><span class="o">-</span><span class="mi">100</span><span class="p">},{</span><span class="mi">100</span><span class="p">,</span><span class="mi">100</span><span class="p">}}))</span>
+</pre></div>
+</div>
+</li>
 <li><p>For simple, small controllers, provide a unit test in a <code class="docutils literal notranslate"><span class="pre">Validation</span></code> or <code class="docutils literal notranslate"><span class="pre">Examples</span></code> package
 that is in the hierarchy one level below the implemented controller.
-See <a class="reference internal" href="#sec-val"><span class="std std-numref">Section 5.4</span></a> for unit test implementation.
+See <a class="reference internal" href="#sec-val"><span class="std std-numref">Section 5.5</span></a> for unit test implementation.
 Because some control logic errors may only be noticed
 when used in a closed loop test,
 for equipment and system controllers, provide also closed loop examples that test the sequence
-for all modes of operation. If the closed loop examples include HVAC models, then put them
+for all modes of operation. If the closed loop examples include HVAC models, put them
 outside of the <code class="docutils literal notranslate"><span class="pre">Buildings.Controls.OBC</span></code> package.
 Make sure sequences are tested for all modes of operation, and as applicable, for winter, shoulder
 and summer days.</p></li>
+<li><p>For general rules on validation models see <a class="reference internal" href="#sec-val"><span class="std std-numref">Section 5.5</span></a>. If there are multiple instances of
+the validated block, preferably list them together as opposed to far apart in the Modelica file.</p></li>
+<li><p>Run the following command to detect various warnings, such as missing comments:</p>
+<blockquote>
+<div><div class="highlight-default notranslate"><div class="highlight"><pre><span></span>$ node app.js -f Buildings/Controls/OBC/ASHRAE/PrimarySystem/{path to package} -o json -m cdl
+</pre></div>
+</div>
+</div></blockquote>
+</li>
 </ol>
 </div>
 </div>
-<div class="section" id="validation">
-<span id="sec-val"></span><h2>5.4. Validation<a class="headerlink" href="#validation" title="Permalink to this headline">¶</a></h2>
-<p>All models that are implemented need to be validated for all
-realistic operating modes.
-These validations need to be part of the
-<a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/wiki/Unit-Tests">unit tests</a>.</p>
-<p>Add a couple of sentences that explain to others the intent of the unit test.
+<div class="section" id="validation-and-unit-tests">
+<span id="sec-val"></span><h2>5.5. Validation and unit tests<a class="headerlink" href="#validation-and-unit-tests" title="Permalink to this headline">¶</a></h2>
+<p>The developer that introduces a new model, block or a function must:</p>
+<ol class="arabic simple">
+<li><p>Implement at least one example or validation model that serves as a unit test for each model, block and function,
+and run the unit tests.
+Unit tests should cover all branches of <code class="docutils literal notranslate"><span class="pre">if-then</span></code> constructs and
+all realistic operating modes of the system represented by the model.</p></li>
+<li><p>In the <cite>info</cite> section of the validation model, describe to others the intent of the unit test.
 For example, an air handler unit controller test could describe
 “This model verifies that as the cooling load of the room increases, the controller
-first increases the mass flow rate setpoint and then reduces the supply temperature setpoint.�</p>
+first increases the mass flow rate setpoint and then reduces the supply temperature setpoint.�</p></li>
+</ol>
+<p>The validation models are part of automated unit tests as described at the
+<a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/wiki/Unit-Tests">unit tests wiki page</a>.</p>
 <p>For simple models, the validation can be against analytic solutions.
 This is for example done in
-<<<<<<< HEAD
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop">Buildings.Fluid.FixedResistances.PressureDrop</a>
-which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.
-For complex thermofluid flow devices, a comparative model validation needs to be done, for example
-=======
 <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop">Buildings.Fluid.FixedResistances.PressureDrop</a>
 which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.</p>
 <p>For complex thermofluid flow devices, a comparative model validation needs to be done, for example
->>>>>>> master
 by comparing the result of the Modelica model against the results from EnergyPlus.
 An example is
-<cite>Buildings.Fluid.HeatExchangers.CoolingTowers.Validation.MerkelEnergyPlus</cite>.
+<code class="docutils literal notranslate"><span class="pre">Buildings.Fluid.HeatExchangers.CoolingTowers.Validation.MerkelEnergyPlus</span></code>.
 For such validations, the following files also need to be added to the repository:</p>
 <blockquote>
 <div><ul>
@@ -470,7 +841,9 @@ <h3>5.3.3. Control Sequences using the Control Description Language<a class="hea
 be read by the Modelica data reader.</p></li>
 </ul>
 </div></blockquote>
-<p>See for example <cite>Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation</cite> for an implementation.</p>
+<p>See for example
+<a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/tree/master/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus">Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation</a>
+for an implementation.</p>
 </div>
 </div>
 
@@ -490,7 +863,7 @@ <h3>5.3.3. Control Sequences using the Control Description Language<a class="hea
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/disclaimer.html b/Buildings/Resources/Documentation/userGuide/build/html/disclaimer.html
index 3d1a03afb50..b14a9adb242 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/disclaimer.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/disclaimer.html
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -197,7 +194,7 @@ <h1>9. Disclaimers<a class="headerlink" href="#disclaimers" title="Permalink to
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/genindex.html b/Buildings/Resources/Documentation/userGuide/build/html/genindex.html
index 7a23a52b0e6..dd4b6b4fc68 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/genindex.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/genindex.html
@@ -66,9 +66,9 @@
       aria-labelledby="dLabelGlobalToc"><ul>
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -77,27 +77,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -250,7 +247,7 @@ <h2 id="V">V</h2>
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html b/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html
index 52dc503ed08..4852a2d38d4 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1 current"><a class="current reference internal" href="#">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -121,9 +118,9 @@
       aria-labelledby="dLabelLocalToc"><ul>
 <li><a class="reference internal" href="#">1. Getting Started</a><ul>
 <li><a class="reference internal" href="#literature-for-users">1.1. Literature for Users</a></li>
-<li><a class="reference internal" href="#literature-for-developers">1.2. Literature for Developers</a></li>
+<li><a class="reference internal" href="#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li><a class="reference internal" href="#software-requirements">1.3. Software Requirements</a></li>
-<li><a class="reference internal" href="#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li><a class="reference internal" href="#literature-for-developers">1.4. Literature for Developers</a></li>
 <li><a class="reference internal" href="#references">1.5. References</a></li>
 </ul>
 </li>
@@ -176,7 +173,7 @@
 <h2>1.1. Literature for Users<a class="headerlink" href="#literature-for-users" title="Permalink to this headline">¶</a></h2>
 <p>The following books are useful for new users to get started:</p>
 <ul class="simple">
-<li><p>The online book with interactive examples of Michael Tiller at <a class="reference external" href="http://book.xogeny.com/">http://book.xogeny.com/</a>.</p></li>
+<li><p>The online book with interactive examples of Michael Tiller at <a class="reference external" href="https://mbe.modelica.university/">https://mbe.modelica.university/</a>.</p></li>
 <li><p>The books by Michael Tiller <a class="reference internal" href="#til2001" id="id1"><span>[Til2001]</span></a> and Peter Fritzson (<a class="reference internal" href="#fri2011" id="id2"><span>[Fri2011]</span></a> and <a class="reference internal" href="#fri2004" id="id3"><span>[Fri2004]</span></a>).</p></li>
 <li><p>The tutorials that are listed at <a class="reference external" href="https://modelica.org/publications">https://modelica.org/publications</a>.</p></li>
 </ul>
@@ -190,25 +187,9 @@ <h2>1.1. Literature for Users<a class="headerlink" href="#literature-for-users"
 as well as tools for workflow automation.
 It also contains numerous examples that apply these technologies to the
 design and operation of building and community energy systems.</p>
-<p>An interactive web-based tour of Modelica is available at
-<a class="reference external" href="http://modelica.university/res/lesson/training.json">http://modelica.university/res/lesson/training.json</a>.</p>
-<p>Spoken tutorials for beginners are available at <a class="reference external" href="http://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&amp;search_language=English">http://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&amp;search_language=English</a>.</p>
-</div>
-<div class="section" id="literature-for-developers">
-<h2>1.2. Literature for Developers<a class="headerlink" href="#literature-for-developers" title="Permalink to this headline">¶</a></h2>
-<p>It is essential that users who develop new thermo-fluid models to  understand the concept of stream connectors. Stream connectors are explained in the Modelica language definition, available at <a class="reference external" href="https://www.modelica.org/documents">https://www.modelica.org/documents</a>, and in the paper Franke et al. <a class="reference internal" href="#fra2009a" id="id4"><span>[Fra2009a]</span></a>.
-The <cite>Buildings</cite> library uses similar modeling principles, and the same base classes, as the <cite>Modelica.Fluid</cite> library. Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid <a class="reference internal" href="#fra2009b" id="id5"><span>[Fra2009b]</span></a>.</p>
-<p>Xogeny’s <a class="reference external" href="http://modref.xogeny.com/">Modelica Web Reference</a> gives a concise overview, explanation and further links about the Modelica language.</p>
-</div>
-<div class="section" id="software-requirements">
-<h2>1.3. Software Requirements<a class="headerlink" href="#software-requirements" title="Permalink to this headline">¶</a></h2>
-<p>Check the software requirements for the different versions of the Buildings library at <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/download.html">https://simulationresearch.lbl.gov/modelica/download.html</a></p>
+<p>Spoken tutorials for beginners are available at <a class="reference external" href="https://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&amp;search_language=English">https://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&amp;search_language=English</a>.</p>
 </div>
 <div class="section" id="running-the-first-simulations">
-<<<<<<< HEAD
-<h2>1.4. Running the First Simulations<a class="headerlink" href="#running-the-first-simulations" title="Permalink to this headline">¶</a></h2>
-<p>To start using Modelica, run the example models of the <cite>Buildings</cite> library. Make variations in these examples by changing values of model parameters or by replacing existing component models by new ones. The example models can be found in the packages <cite>Examples</cite>, and detailed tutorials with step-by-step instructions for how to build system models can be found in the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_Tutorial.html">Tutorial package</a>.</p>
-=======
 <h2>1.2. Running the First Simulations<a class="headerlink" href="#running-the-first-simulations" title="Permalink to this headline">¶</a></h2>
 <p>To start using Modelica, run some of the example models of the <cite>Buildings</cite> library.
 Make variations in these examples by changing values of model parameters
@@ -216,7 +197,6 @@ <h2>1.2. Running the First Simulations<a class="headerlink" href="#running-the-f
 The example models can be found in the packages <cite>Examples</cite>.</p>
 <p>Study the detailed tutorials with step-by-step instructions for how to build system models,
 which can be found in the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_Tutorial.html">Tutorial package</a>.</p>
->>>>>>> master
 <p>Note that heat transfer models, which can be found in <cite>Buildings.HeatTransfer.*.Examples</cite> are easier to understand than fluid flow models because;</p>
 <ul class="simple">
 <li><p>handling fluid flow adds more complexity due to flow reversal (i.e., if the mass flow rate changes its direction),</p></li>
@@ -224,8 +204,6 @@ <h2>1.2. Running the First Simulations<a class="headerlink" href="#running-the-f
 <li><p>fluid flow models use packages that define medium models, such as dry air, moist air, water or other fluids.</p></li>
 </ul>
 </div>
-<<<<<<< HEAD
-=======
 <div class="section" id="software-requirements">
 <h2>1.3. Software Requirements<a class="headerlink" href="#software-requirements" title="Permalink to this headline">¶</a></h2>
 <p>Check the software requirements for the different versions of the Buildings library at <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/download.html">https://simulationresearch.lbl.gov/modelica/download.html</a></p>
@@ -240,7 +218,6 @@ <h2>1.4. Literature for Developers<a class="headerlink" href="#literature-for-de
 <p>The <a class="reference external" href="https://webref.modelica.university">Modelica Web Reference</a> gives a concise overview, explanation and further links about the Modelica language.</p>
 <p>See <a class="reference internal" href="development.html#sec-sty-gui"><span class="std std-numref">Section 5.3</span></a> for conventions and guidelines of the <cite>Buildings</cite> library.</p>
 </div>
->>>>>>> master
 <div class="section" id="references">
 <h2>1.5. References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h2>
 <dl class="citation">
@@ -251,14 +228,13 @@ <h2>1.5. References<a class="headerlink" href="#references" title="Permalink to
 <dd><p>Peter Fritzson. <em>Introduction to Modeling and Simulation of Technical and Physical Systems with Modelica.</em> Wiley-IEEE Press, ISBN 978-1-1180-1068-6, 2011.</p>
 </dd>
 <dt class="label" id="fra2009a"><span class="brackets"><a class="fn-backref" href="#id4">Fra2009a</a></span></dt>
-<dd><ol class="upperalpha simple" start="18">
-<li><p>Franke, F. Casella, M. Otter, M. Sielemann, H. Elmqvist, S. E. Mattsson, and H. Olsson. <a class="reference external" href="https://www.modelica.org/events/modelica2009/Proceedings/memorystick/pages/papers/0078/0078.pdf">Stream connectors – an extension of modelica for device-oriented modeling of convective transport phenomena</a>. In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.</p></li>
-</ol>
+<dd><p>R. Franke, F. Casella, M. Otter, M. Sielemann, H. Elmqvist, S. E. Mattsson, and H. Olsson.
+<a class="reference external" href="http://dx.doi.org/10.3384/ecp09430078">Stream connectors – an extension of modelica for device-oriented modeling of convective transport phenomena</a>.
+In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.</p>
 </dd>
 <dt class="label" id="fra2009b"><span class="brackets"><a class="fn-backref" href="#id5">Fra2009b</a></span></dt>
-<dd><ol class="upperalpha simple" start="18">
-<li><p>Franke, F. Casella, M. Otter, K. Proelss, M. Sielemann, and M. Wetter. <a class="reference external" href="https://www.modelica.org/events/modelica2009/Proceedings/memorystick/pages/papers/0077/0077.pdf">Standardization of thermo-fluid modeling in Modelica.Fluid</a>.     In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.</p></li>
-</ol>
+<dd><p>R. Franke, F. Casella, M. Otter, K. Proelss, M. Sielemann, and M. Wetter. <a class="reference external" href="http://dx.doi.org/10.3384/ecp09430077">Standardization of thermo-fluid modeling in Modelica.Fluid</a>.
+In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.</p>
 </dd>
 <dt class="label" id="til2001"><span class="brackets"><a class="fn-backref" href="#id1">Til2001</a></span></dt>
 <dd><p>Michael M. Tiller. <em>Introduction to Physical Modeling with Modelica.</em> Kluwer Academic Publisher, 2001.</p>
@@ -283,7 +259,7 @@ <h2>1.5. References<a class="headerlink" href="#references" title="Permalink to
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/glossary.html b/Buildings/Resources/Documentation/userGuide/build/html/glossary.html
index 0b47c971ce6..b34b35a596d 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/glossary.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/glossary.html
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -175,7 +172,7 @@ <h1>7. Glossary<a class="headerlink" href="#glossary" title="Permalink to this h
 <p>where <span class="math notranslate nohighlight">\(r\)</span> is a positive real number.
 This causes the input signal <span class="math notranslate nohighlight">\(u(\cdot)\)</span> to be converted to
 an output signal <span class="math notranslate nohighlight">\(y(\cdot)\)</span> that is differentiable in time.
-See the <a class="reference internal" href="workArounds.html#figurefilteredresponse"><span class="std std-ref">plot of a filtered step response</span></a>.</p>
+See the <a class="reference internal" href="performance.html#figurefilteredresponse"><span class="std std-ref">plot of a filtered step response</span></a>.</p>
 </dd>
 <dt id="term-compressible-flow">compressible flow</dt><dd><p>The opposite of <a class="reference internal" href="#term-incompressible-flow"><span class="xref std std-term">incompressible flow</span></a>.</p>
 </dd>
@@ -222,7 +219,7 @@ <h1>7. Glossary<a class="headerlink" href="#glossary" title="Permalink to this h
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/help.html b/Buildings/Resources/Documentation/userGuide/build/html/help.html
index 74cb7b052b3..822d23e5063 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/help.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/help.html
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">6. Help</a></li>
@@ -201,7 +198,7 @@ <h1>6. Help<a class="headerlink" href="#help" title="Permalink to this headline"
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/index.html b/Buildings/Resources/Documentation/userGuide/build/html/index.html
index fbe73f9b595..675d5bc8d36 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/index.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/index.html
@@ -66,9 +66,9 @@
       aria-labelledby="dLabelGlobalToc"><ul>
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -77,27 +77,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -185,9 +182,9 @@ <h2>Contents<a class="headerlink" href="#contents" title="Permalink to this head
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -203,36 +200,47 @@ <h2>Contents<a class="headerlink" href="#contents" title="Permalink to this head
 <li class="toctree-l3"><a class="reference internal" href="bestPractice.html#nominal-values">2.4.5. Nominal Values</a></li>
 </ul>
 </li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="bestPractice.html#state-events">2.8.1. State events</a></li>
-<li class="toctree-l3"><a class="reference internal" href="bestPractice.html#state-variables-that-dominate-the-error-control">2.8.2. State variables that dominate the error control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="performance.html#breaking-algebraic-loops">3.2.1. Breaking algebraic loops</a></li>
+<li class="toctree-l3"><a class="reference internal" href="performance.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.2.2. Reducing nonlinear equations of serially connected flow resistances</a></li>
+<li class="toctree-l3"><a class="reference internal" href="performance.html#prescribed-mass-flow-rate">3.2.3. Prescribed mass flow rate</a></li>
+<li class="toctree-l3"><a class="reference internal" href="performance.html#avoiding-events">3.2.4. Avoiding events</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="performance.html#state-events">3.3.1. State events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="performance.html#state-variables-that-dominate-the-error-control">3.3.2. State variables that dominate the error control</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="development.html#thermofluid-flow-device">5.3.1. Thermofluid flow device</a></li>
-<li class="toctree-l3"><a class="reference internal" href="development.html#pressure-drop">5.3.2. Pressure drop</a></li>
-<li class="toctree-l3"><a class="reference internal" href="development.html#control-sequences-using-the-control-description-language">5.3.3. Control Sequences using the Control Description Language</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="development.html#general">5.3.1. General</a></li>
+<li class="toctree-l3"><a class="reference internal" href="development.html#type-declarations">5.3.2. Type declarations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="development.html#equations-and-algorithms">5.3.3. Equations and algorithms</a></li>
+<li class="toctree-l3"><a class="reference internal" href="development.html#functions">5.3.4. Functions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="development.html#package-order">5.3.5. Package order</a></li>
+<li class="toctree-l3"><a class="reference internal" href="development.html#documentation">5.3.6. Documentation</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="development.html#thermofluid-flow-device">5.4.1. Thermofluid flow device</a></li>
+<li class="toctree-l3"><a class="reference internal" href="development.html#pressure-drop">5.4.2. Pressure drop</a></li>
+<li class="toctree-l3"><a class="reference internal" href="development.html#control-sequences-using-the-control-description-language">5.4.3. Control sequences using the Control Description Language</a></li>
 </ul>
 </li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -269,7 +277,7 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/legal.html b/Buildings/Resources/Documentation/userGuide/build/html/legal.html
index 8ad31852ed8..a11008ef43b 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/legal.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/legal.html
@@ -66,9 +66,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -77,27 +77,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -160,7 +157,7 @@
       
   <div class="section" id="copyright-and-license">
 <h1>10. Copyright and License<a class="headerlink" href="#copyright-and-license" title="Permalink to this headline">¶</a></h1>
-<p>Copyright (c) 2012-2019, The Regents of the University of California, Department
+<p>Copyright (c) 2012-2020, The Regents of the University of California, Department
 of Energy contract-operators of the Lawrence Berkeley National Laboratory.
 All rights reserved.</p>
 <p>1. Redistribution and use in source and binary forms, with or without
@@ -216,7 +213,7 @@ <h1>10. Copyright and License<a class="headerlink" href="#copyright-and-license"
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/objects.inv b/Buildings/Resources/Documentation/userGuide/build/html/objects.inv
index ae22b29f142..498252c10f7 100644
Binary files a/Buildings/Resources/Documentation/userGuide/build/html/objects.inv and b/Buildings/Resources/Documentation/userGuide/build/html/objects.inv differ
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/prePostProcessing.html b/Buildings/Resources/Documentation/userGuide/build/html/prePostProcessing.html
index 03e233ef4ec..42eaf51131b 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/prePostProcessing.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/prePostProcessing.html
@@ -23,7 +23,7 @@
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
     <link rel="next" title="5. Development" href="development.html" />
-    <link rel="prev" title="3. Work-Arounds" href="workArounds.html" />
+    <link rel="prev" title="3. Simulation Performance" href="performance.html" />
 <meta charset='utf-8'>
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
 <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
@@ -67,9 +67,9 @@
       aria-labelledby="dLabelGlobalToc"><ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -78,27 +78,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="current reference internal" href="#">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -129,7 +126,7 @@
               
                 
   <li>
-    <a href="workArounds.html" title="Previous Chapter: 3. Work-Arounds"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; 3. Work-Arounds</span>
+    <a href="performance.html" title="Previous Chapter: 3. Simulation Performance"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; 3. Simulation...</span>
     </a>
   </li>
   <li>
@@ -196,7 +193,7 @@ <h1>4. Pre- and Post-Processing<a class="headerlink" href="#pre-and-post-process
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/search.html b/Buildings/Resources/Documentation/userGuide/build/html/search.html
index 45b6074e33b..171d6b25c68 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/search.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/search.html
@@ -71,9 +71,9 @@
       aria-labelledby="dLabelGlobalToc"><ul>
 <li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.2. Running the First Simulations</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.4. Literature for Developers</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
 </ul>
 </li>
@@ -82,27 +82,24 @@
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
 <li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.5. Controls</a></li>
+<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.6. Start values of iteration variables</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="workArounds.html">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="workArounds.html#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
+<li class="toctree-l1"><a class="reference internal" href="performance.html">3. Simulation Performance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#control-input-signal-of-equipment">3.1. Control input signal of equipment</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#fluid-flow-systems">3.2. Fluid flow systems</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#examples-for-how-to-debug-and-correct-slow-simulations">3.3. Examples for how to debug and correct slow simulations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="performance.html#numerical-solvers">3.4. Numerical solvers</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
 <li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#style-guide">5.3. Style guide</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.4. Adding a new class</a></li>
+<li class="toctree-l2"><a class="reference internal" href="development.html#validation-and-unit-tests">5.5. Validation and unit tests</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
@@ -194,7 +191,7 @@ <h1 id="search-documentation">Search</h1>
       
     </p>
     <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
+        &copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
       Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
     </p>
   </div>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/searchindex.js b/Buildings/Resources/Documentation/userGuide/build/html/searchindex.js
index 3cc290c87c3..dc1c68f018a 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/searchindex.js
+++ b/Buildings/Resources/Documentation/userGuide/build/html/searchindex.js
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Search.setIndex({docnames:["acknowledgments","bestPractice","development","disclaimer","gettingStarted","glossary","help","index","legal","prePostProcessing","workArounds"],envversion:{"sphinx.domains.c":1,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":1,"sphinx.domains.javascript":1,"sphinx.domains.math":2,"sphinx.domains.python":1,"sphinx.domains.rst":1,"sphinx.domains.std":1,sphinx:56},filenames:["acknowledgments.rst","bestPractice.rst","development.rst","disclaimer.rst","gettingStarted.rst","glossary.rst","help.rst","index.rst","legal.rst","prePostProcessing.rst","workArounds.rst"],objects:{},objnames:{},objtypes:{},terms:{"05ch11231":0,"0e7":1,"2nd":[5,10],"66e":1,"94406e":1,"94407e":1,"94411e":1,"9441e":1,"95e7":1,"9e7":1,"boolean":10,"break":7,"case":[1,2],"class":[4,7],"default":[1,2,10],"final":[2,4],"function":[1,2,4,5,8,9,10],"import":1,"new":[1,4,6,7],"public":[0,4],"return":1,"short":1,"static":1,"switch":1,"transient":1,"true":[1,10],"try":1,"while":[1,3,10],AND:8,ARE:8,Adding:[1,7],BUT:8,But:2,FOR:8,For:[1,2,5,6,10],NOT:8,SUCH:8,Such:1,THE:8,The:[0,1,2,3,4,5,6,7,8,9,10],Then:1,These:[1,2],USE:8,Use:[0,2,7],Using:[1,10],_nomin:1,abl:2,about:[4,6],abov:[1,2,10],abruptli:1,abs:1,absolut:1,ac02:0,academ:4,access:2,account:[1,3],accuraci:3,achiev:1,acknowledg:7,across:[1,5],actual:[1,2],actuat:10,adapt:5,add:[1,2,4,10],added:[1,2,5,8],adding:1,addit:[1,2,6,9],adequaci:3,adher:2,adjust:1,advanc:1,advic:7,advis:8,affect:1,after:[1,2],again:1,against:2,agenc:3,agreement:8,ahu:2,aid:2,air:[1,2,4],algebra:7,algorithm:1,all:[1,2,6,8,10],allow:[1,2,10],alreadi:[1,2,6],also:[1,2,4,10],altern:[1,2],although:4,alwai:1,amb:1,ambient:1,amount:2,analyt:2,ani:[1,3,8,10],annex:4,annot:[1,2],anoth:[1,5],anyon:8,anywai:1,apparatu:3,appear:1,appli:[4,10],applic:[1,2],approach:4,approv:3,approxim:[1,5,10],argument:1,aris:8,around:[1,5,7],assign:2,assist:0,assum:3,assumpt:[1,7],attempt:1,author:[1,3,5,10],autom:[4,7,9],automat:2,avail:[1,2,4,7,8],avoid:[2,7],award:0,back:1,bad:1,balanc:[1,2],bar:[1,2,10],base:[1,2,4,5,7],baseclass:[1,2],bash:2,basic:2,basicflowfunction_dp:2,basicflowfunction_m_flow:2,becam:1,becaus:[1,2,4,10],becom:2,been:[1,3,8],befor:6,begin:5,beginn:4,behav:1,behavior:1,believ:3,below:[1,2,10],berkelei:8,best:7,between:[1,2,10],binari:8,block:[1,2,5],boiler:1,boilerpolynomialclosedloop:1,book:4,both:[1,2,10],bottom:1,bou:1,bound:5,boundari:1,branch:1,bsd:8,bug:[6,8],build:[0,2,4,6,7,10],buildingspi:9,busi:8,c_i:1,calcul:2,california:[0,3,8],call:[1,2],can:[1,2,4,6,7,9,10],carbon:1,carnot_i:2,carri:1,casella:4,caus:[1,2,5,6,8,10],caution:1,cdl:2,cdot:[1,5],celsiu:2,chanc:6,chang:[1,2,4,5,7],chaotic:1,check:[1,2,4,6],chiller:[1,2],chillerpl:1,choicesallmatch:1,choos:8,circ:1,circuit:1,circumv:1,claus:8,close:[1,2,10],closedloop:1,co2:4,code:[1,2,8,10],coeffici:10,coil:[1,2,10],com:[2,4,6],combin:5,command:1,commerci:3,commiss:[0,3],commit:1,common:[2,7],commun:4,como:4,compar:2,comparison:[1,2],complet:3,complex:[1,2,4],compli:2,compon:[1,2,4,10],composit:[1,10],compress:[1,5],comput:[1,2,5,8,9,10],concentr:1,concept:4,concis:4,condit:[1,2,5,8],conduct:2,confer:4,configur:[1,2,10],connect:[1,2,7],connector:[1,4],consequ:1,consequenti:8,conserv:1,consid:[1,10],consist:[1,2],constant:[1,2,5],constanteffect:2,constitut:3,construct:1,consult:1,contain:[1,2,3,4,10],continu:[1,2,5,10],contract:[0,8],contractor:3,contribut:[1,7],contributor:8,control:[5,7,9,10],convect:4,convent:2,converg:[1,5,10],convers:2,convert:[2,5],coocoi:1,cool:[1,2,10],coolingtow:2,copi:2,copyright:7,cor:1,correct:[2,3,7,10],correctli:1,correspond:8,cost:9,could:[1,2,10],coupl:[2,10],cours:1,cover:7,creat:[1,6,7,9],cross:1,curv:[1,10],cycl:1,dae:1,dai:2,damag:8,damper:[1,2],dassl:1,data:[1,2,8],debug:7,declar:[1,2],decoupl:[2,10],defaultcomponentnam:2,defin:[1,4,5],definit:[1,4],degc:2,degre:2,delai:[1,2],delet:10,delta:[2,5,10],densiti:[1,2,5],depart:[0,8],depend:[1,2,10],dept:8,der:1,deriv:[5,8],describ:[1,2,4,10],descript:[6,7],design:[1,4,5],detail:[1,4,10],determin:1,develop:[0,1,7,9],devic:[1,4,7],diagram:[1,2,10],dialog:2,did:1,differ:[1,2,4],differenti:[1,2,5],difficult:2,dioxid:1,direct:[1,4,8],directli:8,directori:9,disabl:2,disapprov:3,disclaim:[7,8],disclos:3,displayunit:2,distinct:1,distinguish:1,distribut:[1,2,8],document:[0,1,2,3,4,7,8,9],doe:[1,2,3,9],domain:1,domin:7,done:[1,2],dot:[1,2,5,10],down:1,download:4,dp_nomin:[1,2,10],dpfixed_nomin:10,dpvalve_nomin:10,drastic:1,draw:2,drop:[1,5,7,10],dry:4,dslog:1,dtsup:2,dual:2,dualfandualduct:1,dualfandualductclosedloop:1,duct:[1,10],due:[1,4,10],dure:[1,10],dymola:[1,6,9,10],dynam:[1,10],dynamicbal:10,dynamicsfreeiniti:[1,10],each:[1,2],earlier:1,easier:[1,4,10],easiest:2,ebc:4,econom:1,editor:4,ef410e:1,effect:[1,10],effici:[0,1],effort:1,either:8,ele:1,element:[1,2,10],elementari:1,elimin:10,elmqvist:4,els:1,employe:3,enabl:1,encount:1,end:[0,1,5],endors:[3,8],energi:[0,1,2,3,4,5,8],energydynam:[1,10],energyplu:2,engin:1,english:4,enhanc:8,enlarg:2,ensur:[2,10],enter:[1,6],enthalpi:1,entri:1,environ:6,epsilon:1,equal:[1,2,10],equat:[2,5,7],equilibrium:1,equip:[2,7],equival:1,error:[2,6,7,10],essenti:4,estim:1,evalu:1,even:[1,8],event:[7,8],everi:1,everyon:6,exact:1,exampl:[2,4,5,7,9],exce:1,except:[1,2],exchang:[1,2,5],exclus:8,execut:2,exemplari:8,exhaust:2,exhaustdamp:2,exhibit:1,exist:[2,4],expand:2,expans:1,expansionvessel:1,expect:[1,6],experi:1,experienc:1,explain:[1,2,4],explan:4,explicitli:1,expos:1,express:[1,3,8],extend:[1,2],extens:4,extrem:1,fail:10,fals:[1,10],fan:[1,10],fanc:10,fanret:1,fansupcol:1,fansuphot:1,fast:[1,5],faster:[1,10],favor:3,fd01:1,featur:8,few:1,fig:[1,2],figur:[1,2],file:[1,2,6,7,9],filter:[1,5,10],filteredopen:10,filteredspe:[1,10],find:[1,6],fine:1,first:[2,7],fit:[2,8],fix:[1,2,6,7,8,10],fixedboundari:1,fixediniti:1,fixedresist:[2,10],flow:[4,5,7],flowcircuit:1,flowcontrolled_m_flow:10,flowmodel:2,fluid:[2,4,5,7,10],follow:[1,2,4,7,8],form:[1,2,8],format:[2,9],formul:[1,10],found:[4,7],foundat:4,four:1,fra2009a:4,fra2009b:4,frac:[2,5,10],fraction:1,frank:4,free:[7,8],fri2004:4,fri2011:4,friction:10,fritzson:4,from:[1,2,4,8,10],from_dp:10,full:1,fulli:5,further:[1,2,4,10],g36_pr1:2,gain:[1,2,10],gas:1,gave:1,gener:[1,2,6,9,10],genopt:9,geometri:1,get:7,github:[2,6],give:[1,2,4],global:1,glossari:7,good:[1,8],gov:[4,9],govern:[2,3],grant:8,graphic:2,group:[2,6],grow:1,gui:1,guid:[1,2,4,10],guidanc:2,guidelin:7,h_1:1,h_a:1,h_i:1,h_outflow:1,had:1,halt:1,handl:[1,4],handler:2,happen:1,has:[1,3,5,8,10],have:[1,2,10],heat:[1,2,4,5,10],heater:1,heatercooler_u:2,heatexchang:2,heattransf:4,help:[1,7,10],henc:[1,2,4,6],here:[1,2],herebi:8,herein:3,hierarchi:2,high:10,higher:[1,5,6,10],hmed:1,holder:8,homotopi:2,how:[2,4,7,9],howev:[1,8],html:[2,4],http:[2,4,6,9],humid:[1,2],humidifi:[1,2],humidifier_u:2,hvac:[1,2],hysteresi:[1,2],ideal:[1,2,10],ident:1,iea:4,ieee:4,illustr:[1,10],implement:[1,2,10],impli:[3,8],impos:[1,8],improv:[1,2,10],incident:8,includ:[1,2,5,8],incompress:[5,7,10],inconsist:7,incorpor:8,incorrect:2,increas:[1,2],indent:2,index:7,indirect:8,individu:[1,4,10],industri:4,inequ:[1,2],inertia:10,infin:2,info:2,inform:[3,4,6,7,9,10],infring:3,initi:7,inlet:[2,10],input:[1,2,5,7,10],inspect:1,instal:8,instanc:[1,2,10],instant:[1,2],instantli:10,instead:1,instream:1,instruct:[4,7],integr:[1,2],intend:1,intent:2,interact:[1,4],interest:[0,1,2],interfac:[1,2,4],intern:4,interrupt:8,intersect:10,interv:1,introduc:[1,2,10],introduct:4,invit:6,invok:2,involv:2,isbn:4,isol:1,issu:[2,6],itali:4,item:2,iter:[2,5,7,10],its:[1,2,3,4,8],john:4,join:6,json:4,junction:[7,10],just:1,k_f:10,k_v:10,kelvin:[1,2],kluwer:4,knowledg:2,known:[2,6,10],laboratori:8,languag:[4,7,9],larg:[7,10],larger:[1,10],last:1,later:1,law:1,lawrenc:8,lbl:[2,4,6,9],lbnl:9,lead:[1,10],leav:1,left:1,leg:5,legal:3,length:5,lesson:4,let:1,level:[1,2],liabil:[3,8],liabl:8,librai:6,librari:[1,2,4,6,7,9],licens:[2,7],lift:10,like:[1,10],limit:[1,2,8],line:2,linear:[2,10],link:4,linux:2,list:[2,4,8],literatur:7,load:[1,2],local:1,locat:1,log:1,logic:2,logstartvaluesforiterationvari:1,longer:1,loop:[2,7],loss:8,low:[5,10],lump:[1,2,10],m_0:2,m_1:1,m_2:1,m_flow:1,m_flow_nomin:[1,2,10],m_flow_smal:1,m_i:1,machin:10,made:[1,2],magnitud:[1,5],mai:[1,2,4,6,7,8,10],maintain:[1,2],make:[2,3,4,6,8,10],mani:[1,2],manufactur:[1,3],mas:1,mass:[1,2,4,5,7],massdynam:[1,10],massexchang:2,massflowr:1,massflowsource_t:[1,10],mat:9,materi:8,math:1,mathbb:1,mathrm:1,matlab:9,mattsson:4,max:2,mayb:1,mean:[1,2,5],measur:[1,2,10],mechan:5,media:7,medium:[1,4,5,10],menu:1,merchant:8,merkel:2,merkelenergyplu:2,messag:[1,10],met:8,method:1,michael:4,millisecond:1,min:2,minu:2,mix:[1,10],mixer:[1,10],mixingvolum:1,mockup:4,mode:2,model:[2,4,6,7,9,10],modelica:[1,2,4,6,7,9,10],modif:8,modifi:[2,8],modul:7,moist:4,moistair:1,more:[1,4,10],most:1,move:5,mover:10,much:[1,6],multipl:[1,4,7,10],must:[1,2,8],mwat_flow:2,name:[1,2,3,8],nation:8,necessari:5,necessarili:3,need:[1,2,4,6,10],neglect:1,neglig:[1,8],neighborhood:1,neither:[3,8],network:[1,10],never:[1,2],newton:[1,2,5],next:[1,2],nois:[1,2,5],nomin:[2,7],non:[2,5,8,10],nonlinear:[1,2,5,7],nor:[3,8],normal:2,note:[1,2,4,8],notic:[2,8],now:1,number:[0,1,5],numer:[2,4,5,7],obc:2,object:4,oblig:8,observ:[1,6],obtain:[1,2],occur:1,off:1,offic:0,often:[1,2,10],older:4,olsson:4,omit:2,one:[1,2],ones:4,onli:[1,2],onlin:4,open:[2,5,6,7],openbuildingcontrol:2,openmodelica:[4,9],oper:[1,2,4,6,8],opinion:3,opposit:5,optim:9,option:1,order:[1,2,5,10],ordinari:[1,5],org:4,organ:7,orient:4,oscil:1,oscillatori:1,other:[1,2,4,8,10],otherwis:[1,2,3,8,10],otter:4,our:1,out:[1,8],outlet:10,output:[1,2,5,7,9,10],outsid:[1,2],overdetermin:7,overspecifi:[1,7],overview:4,overwritten:1,own:3,owner:8,p_0:[1,2,5],p_default:1,p_v:5,packag:[2,4,7,10],page:[4,7],pai:1,pane:2,paper:4,paragraph:8,paramet:[2,4,7,10],part:[1,2,6,9,10],parti:3,partialabsolutesensor:2,partialmedium:1,partialresist:2,particular:8,particularli:[1,10],pascal:2,pass:[3,5,10],patch:8,per:[1,2],perfectgas:1,perform:[2,8,10],permiss:8,permit:8,perpetu:8,peter:4,phenomena:[1,4,7],physic:[1,2,4,7],pipe:[1,10],pleas:[2,6],plot:[1,5],pmatrix:5,point:[1,2],port:[1,2],port_a:1,posit:[2,5],possibl:[1,6,8],post:7,practic:7,pre:[7,10],prepar:[3,8],prescrib:7,present:1,press:4,pressur:[5,7,10],pressuredrop:[1,2,10],principl:[1,4],prior:8,privat:3,problem:[6,7,9],problemat:1,proc:4,process:[2,3,7],procur:8,produc:[1,2],product:[1,3,8],proelss:4,profit:8,progess:1,program:[0,9],programmat:2,project:2,promot:8,propag:7,proper:1,properti:1,provid:[1,2,6,7,8,9],publicli:8,publish:[1,4],pull:2,pum:1,pump:[1,10],purpos:8,put:2,python:[2,9],quadrat:2,quantiti:[1,2],question:6,quickli:6,radau:1,rais:[1,10],raisetim:10,rang:[1,2],rapidli:1,rate:[1,2,4,5,7],rather:[1,2,7],ratio:10,read:[2,4],readabl:2,reader:2,real:[1,5,10],realinput:2,realist:2,realiz:6,realoutput:2,reason:[1,2],recommend:[1,2,3,4],redeclar:[1,10],redistribut:8,reduc:[1,2,7],refer:[3,5,7,10],referenc:2,reflect:3,regard:6,regardless:1,regent:[3,8],region:1,regress:2,regstep:1,regular:[1,2,5,10],rel:[1,2],relat:[1,2],releas:2,relev:4,remain:[1,2],remov:[1,10],renew:0,replac:[1,2,4],report:[3,4,6],repositori:2,repres:[1,3],reproduc:[1,6,8],request:2,requir:[1,2,7,10],res1:[1,10],res2:10,res3:1,res:[4,10],research:0,reserv:8,residu:10,resist:[1,2,7],resourc:2,respect:1,respond:2,respons:[1,3,5,10],restart:1,result:[1,2,3,6,9],resultfil:1,retain:8,retun:10,reusabl:2,revers:[1,4],revis:[1,8],rho:1,right:[1,3,8],robust:[1,2,10],room:[1,2],root:[1,6],rotat:10,rotor:10,royalti:8,rule:[1,2],run:[1,2,7,9],same:[1,4,10],sampl:[1,2],sampler:[1,2],satisfactori:10,satisfi:5,save:[1,6],scalar:1,schemat:[1,2,10],script:[2,9],search:[4,6,7],search_foss:4,search_languag:4,second:[1,5,10],secretari:0,section:[1,2,10],see:[1,2,5,6,9,10],seem:1,select:[1,6],sen:1,sensor:[2,7],sent:10,sentenc:2,separ:[2,8,9,10],sept:4,sequenc:7,seri:[1,2,10],serial:7,servic:[3,8],set:[1,2,10],setpoint:2,setup:1,shall:8,share:2,should:[1,2,5],shoulder:2,show:[1,2],shown:[1,2,10],sielemann:4,sign:1,signal:[1,2,5,10],signific:2,significantli:1,similar:[1,2,4,7],similarli:1,simpl:[2,10],simpler:1,simplifi:1,simul:[6,7,9,10],simulatemodel:1,simulationresearch:[4,9],sinc:1,singlezon:2,singular:1,situat:[1,2,10],siunit:1,size:[1,2],skip:1,slight:1,slightli:1,slow:7,small:[1,2,5,6,10],smaller:[1,2,5],smooth:[1,10],snippet:2,softwar:[7,8],solut:[1,2,5,10],solv:[1,2,5,6,10],solver:[2,5,7,10],some:[1,2,10],sometim:10,son:4,sooner:6,sourc:[1,2,7,8,10],space:2,speci:[1,4],special:[1,8],specif:[1,2,3,6,8,9],specifi:[1,9],specificenthalpytwoport:1,speed:10,speedcontrolled_i:10,spike:1,split:1,splitter:[1,10],spoken:4,sponsor:3,sqrt:[2,10],srg:[2,6],stabil:1,stackoverflow:6,stage:1,stall:[1,2],standard:[2,4,9],start:[2,7],state:[3,5,7],steadi:1,steadyst:1,steadystateiniti:1,step:[1,4,5,7],stepsiz:1,still:[4,6],stop:1,stoptim:1,storag:1,store:1,stream:[1,2,4],strict:8,string:2,structur:1,style:2,subcontractor:3,sublicens:8,submit:6,substanc:[1,4],substitut:8,subsystem:1,success:1,successfulli:1,suffici:1,suggest:2,sum_:1,summar:4,summer:2,suppli:2,support:0,suppos:[1,10],sure:[2,6],system:[2,4,5,6,7,10],t_0:1,t_a:1,t_default:1,tab:[1,2],tabl:1,tabul:2,tair:2,take:[1,2],tau:1,tcoicoo:1,technic:4,technolog:[0,4],temperatur:[1,2],temperaturedependentdens:1,temperaturesensor:1,temsen_1:1,temsen_2:1,tend:2,termin:1,terminalunit:2,test:[1,2,5,6,9],than:[1,2,4,5,7],thei:[1,2],them:[1,2],theori:[2,8],therebi:[1,10],therefor:[1,10],thereof:[3,8],thermal:1,thermo:[4,5,7],thermodynam:2,thermofluid:[7,10],thi:[0,1,2,3,5,6,7,8,9,10],thing:1,those:3,thought:10,thousand:2,three:1,threshold:1,through:[1,5],thu:[1,10],thumb:1,til2001:4,tiller:4,time:[1,2,5,10],tmix:1,togeth:2,toler:[1,5],tool:[1,2,4],top:1,topic:1,tort:8,total:6,tour:4,tower:2,tpreheacoi:1,trace:[1,4],track:2,trade:3,trademark:3,train:4,transfer:4,translat:[1,7,10],translatemodel:1,transport:[1,4],travel:10,tret:1,trigger:1,trim:2,tune:2,turn:1,tutori:4,twatin:2,two:[1,2,10],twowaylinear:10,txt:1,type:[1,10],typic:[1,2,5,10],tzon:2,uncontrol:1,under:[0,1,2,8],understand:[1,2,4],understood:1,unit:[1,2,3,9],univers:[3,4,8],unknown:1,unless:2,unlik:1,unmethour:6,unrealist:1,unspecifi:1,unstabl:1,until:[1,2,5],upgrad:8,upon:3,use:[1,2,3,4,6,7,8,9,10],used:[1,2,4,6,7,8,9],useful:4,usefulness:3,user:[1,2,10],usersguid:2,uses:[2,3,4,10],using:[1,4,7,9,10],usual:[1,2],util:1,val:[1,10],valid:7,valu:[2,4,7,10],valv:[1,5,10],vapor:[1,4],vari:10,variabl:[2,5,7,10],variat:4,variou:1,vav:2,vavhot:1,veri:1,verifi:2,version:[1,4],versu:1,vessel:1,view:3,vol:1,volum:[1,2,5,10],wai:[1,8],want:1,warrant:3,warranti:[3,8],water:[2,4,7,10],weather:2,web:4,weight:1,welcom:2,well:[1,2,4],were:9,wetcoildiscret:1,wetter:4,what:1,whatsoev:8,when:[1,2,6,7,10],whenev:1,where:[1,2,5,10],whether:[1,8],which:[1,2,4,5,7,10],who:4,whole:[1,5],whose:[1,5],why:1,wide:1,wilei:4,winter:2,within:[2,5],without:[1,2,8],work:[3,7,8],workflow:4,would:[1,2,3],written:8,wrong:1,www:4,x_0:1,x_i:1,x_ptphi:1,xogeni:4,ydam:2,year:1,you:[1,8,10],your:[6,8],yourself:6,zero:[1,2,10],zone:2},titles:["8. Acknowledgments","2. Best Practice","5. Development","9. Disclaimers","1. Getting Started","7. Glossary","6. Help","User Guide","10. Copyright and License","4. Pre- and Post-Processing","3. Work-Arounds"],titleterms:{"break":10,"class":2,"new":2,Adding:2,Use:1,acknowledg:0,algebra:10,around:10,avoid:[1,10],best:1,build:1,chang:10,connect:10,content:7,contribut:2,control:[1,2],copyright:8,correct:1,debug:1,descript:2,develop:[2,4],devic:2,disclaim:3,domin:1,drop:2,equat:[1,10],error:1,event:1,exampl:1,first:4,flow:[1,2,10],fluid:1,get:4,glossari:5,guid:7,guidelin:2,help:6,how:1,incompress:1,inconsist:1,indic:7,initi:[1,10],iter:1,junction:1,languag:2,larg:1,licens:8,literatur:4,loop:10,mass:10,media:1,model:1,nomin:1,nonlinear:10,numer:1,organ:1,overdetermin:1,overspecifi:10,packag:1,paramet:1,post:9,practic:1,pre:9,prescrib:10,pressur:[1,2],problem:[1,10],process:9,propag:1,rate:10,reduc:10,refer:[1,4],requir:4,resist:10,run:4,sensor:1,sequenc:2,serial:10,simul:[1,4],slow:1,softwar:4,solver:1,start:[1,4],state:1,step:10,system:1,tabl:7,thermo:1,thermofluid:2,user:[4,7],using:2,valid:2,valu:1,variabl:1,water:1,work:10}})
-=======
-Search.setIndex({docnames:["acknowledgments","bestPractice","development","disclaimer","gettingStarted","glossary","help","index","legal","performance","prePostProcessing"],envversion:{"sphinx.domains.c":1,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":1,"sphinx.domains.javascript":1,"sphinx.domains.math":2,"sphinx.domains.python":1,"sphinx.domains.rst":1,"sphinx.domains.std":1,sphinx:56},filenames:["acknowledgments.rst","bestPractice.rst","development.rst","disclaimer.rst","gettingStarted.rst","glossary.rst","help.rst","index.rst","legal.rst","performance.rst","prePostProcessing.rst"],objects:{},objnames:{},objtypes:{},terms:{"05ch11231":0,"0e7":9,"2nd":[5,9],"66e":9,"94406e":9,"94407e":9,"94411e":9,"9441e":9,"95e7":9,"9e7":9,"boolean":[2,9],"break":7,"case":[1,2,9],"class":[4,7],"default":[1,2,9],"final":[2,4],"function":[1,4,5,7,8,9,10],"import":2,"long":2,"new":[1,4,6,7],"public":[0,2,4],"return":[1,9],"short":[1,2],"static":1,"switch":[1,9],"transient":1,"true":[1,2,9],"try":1,"while":[1,3,9],AND:8,ARE:8,Adding:[7,9],And:2,BUT:8,But:2,FOR:8,For:[1,2,5,6,9],NOT:8,SUCH:8,Such:1,THE:8,That:2,The:[0,1,2,3,4,5,6,7,8,9,10],Then:[1,2],These:1,USE:8,Use:[0,2,7],Using:[1,9],_nomin:1,_sort_package_ord:2,abl:2,about:[4,6],abov:[1,2,9],abruptli:9,abs:[1,2],ac02:0,academ:4,access:2,account:[1,3],accuraci:3,achiev:[1,9],acknowledg:7,across:[1,5],actual:[1,2,9],actuat:9,adapt:5,add:[1,2,4,9],added:[1,2,5,8,9],adding:9,addit:[1,2,6,10],adequaci:3,adher:2,adjust:[1,9],advanc:[1,2],advic:7,advis:8,affect:1,after:[2,9],again:[2,9],against:2,agenc:3,agreement:8,ahu:2,aid:2,air:[1,2,4,9],algebra:7,algorithm:[1,7],align:2,all:[1,2,6,8,9],allow:[1,2,9],alphabet:2,alreadi:[1,2,6],also:[1,2,4,9],alt:2,altern:[1,2],although:4,alwai:[1,2],amb:9,ambient:9,amount:2,analyt:2,ani:[2,3,8,9],annex:4,annot:[1,2],anoth:[1,2,5,9],antifreez:1,anyon:8,anywai:1,apart:2,app:2,apparatu:3,appear:[2,9],appli:[2,4,9],applic:[1,2],approach:4,approv:3,approxim:[1,2,5,9],argument:9,aris:8,around:[1,2,5,9],arrai:2,ashra:2,assert:2,assertallinsideminmax:2,assign:2,assist:0,assum:3,assumpt:[1,2,7,9],attempt:[1,9],attribut:2,author:[2,3,5,9],autom:[2,4,7,10],automat:2,avail:[1,2,4,7,8],avoid:[1,2,7],awar:2,award:0,back:9,bad:9,balanc:[1,2],bar:[1,2,9],base:[1,2,4,5,7],baseclass:[1,2],bash:2,basic:2,basicflowfunction_dp:2,basicflowfunction_m_flow:2,becam:9,becaus:[1,2,4,9],becom:2,been:[1,3,8],befor:[2,6],begin:[2,5],beginn:4,behav:1,behavior:9,believ:3,below:[1,2,9],benchmark:2,berkelei:8,best:7,better:2,between:[1,2,9],binari:8,block:[1,2,5,9],boi:2,boiler:[1,2],boilerpolynomialclosedloop:1,book:4,border:2,both:[1,2,9],bottom:1,bou:1,bound:[2,5],boundari:1,boundary_pt:1,branch:[1,2],bsd:8,bug:[2,6,8],build:[0,2,4,6,7,9],buildingspi:[2,10],busi:8,c_i:1,calcul:2,california:[0,3,8],call:[1,2],can:[1,2,4,6,7,9,10],cannot:2,carbon:1,carnot_i:2,carri:1,casella:4,caus:[1,2,5,6,8,9],caution:1,cdl:2,cdot:[1,5],cellpad:2,cellspac:2,celsiu:2,center:2,certainli:1,chanc:6,chang:[1,2,4,5,9],chaotic:9,charact:2,check:[1,2,4,6],chiller:[1,2],chillerpl:1,choicesallmatch:1,choos:8,circ:1,circuit:1,circumv:1,claus:8,close:[1,2,9],closedloop:9,co2:4,code:[1,2,8,9],coeffici:9,coil:[1,2,9],collaps:2,com:[2,6],combin:5,command:[1,2],comment:2,commerci:3,commiss:[0,3],commit:9,common:[2,7],commun:4,como:4,compact:2,compar:2,comparison:[1,2,9],complet:3,complex:[1,2,4],compli:2,compon:[1,2,4,9],composit:[1,9],compress:[1,5],comput:[1,2,5,8,9,10],concentr:1,concept:4,concis:[2,4],condit:[1,2,5,8,9],conduct:2,confer:4,configur:[1,2,9],connect:[1,2,7],connector:[1,4],consequ:1,consequenti:8,conserv:1,consid:[1,2,9],consist:[1,2,9],constant:[1,2,5,9],constanteffect:2,constitut:3,construct:[1,2],consult:1,contain:[1,2,3,4,9],continu:[1,2,5,9],contract:[0,8],contractor:3,contribut:[1,7],contributor:8,control:[5,7,10],convect:4,convent:[2,4],converg:[1,5,9],convers:2,convert:[2,5],coocoi:9,cool:[2,9],coolingtow:2,coordinatesystem:2,copi:2,copyright:7,cor:9,correct:[1,2,3,7],correctli:1,correspond:8,cost:10,could:[2,9],coupl:[2,9],cours:1,cover:[2,7],creat:[1,2,6,7,10],cross:[1,9],curv:[1,9],cycl:1,dae:1,dai:2,damag:8,damper:[2,9],dassl:[1,9],data:[1,2,8],debug:[1,7],declar:[1,7],decoupl:[2,9],defaultcomponentnam:2,defin:[1,4,5],definit:[1,4],degc:2,degre:2,delai:[1,2],delet:9,delta:[2,5,9],denot:2,densiti:[1,2,5],depart:[0,8],depend:[1,2,9],dept:8,der:[1,9],deriv:[1,2,5,8],describ:[1,2,4,9],descript:[6,7],design:[1,4,5],detail:[1,4,9],detect:2,determin:9,develop:[0,1,7,9,10],devic:[1,4,7],diagram:[1,2,9],dialog:2,did:9,differ:[1,2,4,9],differenti:[1,2,5,9],difficult:2,dioxid:1,direct:[1,2,4,8],directli:8,directori:[2,10],disabl:2,disapprov:3,disclaim:[7,8],disclos:3,discontinu:2,displayunit:2,distinct:1,distinguish:1,distribut:[1,2,8],divid:2,document:[0,1,3,4,7,8,10],doe:[1,2,3,9,10],domain:1,domin:7,done:[1,2],dot:[1,2,5,9],down:1,download:4,dp_nomin:[1,2,9],dpfixed_nomin:9,dpvalve_nomin:9,drag:2,drastic:9,draw:2,drop:[1,5,7,9],dry:4,dslog:9,dtsup:2,dual:2,dualfandualduct:9,dualfandualductclosedloop:9,duct:[1,9],due:[1,2,4,9],duplic:2,dure:[1,2,9],dv_flow:2,dymola:[1,2,6,9,10],dynam:[1,2,9],dynamicbal:9,dynamicsfreeiniti:1,each:[1,2],earlier:9,easier:[1,4,9],easiest:2,ebc:4,econom:9,editor:[2,4],ef410e:9,effect:[1,2,9],effici:[0,1,2,9],effort:1,either:[2,8],ele:9,element:[1,2,9],elementari:9,elimin:9,elmqvist:4,els:[1,2,9],empir:2,employe:3,empti:2,enabl:9,encount:9,end:[0,1,2,5,9],endors:[3,8],energi:[0,1,2,3,4,5,8,9],energydynam:[1,2],energyplu:2,enforc:2,engin:1,english:4,enhanc:8,enlarg:2,ensur:[2,9],enter:[1,2,6],enthalpi:[1,9],entri:9,environ:6,eps:2,epsilon:1,equal:[1,2,9],equat:[5,7],equilibrium:1,equip:[2,7],equival:9,error:[1,2,6,7],essenti:4,estim:1,evalu:2,even:[1,8],event:[1,2,7,8],everi:9,everyon:6,exact:9,exactli:1,exampl:[1,2,4,5,7,10],exce:9,except:[1,2],exchang:[1,2,5],exclus:8,execut:2,exemplari:8,exhaust:2,exhaustdamp:2,exhibit:1,exist:[2,4],expand:2,expans:1,expansionvessel:1,expect:[1,6],experi:1,experienc:1,experiment:2,explain:[1,2,4,9],explan:4,explicitli:1,express:[3,8,9],extend:[1,2],extens:4,extent:2,extrem:9,fail:[1,2],fals:9,fan:[1,9],fanc:9,fanret:9,fansupcol:9,fansuphot:9,far:2,fast:[1,5],faster:9,favor:3,fd01:9,featur:8,few:9,fig:[1,2,9],figur:[1,2,9],file:[2,6,7,9,10],filter:[5,9],filteredopen:9,filteredspe:9,find:[6,9],fine:9,finit:2,first:[2,7],fit:[2,8],fix:[1,2,6,7,8,9],fixediniti:1,fixedresist:[2,9],fixedresistancedpm:2,fixm:2,flow:[4,5,7],flowcircuit:1,flowcontrolled_m_flow:9,flowmodel:2,fluid:[2,4,5,7],follow:[1,2,4,7,8,9],font:2,forc:9,forget:2,form:[1,2,8],format:[2,10],formul:[2,9],found:[4,7],foundat:4,four:1,fra2009a:4,fra2009b:4,frac:[2,5,9],fraction:1,frank:4,free:[7,8],fri2004:4,fri2011:4,friction:9,fritzson:4,from:[1,2,4,8,9],from_dp:9,front:2,full:[1,2,9],fulli:5,further:[2,4,9],g36_pr1:2,gain:[2,9],gas:1,gave:9,gener:[1,6,7,9,10],genopt:10,geometri:1,get:7,getinstancenam:2,github:[2,6],give:[1,2,4],global:9,glossari:7,good:[1,2,8],gov:[4,10],govern:[2,3],grant:8,graphic:2,grid:2,group:[2,6],grow:9,gui:1,guid:[1,4,9],guidanc:2,guidelin:[4,7],h_1:1,h_a:9,h_i:1,h_outflow:9,had:9,halt:9,hand:2,handl:[4,9],handler:2,happen:1,hard:2,has:[1,2,3,5,8,9],have:[1,2,9],head:2,header:2,heat:[1,2,4,5,9],heater:1,heatercooler_u:2,heatexchang:2,heattransf:4,help:[1,7],henc:[1,2,4,6,9],here:1,herebi:8,herein:3,hidden:2,hierarchi:2,high:9,higher:[1,5,6,9],highlight:9,hmed:9,holder:8,homotopi:2,how:[1,2,4,7,10],howev:[1,2,8,9],href:2,html:[2,4],http:[2,4,6,10],humid:[1,2],humidifi:[1,2],humidifier_u:2,hvac:[1,2],hyperlink:2,hysteresi:[1,2,9],icon:2,ideal:[1,2,9],ident:1,iea:4,ieee:4,illustr:[1,9],imag:2,img:2,implement:[1,2,9],impli:[3,8],impos:[1,8],improv:[1,2,9],incident:8,inclin:2,includ:[1,2,5,8],incompress:[5,7],inconsist:7,incorpor:8,incorrect:2,increas:[1,2,9],indent:2,index:7,indic:2,indirect:8,individu:[1,4,9],industri:4,inequ:[1,2,9],inertia:9,infin:2,influenc:2,info:2,inform:[2,3,4,6,7,9,10],infring:3,inherit:2,initi:7,inkscap:2,inlet:[2,9],input:[1,2,5,7],insert:2,inspect:9,instabl:2,instal:8,instanc:[1,2],instant:[1,2,9],instanti:2,instantli:9,instead:[1,2],instream:9,instruct:[4,7],integ:2,integr:[1,2,9],intend:1,intent:[1,2],interact:[1,4],interest:[0,1,2],interfac:[1,2,4],intern:[2,4],interrupt:8,intersect:9,interv:9,introduc:[1,2,9],introduct:[2,4],invalid:2,invers:2,invert:2,invit:6,invok:2,involv:2,isbn:4,isol:[1,9],issu:[2,6],ital:2,itali:4,item:2,iter:[2,5,7,9],its:[1,2,3,4,8,9],jacobian:2,john:4,join:6,json:2,junction:[7,9],just:9,k_f:9,k_v:9,keep:2,kelvin:[1,2,9],keyword:2,kluwer:4,know:2,knowledg:2,known:[1,2,6],label:2,laboratori:8,languag:[4,7,10],larg:[2,7,9],larger:9,last:9,later:9,law:1,lawrenc:8,lbl:[2,4,6,10],lbnl:10,lead:[1,2,9],least:2,left:1,leg:5,legal:3,length:[2,5],let:1,level:[1,2],liabil:[3,8],liabl:8,librai:6,librari:[1,2,4,6,7,10],licens:[2,7],lift:9,like:[1,9],limit:[1,2,8,9],line:[2,9],linear:[2,9],link:4,linux:2,list:[2,4,8],literatur:7,load:[1,2,9],local:9,locat:1,log:[2,9],logic:2,logstartvaluesforiterationvari:1,longer:1,look:2,loop:[2,7],loss:8,low:[5,9],lower:2,lump:[1,2,9],m_0:2,m_1:1,m_2:1,m_flow:9,m_flow_nomin:[1,2,9],m_flow_smal:[1,2],m_i:1,machin:9,made:[1,2],magnitud:[1,5,9],mai:[1,2,4,6,7,8,9],main:2,maintain:2,make:[2,3,4,6,8,9],mani:[1,2,9],manufactur:[1,3],mark:2,mas:9,mass:[1,2,4,5,7],massdynam:1,massexchang:2,massflowr:[1,2],massflowsource_t:[1,9],master:2,mat:10,materi:8,math:[2,9],mathbb:1,mathrm:1,matlab:10,mattsson:4,max:2,mayb:9,mbe:4,mean:[1,2,5],measur:[1,2,9],mechan:5,media:[2,7],medium:[1,2,4,5,9],menu:1,merchant:8,merg:2,merkel:2,merkelenergyplu:2,messag:[1,2],met:8,method:9,michael:4,millisecond:9,min:2,minimum:2,minu:2,miss:2,mix:[1,9],mixingvolum:1,mockup:4,mode:2,model:[2,4,6,7,9,10],modelica:[1,2,4,6,7,9,10],modif:8,modifi:[2,8],modul:7,moist:4,moistair:1,more:[1,2,4,9],most:[1,9],move:[2,5],mover:9,much:[6,9],multipl:[1,2,4,7,9],must:[1,2,8,9],mwat_flow:2,mylibrari:1,name:[1,2,3,8,9],nation:8,necessari:5,necessarili:3,need:[1,2,4,6,9],neg:2,neglect:1,neglig:[1,8,9],neighborhood:9,neither:[3,8],network:[1,9],never:[1,2],newton:[1,2,5],next:[1,2],node:2,nois:[1,2,5,9],nomin:[2,7],non:[2,5,8,9],nonlinear:[1,2,5,7],nor:[3,8],normal:2,note:[1,2,4,8,9],notic:[2,8],now:[1,9],number:[0,1,2,5,9],numer:[1,2,4,5,7],obc:2,object:[2,4],oblig:8,observ:[1,6],obsolet:2,obtain:[1,2],obviou:2,occur:[1,9],off:1,offic:0,often:[1,2,9],older:4,olsson:4,omit:2,one:[1,2,9],ones:[2,4],onli:[1,2,9],onlin:4,open:[2,5,6,7],openbuildingcontrol:2,openmodelica:[4,10],oper:[1,2,4,6,8,9],opinion:3,oppos:2,opposit:5,optim:10,optimica:2,option:[1,2,9],order:[5,7,9],ordinari:[5,9],org:[2,4],organ:7,orient:4,origin:2,oscil:9,oscillatori:9,other:[1,2,4,8,9],otherwis:[2,3,8,9],otter:4,our:9,out:[1,8,9],outlet:9,output:[1,2,5,7,9,10],outsid:[1,2,9],over:2,overdetermin:7,overhead:1,overspecifi:1,overview:4,overwrit:2,overwritten:1,own:3,owner:8,p_0:[1,2,5],p_default:1,p_v:5,packag:[4,7,9],page:[2,4,7],pai:1,pane:2,paper:4,paragraph:8,paramet:[2,4,7,9],part:[2,6,9,10],parti:3,partial:2,partialabsolutesensor:2,partialmedium:1,partialresist:2,particular:8,particularli:9,pascal:2,pass:[3,5,9],passag:2,patch:8,path:2,per:[1,2],perfectgas:1,perform:[2,7,8],permiss:8,permit:8,perpetu:8,peter:4,phenomena:[1,4,7],phi:2,physic:[1,2,4,7],pipe:[1,9],place:2,placement:2,pleas:[2,6],plot:[5,9],pmatrix:5,png:2,point:[1,2,9],polynomi:2,port:[1,2],port_a:9,posit:[2,5],possibl:[1,2,6,8,9],post:7,practic:7,pre:[7,9],precomput:2,prefer:2,prepar:[3,8],prescrib:7,present:[1,2],preserveaspectratio:2,press:4,presssur:1,pressur:[5,7,9],pressuredrop:[1,2,9],primarysystem:2,principl:[4,9],printfailuretodifferenti:2,prior:8,priorit:2,privat:3,problem:[2,6,7,9,10],problemat:9,proc:4,process:[2,3,7],processor:2,procur:8,produc:[1,2],product:[1,3,8],proelss:4,profit:8,progess:9,program:[0,10],programmat:2,project:2,promot:8,propag:7,proper:1,properti:1,propyleneglycolwat:1,protect:2,provid:[1,2,6,7,8,9,10],publicli:8,publish:[1,4],pull:2,pum:1,pump:[1,9],purpos:8,put:2,python:[2,10],quadrat:2,quantiti:[1,2],question:6,quickli:6,radau:[1,9],radiat:1,rais:[2,9],raisetim:9,rang:[2,9],rapidli:[1,9],rate:[1,2,4,5,7],rather:[1,2,7],ratio:9,read:[2,4],readabl:2,reader:2,real:[1,2,5,9],realinput:2,realist:2,realiz:6,realoutput:2,reason:[1,2],receiv:1,recommend:[1,2,3,4,9],record:2,redeclar:[1,9],redistribut:8,reduc:[1,2,7],redund:2,refactor:2,refer:[2,3,5,7],referenc:2,reflect:3,regard:6,regardless:9,regent:[3,8],region:[1,2],regress:2,regstep:9,regular:[1,2,5,9],rel:[1,2],relat:[1,2,9],releas:2,relev:4,remain:[1,2],remov:[1,2,9],renew:0,replac:[1,2,4,9],report:[3,4,6],repositori:2,repres:[1,2,3],reproduc:[6,8,9],request:2,requir:[1,2,7,9],res1:[1,9],res2:9,res3:1,res:9,research:0,resembl:2,reserv:8,residu:9,resist:[1,2,7],resourc:2,respect:[1,2],respond:2,respons:[1,3,5,9],restart:9,result:[1,2,3,6,10],resultfil:9,retain:8,retun:9,reusabl:2,revers:[1,4],revis:[2,8,9],rho:1,right:[3,8,9],robust:[1,2,9],room:[1,2],root:[6,9],rotat:9,rotor:9,royalti:8,rule:[2,9],run:[1,2,7,9,10],safe:2,same:[1,2,4,9],sampl:[1,2],sampler:[1,2],satisfactori:9,satisfi:5,save:[1,6],scalar:[1,2],schemat:[1,2,9],script:[2,10],search:[4,6,7],search_foss:4,search_languag:4,second:[2,5,9],secretari:0,section:[1,2,4,9],see:[1,2,4,5,6,9,10],seem:9,select:[1,6,9],sen:1,senden:2,sensor:[2,7,9],sent:9,separ:[2,8,9,10],sept:4,sequenc:7,seri:[1,2,9],serial:7,serv:2,servic:[3,8],set:[1,2,9],setpoint:2,setup:9,shall:[2,8],share:2,should:[1,2,5],shoulder:2,show:[1,2,9],shown:[1,2,9],sielemann:4,sign:[2,9],signal:[1,2,5,7],signific:2,significantli:[2,9],similar:[1,2,4,7],similarli:1,simpl:[2,9],simpler:1,simul:[1,2,6,7,10],simulatemodel:9,simulationresearch:[4,10],sinc:1,singl:2,singlezon:2,singular:[1,2],situat:[1,2,9],siunit:[1,2],size:[1,2,9],skip:1,slight:9,slightli:1,slow:[1,7],small:[1,2,5,6,9],smaller:[1,2,5],smooth:[2,9],smoothord:2,snippet:2,softwar:[7,8],solut:[1,2,5,9],solv:[1,2,5,6,9],solver:[1,2,5,7],some:[1,2,4,9],sometim:9,son:4,sooner:6,sort:2,sourc:[1,2,7,8,9],space:2,spacecool:2,speci:[1,4],special:[1,8],specif:[1,2,3,6,8,10],specifi:[1,10],specificenthalpytwoport:9,speed:9,speedcontrolled_i:9,spell:2,spike:9,spl2:1,spoken:4,sponsor:3,sqrt:[2,9],src:2,srg:[2,6],stabil:9,stackoverflow:6,stage:1,stall:[1,2,9],standard:[4,10],start:[2,7,9],state:[1,2,3,5,7],statement:2,steadi:1,steadyst:1,steadystateiniti:1,step:[1,4,5,9],stepsiz:9,still:[2,4,6],stop:[1,9],stoptim:9,storag:1,store:[1,2],stream:[2,4,9],strict:8,string:2,structur:1,studi:4,style:7,sub:2,subcontractor:3,subdirectori:2,sublicens:8,submit:6,subsect:2,substanc:[1,2,4],substancedynam:2,substitut:8,subsystem:1,success:1,successfulli:9,suffici:9,suggest:2,sum_:1,summar:4,summari:2,summer:2,sup:2,suppli:2,support:0,suppos:[1,9],suppress:2,sure:[2,6,9],svg:2,symbol:2,symmetr:2,system:[2,4,5,6,7],t_0:1,t_a:9,t_default:1,tab:[1,2,9],tabl:[1,2],tabul:2,tag:2,tair:2,take:[1,2,9],tau:[1,2,9],tcoicoo:9,technic:4,technolog:[0,4],temperatur:[1,2,9],temperaturedependentdens:1,temperaturesensor:1,templat:2,temsen_1:9,temsen_2:9,tend:2,termin:9,terminalunit:2,test:[1,5,6,7,10],text:2,textual:2,than:[1,2,4,5,7,9],thei:[1,2],them:[1,2],theori:[2,8],therebi:[1,9],therefor:[1,9],thereof:[3,8],thermal:1,thermo:[4,5,7,9],thermodynam:2,thermofluid:7,thi:[0,1,2,3,5,6,7,8,9,10],thing:9,those:[2,3],thought:9,thousand:2,three:1,threshold:1,through:[1,5,9],thu:[1,9],thumb:9,til2001:4,tiller:4,time:[1,2,5,9],tip:9,tmix:9,togeth:2,toler:[1,5,9],tool:[2,4,9],top:[1,2],topic:1,tort:8,total:6,tower:2,tpreheacoi:9,trace:[1,4],track:2,trade:3,trademark:3,transfer:4,transform:2,translat:[1,2,7,9],translatemodel:1,transport:[1,4,9],travel:9,tret:9,trigger:[1,9],trim:2,tune:2,turn:[1,9],tutori:[2,4],twatin:2,two:[1,2,9],twowaylinear:9,txt:9,type:[1,7,9],typic:[1,2,5,9],tzon:2,unambigu:2,uncontrol:9,under:[0,2,8,9],understand:[1,2,4],understood:1,unit:[1,3,7,10],univers:[3,4,8],unknown:1,unless:2,unlik:1,unmethour:6,unspecifi:1,unstabl:1,unsuit:2,until:[1,2,5],upgrad:8,upon:3,use:[1,2,3,4,6,7,8,9,10],used:[1,2,4,6,7,8,9,10],useful:4,usefulness:3,user:[1,2,9],usersguid:2,uses:[1,2,3,4,9],using:[1,4,7,9,10],usual:[1,2],util:[2,9],v_flow:2,val:[1,9],valid:7,valu:[2,4,7,9],valv:[1,2,5,9],vapor:[1,4],vari:[2,9],variabl:[2,5,7],variat:4,variou:[1,2],vav:2,vavhot:9,veri:[1,9],verifi:2,version:[1,2,4,9],versu:1,vertic:2,view:[2,3],violat:2,vol:1,volum:[1,2,5,9],wai:[1,8],want:1,warn:2,warrant:3,warranti:[3,8],water:[2,4,7],weather:2,web:4,weight:1,welcom:2,well:[1,2,4],were:[2,10],wetcoildiscret:1,wetter:4,what:[1,2],whatsoev:8,when:[1,2,6,7,9],whenev:[1,2,9],where:[1,2,5,9],whether:[1,2,8],which:[1,2,4,5,7,9],who:4,whole:[5,9],whose:[5,9],why:[1,9],wide:1,wiki:2,wilei:4,winter:2,within:[1,2,5],without:[1,2,8,9],work:[2,3,8,9],workflow:4,would:[1,2,3,9],write:2,write_package_ord:2,written:8,wrong:[1,2],x_0:1,x_i:1,x_ptphi:9,xxx:2,ydam:2,year:9,you:[1,8,9],your:[1,2,6,8],yourself:6,zero:[1,2,9],zone:2},titles:["8. Acknowledgments","2. Best Practice","5. Development","9. Disclaimers","1. Getting Started","7. Glossary","6. Help","User Guide","10. Copyright and License","3. Simulation Performance","4. Pre- and Post-Processing"],titleterms:{"break":9,"class":2,"function":2,"new":2,Adding:2,Use:1,acknowledg:0,algebra:9,algorithm:2,avoid:9,best:1,build:1,connect:9,content:7,contribut:2,control:[1,2,9],copyright:8,correct:9,debug:9,declar:2,descript:2,develop:[2,4],devic:2,disclaim:3,document:2,domin:9,drop:2,equat:[1,2,9],equip:9,error:9,event:9,exampl:9,first:4,flow:[1,2,9],fluid:[1,9],gener:2,get:4,glossari:5,guid:[2,7],guidelin:2,help:6,how:9,incompress:1,inconsist:1,indic:7,initi:1,input:9,iter:1,junction:1,languag:2,larg:1,licens:8,literatur:4,loop:9,mass:9,media:1,model:1,nomin:1,nonlinear:9,numer:9,order:2,organ:1,overdetermin:1,packag:[1,2],paramet:1,perform:9,post:10,practic:1,pre:10,prescrib:9,pressur:[1,2],problem:1,process:10,propag:1,rate:9,reduc:9,refer:[1,4],requir:4,resist:9,run:4,sensor:1,sequenc:2,serial:9,signal:9,simul:[4,9],slow:9,softwar:4,solver:9,start:[1,4],state:9,style:2,system:[1,9],tabl:7,test:2,thermo:1,thermofluid:2,type:2,unit:2,user:[4,7],using:2,valid:2,valu:1,variabl:[1,9],water:1}})
->>>>>>> master
+Search.setIndex({docnames:["acknowledgments","bestPractice","development","disclaimer","gettingStarted","glossary","help","index","legal","performance","prePostProcessing"],envversion:{"sphinx.domains.c":1,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":1,"sphinx.domains.javascript":1,"sphinx.domains.math":2,"sphinx.domains.python":1,"sphinx.domains.rst":1,"sphinx.domains.std":1,sphinx:56},filenames:["acknowledgments.rst","bestPractice.rst","development.rst","disclaimer.rst","gettingStarted.rst","glossary.rst","help.rst","index.rst","legal.rst","performance.rst","prePostProcessing.rst"],objects:{},objnames:{},objtypes:{},terms:{"05ch11231":0,"0e7":9,"2nd":[5,9],"66e":9,"94406e":9,"94407e":9,"94411e":9,"9441e":9,"95e7":9,"9e7":9,"boolean":[2,9],"break":7,"case":[1,2,9],"class":[4,7],"default":[1,2,9],"final":[2,4],"function":[1,4,5,7,8,9,10],"import":2,"long":2,"new":[1,4,6,7],"public":[0,2,4],"return":[1,9],"short":[1,2],"static":1,"switch":[1,9],"transient":1,"true":[1,2,9],"try":1,"while":[1,3,9],AND:8,ARE:8,Adding:[7,9],And:2,BUT:8,But:2,FOR:8,For:[1,2,5,6,9],NOT:8,SUCH:8,Such:1,THE:8,That:2,The:[0,1,2,3,4,5,6,7,8,9,10],Then:[1,2],These:1,USE:8,Use:[0,2,7],Using:[1,9],_nomin:1,_sort_package_ord:2,abl:2,about:[4,6],abov:[1,2,9],abruptli:9,abs:[1,2],ac02:0,academ:4,access:2,account:[1,3],accuraci:3,achiev:[1,9],acknowledg:7,across:[1,5],actual:[1,2,9],actuat:9,adapt:5,add:[1,2,4,9],added:[1,2,5,8,9],adding:9,addit:[1,2,6,10],adequaci:3,adher:2,adjust:[1,9],advanc:[1,2],advic:7,advis:8,affect:1,after:[2,9],again:[2,9],against:2,agenc:3,agreement:8,ahu:2,aid:2,air:[1,2,4,9],algebra:7,algorithm:[1,7],align:2,all:[1,2,6,8,9],allow:[1,2,9],alphabet:2,alreadi:[1,2,6],also:[1,2,4,9],alt:2,altern:[1,2],although:4,alwai:[1,2],amb:9,ambient:9,amount:2,analyt:2,ani:[2,3,8,9],annex:4,annot:[1,2],anoth:[1,2,5,9],antifreez:1,anyon:8,anywai:1,apart:2,app:2,apparatu:3,appear:[2,9],appli:[2,4,9],applic:[1,2],approach:4,approv:3,approxim:[1,2,5,9],argument:9,aris:8,around:[1,2,5,9],arrai:2,ashra:2,assert:2,assertallinsideminmax:2,assign:2,assist:0,assum:3,assumpt:[1,2,7,9],attempt:[1,9],attribut:2,author:[2,3,5,9],autom:[2,4,7,10],automat:2,avail:[1,2,4,7,8],avoid:[1,2,7],awar:2,award:0,back:9,bad:9,balanc:[1,2],bar:[1,2,9],base:[1,2,4,5,7],baseclass:[1,2],bash:2,basic:2,basicflowfunction_dp:2,basicflowfunction_m_flow:2,becam:9,becaus:[1,2,4,9],becom:2,been:[1,3,8],befor:[2,6],begin:[2,5],beginn:4,behav:1,behavior:9,believ:3,below:[1,2,9],benchmark:2,berkelei:8,best:7,better:2,between:[1,2,9],binari:8,block:[1,2,5,9],boi:2,boiler:[1,2],boilerpolynomialclosedloop:1,book:4,border:2,both:[1,2,9],bottom:1,bou:1,bound:[2,5],boundari:1,boundary_pt:1,branch:[1,2],bsd:8,bug:[2,6,8],build:[0,2,4,6,7,9],buildingspi:[2,10],busi:8,c_i:1,calcul:2,california:[0,3,8],call:[1,2],can:[1,2,4,6,7,9,10],cannot:2,carbon:1,carnot_i:2,carri:1,casella:4,caus:[1,2,5,6,8,9],caution:1,cdl:2,cdot:[1,5],cellpad:2,cellspac:2,celsiu:2,center:2,certainli:1,chanc:6,chang:[1,2,4,5,9],chaotic:9,charact:2,check:[1,2,4,6],chiller:[1,2],chillerpl:1,choicesallmatch:1,choos:8,circ:1,circuit:1,circumv:1,claus:8,close:[1,2,9],closedloop:9,co2:4,code:[1,2,8,9],coeffici:9,coil:[1,2,9],collaps:2,com:[2,6],combin:5,command:[1,2],comment:2,commerci:3,commiss:[0,3],commit:9,common:[2,7],commun:4,como:4,compact:2,compar:2,comparison:[1,2,9],complet:3,complex:[1,2,4],compli:2,compon:[1,2,4,9],composit:[1,9],compress:[1,5],comput:[1,2,5,8,9,10],concentr:1,concept:4,concis:[2,4],condit:[1,2,5,8,9],conduct:2,confer:4,configur:[1,2,9],connect:[1,2,7],connector:[1,4],consequ:1,consequenti:8,conserv:1,consid:[1,2,9],consist:[1,2,9],constant:[1,2,5,9],constanteffect:2,constitut:3,construct:[1,2],consult:1,contain:[1,2,3,4,9],continu:[1,2,5,9],contract:[0,8],contractor:3,contribut:[1,7],contributor:8,control:[5,7,10],convect:4,convent:[2,4],converg:[1,5,9],convers:2,convert:[2,5],coocoi:9,cool:[2,9],coolingtow:2,coordinatesystem:2,copi:2,copyright:7,cor:9,correct:[1,2,3,7],correctli:1,correspond:8,cost:10,could:[2,9],coupl:[2,9],cours:1,cover:[2,7],creat:[1,2,6,7,10],cross:[1,9],curv:[1,9],cycl:1,dae:1,dai:2,damag:8,damper:[2,9],dassl:[1,9],data:[1,2,8],debug:[1,7],declar:[1,7],decoupl:[2,9],defaultcomponentnam:2,defin:[1,4,5],definit:[1,4],degc:2,degre:2,delai:[1,2],delet:9,delta:[2,5,9],denot:2,densiti:[1,2,5],depart:[0,8],depend:[1,2,9],dept:8,der:[1,9],deriv:[1,2,5,8],describ:[1,2,4,9],descript:[6,7],design:[1,4,5],detail:[1,4,9],detect:2,determin:9,develop:[0,1,7,9,10],devic:[1,4,7],diagram:[1,2,9],dialog:2,did:9,differ:[1,2,4,9],differenti:[1,2,5,9],difficult:2,dioxid:1,direct:[1,2,4,8],directli:8,directori:[2,10],disabl:2,disapprov:3,disclaim:[7,8],disclos:3,discontinu:2,displayunit:2,distinct:1,distinguish:1,distribut:[1,2,8],divid:2,document:[0,1,3,4,7,8,10],doe:[1,2,3,9,10],domain:1,domin:7,done:[1,2],dot:[1,2,5,9],down:1,download:4,dp_nomin:[1,2,9],dpfixed_nomin:9,dpvalve_nomin:9,drag:2,drastic:9,draw:2,drop:[1,5,7,9],dry:4,dslog:9,dtsup:2,dual:2,dualfandualduct:9,dualfandualductclosedloop:9,duct:[1,9],due:[1,2,4,9],duplic:2,dure:[1,2,9],dv_flow:2,dymola:[1,2,6,9,10],dynam:[1,2,9],dynamicbal:9,dynamicsfreeiniti:1,each:[1,2],earlier:9,easier:[1,4,9],easiest:2,ebc:4,econom:9,editor:[2,4],ef410e:9,effect:[1,2,9],effici:[0,1,2,9],effort:1,either:[2,8],ele:9,element:[1,2,9],elementari:9,elimin:9,elmqvist:4,els:[1,2,9],empir:2,employe:3,empti:2,enabl:9,encount:9,end:[0,1,2,5,9],endors:[3,8],energi:[0,1,2,3,4,5,8,9],energydynam:[1,2],energyplu:2,enforc:2,engin:1,english:4,enhanc:8,enlarg:2,ensur:[2,9],enter:[1,2,6],enthalpi:[1,9],entri:9,environ:6,eps:2,epsilon:1,equal:[1,2,9],equat:[5,7],equilibrium:1,equip:[2,7],equival:9,error:[1,2,6,7],essenti:4,estim:1,evalu:2,even:[1,8],event:[1,2,7,8],everi:9,everyon:6,exact:9,exactli:1,exampl:[1,2,4,5,7,10],exce:9,except:[1,2],exchang:[1,2,5],exclus:8,execut:2,exemplari:8,exhaust:2,exhaustdamp:2,exhibit:1,exist:[2,4],expand:2,expans:1,expansionvessel:1,expect:[1,6],experi:1,experienc:1,experiment:2,explain:[1,2,4,9],explan:4,explicitli:1,express:[3,8,9],extend:[1,2],extens:4,extent:2,extrem:9,fail:[1,2],fals:9,fan:[1,9],fanc:9,fanret:9,fansupcol:9,fansuphot:9,far:2,fast:[1,5],faster:9,favor:3,fd01:9,featur:8,few:9,fig:[1,2,9],figur:[1,2,9],file:[2,6,7,9,10],filter:[5,9],filteredopen:9,filteredspe:9,find:[6,9],fine:9,finit:2,first:[2,7],fit:[2,8],fix:[1,2,6,7,8,9],fixediniti:1,fixedresist:[2,9],fixedresistancedpm:2,fixm:2,flow:[4,5,7],flowcircuit:1,flowcontrolled_m_flow:9,flowmodel:2,fluid:[2,4,5,7],follow:[1,2,4,7,8,9],font:2,forc:9,forget:2,form:[1,2,8],format:[2,10],formul:[2,9],found:[4,7],foundat:4,four:1,fra2009a:4,fra2009b:4,frac:[2,5,9],fraction:1,frank:4,free:[7,8],fri2004:4,fri2011:4,friction:9,fritzson:4,from:[1,2,4,8,9],from_dp:9,front:2,full:[1,2,9],fulli:5,further:[2,4,9],g36_pr1:2,gain:[2,9],gas:1,gave:9,gener:[1,6,7,9,10],genopt:10,geometri:1,get:7,getinstancenam:2,github:[2,6],give:[1,2,4],global:9,glossari:7,good:[1,2,8],gov:[4,10],govern:[2,3],grant:8,graphic:2,grid:2,group:[2,6],grow:9,gui:1,guid:[1,4,9],guidanc:2,guidelin:[4,7],h_1:1,h_a:9,h_i:1,h_outflow:9,had:9,halt:9,hand:2,handl:[4,9],handler:2,happen:1,hard:2,has:[1,2,3,5,8,9],have:[1,2,9],head:2,header:2,heat:[1,2,4,5,9],heater:1,heatercooler_u:2,heatexchang:2,heattransf:4,help:[1,7],henc:[1,2,4,6,9],here:1,herebi:8,herein:3,hidden:2,hierarchi:2,high:9,higher:[1,5,6,9],highlight:9,hmed:9,holder:8,homotopi:2,how:[1,2,4,7,10],howev:[1,2,8,9],href:2,html:[2,4],http:[2,4,6,10],humid:[1,2],humidifi:[1,2],humidifier_u:2,hvac:[1,2],hyperlink:2,hysteresi:[1,2,9],icon:2,ideal:[1,2,9],ident:1,iea:4,ieee:4,illustr:[1,9],imag:2,img:2,implement:[1,2,9],impli:[3,8],impos:[1,8],improv:[1,2,9],incident:8,inclin:2,includ:[1,2,5,8],incompress:[5,7],inconsist:7,incorpor:8,incorrect:2,increas:[1,2,9],indent:2,index:7,indic:2,indirect:8,individu:[1,4,9],industri:4,inequ:[1,2,9],inertia:9,infin:2,influenc:2,info:2,inform:[2,3,4,6,7,9,10],infring:3,inherit:2,initi:7,inkscap:2,inlet:[2,9],input:[1,2,5,7],insert:2,inspect:9,instabl:2,instal:8,instanc:[1,2],instant:[1,2,9],instanti:2,instantli:9,instead:[1,2],instream:9,instruct:[4,7],integ:2,integr:[1,2,9],intend:1,intent:[1,2],interact:[1,4],interest:[0,1,2],interfac:[1,2,4],intern:[2,4],interrupt:8,intersect:9,interv:9,introduc:[1,2,9],introduct:[2,4],invalid:2,invers:2,invert:2,invit:6,invok:2,involv:2,isbn:4,isol:[1,9],issu:[2,6],ital:2,itali:4,item:2,iter:[2,5,7,9],its:[1,2,3,4,8,9],jacobian:2,john:4,join:6,json:2,junction:[7,9],just:9,k_f:9,k_v:9,keep:2,kelvin:[1,2,9],keyword:2,kluwer:4,know:2,knowledg:2,known:[1,2,6],label:2,laboratori:8,languag:[4,7,10],larg:[2,7,9],larger:9,last:9,later:9,law:1,lawrenc:8,lbl:[2,4,6,10],lbnl:10,lead:[1,2,9],least:2,left:1,leg:5,legal:3,length:[2,5],let:1,level:[1,2],liabil:[3,8],liabl:8,librai:6,librari:[1,2,4,6,7,10],licens:[2,7],lift:9,like:[1,9],limit:[1,2,8,9],line:[2,9],linear:[2,9],link:4,linux:2,list:[2,4,8],literatur:7,load:[1,2,9],local:9,locat:1,log:[2,9],logic:2,logstartvaluesforiterationvari:1,longer:1,look:2,loop:[2,7],loss:8,low:[5,9],lower:2,lump:[1,2,9],m_0:2,m_1:1,m_2:1,m_flow:9,m_flow_nomin:[1,2,9],m_flow_smal:[1,2],m_i:1,machin:9,made:[1,2],magnitud:[1,5,9],mai:[1,2,4,6,7,8,9],main:2,maintain:2,make:[2,3,4,6,8,9],mani:[1,2,9],manufactur:[1,3],mark:2,mas:9,mass:[1,2,4,5,7],massdynam:1,massexchang:2,massflowr:[1,2],massflowsource_t:[1,9],master:2,mat:10,materi:8,math:[2,9],mathbb:1,mathrm:1,matlab:10,mattsson:4,max:2,mayb:9,mbe:4,mean:[1,2,5],measur:[1,2,9],mechan:5,media:[2,7],medium:[1,2,4,5,9],menu:1,merchant:8,merg:2,merkel:2,merkelenergyplu:2,messag:[1,2],met:8,method:9,michael:4,millisecond:9,min:2,minimum:2,minu:2,miss:2,mix:[1,9],mixingvolum:1,mockup:4,mode:2,model:[2,4,6,7,9,10],modelica:[1,2,4,6,7,9,10],modif:8,modifi:[2,8],modul:7,moist:4,moistair:1,more:[1,2,4,9],most:[1,9],move:[2,5],mover:9,much:[6,9],multipl:[1,2,4,7,9],must:[1,2,8,9],mwat_flow:2,mylibrari:1,name:[1,2,3,8,9],nation:8,necessari:5,necessarili:3,need:[1,2,4,6,9],neg:2,neglect:1,neglig:[1,8,9],neighborhood:9,neither:[3,8],network:[1,9],never:[1,2],newton:[1,2,5],next:[1,2],node:2,nois:[1,2,5,9],nomin:[2,7],non:[2,5,8,9],nonlinear:[1,2,5,7],nor:[3,8],normal:2,note:[1,2,4,8,9],notic:[2,8],now:[1,9],number:[0,1,2,5,9],numer:[1,2,4,5,7],obc:2,object:[2,4],oblig:8,observ:[1,6],obsolet:2,obtain:[1,2],obviou:2,occur:[1,9],off:1,offic:0,often:[1,2,9],older:4,olsson:4,omit:2,one:[1,2,9],ones:[2,4],onli:[1,2,9],onlin:4,open:[2,5,6,7],openbuildingcontrol:2,openmodelica:[4,10],oper:[1,2,4,6,8,9],opinion:3,oppos:2,opposit:5,optim:10,optimica:2,option:[1,2,9],order:[5,7,9],ordinari:[5,9],org:[2,4],organ:7,orient:4,origin:2,oscil:9,oscillatori:9,other:[1,2,4,8,9],otherwis:[2,3,8,9],otter:4,our:9,out:[1,8,9],outlet:9,output:[1,2,5,7,9,10],outsid:[1,2,9],over:2,overdetermin:7,overhead:1,overspecifi:1,overview:4,overwrit:2,overwritten:1,own:3,owner:8,p_0:[1,2,5],p_default:1,p_v:5,packag:[4,7,9],page:[2,4,7],pai:1,pane:2,paper:4,paragraph:8,paramet:[2,4,7,9],part:[2,6,9,10],parti:3,partial:2,partialabsolutesensor:2,partialmedium:1,partialresist:2,particular:8,particularli:9,pascal:2,pass:[3,5,9],passag:2,patch:8,path:2,per:[1,2],perfectgas:1,perform:[2,7,8],permiss:8,permit:8,perpetu:8,peter:4,phenomena:[1,4,7],phi:2,physic:[1,2,4,7],pipe:[1,9],place:2,placement:2,pleas:[2,6],plot:[5,9],pmatrix:5,png:2,point:[1,2,9],polynomi:2,port:[1,2],port_a:9,posit:[2,5],possibl:[1,2,6,8,9],post:7,practic:7,pre:[7,9],precomput:2,prefer:2,prepar:[3,8],prescrib:7,present:[1,2],preserveaspectratio:2,press:4,presssur:1,pressur:[5,7,9],pressuredrop:[1,2,9],primarysystem:2,principl:[4,9],printfailuretodifferenti:2,prior:8,priorit:2,privat:3,problem:[2,6,7,9,10],problemat:9,proc:4,process:[2,3,7],processor:2,procur:8,produc:[1,2],product:[1,3,8],proelss:4,profit:8,progess:9,program:[0,10],programmat:2,project:2,promot:8,propag:7,proper:1,properti:1,propyleneglycolwat:1,protect:2,provid:[1,2,6,7,8,9,10],publicli:8,publish:[1,4],pull:2,pum:1,pump:[1,9],purpos:8,put:2,python:[2,10],quadrat:2,quantiti:[1,2],question:6,quickli:6,radau:[1,9],radiat:1,rais:[2,9],raisetim:9,rang:[2,9],rapidli:[1,9],rate:[1,2,4,5,7],rather:[1,2,7],ratio:9,read:[2,4],readabl:2,reader:2,real:[1,2,5,9],realinput:2,realist:2,realiz:6,realoutput:2,reason:[1,2],receiv:1,recommend:[1,2,3,4,9],record:2,redeclar:[1,9],redistribut:8,reduc:[1,2,7],redund:2,refactor:2,refer:[2,3,5,7],referenc:2,reflect:3,regard:6,regardless:9,regent:[3,8],region:[1,2],regress:2,regstep:9,regular:[1,2,5,9],rel:[1,2],relat:[1,2,9],releas:2,relev:4,remain:[1,2],remov:[1,2,9],renew:0,replac:[1,2,4,9],report:[3,4,6],repositori:2,repres:[1,2,3],reproduc:[6,8,9],request:2,requir:[1,2,7,9],res1:[1,9],res2:9,res3:1,res:9,research:0,resembl:2,reserv:8,residu:9,resist:[1,2,7],resourc:2,respect:[1,2],respond:2,respons:[1,3,5,9],restart:9,result:[1,2,3,6,10],resultfil:9,retain:8,retun:9,reusabl:2,revers:[1,4],revis:[2,8,9],rho:1,right:[3,8,9],robust:[1,2,9],room:[1,2],root:[6,9],rotat:9,rotor:9,royalti:8,rule:[2,9],run:[1,2,7,9,10],safe:2,same:[1,2,4,9],sampl:[1,2],sampler:[1,2],satisfactori:9,satisfi:5,save:[1,6],scalar:[1,2],schemat:[1,2,9],script:[2,10],search:[4,6,7],search_foss:4,search_languag:4,second:[2,5,9],secretari:0,section:[1,2,4,9],see:[1,2,4,5,6,9,10],seem:9,select:[1,6,9],sen:1,senden:2,sensor:[2,7,9],sent:9,separ:[2,8,9,10],sept:4,sequenc:7,seri:[1,2,9],serial:7,serv:2,servic:[3,8],set:[1,2,9],setpoint:2,setup:9,shall:[2,8],share:2,should:[1,2,5],shoulder:2,show:[1,2,9],shown:[1,2,9],sielemann:4,sign:[2,9],signal:[1,2,5,7],signific:2,significantli:[2,9],similar:[1,2,4,7],similarli:1,simpl:[2,9],simpler:1,simul:[1,2,6,7,10],simulatemodel:9,simulationresearch:[4,10],sinc:1,singl:2,singlezon:2,singular:[1,2],situat:[1,2,9],siunit:[1,2],size:[1,2,9],skip:1,slight:9,slightli:1,slow:[1,7],small:[1,2,5,6,9],smaller:[1,2,5],smooth:[2,9],smoothord:2,snippet:2,softwar:[7,8],solut:[1,2,5,9],solv:[1,2,5,6,9],solver:[1,2,5,7],some:[1,2,4,9],sometim:9,son:4,sooner:6,sort:2,sourc:[1,2,7,8,9],space:2,spacecool:2,speci:[1,4],special:[1,8],specif:[1,2,3,6,8,10],specifi:[1,10],specificenthalpytwoport:9,speed:9,speedcontrolled_i:9,spell:2,spike:9,spl2:1,spoken:4,sponsor:3,sqrt:[2,9],src:2,srg:[2,6],stabil:9,stackoverflow:6,stage:1,stall:[1,2,9],standard:[4,10],start:[2,7,9],state:[1,2,3,5,7],statement:2,steadi:1,steadyst:1,steadystateiniti:1,step:[1,4,5,9],stepsiz:9,still:[2,4,6],stop:[1,9],stoptim:9,storag:1,store:[1,2],stream:[2,4,9],strict:8,string:2,structur:1,studi:4,style:7,sub:2,subcontractor:3,subdirectori:2,sublicens:8,submit:6,subsect:2,substanc:[1,2,4],substancedynam:2,substitut:8,subsystem:1,success:1,successfulli:9,suffici:9,suggest:2,sum_:1,summar:4,summari:2,summer:2,sup:2,suppli:2,support:0,suppos:[1,9],suppress:2,sure:[2,6,9],svg:2,symbol:2,symmetr:2,system:[2,4,5,6,7],t_0:1,t_a:9,t_default:1,tab:[1,2,9],tabl:[1,2],tabul:2,tag:2,tair:2,take:[1,2,9],tau:[1,2,9],tcoicoo:9,technic:4,technolog:[0,4],temperatur:[1,2,9],temperaturedependentdens:1,temperaturesensor:1,templat:2,temsen_1:9,temsen_2:9,tend:2,termin:9,terminalunit:2,test:[1,5,6,7,10],text:2,textual:2,than:[1,2,4,5,7,9],thei:[1,2],them:[1,2],theori:[2,8],therebi:[1,9],therefor:[1,9],thereof:[3,8],thermal:1,thermo:[4,5,7,9],thermodynam:2,thermofluid:7,thi:[0,1,2,3,5,6,7,8,9,10],thing:9,those:[2,3],thought:9,thousand:2,three:1,threshold:1,through:[1,5,9],thu:[1,9],thumb:9,til2001:4,tiller:4,time:[1,2,5,9],tip:9,tmix:9,togeth:2,toler:[1,5,9],tool:[2,4,9],top:[1,2],topic:1,tort:8,total:6,tower:2,tpreheacoi:9,trace:[1,4],track:2,trade:3,trademark:3,transfer:4,transform:2,translat:[1,2,7,9],translatemodel:1,transport:[1,4,9],travel:9,tret:9,trigger:[1,9],trim:2,tune:2,turn:[1,9],tutori:[2,4],twatin:2,two:[1,2,9],twowaylinear:9,txt:9,type:[1,7,9],typic:[1,2,5,9],tzon:2,unambigu:2,uncontrol:9,under:[0,2,8,9],understand:[1,2,4],understood:1,unit:[1,3,7,10],univers:[3,4,8],unknown:1,unless:2,unlik:1,unmethour:6,unspecifi:1,unstabl:1,unsuit:2,until:[1,2,5],upgrad:8,upon:3,use:[1,2,3,4,6,7,8,9,10],used:[1,2,4,6,7,8,9,10],useful:4,usefulness:3,user:[1,2,9],usersguid:2,uses:[1,2,3,4,9],using:[1,4,7,9,10],usual:[1,2],util:[2,9],v_flow:2,val:[1,9],valid:7,valu:[2,4,7,9],valv:[1,2,5,9],vapor:[1,4],vari:[2,9],variabl:[2,5,7],variat:4,variou:[1,2],vav:2,vavhot:9,veri:[1,9],verifi:2,version:[1,2,4,9],versu:1,vertic:2,view:[2,3],violat:2,vol:1,volum:[1,2,5,9],wai:[1,8],want:1,warn:2,warrant:3,warranti:[3,8],water:[2,4,7],weather:2,web:4,weight:1,welcom:2,well:[1,2,4],were:[2,10],wetcoildiscret:1,wetter:4,what:[1,2],whatsoev:8,when:[1,2,6,7,9],whenev:[1,2,9],where:[1,2,5,9],whether:[1,2,8],which:[1,2,4,5,7,9],who:4,whole:[5,9],whose:[5,9],why:[1,9],wide:1,wiki:2,wilei:4,winter:2,within:[1,2,5],without:[1,2,8,9],work:[2,3,8,9],workflow:4,would:[1,2,3,9],write:2,write_package_ord:2,written:8,wrong:[1,2],x_0:1,x_i:1,x_ptphi:9,xxx:2,ydam:2,year:9,you:[1,8,9],your:[1,2,6,8],yourself:6,zero:[1,2,9],zone:2},titles:["8. Acknowledgments","2. Best Practice","5. Development","9. Disclaimers","1. Getting Started","7. Glossary","6. Help","User Guide","10. Copyright and License","3. Simulation Performance","4. Pre- and Post-Processing"],titleterms:{"break":9,"class":2,"function":2,"new":2,Adding:2,Use:1,acknowledg:0,algebra:9,algorithm:2,avoid:9,best:1,build:1,connect:9,content:7,contribut:2,control:[1,2,9],copyright:8,correct:9,debug:9,declar:2,descript:2,develop:[2,4],devic:2,disclaim:3,document:2,domin:9,drop:2,equat:[1,2,9],equip:9,error:9,event:9,exampl:9,first:4,flow:[1,2,9],fluid:[1,9],gener:2,get:4,glossari:5,guid:[2,7],guidelin:2,help:6,how:9,incompress:1,inconsist:1,indic:7,initi:1,input:9,iter:1,junction:1,languag:2,larg:1,licens:8,literatur:4,loop:9,mass:9,media:1,model:1,nomin:1,nonlinear:9,numer:9,order:2,organ:1,overdetermin:1,packag:[1,2],paramet:1,perform:9,post:10,practic:1,pre:10,prescrib:9,pressur:[1,2],problem:1,process:10,propag:1,rate:9,reduc:9,refer:[1,4],requir:4,resist:9,run:4,sensor:1,sequenc:2,serial:9,signal:9,simul:[4,9],slow:9,softwar:4,solver:9,start:[1,4],state:9,style:2,system:[1,9],tabl:7,test:2,thermo:1,thermofluid:2,type:2,unit:2,user:[4,7],using:2,valid:2,valu:1,variabl:[1,9],water:1}})
\ No newline at end of file
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/workArounds.html b/Buildings/Resources/Documentation/userGuide/build/html/workArounds.html
deleted file mode 100644
index 6434e5e35a8..00000000000
--- a/Buildings/Resources/Documentation/userGuide/build/html/workArounds.html
+++ /dev/null
@@ -1,331 +0,0 @@
-
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset="utf-8" />
-    <title>3. Work-Arounds &#8212; Buildings Library User Guide</title>
-    <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    <link rel="stylesheet" type="text/css" href="_static/bootstrap.css" />
-    <link rel="stylesheet" type="text/css" href="_static/bootstrap-theme.css" />
-    <link rel="stylesheet" type="text/css" href="_static/bootstrap_custom.css" />
-    <link rel="stylesheet" type="text/css" href="_static/custom.css" />
-    <link rel="stylesheet" type="text/css" href="_static/custom-sphinx.css" />
-    <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <script type="text/javascript" src="_static/language_data.js"></script>
-    <script async="async" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-    <link rel="shortcut icon" href="_static/lbl-icon.ico"/>
-    <link rel="index" title="Index" href="genindex.html" />
-    <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="4. Pre- and Post-Processing" href="prePostProcessing.html" />
-    <link rel="prev" title="2. Best Practice" href="bestPractice.html" />
-<meta charset='utf-8'>
-<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
-<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
-<meta name="apple-mobile-web-app-capable" content="yes">
-<script type="text/javascript" src="_static/js/jquery-1.11.0.min.js "></script>
-<script type="text/javascript" src="_static/js/jquery-fix.js "></script>
-<script type="text/javascript" src="_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
-<script type="text/javascript" src="_static/bootstrap-sphinx.js "></script>
-
-  </head><body>
-
-  <div id="navbar" class="navbar navbar-default ">
-    <div class="container-fluid">
-      <div class="navbar-header">
-        <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="index.html"><img src="_static/lbl-logo.png">
-           </a>
-        <span class="navbar-text navbar-version pull-left"><b></b></span>
-      </div>
-
-        <div class="collapse navbar-collapse nav-collapse">
-          <ul class="nav navbar-nav">
-            
-                <li><a href="https://simulationresearch.lbl.gov/modelica">Home</a></li>
-                <li><a href="index.html">User Guide</a></li>
-            
-            
-              <li class="dropdown globaltoc-container">
-  <a role="button"
-     id="dLabelGlobalToc"
-     data-toggle="dropdown"
-     data-target="#"
-     href="index.html">Site <b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc"
-      role="menu"
-      aria-labelledby="dLabelGlobalToc"><ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="gettingStarted.html">1. Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-users">1.1. Literature for Users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#literature-for-developers">1.2. Literature for Developers</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#software-requirements">1.3. Software Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#running-the-first-simulations">1.4. Running the First Simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="gettingStarted.html#references">1.5. References</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="bestPractice.html">2. Best Practice</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#organization-of-packages">2.1. Organization of packages</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#building-large-system-models">2.2. Building large system models</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#propagating-parameters-and-media-packages">2.3. Propagating parameters and media packages</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#thermo-fluid-systems">2.4. Thermo-fluid systems</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#start-values-of-iteration-variables">2.5. Start values of iteration variables</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#avoiding-events">2.6. Avoiding events</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#controls">2.7. Controls</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#examples-for-how-to-debug-and-correct-slow-simulations">2.8. Examples for how to debug and correct slow simulations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="bestPractice.html#numerical-solvers">2.9. Numerical solvers</a></li>
-</ul>
-</li>
-<li class="toctree-l1 current"><a class="current reference internal" href="#">3. Work-Arounds</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="prePostProcessing.html">4. Pre- and Post-Processing</a></li>
-<li class="toctree-l1"><a class="reference internal" href="development.html">5. Development</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="development.html#contributing">5.1. Contributing</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#guidelines-for-contributions">5.2. Guidelines for contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#adding-a-new-class">5.3. Adding a new class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="development.html#validation">5.4. Validation</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="help.html">6. Help</a></li>
-<li class="toctree-l1"><a class="reference internal" href="glossary.html">7. Glossary</a></li>
-<li class="toctree-l1"><a class="reference internal" href="acknowledgments.html">8. Acknowledgments</a></li>
-<li class="toctree-l1"><a class="reference internal" href="disclaimer.html">9. Disclaimers</a></li>
-<li class="toctree-l1"><a class="reference internal" href="legal.html">10. Copyright and License</a></li>
-</ul>
-</ul>
-</li>
-              
-                <li class="dropdown">
-  <a role="button"
-     id="dLabelLocalToc"
-     data-toggle="dropdown"
-     data-target="#"
-     href="#">Page <b class="caret"></b></a>
-  <ul class="dropdown-menu localtoc"
-      role="menu"
-      aria-labelledby="dLabelLocalToc"><ul>
-<li><a class="reference internal" href="#">3. Work-Arounds</a><ul>
-<li><a class="reference internal" href="#avoiding-step-changes">3.1. Avoiding step changes</a></li>
-<li><a class="reference internal" href="#breaking-algebraic-loops">3.2. Breaking algebraic loops</a></li>
-<li><a class="reference internal" href="#reducing-nonlinear-equations-of-serially-connected-flow-resistances">3.3. Reducing nonlinear equations of serially connected flow resistances</a></li>
-<li><a class="reference internal" href="#prescribed-mass-flow-rate">3.4. Prescribed mass flow rate</a></li>
-<li><a class="reference internal" href="#avoiding-overspecified-initialization-problems">3.5. Avoiding overspecified initialization problems</a></li>
-</ul>
-</li>
-</ul>
-</ul>
-</li>
-              
-            
-            
-              
-                
-  <li>
-    <a href="bestPractice.html" title="Previous Chapter: 2. Best Practice"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; 2. Best Practice</span>
-    </a>
-  </li>
-  <li>
-    <a href="prePostProcessing.html" title="Next Chapter: 4. Pre- and Post-Processing"><span class="glyphicon glyphicon-chevron-right visible-sm"></span><span class="hidden-sm hidden-tablet">4. Pre- and P... &raquo;</span>
-    </a>
-  </li>
-              
-            
-            
-            
-            
-          </ul>
-
-<!--
-          
-            
-<form class="navbar-form navbar-right" action="search.html" method="get">
- <div class="form-group">
-  <input type="text" name="q" class="form-control" placeholder="Search" />
- </div>
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-          
--->
-        </div>
-    </div>
-  </div>
-
-<div class="container">
-  <div class="row">
-    <div class="body col-md-12 content" role="main">
-      
-  <div class="section" id="work-arounds">
-<h1>3. Work-Arounds<a class="headerlink" href="#work-arounds" title="Permalink to this headline">¶</a></h1>
-<p>This section describes work-arounds that often help if there are problems during the model translation, initialization or simulation.</p>
-<div class="section" id="avoiding-step-changes">
-<h2>3.1. Avoiding step changes<a class="headerlink" href="#avoiding-step-changes" title="Permalink to this headline">¶</a></h2>
-<p>All flow machines (fans and pumps) have a boolean parameter
-<code class="docutils literal notranslate"><span class="pre">filteredSpeed</span></code>, and all actuators have a boolean parameter
-<code class="docutils literal notranslate"><span class="pre">filteredOpening</span></code>.
-If set to <code class="docutils literal notranslate"><span class="pre">true</span></code>, which is the default setting, then the control input signal is sent to
-a <a class="reference internal" href="glossary.html#term-2nd-order-low-pass-filter"><span class="xref std std-term">2nd order low pass filter</span></a> that changes a step signal to a smooth signal.
-This typically improves the robustness of the simulation.</p>
-<p>To see the effect of the filter, consider the model below
-in which <code class="docutils literal notranslate"><span class="pre">fanS</span></code> is configured with
-<code class="docutils literal notranslate"><span class="pre">filteredSpeed=false</span></code>, and <code class="docutils literal notranslate"><span class="pre">fanC</span></code> is configured with
-<code class="docutils literal notranslate"><span class="pre">filteredSpeed=true</span></code>.
-Both fans are connected to a step input signal.
-The configuration of <code class="docutils literal notranslate"><span class="pre">fanS</span></code> causes the fan speed to instantly change from 0 to 1. In large system models, this can lead to high computing time or to convergence problems. The <code class="docutils literal notranslate"><span class="pre">fanC</span></code> avoids this problem because the speed of the fan varies continuously, thereby making it easier for the solver to compute a solution. In this model, we set the parameter
-<code class="docutils literal notranslate"><span class="pre">raiseTime=30</span></code> seconds.</p>
-<div class="figure align-default" id="id2">
-<span id="figurefilteredresponse"></span><img alt="_images/fanStepSchematics.png" src="_images/fanStepSchematics.png" />
-<p class="caption"><span class="caption-number">Fig. 3.1 </span><span class="caption-text">Schematic diagram of fans that are configured with <code class="docutils literal notranslate"><span class="pre">filteredSpeed=false</span></code> (<code class="docutils literal notranslate"><span class="pre">fanS</span></code>) and <code class="docutils literal notranslate"><span class="pre">filteredSpeed=true</span></code> (<code class="docutils literal notranslate"><span class="pre">fanC</span></code>).</span><a class="headerlink" href="#id2" title="Permalink to this image">¶</a></p>
-</div>
-<div class="figure align-default" id="id3">
-<img alt="_images/fanStepResponse.png" src="_images/fanStepResponse.png" />
-<p class="caption"><span class="caption-number">Fig. 3.2 </span><span class="caption-text">Mass flow rate of the two fans for a step input signal at 0 seconds.</span><a class="headerlink" href="#id3" title="Permalink to this image">¶</a></p>
-</div>
-<p>For fans and pumps, the dynamics introduced by the filter can be thought of as approximating
-the rotational inertia of the fan rotor and the inertia of the fluid in the duct or piping network.
-The default value is <code class="docutils literal notranslate"><span class="pre">raiseTime=30</span></code> seconds.</p>
-<p>For actuators, the raise time approximates the travel time of the valve lift.
-The default value is <code class="docutils literal notranslate"><span class="pre">raiseTime=120</span></code> seconds.</p>
-<div class="admonition note">
-<p class="admonition-title">Note</p>
-<p>When changing <code class="docutils literal notranslate"><span class="pre">filteredSpeed</span></code> (or <code class="docutils literal notranslate"><span class="pre">filteredOpening</span></code>),
-or when changing the value of <code class="docutils literal notranslate"><span class="pre">raiseTime</span></code>, the dynamic
-response of the closed loop control changes. Therefore,
-control gains may need to be retuned to ensure satisfactory
-closed loop control performance.</p>
-</div>
-<p>For further information, see the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers_UsersGuide.html">User’s Guide of the flow machine package</a>, and the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Actuators_UsersGuide.html">User’s Guide of the actuator package</a>.</p>
-</div>
-<div class="section" id="breaking-algebraic-loops">
-<h2>3.2. Breaking algebraic loops<a class="headerlink" href="#breaking-algebraic-loops" title="Permalink to this headline">¶</a></h2>
-<p>In fluid flow systems, flow junctions where mass flow rates separate and mix can couple non-linear systems of equations. This leads to larger systems of coupled equations that need to be solved, which often causes larger computing time and can sometimes cause convergence problems.
-To decouple these systems of equations, in the model of a flow splitter or mixer (model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop">Buildings.Fluid.FixedResistances.PressureDrop</a>), or in models for fans or pumps (such as the model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y">Buildings.Fluid.Movers.SpeedControlled_y</a>), the parameter <code class="docutils literal notranslate"><span class="pre">dynamicBalance</span></code> can be set to <code class="docutils literal notranslate"><span class="pre">true</span></code>. This adds a control volume at the fluid junction that can decouple the system of equations.</p>
-</div>
-<div class="section" id="reducing-nonlinear-equations-of-serially-connected-flow-resistances">
-<h2>3.3. Reducing nonlinear equations of serially connected flow resistances<a class="headerlink" href="#reducing-nonlinear-equations-of-serially-connected-flow-resistances" title="Permalink to this headline">¶</a></h2>
-<p>In fluid flow systems, if multiple components are connected in series,
-then computing the pressure drop due to flow friction in the
-individual components can lead to coupled nonlinear systems of equations.
-While this is no problem for small models, the iterative solution can lead to higher computing time, particularly in large models where other equations may
-be part of the residual function.</p>
-<p>For illustration, consider the simple system shown below in which the flow resistances <code class="docutils literal notranslate"><span class="pre">res1</span></code> and <code class="docutils literal notranslate"><span class="pre">res2</span></code> compute the mass flow rate as
-<span class="math notranslate nohighlight">\(\dot m = k \, \sqrt{\Delta p}\)</span> if the parameter <code class="docutils literal notranslate"><span class="pre">from_dp</span></code> is set to <code class="docutils literal notranslate"><span class="pre">true</span></code>, or otherwise compute the pressure drop between their inlet and outlet as <span class="math notranslate nohighlight">\(\Delta p = (\dot m / k)^2\)</span>. (Both formulations are implemented using <a class="reference internal" href="glossary.html#term-regularization"><span class="xref std std-term">regularization</span></a> near zero.)</p>
-<div class="figure align-default" id="id4">
-<img alt="_images/resistancesSeries.png" src="_images/resistancesSeries.png" />
-<p class="caption"><span class="caption-number">Fig. 3.3 </span><span class="caption-text">Schematic diagram of two flow resistances in series that connect a source and a volume.</span><a class="headerlink" href="#id4" title="Permalink to this image">¶</a></p>
-</div>
-<p>Depending on the configuration of the individual component models, simulating this system model may require the iterative solution of a nonlinear equation to compute the mass flow rate or the pressure drop.
-To avoid a nonlinear equation, use any of the measures below.</p>
-<blockquote>
-<div><ul class="simple">
-<li><p>Set the parameter <code class="docutils literal notranslate"><span class="pre">res2(dp_nominal=0)</span></code>, and add the pressure drop to the parameter <code class="docutils literal notranslate"><span class="pre">dp_nominal</span></code> of the model <code class="docutils literal notranslate"><span class="pre">res1</span></code>. This will eliminate the equation that computes the flow friction in <code class="docutils literal notranslate"><span class="pre">res2</span></code>, thereby avoiding a nonlinear equation. The same applies if there are multiple components in series, such as a pre-heat coil, a heating coil and a cooling coil.</p></li>
-<li><p>Set <code class="docutils literal notranslate"><span class="pre">from_dp=false</span></code> in all components, which is the default setting. This will cause Modelica to use a function that computes the pressure drop as a function of the mass flow rate. Therefore, a code translator is likely to generate an equation that solves for the mass flow rate, and it then uses the mass flow rate to compute the pressure drop of the components that are connected in series.</p></li>
-</ul>
-</div></blockquote>
-<p>Control valves also allow lumping the pressure drop into the model of the valve. Consider the situation where a fixed flow resistance is in series with a control valve as shown below.</p>
-<div class="figure align-default" id="id5">
-<img alt="_images/resistanceValveSeries.png" src="_images/resistanceValveSeries.png" />
-<p class="caption"><span class="caption-number">Fig. 3.4 </span><span class="caption-text">Schematic diagram of a fixed flow resistance and a valve in series  that connect a source and a volume.</span><a class="headerlink" href="#id5" title="Permalink to this image">¶</a></p>
-</div>
-<p>Suppose the parameters are</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Buildings</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">FixedResistances</span><span class="o">.</span><span class="n">PressureDrop</span> <span class="n">res</span><span class="p">(</span>
-  <span class="kr">redeclare</span> <span class="kr">package</span> <span class="nc">Medium</span> <span class="o">=</span> <span class="n">Medium</span><span class="p">,</span>
-  <span class="n">m_flow_nominal</span><span class="o">=</span><span class="mf">0.2</span><span class="p">,</span>
-  <span class="n">dp_nominal</span><span class="o">=</span><span class="mi">10000</span><span class="p">);</span>
-
-<span class="n">Buildings</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Actuators</span><span class="o">.</span><span class="n">Valves</span><span class="o">.</span><span class="n">TwoWayLinear</span> <span class="n">val</span><span class="p">(</span>
-  <span class="kr">redeclare</span> <span class="kr">package</span> <span class="nc">Medium</span> <span class="o">=</span> <span class="n">Medium</span><span class="p">,</span>
-  <span class="n">m_flow_nominal</span><span class="o">=</span><span class="mf">0.2</span><span class="p">,</span>
-  <span class="n">dpValve_nominal</span><span class="o">=</span><span class="mi">5000</span><span class="p">);</span>
-</pre></div>
-</div>
-<p>To avoid a nonlinear equation, the flow resistance could be deleted as shown below.</p>
-<div class="figure align-default" id="id6">
-<img alt="_images/valveNoResistance.png" src="_images/valveNoResistance.png" />
-<p class="caption"><span class="caption-number">Fig. 3.5 </span><span class="caption-text">Schematic diagram of a valve that connects a source and a volume.</span><a class="headerlink" href="#id6" title="Permalink to this image">¶</a></p>
-</div>
-<p>If the valve is configured as</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">Buildings</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Actuators</span><span class="o">.</span><span class="n">Valves</span><span class="o">.</span><span class="n">TwoWayLinear</span> <span class="n">val</span><span class="p">(</span>
-  <span class="kr">redeclare</span> <span class="kr">package</span> <span class="nc">Medium</span> <span class="o">=</span> <span class="n">Medium</span><span class="p">,</span>
-  <span class="n">m_flow_nominal</span><span class="o">=</span><span class="mf">0.2</span><span class="p">,</span>
-  <span class="n">dpValve_nominal</span><span class="o">=</span><span class="mi">5000</span><span class="p">,</span>
-  <span class="n">dpFixed_nominal</span><span class="o">=</span><span class="mi">10000</span><span class="p">);</span>
-</pre></div>
-</div>
-<p>then the valve will compute the composite flow coefficient
-<span class="math notranslate nohighlight">\(\bar k\)</span> as</p>
-<div class="math notranslate nohighlight">
-\[\bar k = \frac{1}{\sqrt{1/k_v(y) + 1/k_f}}\]</div>
-<p>where <span class="math notranslate nohighlight">\(k_v(y) = \dot m(y)/\sqrt{\Delta p}\)</span> is the flow coefficient of the valve at the lift <span class="math notranslate nohighlight">\(y\)</span>, and
-<span class="math notranslate nohighlight">\(k_f\)</span> is equal to the ratio <code class="docutils literal notranslate"><span class="pre">m_flow_nominal/sqrt(dpFixed_nominal)</span></code>.
-The valve model then computes the pressure drop using <span class="math notranslate nohighlight">\(\bar k\)</span> and the same equations as described above for the fixed resistances.
-Thus, the composite model has the same <a class="reference internal" href="glossary.html#term-valve-authority"><span class="xref std std-term">valve authority</span></a> and mass flow rate, but a nonlinear equation can be avoided.</p>
-<p>For more details, see the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Actuators_UsersGuide.html">User’s Guide of the actuator package</a>.</p>
-</div>
-<div class="section" id="prescribed-mass-flow-rate">
-<h2>3.4. Prescribed mass flow rate<a class="headerlink" href="#prescribed-mass-flow-rate" title="Permalink to this headline">¶</a></h2>
-<p>For some system models, the mass flow rate can be prescribed by using an idealized pump or fan (model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow">Buildings.Fluid.Movers.FlowControlled_m_flow</a>) or a source element that outputs the required mass flow rate (such as the model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T">Buildings.Fluid.Sources.MassFlowSource_T</a>). Using these models avoids having to compute the intersection of the fan curve and the flow resistance. In some situations, this can lead to faster and more robust simulation.</p>
-</div>
-<div class="section" id="avoiding-overspecified-initialization-problems">
-<h2>3.5. Avoiding overspecified initialization problems<a class="headerlink" href="#avoiding-overspecified-initialization-problems" title="Permalink to this headline">¶</a></h2>
-<p>If in thermofluid flow systems, Dymola fails to translate a model with the error message:</p>
-<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">Error</span><span class="p">:</span> <span class="n">The</span> <span class="n">initialization</span> <span class="n">problem</span> <span class="ow">is</span> <span class="n">overspecified</span> <span class="k">for</span> <span class="n">variables</span>
-<span class="n">of</span> <span class="n">element</span> <span class="nb">type</span> <span class="n">Real</span>
-<span class="n">The</span> <span class="n">initial</span> <span class="n">equation</span>
-<span class="o">...</span>
-<span class="n">refers</span> <span class="n">to</span> <span class="n">variables</span><span class="p">,</span> <span class="n">which</span> <span class="n">are</span> <span class="nb">all</span> <span class="n">knowns</span><span class="o">.</span>
-<span class="n">To</span> <span class="n">correct</span> <span class="n">it</span> <span class="n">you</span> <span class="n">can</span> <span class="n">remove</span> <span class="n">this</span> <span class="n">equation</span><span class="o">.</span>
-</pre></div>
-</div>
-<p>then the initialization problem is overspecified. To avoid this, set</p>
-<div class="highlight-modelica notranslate"><div class="highlight"><pre><span></span><span class="n">energyDynamics</span> <span class="o">=</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Types</span><span class="o">.</span><span class="n">Dynamics</span><span class="o">.</span><span class="n">DynamicsFreeInitial</span><span class="p">;</span>
-<span class="n">massDynamics</span> <span class="o">=</span> <span class="n">Modelica</span><span class="o">.</span><span class="n">Fluid</span><span class="o">.</span><span class="n">Types</span><span class="o">.</span><span class="n">Dynamics</span><span class="o">.</span><span class="n">DynamicsFreeInitial</span><span class="p">;</span>
-</pre></div>
-</div>
-<p>in the instances of the components that contain fluid volumes.
-See also the section <a class="reference internal" href="bestPractice.html#referencepressureincompressiblefluids"><span class="std std-ref">Reference pressure for incompressible fluids such as water</span></a>.</p>
-</div>
-</div>
-
-
-    </div>
-      
-  </div>
-</div>
-  
-<footer class="footer">
-  <div class="container">
-    <p class="pull-right">
-      <a href="#">Back to top</a>
-      
-        <br/>
-        
-      
-    </p>
-    <p>
-        &copy; Copyright 2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.1.2.<br/>
-    </p>
-  </div>
-</footer>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/Buildings/Resources/Documentation/userGuide/source/_static/lbl-logo.png b/Buildings/Resources/Documentation/userGuide/source/_static/lbl-logo.png
old mode 100644
new mode 100755
diff --git a/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst b/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst
index efa85ccb0f6..52448269e9d 100644
--- a/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst
@@ -1,30 +1,50 @@
 Best Practice
 =============
 
-This section explains to library users best practice in creating new system models. The selected topics are based on problems that are often observed with new users of Modelica. Experienced users of Modelica may skip this section.
+This section explains to library users best practice in creating system models.
+The selected topics are based on problems that are often observed with new users of Modelica.
+Experienced users of Modelica may skip this section.
 
 Organization of packages
 ------------------------
 
-When developing models, one should distinguish between a library which contains widely applicable models, such as the `Buildings` library, and an application-specific model which may be created for a specific building and is of limited use for other applications.
-It is recommended that users store application-specific models outside of the `Buildings` library. This will allow users to replace the `Buildings` library with a new version without having to change the application-specific model.
-If during the course of the development of application-specific models, some models turn out to be of interest for other applications, then they can be contributed to the development of the `Buildings` library, as described in the section :ref:`Development`.
+When developing models, one should distinguish between a library which contains widely applicable models,
+such as the `Buildings` library, and an application-specific model which may be
+created for a specific building and is of limited use for other applications.
+It is recommended that users store application-specific models outside of the `Buildings` library.
+This will allow users to replace the `Buildings` library with a new version without having to change the application-specific model.
+
+The declare the dependency of your library on ``Buildings`` version 7.0.0, use
+the declaration
+
+.. code-block:: modelica
+
+   within;
+   package MyLibrary
+
+     annotation (
+       uses(
+         Buildings(
+           version="7.0.0")
+         )
+      );
+   end MyLibrary;
+
+
+If during the course of the development of application-specific models,
+some models turn out to be of interest for other applications, then they can be contributed to
+the development of the `Buildings` library, as described in the section :ref:`Development`.
 
 
 Building large system models
 ----------------------------
 
-<<<<<<< HEAD
-When creating a large system model, it is typically easier to build the system model through the composition of subsystem models that can be tested in isolation. For example, the package `Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
-contains small test models that are used to test individual components in the large system model `Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
-=======
 When creating a large system model, it is typically easier to build the system model
 through the composition of subsystem models that can be tested in isolation. For example,
 the package
 `Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
 contains small test models that are used to test individual components in the large system model
 `Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
->>>>>>> master
 Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models.
 
 
@@ -33,36 +53,38 @@ Propagating parameters and media packages
 
 Consider a model with a pump ``pum`` and a mass flow sensor ``sen``.
 Suppose that both models have a parameter ``m_flow_nominal`` for the nominal mass flow rate that needs to be set to the same value.
-Rather than setting these parameters individually to a numeric value, it is recommended to propagate the parameter to the top-level of the model. Thus, instead of using the declaration
+Rather than setting these parameters individually to a numeric value, it is recommended to propagate the parameter to the top-level of the model.
+This allows to change the value of ``m_flow_nominal`` at one location, and then have the value be propagated to all models that reference it.
+The effort for the additional declaration typically pays off as changes to the model are easier and more robust.
+
+To propagate parameters, instead of using the declaration
 
 .. code-block:: modelica
 
    Pump pum(m_flow_nominal=0.1) "Pump";
    TemperatureSensor sen(m_flow_nominal=0.1) "Sensor";
 
-we recommend to use
+use
 
 .. code-block:: modelica
 
-   Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1
-                                 "Nominal mass flow rate";
+   Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1 "Nominal mass flow rate";
    Pump pum(m_flow_nominal=m_flow_nominal) "Pump";
    TemperatureSensor sen(m_flow_nominal=m_flow_nominal) "Sensor";
 
-This allows to change the value of ``m_flow_nominal`` at one location, and then have the value be propagated to all models that reference it. The effort for the additional declaration typically pays off as changes to the model are easier and more robust.
-
-Propagating parameters and packages is particularly important for medium definitions. This allows the user to change the medium declaration at one location and then have it propagated to all models that reference it. This can be done by using the declaration
+Propagating parameters and packages is also recommended for medium definitions.
+This can be done by using the declaration
 
 .. code-block:: modelica
 
    replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
      "Medium model for air" annotation (choicesAllMatching=true);
 
-Here, the optional annotation ``annotation (choicesAllMatching=true)`` is added which causes a GUI to show a drop-down menu with all medium models that extend from ``Modelica.Media.Interfaces.PartialMedium``.
+Here, the optional annotation ``annotation (choicesAllMatching=true)`` is added which causes a GUI to show
+a drop-down menu with all medium models that extend from ``Modelica.Media.Interfaces.PartialMedium``.
 
 If the above sensor requires a medium model, which is likely the case, its declaration would be
 
-
 .. code-block:: modelica
 
    TemperatureSensor sen(redeclare package Medium = Medium,
@@ -88,10 +110,12 @@ Overdetermined initialization problem and inconsistent equations
 We will now explain how state variables, such as temperature and pressure, can be initialized.
 
 Consider a model consisting of a mass flow source ``Modelica.Fluid.Sources.MassFlowSource_T``, a fluid volume ``Buildings.Fluid.MixingVolumes.MixingVolume`` and
-a fixed boundary condition ``Buildings.Fluid.Sources.FixedBoundary``, connected in series as shown in the figure below. Note that the instance ``bou`` implements an equation that sets the medium pressure at its port, i.e., the port pressure ``bou.ports.p`` is fixed.
+a fixed boundary condition ``Buildings.Fluid.Sources.Boundary_pT``,
+connected in series as shown in the figure below. Note that the instance ``bou``
+implements an equation that sets the medium pressure at its port, i.e., the port pressure ``bou.ports.p`` is fixed.
 
-.. figure:: img/MixingVolumeInitialization.png
-   :scale: 100%
+.. figure:: img/MixingVolumeInitialization.*
+   :width: 300px
 
    Schematic diagram of a flow source, a fluid volume, and a pressure source.
 
@@ -130,7 +154,11 @@ Then, the equations for the mass balance of the fluid volume can be configured a
    at the value ``p(start=Medium.p_default)``, where ``Medium`` is the
    name of the instance of the medium model.
 
-Since the model ``Buildings.Fluid.Sources.FixedBoundary`` fixes the pressure at its port, the initial conditions :math:`p(t_0)=p_0` and :math:`dp(t_0)/dt = 0` lead to an overspecified system for the model shown above. To avoid such situation, use different initial conditions, or add a flow resistance between the mixing volume and the pressure source. The flow resistance introduces an equation that relates the pressure of the mixing volume and the pressure source as a function of the mass flow rate, thereby removing the inconsistency.
+Since the model ``Buildings.Fluid.Sources.Boundary_pT`` fixes the pressure at its port,
+the initial conditions :math:`p(t_0)=p_0` and :math:`dp(t_0)/dt = 0` lead to an overspecified system for the model shown above.
+To avoid such situation, use different initial conditions, or add a flow resistance between the mixing volume and the pressure source.
+The flow resistance introduces an equation that relates the pressure of the mixing volume and
+the pressure source as a function of the mass flow rate, thereby removing the inconsistency.
 
 .. warning::
 
@@ -232,33 +260,25 @@ Therefore, energy, mass fraction and trace substances have identical equations a
 Modeling of fluid junctions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 In Modelica, connecting fluid ports as shown below leads to ideal mixing at the junction.
-In some situation, such as the configuration below, connecting multiple connectors to a fluid port represents the physical phenomena that was intended to model.
+In some situation, such as the configuration below, connecting multiple connectors to
+a fluid port represents the physical phenomena that was intended to model.
 
-.. figure:: img/fluidJunctionMixing.png
-   :scale: 100%
+.. figure:: img/fluidJunctionMixing.*
+   :width: 300px
 
-   Connection of three components without explicitly introducing a mixer or splitter model.
+   Connection of three components without explicitly introducing a flow junction model.
 
-<<<<<<< HEAD
-However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix. This may be achieved by using an instance of the model
-`PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop>`_ as shown in the left figure below, which is the test model
-`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
-=======
 However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix.
 This may be achieved by using an instance of the model
 `Junction <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
 as shown in the left figure below, which is derived from the test model
 `BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
->>>>>>> master
 
-.. figure:: img/fluidJunctionMixingSplitter.png
+.. _fig_flu_cor_wro:
 
-   Correct (left) and wrong (right) connection of components with use of a mixer or splitter model.
+.. figure:: img/fluidJunctionMixingSplitter.*
+   :width: 1200px
 
-<<<<<<< HEAD
-In the figure on the left, the mixing points have been correctly defined by use of the three-way model that mixes or splits flow. By setting the nominal pressure drop of the mixer or splitter model to zero, the mixer or splitter model can be simplified so that no equation for the flow resistance is introduced. In addition, in the branch of the splitter that connects to the valve, a pressure drop can be modelled, which then affects the valve authority.
-However, in the figure on the right, the flow that leaves port A is mixing at port B with the return from the volume ``vol``, and then it flows to port C. Thus, the valve is exposed to the wrong temperature.
-=======
    Correct (a) and wrong (b) and (c) connection of components with use of a flow junction model.
 
 In :numref:`fig_flu_cor_wro` (a), the mixing points have been correctly defined by
@@ -273,18 +293,10 @@ e.g., the system model is wrong.
 The overhead for the simulation of these flow junctions can be reduced by
 setting the nominal pressure drop of flow junction model to zero,
 which will remove the pressure drop equation.
->>>>>>> master
 
 
 Use of sensors in fluid flow systems
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<<<<<<< HEAD
-When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on the direction of the flow or not. If the quantity depends on the flow direction, such as temperature or relative humidity, then sensors with two ports from the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_ library should be used. These sensors have a more efficient implementation than sensors with one port for situations where the flow reverses its direction.
-The proper use sensors is described in the
-`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors_UsersGuide.html>`_ of the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_ package.
-=======
 
 When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on
 the direction of the flow or not. If the quantity depends on the flow direction,
@@ -297,7 +309,6 @@ The proper use sensors is described in the
 of the
 `Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
 package.
->>>>>>> master
 
 
 .. _ReferencePressureIncompressibleFluids:
@@ -305,39 +316,33 @@ package.
 Reference pressure for incompressible fluids such as water
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD
-This section explains how to set a reference pressure for incompressible fluids. For fluids that model density as a function of temperature, the section also shows how to account for the thermal expansion of the fluid.
-=======
 This section explains how to set a reference pressure for fluids that model
 the flow as :term:`incompressible flow`,
 such as
 `Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
 and
 `Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
->>>>>>> master
 
-Consider the flow circuit shown below that consists of a pump or fan, a flow resistance and a volume.
+Consider the flow circuit shown in :numref:`fig_flow_cir` that consists of a pump or fan,
+a flow resistance and a volume.
+
+.. _fig_flow_cir:
 
-.. figure:: img/flowCircuitNoExpansion.png
-   :scale: 60%
+.. figure:: img/flowCircuit.*
+   :width: 400pt
 
    Schematic diagram of a flow circuit without means
    to set a reference pressure, or to account for
    thermal expansion of the fluid.
 
 When this model is used with a medium model that models
-:term:`compressible flow`, such as
-the medium model `Buildings.Media.Air <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Air.html#Buildings.Media.Air>`_,
-then the model is well defined because the gas medium implements the
-equation :math:`p=\rho \, R \, T`,
-where :math:`p` is the static pressure, :math:`\rho` is the mass density,
-:math:`R` is the gas constant and :math:`T` is the absolute temperature.
+:term:`compressible flow`,
+then the model is well defined because the gas medium implements
+an equation that relates density to pressure.
 
 However, when the medium model is changed to a model that models
-:term:`incompressible flow`, such as
-`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Water.html#Buildings.Media.Water>`_,
-then the density is constant. Consequently, there is no equation that
-can be used to compute the pressure based on the volume.
+:term:`incompressible flow`,
+then there is no equation that can be used to compute the pressure.
 In this situation, attempting to translate the model leads, in Dymola, to the following error message:
 
 .. code-block:: none
@@ -348,12 +353,8 @@ In this situation, attempting to translate the model leads, in Dymola, to the fo
    The number of scalar Real unknown elements are 58.
    The number of scalar Real equation elements are 58.
 
-<<<<<<< HEAD
-Similarly, if the medium model `Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
-=======
 Similarly, if the medium model
 `Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
->>>>>>> master
 which models density as a function of pressure and enthalpy, is used, then
 the model is well-defined, but the pressure increases the longer the pump runs.
 The reason is that the pump adds heat to the water. When the water temperature
@@ -363,55 +364,18 @@ the pressure increases from :math:`1 \, \mathrm{bars}` to :math:`150 \, \mathrm{
 To avoid this singularity or increase in pressure,
 use a model that imposes a pressure source and that accounts for the expansion of the fluid.
 For example, use
-<<<<<<< HEAD
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
-to form the system model shown below.
-=======
 `Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
 
 .. _fig_flow_cir_wit_bou:
->>>>>>> master
 
-.. figure:: img/flowCircuitWithExpansionVessel.png
-   :scale: 60%
+.. figure:: img/flowCircuitWithBoundary.*
+   :width: 400pt
 
-   Schematic diagram of a flow circuit with expansion vessel that
-   adds a pressure source and accounts for the thermal expansion
-   of the medium.
+   Schematic diagram of a flow circuit with a model that
+   provides a reference presssure.
 
 Alternatively, you may use
-<<<<<<< HEAD
-`Buildings.Fluid.Sources.FixedBoundary <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_, which sets the pressure to a constant value
-and adds or removes fluid as needed to maintain the pressure.
-The model `Buildings.Fluid.Sources.FixedBoundary <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_ usually leads to simpler equations than
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
-Note that the medium that flows out of the fluid port of
-`Buildings.Fluid.Sources.FixedBoundary <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_
-is at a fixed temperature, while the model
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_ conserves energy.
-However, since the thermal expansion of the fluid is usually small, this effect can be neglected in most building HVAC applications.
-
-.. figure:: img/flowCircuitWithBoundary.png
-   :scale: 60%
-
-   Schematic diagram of a flow circuit with a boundary model that adds
-   a fixed pressure source and accounts for any thermal expansion
-   of the medium.
-
-
-.. note::
-
-   In each water circuit, there must be one, and only one, instance of
-   `Buildings.Fluid.Storage.ExpansionVessel
-   <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
-   or instance of
-   `Buildings.Fluid.Sources.FixedBoundary
-   <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.FixedBoundary>`_.
-   If there is no such device, then the absolute pressure
-   may not be defined, or it may raise to an unrealistically large
-   value if the medium density changes.
-=======
 `Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
 but
 `Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
@@ -434,12 +398,32 @@ this effect can be neglected in most building HVAC applications.
    `Buildings.Fluid.Storage.ExpansionVessel
    <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
 
->>>>>>> master
    If there is more than one such device, then there are multiple
    points in the system that set the reference static pressure.
    This will affect the distribution of the mass flow rate.
 
 
+.. note::
+
+   If Dymola fails to translate a model with the error message::
+
+      Error: The initialization problem is overspecified for variables
+      of element type Real
+      The initial equation
+      ...
+      refers to variables, which are all knowns.
+      To correct it you can remove this equation.
+
+   then the initialization problem is overspecified. To avoid this, set
+
+   .. code-block:: modelica
+
+      energyDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
+      massDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
+
+   in the instances of the components that contain fluid volumes.
+
+
 Nominal Values
 ~~~~~~~~~~~~~~
 
@@ -498,111 +482,6 @@ parameters in various model to help the user understand how they are used.
 +---------------------+---------------------------+--------------------------------------------------------------------------+
 
 
-
-
-
-
-Start values of iteration variables
------------------------------------
-
-When computing numerical solutions to systems of nonlinear equations, a Newton-based solver is typically used. Such solvers have a higher success of convergence if good start values are provided for the iteration variables. In Dymola, to see what start values are used, one can enter on the simulation tab the command
-
-.. code-block:: none
-
-   Advanced.LogStartValuesForIterationVariables = true;
-
-Then, when a model is translated, for example using
-
-.. code-block:: none
-
-   translateModel("Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop");
-
-an output of the form
-
-.. code-block:: none
-
-   Start values for iteration variables:
-    val.res1.dp(start = 3000.0)
-    val.res3.dp(start = 3000.0)
-
-is produced. This shows the iteration variables and their start values. These start values can be overwritten in the model.
-
-
-Avoiding events
----------------
-
-In Modelica, the time integration is halted whenever a Real elementary
-operation such as :math:`x>y`, where :math:`x` and :math:`y` are variables of type ``Real``,
-changes its value. In this situation,
-an event occurs and the solver determines a small interval in time in which
-the relation changes its value. Determining this time interval
-often requires an iterative solution, which can significantly
-increase the computing time if the iteration require
-the evaluation of a large system of equations.
-An example where such an event occurs is the following relation
-that computes the enthalpy of the medium that streams through ``port_a`` as
-
-.. code-block:: modelica
-
-		if port_a.m_flow > 0 then
-		  h_a = inStream(port_a.h_outflow);
-		else
-		  h_a = port_a.h_outflow;
-		end if;
-
-or, equivalently,
-
-.. code-block:: modelica
-
-		h_a = if port_a.m_flow > 0 then inStream(port_a.h_outflow) else port_a.h_outflow;
-
-When simulating a model that contains such code, a time integrator
-will iterate to find the time instant where ``port_a.m_flow`` crosses zero.
-If the modeling assumptions allow approximating this equation in
-a neighborhood around ``port_a.m_flow=0``, then replacing this equation
-with an approximation that does not require an event iteration can
-reduce computing time. For example, the above equation could be
-approximated as
-
-.. code-block:: modelica
-
-		T_a = Modelica.Fluid.Utilities.regStep(
-		  port_a.m_flow, inStream(port_a.h_outflow), port_a.h_outflow,
-		  m_flow_nominal*1E-4);
-
-
-where ``m_flow_nominal`` is a parameter that is set to a value that
-is close to the mass flow rate that the model has at full load.
-If the magnitude of the flow rate is larger than 1E-4 times the
-typical flow rate, the approximate equation is the same as the exact equation,
-and below that value, an approximation is used. However, for such small
-flow rates, not much energy is transported and hence the error introduced
-by the approximation is generally negligible.
-
-In some cases, adding dynamics to the model can further improve
-the computing time, because the return value of the function
-`Modelica.Fluid.Utilities.regStep() <https://simulationresearch.lbl.gov/modelica/releases/msl/3.2/help/Modelica_Fluid_Utilities.html#Modelica.Fluid.Utilities.regStep>`_
-above can change abruptly if its argument ``port_a.m_flow`` oscillates in the range of
-``+/- 1E-4*m_flow_nominal``,
-for example due to :term:`numerical noise`.
-Adding dynamics may be achieved using a formulation such as
-
-.. code-block:: modelica
-
-		hMed = Modelica.Fluid.Utilities.regStep(
-		  port_a.m_flow, inStream(port_a.h_outflow), port_a.h_outflow,
-		  m_flow_nominal*1E-4);
-		der(h)=(hMed-h)/tau;
-
-where ``tau``>0 is a time constant. See, for example,
-`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort>`_
-for a robust implementation.
-
-.. note::
-   In the package
-   `Buildings.Utilities.Math <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math>`_
-   the functions and blocks whose names start with ``smooth`` can be used to avoid events.
-
 .. _sec_bes_pra_con:
 
 Controls
@@ -673,181 +552,35 @@ because the ``if-then-else`` construct triggers an event iteration whenever
    See :ref:`sec-example-event-debugging` for what can happen in
    such tests.
 
-.. _sec-example-event-debugging:
-
-Examples for how to debug and correct slow simulations
-------------------------------------------------------
-
-State events
-~~~~~~~~~~~~
-
-This section shows how a simulation that stalls due to events can be debugged
-to find the root cause, and then corrected.
-While the details may differ from one tool to another, the principle is the same.
-In our situation, we attempted to simulate ``Buildings.Examples.DualFanDualDuct``
-for one year in Dymola 2016 FD01 using the model from Buildings version 3.0.0.
-We run
-
-.. code-block:: modelica
-
-   simulateModel("Buildings.Examples.DualFanDualDuct.ClosedLoop",
-                  stopTime=31536000, method="radau",
-                  tolerance=1e-06, resultFile="DualFanDualDuctClosedLoop");
 
-and plotted the computing time and the number of events. Around :math:`t=0.95e7` seconds,
-there was a spike as shown in the figure below.
-
-.. figure:: img/DualFanDualDuct-cpu-events.*
-   :scale: 60%
-
-   Computing time and number of events.
-
-As the number of events increased drastically, we enabled in Dymola in
-`Simulation -> Setup`, under the tab `Debug` the entry `Events during simulation`
-and simulated the model from
-:math:`t=0.9e7` to :math:`t=1.0e7` seconds. It turned out that setting the start time
-to :math:`t=0.9e7` seconds was sufficient to reproduce the behavior;
-otherwise we would
-have had to set it to an earlier time.
-Inspecting Dymola's log file ``dslog.txt`` when the simulation stalls shows that its last entries
-are
-
-.. code-block:: modelica
-
-   Expression TRet.T > amb.x_pTphi.T became true ( (TRet.T)-(amb.x_pTphi.T) = 2.9441e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.854873843
-   Expression TRet.T > amb.x_pTphi.T became false ( (TRet.T)-(amb.x_pTphi.T) = -2.94411e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.855016639
-   Expression TRet.T > amb.x_pTphi.T became true ( (TRet.T)-(amb.x_pTphi.T) = 2.94407e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.855208419
-   Expression TRet.T > amb.x_pTphi.T became false ( (TRet.T)-(amb.x_pTphi.T) = -2.94406e-08 )
-   Iterating to find consistent restart conditions.
-         during event at Time :  9267949.855351238
-
-Hence, there is an event every few milliseconds, which explains
-why the simulation does not appear to be progessing.
-The solver does the right thing, it stops
-the integration, handles the event, and restarts the integration, just to encounter
-another event a few milliseconds later.
-Hence, we go back to our system model and
-follow the output signal of ``TRet.T`` of the
-return air temperature sensor,
-which shows that it is used in the economizer control
-to switch the sign of the control gain because the economizer can provide heating or cooling,
-depending on the ambient and return air temperature. The problematic model is
-shown in the figure below.
-
-.. _fig-dualfan-eco-con-bad:
-
-.. figure:: img/EconomizerTemperatureControl-bad.*
-   :scale: 100%
-
-   Block diagram of part of the economizer control that computes the outside air damper
-   control signal. This implementation triggers many events.
-
-The events are triggered by the inequality block which changes the control, which then in turn
-seems to cause a slight change in the return air temperature, possibly due
-to :term:`numerical noise` or maybe because the return fan may change its operating point
-as the dampers are adjusted, and hence change the heat
-added to the medium. Regardless, this is a bad implementation that also
-would cause oscillatory behavior in a real system if the sensor signal had
-measurement noise.
-Therefore, this equality comparison must be replaced by a block with hysteresis,
-which we did as shown in the figure below.
-We selected a hysteresis of :math:`0.2` Kelvin, and now the model runs fine
-for the whole year.
-
-.. _fig-dualfan-eco-con-revised:
-
-.. figure:: img/EconomizerTemperatureControl-revised.*
-   :scale: 100%
-
-   Block diagram of part of the revised economizer control that computes the outside air damper
-   control signal.
-
-
-State variables that dominate the error control
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Start values of iteration variables
+-----------------------------------
 
-In a development version of the model
-``Buildings.Examples.DualFanDualDuct.ClosedLoop``
-(commit `ef410ee <https://github.com/lbl-srg/modelica-buildings/commit/ef410ee8a5d1816f8b8e171da7743e15caaa3163>`_),
-the simulation time was very slow during part of the
-simulation, as shown in :numref:`fig-dualfan-filtered-speed`.
+When computing numerical solutions to systems of nonlinear equations, a Newton-based solver
+is typically used. Such solvers have a higher success of convergence
+if good start values are provided for the iteration variables. In Dymola,
+to see what start values are used, one can enter on the simulation tab the command
 
+.. code-block:: none
 
-.. _fig-dualfan-filtered-speed:
+   Advanced.LogStartValuesForIterationVariables = true;
 
-.. figure:: img/DualFanDualDuctWithFilteredSpeed.*
-   :scale: 100%
+Then, when a model is translated, for example using
 
-   Computing time and number of events.
+.. code-block:: none
 
-The number of state events did not increase in that time interval.
-To isolate the problem, we enabled in Dymola under `Simulation -> Setup` the
-option to log which states dominate the error (see `Debug` tab).
+   translateModel("Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop");
 
-Running the simulation again gave the following output:
+an output of the form
 
 .. code-block:: none
 
-   Integration terminated successfully at T = 1.66e+07
-     Limit stepsize, Dominate error, Exceeds 10% of error Component (#number)
-         0     1     6 cooCoi.temSen_1.T (#  1)
-        36     0   140 cooCoi.temSen_2.T (#  2)
-        37     0     0 cooCoi.ele[1].mas.T (#  3)
-        45     0     0 cooCoi.ele[2].mas.T (#  4)
-        51     0     0 cooCoi.ele[3].mas.T (#  5)
-        53     0     0 cooCoi.ele[4].mas.T (#  6)
-     13555 13201 19064 fanSupHot.filter.x[1] (#  7)
-     11905  2170 12394 fanSupHot.filter.x[2] (#  8)
-       400    47   419 fanSupCol.filter.x[1] (#  9)
-       420    71   521 fanSupCol.filter.x[2] (# 10)
-      5082  2736  6732 fanRet.filter.x[1] (# 11)
-      1979    25  4974 fanRet.filter.x[2] (# 12)
-        38     0     3 TPreHeaCoi.T (# 13)
-        30     0     1 TRet.T (# 14)
-        38     0     3 TMix.T (# 15)
-        80     0     0 TCoiCoo.T (# 16)
-       305    22   275 cor.vavHot.filter.x[1] (# 18)
-
-Hence, the state variables
-
-.. code-block:: none
+   Start values for iteration variables:
+    val.res1.dp(start = 3000.0)
+    val.res3.dp(start = 3000.0)
 
-     13555 13201 19064 fanSupHot.filter.x[1] (#  7)
-     11905  2170 12394 fanSupHot.filter.x[2] (#  8)
-       400    47   419 fanSupCol.filter.x[1] (#  9)
-       420    71   521 fanSupCol.filter.x[2] (# 10)
-      5082  2736  6732 fanRet.filter.x[1] (# 11)
-      1979    25  4974 fanRet.filter.x[2] (# 12)
-
-limit the step size significantly more often than other variables.
-Therefore, we removed these state variables
-by setting in the fan models the parameter ``filteredSpeed=false``.
-After this change, the model simulates without problems.
-
-
-Numerical solvers
------------------
-Dymola 2017 is configured to use dassl as a default solver with a tolerance of
-1E-4.
-We recommend to change this setting to radau with a tolerance of around
-1E-6, as this generally leads to faster and more robust
-simulation for thermo-fluid flow systems.
-
-Note that this is the error tolerance of the local integration time step.
-Most ordinary differential equation solvers only control the local
-integration error and not the global integration error.
-As a rule of thumb, the global integration error is one
-order of magnitude larger than the local integration error.
-However, the actual magnitude of the global integration error
-depends on the stability of the differential equation.
-As an extreme case, if a system is chaotic
-and uncontrolled, then the global integration error will grow rapidly.
+is produced. This shows the iteration variables and their start values.
+These start values can be overwritten in the model.
 
 
 .. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
diff --git a/Buildings/Resources/Documentation/userGuide/source/conf.py b/Buildings/Resources/Documentation/userGuide/source/conf.py
index 4d025832c81..cad6ee285bc 100644
--- a/Buildings/Resources/Documentation/userGuide/source/conf.py
+++ b/Buildings/Resources/Documentation/userGuide/source/conf.py
@@ -42,7 +42,7 @@
 
 # General information about the project.
 project = u'Modelica Buildings library'
-copyright = u'2012-2019, The Regents of the University of California (through Lawrence Berkeley National Laboratory)'
+copyright = u'2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/Buildings/Resources/Documentation/userGuide/source/development.rst b/Buildings/Resources/Documentation/userGuide/source/development.rst
index 1564ed61f23..0006c7e928f 100644
--- a/Buildings/Resources/Documentation/userGuide/source/development.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/development.rst
@@ -14,26 +14,18 @@ welcome.
 Contributions are ideally made by first opening an issue at https://github.com/lbl-srg/modelica-buildings
 and by providing a pull request with the new code.
 
-
-
 .. _sec_dev_gui_con:
 
 Guidelines for contributions
 ----------------------------
 
-Models that are contributed need to adhere to the following guidelines, as this is needed to integrate them in the library, make them accessible to users and further maintain them:
+Models, blocks and functions that are contributed need to adhere to the following guidelines, as this is needed to integrate them in the library, make them accessible to users and further maintain them:
 
  * They should be of general interest to other users and well documented and tested.
  * They need to follow the coding conventions described in
 
-<<<<<<< HEAD
-   - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_,
-   - the `Modelica Standard Library user guide <https://simulationresearch.lbl.gov/modelica/releases/msl/3.2/help/Modelica_UsersGuide_Conventions.html#Modelica.UsersGuide.Conventions>`_, and
-   - the `Buildings library style guide <https://github.com/lbl-srg/modelica-buildings/wiki/Style-Guide>`_.
-=======
    - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_ and
    - the `Style Guide` provided in subsections of :numref:`sec_sty_gui`
->>>>>>> master
 
  * They need to be made available under the `Modelica Buildings Library license <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License>`_.
  * For models of thermofluid flow components, they need to be based on the base classes in
@@ -41,7 +33,372 @@ Models that are contributed need to adhere to the following guidelines, as this
    which are described in the `user guide <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ of this package.
    Otherwise, it becomes difficult to ensure that the implementation is numerically robust.
 
+.. _sec_sty_gui:
+
+Style guide
+-----------
+
+General
+~~~~~~~
+
+1. Classes declared as ``partial`` and base classes that are not of interest to the user
+   should be stored in a subdirectory called ``BaseClasses``.
+   Each other class, except for constants, must have an icon.
+2. Examples and validation models should be in directories such as ``Valves.Examples`` and
+   ``Valves.Validations``. A script for the regression tests must be added as described below.
+3. Do not copy sections of code. Use object inheritance.
+4. Implement components of fluid flow systems by extending the
+   classes in ``Buildings.Fluid.Interfaces``.
+5. Use the full package names when instantiating a class.
+6. Models, functions and blocks must be implemented as
+   one model, function or block per file. An exception are the ``Buildings.Media`` packages.
+
+Type declarations
+~~~~~~~~~~~~~~~~~
+
+#. Declare all public parameters before protected ones.
+#. Declare variables and final parameters that are not of interest to
+   users as protected.
+#. Set default parameter values as follows:
+
+   #. If a parameter value can range over a large region, do not provide a
+      default value. Examples are nominal mass flow rates.
+   #. If a parameter value does not vary significantly but need to be verified
+      by the user, provide a default value by using its start attribute.
+      For example, for a heat exchanger, use
+
+      .. code-block:: modelica
+
+         parameter Real eps(start=0.8, min=0, max=1, unit="1")
+           "Heat exchanger effectiveness";
+
+      Do not use ``parameter Real eps=0.8`` as this can lead to errors
+      that are difficult to detect if a modeler forgets to overwrite
+      the default value of ``0.8`` with the actual value. The model will simulate,
+      but gives wrong results due to unsuited parameter values and there will be no warning.
+      On the other hand, using ``parameter Real eps(start=0.8)`` will give a warning
+      and hence users can assign better values.
+
+   #. If a parameter value can be precomputed based on other parameters,
+      set its value to this equation. For example,
+
+      .. code-block:: modelica
+
+         parameter Medium.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal
+         ...
+
+   #. If a parameter assignment should not be changed by a user,
+      use the ``final`` keyword.
+
+#. For parameters and variables, provide values for the ``min`` and
+   ``max`` attribute where applicable.
+   Be aware, that these bounds are not enforced by the simulator.
+   If the ``min`` and ``max`` attribute are set, each violation of these bounds
+   during the simulation may raise a warning.
+
+   Simulators may allow to suppress these warnings. In Dymola, violation of
+   bounds can be checked using
+
+   .. code-block::
+
+      Advanced.AssertAllInsideMinMax=true;
+
+#. For any variable or parameter that may need to be solved numerically,
+   provide a value for the ``start`` and ``nominal`` attribute.
+#. Use types from ``Modelica.SIunits`` where possible,
+   except in the package ``Buildings.Controls.OBC`` where the units should be declared
+   as shown in :numref:`cod_uni_dec_cdl`.
+
+Equations and algorithms
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Avoid events where possible.
+#. Only divide by quantities that cannot take on zero. For example, if
+   ``x`` may take on zero, use ``y=x``, not ``1=y/x``, as the second
+   version indicates to a simulator that it is safe to divide by ``x``.
+#. Use the ``assert`` function together with ``"In " + getInstanceName() + ":...``
+   to check for invalid values of parameters or variables. For example, use
+
+   .. code-block:: modelica
+
+      assert(phi>=0, "In " + getInstanceName() + ": Relative humidity must not be negative.");
+
+   Note the use of ``getInstanceName()``, which will write the instance name as part of the error message.
+   Otherwise, OPTIMICA will not write the instance name.
+#. Use either graphical modeling or textual code. When using graphical
+   schematic modeling, do not add textual equations. For example, avoid
+   the following, as on the graphical editor, the model looks appears
+   to be singular:
+
+   .. code-block:: modelica
+
+      model Avoid
+        Modelica.Blocks.Continuous.Integrator integrator "Integrator"
+          annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+        equation
+        integrator.u = 1;
+      end Avoid;
+
+
+#. For computational efficiency, equations shall were possible be
+   differentiable and have a continuous first derivative.
+#. Avoid equations where the first derivative with respect to another
+   variable is zero. For example, avoid
+
+   .. math::
+
+      f(x) = \begin{cases}
+        0, & \text{for } x < 0 \\
+        x^2, & \text{otherwise.}
+          \end{cases}
+
+   because any :math:`x \le 0` is a solution, which
+   can cause instability in the solver.
+   Note that this problem do not exist for functions that assign a value
+   to a constant as these will be evaluated during the model translation.
+#. Do not replace an equation by a constant for a single value, unless
+   the derivative of the original equation is zero for this value. For
+   example, if computing a pressure drop ``dp`` may involve computing a
+   long equation, but one knows that the result is always zero if the
+   volume flow rate ``V_flow`` is zero, one may be inclined to use a
+   construct of the form
+
+   .. code-block:: modelica
+
+      dp = smooth(1, if V_flow == 0 then 0 else f(V_flow));
+
+   The problem with this formulation is that for ``V_flow=0``, the
+   derivative is ``dp/dV_flow = 0``. However, the limit ``dp/dV_flow``,
+   as ``|V_flow|`` tends to zero, may be non-zero. Hence, the first
+   derivative has a discontinuity at ``V_flow=0``, which can cause a
+   solver to fail to solve the equation because the ``smooth``
+   statement declared that the first derivative exists and is
+   continuous.
+#. Make sure that the derivatives of equations are bounded on compact
+   sets. For example, instead of using ``y=sign(x) * sqrt(abs(x))``,
+   approximate the equation with a differentiable function that has a
+   finite derivative near zero. Use functions form
+   ``Buildings.Utilities.Math`` for this approximation.
+#. Whenever possible, a Modelica tool should not have to do numerical
+   differentiation. For example, in Dymola, if your model translation
+   log shows
+
+   .. code-block::
+
+       Number of numerical Jacobians: 1
+
+   (or any number other than zero), then enter on the command line
+
+   .. code-block::
+
+       Hidden.PrintFailureToDifferentiate = true;
+
+
+   Next, translate the model again to see what functions cannot be
+   differentiated symbolically. Then, implement symbolic derivatives for
+   this function.
+   See `implementation of function derivatives <https://github.com/lbl-srg/modelica-buildings/wiki/Function-Derivatives>`__.
+
+Functions
+~~~~~~~~~
+
+1. Use the ``smoothOrder`` annotation if a function is differentiable.
+2. If a function is invertible, also implement its inverse function and
+   use the ``inverse`` annotation. See
+   ``Buildings.Fluid.BaseClasses.FlowModels`` for an example.
+3. If a model allows a linearized implementation of an equation, then
+   implement the linearized equation in an ``equation`` section and not
+   in the ``algorithm`` section of a ``function``. Otherwise, a symbolic
+   processor cannot invert the linear equation, which can lead to
+   coupled systems of equations. See
+   ``Buildings.Fluid.BaseClasses.FlowModels`` for an example.
+
+Package order
+~~~~~~~~~~~~~
+
+1. Packages are first sorted alphabetically by the function
+   ``_sort_package_order``. That function is part of BuildingsPy
+   and can be invoked as
+
+   .. code-block:: python
+
+      import buildingspy.development.refactor as r
+      r.write_package_order(".", True)
 
+2. After alphabetical sorting, the following packages, if they exist,
+   are moved to the front:
+
+   .. code-block:: modelica
+
+      Tutorial
+      UsersGuide
+
+   and the following packages, if they exist, are moved to the end:
+
+   .. code-block:: modelica
+
+      Data
+      Types
+      Examples
+      Validation
+      Benchmarks
+      Experimental
+      Interfaces
+      BaseClasses
+      Internal
+      Obsolete
+
+   The remaining classes are ordered as follows and inserted between the above list:
+   First, models, blocks and records are listed, then functions, and then packages.
+
+Documentation
+~~~~~~~~~~~~~
+
+1.  Add a description string to all parameters and variables, including
+    protected ones.
+2.  Group similar variables using the ``group`` and ``tab`` annotation.
+    For example, use
+
+    .. code-block:: modelica
+
+       parameter Modelica.SIunits.Time tau = 60
+         "Time constant at nominal flow"
+         annotation (Dialog(group="Nominal condition"));
+
+    or use
+
+    .. code-block:: modelica
+
+       parameter Types.Dynamics substanceDynamics=energyDynamics
+         "Formulation of substance balance"
+         annotation(Evaluate=true, Dialog(tab = "Assumptions", group="Dynamics"));
+
+3.  Add model documentation to the ``info`` section. This applies to validation tests as well. To document
+    equations, use the format
+
+    .. code-block:: html
+
+       <p>
+       The polynomial has the form
+       </p>
+       <p align="center" style="font-style:italic;">
+       y = a<sub>1</sub> + a<sub>2</sub> x + a<sub>3</sub> x<sup>2</sup> + ...,
+       </p>
+       <p>
+       where <i>a<sub>1</sub></i> is ...
+
+    To denote time derivatives, such as for mass flow rate,
+    use ``<code>m&#775;</code>``.
+
+    To refer to parameters of the model, use the ``<code>...</code>`` section as in
+
+    .. code-block:: html
+
+       To linearize the equation, set <code>linearize=true</code>.
+
+    To format tables, use
+
+    .. code-block:: html
+
+       <p>
+       <table summary="summary" border="1" cellspacing="0" cellpadding="2" style="border-collapse:collapse;">
+       <tr><th>Header 1</th>       <th>Header 2</th>     </tr>
+       <tr><td>Data 1</td>         <td>Data 2</td>       </tr>
+       </table>
+       </p>
+
+    To include figures, place the figure into a directory in
+    ``Buildings/Resources/Images/`` that has the same name as the full
+    package. For example, use
+
+    .. code:: html
+
+       </p>
+       <p align="center">
+       <img alt="Image of ..."
+       src="modelica://Buildings/Resources/Images/Fluid/FixedResistances/FixedResistanceDpM.png"/>
+       </p>
+       <p>
+
+
+    To create new figures, put the source file for the figure,
+    preferably in ``svg`` format, in the same directory as the ``png``
+    file. ``svg`` files can be created with https://inkscape.org/, which
+    works on any operating system. See for example the file in
+    ``Resources/Images/Examples/Tutorial/SpaceCooling/schematics.svg``.
+4.  Add author information to the ``revision`` section.
+5.  Run a spell check.
+6.  Start headings with ``<h4>``.
+7.  Add hyperlinks to other models using their full name. For example,
+    use
+
+    .. code-block:: html
+
+       See
+       <a href="modelica://Buildings.Fluid.Sensors.Density">
+       Buildings.Fluid.Sensors.Density</a>.
+
+8.  Add a default component name, such as
+
+    .. code-block:: modelica
+
+       annotation(defaultComponentName="senDen", ...
+
+    to objects that will be used as drag and drop elements, as this
+    automatically assigns them this name.
+9.  Keep the line length to no more than around 80 characters.
+10. For complex packages, provide a User's Guide, and reference the
+    User's Guide in ``Buildings.UsersGuide``.
+11. Use the string ``fixme`` within development branches to mark passages
+    that still need to be revised (e.g., to improve code or to fix bugs).
+    Before merging a branch into the master, all ``fixme`` strings must
+    be removed. Within the master branch, no ``fixme`` are allowed.
+12. A suggested template for the documentation of classes is below.
+    Except for the short introduction, the sections are optional.
+
+    .. code-block:: html
+
+       <p>
+       A short introduction.
+       </p>
+       <h4>Main equations</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Assumption and limitations</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Typical use and important parameters</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Options</h4>
+       <p>
+       xxx
+       </p>
+       <h4>Dynamics</h4>
+       <p>
+       Describe which states and dynamics are present in the model
+       and which parameters may be used to influence them.
+       This need not be added in partial classes.
+       </p>
+       <h4>Validation</h4>
+       <p>
+       Describe whether the validation was done using
+       analytical validation, comparative model validation
+       or empirical validation.
+       </p>
+       <h4>Implementation</h4>
+       <p>
+       xxx
+       </p>
+       <h4>References</h4>
+       <p>
+       Add references, if applicable.
+       </p>
+
+13. Always use lower case html tags.
 
 
 Adding a new class
@@ -78,8 +435,8 @@ Alternatively, simple models such as the models below may be used as a starting
 
 .. _fig_merkel:
 
-.. figure:: img/Merkel.png
-   :scale: 10%
+.. figure:: img/Merkel.*
+   :width: 700px
 
    Schematic diagram of the cooling tower model based on the Merkel theory.
 
@@ -92,8 +449,6 @@ thermodynamic calculations. The model shows that the cooling tower performance o
 the control signal `y`, the air inlet temperature `TAir`, the water inlet temperature `TWatIn` and the
 water mass flow rate `mWat_flow`.
 
-
-
 Pressure drop
 ~~~~~~~~~~~~~
 
@@ -146,8 +501,7 @@ to lump the pressure drop of the heating coil into the pressure drop model
 of the cooling coil.
 This often reduces the size of the system of nonlinear equations.
 
-
-Control Sequences using the Control Description Language
+Control sequences using the Control Description Language
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To implement reusable control sequences, such as done within
@@ -160,42 +514,52 @@ The following rules need to be followed, in addition to the guidelines described
 
 #. The naming of parameters, inputs, outputs and instances must follow the naming
    conventions in
-<<<<<<< HEAD
-   `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
-
-#. Each block must have an ``info`` section that explains its functionality.
-   In this ``info`` section, names of ``parameters``, ``inputs`` and ``outputs``
-   need to be referenced using the html ``<code>...</code>`` element.
-   In the ``info`` section, units need to be provided in SI units, or in dual units. For SI units,
-   use Kelvin for temperature *differences* and degree Celsius for actual temperatures.
-=======
    `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
    Avoid providing duplicate information in the instance name, for example if the block is within the ``Boilers`` package,
    the instance name must not contain ``boi``. Ensure that the instance name is unambiguous when viewed in a top level
    controller block.
    Consider whether the block can be used to control other equipment as well, and if so, make sure the instance name
    is also applicable for these applications.
->>>>>>> master
 
 #. Parameters that can be grouped together, such as parameters relating to temperature setpoints
    or to the configuration of the trim and respond logic, should be grouped together with the
    ``Dialog(group=STRING))`` annotation. See for example
    `G36_PR1.TerminalUnits.Controller <https://github.com/lbl-srg/modelica-buildings/blob/94d5919dbe1b2f2e317e7b69800f3b3ad07be930/Buildings/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Controller.mo>`_.
    Do not use ``Dialog(tab=STRING))``, unless the parameter is declared with a default value
-   and this parameter and its value is of no interest to typical users.
+   and is of no interest to typical users.
+
+#. In the source code, the instances must be ordered as follows:
 
-#. Each block must have a ``defaultComponentName`` annotation.
+     - First, list `Boolean` parameters,, then `Integer` parameters and then `Real` parameters.
+     - Next, list inputs, then outputs, followed by blocks.
+     - Protected instances are below all the public instances and follow the same instance ordering rules.
+     - Within the above order, list scalar values before arrays,
+       but prioritize groupings based on model specific similarities.
+
+#. Each block must have a ``defaultComponentName`` annotation and a ``%name`` label placed above the icon.
+   See for example the `CDL.Continuous.Constant <https://github.com/lbl-srg/modelica-buildings/blob/64f35506a2b725e071a900a90e3fa3a291a48dca/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo#L21>`_
+   block.
 
 #. To aid readability, the formatting of the Modelica source code file must be consistent with other
    implemented blocks, e.g., use two spaces for indentation (no tabulators),
-   assign each parameter value on a new line, list first all parameters, then all inputs, all
-   outputs, and finally all instances of other blocks.
+   assign each parameter value on a new line. It is recommended to add an empty line between instances.
    See for example
    `G36_PR1.AHUs.SingleZone.VAV.SetPoints.ExhaustDamper <https://github.com/lbl-srg/modelica-buildings/blob/94d5919dbe1b2f2e317e7b69800f3b3ad07be930/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/ExhaustDamper.mo>`_.
 
 #. For parameters, where generally valid values can be provided, provide them
    as default values.
 
+#. Add comments to all instances. The comments should be concise. The comments
+   should not contain redundant information and must not contain hard coded parameters as those can change.
+   If the functionality of an instance is obvious the developer may use
+   comments that closely resemble the class names, such as "Logical And".
+
+#. Each block must have an ``info`` section that explains its functionality.
+   In this ``info`` section, names of ``parameters``, ``inputs`` and ``outputs``
+   need to be referenced using the html ``<code>...</code>`` element.
+   In the ``info`` section, units need to be provided in SI units, or in dual units. For SI units,
+   use Kelvin for temperature *differences* and degree Celsius for actual temperatures.
+
 #. For PI controllers, normalize the inputs for setpoint and measured value so
    that the control error is of the order of one.
    As control errors for temperature tracking are usually in the order of one,
@@ -229,65 +593,91 @@ The following rules need to be followed, in addition to the guidelines described
    in which graphical annotations are omitted.
 
    .. code-block:: modelica
+      :caption: Unit declaration for CDL.
+      :name: cod_uni_dec_cdl
 
+      Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
+        final unit="K",
+        displayUnit="degC") "Measured zone air temperature";
 
-    Buildings.Controls.OBC.CDL.Interfaces.RealInput TZon(
-      final unit="K",
-      displayUnit="degC") "Measured zone air temperature";
-
-    Buildings.Controls.OBC.CDL.Interfaces.RealInput dTSup(
-      final unit="K") "Temperature difference supply air minus exhaust air";
+      Buildings.Controls.OBC.CDL.Interfaces.RealInput dTSup(
+        final unit="K") "Temperature difference supply air minus exhaust air";
 
-    Buildings.Controls.OBC.CDL.Interfaces.RealOutput yDam(
-      min=0,
-      max=1,
-      final unit="1") "Exhaust damper position";
-
-   Here, units are declared as ``final`` to avoid users to be able to change them, as
-   a change in unit may cause the control logic to be incorrect.
+      Buildings.Controls.OBC.CDL.Interfaces.RealOutput yDam(
+        final min=0,
+        final max=1,
+        final unit="1") "Exhaust damper position";
 
    Conversion of these units to non-SI units can be done programmatically by tools that
    process CDL.
 
+#. Units, quantities and value limits must be declared as ``final`` to avoid users to be able to change them, as
+   a change in unit may cause the control logic to be incorrect.
+
 #. If the block diagram does not fit into the drawing pane, enlarge the drawing pane rather
    than making the blocks smaller.
 
+#. The size of the icon should be such that it provides a good fit for all the input and output interfaces. The minimum
+   recommended icon size is 100 by a 100. If there are many interfaces the icon size should be extended in vertical direction.
+   Icons should be symmetrical with reference to the grid origin. E.g, the default specification is
+
+   .. code-block:: modelica
+
+      Icon(
+        coordinateSystem(
+          preserveAspectRatio=true,
+          extent={{-100,-100},{100,100}}))
+
 #. For simple, small controllers, provide a unit test in a ``Validation`` or ``Examples`` package
    that is in the hierarchy one level below the implemented controller.
    See :numref:`sec_val` for unit test implementation.
    Because some control logic errors may only be noticed
    when used in a closed loop test,
    for equipment and system controllers, provide also closed loop examples that test the sequence
-   for all modes of operation. If the closed loop examples include HVAC models, then put them
+   for all modes of operation. If the closed loop examples include HVAC models, put them
    outside of the ``Buildings.Controls.OBC`` package.
    Make sure sequences are tested for all modes of operation, and as applicable, for winter, shoulder
    and summer days.
 
+#. For general rules on validation models see :numref:`sec_val`. If there are multiple instances of
+   the validated block, preferably list them together as opposed to far apart in the Modelica file.
+
+#. Run the following command to detect various warnings, such as missing comments:
+
+    .. code-block::
+
+       $ node app.js -f Buildings/Controls/OBC/ASHRAE/PrimarySystem/{path to package} -o json -m cdl
 
 
 .. _sec_val:
 
-Validation
-----------
+Validation and unit tests
+-------------------------
+
+The developer that introduces a new model, block or a function must:
 
-All models that are implemented need to be validated for all
-realistic operating modes.
-These validations need to be part of the
-`unit tests <https://github.com/lbl-srg/modelica-buildings/wiki/Unit-Tests>`_.
+1. Implement at least one example or validation model that serves as a unit test for each model, block and function,
+   and run the unit tests.
+   Unit tests should cover all branches of ``if-then`` constructs and
+   all realistic operating modes of the system represented by the model.
 
-Add a couple of sentences that explain to others the intent of the unit test.
-For example, an air handler unit controller test could describe
-"This model verifies that as the cooling load of the room increases, the controller
-first increases the mass flow rate setpoint and then reduces the supply temperature setpoint."
+2. In the `info` section of the validation model, describe to others the intent of the unit test.
+   For example, an air handler unit controller test could describe
+   "This model verifies that as the cooling load of the room increases, the controller
+   first increases the mass flow rate setpoint and then reduces the supply temperature setpoint."
+
+The validation models are part of automated unit tests as described at the
+`unit tests wiki page <https://github.com/lbl-srg/modelica-buildings/wiki/Unit-Tests>`_.
 
 For simple models, the validation can be against analytic solutions.
 This is for example done in
 `Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop>`_
 which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.
+
 For complex thermofluid flow devices, a comparative model validation needs to be done, for example
 by comparing the result of the Modelica model against the results from EnergyPlus.
 An example is
-`Buildings.Fluid.HeatExchangers.CoolingTowers.Validation.MerkelEnergyPlus`.
+``Buildings.Fluid.HeatExchangers.CoolingTowers.Validation.MerkelEnergyPlus``.
 For such validations, the following files also need to be added to the repository:
 
  - The EnergyPlus input data file. Please make sure it only requires a weather data file that already exists in the Buildings library.
@@ -301,4 +691,6 @@ For such validations, the following files also need to be added to the repositor
  - A Python script that converts the EnergyPlus output file to the data file that can
    be read by the Modelica data reader.
 
-See for example `Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation` for an implementation.
+See for example
+`Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation <https://github.com/lbl-srg/modelica-buildings/tree/master/Buildings/Resources/Data/Fluid/HeatExchangers/CoolingTowers/Validation/MerkelEnergyPlus>`_
+for an implementation.
diff --git a/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst b/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst
index 9f955858aa3..90601c837d1 100644
--- a/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst
@@ -10,7 +10,7 @@ Literature for Users
 --------------------
 The following books are useful for new users to get started:
 
-* The online book with interactive examples of Michael Tiller at http://book.xogeny.com/.
+* The online book with interactive examples of Michael Tiller at https://mbe.modelica.university/.
 * The books by Michael Tiller [Til2001]_ and Peter Fritzson ([Fri2011]_ and [Fri2004]_).
 * The tutorials that are listed at https://modelica.org/publications.
 
@@ -27,50 +27,46 @@ as well as tools for workflow automation.
 It also contains numerous examples that apply these technologies to the
 design and operation of building and community energy systems.
 
-An interactive web-based tour of Modelica is available at
-http://modelica.university/res/lesson/training.json.
 
-Spoken tutorials for beginners are available at http://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&search_language=English.
+Spoken tutorials for beginners are available at https://spoken-tutorial.org/tutorial-search/?search_foss=OpenModelica&search_language=English.
 
 
+Running the First Simulations
+-----------------------------
+
+To start using Modelica, run some of the example models of the `Buildings` library.
+Make variations in these examples by changing values of model parameters
+or by replacing existing component models by new ones.
+The example models can be found in the packages `Examples`.
 
-<<<<<<< HEAD
-Literature for Developers
--------------------------
-=======
 Study the detailed tutorials with step-by-step instructions for how to build system models,
 which can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/v8.0.0/help/Buildings_Examples_Tutorial.html>`_.
->>>>>>> master
 
-It is essential that users who develop new thermo-fluid models to  understand the concept of stream connectors. Stream connectors are explained in the Modelica language definition, available at https://www.modelica.org/documents, and in the paper Franke et al. [Fra2009a]_.
-The `Buildings` library uses similar modeling principles, and the same base classes, as the `Modelica.Fluid` library. Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b]_.
+Note that heat transfer models, which can be found in `Buildings.HeatTransfer.*.Examples` are easier to understand than fluid flow models because;
 
-Xogeny's `Modelica Web Reference <http://modref.xogeny.com/>`_ gives a concise overview, explanation and further links about the Modelica language.
+* handling fluid flow adds more complexity due to flow reversal (i.e., if the mass flow rate changes its direction),
+* fluid flow models may need to handle multiple species such as air and water vapor, as well as trace substances such as CO2, and
+* fluid flow models use packages that define medium models, such as dry air, moist air, water or other fluids.
 
 
 Software Requirements
 ---------------------
+
 Check the software requirements for the different versions of the Buildings library at https://simulationresearch.lbl.gov/modelica/download.html
 
 
-Running the First Simulations
------------------------------
+Literature for Developers
+-------------------------
 
-<<<<<<< HEAD
-To start using Modelica, run the example models of the `Buildings` library. Make variations in these examples by changing values of model parameters or by replacing existing component models by new ones. The example models can be found in the packages `Examples`, and detailed tutorials with step-by-step instructions for how to build system models can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Examples_Tutorial.html>`_.
-=======
 It is essential that users who develop new thermo-fluid models to understand the concept of stream connectors.
 Stream connectors are explained in the Modelica language definition, available at https://modelica.org/documents,
 and in the paper Franke et al. [Fra2009a]_.
 The `Buildings` library uses similar modeling principles, and the same base classes, as the `Modelica.Fluid` library.
 Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b]_.
->>>>>>> master
 
-Note that heat transfer models, which can be found in `Buildings.HeatTransfer.*.Examples` are easier to understand than fluid flow models because;
+The `Modelica Web Reference <https://webref.modelica.university>`_ gives a concise overview, explanation and further links about the Modelica language.
 
-* handling fluid flow adds more complexity due to flow reversal (i.e., if the mass flow rate changes its direction),
-* fluid flow models may need to handle multiple species such as air and water vapor, as well as trace substances such as CO2, and
-* fluid flow models use packages that define medium models, such as dry air, moist air, water or other fluids.
+See :numref:`sec_sty_gui` for conventions and guidelines of the `Buildings` library.
 
 
 References
@@ -80,10 +76,12 @@ References
 
 .. [Fri2011] Peter Fritzson. *Introduction to Modeling and Simulation of Technical and Physical Systems with Modelica.* Wiley-IEEE Press, ISBN 978-1-1180-1068-6, 2011.
 
-.. [Fra2009a] R. Franke, F. Casella, M. Otter, M. Sielemann, H. Elmqvist, S. E. Mattsson, and H. Olsson. `Stream connectors – an extension of modelica for device-oriented modeling of convective transport phenomena <https://www.modelica.org/events/modelica2009/Proceedings/memorystick/pages/papers/0078/0078.pdf>`_. In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
+.. [Fra2009a] R. Franke, F. Casella, M. Otter, M. Sielemann, H. Elmqvist, S. E. Mattsson, and H. Olsson.
+              `Stream connectors – an extension of modelica for device-oriented modeling of convective transport phenomena <http://dx.doi.org/10.3384/ecp09430078>`_.
+              In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
 
-.. [Fra2009b] R. Franke, F. Casella, M. Otter, K. Proelss, M. Sielemann, and M. Wetter. `Standardization of thermo-fluid modeling in Modelica.Fluid     <https://www.modelica.org/events/modelica2009/Proceedings/memorystick/pages/papers/0077/0077.pdf>`_.     In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
+.. [Fra2009b] R. Franke, F. Casella, M. Otter, K. Proelss, M. Sielemann, and M. Wetter. `Standardization of thermo-fluid modeling in Modelica.Fluid
+              <http://dx.doi.org/10.3384/ecp09430077>`_.
+              In F. Casella, editor, Proc. of the 7-th International Modelica Conference, Como, Italy, Sept. 2009.
 
 .. [Til2001] Michael M. Tiller. *Introduction to Physical Modeling with Modelica.* Kluwer Academic Publisher, 2001.
-
-.. ###############################################################################################################
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.pdf b/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.pdf
new file mode 100644
index 00000000000..54362ac1a1e
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.png b/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.png
index 2cf6cf77872..32fbd3fca9d 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.png and b/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.svg b/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.svg
new file mode 100644
index 00000000000..e5deea24f6e
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/MixingVolumeInitialization.svg
@@ -0,0 +1,1181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 614.96002 211.86137"
+   version="1.1"
+   id="svg256"
+   sodipodi:docname="MixingVolumeInitialization.svg"
+   width="614.96002"
+   height="211.86137"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata262">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs260" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2070"
+     inkscape:window-height="1258"
+     id="namedview258"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.68613537"
+     inkscape:cx="552.26001"
+     inkscape:cy="149.16138"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg256" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-177.16138"
+     width="41"
+     height="56"
+     id="rect2" />
+  <rect
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-177.16138"
+     width="41"
+     height="56"
+     id="rect4" />
+  <rect
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-177.16138"
+     width="41"
+     height="56"
+     id="rect6" />
+  <rect
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-176.66138"
+     width="41"
+     height="55"
+     id="rect8" />
+  <rect
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-176.16138"
+     width="41"
+     height="54"
+     id="rect10" />
+  <rect
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-175.66138"
+     width="41"
+     height="53"
+     id="rect12" />
+  <rect
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-175.16138"
+     width="41"
+     height="52"
+     id="rect14" />
+  <rect
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-174.16138"
+     width="41"
+     height="50"
+     id="rect16" />
+  <rect
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-173.16138"
+     width="41"
+     height="48"
+     id="rect18" />
+  <rect
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-172.16138"
+     width="41"
+     height="46"
+     id="rect20" />
+  <rect
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-170.66138"
+     width="41"
+     height="43"
+     id="rect22" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-169.66138"
+     width="41"
+     height="41"
+     id="rect24" />
+  <rect
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-168.16138"
+     width="41"
+     height="38"
+     id="rect26" />
+  <rect
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-166.66138"
+     width="41"
+     height="35"
+     id="rect28" />
+  <rect
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-165.16138"
+     width="41"
+     height="32"
+     id="rect30" />
+  <rect
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-163.16138"
+     width="41"
+     height="28"
+     id="rect32" />
+  <rect
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-161.66138"
+     width="41"
+     height="25"
+     id="rect34" />
+  <rect
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-159.66138"
+     width="41"
+     height="21"
+     id="rect36" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-157.66138"
+     width="41"
+     height="17"
+     id="rect38" />
+  <rect
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-156.16138"
+     width="41"
+     height="14"
+     id="rect40" />
+  <rect
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-154.16138"
+     width="41"
+     height="10"
+     id="rect42" />
+  <rect
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-152.16138"
+     width="41"
+     height="6"
+     id="rect44" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="85.023003"
+     y="-150.16138"
+     width="41"
+     height="2"
+     id="rect46" />
+  <circle
+     fill="#ffffff"
+     stroke="#0000ff"
+     stroke-opacity="1"
+     cx="50.66"
+     cy="149.16138"
+     id="ellipse48"
+     r="50.16" />
+  <polygon
+     fill="#0000ff"
+     stroke="#0000ff"
+     stroke-opacity="1"
+     points="389.32,684.636 389.32,598.11 464.56,642 "
+     id="polygon50"
+     transform="translate(-363.73999,-492.83862)" />
+  <text
+     fill="#ff0000"
+     font-size="39px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="51.287014"
+     y="148.53436"
+     id="text52">m</text>
+  <circle
+     fill="#ff0000"
+     stroke="#ff0000"
+     stroke-opacity="1"
+     cx="49.406002"
+     cy="132.85938"
+     id="ellipse54"
+     r="2.5079999" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="56.303005"
+     y="67.651367"
+     id="text56">sou</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="552.26001"
+     y="67.651367"
+     id="text58">sin</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse60"
+     r="62.700001" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse62"
+     r="62.547298" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse64"
+     r="62.089802" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse66"
+     r="61.329899" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse68"
+     r="60.271099" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse70"
+     r="58.918701" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse72"
+     r="57.279301" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse74"
+     r="55.360802" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse76"
+     r="53.1726" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse78"
+     r="50.725399" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse80"
+     r="48.030998" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse82"
+     r="45.1026" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse84"
+     r="41.954498" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse86"
+     r="38.602001" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse88"
+     r="35.061401" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse90"
+     r="31.35" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse92"
+     r="27.485901" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse94"
+     r="23.487801" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse96"
+     r="19.375401" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse98"
+     r="15.1685" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse100"
+     r="10.8877" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse102"
+     r="6.5539298" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-552.26001"
+     cy="-149.16138"
+     id="ellipse104"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="551.00598"
+     y="147.2804"
+     id="text106" />
+  <text
+     fill="#ffffff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="300.20599"
+     y="112.79535"
+     id="text108">V=0.1 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="300.20599"
+     y="11.221375"
+     id="text110">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse112"
+     r="62.700001" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse114"
+     r="62.547298" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse116"
+     r="62.089802" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse118"
+     r="61.329899" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse120"
+     r="60.271099" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse122"
+     r="58.918701" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse124"
+     r="57.279301" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse126"
+     r="55.360802" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse128"
+     r="53.1726" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse130"
+     r="50.725399" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse132"
+     r="48.030998" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse134"
+     r="45.1026" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse136"
+     r="41.954498" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse138"
+     r="38.602001" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse140"
+     r="35.061401" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse142"
+     r="31.35" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse144"
+     r="27.485901" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse146"
+     r="23.487801" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse148"
+     r="19.375401" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse150"
+     r="15.1685" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse152"
+     r="10.8877" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse154"
+     r="6.5539298" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="87.715393"
+     id="ellipse156"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="302.71399"
+     y="84.580383"
+     id="text158" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="300.20599"
+     y="11.221375"
+     id="text160">vol</text>
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="853.300000,642.000000 652.660000,642.000000"
+     id="polyline162"
+     transform="translate(-363.73999,-492.83862)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="853.300000,642.000000 652.660000,642.000000"
+     id="polyline164"
+     transform="translate(-363.73999,-492.83862)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="489.640000,642.000000 677.740000,642.000000"
+     id="polyline166"
+     transform="translate(-363.73999,-492.83862)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="489.640000,642.000000 677.740000,642.000000"
+     id="polyline168"
+     transform="translate(-363.73999,-492.83862)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="119.40002"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect170" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse172"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse174"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse176"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse178"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse180"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse182"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="119.40002"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect184" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse186"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse188"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse190"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="149.16138"
+     id="ellipse192"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="165.46338"
+     id="ellipse194"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="125.90002"
+     cy="132.85938"
+     id="ellipse196"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-496.06"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect198" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse200"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse202"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse204"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse206"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse208"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse210"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-496.06"
+     y="124.16138"
+     width="13"
+     height="50"
+     id="rect212" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse214"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse216"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse218"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-149.16138"
+     id="ellipse220"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-165.46338"
+     id="ellipse222"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-489.56003"
+     cy="-132.85938"
+     id="ellipse224"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="276.45999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect226" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse228" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse230" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse232" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse234" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse236" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse238" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="276.45999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect240" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse242" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse244" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.16138"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse246" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="285.409"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse248" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="301.46002"
+     cy="149.24738"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse250" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="317.51099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse252" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="232.26001"
+     y="-92.96138"
+     width="13"
+     height="13"
+     id="rect254" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.pdf b/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.pdf
new file mode 100644
index 00000000000..388e0f4cbce
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.png b/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.png
index e47fab8b18c..15b5b6057d5 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.png and b/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.svg b/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.svg
new file mode 100644
index 00000000000..85b1ac281ea
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/fanStepSchematics.svg
@@ -0,0 +1,1063 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 644.98609 647.25202"
+   version="1.1"
+   id="svg876"
+   sodipodi:docname="fanStepSchematics.svg"
+   width="644.98608"
+   height="647.25201"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata882">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs880" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2769"
+     inkscape:window-height="2010"
+     id="namedview878"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.750088"
+     inkscape:cx="318.52443"
+     inkscape:cy="323.62603"
+     inkscape:window-x="67"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg876"
+     inkscape:document-rotation="0" />
+  <polyline
+     points="769.250000,541.000000 532.550000,541.000000"
+     id="polyline973"
+     transform="matrix(0.34259954,0,0,1,-180.93436,-444.41422)"
+     style="fill:none;stroke:#ff00ff;stroke-opacity:1" />
+  <text
+     font-size="26px"
+     dominant-baseline="central"
+     x="382.64407"
+     y="639.40002"
+     id="text2"
+     style="font-size:26px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">fanC</text>
+  <polyline
+     points="821.850000,757.975000 887.600000,757.975000"
+     id="polyline4"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="821.850000,744.825000 887.600000,744.825000"
+     id="polyline6"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.79504"
+     width="132"
+     height="21"
+     id="rect8"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.79504"
+     width="132"
+     height="21"
+     id="rect10"
+     style="fill:#001021;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.29504"
+     width="132"
+     height="20"
+     id="rect12"
+     style="fill:#002041;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-567.29504"
+     width="132"
+     height="20"
+     id="rect14"
+     style="fill:#003061;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-566.29504"
+     width="132"
+     height="18"
+     id="rect16"
+     style="fill:#003f7f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-565.79504"
+     width="132"
+     height="17"
+     id="rect18"
+     style="fill:#004d9b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-564.79504"
+     width="132"
+     height="15"
+     id="rect20"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-563.79504"
+     width="132"
+     height="13"
+     id="rect22"
+     style="fill:#0064ca;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-562.79504"
+     width="132"
+     height="11"
+     id="rect24"
+     style="fill:#006ddc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-561.79504"
+     width="132"
+     height="9"
+     id="rect26"
+     style="fill:#0075eb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-560.79504"
+     width="132"
+     height="7"
+     id="rect28"
+     style="fill:#007af6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-559.29504"
+     width="132"
+     height="4"
+     id="rect30"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="315.98608"
+     y="-557.79504"
+     width="132"
+     height="1"
+     id="rect32"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse34"
+     r="38.134998"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse36"
+     r="38.042099"
+     style="fill:#00070e;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse38"
+     r="37.763901"
+     style="fill:#000e1c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse40"
+     r="37.301701"
+     style="fill:#00152a;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse42"
+     r="36.6577"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse44"
+     r="35.835201"
+     style="fill:#002245;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse46"
+     r="34.8381"
+     style="fill:#002952;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse48"
+     r="33.6712"
+     style="fill:#002f5f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse50"
+     r="32.340302"
+     style="fill:#00366b;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse52"
+     r="30.8519"
+     style="fill:#003b77;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse54"
+     r="29.2131"
+     style="fill:#004182;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse56"
+     r="27.431999"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse58"
+     r="25.5173"
+     style="fill:#004b96;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse60"
+     r="23.4783"
+     style="fill:#00509f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse62"
+     r="21.3248"
+     style="fill:#0054a7;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse64"
+     r="19.067499"
+     style="fill:#0057ae;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse66"
+     r="16.7173"
+     style="fill:#005ab5;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse68"
+     r="14.2856"
+     style="fill:#005dba;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse70"
+     r="11.7844"
+     style="fill:#005fbe;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse72"
+     r="9.2256899"
+     style="fill:#0061c2;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse74"
+     r="6.6220698"
+     style="fill:#0062c4;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse76"
+     r="3.9861901"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="381.98605"
+     cy="557.29504"
+     id="ellipse78"
+     r="1.3308901"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="821.85,771.125 821.85,836.875 857.355,804 "
+     id="polygon80"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse82"
+     r="10.52"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse84"
+     r="10.437"
+     style="fill:#000d19;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse86"
+     r="10.1895"
+     style="fill:#001933;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse88"
+     r="9.78125"
+     style="fill:#00264c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse90"
+     r="9.21875"
+     style="fill:#003163;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse92"
+     r="8.5108604"
+     style="fill:#003c79;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse94"
+     r="7.6687498"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse96"
+     r="6.7056999"
+     style="fill:#004f9d;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse98"
+     r="5.6368999"
+     style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse100"
+     r="4.4791999"
+     style="fill:#005cb7;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse102"
+     r="3.25086"
+     style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse104"
+     r="1.9712501"
+     style="fill:#0063c5;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="557.29504"
+     id="ellipse106"
+     r="0.66055602"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="440.50406"
+     y="492.20303"
+     id="text108"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">P</text>
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="426.03909"
+     y="505.353"
+     id="text110"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y_actual</text>
+  <polyline
+     points="821.850000,738.250000 821.850000,771.125000"
+     id="polyline112"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     x="361.14407"
+     y="491.76999"
+     width="43"
+     height="39"
+     id="rect114"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     cx="382.64407"
+     cy="511.26999"
+     rx="21.6975"
+     ry="19.725"
+     id="ellipse116"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="30px"
+     font-weight="bold"
+     dominant-baseline="central"
+     x="382.64407"
+     y="511.92706"
+     id="text118"
+     style="font-weight:bold;font-size:30px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <text
+     font-size="33px"
+     dominant-baseline="central"
+     x="316.23605"
+     y="490.88699"
+     id="text120"
+     style="font-size:33px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y</text>
+  <text
+     font-size="26px"
+     dominant-baseline="central"
+     x="395.7941"
+     y="376.39999"
+     id="text122"
+     style="font-size:26px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">fanS</text>
+  <polyline
+     points="835.000000,494.975000 900.750000,494.975000"
+     id="polyline124"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="835.000000,481.825000 900.750000,481.825000"
+     id="polyline126"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="835.000000,475.250000 835.000000,514.700000"
+     id="polyline128"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.79501"
+     width="132"
+     height="21"
+     id="rect130"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.79501"
+     width="132"
+     height="21"
+     id="rect132"
+     style="fill:#001021;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.29501"
+     width="132"
+     height="20"
+     id="rect134"
+     style="fill:#002041;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-304.29501"
+     width="132"
+     height="20"
+     id="rect136"
+     style="fill:#003061;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-303.29501"
+     width="132"
+     height="18"
+     id="rect138"
+     style="fill:#003f7f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-302.79501"
+     width="132"
+     height="17"
+     id="rect140"
+     style="fill:#004d9b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-301.79501"
+     width="132"
+     height="15"
+     id="rect142"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-300.79501"
+     width="132"
+     height="13"
+     id="rect144"
+     style="fill:#0064ca;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-299.79501"
+     width="132"
+     height="11"
+     id="rect146"
+     style="fill:#006ddc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-298.79501"
+     width="132"
+     height="9"
+     id="rect148"
+     style="fill:#0075eb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-297.79501"
+     width="132"
+     height="7"
+     id="rect150"
+     style="fill:#007af6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-296.29501"
+     width="132"
+     height="4"
+     id="rect152"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="329.13608"
+     y="-294.79501"
+     width="132"
+     height="1"
+     id="rect154"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse156"
+     r="38.134998"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse158"
+     r="38.042099"
+     style="fill:#00070e;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse160"
+     r="37.763901"
+     style="fill:#000e1c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse162"
+     r="37.301701"
+     style="fill:#00152a;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse164"
+     r="36.6577"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse166"
+     r="35.835201"
+     style="fill:#002245;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse168"
+     r="34.8381"
+     style="fill:#002952;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse170"
+     r="33.6712"
+     style="fill:#002f5f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse172"
+     r="32.340302"
+     style="fill:#00366b;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse174"
+     r="30.8519"
+     style="fill:#003b77;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse176"
+     r="29.2131"
+     style="fill:#004182;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse178"
+     r="27.431999"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse180"
+     r="25.5173"
+     style="fill:#004b96;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse182"
+     r="23.4783"
+     style="fill:#00509f;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse184"
+     r="21.3248"
+     style="fill:#0054a7;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse186"
+     r="19.067499"
+     style="fill:#0057ae;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse188"
+     r="16.7173"
+     style="fill:#005ab5;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse190"
+     r="14.2856"
+     style="fill:#005dba;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse192"
+     r="11.7844"
+     style="fill:#005fbe;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse194"
+     r="9.2256899"
+     style="fill:#0061c2;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse196"
+     r="6.6220698"
+     style="fill:#0062c4;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse198"
+     r="3.9861901"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     cx="395.13608"
+     cy="294.29501"
+     id="ellipse200"
+     r="1.3308901"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="835,508.125 835,573.875 870.505,541 "
+     id="polygon202"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="453.65408"
+     y="229.20299"
+     id="text204"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">P</text>
+  <text
+     font-size="10px"
+     dominant-baseline="central"
+     x="439.18906"
+     y="242.35301"
+     id="text206"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y_actual</text>
+  <polyline
+     points="835.000000,475.250000 835.000000,508.125000"
+     id="polyline208"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="33px"
+     dominant-baseline="central"
+     x="329.38608"
+     y="227.88701"
+     id="text210"
+     style="font-size:33px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">y</text>
+  <rect
+     transform="scale(1,-1)"
+     x="92.436073"
+     y="-163.045"
+     width="132"
+     height="132"
+     id="rect274"
+     style="fill:#d2d2d2;stroke:#000000;stroke-opacity:1" />
+  <rect
+     x="90.893105"
+     y="29.502007"
+     width="1.79333"
+     height="133.293"
+     id="rect276"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="90.893105"
+     y="162.795"
+     width="133.293"
+     height="1.79333"
+     id="rect278"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="224.18608"
+     y="31.295006"
+     width="1.79333"
+     height="133.293"
+     id="rect280"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="92.686073"
+     y="29.502007"
+     width="133.293"
+     height="1.79333"
+     id="rect282"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="92.686073"
+     y="31.295006"
+     width="2.6900001"
+     height="131.5"
+     id="rect284"
+     style="fill:#ffffff;stroke:none" />
+  <rect
+     x="92.686073"
+     y="31.295006"
+     width="131.5"
+     height="2.6900001"
+     id="rect286"
+     style="fill:#ffffff;stroke:none" />
+  <rect
+     x="222.39311"
+     y="31.295006"
+     width="1.79333"
+     height="131.5"
+     id="rect288"
+     style="fill:#716f64;stroke:none" />
+  <rect
+     x="92.686073"
+     y="161.002"
+     width="131.5"
+     height="1.79333"
+     id="rect290"
+     style="fill:#716f64;stroke:none" />
+  <rect
+     x="220.59911"
+     y="33.088005"
+     width="1.79333"
+     height="127.913"
+     id="rect292"
+     style="fill:#aca899;stroke:none" />
+  <rect
+     x="94.479103"
+     y="159.20799"
+     width="127.913"
+     height="1.79333"
+     id="rect294"
+     style="fill:#aca899;stroke:none" />
+  <circle
+     cx="107.15111"
+     cy="97.045006"
+     id="ellipse296"
+     r="4.6025"
+     style="fill:#ebebeb;stroke:#ebebeb;stroke-opacity:1" />
+  <text
+     font-size="26px"
+     dominant-baseline="central"
+     x="158.43608"
+     y="11.570001"
+     id="text298"
+     style="font-size:26px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">booToInt</text>
+  <text
+     font-size="32px"
+     dominant-baseline="central"
+     x="159.09306"
+     y="137.81001"
+     id="text300"
+     style="font-size:32px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">0</text>
+  <text
+     font-size="32px"
+     dominant-baseline="central"
+     x="159.09306"
+     y="100.36002"
+     id="text302"
+     style="font-size:32px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">1</text>
+  <text
+     font-size="34px"
+     dominant-baseline="central"
+     x="118.98606"
+     y="62.855003"
+     id="text304"
+     style="font-size:34px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ff00ff">B</text>
+  <polygon
+     points="602.245,318.765 602.245,325.34 615.395,312.19 602.245,299.04 602.245,305.615 581.205,305.615 581.205,318.765 "
+     id="polygon306"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="38px"
+     dominant-baseline="central"
+     x="197.88609"
+     y="62.198021"
+     id="text308"
+     style="font-size:38px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">R</text>
+  <polyline
+     points="677.200000,343.750000 835.000000,343.750000 835.000000,462.100000"
+     id="polyline734"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="677.200000,343.750000 835.000000,343.750000 835.000000,462.100000"
+     id="polyline736"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="677.200000,343.750000 703.500000,343.750000 703.500000,672.500000 821.850000,672.500000 821.850000,725.100000"
+     id="polyline738"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="677.200000,343.750000 703.500000,343.750000 703.500000,672.500000 821.850000,672.500000 821.850000,725.100000"
+     id="polyline740"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="1084.850000,541.000000 900.750000,541.000000"
+     id="polyline742"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1084.850000,541.000000 900.750000,541.000000"
+     id="polyline744"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="887.600000,804.000000 1071.700000,804.000000"
+     id="polyline746"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="887.600000,804.000000 1071.700000,804.000000"
+     id="polyline748"
+     transform="matrix(1.0647915,0,0,1,-497.37286,-246.46156)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="756.100000,804.000000 519.400000,804.000000"
+     id="polyline750"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="756.100000,804.000000 519.400000,804.000000"
+     id="polyline752"
+     transform="matrix(1.329424,0,0,1,-688.94136,-246.70499)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="769.250000,541.000000 532.550000,541.000000"
+     id="polyline754"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="769.250000,541.000000 532.550000,541.000000"
+     id="polyline756"
+     transform="matrix(1.0531989,0,0,1,-480.78718,-246.70499)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="263.63608"
+     cy="97.045006"
+     id="ellipse758"
+     r="3"
+     style="fill:#00007f;stroke:#00007f" />
+  <circle
+     cx="316.23605"
+     cy="557.29504"
+     id="ellipse760"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="316.23605"
+     cy="557.29504"
+     id="ellipse762"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-447.73608"
+     cy="-557.29504"
+     id="ellipse764"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-447.73608"
+     cy="-557.29504"
+     id="ellipse766"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-447.73608"
+     cy="-557.29504"
+     id="ellipse768"
+     r="5.2600002"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="887.6,751.4 900.75,757.975 887.6,764.55 "
+     id="polygon770"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="887.6,738.25 900.75,744.825 887.6,751.4 "
+     id="polygon772"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="375.48608"
+     y="-608.505"
+     width="13"
+     height="13"
+     id="rect774"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="835,711.95 821.85,738.25 808.7,711.95 "
+     id="polygon776"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     cx="329.38608"
+     cy="294.29501"
+     id="ellipse778"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="329.38608"
+     cy="294.29501"
+     id="ellipse780"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-460.88605"
+     cy="-294.29501"
+     id="ellipse782"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-460.88605"
+     cy="-294.29501"
+     id="ellipse784"
+     r="6.5749998"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-460.88605"
+     cy="-294.29501"
+     id="ellipse786"
+     r="5.2600002"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="900.75,488.4 913.9,494.975 900.75,501.55 "
+     id="polygon788"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="900.75,475.25 913.9,481.825 900.75,488.4 "
+     id="polygon790"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="388.63608"
+     y="-345.505"
+     width="13"
+     height="13"
+     id="rect792"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="848.15,448.95 835,475.25 821.85,448.95 "
+     id="polygon794"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="519.4,337.175 532.55,343.75 519.4,350.325 "
+     id="polygon800"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ff00ff;stroke:#ff00ff;stroke-opacity:1" />
+  <polygon
+     points="664.05,337.175 677.2,343.75 664.05,350.325 "
+     id="polygon802"
+     transform="translate(-439.86391,-246.70499)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     transform="matrix(1.3915761,0,0,1,-741.08385,-246.70499)"
+     id="polyline967"
+     points="769.250000,541.000000 532.550000,541.000000"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.pdf b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.pdf
new file mode 100644
index 00000000000..1bbad3985fc
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.png b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.png
new file mode 100644
index 00000000000..9cd225403f1
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.svg b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.svg
new file mode 100644
index 00000000000..6a68ca486a3
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuit.svg
@@ -0,0 +1,1501 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 880.29999 508.6012"
+   version="1.1"
+   id="svg408"
+   sodipodi:docname="flowCircuit.svg"
+   inkscape:export-filename="flowCircuitWithBoundary.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   width="880.29999"
+   height="508.6012"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata414">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs412" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1587"
+     inkscape:window-height="1149"
+     id="namedview410"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.62326136"
+     inkscape:cx="131.33301"
+     inkscape:cy="546.04967"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg408"
+     inkscape:document-rotation="0" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="316.62701"
+     y="496.51935"
+     id="text2">pump</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,472.710000 916.000000,472.710000"
+     id="polyline4"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,460.170000 916.000000,460.170000"
+     id="polyline6"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,491.520000"
+     id="polyline8"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect10" />
+  <rect
+     fill="#001021"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect12" />
+  <rect
+     fill="#002041"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect14" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect16" />
+  <rect
+     fill="#003f7f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-421.50137"
+     width="125"
+     height="18"
+     id="rect18" />
+  <rect
+     fill="#004d9b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect20" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.00137"
+     width="125"
+     height="15"
+     id="rect22" />
+  <rect
+     fill="#0064ca"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-419.00137"
+     width="125"
+     height="13"
+     id="rect24" />
+  <rect
+     fill="#006ddc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-418.00137"
+     width="125"
+     height="11"
+     id="rect26" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect28" />
+  <rect
+     fill="#007af6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-415.50137"
+     width="125"
+     height="6"
+     id="rect30" />
+  <rect
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-414.50137"
+     width="125"
+     height="4"
+     id="rect32" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-413.00137"
+     width="125"
+     height="1"
+     id="rect34" />
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse36"
+     r="36.366001" />
+  <circle
+     fill="#00070e"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse38"
+     r="36.277401" />
+  <circle
+     fill="#000e1c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse40"
+     r="36.0121" />
+  <circle
+     fill="#00152a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse42"
+     r="35.571301" />
+  <circle
+     fill="#001c38"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse44"
+     r="34.957199" />
+  <circle
+     fill="#002245"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse46"
+     r="34.172901" />
+  <circle
+     fill="#002952"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse48"
+     r="33.222" />
+  <circle
+     fill="#002f5f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse50"
+     r="32.109299" />
+  <circle
+     fill="#00366b"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse52"
+     r="30.840099" />
+  <circle
+     fill="#003b77"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse54"
+     r="29.4207" />
+  <circle
+     fill="#004182"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse56"
+     r="27.858" />
+  <circle
+     fill="#00468c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse58"
+     r="26.1595" />
+  <circle
+     fill="#004b96"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse60"
+     r="24.333599" />
+  <circle
+     fill="#00509f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse62"
+     r="22.389099" />
+  <circle
+     fill="#0054a7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse64"
+     r="20.3356" />
+  <circle
+     fill="#0057ae"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse66"
+     r="18.183001" />
+  <circle
+     fill="#005ab5"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse68"
+     r="15.9418" />
+  <circle
+     fill="#005dba"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse70"
+     r="13.6229" />
+  <circle
+     fill="#005fbe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse72"
+     r="11.2377" />
+  <circle
+     fill="#0061c2"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse74"
+     r="8.7977304" />
+  <circle
+     fill="#0062c4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse76"
+     r="6.3148899" />
+  <circle
+     fill="#0063c6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse78"
+     r="3.80128" />
+  <circle
+     fill="#0064c7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse80"
+     r="1.26916" />
+  <polygon
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     points="887.158,516.6 853.3,485.25 853.3,547.95 "
+     id="polygon82"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="371.80304"
+     y="350.42838"
+     id="text84">P</text>
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="358.00903"
+     y="362.96835"
+     id="text86">y_actual</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,485.250000"
+     id="polyline88"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="253.29997"
+     y="349.17438"
+     id="text90">y</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="567.42999"
+     y="496.51935"
+     id="text92">res</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect94" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect96" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect98" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.00137"
+     width="125"
+     height="49"
+     id="rect100" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.50137"
+     width="125"
+     height="48"
+     id="rect102" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.00137"
+     width="125"
+     height="47"
+     id="rect104" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-435.50137"
+     width="125"
+     height="46"
+     id="rect106" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.50137"
+     width="125"
+     height="44"
+     id="rect108" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.00137"
+     width="125"
+     height="43"
+     id="rect110" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-433.00137"
+     width="125"
+     height="41"
+     id="rect112" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-431.50137"
+     width="125"
+     height="38"
+     id="rect114" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-430.50137"
+     width="125"
+     height="36"
+     id="rect116" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-429.50137"
+     width="125"
+     height="34"
+     id="rect118" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-428.00137"
+     width="125"
+     height="31"
+     id="rect120" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.50137"
+     width="125"
+     height="28"
+     id="rect122" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.00137"
+     width="125"
+     height="25"
+     id="rect124" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.50137"
+     width="125"
+     height="22"
+     id="rect126" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect128" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect130" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-418.50137"
+     width="125"
+     height="12"
+     id="rect132" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect134" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.00137"
+     width="125"
+     height="5"
+     id="rect136" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.50137"
+     width="125"
+     height="2"
+     id="rect138" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect140" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect142" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect144" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect146" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.62839"
+     width="125"
+     height="27"
+     id="rect148" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.12839"
+     width="125"
+     height="26"
+     id="rect150" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.12839"
+     width="125"
+     height="24"
+     id="rect152" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-424.62839"
+     width="125"
+     height="23"
+     id="rect154" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.62839"
+     width="125"
+     height="21"
+     id="rect156" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.62839"
+     width="125"
+     height="19"
+     id="rect158" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-421.62839"
+     width="125"
+     height="17"
+     id="rect160" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.12839"
+     width="125"
+     height="14"
+     id="rect162" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-419.12839"
+     width="125"
+     height="12"
+     id="rect164" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.62839"
+     width="125"
+     height="9"
+     id="rect166" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-416.62839"
+     width="125"
+     height="7"
+     id="rect168" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.12839"
+     width="125"
+     height="4"
+     id="rect170" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.62839"
+     width="125"
+     height="1"
+     id="rect172" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect174" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect176" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="112.79537"
+     id="text178">V=1 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text180">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse182"
+     r="62.700001" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse184"
+     r="62.547298" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse186"
+     r="62.089802" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse188"
+     r="61.329899" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse190"
+     r="60.271099" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse192"
+     r="58.918701" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse194"
+     r="57.279301" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse196"
+     r="55.360802" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse198"
+     r="53.1726" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse200"
+     r="50.725399" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse202"
+     r="48.030998" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse204"
+     r="45.1026" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse206"
+     r="41.954498" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse208"
+     r="38.602001" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse210"
+     r="35.061401" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse212"
+     r="31.35" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse214"
+     r="27.485901" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse216"
+     r="23.487801" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse218"
+     r="19.375401" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse220"
+     r="15.1685" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse222"
+     r="10.8877" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse224"
+     r="6.5539298" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse226"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="442.65399"
+     y="84.580376"
+     id="text228" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text230">vol</text>
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="65.400009"
+     y="224.60138"
+     width="125"
+     height="125"
+     id="rect232" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="205.59137"
+     id="text234">con</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="615.040000,348.564000 615.040000,441.360000"
+     id="polyline236"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="620.056,348.564 615.04,334.77 610.024,348.564 "
+     id="polygon238"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="608.770000,435.090000 716.614000,435.090000"
+     id="polyline240"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="707.836,440.106 721.63,435.09 707.836,430.074 "
+     id="polygon242"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="615.040000,391.200000 715.360000,391.200000"
+     id="polyline244"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="368.61136"
+     id="text246">k=1</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="231.98198"
+     y="265.15637"
+     id="text248" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="816.35004"
+     y="172.36038"
+     id="text298" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline300"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline302"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline304"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline306"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline308"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline310"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline312"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline314"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1292.200000,278.340000 995.420209,278.340000 995.420209,253.260000"
+     id="polyline316"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse320"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse322"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse324"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse326"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse328"
+     r="5.0159998" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,478.98 916,466.44 928.54,472.71 "
+     id="polygon330"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,466.44 916,453.9 928.54,460.17 "
+     id="polygon332"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="309.5"
+     y="-461.63736"
+     width="13"
+     height="13"
+     id="rect334" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="840.76,428.82 865.84,428.82 853.3,453.9 "
+     id="polygon336"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse338"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse340"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse342"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse344"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse346"
+     r="5.0159998" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect348" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse350" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse352" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse354" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse356" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse358" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse360" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect362" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse364" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse366" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse368" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse370" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse372" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse374" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="372.20001"
+     y="-92.961372"
+     width="13"
+     height="13"
+     id="rect376" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="727.9,397.47 727.9,384.93 740.44,391.2 "
+     id="polygon378"
+     transform="translate(-537.3,-104.09863)" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.pdf b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.pdf
new file mode 100644
index 00000000000..a503b0e5a48
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.png b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.png
index 825bc9f5464..0408c2072b4 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.png and b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.svg b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.svg
new file mode 100644
index 00000000000..ac588bb221b
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithBoundary.svg
@@ -0,0 +1,1851 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 880.29999 508.6012"
+   version="1.1"
+   id="svg408"
+   sodipodi:docname="FlowCircuit.svg"
+   inkscape:export-filename="flowCircuitWithBoundary.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   width="880.29999"
+   height="508.6012"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata414">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs412" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1587"
+     inkscape:window-height="1149"
+     id="namedview410"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.68613537"
+     inkscape:cx="378.7"
+     inkscape:cy="537.90137"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg408" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="316.62701"
+     y="496.51935"
+     id="text2">pump</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,472.710000 916.000000,472.710000"
+     id="polyline4"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,460.170000 916.000000,460.170000"
+     id="polyline6"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,491.520000"
+     id="polyline8"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect10" />
+  <rect
+     fill="#001021"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.50137"
+     width="125"
+     height="20"
+     id="rect12" />
+  <rect
+     fill="#002041"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect14" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect16" />
+  <rect
+     fill="#003f7f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-421.50137"
+     width="125"
+     height="18"
+     id="rect18" />
+  <rect
+     fill="#004d9b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect20" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-420.00137"
+     width="125"
+     height="15"
+     id="rect22" />
+  <rect
+     fill="#0064ca"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-419.00137"
+     width="125"
+     height="13"
+     id="rect24" />
+  <rect
+     fill="#006ddc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-418.00137"
+     width="125"
+     height="11"
+     id="rect26" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect28" />
+  <rect
+     fill="#007af6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-415.50137"
+     width="125"
+     height="6"
+     id="rect30" />
+  <rect
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-414.50137"
+     width="125"
+     height="4"
+     id="rect32" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.5"
+     y="-413.00137"
+     width="125"
+     height="1"
+     id="rect34" />
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse36"
+     r="36.366001" />
+  <circle
+     fill="#00070e"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse38"
+     r="36.277401" />
+  <circle
+     fill="#000e1c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse40"
+     r="36.0121" />
+  <circle
+     fill="#00152a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse42"
+     r="35.571301" />
+  <circle
+     fill="#001c38"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse44"
+     r="34.957199" />
+  <circle
+     fill="#002245"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse46"
+     r="34.172901" />
+  <circle
+     fill="#002952"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse48"
+     r="33.222" />
+  <circle
+     fill="#002f5f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse50"
+     r="32.109299" />
+  <circle
+     fill="#00366b"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse52"
+     r="30.840099" />
+  <circle
+     fill="#003b77"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse54"
+     r="29.4207" />
+  <circle
+     fill="#004182"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse56"
+     r="27.858" />
+  <circle
+     fill="#00468c"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse58"
+     r="26.1595" />
+  <circle
+     fill="#004b96"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse60"
+     r="24.333599" />
+  <circle
+     fill="#00509f"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse62"
+     r="22.389099" />
+  <circle
+     fill="#0054a7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse64"
+     r="20.3356" />
+  <circle
+     fill="#0057ae"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse66"
+     r="18.183001" />
+  <circle
+     fill="#005ab5"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse68"
+     r="15.9418" />
+  <circle
+     fill="#005dba"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse70"
+     r="13.6229" />
+  <circle
+     fill="#005fbe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse72"
+     r="11.2377" />
+  <circle
+     fill="#0061c2"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse74"
+     r="8.7977304" />
+  <circle
+     fill="#0062c4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse76"
+     r="6.3148899" />
+  <circle
+     fill="#0063c6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse78"
+     r="3.80128" />
+  <circle
+     fill="#0064c7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="316"
+     cy="412.50134"
+     id="ellipse80"
+     r="1.26916" />
+  <polygon
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     points="887.158,516.6 853.3,485.25 853.3,547.95 "
+     id="polygon82"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="371.80304"
+     y="350.42838"
+     id="text84">P</text>
+  <text
+     fill="#00007f"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="358.00903"
+     y="362.96835"
+     id="text86">y_actual</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="853.300000,453.900000 853.300000,485.250000"
+     id="polyline88"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#00007f"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="253.29997"
+     y="349.17438"
+     id="text90">y</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="567.42999"
+     y="496.51935"
+     id="text92">res</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect94" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect96" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.50137"
+     width="125"
+     height="50"
+     id="rect98" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-437.00137"
+     width="125"
+     height="49"
+     id="rect100" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.50137"
+     width="125"
+     height="48"
+     id="rect102" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-436.00137"
+     width="125"
+     height="47"
+     id="rect104" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-435.50137"
+     width="125"
+     height="46"
+     id="rect106" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.50137"
+     width="125"
+     height="44"
+     id="rect108" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-434.00137"
+     width="125"
+     height="43"
+     id="rect110" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-433.00137"
+     width="125"
+     height="41"
+     id="rect112" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-431.50137"
+     width="125"
+     height="38"
+     id="rect114" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-430.50137"
+     width="125"
+     height="36"
+     id="rect116" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-429.50137"
+     width="125"
+     height="34"
+     id="rect118" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-428.00137"
+     width="125"
+     height="31"
+     id="rect120" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.50137"
+     width="125"
+     height="28"
+     id="rect122" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.00137"
+     width="125"
+     height="25"
+     id="rect124" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.50137"
+     width="125"
+     height="22"
+     id="rect126" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.00137"
+     width="125"
+     height="19"
+     id="rect128" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.50137"
+     width="125"
+     height="16"
+     id="rect130" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-418.50137"
+     width="125"
+     height="12"
+     id="rect132" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.00137"
+     width="125"
+     height="9"
+     id="rect134" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.00137"
+     width="125"
+     height="5"
+     id="rect136" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.50137"
+     width="125"
+     height="2"
+     id="rect138" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect140" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.62839"
+     width="125"
+     height="29"
+     id="rect142" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect144" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-427.12839"
+     width="125"
+     height="28"
+     id="rect146" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.62839"
+     width="125"
+     height="27"
+     id="rect148" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-426.12839"
+     width="125"
+     height="26"
+     id="rect150" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-425.12839"
+     width="125"
+     height="24"
+     id="rect152" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-424.62839"
+     width="125"
+     height="23"
+     id="rect154" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-423.62839"
+     width="125"
+     height="21"
+     id="rect156" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-422.62839"
+     width="125"
+     height="19"
+     id="rect158" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-421.62839"
+     width="125"
+     height="17"
+     id="rect160" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-420.12839"
+     width="125"
+     height="14"
+     id="rect162" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-419.12839"
+     width="125"
+     height="12"
+     id="rect164" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-417.62839"
+     width="125"
+     height="9"
+     id="rect166" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-416.62839"
+     width="125"
+     height="7"
+     id="rect168" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-415.12839"
+     width="125"
+     height="4"
+     id="rect170" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="504.29999"
+     y="-413.62839"
+     width="125"
+     height="1"
+     id="rect172" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect174" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="504.10004"
+     y="406.23135"
+     width="0"
+     height="0"
+     id="rect176" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="112.79537"
+     id="text178">V=1 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text180">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse182"
+     r="62.700001" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse184"
+     r="62.547298" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse186"
+     r="62.089802" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse188"
+     r="61.329899" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse190"
+     r="60.271099" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse192"
+     r="58.918701" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse194"
+     r="57.279301" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse196"
+     r="55.360802" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse198"
+     r="53.1726" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse200"
+     r="50.725399" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse202"
+     r="48.030998" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse204"
+     r="45.1026" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse206"
+     r="41.954498" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse208"
+     r="38.602001" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse210"
+     r="35.061401" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse212"
+     r="31.35" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse214"
+     r="27.485901" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse216"
+     r="23.487801" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse218"
+     r="19.375401" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse220"
+     r="15.1685" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse222"
+     r="10.8877" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse224"
+     r="6.5539298" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="87.71537"
+     id="ellipse226"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="442.65399"
+     y="84.580376"
+     id="text228" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="440.146"
+     y="11.221375"
+     id="text230">vol</text>
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="65.400009"
+     y="224.60138"
+     width="125"
+     height="125"
+     id="rect232" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="205.59137"
+     id="text234">con</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="615.040000,348.564000 615.040000,441.360000"
+     id="polyline236"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="620.056,348.564 615.04,334.77 610.024,348.564 "
+     id="polygon238"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="608.770000,435.090000 716.614000,435.090000"
+     id="polyline240"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="707.836,440.106 721.63,435.09 707.836,430.074 "
+     id="polygon242"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="615.040000,391.200000 715.360000,391.200000"
+     id="polyline244"
+     transform="translate(-537.3,-104.09863)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="127.90001"
+     y="368.61136"
+     id="text246">k=1</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="231.98198"
+     y="265.15637"
+     id="text248" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="817.60004"
+     y="92.731377"
+     id="text250">bou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse252"
+     r="62.700001" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse254"
+     r="62.547298" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse256"
+     r="62.089802" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse258"
+     r="61.329899" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse260"
+     r="60.271099" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse262"
+     r="58.918701" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse264"
+     r="57.279301" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse266"
+     r="55.360802" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse268"
+     r="53.1726" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse270"
+     r="50.725399" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse272"
+     r="48.030998" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse274"
+     r="45.1026" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse276"
+     r="41.954498" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse278"
+     r="38.602001" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse280"
+     r="35.061401" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse282"
+     r="31.35" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse284"
+     r="27.485901" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse286"
+     r="23.487801" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse288"
+     r="19.375401" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse290"
+     r="15.1685" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse292"
+     r="10.8877" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse294"
+     r="6.5539298" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-817.59998"
+     cy="-174.24138"
+     id="ellipse296"
+     r="2.1882" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="816.35004"
+     y="172.36038"
+     id="text298" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline300"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="916.000000,516.600000 1041.400000,516.600000"
+     id="polyline302"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline304"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="740.440000,391.200000 853.300000,391.200000 853.300000,441.360000"
+     id="polyline306"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline308"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="790.600000,516.600000 539.800000,516.600000 539.800000,290.880000 961.979979,290.880000 961.979979,253.260000"
+     id="polyline310"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline312"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="978.700000,253.260000 978.700000,290.880000 1229.500000,290.880000 1229.500000,516.600000 1166.800000,516.600000"
+     id="polyline314"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1292.200000,278.340000 995.420209,278.340000 995.420209,253.260000"
+     id="polyline316"
+     transform="translate(-537.3,-104.09863)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="1292.200000,278.340000 995.420209,278.340000 995.420209,253.260000"
+     id="polyline318"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse320"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="253.29997"
+     cy="412.50134"
+     id="ellipse322"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse324"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse326"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-378.70001"
+     cy="-412.5014"
+     id="ellipse328"
+     r="5.0159998" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,478.98 916,466.44 928.54,472.71 "
+     id="polygon330"
+     transform="translate(-537.3,-104.09863)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="916,466.44 916,453.9 928.54,460.17 "
+     id="polygon332"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="309.5"
+     y="-461.63736"
+     width="13"
+     height="13"
+     id="rect334" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="840.76,428.82 865.84,428.82 853.3,453.9 "
+     id="polygon336"
+     transform="translate(-537.3,-104.09863)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse338"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="504.10004"
+     cy="412.50134"
+     id="ellipse340"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse342"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse344"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-629.49994"
+     cy="-412.5014"
+     id="ellipse346"
+     r="5.0159998" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect348" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse350" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse352" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse354" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse356" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse358" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse360" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="416.39999"
+     y="-155.66138"
+     width="50"
+     height="13"
+     id="rect362" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse364" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse366" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.16136"
+     rx="6.0191998"
+     ry="6.27"
+     id="ellipse368" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="425.349"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse370" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="441.40002"
+     cy="149.24736"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse372" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="457.45099"
+     cy="149.21637"
+     rx="3.5112"
+     ry="3.6287601"
+     id="ellipse374" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="372.20001"
+     y="-92.961372"
+     width="13"
+     height="13"
+     id="rect376" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="727.9,397.47 727.9,384.93 740.44,391.2 "
+     id="polygon378"
+     transform="translate(-537.3,-104.09863)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-761.40002"
+     y="149.24138"
+     width="13"
+     height="50"
+     id="rect380" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse382"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse384"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse386"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse388"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse390"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse392"
+     r="3.7620001" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1,1)"
+     x="-761.40002"
+     y="149.24138"
+     width="13"
+     height="50"
+     id="rect394" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse396"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse398"
+     r="6.27" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse400"
+     r="6.27" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-174.24138"
+     id="ellipse402"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-190.54338"
+     id="ellipse404"
+     r="3.7620001" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-754.90002"
+     cy="-157.93938"
+     id="ellipse406"
+     r="3.7620001" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithExpansionVessel.png b/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithExpansionVessel.png
deleted file mode 100644
index c577ae48f25..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/flowCircuitWithExpansionVessel.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.pdf b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.pdf
new file mode 100644
index 00000000000..7ab32f3fffa
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.png b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.png
index d2ab3b039b3..4d96f9f1a47 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.png and b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.svg b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.svg
new file mode 100644
index 00000000000..961f65ef4f1
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixing.svg
@@ -0,0 +1,2044 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 413.1954 400.40726"
+   version="1.1"
+   id="svg560"
+   sodipodi:docname="fluidJunctionMixing.svg"
+   width="413.1954"
+   height="400.40726"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata566">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs564" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3293"
+     inkscape:window-height="2038"
+     id="namedview562"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="4.5154026"
+     inkscape:cx="201.95941"
+     inkscape:cy="155.91079"
+     inkscape:window-x="67"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg560" />
+  <g
+     id="g1389"
+     transform="translate(-1166.5828,-646.63279)">
+    <polyline
+       id="polyline1385"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       id="polyline1387"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(-1433.9876,-646.63279)"
+     id="g1401">
+    <polyline
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       id="polyline1397" />
+    <polyline
+       style="fill:none;stroke:#007fff;stroke-opacity:1"
+       transform="matrix(1,0,0,0.66992892,0,82.989554)"
+       points="1492.760870,841.347826 1492.760870,914.260870"
+       id="polyline1399" />
+  </g>
+  <polygon
+     points="1234.1626,712.53478 1232.7043,695.52174 1216.1774,695.52174 1212.7748,744.13044 1236.593,744.13044 1235.1348,727.60348 1249.7174,727.60348 1249.7174,712.53478 "
+     id="polygon2"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1231.7322,715.4513 1230.2739,695.52174 1220.0661,695.52174 1216.1774,744.13044 1233.6765,744.13044 1232.2183,724.20087 1249.7174,724.20087 1249.7174,715.4513 "
+     id="polygon4"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text6"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="-73.436195"
+     y="29.144512">spl</text>
+  <rect
+     transform="rotate(-90)"
+     x="-97.4972"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect8"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-97.4972"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect10"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-73.193199"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect12"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-73.193199"
+     y="56.364513"
+     width="0"
+     height="0"
+     id="rect14"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-75.624199"
+     y="58.794514"
+     width="0"
+     height="0"
+     id="rect16"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-75.624199"
+     y="58.794514"
+     width="0"
+     height="0"
+     id="rect18"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-73.193161"
+     cy="58.794502"
+     id="ellipse20"
+     r="8.5065203"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1484.0113,727.11739 1485.4696,744.13044 1501.9965,744.13044 1505.3991,695.52174 1481.5809,695.52174 1483.0391,712.0487 1468.4565,712.0487 1468.4565,727.11739 "
+     id="polygon22"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1486.4417,724.20087 1487.9,744.13044 1498.1078,744.13044 1501.9965,695.52174 1484.4974,695.52174 1485.9557,715.4513 1468.4565,715.4513 1468.4565,724.20087 "
+     id="polygon24"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text26"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="72.950195"
+     y="-355.79449">mix2</text>
+  <rect
+     transform="rotate(90)"
+     x="48.889202"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect28"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="48.889202"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect30"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="73.193199"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect32"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="73.193199"
+     y="-328.57449"
+     width="0"
+     height="0"
+     id="rect34"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="70.763199"
+     y="-326.1445"
+     width="0"
+     height="0"
+     id="rect36"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="70.763199"
+     y="-326.1445"
+     width="0"
+     height="0"
+     id="rect38"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="73.193207"
+     cy="-326.1445"
+     id="ellipse40"
+     r="8.5065203"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text42"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="-291.68921"
+     y="91.36451">pumBoi</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect48"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect50"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect52"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.794514"
+     width="49"
+     height="8"
+     id="rect54"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect56"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect58"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect60"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect62"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-62.294514"
+     width="49"
+     height="7"
+     id="rect64"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.794514"
+     width="49"
+     height="6"
+     id="rect66"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.794514"
+     width="49"
+     height="6"
+     id="rect68"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.794514"
+     width="49"
+     height="6"
+     id="rect70"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.294514"
+     width="49"
+     height="5"
+     id="rect72"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-61.294514"
+     width="49"
+     height="5"
+     id="rect74"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.794514"
+     width="49"
+     height="4"
+     id="rect76"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.794514"
+     width="49"
+     height="4"
+     id="rect78"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.294514"
+     width="49"
+     height="3"
+     id="rect80"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-60.294514"
+     width="49"
+     height="3"
+     id="rect82"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.794514"
+     width="49"
+     height="2"
+     id="rect84"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.794514"
+     width="49"
+     height="2"
+     id="rect86"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.294514"
+     width="49"
+     height="1"
+     id="rect88"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-59.294514"
+     width="49"
+     height="1"
+     id="rect90"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-316.43222"
+     y="-58.794514"
+     width="49"
+     height="0"
+     id="rect92"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse94"
+     r="14.0965"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse96"
+     r="14.0327"
+     style="fill:#000913;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse98"
+     r="13.8418"
+     style="fill:#001326;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse100"
+     r="13.5255"
+     style="fill:#001d39;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse102"
+     r="13.0868"
+     style="fill:#00264c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse104"
+     r="12.5295"
+     style="fill:#002f5d;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse106"
+     r="11.8587"
+     style="fill:#00376e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse108"
+     r="11.0806"
+     style="fill:#003f7e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse110"
+     r="10.2021"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse112"
+     r="9.2312603"
+     style="fill:#004d99;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse114"
+     r="8.1767797"
+     style="fill:#0053a5;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse116"
+     r="7.0482602"
+     style="fill:#0058af;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse118"
+     r="5.8559098"
+     style="fill:#005cb7;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse120"
+     r="4.6105199"
+     style="fill:#005fbe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse122"
+     r="3.32338"
+     style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse124"
+     r="2.00614"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-291.93216"
+     cy="58.794514"
+     id="ellipse126"
+     r="0.67074001"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1237.5652,938.56522 1225.413,925.44087 1213.2609,938.56522 "
+     id="polygon128"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse130"
+     r="3.8887"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse132"
+     r="3.73118"
+     style="fill:#001e3d;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse134"
+     r="3.2713799"
+     style="fill:#003a74;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse136"
+     r="2.54655"
+     style="fill:#0050a0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse138"
+     r="1.61542"
+     style="fill:#005fbd;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-287.07117"
+     cy="58.794491"
+     id="ellipse140"
+     r="0.55341899"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="1201.108696,938.565217 1213.260870,938.565217"
+     id="polyline146"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="rotate(-90)"
+     x="-299.68921"
+     y="34.284512"
+     width="16"
+     height="15"
+     id="rect148"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-291.68918"
+     cy="41.784534"
+     rx="8.0204296"
+     ry="7.2912998"
+     id="ellipse150"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text152"
+     style="font-weight:bold;font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="-291.68921"
+     y="42.024509">M</text>
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text154"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f"
+     x="-316.23721"
+     y="34.254513">m_flow</text>
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     x="204.38451"
+     y="397.41727"
+     id="text156"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+  <rect
+     transform="scale(-1)"
+     x="-221.62451"
+     y="-379.3472"
+     width="34"
+     height="29"
+     id="rect158"
+     style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1)"
+     x="-229.24451"
+     y="-365.7272"
+     width="49"
+     height="2"
+     id="rect160"
+     style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-204.47452"
+     y="363.7272"
+     width="24"
+     height="2"
+     id="rect162"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1374.1557,1024.1165 1367.8365,1024.1165 1371.2391,1019.7417 "
+     id="polygon164"
+     style="fill:#ffff00;stroke:none;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1395.543478,992.034783 1390.682609,992.034783 1390.682609,1022.172174 1372.697391,1022.172174"
+     id="polyline166"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1346.934783,992.034783 1351.795652,992.034783 1351.795652,1010.506087"
+     id="polyline168"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     x="180.31456"
+     y="335.92325"
+     id="text170"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     x="228.44456"
+     y="335.43723"
+     id="text172"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     x="379.61447"
+     y="333.25021"
+     id="text174"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse176"
+     r="24.3043"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse178"
+     r="24.2451"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse180"
+     r="24.067801"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse182"
+     r="23.773199"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse184"
+     r="23.362801"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse186"
+     r="22.8386"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse188"
+     r="22.2031"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse190"
+     r="21.459499"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse192"
+     r="20.6113"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse194"
+     r="19.6626"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse196"
+     r="18.6182"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse198"
+     r="17.483101"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse200"
+     r="16.2628"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse202"
+     r="14.9633"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse204"
+     r="13.5908"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse206"
+     r="12.1522"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse208"
+     r="10.6543"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse210"
+     r="9.1045704"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse212"
+     r="7.5104599"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse214"
+     r="5.8797498"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse216"
+     r="4.2204099"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse218"
+     r="2.5404999"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-379.6145"
+     cy="-364.84723"
+     id="ellipse220"
+     r="0.84820998"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     x="379.12448"
+     y="364.11722"
+     id="text222"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <polyline
+     points="1504.426957,817.043478 1519.009565,817.043478"
+     id="polyline224"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1509.773913,817.043478 1509.773913,826.765217"
+     id="polyline226"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="rotate(90)"
+     x="162.65421"
+     y="-350.65451"
+     width="16"
+     height="15"
+     id="rect228"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(90)"
+     cx="170.65422"
+     cy="-343.15451"
+     rx="8.0204296"
+     ry="7.2912998"
+     id="ellipse230"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text232"
+     style="font-weight:bold;font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="170.65421"
+     y="-343.40451">M</text>
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text234"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="146.1062"
+     y="-350.69449" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect236"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect238"
+     style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect240"
+     style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect242"
+     style="fill:#282828;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="316.6445"
+     width="49"
+     height="19"
+     id="rect244"
+     style="fill:#363636;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="317.1445"
+     width="49"
+     height="18"
+     id="rect246"
+     style="fill:#434343;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="317.1445"
+     width="49"
+     height="18"
+     id="rect248"
+     style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="317.6445"
+     width="49"
+     height="17"
+     id="rect250"
+     style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="318.1445"
+     width="49"
+     height="16"
+     id="rect252"
+     style="fill:#676767;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="318.1445"
+     width="49"
+     height="16"
+     id="rect254"
+     style="fill:#737373;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="318.6445"
+     width="49"
+     height="15"
+     id="rect256"
+     style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="319.1445"
+     width="49"
+     height="14"
+     id="rect258"
+     style="fill:#878787;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="319.6445"
+     width="49"
+     height="13"
+     id="rect260"
+     style="fill:#919191;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.1445"
+     width="49"
+     height="12"
+     id="rect262"
+     style="fill:#999999;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect264"
+     style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect266"
+     style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect268"
+     style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.6445"
+     width="49"
+     height="7"
+     id="rect270"
+     style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.1445"
+     width="49"
+     height="6"
+     id="rect272"
+     style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.6445"
+     width="49"
+     height="5"
+     id="rect274"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.6445"
+     width="49"
+     height="3"
+     id="rect276"
+     style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.1445"
+     width="49"
+     height="2"
+     id="rect278"
+     style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.6445"
+     width="49"
+     height="1"
+     id="rect280"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect282"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect284"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="320.6445"
+     width="49"
+     height="11"
+     id="rect286"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect288"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect290"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect292"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.1445"
+     width="49"
+     height="10"
+     id="rect294"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect296"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect298"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="321.6445"
+     width="49"
+     height="9"
+     id="rect300"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.1445"
+     width="49"
+     height="8"
+     id="rect302"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.1445"
+     width="49"
+     height="8"
+     id="rect304"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.6445"
+     width="49"
+     height="7"
+     id="rect306"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="322.6445"
+     width="49"
+     height="7"
+     id="rect308"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.1445"
+     width="49"
+     height="6"
+     id="rect310"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.6445"
+     width="49"
+     height="5"
+     id="rect312"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="323.6445"
+     width="49"
+     height="5"
+     id="rect314"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.1445"
+     width="49"
+     height="4"
+     id="rect316"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.6445"
+     width="49"
+     height="3"
+     id="rect318"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="324.6445"
+     width="49"
+     height="3"
+     id="rect320"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.1445"
+     width="49"
+     height="2"
+     id="rect322"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="325.6445"
+     width="49"
+     height="1"
+     id="rect324"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="145.9102"
+     y="326.1445"
+     width="49"
+     height="0"
+     id="rect326"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="155.9102"
+     y="316.6445"
+     width="29"
+     height="19"
+     id="rect328"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1507.3435,798.57217 1478.1783,798.57217 1492.7609,817.04348 "
+     id="polygon330"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1507.3435,835.51478 1478.1783,835.51478 1492.7609,817.04348 "
+     id="polygon332"
+     style="fill:#ffffff;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="160.9102"
+     y="301.68451"
+     width="19"
+     height="11"
+     id="rect334"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="160.9102"
+     y="301.68451"
+     width="19"
+     height="11"
+     id="rect336"
+     style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="161.4102"
+     y="301.68451"
+     width="18"
+     height="11"
+     id="rect338"
+     style="fill:#535353;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="162.4102"
+     y="301.68451"
+     width="16"
+     height="11"
+     id="rect340"
+     style="fill:#777777;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="163.9102"
+     y="301.68451"
+     width="13"
+     height="11"
+     id="rect342"
+     style="fill:#969696;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.4102"
+     y="301.68451"
+     width="10"
+     height="11"
+     id="rect344"
+     style="fill:#acacac;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="167.4102"
+     y="301.68451"
+     width="6"
+     height="11"
+     id="rect346"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="169.4102"
+     y="301.68451"
+     width="2"
+     height="11"
+     id="rect348"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="164.9102"
+     y="301.68451"
+     width="11"
+     height="11"
+     id="rect350"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.4102"
+     y="301.68451"
+     width="10"
+     height="11"
+     id="rect352"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.4102"
+     y="301.68451"
+     width="10"
+     height="11"
+     id="rect354"
+     style="fill:#00376e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="165.9102"
+     y="301.68451"
+     width="9"
+     height="11"
+     id="rect356"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="166.9102"
+     y="301.68451"
+     width="7"
+     height="11"
+     id="rect358"
+     style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="167.9102"
+     y="301.68451"
+     width="5"
+     height="11"
+     id="rect360"
+     style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="168.9102"
+     y="301.68451"
+     width="3"
+     height="11"
+     id="rect362"
+     style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="169.9102"
+     y="301.68451"
+     width="1"
+     height="11"
+     id="rect364"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1474.2896,831.62609 1474.2896,802.46087 1492.7609,817.04348 "
+     id="polygon366"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1502.482609,809.752174 1502.482609,824.334783"
+     id="polyline368"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1502.482609,817.043478 1492.760870,817.043478"
+     id="polyline370"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="11"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text372"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff"
+     x="157.52921"
+     y="-326.63449" />
+  <text
+     font-size="10"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text374"
+     style="font-size:10px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff"
+     x="292.1752"
+     y="-293.57449">temRet</text>
+  <polyline
+     points="1507.343478,951.203478 1510.746087,952.661739 1513.662609,954.606087 1515.120870,957.036522 1516.093043,959.953043 1516.093043,962.383478"
+     id="polyline376"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,914.260870 1492.760870,960.925217"
+     id="polyline378"
+     style="fill:none;stroke:#0080ff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <ellipse
+     transform="rotate(90)"
+     cx="291.93222"
+     cy="-316.66449"
+     rx="4.8608699"
+     ry="4.6178298"
+     id="ellipse380"
+     style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="1507.343478,928.843478 1507.343478,935.648696"
+     id="polyline382"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1500.052174,928.843478 1500.052174,935.648696"
+     id="polyline384"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,928.843478 1492.760870,935.648696"
+     id="polyline386"
+     style="fill:none;stroke:#000000;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="matrix(0,1,1,0,0,0)"
+     x="288.93222"
+     y="320.52451"
+     width="6"
+     height="20"
+     id="rect388"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="1514.6348,938.56522 1514.1487,940.02348 1513.6626,940.99565 1512.2043,941.48174 1507.3435,941.48174 1507.3435,935.6487 1512.2043,935.6487 1513.6626,936.13478 1514.1487,937.10696 "
+     id="polygon390"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text392"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="302.1402"
+     y="-354.09448">T</text>
+  <polyline
+     points="1507.343478,935.648696 1486.684783,935.648696"
+     id="polyline394"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1507.343478,941.481739 1486.927826,941.481739"
+     id="polyline396"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1517.065217,938.565217 1504.913043,938.565217"
+     id="polyline398"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <text
+     font-size="12"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text400"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
+     x="272.4892"
+     y="-349.2345" />
+  <polyline
+     points="1346.934783,1011.478261 1225.413043,1011.478261 1225.413043,962.869565"
+     id="polyline402"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1346.934783,1011.478261 1225.413043,1011.478261 1225.413043,962.869565"
+     id="polyline404"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,841.347826 1492.760870,914.260870"
+     id="polyline406"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,841.347826 1492.760870,914.260870"
+     id="polyline408"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,962.869565 1492.760870,1011.478261 1395.543478,1011.478261"
+     id="polyline410"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,962.869565 1492.760870,1011.478261 1395.543478,1011.478261"
+     id="polyline412"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1395.543478,1011.478261 1521.926087,1011.478261"
+     id="polyline414"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1395.543478,1011.478261 1521.926087,1011.478261"
+     id="polyline416"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,744.130435 1492.760870,792.739130"
+     id="polyline418"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1492.760870,744.130435 1492.760870,792.739130"
+     id="polyline420"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1249.717391,719.826087 1468.456522,719.826087"
+     id="polyline422"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1249.717391,719.826087 1468.456522,719.826087"
+     id="polyline424"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,914.260870 1225.413043,744.130435"
+     id="polyline426"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,914.260870 1225.413043,744.130435"
+     id="polyline428"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,817.043478 1468.456522,817.043478"
+     id="polyline430"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polyline
+     points="1225.413043,914.260870 1225.413043,817.043478 1468.456522,817.043478"
+     id="polyline432"
+     style="fill:none;stroke:#007fff;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     cx="58.794548"
+     cy="170.41023"
+     id="ellipse434"
+     r="3"
+     style="fill:#007fff;stroke:#007fff" />
+  <circle
+     cx="326.1445"
+     cy="364.8472"
+     id="ellipse436"
+     r="3"
+     style="fill:#007fff;stroke:#007fff" />
+  <circle
+     transform="rotate(-90)"
+     cx="-97.497162"
+     cy="58.794518"
+     id="ellipse438"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-97.497162"
+     cy="58.794518"
+     id="ellipse440"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-73.19323"
+     cy="83.1045"
+     id="ellipse448"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-73.19323"
+     cy="83.1045"
+     id="ellipse450"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(90)"
+     cx="49.691422"
+     cy="-326.1445"
+     rx="1.6282153"
+     ry="2.4304299"
+     id="ellipse452"
+     style="fill:#007fff;stroke:#007fff;stroke-width:0.81849188;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(90)"
+     cx="48.907242"
+     cy="-326.1445"
+     rx="2.3386657"
+     ry="2.3567023"
+     id="ellipse454"
+     style="fill:#007fff;stroke:#000000;stroke-width:0.96594709;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="97.497208"
+     cy="-326.1445"
+     id="ellipse456"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="97.497208"
+     cy="-326.1445"
+     id="ellipse458"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="97.497208"
+     cy="-326.1445"
+     id="ellipse460"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="73.193161"
+     cy="-301.84451"
+     id="ellipse462"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="73.193161"
+     cy="-301.84451"
+     id="ellipse464"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="58.794506"
+     id="ellipse466"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="58.794506"
+     id="ellipse468"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.62823"
+     cy="-58.794525"
+     id="ellipse470"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.62823"
+     cy="-58.794525"
+     id="ellipse472"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.62823"
+     cy="-58.794525"
+     id="ellipse474"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-294.43222"
+     y="-77.824509"
+     width="5"
+     height="5"
+     id="rect480"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="1201.1087,938.56522 1191.387,943.42609 1191.387,933.70435 "
+     id="polygon482"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     transform="scale(-1)"
+     cx="-228.92447"
+     cy="-364.84723"
+     id="ellipse486"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-228.92447"
+     cy="-364.84723"
+     id="ellipse488"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="180.31456"
+     cy="364.8472"
+     id="ellipse490"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="180.31456"
+     cy="364.8472"
+     id="ellipse492"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="180.31456"
+     cy="364.8472"
+     id="ellipse494"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="1395.5435,992.03478 1405.2652,996.89565 1405.2652,987.17391 "
+     id="polygon496"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1342.0739,992.03478 1346.9348,994.46522 1346.9348,989.60435 "
+     id="polygon498"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <rect
+     transform="scale(-1)"
+     x="-207.12451"
+     y="-349.84619"
+     width="5"
+     height="5"
+     id="rect500"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-357.81448"
+     y="355.3472"
+     width="5"
+     height="19"
+     id="rect502"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse504"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse506"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse508"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse510"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse512"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse514"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-357.81448"
+     y="355.3472"
+     width="5"
+     height="19"
+     id="rect516"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse518"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse520"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse522"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-364.84723"
+     id="ellipse524"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-371.16721"
+     id="ellipse526"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-355.31445"
+     cy="-358.52722"
+     id="ellipse528"
+     r="1.4582601"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="146.10622"
+     cy="-326.14447"
+     id="ellipse530"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="146.10622"
+     cy="-326.14447"
+     id="ellipse532"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="194.71521"
+     cy="-326.14447"
+     id="ellipse534"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="194.71521"
+     cy="-326.14447"
+     id="ellipse536"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="194.71521"
+     cy="-326.14447"
+     id="ellipse538"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="170.41017"
+     cy="-301.84445"
+     id="ellipse540"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="170.41017"
+     cy="-301.84445"
+     id="ellipse542"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1517.0652,817.04348 1526.787,812.18261 1526.787,821.90435 "
+     id="polygon544"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <polygon
+     points="1509.7739,831.62609 1507.3435,826.76522 1512.2043,826.76522 "
+     id="polygon546"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     transform="rotate(90)"
+     cx="267.6282"
+     cy="-326.1445"
+     id="ellipse548"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.6282"
+     cy="-326.1445"
+     id="ellipse550"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="326.1445"
+     id="ellipse552"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="326.1445"
+     id="ellipse554"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-316.23718"
+     cy="326.1445"
+     id="ellipse556"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="1521.9261,938.56522 1517.0652,936.13478 1517.0652,940.99565 "
+     id="polygon558"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1"
+     transform="translate(-1166.6155,-646.63279)" />
+  <circle
+     id="ellipse1391"
+     cy="-58.794548"
+     cx="49.62825"
+     transform="rotate(90)"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     id="ellipse1393"
+     cy="-58.794548"
+     cx="49.62825"
+     transform="rotate(90)"
+     r="2.4304299"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     id="ellipse1395"
+     cy="-58.794548"
+     cx="49.62825"
+     transform="rotate(90)"
+     r="1.94435"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     transform="rotate(90,925.07417,13.491051)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     id="polyline1403"
+     points="1203.539130,938.565217 1203.539130,914.260870" />
+  <polyline
+     points="1203.539130,938.565217 1203.539130,914.260870"
+     id="polyline1407"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="matrix(0,1,-10.829397,0,10164.095,-956.08767)" />
+  <polyline
+     points="1203.539130,938.565217 1203.539130,914.260870"
+     id="polyline1409"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="rotate(90,1017.8619,159.60034)" />
+  <polyline
+     transform="matrix(-1,0,0,-4.0231012,1466.7406,4023.4415)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     id="polyline1411"
+     points="1203.539130,938.565217 1203.539130,914.260870" />
+  <polyline
+     points="1203.539130,938.565217 1203.539130,914.260870"
+     id="polyline1413"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     transform="matrix(0,1,-2.184576,0,2410.4678,-1033.3885)" />
+  <polyline
+     transform="matrix(0,-1,-2.3668185,0,2577.0849,1495.0522)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1"
+     id="polyline1417"
+     points="1203.539130,938.565217 1203.539130,914.260870" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.pdf b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.pdf
new file mode 100644
index 00000000000..e40e0dfe205
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.png b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.png
index cf54076e082..f1fca1449b3 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.png and b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.svg b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.svg
index eba40011c8a..792516cf644 100644
--- a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.svg
+++ b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitter.svg
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3055"
+   viewBox="0 0 1648.4141 944.49182"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   width="555.19141"
-   height="584.22089"
-   sodipodi:docname="fluidJunctionMixingSplitter.svg">
+   id="svg1454"
+   sodipodi:docname="fluidJunctionMixingSplitter.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="1648.4141"
+   height="944.49182">
   <metadata
-     id="metadata3061">
+     id="metadata1460">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -29,343 +27,29 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs3059">
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3848"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3851"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart-1"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart">
-      <path
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3848-85"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-6"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-7"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-8"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-1"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-0"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-0"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart-8"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart">
-      <path
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3848-8"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart-5"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart">
-      <path
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3848-5"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart-2"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart">
-      <path
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3848-7"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-5"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-2"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend-6-04"
-       style="overflow:visible">
-      <path
-         inkscape:connector-curvature="0"
-         id="path3851-1-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-9"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-17"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-1"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-8"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-3"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-5"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-2"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-66"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-84"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-171"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-87"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-74"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-91"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-55"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-07"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-4"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-7"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-56"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-4"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-85"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-5"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-856"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lend-6-55"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         id="path3851-1-63"
-         inkscape:connector-curvature="0" />
-    </marker>
+     id="defs1458">
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect5803"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect4976"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
   </defs>
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -376,185 +60,8145 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1447"
-     inkscape:window-height="927"
-     id="namedview3057"
+     inkscape:window-width="3293"
+     inkscape:window-height="2038"
+     id="namedview1456"
      showgrid="false"
-     inkscape:zoom="1.3120946"
-     inkscape:cx="210.03574"
-     inkscape:cy="227.63884"
-     inkscape:window-x="74"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3055"
+     inkscape:zoom="0.97034195"
+     inkscape:cx="891.33175"
+     inkscape:cy="914.39918"
+     inkscape:window-x="67"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1454"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0" />
-  <image
-     y="0"
-     x="0"
-     id="image3305"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASIAAAJQCAIAAACl3v62AAAAA3NCSVQICAjb4U/gAAAgAElEQVR4 nO3dfXgU1aE/8O+EkFcSA4EgBBIMEKIU5MVyw0+CokCrVStgrW8VAS1Pi1oFEeJFs7FqVLwtVfGx 4CWE8ittqsReubmA3oJCwBcQKf4KEkRIeBEiBIS8Qcj8/pjZ2cm+ZbM7Z2Z29/t58uSZnczOnOzm mzNz9pwzkizLICKRYqwuAFHkY8yIhGPMiIRjzIiEY8yIhGPMiIRjzIiEY8zCyXPPYdAgqwtBnceY EQnHmNnFmTPo0gUnTgDAH/+ItDS0tWHsWMTFIS4O06dbXT4KAWNmF2lp6N8fr7wCAMuW4ZZb8Mwz 2LcP332HL7/EmjXYtMnqIlKwGDMbufNOrF2Ltjbs2YPiYmzciGnTkJqK3FwMG4a//tXq8lGwGDMb efJJHD6MFSuQno6BA6Hv1B0Tg9ZW60pGoWHMbKRnT/Tpg7lzcffdADBpEtauxfnzqK7G7t24806r y0fBYszs5Y47cP48Fi0CgOeew+DB6NEDQ4fi7rsxebLVhaNgSRxvRiRarNUFIC9yR4z1un7/F9tN LgkZgrWZjWjp6pM12OsGx2uqlQXmLbywNrOL3BFjtXT17p/T4cZMWhhhbWYxpQbzDFhSSprblo3n zigLJ2oPKgtK5ca82R9jZiV9xnr3z9FHKynlMreNG8+d1S2fUcLGpIUFxswy2lmiUoMpGdPSldTN I2bn1ZgpeVMqNy1sTJqdMWbW0GfMa8ASu6W4PaXp/Dl4CxuTZn+MmQU86zElY0ndLtPSlZDkHrPm xnPKQtP5c0rYGs+dZZ0WFhgzs2nXY0rGevbNhreAJSQmuz2xuakB3sL23bHDAE7UHuR1mm2xQd8C Ssa0Bg/tMkwfsPjEJK/PTUhMbm5qUMKW1O2yxvNnlf0oodU+WCNbYczMpv/oOSnlMu1KTMuYErC4 +ESvT29paoQzkE3nzylP1xohfX2uTdZi12FTKWeMSlWmXI8ldktRMpaQmOw/Y8rK+MQkZcuEpBTl uVDimpKmVGi+OmqRhRgz82gtH26ni1prR3xiUlx8opaxrvEJ2peyRvmpdj6pPFE751R22ydrMJNm N4yZ2Zyti+1a7ZV6zC1gsV3jtC+3sGl1mrYTZYcd9tIiSzBmltGqstr9e5Y88XNtfeP57x/+UY4s t3WJ7ap9aWEDsKx4ds3+PUqd5lahkT0xZiZRzhi91jYDh435/vR39XXHAXSNT/jnto2jxv/E7XMz JWxHD+5967e//vzD/+4aF+/1KMoVGs8b7YYxM5vS+KF8UKa0fCQmd7tmwm07N69TNvhs03/lT75D We7SJbZLF1drcHJq9/9z088zr8iD/tQxKSWxW0pSt8s8u0GSTTBmwm2WpM2StGz3x8Xv/enXbxR7 3WbMxCk7Nv29a3zCheammq92Dxs7EUCXLrFSTIwUE6MlrXf/gaOvvzW1Ry/zSk9G4OdmtjAgb0RL U9PxQ/trD3w5ouCm2K5xx7756o+OX2obxMUn/PuyDRaWkEIRu1mSrC4DQZKkMTf+9LN//P3I1/+6 4Y4HAfQfNPT5P2+XJAmALMtyW9ulS5xBLlzFXs8+jYIF+I/shzfe/uYzD168cOHRMRMA1B74f38s ekiLWVxCImuz8MWTRrvoO2BIXHzilaMLusR2BdD3iiHP/d9t2k9ZlYU1xkw45XxBa9D37BGsdFOM i09ctHxj1/iES60XlaR5RutS68XWixd+s3gNgAstTcoTyf4YM7NpU3po9GNeLrY0a8tK2DRKxvQb AFB66yuDYvSzGJCtsEHfJPu/2H68plqbLcfThZYmZeFiS3PrxQsALrVe1H/pM6Zt7EYZTM3xnXbD 2swyjefPJnZL0YZpxicmXWhpUro1ulVZCreMtTQ1agPPtJkLyJ5Ym5lNqdCUEzxleg8AzU0NyoWW vk5z+1LW6zOmrFHnCDl3Frq55chWGDPzKOeN0F2eNZ4/23T+XHPjuebGc/qkeT0n1NZr9Zh2Vabu 7dwZcEYQW2LMTKUE4ETtwcZzZ7QWC7c6TflSQqX/0n7kVo/BOfcOqzLb4rWZ2Y7XVCuDO7U6Lanb ZVpgFAmJyV4b6/Wz7mjzyWnzW4FVmV0xZhZQTh17989xa9zXt4h45X8OOc63Y1ucQM4CvuZphO+5 UBWeM6JynsawwJhZ5rrb7kfAM3sr/Mzv/eF/rRJeYgoWTxotoz/HU+a66rAbh5+7VZCdsTazkte7 LnnecklPX4OBd4QJE4yZLQR+D0EGLBwxZnYhOQAAxc7BaUVyhw9lh2mlo5Dw2sxOiiU1TnAmys/D Iv5/DBu2iJn6j5wAALKj3Qvi56ENXzdWsF7ZImbg2wOf4fHz0G4vmg1jbxN2iRkBQJHcqWszCheM mV2oVZOjfX78P6QwwR76RMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTC MWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIx ZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFm RMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZE wjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTC MWZEwjFmRMIxZkTCMWZEwomKmSQ5OlxDFCUE1mZMGpFCSMwkySHLDv9rXD9yuL4TRSQDYrZnz4ni 4s1FRZv27ftOv16WHW7Vl+ca5ZESwBCTJstobla/3n8f77wT0t6IDBRqzPburSsoKP3mmzMHD9aP HfvWgQOnlSBJkkOrwTzXKKQfL4EzY2rSbi8NrhiHDyM7G/37o18/5OTgrrtw+eVB/05EBosN8fmV ldW/+tU1JSUTATz22Pr16w84oyXJsqxs47lGT3JAdoRala1di1/8AvPnY948LFuGRx9Fz54h7ZDI QKHWZufOXcjMTFWW+/VLbW5u7dzzT38N7XTx3LGgiyFJSE1FWhq+/RYxMZgwAZWVQe+MyGCh1mYG kGVIEi6cD2UfP/kJCgowfjyys/H449ixA48/blT5iEJlQMwee2z9E09sBNDa2gZg0aJ/hL7Pzho8 GPv24cIFvPgili/HiBGYMsX8UhB5F2rMFi0av3DhOM/1iYlPh7jnzkpOxrZtqK1FXh4mT0YM+7eQ bYQas9jYmNhY6/+iz57F+PEYOBBXXomNG/HUU9i6FSkpVheLCIAtrs2MUF6OyZOxeLH68MknUV6O WbMsLRORk9UxW1ngsWpGELtpaUF6uuthr15obg6+UETGsixmUmpfAOgz2ut6+fvONe7ffjvGjUNL C4YMwf79KC3Fli0GFZQoZNZcVkmpfdFnNPqMRnJvZAyTv3pP/uo9ZAxDcm9lvRrCgPXrh+3bER+P rVsRF4dt29Cvn6CyE3Wa954ZBuzXo8+HtkbNGICMYQDkLS+4til4CgBO7gGA4zs7W6dp1q/HmTO4 667gnk1BUjr0kCezazM1Y8m9kTEMSen6jEGJXFK6Vq11tk7THDqEffuMKC6REYyMmaTj9lBbo2Ys OQNJ6fKGeZ47kTfMQ1I6kjPUE0ii8GdwE0hJSUlhYaGyoF+vrFQlZ0CJkw/yhnlSwVNIzkDDCWnI rfJX7xlbSCKTBXNt5muMplJlAZgxw71RPjc3V03ayFlIznA7V/R+lIKn0HASDSf8x+z11/H66+4r 6+vxq1/B4aWMJBCvzXwJMmbKgscQacnXU5TKrbCwEOMKA8mYusMAknb6NE6f9rK+Rw/06BHgccgY jJkvIcVMoYVNi1lGRkZWVlZWVlZycrKy5qqrrlIWCgsLO3VEadSDaDixaf86/crrve2hsREnT7oe pqUhLS3w45ABGDNfDLg2U1KnhG327Nm1tbU1NTXV1dU7duxIT09X8hb0zuXP35KG3NrhZp9+iokT MWgQkpLUNTNnYubMoA9LZKRYo2abkiQHUDRgQMKAAQOUNceOHauqqtq9e/euXbvy8/NdW96+AgDi L0NcMmIT0aUrpBgAkNtw6SJam3ChAS1nAeDUATScRAA+/BBPP4358w35VYgMFutrwik/fCez+MiR OTU1NbW1tYcPH66vr09PTx8+fHgHtdmli4iNVxeCNWECFi/GuXPslU92ZEyDvnO2j+KlS5cC6NWr V05OTnZ2tnZt5lNrE2IT0driehiUzEx8+il69XJNATJ3LubODW5nRAYLNWZeK8O6urq6urqdO3dq a1wtjSNn4dQBpA9STwvjkt2j5XbG2HACx3d6bfPQKy/HpEl45RXXtRmHdZJ9BB8zP2eb06dP91zZ 7hPqpnokdgeACw2I09V4FxpcG2gHCqBnY14ejh9HamqHGxJZIJiY+QmY0gukrKzMZy+QhhNIzkDj Ke/PV+qxpnp1g4YTARcJa9ZgyxZccYW6ZupUTJ0a4LOJxDJ+vJnr/NDXypN7kDFMDVJidzVaGi1j J/cACLCnVV4eysrarXG2dxJZz8iBMH56gbik9FE7BDs7ELtv0HhKvSRDJ8bCePYFYS8Q8/HjaV+M rM0CT6w05FY0nEDDCWXIWTvKYLOA6zHFunVYtQoA2tpw8CBiYvDyy7jjjsB3QCSQRZMUHN8ZzI98 u/9+3H+/utzWhjlzXBdpRJazJmbKqaD04yXY9rLXH4UiJgZDh2LTJozmaDWyB6tntnpgC7rnqJN7 t3yPrzcEt5vKStek+Y2NeO893niJbMTqmBkkJwcTJ7oezpuHoUOtKw1RexHSVyIvDwUFqK1FVRUO H0bv3lYXiEgnQmJ25AhGjsQ33+DKK1FTg1GjcPSo1WUicoqQk8a1azFrFoqK1IcpKVi7Fo88YmmZ iJwipDbr3x9Nuh7IjY28KS7ZiA1qs2edUZ8b/HleVhYWLlRPGvfuxaZNSEvDiy9i3DiM83JbKCJT WR2z1wYBQJGMYgm/y8RPVwS3m0uXXKeIBQUocN4AIy4u9CIShcrqmAEoktXvxQF0ifRhzBiMGWNY iYiMJWoO/UAPr/Q2dmbM2sJQiNh12BeLm0DUXDFjFNGsb2mUZRlFMjNGEcz6mBFFPMaMSDjGjEg4 xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjG jEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaM SDiLb4oLQHKoC7yfalhT72/Mu656Y3FtpmRMCZiWNwo7rnuI6/JGGrNjJrUHZ8bUpLX/EdmQ5A2g ZkxLms/NopLZJ42SJFVUVACYMmUKHDJkAJAdzqpMAhxSRUXFlClTeO5hT+7voMLhTFqxBMC1Huob qmwfte+p1U0gEgBdxihMKbnyzBgBAGKtLgDTFSmYLt+srs2IogBjRiQcY0YknKkx895I5U1FRUU0 t//amSzLU6ZMCXRrNjMCsGNt5ujMu0jWqaioUNvxqSP2ixlRxGHMiIRjzMhisoxVq1BZiYYGvPoq Nm60ukACBPPx9IsvYt8+L+sXLkReXqgFomizfj1KSrBmDZYswa5dWLoU//mfGDfO6mIZKpiY3XAD Rozwsj4jI9TSuAmksTGa268EMbmN94svMHs2RozAvfdi+3aUlmLbNsYMGDNGXdi3DxUVqK/HsGH4 +c8RF2dkyZSGYP/YJilIIC++UbKzsW4dNm9GVhYaGvD223j0UdMObpLgr83+538waRJkGbm5eO89 TJyIS5cMLBhFi2nTEBODBQvw7LM4fhy33YapU60uk9GC7zq8fDlWr8Z11wHArFmYMAH/+heGDTOm WKymrGXm6x8fj9WrXQ9HjTLtyOYJPmb9+6OpSV2WZVy8iJ49jSlToH29HRIASbJ+noVI4rowY497 4wR/0pifjxkz8Otf45lnMH48WlpQVoYXX0RNjYHF883BUfHGazcO2qweHitWoKjInENZJvjaLCEB //7v6vJdd7nWd+kSWokCp42KL5Y4j4hhdK+qOQccMybyPwcy74wr8H7DAWk/Kp7njYZw1WaGjINm v2Gn4E8aT53CvHlobsaqVbj6aixebGCpAqAbFR/lb6GB1FfS3LkGjhxBdbU5h7JM8CeNTz+NS5dw 8SJeegnvvIOpU3HPPcjMNKJQnbkqYMaMJcuyWqcF+C6EnMbychw4gDfeCHE3thZ8zA4exMsvY9s2 jB2LvDwMHozaWoNiFvDHo2z3F8TM13/u3ND3YXfBx+zaa7FgAU6exGuvoaICVVXIzTWwYESRI/iY FRairAwJCRg7FkuXoqICPXoYWDCAlZV1AnnljeqQVV6Oo0fx+OOG7Mymgo9ZbCxmzVKXH37YmNJ4 4qWX+QJ5zQ38rDIrC926GbUzm7LBPI0U3fLzrS6BeBzWSSQcY0YknC1jxsmtwgQntwqQLWNGFFlM illwHRo5KaptdTwpKjs06rA2IxKOMSMSjjEjEs4GH087OCo+ImjvHq+mPVhdmzksGBVPxnPeQ1xb Jj2TRk/7azAschbA26h4NlLZVrv3tEhWM6bcSbz9W8k30aTaTPYBcL4lznHQXjYgW3J7m5TpWJTv fBPdWD/7mvZP0fKSUCi0WY+0ao00Vl+bKekq4v+8sKekixnzyvqYEUU8xoxIOMaMSDjGjEg4xoxI OMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4GwyEcagL7Nwd1jigyQ+LazN1FKDDtUzh yHXTakNvFhMxTK3N7rjjjkGDBmVnZ/+6bB9yb0GvoUjp225w+5GPcWD9K7emHDp0aMeOHdu3bzet bBQgnynyO9mEImorOutntpIckB2sysKJlwmkHRKKJRTJXm4Pr5t+2PSS2oXVTSCtLdBOF09/bWlR KAQO3bQunAjQg/DazOc5xiev+nrKEx+6PzdqTzbCCdPlm/CYybIsScFfAYbyXCKbMOOkUUmaCQci sierr838YlVGkcG86VCNqtBYMVqr4zub6fEuZwBEx0zStdN3NmleqzJmzD54R9zACa/NgkuaZ8Yk SWLGKEwJjJkkOWSD+ikyYBTWhNdmsuzobIXmVpUxY5FNlrFqFSor0dCAV1/Fxo1WF0gAI2MmteMA IElKxor1P/CfNGYs2qxfj5IS9O2LJUvw0Ud45BFs3Wp1mYxm8MfTJSUlAAoLC0tKEvSrCwsLtR8h sM+sGTCrmPzKf/EFZs/GiBG4915s347SUmzbhnHjzCyCcMb3AtESpVdSUuJ1vRste/7faf1Po7mZ WBylFd4c2dlYtw6bNyMrCw0NePttPPqoaQc3STAx89O2UVhYOGPGjP3797utz83NVZKmrfFToXX4 33T69OmdKzHZ2LRpqKzEggV4/XUcP47bbsPUqVaXyWhB1mbKpZfXsJWWlnqu9FqPuSWtw8s2TdmH NdryykCKS51k5qCV+HisXu16OGqUaUc2T0gnjb7ClpGRkZWVlZWVlZycrF/vVqFBlzQlXYFeFdy6 HABeGwR2yDKa6y1gj3vjGNDS6GxOBIDZs2fffPPNGRkZ1dXVa9eurays/PLLL7///vvQj9JOSl8l YxwVbyz9XAOm9fBYsQJFReYcyjKxkkHjliXJARQNGJAwYMAAZc2xY8eqqqp27969a9eu/Px83Zbu 71+nc9I1EXD+NRTJKDbql6B2r6o5BxwzBnl55hzKMrFBdNTw/UddfOTInJqamtra2sOHD9fX16en pw8fPjwrK0u/kWE9FXWj4jkrliGk4navaqgC6zf8gx8YcCibM6ZBX8mqJBUvXboUQK9evXJycrKz s92uzbzSD5EONG/7/xt3r8OaW9SM8drMIOpbYO5cA0eOoKkJgwebczRrhBozr5VhXV1dXV3dzp07 tTX6z6b19LkKvKURxz4DgOuKAMibvRSAguZ6CwK8Ngs5jeXlOHAAb7wR4m5sLfiY+TrbDPxDLa+J CiRpJT9O8L8BhSjAj6cNafefOzf0fdhdMDHzcznnp7eHsl6r0PRZyszMPHv27Pnz55UKrcOOIOXl 5drywoULO/8bEJnK+M5WXpPmtkYfoTfffLNv376ZmZkLFiz44IMPtM/B/FRrn3/+ueHFJr1Aqimj OmSVl+PoUTz+uCE7symDY6ZVVp6XYfo1MTExbW1tAHr06DFkyJAJEybk5eW99NJLH3zwAXSfOHOu HksE0qRk4PuSlYVu3YzamU0ZGbMAW/xyc3P/9re/LV++fMOGDWfOnElKSnrooYeuvfbaqqoqX/tk 2CKY7iPViGX2zFaSJFVXV99zzz2DBw/+y1/+kp+ff/PNN3fp0uXtt99evHixfjP9s9hkT2HN1Jhp 4WlpaXnttddmzZo1YcKE3//+99u2bVu3bp3n5B/6h0wahS/zYqaPzZw5cz777LO1a9euWLHiscce u/vuu5ctWzZw4EA/TwEgO5lRXAoAJ7cKkEkx0weme/fuM2bMyM/Pf/PNN+fPn3/69OnCwkKHw3HD DTf4fyJRmLJg1uHm5uaEhISrrrrqmmuu+fbbb5WVx44dW758udftmTQb6nhSVE6EqmNGzNxy0tTU NGvWrCeeeKKxsfEPf/iDCQUgspY1N1765JNPPvnkE9GHJrIJM268pC17uSluYjpi4yHLkNtw5hAa 63hTXIo81t8U1zW06ZEDlpaDQqP9O+WltAerb7z0fALgHLGrzDtA4UgGtMG10d7e4YXVMYNuVDyF G7Wx0eEawK4mzSEpP43m27rrWTwtlGuOF46DDmfKtBWyw7VAetbPvsb7uEcGbYIYZsyT9SeNsiyj iF2owl67k0Zqz/qYEUU8xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaMSDjGjEg4xoxIOMaM SDjGjEg4GwyEcagL7Nwd1jigyQ+LazP9KEDepj18uYbncl5Nbyy4VYUe2o9TcvsR2ZDkDdBusgmv 20Tze2r2SaMkuSajhUPWpmpRqzJJna2WU9Xalvs7qHC0m2yi3Q2pOf2w5SeNymRjroxRmFJy5Zkx AmCLeRqZrsjAdPlmdW1GFAUYMyLhGDMi4cy+Ka6XRipvKioqorn91846vrOZHpsZAdixNnN05l0k 6/COuIGzX8yIIg5jRiScYTFbtgxHjhi1M4oisoxVq1BZiYYGvPoqNm60ukACGBazTz/F2bNG7Yyi yPr1KClB375YsgQffYRHHsHWrVaXyWiG9QJ56y2j9uQSSGNjNLdfCWJyG+8XX2D2bIwYgXvvxfbt KC3Ftm0YN87MIghng85WPigNwf6xTVKQQF58o2RnY906bN6MrCw0NODtt/Hoo6Yd3CSGnTSOHAne kJ2CMG0aYmKwYAGefRbHj+O22zB1qtVlMpqRJ42DBxu1M1ZTFjPz9Y+Px+rVroejRpl2ZPMYFrPR o43aU8B9vR0SAEmyfp6FSOK6MGOPe+MYdtL47rs4edKonQXAwVHxxms3DtqsHh4rVqCoyJxDWcaw 2mzFCmRnIyPDqP0FQBsVXyxxHhHD6F5Vcw44Zgzy8sw5lGXMO+MKvN9wQNqPiud5oyFctZkh46DZ b9gpbDtb6UbFR/lbaCD1lTR3roEjR1Bdbc6hLBP8SeOpU3jhBTz/PMrL8R//gfvuw/z5BhWqM1cF zJixZFlW67QA34WQ01hejgMH8MYbIe7G1oKP2dNP49IlXLyIl17CO+9g6lTccw8yM40pVoAfj7Ld XxAzX/+5c0Pfh90Ff9J48CDmzMG2bRg7Fnl5GDwYtbUGFowocgRfm117LRYswMmTeO01VFSgqgq5 uQYWDGBlZZ1AXnmjOmSVl+PoUTz+uCE7s6ngY1ZYiLIyJCRg7FgsXYqKCvToYWDBVLz0Ml8gr7mB n1VmZaFbN6N2ZlPBxyw2FrNmqcsPP2xMaSgK5edbXQLxwrZBnyh8MGZEwtkyZpzcKkxwcqsA2TJm RJHFpJgF16GRk6LaVseTorJDow5rMyLhGDMi4RgzIuFsMLOVg6PiI4L27vFq2oPVtZnDglHxZDzn PcS1ZdIzafS0vwbDImcBvI2KZyOVbbV7T4tkNWPKncTbv5V8E02qzWQfAOdb4hwH7WUDsiW3t0mZ jkX5zjfRjfWzr2n/FC0vCYVCm/VIq9ZIY/W1mZKuIv7PC3tKupgxr6yPGVHEY8yIhGPMiIRjzIiE Y8yIhGPMiIRjzIiEY8yIhGPMiIRjzIiEY8yIhBMVM8/7Z/KOmhS1BNZmTBqRQkjMJMkht++q7bnG 9SOH6ztRRDIgZnv2nCgu3lxUtGnfvu/062XZ4VZ9ea5RRwE6XMtEkSfUmO3dW1dQUPrNN2cOHqwf O/atAwdOK0GSJIdWg3muUUg/XoL245Sk20tDLA+RDYU6s1VlZfWvfnVNSclEAI89tn79+gPOaLnG ZXuu0ZMckB3BV2Xr1uHoUWRmYt26dutvuQW33BLkPomMFWrMzp27kJmZqiz365fa3Nzaueef/ho9 BqoZO3csiALk5uLyy5GWhtj2v8qgQUHsjEgIG8zTKMuQJFw4H9yztTvxZmfj/fdRW4t+/TB5Mrp2 NayARCEyIGaPPbb+iSc2AmhtbQOwaNE/Qt9nZ509i/HjMXAgrrwSGzfiqaewdStSUswvCJEXocZs 0aLxCxeO81yfmPh0iHvulPJyTJ6MxYvVh08+ifJy1z17iawVasxiY2NiY63vsdXSgvR018NevdDc bF1piNqzwbWZEW6/HePGoaUFQ4Zg/36UlmLLFqvLRORkdcxWFnismhHEbvr1w/btKCvD1q3o1w/b tqFPn9ALR2QMy2ImpfYFgD6jva6Xv+9E4/7x4zh4EGPGYNo0lJbi6CQy3dAAAAzQSURBVFEcOcKY kY1YEzMpta8asOTeSM6Qt7wAQCp4Cg0nlfVSat8Ak3boEH74Q/zgB0hPx6FDuOkmpKfj9ttRWYmr rxb5OxAFzILWC1fGMoZpGQMgb3kByRnIGAYAfUar1V1H3n0Xd96JTZuQmoqbb8ZvfwuHA7/5Ddav F1V+os4yO2ZqxpJ7I2MYktK1jCnkLS8gKR0Zw5DcO8CknTmDIUMAIC8PqWp3FKSmoqnJ+MITBcfI mEk6bg+1NWrGkjOQlC5vmOe5E3nDPCSlIzlDSVpAv0OM6zuRDRl8bVZSUlJYWKgs6NcrK1XJGVDi 5IO8YZ5U8BSSM9BwQhpyq/zVe/4P+vzzePNNfPcdAKxcCQCnT+OXvwzyVyAyXDD3N/M1RlO7U9mM Ge6N8rm5uWrSRs7SX4/5O4rSItJwwn/MvvtODZibnj3Rs2eHByEjKYMtyFOQMVMWPIZI+7zzrVK5 FRYWYlxhIBlTdxhY0hSNjTh50vUwLQ1paQEeh4zBmPkSUswUWti0mGVkZGRlZWVlZSUnJytrrrrq KmWhsLCwU0eURj2IhhOb9rcbTHa9xx4+/RQTJ2LQICQlqWtmzsTMmYEfhwzAmPliwLWZkjolbLNn z66tra2pqamurt6xY0d6erqSt6B3Ln/+ljTk1g43+/BDPP005s8P+jhEAsUaNduUJDmAogEDEgYM GKCsOXbsWFVV1e7du3ft2pWfn+/a8vYVABB/GeKSEZuILl0hxQCA3IZLF9HahAsNaDkLAKcOoOEk AjBhAhYvxrlzHPxCdhTra8IpP3wns/jIkTk1NTW1tbWHDx+ur69PT08fPnx4B7XZpYuIjVcXgpWZ iU8/Ra9ermaPuXMxd27Q+yMykjEN+s7ZPoqXLl0KoFevXjk5OdnZ2dq1mU+tTYhNRGuL62FQyssx aRJeecV1bcaP0cg+Qo2Z18qwrq6urq5u586d2hpXS+PIWTh1AOmD1NPCuGT3aLmdMTacwPGdnm0e bvLycPy4qxcIka0EHzM/Z5vTp0/3XNnuE+qmeiR2B4ALDYjT1XgXGlwbaAcKoA+xLGPNGmzZgiuu UNdMnYqpUzt8HpEZgomZn4ApvUDKysp89gJpOIHkDDSe8v58pR5rqlc3aDgRYJHy8lBW1m6NsyGG yHrGD4RxnR/6WnlyDzKGqUFK7K5GS6Nl7OQeAIF8MA0gNRX9+rmvIbKJYD6e9rkv371AXFL66Eea ISndfYPGU+olGYDjOwMcdbZqFVatAoC2Nhw8iJgYvPwy7rijM6WnkPHjaV+MrM0CT6w05FY0nEDD CXV0md7JPereAqvHFPffj/vvV5fb2jBnjusijchyFk1ScHxnMD8KTEwMhg7Fpk0YHdAwGiLhrImZ cioo/XgJtr3s9UedVVmJykp1ubER772Hd94JrYhExrF6ZqsHtqB7jjq5d8v3+HpDcLvJycHEia6H 8+Zh6FBjCkgUugjpK5GXh4IC1NaiqgqHD6N3b6sLRKQTITE7cgQjR+Kbb3DllaipwahROHrU6jIR OVl90miQtWsxaxaKitSHKSlYuxaPPGJpmYicIqQ269+/3VRWjY24/HLrSkPUXoTUZllZWLhQPWnc uxebNiEtDS++iHHjMM7L/WqITGWDmD3rrFHnBn85demS6xSxoAAFzpn54+JCKRmRMayO2WuDAKBI RrGE32XipyuC282YMRgzxshyERnIBtdmRbLrO1EkMrLrcDCHV3obK7VZZ3pFkg2x67AvFtdmaq6Y MYpo1p80yrKMIpkZowhmfcyIIh5jRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxj RiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNG JBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0Yk HGNGJBxjRiQcY0YkHGNGJBxjRiQcY0YkHGNGJBxjRiQcY0bRqLERM2ciOxujRmH9ejQ2YuhQHDiA 1lb88IfYtQuvv47HH8fYscjOxqJFkOWQDhdrULGJwsnvfod+/fD116ipwbXX4uBBLFmChx/GpEmY PBkjR6KqCn//Oz77DPHxuP56TJiAG28M/nCMGUWj999HczM++ggALrsMx45h0iSsXo3SUuzYoW7z s58hPR0AHngAH33EmBF10qVLeOUVFBQAwP79yM6GLOPUKTQ2oqEBCQntNo6JwaVLIR2O12YUja67 DitWoK0Nn3yCH/0IMTFYswa9e+PJJ7FggbrN3/6G06fR0IDSUowfH9LhWJtRNFq4EL/8JXJykJSE 1atx+jR++1ts2YLu3bFypXoyec01mDwZdXW47z5MmhTS4RgzikYpKVizpt2avXvVhY8/BoB//hOj RqG83JjD8aSRSDjWZkRePPywkXtjbUYkHGszinCSJInbuRxY9xDWZkTCMWZEwvGkkaJFgCd4gejs iShrMyLhGDMi4RgzIuEYMyLhGDMi4RgzIuHYoE/Rwq0R3q15389P/T8xEIwZRQn3cPj/6MvPTyVJ 2VsnPjrjSSORcLaImeywugREItkiZkSRLVaSHFaXgUIl83zA3mL5DoU7/qO0P540Eglni5jx3zFF NlvEjCiyMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCMWZEwjFmRMIxZkTCcfQ0RQmBN6zoEGszIr0i oMjwnTJmFOHkzujsUwIsA08aiVS6G1A4jN0zazMiQMtYkQwBdx5kzIicimTXd0MxZkROxZLru6EY MyJAu8lgsQRDbzioYMyIVLIso6gT7YeBY8yIhGPMiIRjzIiEY8yIhGPMiIRjzIiEY8yIhGPMiIRj zIiEi4qYPfvshz17vtyz58uS5EhPf6lnz5cXLHjf5DLMnPn3tWv3Aqivb7riiiWtrW0mF4AsFBXj zZ555rpnnrkOQELCc0ePzktIsOC3vvPOoX/60+6pU698552906ZdFRsbFf/gSME32yQ33nhFVVVt c3Prn/+85xe/GG51cchUjJlJunbtcuONV6xc+cXp001XX3251cUhUzFm5vnZz4bOn7/x3nuHWV0Q MhtjZp4bbriirU2+5x7GLOowZub5+OMj116blZmZql/JG7RHg6hoabSD1av/uWjRP9599y5tDQMW PWwRM9lh0oGamxcpC5LkkE07KgDgvvuG33ffcO3oZh6aLGeLmJkp6D/xze0nFbs+qKHsDFh0io22 N16pxCTJof/FBdVs7af78zlldLS9BVEo1uRzJ2sp6VJ+Ze0XF/pXrp+/xdeBouotiE7RddKoVWWW /GVrRzf/0GQtWzTom/yHZ23tIcvWhJwsFF21mR8PPPBAB1tMn65/tLKj7VeuXOnnp9bWq2QyW9Rm UYsZixKMGZFwjBmRcIwZkXCMGZFwjBmRcGzQB9SPjAd0uFkRipWFQ+0b90n75FNymNcRPIwwZmqr uv/PzQaUlbk9ZNI0br0LmDRP0XjSKDnUrwC5ZczPSp9HdAr8KeHC68vI/mRuoq42U/4CZGfSZOeN hlf6forDx/qyMj9PghJDSQIgAUCRjGJJkiQRN4Mkm7NLzMz8/6ec0sidqdBCVSSr34ujpedwlPya AYq6f6762gxw1WZ+OHysL0aHL50EyPraDAJuH24tX3Hi5Zle1MUMur8M/Z9Cp5pAEEBj48qVK7VT RO2qLCJfbc+kMWNuorEJRHaoX4FzC1Vnmxllp049K1y4vZLMmCe7XJvZH1vw/WC0/IvG2ozIZIwZ kXCMWeesXNmJT6WJFNHY0uhVx5MUODPWqb4cfHkJbAIJnFaPyTIeeKDj5hD/c4FQVGHMAhVItIi8 4rUZkXC8NiMSjrVZB6RiSMVWF4LCHK/NfFLSJfu8wwRRoBgzLxgwMhavzdoJ/fyQ4SRPjJkXrM3I WIyZT1rYpGJGjkLCmHWAGaPQMWZEwvFzM5/69et4m2uuwbffii8KhTnGLCR/+QvS060uBNkeY+aT LOOJJzB4MEaPxp49ALBnD/7t35CTg5tuUiux++7DqVPWFpPCAGPmU0sL+vdHdTXmz8eDDwLA9Ol4 9lkcPIgbb8TChVaXj8IHm0B86tULhw8jKQmyjN69sXcvRo/GoUMA8P33GDkSX3+N/Hy8+y4uv9zi opLNsTbzRxso3bUrYmJcDyUJbW1WFYrCD2Pmkyxj+XIA+OtfkZuL7t2Rlob//V8AWL4cBQXWlo7C CbsO+9S/P776CoMHIz0dq1YBwMqVeOgh1Ndj4ECUllpdPgofvDYjEo4njUTCMWZEwjFmRMIxZkTC MWZEwjFmRMIxZkTCMWZEwjFmRML9f2lOxSlWP49lAAAAAElFTkSuQmCC "
-     height="584.22089"
-     width="286.1893"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <image
-     y="3.0242815"
-     x="287.07416"
-     id="image3370"
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARQAAAJNCAIAAAB/ex2MAAAAA3NCSVQICAjb4U/gAAAgAElEQVR4 nO3df3gU1aE38O+EkJ8kBhaCEEggQIhwQQFL4ZWgVKBatQJSq9aKgJbHYiuCCPGi2VgVC9w+9ip9 LHghod7S0kr0wstF7C1aDHgVpEjfggQREn4YEAKG/IIk8/5xdmcnm93N7MnM7K/v58nDMzs7O3PY zTfnzNkzZxRVVUFEwYsLdQGIIhXDQySJ4SGSxPAQSWJ4iCQxPESSGJ7w8sILGDw41IUgYxgeIkkM j30uXkSXLqiuBoDf/hYZGWhtxfjxSEhAQgJmzQp1+ShIDI99MjLQvz9WrQKANWtw55147jkcPoyv v8Y//oGNG7FzZ6iLSMFgeGx1773YvBmtrTh4EMXF2LED99yD9HTk5WHECPzxj6EuHwWD4bHV00/j xAmsWweHA4MGQT+uMC4Ozc2hKxkFj+GxVc+e6NMHCxfi/vsBYMoUbN6My5dRUYEDB3DvvaEuHwWD 4bHbzJm4fBnLlgHACy9gyBD06IHhw3H//Zg6NdSFo2AovCSBSE58qAsQo/JuGO9z/ZG/77G5JCSN NY+ttMz0yR7ic4MzlRVigSkKf6x57JN3w3gtM73753a4MfMT5ljzWE7UNu1jk5KW4bVlfe1FsVBd dUwsiIqIKQpPDI+19Mnp3T9XH5iUtGu8Nq6vvaRbvigixPyELYbHQlo7TdQ2IjlaZlK6tQvPZVd4 RIpERaRFiPkJNwyPVfTJ8Rmb5G5pXi9puFwLXxFifsITw2OJ9nWOSE5Kt2u0zCSleIensb5WLDRc rhURqq+9xPonbDE85tPOc0RyevbNga/YJCWner2wsaEOviL09ekTAKqrjvH8J6ywq9oSIjla94B2 eqOPTWJyis/XJiWnNjbUiQildLum/vIlsR8RRe2LIAo5hsd8+i9AU9Ku0c5wtOSI2CQkJvt8eVND Pdwxa7hcK16udcT5+3aV7MeBoSYTbTZR7YjznORuaSI5ScmpgZMjViYmp4gtk1LSxGshQpiWISof f0N7yGYMj5m0fgKvBpvWN5CYnJKQmKwlp2tikvYj1ohntRadeKHW6hO77ZM9hPkJBwyP+dw9bG36 o0Wd4xWb+K4J2o9XhLT6R9uJ2GGH43rINgyPhbRqp+rIwVee+qG2vv7yN49/N1dVW7vEd9V+tAgB WFM8r/LIQVH/eFU+FD4YHtOINpvPmmHQiLHfXPi65twZAF0Tkz7bvWP0xDu8vucRETp17NAbv/jp px/8364JiT6PIs582HILBwyP+URXgfhiR/QTJKd2u3HS9/e9v1Vs8MnO/xo3daZY7tIlvksXT59n anr3/3P7D7MG5kPfeEtJS+6WltLtmvbD4SiEGB4TvK8o7yvKmgMfFW/53U9/U+xzm7GTp+/d+U7X xKQrjQ2Vnx8YMX4ygC5d4pW4OCUuTstP7/6DxtxyV3qPXvaVnmTxex6bDMi/oamh4czxI1VH/3FD we3xXRNOf/n5b50/0TZISEz61zXvhrCEFKz49xUl1GWICYqijL317k/++s7JL/75nZmPAOg/ePiL v9+jKAoAVVXV1taWFs49FUnib+HYtk4z+AfoW7dOe/25R65eufLzsZMAVB39f78telQLT0JSMmue yMJmm336DhiakJh83ZiCLvFdAfQdOPSF/9ytPctqJ+IwPCYQtbfWVd1+vKcYrpaQmLxs7Y6uiUkt zVdFftoHpqX5avPVK0+s3AjgSlODeCGFJ4bHfNpUBBr91QdXmxq1ZREhjUiOfgMAYoS1uDxBf502 hRy7qk1z5O97zlRWaHN3tHelqUEsXG1qbL56BUBL81X9jz452sZexIWlvCouHLDmsVD95UvJ3dK0 i9sSk1OuNDWI4W1e1YvglZymhnrtwh7t2mwKH6x5zCcqH9HEEtMSAGhsqBMnMPr6x+tHrNcnR6xx zW1Qewm6Wako5BgeM4mWG3SnPfWXLzVcrm2sr22sr9Xnx2erTFuv1Tna2Y5rb7UXwZkMwgbDYzLx a11dday+9qJ2fu9V/4gfERX9j/aUV50D90wgrHbCCs95zHemskJcEqfVPyndrtFiICQlp/rshtbP AaLNRKXNoQNWO+GE4bGEaLz17p/r1W2t7z/wKfDsU5z9I6xw6ilL+Ju3Df5nPBTaz3vIedvCFsNj oZu//xAMz7UrBJhx94P/2mB5iSkYbLZZSN/KEvPpdDhEIMBc7xRuWPNYy+f9RdrfXERPX9uAd0kI YwyPTYzf2YqxiRQMj30UJwCg2H3xT5Ha4UPVaVvpKGg857FXseIKCdw5CfCwiH/XwppN4XH90SUA gOps84YEeBiG7xsrQ419NQ/fdH+RCPAw3N60MAxzCLHZZq8iNahzHgpnDI99XNWIs20qAj+kMMZR 1USSGB4iSQwPkSSGh0gSw0MkieEhksTwEElieIgkMTxEkhgeIkkMD5EkhodIEsNDJInhIZLE8BBJ YniIJDE8RJIYHiJJDA+RJIaHSBLDQySJ4SGSxPAQSWJ4iCQxPESSGB4iSQwPkSSGh0gSw0MkieEh ksTwEElieIgkMTxEkhgeIkkMD5EkhodIEsNDJInhIZLE8BBJYniIJDE8RJIYHiJJDA+RJIaHSBLD QySJ4SGSxPAQSWJ4iCQxPESSGB4iSQwPkSSGh0gSw0MkieEhksTwEElieIgkMTxEkhgeIkkMD5Ek hodIEsNDJInhIZLE8BBJYniIJDE8RJIYHiJJDA+RJIaHSBLDQySJ4SGSxPAQSWJ4iCTJh0dRnB2u IYpinap5mB+KZZLhURSnqjoDr/E85fT8SxQ1DIXn4MHq4uL3i4p2Hj78tX69qjq9qpr2a8QjEatO 5kdV0djo+nnvPbz1Vqf2RtRJHYfn0KFzBQXrv/zy4rFjNePHv3H06AURD0VxarVN+zWCctsrcCfH lZ9p6+UKeuIEcnLQvz/69UNuLu67D9deK7cnInPEd7jFtm0Vjz124/LlkwEsWLB9+/aj7sAoqqqK bdqv0VOcUJ2drXY2b8aPf4zFi7FoEdaswc9/jp49O7VDok7quOaprb2SlZUulvv1S29sbA7uCBe+ gNZgqz0d3Gt1FAXp6cjIwFdfIS4OkyZh2zbpnRGZoOOaxwSqCkXBlcud2ccdd6CgABMnIicHTz6J vXvx5JNmlY9IhqHwLFiw/amndgBobm4FsGzZX60tlC9DhuDwYVy5gpdfxtq1uOEGTJ9ufymIPDoO z7JlE5cundB+fXLysxaUJ5DUVOzejaoq5Odj6lTEcXQEhVTH4YmPj4uPD/3v6aVLmDgRgwbhuuuw YweeeQYffoi0tFAXi2KYLec8Zti0CVOnYuVK18Onn8amTZg7N6RlothmfXhKCtqtmi2xm6YmOBye h716obFRvlBEnWdheJT0vgDQZ4zP9eo3wXVbT5uGCRPQ1IShQ3HkCNavx65dJhWUSIpVJzNKel/0 GYM+Y5DaG5kj1M+3qJ9vQeYIpPYW613RMqxfP+zZg8REfPghEhKwezf69bOo7ESG+B4TYOiV7cYT aGtcyQGQOQKAuuslzzYFzwDA2YMAcGZfsPWPZvt2XLyI++6TezVJEoNFSDC/5nElJ7U3MkcgxaFP DkSQUhxaFRRs/aM5fhyHD5tRXCJZwYVH0fF6qK1xJSc1EykO9d1F7XeivrsIKQ6kZrqacESRKegO g+XLlxcWFooF/Xqx0iU1EyIkfqjvLlIKnkFqJuqqlaF3qZ9vCbYYRCHnZxy0nyvbRPUCYPZs7+7m vLw8V35GzUVqpldrzfexC55B3VnUVQcOz2uv4bXXvFfW1OCxx+D0UUayEM959PyGRyy0u1xU8bcj UREVFhZiQqGR5Lh2aCA/Fy7gwgUf63v0QI8eBo9D5mB49DoIj6BFSAtPZmZmdnZ2dnZ2amqqWDNs 2DCxUFhYGFQPnjL6EdRV7zyyVb/yFl97qK/H2bOehxkZyMgwfhwyAcOjZ+icR2RJRGjevHlVVVWV lZUVFRV79+51OBwiRdIlUD99Qxl6V4ebffwxJk/G4MFISXGtmTMHc+ZIH5aos+KNz3ejKE6gaMCA pAEDBog1p0+fLi8vP3DgwP79+8eNG+fZcto6AEi8BgmpiE9Gl65Q4gBAbUXLVTQ34Eodmi4BwPmj qDsLAz74AM8+i8WLDRaWyHLxfjoGfKwEABSfPDm/srKyqqrqxIkTNTU1Dodj5MiRHdQ8LVcRn+ha kDVpElauRG0tR1JTuDDaVe2epaB49erVAHr16pWbm5uTk6Od8/jV3ID4ZDQ3eR5KycrCxx+jVy/P 1AULF2LhQrmdEZmg4/D4rJrOnTt37ty5ffv2aWs8vW2j5uL8UTgGuxpmCanegfFqs9VV48w+nz0E eps2YcoUrFrlOefhxXAUWoHC428SQwCzZs1qv7LN96QNNUjuDgBX6pCgq52u1Hk20A5kYIRbfj7O nEF6eocbEtnEd3gCxEaMMCgtLfU7wqCuGqmZqD/v+/WizmmocW1QV22woKqKjRuxaxcGDnStmTED M2YYfDWR+WSu5/G00PytPHsQmSNc8Uju7gqMRkvO2YMADI7Nyc9HaWmbNe4+P6LQCO6ShAAjDDzS +riGe7qHh3pvUH/edaqDIK5KaD/OgCMM7McvSfWCq3mMJ00ZehfqqlFXLS7paUNczGO4zhG2bsWG DQDQ2opjxxAXhxUrMHOm8R0Qmcyyy7DP7JN5yr+HHsJDD7mWW1sxf77n5IcoJKwKj2iMKbe9gt0r fD7VGXFxGD4cO3diDK8GotCxfvach3ehe65rut2mb/DFu3K72bbNMzl1fT22bOEtRijEImbettxc TJ7sebhoEYYPD11piCLohr75+SgoQFUVystx4gR69w51gSjmRUx4Tp7EqFH48ktcdx0qKzF6NE6d CnWZKLZFTLNt82bMnYuiItfDtDRs3oyf/SykZaLYFjE1T//+aNCNL62v520VKcRsqXmed0d0oXxL KzsbS5e6mm2HDmHnTmRk4OWXMWECJvi4AQqR5awPz6uDAaBIRbGCX2Xh7nVyu2lp8TTSCgpQ4J4+ PiGh80UkkmFLzVOkuv4tNjA0zo+xYzF2rGklIuo8+bmqjR5AjCV1J8fqw5GlODBUz/IOA1damByK Onb0tqmqiiKVyaEoEzFd1UThhuEhksTwEElieIgkMTxEkhgeIkkMD5EkhodIEsNDJInhIZLE8BBJ YniIJDE8RJIYHiJJDA+RJIaHSBLDQySJ4SGSxPAQSWJ4iCQxPESSGB4iSQwPkSSGh0gSw0MkieEh ksTwEElieIgkMTxEkhgeIkkMD5EkhodIkuW3VQSgOF0LvCNfRHPdIZN3+HOzvOYRyRGx0VJEEcdz b1ldimKc+eFR2oI7Oa78tH2KwpDiC6C7q7mfbWLtMzW/2aYoSllZGYDp06fDqUIFANXprnYUwKmU lZVNnz6dtX948v4EBWebu5p71sP1gYrtY+oztb7DQAGgSw5FKKfnruZtkhPD4u04CDMTHZiZtthV TSSJ4SGSxPAQSTI5PL47anwpKyuLtZ7NSKGq6vTp041uHatdbQhNzeMM5rOh0CkrK3P1UJMvbLYR SWJ4iCQxPGQ5VcWGDdi2DXV1+Pd/x44doS6QSXx/Sfryyzh82Mf6pUuRn29tgSj6bN+O5cuxcSNe eQX792P1avzHf2DChFAXq9N8h+c738ENN/hYn5lp8uGNdLjFWh+ODWzu5/z73zFvHm64AT/6Efbs wfr12L07esMzdqxr4fBhlJWhpgYjRuCHP0RCgpnHFl2cgbFfziJG3nyz5ORg61a8/z6ys1FXhz// GT//uW0Ht1Cgc57//m9MmQJVRV4etmzB5MloabGtYBQ97rkHcXFYsgTPP48zZ/D972PGjFCXyQyB BoauXYs338TNNwPA3LmYNAn//CdGjDDnwKxSQsvO9z8xEW++6Xk4erRtR7ZWoPD074+GBteyquLq VfTsadJhDY7PdSoAFMWOa8Vjh+eEh6OkOydQs23cOMyejZ/+FM89h4kT0dSE0lK8/DIqK20pmpPX /ZqvzTWhdo0eWLcORUX2HMpWgWqepCT867+6lu+7z7O+SxcrS6SnXfdbrHD+A9Po3lV7Djh2bHR+ w2Fmi8j4qFBD2l73y5abKTw1jynXhMbwqFAEbradP49Fi9DYiA0bcP31WLnStlIBaHPdbwx+MBZx vZP2Xk198iQqKuw5lK0CNduefRYtLbh6Fb/8Jd56CzNm4IEHkJVlxmGDaW0zOeZSVdVV/xj8FDqd sU2bcPQofvObTu4m7AQKz7FjWLECu3dj/Hjk52PIEFRVmRQew1/SsUfbIna+/wsXdn4f4ShQeG66 CUuW4OxZvPoqyspQXo68PNsKRhTuAoWnsBClpUhKwvjxWL0aZWXo0cPkw7NiCRUj77xZQ3g2bcKp U3jySVN2FkYChSc+HnPnupYff9yqEvCUxn5G3nMTv1vLzka3bmbtLIzYMm8bxbZx40JdAmvwYjgi SQwPkaQQhYcT6EQITqATAGseIkmmhUduYBunPgxbHU99GNsD28Cah0gaw0MkieEhkmTLl6ROXvcb FbRPj2epAOyoeZwhuO6XzOe+t6y2TKZdSRqo06zIfQhf1/3GZkdNRGjzmRapruSIO8y2/Shj80M0 reZR/QDcb7T7mlAfG1BY8vqYxDQS4l9+iLDiVvI+juH+Axaz73J00OZg0aqgGGdHb5uqqiiK3b9P UUNkhsnRsKuaSBLDQySJ4SGSxPAQSWJ4iCQxPESSGB4iSQwPkSSGh0gSw0MkieEhksTwEElieIgk 2REe/XUgRFHD8vC4rp1yepaJooPJE4DMnDlz8ODBOTk5Py09jLw70Ws40vpq14EoTiiPfISj21fd lXb8+PG9e/fu2bPH3AIQ2YbNNiJJ1oenuQlaci58YfnhiOxiwhwGpkw2zYu0I4Li5GXYHiac84hb k0v/9nfmtUQhZE6zTeTHlF0RRYoQf0nKaocil5mTHppV+bASo4jQ2fAouh7oYPPjs9phcihSmFDz yOWnfXIURWFyKIJ0KjyK4lRN6rlkbCjimFDzqKoz2MrHq9phcigSBfc9T9vf8iJ42mzFilKsPRH4 mx8mh6JD0F+SLl++HEBhYeHy5Un61YWFhdpTMPbNKWNDEU2m2ablRG/58uUiNoFpiQqcHEVHooRE NvBdOfjrCRC/yrNnz27/VF5eHnTVjrZ9+y41IydFs2bN0pZLSkoCb0w20A+K5/A2wW94xIJXhAL8 0nu12fQv8cqSocpkwCRtUf3yrx1vT1ZqfzkJ84MOwyNoEdJ+7zMzM7Ozs7Ozs1NTU8WaYcOGiYXC wkK52qaNnx0FgFcHuwvAITwh4+9CLObHUIeByJKI0Lx586qqqiorKysqKvbu3etwOESKTC5XWl+8 lAIARSqKFQ6BozAUrxi+wlNRnEDRgAFJAwYMEGtOnz5dXl5+4MCB/fv3jxs3TreldyUT9Hl/12TA fRttkR+jxSSySbyfjgEfKwEAxSdPzq+srKyqqjpx4kRNTY3D4Rg5cqRXzWPaiLViRSQHbCSEDv9s +WPonAfuNpuWgV69emVnZ+fk5Bg853HvxPCZz/1bAWDjndoLDb2KrMEOA586Do++apLrbdNvZjQ/ Nxd5XvK+0/92ZBN2VbcXqMPA36BP/ZcwgfnMiZH8LL8tKfAGZDNt5j0mRxNcL5aiKGIkQfsRBnCP PNCabfqEZGVlXbp06fLly2j7Faq/A40aNUpb/vTTT42XkCzF8OjJTADiMz9ea/TBeP311/v27ZuV lbVkyZK//OUvWr9zgCqIgaEIoAbD+D7j4lyj5nr06LFz504A+fn577zzTvvjdr5UZBsUhboE4SS4 gaEGd5qXl/enP/3ptttuUxTl4sWLKSkpjz766NKlS8vLy/3tM6hiEIUD82fPURSloqLigQceGDJk yB/+8Idx48Z973vf69Kly5///OeVK1fqN9O/ivmhiGPysBevSHTr1u2JJ54YOnToqlWrPvvss/bb q/6/ETKxVGQWdhjomVnz6JMzf/78Tz75ZPPmzevWrVuwYMH999+/Zs2aQYMGBXgJOjoRIgorptU8 +hh07979vffe+/a3v3333XdPmDBh4cKFAPr27XvHHXesXbu2/WuZlkjBmkfPkhlDGxsbk5KShg0b duONN3711Vdi5enTp30mB7wemyKTOeHx+u1vaGiYO3fuU089VV9f/+tf/9qUQxCFG95ihILAZpue ObcY0ZZ93FYx2YH4RKgq1FZcPI76c7ytIkUHk+9J6luxu2oSF1cTRQXrbzHyYhLgvibUPScBURSw 5f482tXURFHE8ok1XN0J2tXU7BiIZOww0LO85nGlhcmhqGNHs011D2W34VhEtgnxPUmJIhfDQySJ 4SGSxPAQSWJ4iCQxPESSGB4iSQwPkSSGh0gSw0MkieEhksTwEElieIgk2REecV8k3p2Poozl4RGZ 0W6NRBQ1LJnoXQ/u5Ljy0/YposhlSc1TVlZWVlYGAE4VXs02pyo2sOK4RHay/pxHAbTksLKhKGLL vG3MDEUjdlUTSWJ4iCQxPESSTA6PoiiiJ2369OmiY82fsrIy9lZTRAtFzeNUp0+fHoLjEpmKzTYi SQwPkaQgwrNmDU6etK4kRBEmiPB8/DEuXbKuJEQRJogRBm+8Yf7hjXS4cYZ4Ck+2DM/xw8jwUPbL UdgKotk2ahR4+92YpTh5UaO34JptQ4aYdmBWKRHEKzC8P5wQRHjGjDHvsAEHH+g2UwAoiuX3fqQA fFY1zA+Cara9/TbOnrWuJO043TczNdavQGSzIGqedeuQk4PMTOsK0452G+1ihU1tCjdmtoiMjwo1 xMnbaIcFf3+22GwL4+E5Tt5GOyz4DAmTg8DNtvPn8dJLePFFbNqEf/s3PPggFi826bDOIM5hmJyQ U51t6h8mRwgUnmefRUsLrl7FL3+Jt97CjBl44AFkZZlzYIMT6LBHO0xoM+8xOZpAzbZjxzB/Pnbv xvjxyM/HkCGoqrKtYEThLlDNc9NNWLIEZ8/i1VdRVobycuTlmXx4ViwUuQKFp7AQpaVISsL48Vi9 GmVl6NHD/BLwlIYiVKDwxMdj7lzX8uOP21EaoggSxl3VROGN4SGSFKLwcAIdinyseYgkmRYeuYFt nPqQIhdrHiJJDA+RJIaHSJIts+doY6g7f5EPUdiwvubRXU0d1JUIRGHOtCtJA3WaFbkPUexjG45t iyC8JEHPtJpH9QNwZ8Z9TaiPDYgikOXNNn1+GBWKJnb0tqmqiiJWMhRt2FVNJInhIZLE8BBJYniI JDE8RJIYHiJJDA+RJIaHSBLDQySJ4SGSxPAQSZIPT/t7tfHubRRTOlXzMD8UyyTDoyhOte1VUe3X eJ5yev4lihqGwnPwYHVx8ftFRTsPH/5av15VnV5VTfs14pF2aySiqNFxeA4dOldQsP7LLy8eO1Yz fvwbR49eEPFQFKdW27RfIyi3vQJ3clz5mbbe3P8AUah0PHvOtm0Vjz124/LlkwEsWLB9+/aj7sB4 5j9ov0ZPXPguXe1s3YpTp5CVha1b26y/807ceafkPok6r+Pw1NZeycpKF8v9+qU3NjYHd4QLX6DH IFdyak8HWTwAyMvDtdciIwPxbQs7eLDEzohMY8u8baoKRcGVy3Kv1u7lmJOD995DVRX69cPUqeja 1bQCEkkwFJ4FC7Y/9dQOAM3NrQCWLfurtYXy5dIlTJyIQYNw3XXYsQPPPIMPP0Ramv0FIXLpODzL lk1cunRC+/XJyc9aUB6/Nm3C1KlYudL18OmnsWmT566PRPbrODzx8XHx8aEfxdPUBIfD87BXLzQ2 hq40RDad85hh2jRMmICmJgwdiiNHsH49du0KdZkotlkfnpKCdqtmS+ymXz/s2YPSUnz4Ifr1w+7d 6NOn84UjkmdheJT0vgDQZ4zP9eo3QXRbnzmDY8cwdizuuQfr1+PUKZw8yfBQiFkVHiW9rys2qb2R mqnuegmAUvAM6s6K9Up6X4P5OX4c3/oW/uVf4HDg+HHcfjscDkybhm3bcP31FhWfqGOW9AR4kpM5 QksOAHXXS0jNROYIAOgzxlU1deTtt3Hvvdi5E+np+N738ItfwOnEE09g+3Yryk5klPnhcSUntTcy RyDFoSVHUHe9hBQHMkcgtbfB/Fy8iKFDASA/H+muoQ5IT0dDg+llJwpCcOFRdLweamtcyUnNRIpD fXdR+52o7y5CigOpmSI/hkoZ5/mXKEwEfc6zfPnywsJCsaBfL1a6pGZChMQP9d1FSsEzSM1EXbUy 9C718y2BD/rii3j9dXz9NQCUlADAhQv4yU+CLTuRmfyMg/ZzZZt2+7fZs727m/Py8lz5GTVXf54T 6Nii/6CuOnB4vv7aFRsvPXuiZ88OD0Jm4p3h9PyGRyy0u1zU770TRUVUWFiICYVGkuPaobH8CPX1 OHvW8zAjAxkZBo9D5mB49DoIj6BFSAtPZmZmdnZ2dnZ2amqqWDNs2DCxUFhYGNR9rJTRj6CueueR Nhfr3NJuDx9/jMmTMXgwUlJca+bMwZw5xo9DJmB49Ayd84gsiQjNmzevqqqqsrKyoqJi7969DodD pEi6BOqnbyhD7+pwsw8+wLPPYvFi6eMQmSze+Hw3iuIEigYMSBowYIBYc/r06fLy8gMHDuzfv3/c uHGeLaetA4DEa5CQivhkdOkKJQ4A1Fa0XEVzA67UoekSAJw/irqzMGDSJKxcidpaXoZA4SLeT8eA j5UAgOKTJ+dXVlZWVVWdOHGipqbG4XCMHDmyg5qn5SriE10LsrKy8PHH6NXL00mwcCEWLpTeH1Fn Ge2qds9SULx69WoAvXr1ys3NzcnJ0c55/GpuQHwymps8D6Vs2oQpU7Bqleech1/7UGh1HB6fVdO5 c+fOnTu3b98+bY2nt23UXJw/CsdgV8MsIdU7MF5ttrpqnNnXvofAS7aw8UgAAAnKSURBVH4+zpzx jDAgCrlA4fE3iSGAWbNmtV/Z5nvShhokdweAK3VI0NVOV+o8G2gHMjBCVFWxcSN27cLAga41M2Zg xowOX0dkFd/hCRAbMcKgtLTU7wiDumqkZqL+vO/Xizqnoca1QV21wYLm56O0tM0ad7cFUWjIXJLg aaH5W3n2IDJHuOKR3N0VGI2WnLMHARj5ehRAejr69fNeQxRCvr8k9bu1/xEGHml99FfyIMXhvUH9 edepDoAz+wxe1bNhAzZsAIDWVhw7hrg4rFiBmTONl51MwC9J9YKreYwnTRl6F+qqUVftunpH7+xB 196M1TnCQw/hoYdcy62tmD/fc/JDFBKWXYZ9Zp/MU8bExWH4cOzciTGGLmggsoRV4RGNMeW2V7B7 hc+ngrVtG7Ztcy3X12PLFrz1VueKSNQ51s+e8/AudM91Tbfb9A2+eFduN7m5mDzZ83DRIgwfbk4B ieREzLf0+fkoKEBVFcrLceIEevcOdYEo5kVMeE6exKhR+PJLXHcdKisxejROnQp1mSi2RcyMoZs3 Y+5cFBW5HqalYfNm/OxnIS0TxbaIqXn6928zXU59Pa69NnSlIYqgmic7G0uXuppthw5h505kZODl lzFhAib4uIcDkeVsCc/z7vptofxpSkuLp5FWUIAC9wzYCQmdKRmRPOvD8+pgAChSUazgV1m4e53c bsaOxdixZpaLqJNsOecpUj3/EkWL4AaGyhxAjCUVNU8wo+MoDHFgqJ7lNY8rLUwORR07mm2qqqJI ZXIoykTM9zxE4YbhIZLE8BBJYniIJDE8RJIYHiJJDA+RJIaHSBLDQySJ4SGSxPAQSWJ4iCQxPESS GB4iSQwPkSSGh0gSw0MkieEhksTwEElieIgkMTxEkhgeIkkMD5EkhodIEsNDJInhIZLE8BBJYniI JDE8RJIYHiJJDA+RJIaHSBLDQySJ4SGSxPAQSWJ4iCQxPESSGB4iSQwPkSSGh0gSw0MkieEhksTw EElieIgkMTxEkhgeIkkMD5EkhoeiU3095sxBTg5Gj8b27aivx/DhOHoUzc341rewfz9eew1PPonx 45GTg2XLoKpBHyLegmIThd6vfoV+/fDFF6isxE034dgxvPIKHn8cU6Zg6lSMGoXycrzzDj75BImJ uOUWTJqEW28N7hAMD0Wn995DYyP+9jcAuOYanD6NKVPw5ptYvx5797q2+cEP4HAAwMMP429/Y3iI AAAtLVi1CgUFAHDkCHJyoKo4fx719airQ1JSm43j4tDSEvQheM5D0enmm7FuHVpb8b//i+9+F3Fx 2LgRvXvj6aexZIlrmz/9CRcuoK4O69dj4sSgD8Gah6LT0qX4yU+Qm4uUFLz5Ji5cwC9+gV270L07 Skpczbkbb8TUqTh3Dg8+iClTgj4Ew0PRKS0NGze2WXPokGvho48A4LPPMHo0Nm2SPwSbbUSSWPNQ jHr88c7ugTUPkSTWPBTxFEWxbueq/6EHrHmIJDE8RJLYbKPoEaCJFSwjTUHWPESSGB4iSQwPkSSG h0gSw0MkieEhksSuaooeXt3LXh3XAZ4N/EJ/GB6KGt6/8oG/qgnwrKKIvXXwVQ+bbUSSbAqP6rTn OET2Yc1DJCleUZyhLgN1TGXdHX7i+amEP/6BC09sthFJsik8/NNJ0Yc1D5EkhodIEsNDJInhIZLE 8BBJYniIJDE8RJIYHiJJDA+RJIaHSBKvJKWoYeF07z6x5qFYUwQUmbIjhocinhqMYF8S4LhstlEM 0U3f7uz83ljzUKxwJadIhUn3w2J4KJYUqZ5/O43hoVhSrHj+7TSGh2KF6+y/WIFJt8FieCiGqKqK og760IxjeIgkMTxEkhgeIkkMD5EkhodIEsNDJInhIZLE8BBJYniIJEVJeJ5//oOePVf07LlCUZwO xy979lyxZMl7Npdhzpx3Nm8+BKCmpmHgwFeam1ttLgDZLEqu53nuuZufe+5mAElJL5w6tSgpKQT/ r3vvHf673x2YMeO6t946dM89w+Ljo+QPE/nDD9g0t946sLy8qrGx+fe/P/jjH48MdXHIcgyPabp2 7XLrrQNLSv5+4ULD9ddfG+rikOUYHjP94AfDFy/e8aMfjQh1QcgODI+ZvvOdga2t6gMPMDwxgeEx 00cfnbzppuysrHT9St6ON1pFSW9bOHjzzc+WLfvr22/fp61hbKKbTeGx7X71jY3LxIKiOFXbjgoA ePDBkQ8+OFI7up2HppCIwppH+hf3/bbTEd0idbEuYxM74qPvwxYVjqI49f81i2qhttN/+Z3ENfre ZAIQb3PbxmoiM+I/pf3XLP3d1c8m4e9AUfYmkxBtzTat2gnJ76t2dPsPTfazqava5l+n0P6lV9XQ RJdsFm01TwAPP/xwB1vMmqV/VNLR9iUlJQGeDW0dSDbgl6TWYnKiGMNDJInhIZLE8BBJYniIJDE8 RJJipataUZzAgA43K0KxWDjettuatG/qFKd9w3zDXEyER/QXB/6eZ0BpqddD5kfj9R038yNEZ7NN cbp+DPJKToCVfo/oZvwlkcLn28gRSIjKmkd8rqo7P6r7BpQl/l/i9LO+tDTAiyDCpSgA3LdZLlYU RTHrxmMU5uwLj51/q0SjQg2m8uks7TbLxbEyLjRG/psBROGfSX3NA3hqngCcftYXo8M3RwFUfc0D k24WGz78hYSnPVEYHug+b/0HHFSHAQx0uJWUlGiNNO1sJ7rfTw2Tg2jtMFCdrh/jvKISbFeb6hbU qyKF1zvJ5AhR2GEgjX3TATAw7UVnzUNkA4aHSBLD462kJIjvRimWRWdvm08dX4btTk5Q4wRi5w0k L+ww8NDqHFXFww933HkQeA4DinoMj4eRwBBpeM5DJCmGznmIzMWaB0oxlOJQF4IiUEyf84jMqH7n ZycKJEbDw9hQ58XcOU/nW2iMHAkxFx6BNQ91XoyGR9AipBQzSBS0mA6PwOSQHIaHSFJMf8/Tr1/H 29x4I776yvqiUASK6fAY8Yc/wOEIdSEoLMV0eFQVTz2FIUMwZgwOHgSAgwfx7W8jNxe33+6qcB58 EOfPh7aYFKZiOjxNTejfHxUVWLwYjzwCALNm4fnncewYbr0VS5eGunwU3mK6w6BXL5w4gZQUqCp6 98ahQxgzBsePA8A332DUKHzxBcaNw9tv49prQ1xUCkMxXfNAd9Fo166Ii/M8VBS0toaqUBQZYjo8 qoq1awHgj39EXh66d0dGBv7nfwBg7VoUFIS2dBTuYnRgqNC/Pz7/HEOGwOHAhg0AUFKCRx9FTQ0G DcL69aEuH4W3mD7nIeqMmG62EXUGw0MkieEhksTwEElieIgkMTxEkhgeIkn/HzzMcpQjWQUXAAAA AElFTkSuQmCC "
-     height="572.17767"
-     width="268.11725"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1225.0927"
+     y="-87.234009"
+     id="text52"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1051.7126"
+     y="-232.2616"
+     id="text106"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text156"
+     x="-126.219"
+     y="871.51764"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-897.41565"
+     width="55"
+     height="0"
+     id="rect232"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-322.49698"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect306"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-322.49698"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect308"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-295.23599"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect310"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-295.23599"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect312"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-297.96198"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect314"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-297.96198"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect316"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-540.58405"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect326"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-540.58405"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect328"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-513.323"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect330"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-513.323"
+     y="894.68964"
+     width="0"
+     height="0"
+     id="rect332"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-516.04901"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect334"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-516.04901"
+     y="897.41565"
+     width="0"
+     height="0"
+     id="rect336"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="267.97498"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect346"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="267.97498"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect348"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="295.23599"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect350"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="295.23599"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect352"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="292.50998"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect354"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="292.50998"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect356"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="486.06198"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect366"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="486.06198"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect368"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="513.323"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect370"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="513.323"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect372"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="510.59702"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect374"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="510.59702"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect376"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="377.01898"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect386"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="377.01898"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect388"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="404.28"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect390"
+     style="fill:#000000;stroke:#1c6cc8;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="404.28"
+     y="-1200.0127"
+     width="0"
+     height="0"
+     id="rect392"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="401.55399"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect394"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="rotate(90)"
+     x="401.55399"
+     y="-1197.2827"
+     width="0"
+     height="0"
+     id="rect396"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-897.41565"
+     width="55"
+     height="0"
+     id="rect450"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text546"
+     x="-431.54099"
+     y="869.88165"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.78"
+     y="-897.41565"
+     width="55"
+     height="0"
+     id="rect638"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <text
+     font-size="12px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text684"
+     x="-418.728"
+     y="896.86969"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1256.7126"
+     y="839.638"
+     id="text734"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <text
+     font-size="12px"
+     dominant-baseline="central"
+     x="26.021662"
+     y="-175.14999"
+     id="text794"
+     style="font-size:12px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#ffffff" />
+  <polyline
+     points="648.843478,696.521739 965.069565,696.521739"
+     id="polyline1076"
+     transform="translate(-100.36733,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="583.417391,843.730435 479.826087,843.730435 479.826087,1110.886957 1131.360870,1110.886957"
+     id="polyline1080"
+     transform="translate(-100.36733,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="967.795652,396.652174 561.608696,396.652174 561.608696,712.878261 583.417391,712.878261"
+     id="polyline1096"
+     transform="translate(-100.36733,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <rect
+     x="51.828663"
+     y="-195.4594"
+     width="1"
+     height="0"
+     id="rect1388"
+     style="fill:none;stroke:#ffcc33;stroke-width:2;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="51.841663"
+     y="195.4594"
+     width="1"
+     height="0"
+     id="rect1402"
+     style="fill:none;stroke:#ffcc33;stroke-width:2;stroke-opacity:1" />
+  <g
+     id="g1883"
+     transform="translate(-859.45217,-292.242)">
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1099.62"
+       y="351.39899"
+       id="text108"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">rad</text>
+    <ellipse
+       cx="1099.35"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse110"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1073.35"
+       y="-316.09698"
+       width="55"
+       height="3"
+       id="rect112"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       x="1071.67"
+       y="313.09698"
+       width="27"
+       height="3"
+       id="rect114"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <ellipse
+       cx="1099.35"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse116"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1077.35"
+       y="-331.37"
+       width="44"
+       height="33"
+       id="rect118"
+       style="fill:#5f5f5f;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,306.691304 1179.340000,306.691304"
+       id="polyline120"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,314.324348 1179.340000,314.324348"
+       id="polyline122"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,323.047826 1179.340000,323.047826"
+       id="polyline124"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,298.513043 1143.355652,331.226087"
+       id="polyline126"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1179.340000,298.513043 1179.340000,331.226087"
+       id="polyline128"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text130"
+       x="-396.38"
+       y="972.31012"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">temSup</text>
+    <polyline
+       points="981.426087,382.476522 977.609565,380.840870 974.338261,378.660000 972.702609,375.933913 971.612174,372.662609 971.612174,369.936522"
+       id="polyline132"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="997.782609,423.913043 997.782609,371.572174"
+       id="polyline134"
+       transform="translate(-62)"
+       style="fill:none;stroke:#0080ff;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-396.65204"
+       cy="946.40997"
+       rx="5.4521699"
+       ry="5.1795702"
+       id="ellipse136"
+       style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,407.556522 981.426087,399.923478"
+       id="polyline138"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="989.604348,407.556522 989.604348,399.923478"
+       id="polyline140"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="997.782609,407.556522 997.782609,399.923478"
+       id="polyline142"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-400.15201"
+       y="-942.37598"
+       width="7"
+       height="23"
+       id="rect144"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="981.42609,393.38087 981.42609,399.92348 975.97391,399.92348 974.33826,399.37826 973.79304,398.28783 973.24783,396.65217 973.79304,395.01652 974.33826,393.92609 975.97391,393.38087 "
+       id="polygon146"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text148"
+       x="-385.203"
+       y="904.43298"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <polyline
+       points="981.426087,399.923478 1004.597826,399.923478"
+       id="polyline150"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,393.380870 1004.325217,393.380870"
+       id="polyline152"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="970.521739,396.652174 984.152174,396.652174"
+       id="polyline154"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text182"
+       x="-478.16199"
+       y="972.31012"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumRad</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect188"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect190"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect192"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect194"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect196"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect198"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect200"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect202"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect204"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect206"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect208"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect210"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect212"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect214"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect216"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect218"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect220"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect222"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect224"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect226"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect228"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect230"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse234"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse236"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse238"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse240"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse242"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse244"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse246"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse248"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse250"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse252"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse254"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse256"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse258"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse260"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse262"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse264"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse266"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="935.78302"
+       id="ellipse268"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="997.78261,463.71391 984.15217,478.43478 1011.413,478.43478 "
+       id="polygon270"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse272"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse274"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse276"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse278"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse280"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse282"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="935.78302"
+       id="ellipse284"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,478.434783 984.152174,478.434783"
+       id="polyline290"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-487.16199"
+       y="908.70001"
+       width="18"
+       height="16"
+       id="rect292"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-478.16199"
+       cy="916.70001"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse294"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text296"
+       x="-478.16199"
+       y="916.97302"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text298"
+       x="-505.69601"
+       y="908.24902"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <polygon
+       points="1025.0435,596.20174 1025.0435,579.3 1007.5965,579.3 1005.9609,560.21739 987.42348,560.21739 983.60696,614.73913 1010.3226,614.73913 1008.687,596.20174 "
+       id="polygon300"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1025.0435,592.38522 1025.0435,582.5713 1004.8704,582.5713 1003.2348,560.21739 991.78522,560.21739 987.42348,614.73913 1007.0513,614.73913 1005.4157,592.38522 "
+       id="polygon302"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text304"
+       x="-587.75098"
+       y="902.52399"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="935.78302"
+       id="ellipse318"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1025.0435,814.2887 1025.0435,797.38696 1007.5965,797.38696 1005.9609,778.30435 987.42348,778.30435 983.60696,832.82609 1010.3226,832.82609 1008.687,814.2887 "
+       id="polygon320"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1025.0435,810.47217 1025.0435,800.65826 1004.8704,800.65826 1003.2348,778.30435 991.78522,778.30435 987.42348,832.82609 1007.0513,832.82609 1005.4157,810.47217 "
+       id="polygon322"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text324"
+       x="-805.83801"
+       y="902.52399"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-805.565"
+       cy="935.78302"
+       id="ellipse338"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,578.75478 1270.3913,595.65652 1287.8383,595.65652 1289.4739,614.73913 1308.0113,614.73913 1311.8278,560.21739 1285.1122,560.21739 1286.7478,578.75478 "
+       id="polygon340"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,582.5713 1270.3913,592.38522 1290.5643,592.38522 1292.2,614.73913 1303.6496,614.73913 1308.0113,560.21739 1288.3835,560.21739 1290.0191,582.5713 "
+       id="polygon342"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text344"
+       x="587.20599"
+       y="-1268.91"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl2</text>
+    <circle
+       transform="rotate(90)"
+       cx="587.47803"
+       cy="-1235.65"
+       id="ellipse358"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,796.84174 1270.3913,813.74348 1287.8383,813.74348 1289.4739,832.82609 1308.0113,832.82609 1311.8278,778.30435 1285.1122,778.30435 1286.7478,796.84174 "
+       id="polygon360"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,800.65826 1270.3913,810.47217 1290.5643,810.47217 1292.2,832.82609 1303.6496,832.82609 1308.0113,778.30435 1288.3835,778.30435 1290.0191,800.65826 "
+       id="polygon362"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text364"
+       x="805.29303"
+       y="-1268.91"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix2</text>
+    <circle
+       transform="rotate(90)"
+       cx="805.565"
+       cy="-1235.65"
+       id="ellipse378"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,687.79826 1270.3913,704.7 1287.8383,704.7 1289.4739,723.78261 1308.0113,723.78261 1311.8278,669.26087 1285.1122,669.26087 1286.7478,687.79826 "
+       id="polygon380"
+       transform="translate(-62)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1270.3913,691.61478 1270.3913,701.4287 1290.5643,701.4287 1292.2,723.78261 1303.6496,723.78261 1308.0113,669.26087 1288.3835,669.26087 1290.0191,691.61478 "
+       id="polygon382"
+       transform="translate(-62)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text384"
+       x="696.24902"
+       y="-1268.91"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl4</text>
+    <circle
+       transform="rotate(90)"
+       cx="696.52203"
+       cy="-1235.65"
+       id="ellipse398"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text400"
+       x="-1050.64"
+       y="972.31012"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumBoi</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect406"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect408"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect410"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect412"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect414"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect416"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect418"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect420"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect422"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect424"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect426"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect428"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect430"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect432"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect434"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect436"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect438"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect440"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect442"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect444"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect446"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect448"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse452"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse454"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse456"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse458"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse460"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse462"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse464"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse466"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse468"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse470"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse472"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse474"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse476"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse478"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse480"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse482"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse484"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="935.78302"
+       id="ellipse486"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="997.78261,1036.1922 984.15217,1050.913 1011.413,1050.913 "
+       id="polygon488"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse490"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse492"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse494"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse496"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse498"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse500"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.46"
+       cy="935.78296"
+       id="ellipse502"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,1050.913043 984.152174,1050.913043"
+       id="polyline508"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-1059.64"
+       y="908.70001"
+       width="18"
+       height="16"
+       id="rect510"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-1050.64"
+       cy="916.70001"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse512"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text514"
+       x="-1050.64"
+       y="916.97302"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text516"
+       x="-1078.17"
+       y="908.24902"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1099.08"
+       y="1169.23"
+       id="text518"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+    <rect
+       transform="scale(-1)"
+       x="-1118.35"
+       y="-1149.2"
+       width="38"
+       height="33"
+       id="rect520"
+       style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-1126.98"
+       y="-1133.5601"
+       width="55"
+       height="2"
+       id="rect522"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1099.22"
+       y="1131.5601"
+       width="27"
+       height="2"
+       id="rect524"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1157.5313,1146.8713 1161.3478,1141.9643 1164.6191,1146.8713 "
+       id="polygon526"
+       transform="translate(-62)"
+       style="fill:#ffff00;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1110.886957 1183.156522,1110.886957 1183.156522,1144.690435 1162.983478,1144.690435"
+       id="polyline528"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1110.886957 1139.539130,1110.886957 1139.539130,1131.605217"
+       id="polyline530"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="1072.09"
+       y="1100.26"
+       id="text532"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="1126.0601"
+       y="1099.71"
+       id="text534"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+    <polyline
+       points="984.697391,696.521739 968.340870,696.521739"
+       id="polyline536"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-705.24902"
+       y="908.70001"
+       width="18"
+       height="16"
+       id="rect540"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-696.24896"
+       cy="916.70001"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse542"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text544"
+       x="-696.24902"
+       y="916.427"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.78302"
+       width="55"
+       height="22"
+       id="rect548"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.78302"
+       width="55"
+       height="22"
+       id="rect550"
+       style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.78302"
+       width="55"
+       height="22"
+       id="rect552"
+       style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.28302"
+       width="55"
+       height="21"
+       id="rect554"
+       style="fill:#282828;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-946.28302"
+       width="55"
+       height="21"
+       id="rect556"
+       style="fill:#363636;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-945.78302"
+       width="55"
+       height="20"
+       id="rect558"
+       style="fill:#434343;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-945.78302"
+       width="55"
+       height="20"
+       id="rect560"
+       style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-945.28302"
+       width="55"
+       height="19"
+       id="rect562"
+       style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-944.78302"
+       width="55"
+       height="18"
+       id="rect564"
+       style="fill:#676767;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-944.78302"
+       width="55"
+       height="18"
+       id="rect566"
+       style="fill:#737373;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-944.28302"
+       width="55"
+       height="17"
+       id="rect568"
+       style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-943.78302"
+       width="55"
+       height="16"
+       id="rect570"
+       style="fill:#878787;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-943.28302"
+       width="55"
+       height="15"
+       id="rect572"
+       style="fill:#919191;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-942.28302"
+       width="55"
+       height="13"
+       id="rect574"
+       style="fill:#999999;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect576"
+       style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect578"
+       style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.78302"
+       width="55"
+       height="10"
+       id="rect580"
+       style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect582"
+       style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect584"
+       style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect586"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect588"
+       style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect590"
+       style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect592"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect594"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect596"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect598"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect600"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.78302"
+       width="55"
+       height="12"
+       id="rect602"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect604"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect606"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-941.28302"
+       width="55"
+       height="11"
+       id="rect608"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.78302"
+       width="55"
+       height="10"
+       id="rect610"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.78302"
+       width="55"
+       height="10"
+       id="rect612"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect614"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-940.28302"
+       width="55"
+       height="9"
+       id="rect616"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.78302"
+       width="55"
+       height="8"
+       id="rect618"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect620"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-939.28302"
+       width="55"
+       height="7"
+       id="rect622"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-938.78302"
+       width="55"
+       height="6"
+       id="rect624"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-938.28302"
+       width="55"
+       height="5"
+       id="rect626"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect628"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.78302"
+       width="55"
+       height="4"
+       id="rect630"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-937.28302"
+       width="55"
+       height="3"
+       id="rect632"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.78302"
+       width="55"
+       height="2"
+       id="rect634"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-936.28302"
+       width="55"
+       height="1"
+       id="rect636"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-713.02197"
+       y="-946.78302"
+       width="33"
+       height="22"
+       id="rect640"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1014.1391,717.24 997.78261,696.52174 981.42609,717.24 "
+       id="polygon642"
+       transform="translate(-62)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1014.1391,675.80348 997.78261,696.52174 981.42609,675.80348 "
+       id="polygon644"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.52197"
+       y="-963.04999"
+       width="22"
+       height="12"
+       id="rect646"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.02197"
+       y="-963.04999"
+       width="21"
+       height="12"
+       id="rect648"
+       style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-706.52197"
+       y="-963.04999"
+       width="20"
+       height="12"
+       id="rect650"
+       style="fill:#535353;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-705.52197"
+       y="-963.04999"
+       width="18"
+       height="12"
+       id="rect652"
+       style="fill:#777777;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-704.02197"
+       y="-963.04999"
+       width="15"
+       height="12"
+       id="rect654"
+       style="fill:#969696;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-963.04999"
+       width="11"
+       height="12"
+       id="rect656"
+       style="fill:#acacac;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.02197"
+       y="-963.04999"
+       width="7"
+       height="12"
+       id="rect658"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.52197"
+       y="-963.04999"
+       width="2"
+       height="12"
+       id="rect660"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-963.04999"
+       width="12"
+       height="12"
+       id="rect662"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-963.04999"
+       width="12"
+       height="12"
+       id="rect664"
+       style="fill:#001c38;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-963.04999"
+       width="11"
+       height="12"
+       id="rect666"
+       style="fill:#00376e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-701.52197"
+       y="-963.04999"
+       width="10"
+       height="12"
+       id="rect668"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.52197"
+       y="-963.04999"
+       width="8"
+       height="12"
+       id="rect670"
+       style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-699.52197"
+       y="-963.04999"
+       width="6"
+       height="12"
+       id="rect672"
+       style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-698.52197"
+       y="-963.04999"
+       width="4"
+       height="12"
+       id="rect674"
+       style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.02197"
+       y="-963.04999"
+       width="1"
+       height="12"
+       id="rect676"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1018.5009,712.87826 997.78261,696.52174 1018.5009,680.16522 "
+       id="polygon678"
+       transform="translate(-62)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,704.700000 986.878261,688.343478"
+       id="polyline680"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,696.521739 997.782609,696.521739"
+       id="polyline682"
+       transform="translate(-62)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1295.63"
+       y="1097.26"
+       id="text686"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse688"
+       r="27.2609"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse690"
+       r="27.1945"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse692"
+       r="26.9956"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse694"
+       r="26.665199"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse696"
+       r="26.2048"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse698"
+       r="25.6168"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse700"
+       r="24.903999"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse702"
+       r="24.069901"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse704"
+       r="23.1185"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse706"
+       r="22.054501"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse708"
+       r="20.882999"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse710"
+       r="19.6098"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse712"
+       r="18.2411"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse714"
+       r="16.783501"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse716"
+       r="15.2441"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse718"
+       r="13.6304"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse720"
+       r="11.9504"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse722"
+       r="10.2121"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse724"
+       r="8.4240704"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse726"
+       r="6.5949998"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse728"
+       r="4.7337999"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse730"
+       r="2.84954"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1295.63"
+       cy="-1132.7001"
+       id="ellipse732"
+       r="0.95139098"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline822"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline824"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline838"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline840"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline842"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline844"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline846"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline848"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline850"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline852"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline854"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline856"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,723.782609 1297.652174,778.304348"
+       id="polyline858"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,723.782609 1297.652174,778.304348"
+       id="polyline860"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,614.739130 1297.652174,669.260870"
+       id="polyline862"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,614.739130 1297.652174,669.260870"
+       id="polyline864"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline866"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline868"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline870"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline872"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline874"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline876"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline878"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline880"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline882"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline884"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline906"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline908"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline910"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline912"
+       transform="translate(-62)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1064"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline1068"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline1070"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline1072"
+       transform="translate(-62)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline1074"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       cx="1235.65"
+       cy="1132.7"
+       id="ellipse1106"
+       r="3"
+       style="fill:#007fff;stroke:#007fff" />
+    <circle
+       cx="1072.09"
+       cy="314.87"
+       id="ellipse1182"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="314.87"
+       id="ellipse1184"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-314.87"
+       id="ellipse1186"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-314.87"
+       id="ellipse1188"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-314.87"
+       id="ellipse1190"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1091.4"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect1192"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="1102.3"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect1194"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="935.78302"
+       id="ellipse1196"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="935.78302"
+       id="ellipse1198"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-935.78302"
+       id="ellipse1200"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-935.78302"
+       id="ellipse1202"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-935.78302"
+       id="ellipse1204"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="970.52174,399.37826 970.52174,393.92609 965.06957,396.65217 "
+       id="polygon1206"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="935.78302"
+       id="ellipse1212"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="935.78302"
+       id="ellipse1214"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-935.78296"
+       id="ellipse1216"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-935.78296"
+       id="ellipse1218"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-935.78296"
+       id="ellipse1220"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-480.935"
+       y="-956.82001"
+       width="5"
+       height="5"
+       id="rect1226"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1066"
+       transform="translate(-62)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="970.52174,478.43478 959.61739,483.88696 959.61739,472.98261 "
+       id="polygon1228"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="935.78302"
+       id="ellipse1232"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="935.78302"
+       id="ellipse1234"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="935.78296"
+       id="ellipse1236"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="935.78296"
+       id="ellipse1238"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="935.78296"
+       id="ellipse1240"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="963.03998"
+       id="ellipse1242"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="963.03998"
+       id="ellipse1244"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="935.78296"
+       id="ellipse1246"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="935.78296"
+       id="ellipse1248"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="935.78302"
+       id="ellipse1250"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="935.78302"
+       id="ellipse1252"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="935.78302"
+       id="ellipse1254"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="963.03998"
+       id="ellipse1256"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="963.03998"
+       id="ellipse1258"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21704"
+       cy="-1235.65"
+       id="ellipse1260"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21704"
+       cy="-1235.65"
+       id="ellipse1262"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73901"
+       cy="-1235.65"
+       id="ellipse1264"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73901"
+       cy="-1235.65"
+       id="ellipse1266"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73901"
+       cy="-1235.65"
+       id="ellipse1268"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47803"
+       cy="-1208.39"
+       id="ellipse1270"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47803"
+       cy="-1208.39"
+       id="ellipse1272"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="778.30402"
+       cy="-1235.65"
+       id="ellipse1274"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="778.30402"
+       cy="-1235.65"
+       id="ellipse1276"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="832.82605"
+       cy="-1235.65"
+       id="ellipse1278"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="832.82605"
+       cy="-1235.65"
+       id="ellipse1280"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="832.82605"
+       cy="-1235.65"
+       id="ellipse1282"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="805.565"
+       cy="-1208.39"
+       id="ellipse1284"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="805.565"
+       cy="-1208.39"
+       id="ellipse1286"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="669.26105"
+       cy="-1235.65"
+       id="ellipse1288"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="669.26105"
+       cy="-1235.65"
+       id="ellipse1290"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="723.78302"
+       cy="-1235.65"
+       id="ellipse1292"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="723.78302"
+       cy="-1235.65"
+       id="ellipse1294"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="723.78302"
+       cy="-1235.65"
+       id="ellipse1296"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="696.52203"
+       cy="-1208.39"
+       id="ellipse1298"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="696.52203"
+       cy="-1208.39"
+       id="ellipse1300"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.1699"
+       cy="935.78302"
+       id="ellipse1302"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.1699"
+       cy="935.78302"
+       id="ellipse1304"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-935.78296"
+       id="ellipse1306"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-935.78296"
+       id="ellipse1308"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-935.78296"
+       id="ellipse1310"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1053.41"
+       y="-956.82001"
+       width="5"
+       height="5"
+       id="rect1316"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="959.61739,1056.3652 959.61739,1045.4609 970.52174,1050.913 "
+       id="polygon1318"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-1132.7001"
+       id="ellipse1322"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1126.61"
+       cy="-1132.7001"
+       id="ellipse1324"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="1132.7"
+       id="ellipse1326"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="1132.7"
+       id="ellipse1328"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="1072.09"
+       cy="1132.7"
+       id="ellipse1330"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="1199.513,1116.3391 1199.513,1105.4348 1188.6087,1110.887 "
+       id="polygon1332"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1134.087,1113.613 1134.087,1108.1609 1128.6348,1110.887 "
+       id="polygon1334"
+       transform="translate(-62)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-1101.85"
+       y="-1115.5699"
+       width="5"
+       height="5"
+       id="rect1336"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="935.78302"
+       id="ellipse1338"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="935.78302"
+       id="ellipse1340"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="935.78296"
+       id="ellipse1342"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="935.78296"
+       id="ellipse1344"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="935.78296"
+       id="ellipse1346"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52197"
+       cy="963.03998"
+       id="ellipse1348"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52197"
+       cy="963.03998"
+       id="ellipse1350"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="959.61739,701.97391 959.61739,691.06957 970.52174,696.52174 "
+       id="polygon1352"
+       transform="translate(-62)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1270.87"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect1356"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1358"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1360"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1362"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1364"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1366"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1368"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1270.87"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect1370"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1372"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1374"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1376"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1132.7001"
+       id="ellipse1378"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1139.78"
+       id="ellipse1380"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1268.37"
+       cy="-1125.61"
+       id="ellipse1382"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1474"
+       transform="matrix(1,0,0,-1,-62,1174.9565)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline1478"
+       transform="translate(-62,-81.782609)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  </g>
+  <g
+     id="g3849"
+     transform="translate(-110.36733,-292.242)">
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="951.87738"
+       y="351.39899"
+       id="text1885"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">rad</text>
+    <ellipse
+       cx="951.60742"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse1887"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="925.60748"
+       y="-316.09698"
+       width="55"
+       height="3"
+       id="rect1889"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       x="923.92749"
+       y="313.09698"
+       width="27"
+       height="3"
+       id="rect1891"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <ellipse
+       cx="951.60742"
+       cy="314.59698"
+       rx="5.4521699"
+       ry="5.7247801"
+       id="ellipse1893"
+       style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="929.60748"
+       y="-331.37"
+       width="44"
+       height="33"
+       id="rect1895"
+       style="fill:#5f5f5f;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,306.691304 1179.340000,306.691304"
+       id="polyline1897"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,314.324348 1179.340000,314.324348"
+       id="polyline1899"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,323.047826 1179.340000,323.047826"
+       id="polyline1901"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1143.355652,298.513043 1143.355652,331.226087"
+       id="polyline1903"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1179.340000,298.513043 1179.340000,331.226087"
+       id="polyline1905"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text1907"
+       x="-396.38"
+       y="824.5675"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">temSup</text>
+    <polyline
+       points="981.426087,382.476522 977.609565,380.840870 974.338261,378.660000 972.702609,375.933913 971.612174,372.662609 971.612174,369.936522"
+       id="polyline1909"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="997.782609,423.913043 997.782609,371.572174"
+       id="polyline1911"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#0080ff;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-396.65204"
+       cy="798.66748"
+       rx="5.4521699"
+       ry="5.1795702"
+       id="ellipse1913"
+       style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,407.556522 981.426087,399.923478"
+       id="polyline1915"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="989.604348,407.556522 989.604348,399.923478"
+       id="polyline1917"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="997.782609,407.556522 997.782609,399.923478"
+       id="polyline1919"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-400.15201"
+       y="-794.63348"
+       width="7"
+       height="23"
+       id="rect1921"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="973.24783,396.65217 973.79304,395.01652 974.33826,393.92609 975.97391,393.38087 981.42609,393.38087 981.42609,399.92348 975.97391,399.92348 974.33826,399.37826 973.79304,398.28783 "
+       id="polygon1923"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text1925"
+       x="-385.203"
+       y="756.69049"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <polyline
+       points="981.426087,399.923478 1004.597826,399.923478"
+       id="polyline1927"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="981.426087,393.380870 1004.325217,393.380870"
+       id="polyline1929"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+    <polyline
+       points="970.521739,396.652174 984.152174,396.652174"
+       id="polyline1931"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text1933"
+       x="-478.16199"
+       y="824.5675"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumRad</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1939"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1941"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1943"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect1945"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1947"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1949"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1951"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect1953"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect1955"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect1957"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect1959"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect1961"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect1963"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect1965"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect1967"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect1969"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect1971"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect1973"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect1975"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect1977"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect1979"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-505.935"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect1981"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1983"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1985"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1987"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1989"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1991"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1993"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1995"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1997"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle1999"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2001"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2003"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2005"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2007"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2009"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2011"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2013"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2015"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-478.43497"
+       cy="788.04053"
+       id="circle2017"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1011.413,478.43478 997.78261,463.71391 984.15217,478.43478 "
+       id="polygon2019"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2021"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2023"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2025"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2027"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2029"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2031"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-472.98297"
+       cy="788.04053"
+       id="circle2033"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,478.434783 984.152174,478.434783"
+       id="polyline2039"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-487.16199"
+       y="760.95752"
+       width="18"
+       height="16"
+       id="rect2041"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-478.16199"
+       cy="768.95746"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse2043"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2045"
+       x="-478.16199"
+       y="769.23053"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2047"
+       x="-505.69601"
+       y="760.50647"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <polygon
+       points="987.42348,560.21739 983.60696,614.73913 1010.3226,614.73913 1008.687,596.20174 1025.0435,596.20174 1025.0435,579.3 1007.5965,579.3 1005.9609,560.21739 "
+       id="polygon2049"
+       transform="translate(-209.7425)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="991.78522,560.21739 987.42348,614.73913 1007.0513,614.73913 1005.4157,592.38522 1025.0435,592.38522 1025.0435,582.5713 1004.8704,582.5713 1003.2348,560.21739 "
+       id="polygon2051"
+       transform="translate(-209.7425)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2053"
+       x="-587.75098"
+       y="754.78149"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47797"
+       cy="788.04053"
+       id="circle2055"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="987.42348,778.30435 983.60696,832.82609 1010.3226,832.82609 1008.687,814.2887 1025.0435,814.2887 1025.0435,797.38696 1007.5965,797.38696 1005.9609,778.30435 "
+       id="polygon2057"
+       transform="translate(-209.7425)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="991.78522,778.30435 987.42348,832.82609 1007.0513,832.82609 1005.4157,810.47217 1025.0435,810.47217 1025.0435,800.65826 1004.8704,800.65826 1003.2348,778.30435 "
+       id="polygon2059"
+       transform="translate(-209.7425)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2061"
+       x="-805.83801"
+       y="754.78149"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl</text>
+    <circle
+       transform="rotate(-90)"
+       cx="-805.565"
+       cy="788.04053"
+       id="circle2063"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1308.0113,614.73913 1311.8278,560.21739 1285.1122,560.21739 1286.7478,578.75478 1270.3913,578.75478 1270.3913,595.65652 1287.8383,595.65652 1289.4739,614.73913 "
+       id="polygon2065"
+       transform="translate(-209.7425)"
+       style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="1303.6496,614.73913 1308.0113,560.21739 1288.3835,560.21739 1290.0191,582.5713 1270.3913,582.5713 1270.3913,592.38522 1290.5643,592.38522 1292.2,614.73913 "
+       id="polygon2067"
+       transform="translate(-209.7425)"
+       style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(90)"
+       id="text2069"
+       x="587.20599"
+       y="-1121.1675"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl2</text>
+    <circle
+       transform="rotate(90)"
+       cx="587.47797"
+       cy="-1087.9075"
+       id="circle2071"
+       r="9.5412998"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2089"
+       x="-1050.6399"
+       y="824.56744"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumBoi</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2095"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2097"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2099"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2101"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2103"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2105"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2107"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2109"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2111"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2113"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2115"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect2117"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect2119"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2121"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2123"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2125"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2127"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect2129"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect2131"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2133"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2135"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1078.41"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect2137"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2139"
+       r="15.8113"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2141"
+       r="15.7477"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2143"
+       r="15.5572"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2145"
+       r="15.2415"
+       style="fill:#001b36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2147"
+       r="14.8031"
+       style="fill:#002447;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2149"
+       r="14.2455"
+       style="fill:#002c58;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2151"
+       r="13.5732"
+       style="fill:#003468;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2153"
+       r="12.7916"
+       style="fill:#003c77;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2155"
+       r="11.907"
+       style="fill:#004386;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2157"
+       r="10.9266"
+       style="fill:#004993;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2159"
+       r="9.8581896"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2161"
+       r="8.7103996"
+       style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2163"
+       r="7.4924798"
+       style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2165"
+       r="6.2142401"
+       style="fill:#005db9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2167"
+       r="4.8859601"
+       style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2169"
+       r="3.5183499"
+       style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2171"
+       r="2.1224"
+       style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1050.91"
+       cy="788.04047"
+       id="circle2173"
+       r="0.70937097"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1011.413,1050.913 997.78261,1036.1922 984.15217,1050.913 "
+       id="polygon2175"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2177"
+       r="4.3617401"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2179"
+       r="4.2349901"
+       style="fill:#001933;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2181"
+       r="3.8621299"
+       style="fill:#003163;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2183"
+       r="3.2648101"
+       style="fill:#00468c;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2185"
+       r="2.4777501"
+       style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2187"
+       r="1.54669"
+       style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1045.4601"
+       cy="788.04041"
+       id="circle2189"
+       r="0.52574998"
+       style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="970.521739,1050.913043 984.152174,1050.913043"
+       id="polyline2195"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-1059.64"
+       y="760.95752"
+       width="18"
+       height="16"
+       id="rect2197"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-1050.64"
+       cy="768.95746"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse2199"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2201"
+       x="-1050.64"
+       y="769.23053"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2203"
+       x="-1078.1699"
+       y="760.50647"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="951.3374"
+       y="1169.23"
+       id="text2205"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+    <rect
+       transform="scale(-1)"
+       x="-970.60748"
+       y="-1149.2"
+       width="38"
+       height="33"
+       id="rect2207"
+       style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-979.23749"
+       y="-1133.5601"
+       width="55"
+       height="2"
+       id="rect2209"
+       style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-951.47748"
+       y="1131.5601"
+       width="27"
+       height="2"
+       id="rect2211"
+       style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1164.6191,1146.8713 1157.5313,1146.8713 1161.3478,1141.9643 "
+       id="polygon2213"
+       transform="translate(-209.7425)"
+       style="fill:#ffff00;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1110.886957 1183.156522,1110.886957 1183.156522,1144.690435 1162.983478,1144.690435"
+       id="polyline2215"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1110.886957 1139.539130,1110.886957 1139.539130,1131.605217"
+       id="polyline2217"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="924.34741"
+       y="1100.26"
+       id="text2219"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+    <text
+       font-size="14px"
+       dominant-baseline="central"
+       x="978.3175"
+       y="1099.71"
+       id="text2221"
+       style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+    <polyline
+       points="984.697391,696.521739 968.340870,696.521739"
+       id="polyline2223"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       x="-705.24902"
+       y="760.95752"
+       width="18"
+       height="16"
+       id="rect2227"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <ellipse
+       transform="rotate(-90)"
+       cx="-696.24896"
+       cy="768.95752"
+       rx="8.9960899"
+       ry="8.1782598"
+       id="ellipse2229"
+       style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="13px"
+       font-weight="bold"
+       dominant-baseline="central"
+       transform="rotate(-90)"
+       id="text2231"
+       x="-696.24902"
+       y="768.68451"
+       style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-799.04053"
+       width="55"
+       height="22"
+       id="rect2233"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-799.04053"
+       width="55"
+       height="22"
+       id="rect2235"
+       style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-799.04053"
+       width="55"
+       height="22"
+       id="rect2237"
+       style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.54053"
+       width="55"
+       height="21"
+       id="rect2239"
+       style="fill:#282828;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.54053"
+       width="55"
+       height="21"
+       id="rect2241"
+       style="fill:#363636;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.04053"
+       width="55"
+       height="20"
+       id="rect2243"
+       style="fill:#434343;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-798.04053"
+       width="55"
+       height="20"
+       id="rect2245"
+       style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-797.54053"
+       width="55"
+       height="19"
+       id="rect2247"
+       style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-797.04053"
+       width="55"
+       height="18"
+       id="rect2249"
+       style="fill:#676767;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-797.04053"
+       width="55"
+       height="18"
+       id="rect2251"
+       style="fill:#737373;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-796.54053"
+       width="55"
+       height="17"
+       id="rect2253"
+       style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-796.04053"
+       width="55"
+       height="16"
+       id="rect2255"
+       style="fill:#878787;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-795.54053"
+       width="55"
+       height="15"
+       id="rect2257"
+       style="fill:#919191;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.54053"
+       width="55"
+       height="13"
+       id="rect2259"
+       style="fill:#999999;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2261"
+       style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2263"
+       style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.04053"
+       width="55"
+       height="10"
+       id="rect2265"
+       style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2267"
+       style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2269"
+       style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2271"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2273"
+       style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2275"
+       style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect2277"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2279"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2281"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2283"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2285"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-794.04053"
+       width="55"
+       height="12"
+       id="rect2287"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2289"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2291"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.54053"
+       width="55"
+       height="11"
+       id="rect2293"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.04053"
+       width="55"
+       height="10"
+       id="rect2295"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-793.04053"
+       width="55"
+       height="10"
+       id="rect2297"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2299"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.54053"
+       width="55"
+       height="9"
+       id="rect2301"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-792.04053"
+       width="55"
+       height="8"
+       id="rect2303"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2305"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.54053"
+       width="55"
+       height="7"
+       id="rect2307"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-791.04053"
+       width="55"
+       height="6"
+       id="rect2309"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.54053"
+       width="55"
+       height="5"
+       id="rect2311"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2313"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-790.04053"
+       width="55"
+       height="4"
+       id="rect2315"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-789.54053"
+       width="55"
+       height="3"
+       id="rect2317"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-789.04053"
+       width="55"
+       height="2"
+       id="rect2319"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-724.02197"
+       y="-788.54053"
+       width="55"
+       height="1"
+       id="rect2321"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-713.02197"
+       y="-799.04053"
+       width="33"
+       height="22"
+       id="rect2323"
+       style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="981.42609,717.24 1014.1391,717.24 997.78261,696.52174 "
+       id="polygon2325"
+       transform="translate(-209.7425)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="981.42609,675.80348 1014.1391,675.80348 997.78261,696.52174 "
+       id="polygon2327"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.52197"
+       y="-815.3075"
+       width="22"
+       height="12"
+       id="rect2329"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-707.02197"
+       y="-815.3075"
+       width="21"
+       height="12"
+       id="rect2331"
+       style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-706.52197"
+       y="-815.3075"
+       width="20"
+       height="12"
+       id="rect2333"
+       style="fill:#535353;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-705.52197"
+       y="-815.3075"
+       width="18"
+       height="12"
+       id="rect2335"
+       style="fill:#777777;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-704.02197"
+       y="-815.3075"
+       width="15"
+       height="12"
+       id="rect2337"
+       style="fill:#969696;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-815.3075"
+       width="11"
+       height="12"
+       id="rect2339"
+       style="fill:#acacac;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.02197"
+       y="-815.3075"
+       width="7"
+       height="12"
+       id="rect2341"
+       style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.52197"
+       y="-815.3075"
+       width="2"
+       height="12"
+       id="rect2343"
+       style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-815.3075"
+       width="12"
+       height="12"
+       id="rect2345"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.52197"
+       y="-815.3075"
+       width="12"
+       height="12"
+       id="rect2347"
+       style="fill:#001c38;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-702.02197"
+       y="-815.3075"
+       width="11"
+       height="12"
+       id="rect2349"
+       style="fill:#00376e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-701.52197"
+       y="-815.3075"
+       width="10"
+       height="12"
+       id="rect2351"
+       style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-700.52197"
+       y="-815.3075"
+       width="8"
+       height="12"
+       id="rect2353"
+       style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-699.52197"
+       y="-815.3075"
+       width="6"
+       height="12"
+       id="rect2355"
+       style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-698.52197"
+       y="-815.3075"
+       width="4"
+       height="12"
+       id="rect2357"
+       style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-697.02197"
+       y="-815.3075"
+       width="1"
+       height="12"
+       id="rect2359"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polygon
+       points="1018.5009,680.16522 1018.5009,712.87826 997.78261,696.52174 "
+       id="polygon2361"
+       transform="translate(-209.7425)"
+       style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,704.700000 986.878261,688.343478"
+       id="polyline2363"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <polyline
+       points="986.878261,696.521739 997.782609,696.521739"
+       id="polyline2365"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#000000;stroke-opacity:1" />
+    <text
+       font-size="11px"
+       dominant-baseline="central"
+       x="1147.8875"
+       y="1097.26"
+       id="text2367"
+       style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2369"
+       r="27.2609"
+       style="fill:#000000;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2371"
+       r="27.1945"
+       style="fill:#000912;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2373"
+       r="26.9956"
+       style="fill:#001224;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2375"
+       r="26.665199"
+       style="fill:#001a36;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2377"
+       r="26.2048"
+       style="fill:#002347;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2379"
+       r="25.6168"
+       style="fill:#002c59;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2381"
+       r="24.903999"
+       style="fill:#003469;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2383"
+       r="24.069901"
+       style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2385"
+       r="23.1185"
+       style="fill:#004489;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2387"
+       r="22.054501"
+       style="fill:#004c98;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2389"
+       r="20.882999"
+       style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2391"
+       r="19.6098"
+       style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2393"
+       r="18.2411"
+       style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2395"
+       r="16.783501"
+       style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2397"
+       r="15.2441"
+       style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2399"
+       r="13.6304"
+       style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2401"
+       r="11.9504"
+       style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2403"
+       r="10.2121"
+       style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2405"
+       r="8.4240704"
+       style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2407"
+       r="6.5949998"
+       style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2409"
+       r="4.7337999"
+       style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2411"
+       r="2.84954"
+       style="fill:#007efe;stroke:none;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1147.8876"
+       cy="-1132.7001"
+       id="circle2413"
+       r="0.95139098"
+       style="fill:#007fff;stroke:none;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline2415"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+       id="polyline2417"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline2419"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,451.173913 997.782609,423.913043"
+       id="polyline2421"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline2423"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+       id="polyline2425"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline2427"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,778.304348 997.782609,723.782609"
+       id="polyline2429"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline2431"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,669.260870 997.782609,614.739130"
+       id="polyline2433"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline2435"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,1132.695652 1330.365217,1132.695652"
+       id="polyline2437"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,614.739130 1297.652174,669.260870"
+       id="polyline2443"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline2447"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,696.521739 1270.391304,696.521739"
+       id="polyline2449"
+       transform="matrix(1.1078478,0,0,1,-320.29123,0)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline2451"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,805.565217 1270.391304,805.565217"
+       id="polyline2453"
+       transform="matrix(1.1096196,0,0,1,-322.1074,-0.11050075)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline2455"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1025.043478,587.478261 1270.391304,587.478261"
+       id="polyline2457"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline2459"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,560.217391 997.782609,505.695652"
+       id="polyline2461"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline2463"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+       id="polyline2465"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline2467"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="997.782609,1023.652174 997.782609,832.826087"
+       id="polyline2469"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline2471"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+       id="polyline2473"
+       transform="matrix(1,0,0,1.7272727,-209.7425,-823.77866)"
+       style="fill:none;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2475"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline2477"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,1050.913043 965.069565,1050.913043"
+       id="polyline2479"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline2481"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+    <polyline
+       points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+       id="polyline2483"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       cx="1087.9075"
+       cy="1132.7"
+       id="circle2485"
+       r="3"
+       style="fill:#007fff;stroke:#007fff" />
+    <circle
+       cx="924.34741"
+       cy="314.87"
+       id="circle2487"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="314.87"
+       id="circle2489"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-314.87"
+       id="circle2491"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-314.87"
+       id="circle2493"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-314.87"
+       id="circle2495"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="943.65747"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect2497"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <rect
+       transform="scale(1,-1)"
+       x="954.5575"
+       y="-297.742"
+       width="5"
+       height="5"
+       id="rect2499"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="788.04047"
+       id="circle2501"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-423.91299"
+       cy="788.04047"
+       id="circle2503"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-788.04053"
+       id="circle2505"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-788.04053"
+       id="circle2507"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="369.39102"
+       cy="-788.04053"
+       id="circle2509"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="965.06957,396.65217 970.52174,399.37826 970.52174,393.92609 "
+       id="polygon2511"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="788.04053"
+       id="circle2513"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-505.69598"
+       cy="788.04053"
+       id="circle2515"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-788.04047"
+       id="circle2517"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-788.04047"
+       id="circle2519"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="451.17401"
+       cy="-788.04047"
+       id="circle2521"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-480.935"
+       y="-809.07751"
+       width="5"
+       height="5"
+       id="rect2527"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2529"
+       transform="translate(-209.7425)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="959.61739,472.98261 970.52174,478.43478 959.61739,483.88696 "
+       id="polygon2531"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="788.04053"
+       id="circle2535"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-614.73895"
+       cy="788.04053"
+       id="circle2537"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="788.04047"
+       id="circle2539"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="788.04047"
+       id="circle2541"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-560.21698"
+       cy="788.04047"
+       id="circle2543"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47803"
+       cy="815.29761"
+       id="circle2545"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-587.47803"
+       cy="815.29761"
+       id="circle2547"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="788.04047"
+       id="circle2549"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-832.82599"
+       cy="788.04047"
+       id="circle2551"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="788.04053"
+       id="circle2553"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="788.04053"
+       id="circle2555"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-778.30396"
+       cy="788.04053"
+       id="circle2557"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="815.29742"
+       id="circle2559"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-805.56494"
+       cy="815.29742"
+       id="circle2561"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21698"
+       cy="-1087.9076"
+       id="circle2563"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="560.21698"
+       cy="-1087.9076"
+       id="circle2565"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73895"
+       cy="-1087.9076"
+       id="circle2567"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73895"
+       cy="-1087.9076"
+       id="circle2569"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="614.73895"
+       cy="-1087.9076"
+       id="circle2571"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47797"
+       cy="-1060.6476"
+       id="circle2573"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="587.47797"
+       cy="-1060.6476"
+       id="circle2575"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="805.90991"
+       cy="-1087.9076"
+       id="circle2581"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="696.52197"
+       cy="-1087.1224"
+       id="circle2601"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.17"
+       cy="788.04047"
+       id="circle2605"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-1078.17"
+       cy="788.04047"
+       id="circle2607"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-788.04041"
+       id="circle2609"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-788.04041"
+       id="circle2611"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(90)"
+       cx="1023.65"
+       cy="-788.04041"
+       id="circle2613"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="matrix(0,-1,-1,0,0,0)"
+       x="-1053.41"
+       y="-809.07751"
+       width="5"
+       height="5"
+       id="rect2619"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <polygon
+       points="970.52174,1050.913 959.61739,1056.3652 959.61739,1045.4609 "
+       id="polygon2621"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-1132.7001"
+       id="circle2625"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-978.86761"
+       cy="-1132.7001"
+       id="circle2627"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="1132.7"
+       id="circle2629"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="1132.7"
+       id="circle2631"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       cx="924.34741"
+       cy="1132.7"
+       id="circle2633"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polygon
+       points="1188.6087,1110.887 1199.513,1116.3391 1199.513,1105.4348 "
+       id="polygon2635"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <polygon
+       points="1128.6348,1110.887 1134.087,1113.613 1134.087,1108.1609 "
+       id="polygon2637"
+       transform="translate(-209.7425)"
+       style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1)"
+       x="-954.10748"
+       y="-1115.5699"
+       width="5"
+       height="5"
+       id="rect2639"
+       style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="788.04053"
+       id="circle2641"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-723.78296"
+       cy="788.04053"
+       id="circle2643"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="788.04047"
+       id="circle2645"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="788.04047"
+       id="circle2647"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-669.26099"
+       cy="788.04047"
+       id="circle2649"
+       r="2.1808701"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52191"
+       cy="815.29742"
+       id="circle2651"
+       r="2.72609"
+       style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="rotate(-90)"
+       cx="-696.52191"
+       cy="815.29742"
+       id="circle2653"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <polygon
+       points="970.52174,696.52174 959.61739,701.97391 959.61739,691.06957 "
+       id="polygon2655"
+       transform="translate(-209.7425)"
+       style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1123.1274"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect2659"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2661"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2663"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2665"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2667"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2669"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2671"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <rect
+       transform="scale(-1,1)"
+       x="-1123.1274"
+       y="1121.7"
+       width="5"
+       height="22"
+       id="rect2673"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2675"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2677"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2679"
+       r="2.72609"
+       style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1132.7001"
+       id="circle2681"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1139.78"
+       id="circle2683"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <circle
+       transform="scale(-1)"
+       cx="-1120.6276"
+       cy="-1125.61"
+       id="circle2685"
+       r="1.63565"
+       style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2687"
+       transform="matrix(1,0,0,-1,-209.7425,1174.9565)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+    <polyline
+       points="921.452174,478.434783 965.069565,478.434783"
+       id="polyline2689"
+       transform="translate(-209.7425,-81.782609)"
+       style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  </g>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     x="1425.1431"
+     y="59.156994"
+     id="text3851"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">rad</text>
+  <ellipse
+     cx="1424.873"
+     cy="22.354982"
+     rx="5.4521699"
+     ry="5.7247801"
+     id="ellipse3853"
+     style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1398.8732"
+     y="-23.854982"
+     width="55"
+     height="3"
+     id="rect3855"
+     style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+  <rect
+     x="1397.1931"
+     y="20.854982"
+     width="27"
+     height="3"
+     id="rect3857"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <ellipse
+     cx="1424.873"
+     cy="22.354982"
+     rx="5.4521699"
+     ry="5.7247801"
+     id="ellipse3859"
+     style="fill:#7f0000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1402.8732"
+     y="-39.128002"
+     width="44"
+     height="33"
+     id="rect3861"
+     style="fill:#5f5f5f;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,306.691304 1179.340000,306.691304"
+     id="polyline3863"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,314.324348 1179.340000,314.324348"
+     id="polyline3865"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,323.047826 1179.340000,323.047826"
+     id="polyline3867"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1143.355652,298.513043 1143.355652,331.226087"
+     id="polyline3869"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1179.340000,298.513043 1179.340000,331.226087"
+     id="polyline3871"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text3873"
+     x="-104.13801"
+     y="1297.8331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">temSup</text>
+  <polyline
+     points="981.426087,382.476522 977.609565,380.840870 974.338261,378.660000 972.702609,375.933913 971.612174,372.662609 971.612174,369.936522"
+     id="polyline3875"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="997.782609,423.913043 997.782609,371.572174"
+     id="polyline3877"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#0080ff;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-104.41004"
+     cy="1271.9331"
+     rx="5.4521699"
+     ry="5.1795702"
+     id="ellipse3879"
+     style="fill:#bf0000;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="981.426087,407.556522 981.426087,399.923478"
+     id="polyline3881"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="989.604348,407.556522 989.604348,399.923478"
+     id="polyline3883"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="997.782609,407.556522 997.782609,399.923478"
+     id="polyline3885"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-107.91001"
+     y="-1267.8992"
+     width="7"
+     height="23"
+     id="rect3887"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="981.42609,393.38087 981.42609,399.92348 975.97391,399.92348 974.33826,399.37826 973.79304,398.28783 973.24783,396.65217 973.79304,395.01652 974.33826,393.92609 975.97391,393.38087 "
+     id="polygon3889"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text3891"
+     x="-92.961006"
+     y="1229.9562"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+  <polyline
+     points="981.426087,399.923478 1004.597826,399.923478"
+     id="polyline3893"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="981.426087,393.380870 1004.325217,393.380870"
+     id="polyline3895"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-opacity:1" />
+  <polyline
+     points="970.521739,396.652174 984.152174,396.652174"
+     id="polyline3897"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text3899"
+     x="-185.92"
+     y="1297.8331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumRad</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3901"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3903"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3905"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect3907"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3909"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3911"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3913"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect3915"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect3917"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect3919"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect3921"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect3923"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect3925"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect3927"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect3929"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect3931"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect3933"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect3935"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect3937"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect3939"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect3941"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-213.69301"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect3943"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3945"
+     r="15.8113"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3947"
+     r="15.7477"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3949"
+     r="15.5572"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3951"
+     r="15.2415"
+     style="fill:#001b36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3953"
+     r="14.8031"
+     style="fill:#002447;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3955"
+     r="14.2455"
+     style="fill:#002c58;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3957"
+     r="13.5732"
+     style="fill:#003468;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3959"
+     r="12.7916"
+     style="fill:#003c77;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3961"
+     r="11.907"
+     style="fill:#004386;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3963"
+     r="10.9266"
+     style="fill:#004993;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3965"
+     r="9.8581896"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3967"
+     r="8.7103996"
+     style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3969"
+     r="7.4924798"
+     style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3971"
+     r="6.2142401"
+     style="fill:#005db9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3973"
+     r="4.8859601"
+     style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3975"
+     r="3.5183499"
+     style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3977"
+     r="2.1224"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-186.19298"
+     cy="1261.3062"
+     id="circle3979"
+     r="0.70937097"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="997.78261,463.71391 984.15217,478.43478 1011.413,478.43478 "
+     id="polygon3981"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3983"
+     r="4.3617401"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3985"
+     r="4.2349901"
+     style="fill:#001933;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3987"
+     r="3.8621299"
+     style="fill:#003163;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3989"
+     r="3.2648101"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3991"
+     r="2.4777501"
+     style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3993"
+     r="1.54669"
+     style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-180.74098"
+     cy="1261.3062"
+     id="circle3995"
+     r="0.52574998"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="970.521739,478.434783 984.152174,478.434783"
+     id="polyline3997"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-194.92"
+     y="1234.2231"
+     width="18"
+     height="16"
+     id="rect3999"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-185.92"
+     cy="1242.2231"
+     rx="8.9960899"
+     ry="8.1782598"
+     id="ellipse4001"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="13px"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4003"
+     x="-185.92"
+     y="1242.4962"
+     style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4005"
+     x="-213.45403"
+     y="1233.7721"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+  <polygon
+     points="1008.687,596.20174 1025.0435,596.20174 1025.0435,579.3 1007.5965,579.3 1005.9609,560.21739 987.42348,560.21739 983.60696,614.73913 1010.3226,614.73913 "
+     id="polygon4007"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1005.4157,592.38522 1025.0435,592.38522 1025.0435,582.5713 1004.8704,582.5713 1003.2348,560.21739 991.78522,560.21739 987.42348,614.73913 1007.0513,614.73913 "
+     id="polygon4009"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4011"
+     x="-295.50897"
+     y="1228.0471"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">mix</text>
+  <circle
+     transform="rotate(-90)"
+     cx="-295.23596"
+     cy="1261.3062"
+     id="circle4013"
+     r="9.5412998"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1008.687,814.2887 1025.0435,814.2887 1025.0435,797.38696 1007.5965,797.38696 1005.9609,778.30435 987.42348,778.30435 983.60696,832.82609 1010.3226,832.82609 "
+     id="polygon4015"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1005.4157,810.47217 1025.0435,810.47217 1025.0435,800.65826 1004.8704,800.65826 1003.2348,778.30435 991.78522,778.30435 987.42348,832.82609 1007.0513,832.82609 "
+     id="polygon4017"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4019"
+     x="-513.59601"
+     y="1228.0471"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl</text>
+  <circle
+     transform="rotate(-90)"
+     cx="-513.323"
+     cy="1261.3062"
+     id="circle4021"
+     r="9.5412998"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1286.7478,578.75478 1270.3913,578.75478 1270.3913,595.65652 1287.8383,595.65652 1289.4739,614.73913 1308.0113,614.73913 1311.8278,560.21739 1285.1122,560.21739 "
+     id="polygon4023"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#afafaf;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1290.0191,582.5713 1270.3913,582.5713 1270.3913,592.38522 1290.5643,592.38522 1292.2,614.73913 1303.6496,614.73913 1308.0113,560.21739 1288.3835,560.21739 "
+     id="polygon4025"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#0080ff;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(90)"
+     id="text4027"
+     x="294.96399"
+     y="-1594.4331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">spl2</text>
+  <circle
+     transform="rotate(90)"
+     cx="295.23596"
+     cy="-1561.1731"
+     id="circle4029"
+     r="9.5412998"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4031"
+     x="-758.39789"
+     y="1297.8331"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">pumBoi</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4037"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4039"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4041"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4043"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4045"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4047"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4049"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4051"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4053"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4055"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4057"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect4059"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect4061"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4063"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4065"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4067"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4069"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect4071"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect4073"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4075"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4077"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-786.16803"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect4079"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4081"
+     r="15.8113"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4083"
+     r="15.7477"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4085"
+     r="15.5572"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4087"
+     r="15.2415"
+     style="fill:#001b36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4089"
+     r="14.8031"
+     style="fill:#002447;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4091"
+     r="14.2455"
+     style="fill:#002c58;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4093"
+     r="13.5732"
+     style="fill:#003468;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4095"
+     r="12.7916"
+     style="fill:#003c77;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4097"
+     r="11.907"
+     style="fill:#004386;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4099"
+     r="10.9266"
+     style="fill:#004993;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4101"
+     r="9.8581896"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4103"
+     r="8.7103996"
+     style="fill:#0055a9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4105"
+     r="7.4924798"
+     style="fill:#0059b2;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4107"
+     r="6.2142401"
+     style="fill:#005db9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4109"
+     r="4.8859601"
+     style="fill:#0060bf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4111"
+     r="3.5183499"
+     style="fill:#0062c3;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4113"
+     r="2.1224"
+     style="fill:#0063c6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-758.66803"
+     cy="1261.3062"
+     id="circle4115"
+     r="0.70937097"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="997.78261,1036.1922 984.15217,1050.913 1011.413,1050.913 "
+     id="polygon4117"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4119"
+     r="4.3617401"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4121"
+     r="4.2349901"
+     style="fill:#001933;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4123"
+     r="3.8621299"
+     style="fill:#003163;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4125"
+     r="3.2648101"
+     style="fill:#00468c;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4127"
+     r="2.4777501"
+     style="fill:#0056ac;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4129"
+     r="1.54669"
+     style="fill:#0060c0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-753.21808"
+     cy="1261.306"
+     id="circle4131"
+     r="0.52574998"
+     style="fill:#0064c7;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="970.521739,1050.913043 984.152174,1050.913043"
+     id="polyline4137"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-767.39801"
+     y="1234.2231"
+     width="18"
+     height="16"
+     id="rect4139"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-758.39801"
+     cy="1242.2231"
+     rx="8.9960899"
+     ry="8.1782598"
+     id="ellipse4141"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="13px"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4143"
+     x="-758.39801"
+     y="1242.4962"
+     style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4145"
+     x="-785.92792"
+     y="1233.7721"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#00007f">m_flow</text>
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     x="1424.603"
+     y="876.98798"
+     id="text4147"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">boi</text>
+  <rect
+     transform="scale(-1)"
+     x="-1443.8732"
+     y="-856.95795"
+     width="38"
+     height="33"
+     id="rect4149"
+     style="fill:#5f5f5f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1)"
+     x="-1452.5032"
+     y="-841.31805"
+     width="55"
+     height="2"
+     id="rect4151"
+     style="fill:#0000ff;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-1424.7432"
+     y="839.31805"
+     width="27"
+     height="2"
+     id="rect4153"
+     style="fill:#ff0000;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1157.5313,1146.8713 1161.3478,1141.9643 1164.6191,1146.8713 "
+     id="polygon4155"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffff00;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,1110.886957 1183.156522,1110.886957 1183.156522,1144.690435 1162.983478,1144.690435"
+     id="polyline4157"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="1134.086957,1110.886957 1139.539130,1110.886957 1139.539130,1131.605217"
+     id="polyline4159"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1397.613"
+     y="808.01801"
+     id="text4161"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">T</text>
+  <text
+     font-size="14px"
+     dominant-baseline="central"
+     x="1451.5831"
+     y="807.46796"
+     id="text4163"
+     style="font-size:14px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">y</text>
+  <polyline
+     points="984.697391,696.521739 968.340870,696.521739"
+     id="polyline4165"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="rotate(-90)"
+     x="-413.00702"
+     y="1234.2231"
+     width="18"
+     height="16"
+     id="rect4167"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <ellipse
+     transform="rotate(-90)"
+     cx="-404.00696"
+     cy="1242.2231"
+     rx="8.9960899"
+     ry="8.1782598"
+     id="ellipse4169"
+     style="fill:#878787;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="13px"
+     font-weight="bold"
+     dominant-baseline="central"
+     transform="rotate(-90)"
+     id="text4171"
+     x="-404.00702"
+     y="1241.9502"
+     style="font-weight:bold;font-size:13px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">M</text>
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1272.3062"
+     width="55"
+     height="22"
+     id="rect4173"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1272.3062"
+     width="55"
+     height="22"
+     id="rect4175"
+     style="fill:#0d0d0d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1272.3062"
+     width="55"
+     height="22"
+     id="rect4177"
+     style="fill:#1b1b1b;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.8062"
+     width="55"
+     height="21"
+     id="rect4179"
+     style="fill:#282828;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.8062"
+     width="55"
+     height="21"
+     id="rect4181"
+     style="fill:#363636;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.3062"
+     width="55"
+     height="20"
+     id="rect4183"
+     style="fill:#434343;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1271.3062"
+     width="55"
+     height="20"
+     id="rect4185"
+     style="fill:#4f4f4f;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1270.8062"
+     width="55"
+     height="19"
+     id="rect4187"
+     style="fill:#5c5c5c;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1270.3062"
+     width="55"
+     height="18"
+     id="rect4189"
+     style="fill:#676767;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1270.3062"
+     width="55"
+     height="18"
+     id="rect4191"
+     style="fill:#737373;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1269.8062"
+     width="55"
+     height="17"
+     id="rect4193"
+     style="fill:#7d7d7d;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1269.3062"
+     width="55"
+     height="16"
+     id="rect4195"
+     style="fill:#878787;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1268.8062"
+     width="55"
+     height="15"
+     id="rect4197"
+     style="fill:#919191;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.8062"
+     width="55"
+     height="13"
+     id="rect4199"
+     style="fill:#999999;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4201"
+     style="fill:#a1a1a1;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4203"
+     style="fill:#a8a8a8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.3062"
+     width="55"
+     height="10"
+     id="rect4205"
+     style="fill:#aeaeae;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4207"
+     style="fill:#b3b3b3;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4209"
+     style="fill:#b8b8b8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4211"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4213"
+     style="fill:#bebebe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4215"
+     style="fill:#bfbfbf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect4217"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4219"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4221"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4223"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4225"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1267.3062"
+     width="55"
+     height="12"
+     id="rect4227"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4229"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4231"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.8062"
+     width="55"
+     height="11"
+     id="rect4233"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.3062"
+     width="55"
+     height="10"
+     id="rect4235"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1266.3062"
+     width="55"
+     height="10"
+     id="rect4237"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4239"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.8062"
+     width="55"
+     height="9"
+     id="rect4241"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1265.3062"
+     width="55"
+     height="8"
+     id="rect4243"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4245"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.8062"
+     width="55"
+     height="7"
+     id="rect4247"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1264.3062"
+     width="55"
+     height="6"
+     id="rect4249"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.8062"
+     width="55"
+     height="5"
+     id="rect4251"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4253"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1263.3062"
+     width="55"
+     height="4"
+     id="rect4255"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1262.8062"
+     width="55"
+     height="3"
+     id="rect4257"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1262.3062"
+     width="55"
+     height="2"
+     id="rect4259"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-431.77994"
+     y="-1261.8062"
+     width="55"
+     height="1"
+     id="rect4261"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-420.77997"
+     y="-1272.3062"
+     width="33"
+     height="22"
+     id="rect4263"
+     style="fill:#ffffff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1014.1391,717.24 997.78261,696.52174 981.42609,717.24 "
+     id="polygon4265"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="1014.1391,675.80348 997.78261,696.52174 981.42609,675.80348 "
+     id="polygon4267"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-415.27997"
+     y="-1288.5731"
+     width="22"
+     height="12"
+     id="rect4269"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-414.77997"
+     y="-1288.5731"
+     width="21"
+     height="12"
+     id="rect4271"
+     style="fill:#2a2a2a;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-414.27997"
+     y="-1288.5731"
+     width="20"
+     height="12"
+     id="rect4273"
+     style="fill:#535353;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-413.27997"
+     y="-1288.5731"
+     width="18"
+     height="12"
+     id="rect4275"
+     style="fill:#777777;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-411.77997"
+     y="-1288.5731"
+     width="15"
+     height="12"
+     id="rect4277"
+     style="fill:#969696;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-409.77997"
+     y="-1288.5731"
+     width="11"
+     height="12"
+     id="rect4279"
+     style="fill:#acacac;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-407.77997"
+     y="-1288.5731"
+     width="7"
+     height="12"
+     id="rect4281"
+     style="fill:#bbbbbb;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-405.27997"
+     y="-1288.5731"
+     width="2"
+     height="12"
+     id="rect4283"
+     style="fill:#c0c0c0;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-410.27997"
+     y="-1288.5731"
+     width="12"
+     height="12"
+     id="rect4285"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-410.27997"
+     y="-1288.5731"
+     width="12"
+     height="12"
+     id="rect4287"
+     style="fill:#001c38;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-409.77997"
+     y="-1288.5731"
+     width="11"
+     height="12"
+     id="rect4289"
+     style="fill:#00376e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-409.27997"
+     y="-1288.5731"
+     width="10"
+     height="12"
+     id="rect4291"
+     style="fill:#004f9e;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-408.27997"
+     y="-1288.5731"
+     width="8"
+     height="12"
+     id="rect4293"
+     style="fill:#0063c7;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-407.27997"
+     y="-1288.5731"
+     width="6"
+     height="12"
+     id="rect4295"
+     style="fill:#0072e5;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-406.27997"
+     y="-1288.5731"
+     width="4"
+     height="12"
+     id="rect4297"
+     style="fill:#007bf8;stroke:none;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-404.77997"
+     y="-1288.5731"
+     width="1"
+     height="12"
+     id="rect4299"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <polygon
+     points="1018.5009,712.87826 997.78261,696.52174 1018.5009,680.16522 "
+     id="polygon4301"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="986.878261,704.700000 986.878261,688.343478"
+     id="polyline4303"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <polyline
+     points="986.878261,696.521739 997.782609,696.521739"
+     id="polyline4305"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#000000;stroke-opacity:1" />
+  <text
+     font-size="11px"
+     dominant-baseline="central"
+     x="1621.1531"
+     y="805.01801"
+     id="text4307"
+     style="font-size:11px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#0000ff">preSou</text>
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4309"
+     r="27.2609"
+     style="fill:#000000;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4311"
+     r="27.1945"
+     style="fill:#000912;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4313"
+     r="26.9956"
+     style="fill:#001224;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4315"
+     r="26.665199"
+     style="fill:#001a36;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4317"
+     r="26.2048"
+     style="fill:#002347;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4319"
+     r="25.6168"
+     style="fill:#002c59;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4321"
+     r="24.903999"
+     style="fill:#003469;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4323"
+     r="24.069901"
+     style="fill:#003c7a;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4325"
+     r="23.1185"
+     style="fill:#004489;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4327"
+     r="22.054501"
+     style="fill:#004c98;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4329"
+     r="20.882999"
+     style="fill:#0053a6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4331"
+     r="19.6098"
+     style="fill:#0059b4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4333"
+     r="18.2411"
+     style="fill:#005fc0;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4335"
+     r="16.783501"
+     style="fill:#0065cc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4337"
+     r="15.2441"
+     style="fill:#006ad6;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4339"
+     r="13.6304"
+     style="fill:#006fdf;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4341"
+     r="11.9504"
+     style="fill:#0073e7;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4343"
+     r="10.2121"
+     style="fill:#0076ee;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4345"
+     r="8.4240704"
+     style="fill:#0079f4;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4347"
+     r="6.5949998"
+     style="fill:#007cf9;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4349"
+     r="4.7337999"
+     style="fill:#007dfc;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4351"
+     r="2.84954"
+     style="fill:#007efe;stroke:none;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1621.1532"
+     cy="-840.45807"
+     id="circle4353"
+     r="0.95139098"
+     style="fill:#007fff;stroke:none;stroke-opacity:1" />
+  <polyline
+     points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+     id="polyline4355"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,369.391304 997.782609,314.869565 1134.086957,314.869565"
+     id="polyline4357"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,451.173913 997.782609,423.913043"
+     id="polyline4359"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,451.173913 997.782609,423.913043"
+     id="polyline4361"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+     id="polyline4363"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1134.086957,1132.695652 997.782609,1132.695652 997.782609,1078.173913"
+     id="polyline4365"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,778.304348 997.782609,723.782609"
+     id="polyline4367"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,778.304348 997.782609,723.782609"
+     id="polyline4369"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,669.260870 997.782609,614.739130"
+     id="polyline4371"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,669.260870 997.782609,614.739130"
+     id="polyline4373"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,1132.695652 1330.365217,1132.695652"
+     id="polyline4375"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,1132.695652 1330.365217,1132.695652"
+     id="polyline4377"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1297.652174,614.739130 1297.652174,669.260870"
+     id="polyline4379"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1025.043478,587.478261 1270.391304,587.478261"
+     id="polyline4389"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1025.043478,587.478261 1270.391304,587.478261"
+     id="polyline4391"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,560.217391 997.782609,505.695652"
+     id="polyline4393"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,560.217391 997.782609,505.695652"
+     id="polyline4395"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+     id="polyline4397"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1188.608696,314.869565 1297.652174,314.869565 1297.652174,560.217391"
+     id="polyline4399"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="997.782609,1023.652174 997.782609,832.826087"
+     id="polyline4401"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="997.782609,1023.652174 997.782609,832.826087"
+     id="polyline4403"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+     id="polyline4405"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="1297.652174,832.826087 1297.652174,1132.695652 1188.608696,1132.695652"
+     id="polyline4407"
+     transform="matrix(1,0,0,1.7272727,263.52311,-1116.0206)"
+     style="fill:none;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4409"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="921.452174,1050.913043 965.069565,1050.913043"
+     id="polyline4411"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="921.452174,1050.913043 965.069565,1050.913043"
+     id="polyline4413"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+     id="polyline4415"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1" />
+  <polyline
+     points="921.452174,969.130435 1226.773913,969.130435 1226.773913,1110.886957 1194.060870,1110.886957"
+     id="polyline4417"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     cx="1561.1731"
+     cy="840.45795"
+     id="circle4419"
+     r="3"
+     style="fill:#007fff;stroke:#007fff" />
+  <circle
+     cx="1397.613"
+     cy="22.627993"
+     id="circle4421"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="22.627993"
+     id="circle4423"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-22.627993"
+     id="circle4425"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-22.627993"
+     id="circle4427"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-22.627993"
+     id="circle4429"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1416.9231"
+     y="-5.5000019"
+     width="5"
+     height="5"
+     id="rect4431"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <rect
+     transform="scale(1,-1)"
+     x="1427.8231"
+     y="-5.5000019"
+     width="5"
+     height="5"
+     id="rect4433"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-131.67101"
+     cy="1261.3062"
+     id="circle4435"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-131.67101"
+     cy="1261.3062"
+     id="circle4437"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="77.149025"
+     cy="-1261.3062"
+     id="circle4439"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="77.149025"
+     cy="-1261.3062"
+     id="circle4441"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="77.149025"
+     cy="-1261.3062"
+     id="circle4443"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="970.52174,399.37826 970.52174,393.92609 965.06957,396.65217 "
+     id="polygon4445"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-213.45399"
+     cy="1261.3062"
+     id="circle4447"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-213.45399"
+     cy="1261.3062"
+     id="circle4449"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="158.93202"
+     cy="-1261.3062"
+     id="circle4451"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="158.93202"
+     cy="-1261.3062"
+     id="circle4453"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="158.93202"
+     cy="-1261.3062"
+     id="circle4455"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-188.69301"
+     y="-1282.3431"
+     width="5"
+     height="5"
+     id="rect4457"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4459"
+     transform="translate(263.52311,-292.242)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="970.52174,478.43478 959.61739,483.88696 959.61739,472.98261 "
+     id="polygon4461"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-322.49695"
+     cy="1261.3062"
+     id="circle4463"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-322.49695"
+     cy="1261.3062"
+     id="circle4465"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-267.97498"
+     cy="1261.3062"
+     id="circle4467"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-267.97498"
+     cy="1261.3062"
+     id="circle4469"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-267.97498"
+     cy="1261.3062"
+     id="circle4471"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-295.23602"
+     cy="1288.5632"
+     id="circle4473"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-295.23602"
+     cy="1288.5632"
+     id="circle4475"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-540.58398"
+     cy="1261.3062"
+     id="circle4477"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-540.58398"
+     cy="1261.3062"
+     id="circle4479"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-486.06192"
+     cy="1261.3062"
+     id="circle4481"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-486.06192"
+     cy="1261.3062"
+     id="circle4483"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-486.06192"
+     cy="1261.3062"
+     id="circle4485"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-513.32294"
+     cy="1288.5631"
+     id="circle4487"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-513.32294"
+     cy="1288.5631"
+     id="circle4489"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.97498"
+     cy="-1561.1732"
+     id="circle4491"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="267.97498"
+     cy="-1561.1732"
+     id="circle4493"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="322.49695"
+     cy="-1561.1732"
+     id="circle4495"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="322.49695"
+     cy="-1561.1732"
+     id="circle4497"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="322.49695"
+     cy="-1561.1732"
+     id="circle4499"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="295.23596"
+     cy="-1533.9132"
+     id="circle4501"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="295.23596"
+     cy="-1533.9132"
+     id="circle4503"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-785.92804"
+     cy="1261.3062"
+     id="circle4509"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-785.92804"
+     cy="1261.3062"
+     id="circle4511"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="731.40802"
+     cy="-1261.306"
+     id="circle4513"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="731.40802"
+     cy="-1261.306"
+     id="circle4515"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(90)"
+     cx="731.40802"
+     cy="-1261.306"
+     id="circle4517"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,-1,0,0,0)"
+     x="-761.16803"
+     y="-1282.3431"
+     width="5"
+     height="5"
+     id="rect4523"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <polygon
+     points="959.61739,1056.3652 959.61739,1045.4609 970.52174,1050.913 "
+     id="polygon4525"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-840.45807"
+     id="circle4529"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1452.1333"
+     cy="-840.45807"
+     id="circle4531"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="840.45795"
+     id="circle4533"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="840.45795"
+     id="circle4535"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     cx="1397.613"
+     cy="840.45795"
+     id="circle4537"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polygon
+     points="1199.513,1116.3391 1199.513,1105.4348 1188.6087,1110.887 "
+     id="polygon4539"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <polygon
+     points="1134.087,1113.613 1134.087,1108.1609 1128.6348,1110.887 "
+     id="polygon4541"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(-1)"
+     x="-1427.3732"
+     y="-823.32794"
+     width="5"
+     height="5"
+     id="rect4543"
+     style="fill:#bf0000;stroke:#bf0000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-431.54092"
+     cy="1261.3062"
+     id="circle4545"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-431.54092"
+     cy="1261.3062"
+     id="circle4547"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-377.01898"
+     cy="1261.3062"
+     id="circle4549"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-377.01898"
+     cy="1261.3062"
+     id="circle4551"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-377.01898"
+     cy="1261.3062"
+     id="circle4553"
+     r="2.1808701"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-404.27991"
+     cy="1288.5631"
+     id="circle4555"
+     r="2.72609"
+     style="fill:#007fff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="rotate(-90)"
+     cx="-404.27991"
+     cy="1288.5631"
+     id="circle4557"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <polygon
+     points="959.61739,701.97391 959.61739,691.06957 970.52174,696.52174 "
+     id="polygon4559"
+     transform="translate(263.52311,-292.242)"
+     style="fill:#00007f;stroke:#00007f;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-1596.3931"
+     y="829.45795"
+     width="5"
+     height="22"
+     id="rect4561"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4563"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4565"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4567"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4569"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4571"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4573"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-1596.3931"
+     y="829.45795"
+     width="5"
+     height="22"
+     id="rect4575"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4577"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4579"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4581"
+     r="2.72609"
+     style="fill:#007fff;stroke:#000000;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-840.45807"
+     id="circle4583"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-847.53802"
+     id="circle4585"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <circle
+     transform="scale(-1)"
+     cx="-1593.8932"
+     cy="-833.36798"
+     id="circle4587"
+     r="1.63565"
+     style="fill:#ffffff;stroke:#007fff;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4589"
+     transform="matrix(1,0,0,-1,263.52311,882.7145)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
+  <polyline
+     points="921.452174,478.434783 965.069565,478.434783"
+     id="polyline4591"
+     transform="translate(263.52311,-374.02461)"
+     style="fill:none;stroke:#00007f;stroke-opacity:1" />
   <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lstart)"
-     d="m 453.39095,252.5122 c -17.37643,20.07568 -88.96732,22.22664 -88.96732,22.22664 l 0,0"
-     id="path3067"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
+     style="fill:none;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1288.5666,404.27974 c 78.4585,0.26724 156.9146,0.53446 202.3497,-13.09602 45.4351,-13.63049 57.8468,-41.15802 70.259,-68.68659"
+     id="path4974"
+     inkscape:path-effect="#path-effect4976"
+     inkscape:original-d="m 1288.5666,404.27974 c 78.4585,0.26823 156.9146,0.53546 235.3728,0.8017 12.4132,-27.52768 24.8249,-55.05521 37.2359,-82.58431"
+     sodipodi:nodetypes="ccc"
+     inkscape:connector-curvature="0" />
   <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
-     d="m 475.33769,252.20565 c -1.35945,44.02304 3.559,99.11 -0.30014,159.94163 -3.61005,56.90521 -6.79115,106.068 -48.48652,112.09851"
-     id="path3075"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csc"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lstart)"
-     d="m 456.75316,256.74215 c 0,0 -1.25508,43.57711 -16.14557,54.33035 -23.92667,17.27877 -72.65508,13.94968 -72.65508,13.94968"
-     id="path5761"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csc"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <flowRoot
+     style="fill:none;stroke:#0080ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1288.5666,513.32322 c 79.0553,0.3065 158.108,0.61299 203.5431,-31.1916 45.4351,-31.80459 57.2502,-95.71851 69.0656,-159.63449"
+     id="path5801"
+     inkscape:path-effect="#path-effect5803"
+     inkscape:original-d="m 1288.5666,513.32322 c 79.0553,0.3075 158.108,0.61399 237.1628,0.91949 11.8166,-63.91546 23.6316,-127.82939 35.4459,-191.74558"
+     sodipodi:nodetypes="ccc"
+     inkscape:connector-curvature="0" />
+  <text
      xml:space="preserve"
-     id="flowRoot3017"
-     style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-     transform="translate(-9.4430037,67.450228)"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300"><flowRegion
-       id="flowRegion3019"><rect
-         id="rect3021"
-         width="24.88625"
-         height="27.219336"
-         x="370.18307"
-         y="274.29593"
-         style="font-size:22px"
-         ry="0" /></flowRegion><flowPara
-       id="flowPara3023">A</flowPara></flowRoot>  <flowRoot
-     transform="translate(-9.4429987,11.450226)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+     x="212.67993"
+     y="939.21838"
+     id="text6534"
+     inkscape:transform-center-x="14.477778"
+     inkscape:transform-center-y="45.588803"><tspan
+       sodipodi:role="line"
+       id="tspan6532"
+       x="212.67993"
+       y="939.21838">(a)</tspan></text>
+  <text
      xml:space="preserve"
-     id="flowRoot3017-4"
-     style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300"><flowRegion
-       id="flowRegion3019-1"><rect
-         id="rect3021-8"
-         width="24.88625"
-         height="27.219336"
-         x="370.18307"
-         y="274.29593"
-         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-         ry="0" /></flowRegion><flowPara
-       id="flowPara3052">C</flowPara></flowRoot>  <flowRoot
-     transform="translate(108.21272,-32.711733)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+     x="815.57019"
+     y="939.21838"
+     id="text6538"
+     inkscape:transform-center-x="14.477778"
+     inkscape:transform-center-y="45.588803"><tspan
+       sodipodi:role="line"
+       id="tspan6536"
+       x="815.57019"
+       y="939.21838">(b)</tspan></text>
+  <text
      xml:space="preserve"
-     id="flowRoot3017-4-0"
-     style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300"><flowRegion
-       id="flowRegion3019-1-7"><rect
-         id="rect3021-8-4"
-         width="24.88625"
-         height="27.219336"
-         x="370.18307"
-         y="274.29593"
-         style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-         ry="0" /></flowRegion><flowPara
-       id="flowPara3081">B</flowPara></flowRoot>  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 475.34244,170.10268 c 0,29.23359 0,29.92963 0,29.92963"
-     id="path7875-7-4"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 217.6338,358.74793 c 0,29.23359 0,29.92963 0,29.92963"
-     id="path7875-7-4-5-7"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 150.58968,216.78853 c -29.23358,0 -29.92962,0 -29.92962,0"
-     id="path7875-7-4-5-87"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 148.58968,272.78853 c -29.23358,0 -29.92962,0 -29.92962,0"
-     id="path7875-7-4-5-87-4"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 118.66006,324.78853 c 29.23358,0 29.92962,0 29.92962,0"
-     id="path7875-7-4-5-87-5"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 420.58968,218.78853 c -29.23359,0 -29.92963,0 -29.92963,0"
-     id="path7875-7-4-5-87-8"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 217.6338,294.74793 c 0,29.23359 0,29.92963 0,29.92963"
-     id="path7875-7-4-5-7-5"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 217.6338,234.74793 c 0,29.23359 0,29.92963 0,29.92963"
-     id="path7875-7-4-5-7-7"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend-6)"
-     d="m 217.6338,164.74793 c 0,29.23359 0,29.92963 0,29.92963"
-     id="path7875-7-4-5-7-2"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300"
-     inkscape:export-filename="/Users/mwetter/Desktop/path7875-7-4-5-7-2.png" />
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+     x="1397.2368"
+     y="939.21838"
+     id="text6542"
+     inkscape:transform-center-x="14.477778"
+     inkscape:transform-center-y="45.588803"><tspan
+       sodipodi:role="line"
+       id="tspan6540"
+       x="1397.2368"
+       y="939.21838">(c)</tspan></text>
 </svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterCorrect.png b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterCorrect.png
deleted file mode 100644
index 8c2bcb6bd52..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterCorrect.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterWrong.png b/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterWrong.png
deleted file mode 100644
index 42d3aa9bb97..00000000000
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/fluidJunctionMixingSplitterWrong.png and /dev/null differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/models/ExpansionVessel.mo b/Buildings/Resources/Documentation/userGuide/source/img/models/ExpansionVessel.mo
deleted file mode 100644
index a446dc797ca..00000000000
--- a/Buildings/Resources/Documentation/userGuide/source/img/models/ExpansionVessel.mo
+++ /dev/null
@@ -1,20 +0,0 @@
-within models;
-model ExpansionVessel
-  extends PartialFluidLoop(vol(nPorts=3));
-  Buildings.Fluid.Storage.ExpansionVessel exp
-    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
-equation
-  connect(vol.ports[2], fan.port_a) annotation (Line(
-      points={{30,20},{30,20},{30,10},{-60,10},{-60,-40},{-20,-40}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(res.port_b, vol.ports[3]) annotation (Line(
-      points={{40,-40},{60,-40},{60,10},{32,10},{32,20},{30,20}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(exp.port_a, vol.ports[1]) annotation (Line(
-      points={{0,30},{0,14},{28,14},{28,20},{30,20}},
-      color={0,127,255},
-      smooth=Smooth.None));
-
-end ExpansionVessel;
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/models/FixedPressure.mo b/Buildings/Resources/Documentation/userGuide/source/img/models/FixedPressure.mo
deleted file mode 100644
index 7afd8d6f12f..00000000000
--- a/Buildings/Resources/Documentation/userGuide/source/img/models/FixedPressure.mo
+++ /dev/null
@@ -1,20 +0,0 @@
-within models;
-model FixedPressure
-  extends PartialFluidLoop(vol(nPorts=3));
-  Buildings.Fluid.Sources.Boundary_pT bou(nPorts=1)
-    annotation (Placement(transformation(extent={{-32,30},{-12,50}})));
-equation
-  connect(vol.ports[1], bou.ports[1]) annotation (Line(
-      points={{30,20},{30,20},{28,20},{28,20},{28,20},{28,14},{-4,14},{-4,40},{-12,
-          40}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(vol.ports[2], fan.port_a) annotation (Line(
-      points={{30,20},{30,20},{30,10},{-60,10},{-60,-40},{-20,-40}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(res.port_b, vol.ports[3]) annotation (Line(
-      points={{40,-40},{60,-40},{60,10},{32,10},{32,20},{30,20}},
-      color={0,127,255},
-      smooth=Smooth.None));
-end FixedPressure;
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/models/NoPressureReference.mo b/Buildings/Resources/Documentation/userGuide/source/img/models/NoPressureReference.mo
deleted file mode 100644
index 124e4410689..00000000000
--- a/Buildings/Resources/Documentation/userGuide/source/img/models/NoPressureReference.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within models;
-model NoPressureReference
-  extends PartialFluidLoop(vol(nPorts=2));
-equation
-  connect(vol.ports[1], fan.port_a) annotation (Line(
-      points={{30,20},{30,10},{-60,10},{-60,-40},{-20,-40}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(vol.ports[2], res.port_b) annotation (Line(
-      points={{30,20},{32,20},{32,10},{60,10},{60,-40},{40,-40}},
-      color={0,127,255},
-      smooth=Smooth.None));
-end NoPressureReference;
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/models/PartialFluidLoop.mo b/Buildings/Resources/Documentation/userGuide/source/img/models/PartialFluidLoop.mo
deleted file mode 100644
index f3c9ef76734..00000000000
--- a/Buildings/Resources/Documentation/userGuide/source/img/models/PartialFluidLoop.mo
+++ /dev/null
@@ -1,23 +0,0 @@
-within models;
-model PartialFluidLoop
-  Buildings.Fluid.Movers.FlowControlled_m_flow fan
-    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
-  Modelica.Blocks.Sources.Constant const
-    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
-  Buildings.Fluid.FixedResistances.PressureDrop res
-    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
-  Buildings.Fluid.MixingVolumes.MixingVolume vol
-    annotation (Placement(transformation(extent={{20,20},{40,40}})));
-equation
-  connect(const.y, fan.m_flow_in) annotation (Line(
-      points={{-19,-10},{-10,-10},{-10,-28},{-10.2,-28}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(fan.port_b, res.port_a) annotation (Line(
-      points={{4.44089e-16,-40},{20,-40}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-80,-60},
-            {80,60}}),         graphics), Icon(coordinateSystem(extent={{-80,
-            -60},{80,60}})));
-end PartialFluidLoop;
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/models/package.mo b/Buildings/Resources/Documentation/userGuide/source/img/models/package.mo
deleted file mode 100644
index 3f0e2831aa6..00000000000
--- a/Buildings/Resources/Documentation/userGuide/source/img/models/package.mo
+++ /dev/null
@@ -1,4 +0,0 @@
-within ;
-package models
-annotation (uses(Buildings(version="1.6"), Modelica(version="3.2.1")));
-end models;
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/models/package.order b/Buildings/Resources/Documentation/userGuide/source/img/models/package.order
deleted file mode 100644
index 14537e59cf0..00000000000
--- a/Buildings/Resources/Documentation/userGuide/source/img/models/package.order
+++ /dev/null
@@ -1,4 +0,0 @@
-ExpansionVessel
-FixedPressure
-NoPressureReference
-PartialFluidLoop
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.pdf b/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.pdf
new file mode 100644
index 00000000000..734ebae0418
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.png b/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.png
index 0a7f4747bfd..d1ec957cd9c 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.png and b/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.svg b/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.svg
new file mode 100644
index 00000000000..d77a4ee0987
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/resistanceValveSeries.svg
@@ -0,0 +1,2016 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1076.5896 364.54218"
+   version="1.1"
+   id="svg446"
+   sodipodi:docname="resistanceValveSeries.svg"
+   width="1076.5896"
+   height="364.54218"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata452">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs450" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2085"
+     inkscape:window-height="1376"
+     id="namedview448"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.6929368"
+     inkscape:cx="578.58965"
+     inkscape:cy="522.98915"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg446"
+     inkscape:document-rotation="0" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="5.6396484"
+     y="161.68916"
+     width="125"
+     height="125"
+     id="rect2" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="143.26414"
+     id="text4">P</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="77.250000,331.370000 77.250000,423.500000"
+     id="polyline6"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="82.23,331.37 77.25,317.675 72.27,331.37 "
+     id="polygon8"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="71.025000,417.275000 178.095000,417.275000"
+     id="polyline10"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="169.38,422.255 183.075,417.275 169.38,412.295 "
+     id="polygon12"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="77.250000,417.275000 102.150000,417.275000 146.347500,350.045000"
+     id="polyline14"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="305.11414"
+     id="text16">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="146.347500,350.045000 180.585000,350.045000"
+     id="polyline18"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="516.96167"
+     y="351.40414"
+     id="text20">res1</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect22" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect24" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect26" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect28" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-297.98914"
+     width="125"
+     height="48"
+     id="rect30" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-297.48914"
+     width="125"
+     height="47"
+     id="rect32" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-296.48914"
+     width="125"
+     height="45"
+     id="rect34" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-295.98914"
+     width="125"
+     height="44"
+     id="rect36" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-294.98914"
+     width="125"
+     height="42"
+     id="rect38" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-293.98914"
+     width="125"
+     height="40"
+     id="rect40" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-292.98914"
+     width="125"
+     height="38"
+     id="rect42" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-291.98914"
+     width="125"
+     height="36"
+     id="rect44" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-290.48914"
+     width="125"
+     height="33"
+     id="rect46" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-289.48914"
+     width="125"
+     height="31"
+     id="rect48" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-287.98914"
+     width="125"
+     height="28"
+     id="rect50" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-286.48914"
+     width="125"
+     height="25"
+     id="rect52" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-284.98914"
+     width="125"
+     height="22"
+     id="rect54" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-283.48914"
+     width="125"
+     height="19"
+     id="rect56" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-281.48914"
+     width="125"
+     height="15"
+     id="rect58" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-279.98914"
+     width="125"
+     height="12"
+     id="rect60" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-278.48914"
+     width="125"
+     height="9"
+     id="rect62" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-276.48914"
+     width="125"
+     height="5"
+     id="rect64" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-274.98914"
+     width="125"
+     height="2"
+     id="rect66" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect68" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect70" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-288.61215"
+     width="125"
+     height="28"
+     id="rect72" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect74" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect76" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-287.11215"
+     width="125"
+     height="25"
+     id="rect78" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-286.61215"
+     width="125"
+     height="24"
+     id="rect80" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-286.11215"
+     width="125"
+     height="23"
+     id="rect82" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-285.11215"
+     width="125"
+     height="21"
+     id="rect84" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-284.11215"
+     width="125"
+     height="19"
+     id="rect86" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-283.11115"
+     width="125"
+     height="17"
+     id="rect88" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-281.61215"
+     width="125"
+     height="14"
+     id="rect90" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-280.61215"
+     width="125"
+     height="12"
+     id="rect92" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-279.11215"
+     width="125"
+     height="9"
+     id="rect94" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-278.11115"
+     width="125"
+     height="7"
+     id="rect96" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-276.61215"
+     width="125"
+     height="4"
+     id="rect98" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-275.11215"
+     width="125"
+     height="1"
+     id="rect100" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect102" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect104" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="198.86464"
+     y="203.02415"
+     id="text106">p</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="267.33966"
+     y="193.06416"
+     id="text108">sou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse110"
+     r="62.25" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse112"
+     r="62.0984" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse114"
+     r="61.644199" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse116"
+     r="60.889702" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse118"
+     r="59.838501" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse120"
+     r="58.495899" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse122"
+     r="56.868198" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse124"
+     r="54.963501" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse126"
+     r="52.791" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse128"
+     r="50.361301" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse130"
+     r="47.686298" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse132"
+     r="44.7789" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse134"
+     r="41.6534" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse136"
+     r="38.324902" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse138"
+     r="34.809799" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse140"
+     r="31.125" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse142"
+     r="27.288601" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse144"
+     r="23.3193" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse146"
+     r="19.2363" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse148"
+     r="15.0596" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse150"
+     r="10.8096" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse152"
+     r="6.5068998" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse154"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="268.58466"
+     y="272.12112"
+     id="text156" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="237.88414"
+     id="text158">V=10 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text160">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse162"
+     r="62.25" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse164"
+     r="62.0984" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse166"
+     r="61.644199" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse168"
+     r="60.889702" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse170"
+     r="59.838501" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse172"
+     r="58.495899" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse174"
+     r="56.868198" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse176"
+     r="54.963501" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse178"
+     r="52.791" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse180"
+     r="50.361301" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse182"
+     r="47.686298" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse184"
+     r="44.7789" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse186"
+     r="41.6534" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse188"
+     r="38.324902" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse190"
+     r="34.809799" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse192"
+     r="31.125" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse194"
+     r="27.288601" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse196"
+     r="23.3193" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse198"
+     r="19.2363" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse200"
+     r="15.0596" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse202"
+     r="10.8096" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse204"
+     r="6.5068998" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse206"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1015.5797"
+     y="209.87114"
+     id="text208" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text210">vol</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="351.40414"
+     id="text212">val</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect214" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect216" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect218" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect220" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.98914"
+     width="125"
+     height="48"
+     id="rect222" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.48914"
+     width="125"
+     height="47"
+     id="rect224" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-296.48914"
+     width="125"
+     height="45"
+     id="rect226" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-295.98914"
+     width="125"
+     height="44"
+     id="rect228" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-294.98914"
+     width="125"
+     height="42"
+     id="rect230" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-293.98914"
+     width="125"
+     height="40"
+     id="rect232" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-292.98914"
+     width="125"
+     height="38"
+     id="rect234" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-291.98914"
+     width="125"
+     height="36"
+     id="rect236" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-290.48914"
+     width="125"
+     height="33"
+     id="rect238" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.48914"
+     width="125"
+     height="31"
+     id="rect240" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.98914"
+     width="125"
+     height="28"
+     id="rect242" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.48914"
+     width="125"
+     height="25"
+     id="rect244" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.98914"
+     width="125"
+     height="22"
+     id="rect246" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.48914"
+     width="125"
+     height="19"
+     id="rect248" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.48914"
+     width="125"
+     height="15"
+     id="rect250" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.98914"
+     width="125"
+     height="12"
+     id="rect252" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.48914"
+     width="125"
+     height="9"
+     id="rect254" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.48914"
+     width="125"
+     height="5"
+     id="rect256" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-274.98914"
+     width="125"
+     height="2"
+     id="rect258" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect260" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect262" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.61215"
+     width="125"
+     height="28"
+     id="rect264" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect266" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect268" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.11215"
+     width="125"
+     height="25"
+     id="rect270" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.61215"
+     width="125"
+     height="24"
+     id="rect272" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.11215"
+     width="125"
+     height="23"
+     id="rect274" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-285.11215"
+     width="125"
+     height="21"
+     id="rect276" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.11215"
+     width="125"
+     height="19"
+     id="rect278" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.11115"
+     width="125"
+     height="17"
+     id="rect280" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.61215"
+     width="125"
+     height="14"
+     id="rect282" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-280.61215"
+     width="125"
+     height="12"
+     id="rect284" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.11215"
+     width="125"
+     height="9"
+     id="rect286" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.11115"
+     width="125"
+     height="7"
+     id="rect288" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.61215"
+     width="125"
+     height="4"
+     id="rect290" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-275.11215"
+     width="125"
+     height="1"
+     id="rect292" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect294" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect296" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,393.620000 824.250000,356.270000"
+     id="polyline298"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,379.925000 849.150000,379.925000"
+     id="polyline300"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="745.46167"
+     y="211.91414"
+     width="41"
+     height="37"
+     id="rect302" />
+  <ellipse
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="765.96167"
+     cy="230.41414"
+     rx="20.5425"
+     ry="18.674999"
+     id="ellipse304" />
+  <text
+     fill="#000000"
+     font-size="29px"
+     font-family="helvetica"
+     font-weight="bold"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="229.79216"
+     id="text306">M</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="703.08966"
+     y="211.11617"
+     id="text308" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="727.83966"
+     y="-298.98914"
+     width="75"
+     height="50"
+     id="rect310" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="776.94,460.85 824.25,423.5 776.94,386.15 "
+     id="polygon312"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="871.56,460.85 824.25,423.5 871.56,386.15 "
+     id="polygon314"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="805.575000,398.600000 842.925000,398.600000"
+     id="polyline316"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,398.600000 824.250000,423.500000"
+     id="polyline318"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="578.33966"
+     y="24.739151"
+     width="125"
+     height="125"
+     id="rect320" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="6.3141475"
+     id="text322">y</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="649.950000,194.420000 649.950000,286.550000"
+     id="polyline324"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="654.93,194.42 649.95,180.725 644.97,194.42 "
+     id="polygon326"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="643.725000,280.325000 750.795000,280.325000"
+     id="polyline328"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="742.08,285.305 755.775,280.325 742.08,275.345 "
+     id="polygon330"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="649.950000,280.325000 674.850000,280.325000 719.047500,213.095000"
+     id="polyline332"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="168.16414"
+     id="text334">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="719.047500,213.095000 753.285000,213.095000"
+     id="polyline336"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline338"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline340"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline342"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline344"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline346"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline348"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline350"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline352"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline354"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline356"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="189.3,379.925 189.3,367.475 201.75,373.7 "
+     id="polygon358"
+     transform="translate(-58.910355,-149.51085)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="273.98914"
+     id="ellipse360"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="273.98914"
+     id="ellipse362"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-273.98914"
+     id="ellipse364"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-273.98914"
+     id="ellipse366"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-273.98914"
+     id="ellipse368"
+     r="4.98" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect370" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse372"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse374"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse376"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse378"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse380"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse382"
+     r="3.7349999" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect384" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse386"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse388"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse390"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse392"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse394"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse396"
+     r="3.7349999" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="239.1,386.15 239.1,361.25 264,373.7 "
+     id="polygon398"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect400" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse402" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse404" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse406" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse408" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse410" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse412" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect414" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse416" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse418" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse420" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse422" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse424" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse426" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="946.08966"
+     y="-217.73915"
+     width="12"
+     height="12"
+     id="rect428" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse430"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse432"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse434"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse436"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse438"
+     r="4.98" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="811.8,336.35 836.7,336.35 824.25,361.25 "
+     id="polygon440"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="849.15,386.15 849.15,373.7 861.6,379.925 "
+     id="polygon442"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="762,242.975 762,230.525 774.45,236.75 "
+     id="polygon444"
+     transform="translate(-58.910355,-149.51085)" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.pdf b/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.pdf
new file mode 100644
index 00000000000..519ef47cf8b
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.png b/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.png
index 5f92fbc1bc8..922b9521b40 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.png and b/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.svg b/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.svg
new file mode 100644
index 00000000000..1e0c2c136c2
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/resistancesSeries.svg
@@ -0,0 +1,1822 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1076.5896 238.7244"
+   version="1.1"
+   id="svg396"
+   sodipodi:docname="resistancesSeries.svg"
+   width="1076.5896"
+   height="238.7244"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata402">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs400" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1486"
+     inkscape:window-height="1163"
+     id="namedview398"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.6929368"
+     inkscape:cx="235.2687"
+     inkscape:cy="401.00875"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg396"
+     inkscape:document-rotation="0" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="5.6396484"
+     y="35.871399"
+     width="125"
+     height="125"
+     id="rect2" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="17.446381"
+     id="text4">P</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="77.250000,331.370000 77.250000,423.500000"
+     id="polyline6"
+     transform="translate(-58.910355,-275.32861)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="82.23,331.37 77.25,317.675 72.27,331.37 "
+     id="polygon8"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="71.025000,417.275000 178.095000,417.275000"
+     id="polyline10"
+     transform="translate(-58.910355,-275.32861)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="169.38,422.255 183.075,417.275 169.38,412.295 "
+     id="polygon12"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="77.250000,417.275000 102.150000,417.275000 146.347500,350.045000"
+     id="polyline14"
+     transform="translate(-58.910355,-275.32861)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="179.29639"
+     id="text16">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="146.347500,350.045000 180.585000,350.045000"
+     id="polyline18"
+     transform="translate(-58.910355,-275.32861)" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="516.96167"
+     y="225.5864"
+     id="text20">res1</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect22" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect24" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect26" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect28" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-172.17139"
+     width="125"
+     height="48"
+     id="rect30" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-171.67139"
+     width="125"
+     height="47"
+     id="rect32" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-170.67139"
+     width="125"
+     height="45"
+     id="rect34" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-170.17139"
+     width="125"
+     height="44"
+     id="rect36" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-169.17139"
+     width="125"
+     height="42"
+     id="rect38" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-168.17139"
+     width="125"
+     height="40"
+     id="rect40" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-167.17139"
+     width="125"
+     height="38"
+     id="rect42" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-166.17139"
+     width="125"
+     height="36"
+     id="rect44" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-164.67139"
+     width="125"
+     height="33"
+     id="rect46" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-163.67139"
+     width="125"
+     height="31"
+     id="rect48" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.17139"
+     width="125"
+     height="28"
+     id="rect50" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-160.67139"
+     width="125"
+     height="25"
+     id="rect52" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-159.17139"
+     width="125"
+     height="22"
+     id="rect54" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-157.67139"
+     width="125"
+     height="19"
+     id="rect56" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-155.67139"
+     width="125"
+     height="15"
+     id="rect58" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-154.17139"
+     width="125"
+     height="12"
+     id="rect60" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-152.67139"
+     width="125"
+     height="9"
+     id="rect62" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-150.67139"
+     width="125"
+     height="5"
+     id="rect64" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-149.17139"
+     width="125"
+     height="2"
+     id="rect66" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect68" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect70" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.79439"
+     width="125"
+     height="28"
+     id="rect72" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect74" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect76" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-161.29439"
+     width="125"
+     height="25"
+     id="rect78" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-160.79439"
+     width="125"
+     height="24"
+     id="rect80" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-160.29439"
+     width="125"
+     height="23"
+     id="rect82" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-159.29439"
+     width="125"
+     height="21"
+     id="rect84" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-158.29439"
+     width="125"
+     height="19"
+     id="rect86" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-157.29338"
+     width="125"
+     height="17"
+     id="rect88" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-155.79439"
+     width="125"
+     height="14"
+     id="rect90" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-154.79439"
+     width="125"
+     height="12"
+     id="rect92" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-153.29439"
+     width="125"
+     height="9"
+     id="rect94" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-152.29338"
+     width="125"
+     height="7"
+     id="rect96" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-150.79439"
+     width="125"
+     height="4"
+     id="rect98" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="453.83966"
+     y="-149.29439"
+     width="125"
+     height="1"
+     id="rect100" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect102" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="454.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect104" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="198.86464"
+     y="77.20639"
+     id="text106">p</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="267.33966"
+     y="67.246399"
+     id="text108">sou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse110"
+     r="62.25" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse112"
+     r="62.0984" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse114"
+     r="61.644199" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse116"
+     r="60.889702" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse118"
+     r="59.838501" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse120"
+     r="58.495899" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse122"
+     r="56.868198" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse124"
+     r="54.963501" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse126"
+     r="52.791" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse128"
+     r="50.361301" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse130"
+     r="47.686298" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse132"
+     r="44.7789" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse134"
+     r="41.6534" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse136"
+     r="38.324902" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse138"
+     r="34.809799" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse140"
+     r="31.125" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse142"
+     r="27.288601" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse144"
+     r="23.3193" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse146"
+     r="19.2363" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse148"
+     r="15.0596" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse150"
+     r="10.8096" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse152"
+     r="6.5068998" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="148.17139"
+     id="ellipse154"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="268.58466"
+     y="146.30338"
+     id="text156" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="112.06638"
+     id="text158">V=10 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="11.221375"
+     id="text160">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse162"
+     r="62.25" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse164"
+     r="62.0984" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse166"
+     r="61.644199" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse168"
+     r="60.889702" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse170"
+     r="59.838501" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse172"
+     r="58.495899" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse174"
+     r="56.868198" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse176"
+     r="54.963501" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse178"
+     r="52.791" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse180"
+     r="50.361301" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse182"
+     r="47.686298" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse184"
+     r="44.7789" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse186"
+     r="41.6534" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse188"
+     r="38.324902" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse190"
+     r="34.809799" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse192"
+     r="31.125" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse194"
+     r="27.288601" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse196"
+     r="23.3193" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse198"
+     r="19.2363" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse200"
+     r="15.0596" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse202"
+     r="10.8096" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse204"
+     r="6.5068998" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="87.166382"
+     id="ellipse206"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1015.5797"
+     y="84.053375"
+     id="text208" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="11.221375"
+     id="text210">vol</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="225.5864"
+     id="text212">res2</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect214" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-173.17139"
+     width="125"
+     height="50"
+     id="rect216" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect218" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-172.67139"
+     width="125"
+     height="49"
+     id="rect220" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-172.17139"
+     width="125"
+     height="48"
+     id="rect222" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-171.67139"
+     width="125"
+     height="47"
+     id="rect224" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-170.67139"
+     width="125"
+     height="45"
+     id="rect226" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-170.17139"
+     width="125"
+     height="44"
+     id="rect228" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-169.17139"
+     width="125"
+     height="42"
+     id="rect230" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-168.17139"
+     width="125"
+     height="40"
+     id="rect232" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-167.17139"
+     width="125"
+     height="38"
+     id="rect234" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-166.17139"
+     width="125"
+     height="36"
+     id="rect236" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-164.67139"
+     width="125"
+     height="33"
+     id="rect238" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-163.67139"
+     width="125"
+     height="31"
+     id="rect240" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.17139"
+     width="125"
+     height="28"
+     id="rect242" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-160.67139"
+     width="125"
+     height="25"
+     id="rect244" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-159.17139"
+     width="125"
+     height="22"
+     id="rect246" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-157.67139"
+     width="125"
+     height="19"
+     id="rect248" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-155.67139"
+     width="125"
+     height="15"
+     id="rect250" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-154.17139"
+     width="125"
+     height="12"
+     id="rect252" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-152.67139"
+     width="125"
+     height="9"
+     id="rect254" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-150.67139"
+     width="125"
+     height="5"
+     id="rect256" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-149.17139"
+     width="125"
+     height="2"
+     id="rect258" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect260" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-163.29439"
+     width="125"
+     height="29"
+     id="rect262" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.79439"
+     width="125"
+     height="28"
+     id="rect264" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect266" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-162.29439"
+     width="125"
+     height="27"
+     id="rect268" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-161.29439"
+     width="125"
+     height="25"
+     id="rect270" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-160.79439"
+     width="125"
+     height="24"
+     id="rect272" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-160.29439"
+     width="125"
+     height="23"
+     id="rect274" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-159.29439"
+     width="125"
+     height="21"
+     id="rect276" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-158.29439"
+     width="125"
+     height="19"
+     id="rect278" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-157.29338"
+     width="125"
+     height="17"
+     id="rect280" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-155.79439"
+     width="125"
+     height="14"
+     id="rect282" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-154.79439"
+     width="125"
+     height="12"
+     id="rect284" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-153.29439"
+     width="125"
+     height="9"
+     id="rect286" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-152.29338"
+     width="125"
+     height="7"
+     id="rect288" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-150.79439"
+     width="125"
+     height="4"
+     id="rect290" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-149.29439"
+     width="125"
+     height="1"
+     id="rect292" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect294" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="141.94638"
+     width="0"
+     height="0"
+     id="rect296" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline298"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline300"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline302"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="388.500000,423.500000 513.000000,423.500000"
+     id="polyline304"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline306"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="637.500000,423.500000 762.000000,423.500000"
+     id="polyline308"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline310"
+     transform="translate(-58.910355,-275.32861)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline312"
+     transform="translate(-58.910355,-275.32861)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="189.3,379.925 189.3,367.475 201.75,373.7 "
+     id="polygon314"
+     transform="translate(-58.910355,-275.32861)" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="148.17139"
+     id="ellipse316"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="454.08966"
+     cy="148.17139"
+     id="ellipse318"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-148.17139"
+     id="ellipse320"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-148.17139"
+     id="ellipse322"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-578.58966"
+     cy="-148.17139"
+     id="ellipse324"
+     r="4.98" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="123.17139"
+     width="12"
+     height="50"
+     id="rect326" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse328"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse330"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse332"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse334"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse336"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse338"
+     r="3.7349999" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="123.17139"
+     width="12"
+     height="50"
+     id="rect340" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse342"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse344"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse346"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="148.17139"
+     id="ellipse348"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="164.35638"
+     id="ellipse350"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="131.98639"
+     id="ellipse352"
+     r="3.7349999" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="239.1,386.15 239.1,361.25 264,373.7 "
+     id="polygon354"
+     transform="translate(-58.910355,-275.32861)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-154.17139"
+     width="50"
+     height="12"
+     id="rect356" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse358" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse360" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse362" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse364" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse366" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.22537"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse368" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-154.17139"
+     width="50"
+     height="12"
+     id="rect370" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse372" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse374" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.17139"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse376" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse378" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="148.25739"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse380" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="148.22537"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse382" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="946.08966"
+     y="-91.921387"
+     width="12"
+     height="12"
+     id="rect384" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="148.17139"
+     id="ellipse386"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="148.17139"
+     id="ellipse388"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-148.17139"
+     id="ellipse390"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-148.17139"
+     id="ellipse392"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-148.17139"
+     id="ellipse394"
+     r="4.98" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.pdf b/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.pdf
new file mode 100644
index 00000000000..0d3b5b66bd9
Binary files /dev/null and b/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.pdf differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.png b/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.png
index 409ac853a6e..1f08a9b6364 100644
Binary files a/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.png and b/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.png differ
diff --git a/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.svg b/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.svg
new file mode 100644
index 00000000000..1d2c49d486a
--- /dev/null
+++ b/Buildings/Resources/Documentation/userGuide/source/img/valveNoResistance.svg
@@ -0,0 +1,1531 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1076.5896 364.54218"
+   version="1.1"
+   id="svg346"
+   sodipodi:docname="valveNoResistance.svg"
+   width="1076.5896"
+   height="364.54218"
+   inkscape:version="1.0 (b51213c273, 2020-08-10)">
+  <metadata
+     id="metadata352">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs350" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2525"
+     inkscape:window-height="1347"
+     id="namedview348"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.6929368"
+     inkscape:cx="232.95928"
+     inkscape:cy="522.98915"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg346"
+     inkscape:document-rotation="0" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="5.6396484"
+     y="161.68916"
+     width="125"
+     height="125"
+     id="rect2" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="143.26414"
+     id="text4">P</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="77.250000,331.370000 77.250000,423.500000"
+     id="polyline6"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="82.23,331.37 77.25,317.675 72.27,331.37 "
+     id="polygon8"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="71.025000,417.275000 178.095000,417.275000"
+     id="polyline10"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="169.38,422.255 183.075,417.275 169.38,412.295 "
+     id="polygon12"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="77.250000,417.275000 102.150000,417.275000 146.347500,350.045000"
+     id="polyline14"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="68.139648"
+     y="305.11414"
+     id="text16">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="146.347500,350.045000 180.585000,350.045000"
+     id="polyline18"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="198.86464"
+     y="203.02415"
+     id="text20">p</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="267.33966"
+     y="193.06416"
+     id="text22">sou</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse24"
+     r="62.25" />
+  <circle
+     fill="#000912"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse26"
+     r="62.0984" />
+  <circle
+     fill="#001224"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse28"
+     r="61.644199" />
+  <circle
+     fill="#001a36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse30"
+     r="60.889702" />
+  <circle
+     fill="#002347"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse32"
+     r="59.838501" />
+  <circle
+     fill="#002c59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse34"
+     r="58.495899" />
+  <circle
+     fill="#003469"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse36"
+     r="56.868198" />
+  <circle
+     fill="#003c7a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse38"
+     r="54.963501" />
+  <circle
+     fill="#004489"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse40"
+     r="52.791" />
+  <circle
+     fill="#004c98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse42"
+     r="50.361301" />
+  <circle
+     fill="#0053a6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse44"
+     r="47.686298" />
+  <circle
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse46"
+     r="44.7789" />
+  <circle
+     fill="#005fc0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse48"
+     r="41.6534" />
+  <circle
+     fill="#0065cc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse50"
+     r="38.324902" />
+  <circle
+     fill="#006ad6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse52"
+     r="34.809799" />
+  <circle
+     fill="#006fdf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse54"
+     r="31.125" />
+  <circle
+     fill="#0073e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse56"
+     r="27.288601" />
+  <circle
+     fill="#0076ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse58"
+     r="23.3193" />
+  <circle
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse60"
+     r="19.2363" />
+  <circle
+     fill="#007cf9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse62"
+     r="15.0596" />
+  <circle
+     fill="#007dfc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse64"
+     r="10.8096" />
+  <circle
+     fill="#007efe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse66"
+     r="6.5068998" />
+  <circle
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="267.33966"
+     cy="273.98914"
+     id="ellipse68"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="268.58466"
+     y="272.12112"
+     id="text70" />
+  <text
+     fill="#ffffff"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="237.88414"
+     id="text72">V=10 m³</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text74">vol</text>
+  <circle
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse76"
+     r="62.25" />
+  <circle
+     fill="#0c0f12"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse78"
+     r="62.0984" />
+  <circle
+     fill="#181e24"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse80"
+     r="61.644199" />
+  <circle
+     fill="#242d36"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse82"
+     r="60.889702" />
+  <circle
+     fill="#2f3c47"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse84"
+     r="59.838501" />
+  <circle
+     fill="#3b4a59"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse86"
+     r="58.495899" />
+  <circle
+     fill="#465869"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse88"
+     r="56.868198" />
+  <circle
+     fill="#51667a"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse90"
+     r="54.963501" />
+  <circle
+     fill="#5b7389"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse92"
+     r="52.791" />
+  <circle
+     fill="#657f98"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse94"
+     r="50.361301" />
+  <circle
+     fill="#6f8ba6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse96"
+     r="47.686298" />
+  <circle
+     fill="#7896b4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse98"
+     r="44.7789" />
+  <circle
+     fill="#80a0c0"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse100"
+     r="41.6534" />
+  <circle
+     fill="#88aacc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse102"
+     r="38.324902" />
+  <circle
+     fill="#8fb3d6"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse104"
+     r="34.809799" />
+  <circle
+     fill="#95badf"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse106"
+     r="31.125" />
+  <circle
+     fill="#9ac1e7"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse108"
+     r="27.288601" />
+  <circle
+     fill="#9fc7ee"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse110"
+     r="23.3193" />
+  <circle
+     fill="#a3ccf4"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse112"
+     r="19.2363" />
+  <circle
+     fill="#a6d0f9"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse114"
+     r="15.0596" />
+  <circle
+     fill="#a8d2fc"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse116"
+     r="10.8096" />
+  <circle
+     fill="#a9d4fe"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse118"
+     r="6.5068998" />
+  <circle
+     fill="#aad5ff"
+     stroke="none"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="212.98415"
+     id="ellipse120"
+     r="2.1724899" />
+  <text
+     fill="#ffffff"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1015.5797"
+     y="209.87114"
+     id="text122" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1013.0997"
+     y="137.03914"
+     id="text124">vol</text>
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="351.40414"
+     id="text126">val</text>
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect128" />
+  <rect
+     fill="#0d0d0d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.98914"
+     width="125"
+     height="50"
+     id="rect130" />
+  <rect
+     fill="#1b1b1b"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect132" />
+  <rect
+     fill="#282828"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-298.48914"
+     width="125"
+     height="49"
+     id="rect134" />
+  <rect
+     fill="#363636"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.98914"
+     width="125"
+     height="48"
+     id="rect136" />
+  <rect
+     fill="#434343"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-297.48914"
+     width="125"
+     height="47"
+     id="rect138" />
+  <rect
+     fill="#4f4f4f"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-296.48914"
+     width="125"
+     height="45"
+     id="rect140" />
+  <rect
+     fill="#5c5c5c"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-295.98914"
+     width="125"
+     height="44"
+     id="rect142" />
+  <rect
+     fill="#676767"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-294.98914"
+     width="125"
+     height="42"
+     id="rect144" />
+  <rect
+     fill="#737373"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-293.98914"
+     width="125"
+     height="40"
+     id="rect146" />
+  <rect
+     fill="#7d7d7d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-292.98914"
+     width="125"
+     height="38"
+     id="rect148" />
+  <rect
+     fill="#878787"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-291.98914"
+     width="125"
+     height="36"
+     id="rect150" />
+  <rect
+     fill="#919191"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-290.48914"
+     width="125"
+     height="33"
+     id="rect152" />
+  <rect
+     fill="#999999"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.48914"
+     width="125"
+     height="31"
+     id="rect154" />
+  <rect
+     fill="#a1a1a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.98914"
+     width="125"
+     height="28"
+     id="rect156" />
+  <rect
+     fill="#a8a8a8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.48914"
+     width="125"
+     height="25"
+     id="rect158" />
+  <rect
+     fill="#aeaeae"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.98914"
+     width="125"
+     height="22"
+     id="rect160" />
+  <rect
+     fill="#b3b3b3"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.48914"
+     width="125"
+     height="19"
+     id="rect162" />
+  <rect
+     fill="#b8b8b8"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.48914"
+     width="125"
+     height="15"
+     id="rect164" />
+  <rect
+     fill="#bbbbbb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.98914"
+     width="125"
+     height="12"
+     id="rect166" />
+  <rect
+     fill="#bebebe"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.48914"
+     width="125"
+     height="9"
+     id="rect168" />
+  <rect
+     fill="#bfbfbf"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.48914"
+     width="125"
+     height="5"
+     id="rect170" />
+  <rect
+     fill="#c0c0c0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-274.98914"
+     width="125"
+     height="2"
+     id="rect172" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect174" />
+  <rect
+     fill="#000c18"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-289.11215"
+     width="125"
+     height="29"
+     id="rect176" />
+  <rect
+     fill="#001831"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.61215"
+     width="125"
+     height="28"
+     id="rect178" />
+  <rect
+     fill="#00244a"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect180" />
+  <rect
+     fill="#003061"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-288.11215"
+     width="125"
+     height="27"
+     id="rect182" />
+  <rect
+     fill="#003b78"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-287.11215"
+     width="125"
+     height="25"
+     id="rect184" />
+  <rect
+     fill="#00468d"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.61215"
+     width="125"
+     height="24"
+     id="rect186" />
+  <rect
+     fill="#0050a1"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-286.11215"
+     width="125"
+     height="23"
+     id="rect188" />
+  <rect
+     fill="#0059b4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-285.11215"
+     width="125"
+     height="21"
+     id="rect190" />
+  <rect
+     fill="#0062c5"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-284.11215"
+     width="125"
+     height="19"
+     id="rect192" />
+  <rect
+     fill="#0069d4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-283.11115"
+     width="125"
+     height="17"
+     id="rect194" />
+  <rect
+     fill="#0070e0"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-281.61215"
+     width="125"
+     height="14"
+     id="rect196" />
+  <rect
+     fill="#0075eb"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-280.61215"
+     width="125"
+     height="12"
+     id="rect198" />
+  <rect
+     fill="#0079f4"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-279.11215"
+     width="125"
+     height="9"
+     id="rect200" />
+  <rect
+     fill="#007cfa"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-278.11115"
+     width="125"
+     height="7"
+     id="rect202" />
+  <rect
+     fill="#007efd"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-276.61215"
+     width="125"
+     height="4"
+     id="rect204" />
+  <rect
+     fill="#007fff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="702.83966"
+     y="-275.11215"
+     width="125"
+     height="1"
+     id="rect206" />
+  <rect
+     fill="#ff0000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect208" />
+  <rect
+     fill="#000000"
+     stroke="none"
+     stroke-opacity="1"
+     x="703.08966"
+     y="267.76413"
+     width="0"
+     height="0"
+     id="rect210" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,393.620000 824.250000,356.270000"
+     id="polyline212"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,379.925000 849.150000,379.925000"
+     id="polyline214"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="745.46167"
+     y="211.91414"
+     width="41"
+     height="37"
+     id="rect216" />
+  <ellipse
+     fill="#878787"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="765.96167"
+     cy="230.41414"
+     rx="20.5425"
+     ry="18.674999"
+     id="ellipse218" />
+  <text
+     fill="#000000"
+     font-size="29px"
+     font-family="helvetica"
+     font-weight="bold"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="765.96167"
+     y="229.79216"
+     id="text220">M</text>
+  <text
+     fill="#000000"
+     font-size="31px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="703.08966"
+     y="211.11617"
+     id="text222" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="727.83966"
+     y="-298.98914"
+     width="75"
+     height="50"
+     id="rect224" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="776.94,460.85 824.25,423.5 776.94,386.15 "
+     id="polygon226"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="871.56,460.85 824.25,423.5 871.56,386.15 "
+     id="polygon228"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="805.575000,398.600000 842.925000,398.600000"
+     id="polyline230"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="824.250000,398.600000 824.250000,423.500000"
+     id="polyline232"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     x="578.33966"
+     y="24.739151"
+     width="125"
+     height="125"
+     id="rect234" />
+  <text
+     fill="#0000ff"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="6.3141475"
+     id="text236">y</text>
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="649.950000,194.420000 649.950000,286.550000"
+     id="polyline238"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="654.93,194.42 649.95,180.725 644.97,194.42 "
+     id="polygon240"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="643.725000,280.325000 750.795000,280.325000"
+     id="polyline242"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#c0c0c0"
+     stroke="#c0c0c0"
+     stroke-opacity="1"
+     points="742.08,285.305 755.775,280.325 742.08,275.345 "
+     id="polygon244"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="649.950000,280.325000 674.850000,280.325000 719.047500,213.095000"
+     id="polyline246"
+     transform="translate(-58.910355,-149.51085)" />
+  <text
+     fill="#000000"
+     font-size="25px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="640.83966"
+     y="168.16414"
+     id="text248">duration=1 s</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="719.047500,213.095000 753.285000,213.095000"
+     id="polyline250"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline252"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="195.525000,373.700000 251.550000,373.700000"
+     id="polyline254"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline256"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="886.500000,423.500000 1073.250000,423.500000"
+     id="polyline258"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline260"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="768.225000,236.750000 824.250000,236.750000 824.250000,348.800000"
+     id="polyline262"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="388.500000,423.500000 762.000000,423.500000"
+     id="polyline264"
+     transform="translate(-58.910355,-149.51085)" />
+  <polyline
+     fill="none"
+     stroke="#007fff"
+     stroke-opacity="1"
+     points="388.500000,423.500000 762.000000,423.500000"
+     id="polyline266"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="189.3,379.925 189.3,367.475 201.75,373.7 "
+     id="polygon268"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect270" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse272"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse274"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse276"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse278"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse280"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse282"
+     r="3.7349999" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     x="323.58966"
+     y="248.98915"
+     width="12"
+     height="50"
+     id="rect284" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse286"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse288"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse290"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="273.98914"
+     id="ellipse292"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="290.17413"
+     id="ellipse294"
+     r="3.7349999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="329.58966"
+     cy="257.80414"
+     id="ellipse296"
+     r="3.7349999" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="239.1,386.15 239.1,361.25 264,373.7 "
+     id="polygon298"
+     transform="translate(-58.910355,-149.51085)" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect300" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse302" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse304" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse306" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse308" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse310" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse312" />
+  <rect
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="989.33966"
+     y="-279.98914"
+     width="50"
+     height="12"
+     id="rect314" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse316" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse318" />
+  <ellipse
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="273.98914"
+     rx="5.9759998"
+     ry="6.2249999"
+     id="ellipse320" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="998.39972"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse322" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1014.3397"
+     cy="274.07513"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse324" />
+  <ellipse
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="1030.2795"
+     cy="274.04312"
+     rx="3.4860001"
+     ry="3.60272"
+     id="ellipse326" />
+  <rect
+     fill="#bf0000"
+     stroke="#bf0000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="946.08966"
+     y="-217.73915"
+     width="12"
+     height="12"
+     id="rect328" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse330"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="703.08966"
+     cy="273.98914"
+     id="ellipse332"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse334"
+     r="6.2249999" />
+  <circle
+     fill="#007fff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse336"
+     r="6.2249999" />
+  <circle
+     fill="#ffffff"
+     stroke="#007fff"
+     stroke-opacity="1"
+     transform="scale(-1)"
+     cx="-827.58966"
+     cy="-273.98914"
+     id="ellipse338"
+     r="4.98" />
+  <polygon
+     fill="#00007f"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="811.8,336.35 836.7,336.35 824.25,361.25 "
+     id="polygon340"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="849.15,386.15 849.15,373.7 861.6,379.925 "
+     id="polygon342"
+     transform="translate(-58.910355,-149.51085)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#00007f"
+     stroke-opacity="1"
+     points="762,242.975 762,230.525 774.45,236.75 "
+     id="polygon344"
+     transform="translate(-58.910355,-149.51085)" />
+</svg>
diff --git a/Buildings/Resources/Documentation/userGuide/source/index.rst b/Buildings/Resources/Documentation/userGuide/source/index.rst
index d8ec71ed39c..324adb5889c 100644
--- a/Buildings/Resources/Documentation/userGuide/source/index.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/index.rst
@@ -32,7 +32,7 @@ Contents
 
    gettingStarted
    bestPractice
-   workArounds
+   performance
    prePostProcessing
    development
    help
diff --git a/Buildings/Resources/Documentation/userGuide/source/legal.rst b/Buildings/Resources/Documentation/userGuide/source/legal.rst
index fc3858aae60..723047436f5 100644
--- a/Buildings/Resources/Documentation/userGuide/source/legal.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/legal.rst
@@ -1,7 +1,7 @@
 Copyright and License
 =====================
 
-Copyright (c) 2012-2019, The Regents of the University of California, Department
+Copyright (c) 2012-2020, The Regents of the University of California, Department
 of Energy contract-operators of the Lawrence Berkeley National Laboratory.
 All rights reserved.
 
diff --git a/Buildings/Resources/Documentation/userGuide/source/modelica/FlowCircuit.mo b/Buildings/Resources/Documentation/userGuide/source/modelica/FlowCircuit.mo
index 29fee6e563b..6c6feb46f69 100644
--- a/Buildings/Resources/Documentation/userGuide/source/modelica/FlowCircuit.mo
+++ b/Buildings/Resources/Documentation/userGuide/source/modelica/FlowCircuit.mo
@@ -4,42 +4,40 @@ model FlowCircuit
   //package Medium = Buildings.Media.ConstantPropertyLiquidWater;
   //package Medium = Buildings.Media.GasesConstantDensity.SimpleAir;
  package Medium = Modelica.Media.Water.WaterIF97OnePhase_ph;
-  Buildings.Fluid.Movers.SpeedControlled_y fan(
-    dynamicBalance=false,
+  Buildings.Fluid.Movers.SpeedControlled_y pump(
     redeclare package Medium = Medium,
-    m_flow_nominal=1,
-    redeclare function flowCharacteristic =
-        Buildings.Fluid.Movers.BaseClasses.Characteristics.linearFlow (
-          data(V_flow_nominal={2e6,0}, dp_nominal={0,20000})))
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    use_inputFilter=false,
+    m_flow_nominal=1)
     annotation (Placement(transformation(extent={{-20,10},{0,30}})));
   Buildings.Fluid.FixedResistances.PressureDrop res(
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     dp_nominal=1000)
     annotation (Placement(transformation(extent={{20,10},{40,30}})));
-  Buildings.Fluid.MixingVolumes.MixingVolume vol(nPorts=2,
+  Buildings.Fluid.MixingVolumes.MixingVolume vol(nPorts=3,
     redeclare package Medium = Medium,
     m_flow_nominal=0.1,
     V=1)
     annotation (Placement(transformation(extent={{0,62},{20,82}})));
-  Modelica.Blocks.Sources.Constant const(k=1)
-    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+  Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(k=1)
+    annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
+  Buildings.Fluid.Sources.Boundary_pT bou(nPorts=1)
+    annotation (Placement(transformation(extent={{80,48},{60,68}})));
 equation
-  connect(fan.port_b, res.port_a) annotation (Line(
+  connect(pump.port_b, res.port_a) annotation (Line(
       points={{5.55112e-16,20},{20,20}},
       color={0,127,255},
       smooth=Smooth.None));
-  connect(res.port_b, vol.ports[1]) annotation (Line(
-      points={{40,20},{50,20},{50,56},{12,56},{12,62},{8,62}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(vol.ports[2], fan.port_a) annotation (Line(
-      points={{12,62},{12,56},{-60,56},{-60,20},{-20,20}},
-      color={0,127,255},
-      smooth=Smooth.None));
-  connect(const.y, fan.y) annotation (Line(
-      points={{-19,40},{-10,40},{-10,30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  annotation (uses(Buildings(version="0.13"), Modelica(version="3.2")));
+  connect(con.y, pump.y)
+    annotation (Line(points={{-28,40},{-10,40},{-10,32}}, color={0,0,127}));
+  connect(pump.port_a, vol.ports[1]) annotation (Line(points={{-20,20},{-60,20},
+          {-60,56},{7.33333,56},{7.33333,62}}, color={0,127,255}));
+  connect(vol.ports[2], res.port_b) annotation (Line(points={{10,62},{10,56},{
+          50,56},{50,20},{40,20}}, color={0,127,255}));
+  connect(bou.ports[1], vol.ports[3]) annotation (Line(points={{60,58},{12.6667,
+          58},{12.6667,62}}, color={0,127,255}));
+  annotation (uses(Modelica(version="3.2.3"), Buildings(version="8.0.0")),
+    version="1",
+    conversion(noneFromVersion=""));
 end FlowCircuit;
diff --git a/Buildings/Resources/Documentation/userGuide/source/workArounds.rst b/Buildings/Resources/Documentation/userGuide/source/workArounds.rst
deleted file mode 100644
index ada178fe79d..00000000000
--- a/Buildings/Resources/Documentation/userGuide/source/workArounds.rst
+++ /dev/null
@@ -1,162 +0,0 @@
-Work-Arounds
-============
-
-This section describes work-arounds that often help if there are problems during the model translation, initialization or simulation.
-
-Avoiding step changes
----------------------
-
-All flow machines (fans and pumps) have a boolean parameter
-``filteredSpeed``, and all actuators have a boolean parameter
-``filteredOpening``.
-If set to ``true``, which is the default setting, then the control input signal is sent to
-a :term:`2nd order low pass filter` that changes a step signal to a smooth signal.
-This typically improves the robustness of the simulation.
-
-To see the effect of the filter, consider the model below
-in which ``fanS`` is configured with
-``filteredSpeed=false``, and ``fanC`` is configured with
-``filteredSpeed=true``.
-Both fans are connected to a step input signal.
-The configuration of ``fanS`` causes the fan speed to instantly change from 0 to 1. In large system models, this can lead to high computing time or to convergence problems. The ``fanC`` avoids this problem because the speed of the fan varies continuously, thereby making it easier for the solver to compute a solution. In this model, we set the parameter
-``raiseTime=30`` seconds.
-
-.. _FigureFilteredResponse:
-
-.. figure:: img/fanStepSchematics.png
-
-   Schematic diagram of fans that are configured with ``filteredSpeed=false`` (``fanS``) and ``filteredSpeed=true`` (``fanC``).
-
-.. figure:: img/fanStepResponse.png
-
-   Mass flow rate of the two fans for a step input signal at 0 seconds.
-
-
-For fans and pumps, the dynamics introduced by the filter can be thought of as approximating
-the rotational inertia of the fan rotor and the inertia of the fluid in the duct or piping network.
-The default value is ``raiseTime=30`` seconds.
-
-For actuators, the raise time approximates the travel time of the valve lift.
-The default value is ``raiseTime=120`` seconds.
-
-.. note:: When changing ``filteredSpeed`` (or ``filteredOpening``),
-          or when changing the value of ``raiseTime``, the dynamic
-          response of the closed loop control changes. Therefore,
-          control gains may need to be retuned to ensure satisfactory
-          closed loop control performance.
-
-For further information, see the
-`User's Guide of the flow machine package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers_UsersGuide.html>`_, and the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
-
-
-
-Breaking algebraic loops
-------------------------
-
-In fluid flow systems, flow junctions where mass flow rates separate and mix can couple non-linear systems of equations. This leads to larger systems of coupled equations that need to be solved, which often causes larger computing time and can sometimes cause convergence problems.
-To decouple these systems of equations, in the model of a flow splitter or mixer (model `Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop>`_), or in models for fans or pumps (such as the model `Buildings.Fluid.Movers.SpeedControlled_y <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y>`_), the parameter ``dynamicBalance`` can be set to ``true``. This adds a control volume at the fluid junction that can decouple the system of equations.
-
-Reducing nonlinear equations of serially connected flow resistances
--------------------------------------------------------------------
-
-In fluid flow systems, if multiple components are connected in series,
-then computing the pressure drop due to flow friction in the
-individual components can lead to coupled nonlinear systems of equations.
-While this is no problem for small models, the iterative solution can lead to higher computing time, particularly in large models where other equations may
-be part of the residual function.
-
-For illustration, consider the simple system shown below in which the flow resistances ``res1`` and ``res2`` compute the mass flow rate as
-:math:`\dot m = k \, \sqrt{\Delta p}` if the parameter ``from_dp`` is set to ``true``, or otherwise compute the pressure drop between their inlet and outlet as :math:`\Delta p = (\dot m / k)^2`. (Both formulations are implemented using :term:`regularization` near zero.)
-
-.. figure:: img/resistancesSeries.png
-
-   Schematic diagram of two flow resistances in series that connect a source and a volume.
-
-Depending on the configuration of the individual component models, simulating this system model may require the iterative solution of a nonlinear equation to compute the mass flow rate or the pressure drop.
-To avoid a nonlinear equation, use any of the measures below.
-
- - Set the parameter ``res2(dp_nominal=0)``, and add the pressure drop to the parameter ``dp_nominal`` of the model ``res1``. This will eliminate the equation that computes the flow friction in ``res2``, thereby avoiding a nonlinear equation. The same applies if there are multiple components in series, such as a pre-heat coil, a heating coil and a cooling coil.
- - Set ``from_dp=false`` in all components, which is the default setting. This will cause Modelica to use a function that computes the pressure drop as a function of the mass flow rate. Therefore, a code translator is likely to generate an equation that solves for the mass flow rate, and it then uses the mass flow rate to compute the pressure drop of the components that are connected in series.
-
-
-Control valves also allow lumping the pressure drop into the model of the valve. Consider the situation where a fixed flow resistance is in series with a control valve as shown below.
-
-.. figure:: img/resistanceValveSeries.png
-
-   Schematic diagram of a fixed flow resistance and a valve in series  that connect a source and a volume.
-
-Suppose the parameters are
-
-.. code-block:: modelica
-
-   Buildings.Fluid.FixedResistances.PressureDrop res(
-     redeclare package Medium = Medium,
-     m_flow_nominal=0.2,
-     dp_nominal=10000);
-
-   Buildings.Fluid.Actuators.Valves.TwoWayLinear val(
-     redeclare package Medium = Medium,
-     m_flow_nominal=0.2,
-     dpValve_nominal=5000);
-
-To avoid a nonlinear equation, the flow resistance could be deleted as shown below.
-
-.. figure:: img/valveNoResistance.png
-
-   Schematic diagram of a valve that connects a source and a volume.
-
-
-If the valve is configured as
-
-.. code-block:: modelica
-
-   Buildings.Fluid.Actuators.Valves.TwoWayLinear val(
-     redeclare package Medium = Medium,
-     m_flow_nominal=0.2,
-     dpValve_nominal=5000,
-     dpFixed_nominal=10000);
-
-then the valve will compute the composite flow coefficient
-:math:`\bar k` as
-
-.. math::
-
-    \bar k = \frac{1}{\sqrt{1/k_v(y) + 1/k_f}}
-
-where :math:`k_v(y) = \dot m(y)/\sqrt{\Delta p}` is the flow coefficient of the valve at the lift :math:`y`, and
-:math:`k_f` is equal to the ratio ``m_flow_nominal/sqrt(dpFixed_nominal)``.
-The valve model then computes the pressure drop using :math:`\bar k` and the same equations as described above for the fixed resistances.
-Thus, the composite model has the same :term:`valve authority` and mass flow rate, but a nonlinear equation can be avoided.
-
-For more details, see the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
-
-
-
-Prescribed mass flow rate
--------------------------
-For some system models, the mass flow rate can be prescribed by using an idealized pump or fan (model `Buildings.Fluid.Movers.FlowControlled_m_flow <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow>`_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T <https://simulationresearch.lbl.gov/modelica/releases/latest/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T>`_). Using these models avoids having to compute the intersection of the fan curve and the flow resistance. In some situations, this can lead to faster and more robust simulation.
-
-
-Avoiding overspecified initialization problems
-----------------------------------------------
-
-If in thermofluid flow systems, Dymola fails to translate a model with the error message::
-
-   Error: The initialization problem is overspecified for variables
-   of element type Real
-   The initial equation
-   ...
-   refers to variables, which are all knowns.
-   To correct it you can remove this equation.
-
-then the initialization problem is overspecified. To avoid this, set
-
-.. code-block:: modelica
-
-   energyDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
-   massDynamics = Modelica.Fluid.Types.Dynamics.DynamicsFreeInitial;
-
-in the instances of the components that contain fluid volumes.
-See also the section :ref:`ReferencePressureIncompressibleFluids`.
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.png b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.png
index 98b4b342551..a8471876f0d 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.png and b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.svg b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.svg
index 2f7f9227eb4..9003f7afeaa 100644
--- a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.svg
+++ b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,13 +7,13 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="188.69179mm"
+   width="187.74347mm"
    height="59.689999mm"
-   viewBox="0 0 668.59295 211.49999"
+   viewBox="0 0 665.23277 211.49999"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.1 unknown"
-   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/OBC/ASHRAE/G36_PR1/Cool-downModeDefinition.png"
+   inkscape:version="1.0 (6e3e5246a0, 2020-05-07)"
+   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Cool-downModeDefinition.png"
    inkscape:export-xdpi="108.331"
    inkscape:export-ydpi="108.331"
    sodipodi:docname="Cool-downModeDefinition.svg">
@@ -132,22 +130,6 @@
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker4985"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow2Lend"
-       inkscape:collect="always">
-      <path
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path4987"
-         inkscape:connector-curvature="0" />
-    </marker>
     <marker
        inkscape:stockid="Arrow2Lend"
        orient="auto"
@@ -218,9 +200,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.6190268"
-     inkscape:cx="268.64018"
-     inkscape:cy="73.971886"
+     inkscape:zoom="1.4221708"
+     inkscape:cx="394.25531"
+     inkscape:cy="1.8097329"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -228,16 +210,17 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1332"
-     inkscape:window-height="798"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     inkscape:window-width="1869"
+     inkscape:window-height="1715"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid4136"
-       originx="76.095273"
-       originy="-649.24993" />
+       originx="76.095279"
+       originy="-649.24979" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -247,7 +230,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -255,15 +238,15 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(76.095274,-191.61222)">
+     transform="translate(76.095274,-191.61221)">
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5305)"
-       d="m 79.818664,272.3622 30.181336,0"
+       d="M 79.818664,272.3622 H 110"
        id="path4138"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52247661;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4899)"
-       d="m -75.298541,322.3622 424.970911,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.522477;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4899)"
+       d="M -75.298541,322.3622 H 349.67237"
        id="path4140"
        inkscape:connector-curvature="0" />
     <rect
@@ -281,25 +264,25 @@
        x="110"
        y="202.3622" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.999213;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4152"
-       width="70"
+       width="79.374992"
        height="40"
        x="230"
        y="222.3622" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5159)"
-       d="m 180,217.17349 25,0 0,15.56465 25,0"
+       d="m 180,217.17349 h 25 v 15.56465 h 25"
        id="path4154"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82354945px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 179.95501,272.48735 25.08822,0 0,-20.27546"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.823549px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 179.95501,272.48735 h 25.08822 v -20.27546"
        id="path4156"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5229)"
-       d="m 205,252.3622 25,0"
+       d="m 205,252.3622 h 25"
        id="path4161"
        inkscape:connector-curvature="0" />
     <rect
@@ -310,35 +293,30 @@
        x="350.39401"
        y="292.37585" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5095)"
-       d="m 300,242.3622 20,0 0,60 30,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.520866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5095)"
+       d="M 309.37499,242.3622 H 325.625 v 60 H 350"
        id="path4167"
        inkscape:connector-curvature="0" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985"
        id="rect4169"
        width="70"
        height="40"
        x="10"
        y="252.3622" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.65008616;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5387)"
-       d="m -75.099514,262.3622 84.5224019,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.650086;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5387)"
+       d="M -75.099514,262.3622 H 9.4228879"
        id="path4171"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.64722478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5475)"
-       d="m -74.344685,282.3622 83.7799839,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.647225;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5475)"
+       d="M -74.344685,282.3622 H 9.4352989"
        id="path4173"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.64865702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4985)"
-       d="m -74.722099,362.3622 84.1511924,0"
-       id="path4175"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.55688858;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5037)"
-       d="m -75.099514,382.3622 180.006854,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.556299;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker5037)"
+       d="M -75.099514,382.3622 H 104.90734"
        id="path4177"
        inkscape:connector-curvature="0" />
     <rect
@@ -355,20 +333,20 @@
        y="263.88934"
        id="text4181"><tspan
          sodipodi:role="line"
-         id="tspan7123"
+         id="tspan4197"
          x="12.53206"
          y="263.88934"
-         style="font-size:8.14960957px;line-height:1.25">If window open </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">If window open </tspan><tspan
          sodipodi:role="line"
-         id="tspan7125"
+         id="tspan4199"
          x="12.53206"
          y="274.07635"
-         style="font-size:8.14960957px;line-height:1.25">in zone i, then  </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">in zone i, then  </tspan><tspan
          sodipodi:role="line"
-         id="tspan7127"
+         id="tspan4201"
          x="12.53206"
          y="284.26337"
-         style="font-size:8.14960957px;line-height:1.25">cooDowTim[i]=0</tspan></text>
+         style="font-size:8.14961px;line-height:1.25">cooDowTim[i]=0</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -376,20 +354,20 @@
        y="264.64417"
        id="text4181-9"><tspan
          sodipodi:role="line"
-         id="tspan7129"
+         id="tspan4301"
          x="112.73109"
          y="264.64417"
-         style="font-size:8.14960957px;line-height:1.25">Maximum cool </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">Maximum cool </tspan><tspan
          sodipodi:role="line"
-         id="tspan7131"
+         id="tspan4303"
          x="112.73109"
          y="274.83118"
-         style="font-size:8.14960957px;line-height:1.25">down time:</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">down time:</tspan><tspan
          sodipodi:role="line"
-         id="tspan7133"
+         id="tspan4305"
          x="112.73109"
          y="285.01819"
-         style="font-size:8.14960957px;line-height:1.25">max(cooDowTim)</tspan></text>
+         style="font-size:8.14961px;line-height:1.25">max(cooDowTim)</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -397,20 +375,20 @@
        y="209.81961"
        id="text4181-1"><tspan
          sodipodi:role="line"
-         id="tspan7135"
+         id="tspan4261"
          x="111.97921"
          y="209.81961"
-         style="font-size:8.14960957px;line-height:1.25">Cool down time</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">Cool down time</tspan><tspan
          sodipodi:role="line"
-         id="tspan7137"
+         id="tspan4263"
          x="111.97921"
          y="220.00662"
-         style="font-size:8.14960957px;line-height:1.25">upper limit:</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">upper limit:</tspan><tspan
          sodipodi:role="line"
-         id="tspan7139"
+         id="tspan4265"
          x="111.97921"
          y="230.19363"
-         style="font-size:8.14960957px;line-height:1.25">3 hours</tspan></text>
+         style="font-size:8.14961px;line-height:1.25">3 hours</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -418,20 +396,20 @@
        y="235.10635"
        id="text4181-1-7"><tspan
          sodipodi:role="line"
-         id="tspan7141"
+         id="tspan4295"
          x="233.12915"
          y="235.10635"
-         style="font-size:8.14960957px;line-height:1.25">Cool down time:</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">Cool down time:</tspan><tspan
          sodipodi:role="line"
-         id="tspan7143"
+         id="tspan4297"
          x="233.12915"
          y="245.29337"
-         style="font-size:8.14960957px;line-height:1.25">min(3 hours, </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">min(3 hours, </tspan><tspan
          sodipodi:role="line"
-         id="tspan7145"
+         id="tspan4299"
          x="233.12915"
          y="255.48038"
-         style="font-size:8.14960957px;line-height:1.25">max(cooDowTim))</tspan></text>
+         style="font-size:8.14961px;line-height:1.25">max(cooDowTim))</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -442,7 +420,7 @@
          id="tspan4331"
          x="-74.448547"
          y="315.20212"
-         style="font-size:9.25500298px;line-height:1.25">tNexOcc</tspan></text>
+         style="font-size:9.255px;line-height:1.25">tNexOcc</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -453,18 +431,18 @@
          id="tspan4371"
          x="-75.748917"
          y="256.96732"
-         style="font-size:9.04479504px;line-height:1.25">uWinSta</tspan></text>
+         style="font-size:9.0448px;line-height:1.25">uWin</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="-76.607651"
        y="277.85956"
        id="text4181-3-3-4"><tspan
-         sodipodi:role="line"
-         id="tspan7121"
-         x="-76.607651"
          y="277.85956"
-         style="font-size:9.28626442px;line-height:1.25">cooDowTim</tspan></text>
+         x="-76.607651"
+         sodipodi:role="line"
+         id="tspan4351-8"
+         style="font-size:9.28626px;line-height:1.25">cooDowTim</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -472,31 +450,31 @@
        y="304.17313"
        id="text4181-1-7-1"><tspan
          sodipodi:role="line"
-         id="tspan7147"
+         id="tspan4399"
          x="352.76944"
          y="304.17313"
-         style="font-size:8.14960957px;line-height:1.25">cooDowTim </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">cooDowTim </tspan><tspan
          sodipodi:role="line"
-         id="tspan7149"
+         id="tspan4401"
          x="352.76944"
          y="314.36014"
-         style="font-size:8.14960957px;line-height:1.25">          &lt; </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25">          &lt; </tspan><tspan
          sodipodi:role="line"
-         id="tspan7151"
+         id="tspan4403"
          x="352.76944"
          y="324.54715"
-         style="font-size:8.14960957px;line-height:1.25">          tNexOcc ?</tspan></text>
+         style="font-size:8.14961px;line-height:1.25">          tNexOcc ?</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.47763443px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.78980279px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="-75.273857"
-       y="356.56116"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.47763px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.789803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-75.273926"
+       y="356.56088"
        id="text4181-3-36"><tspan
          sodipodi:role="line"
-         id="tspan4737"
-         x="-75.273857"
-         y="356.56116"
-         style="stroke-width:0.78980279px">TZon</tspan></text>
+         id="tspan7359"
+         x="-75.273926"
+         y="356.56088"
+         style="stroke-width:0.789803px">TZon</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -504,72 +482,28 @@
        y="377.65668"
        id="text4181-3-36-1"><tspan
          sodipodi:role="line"
-         id="tspan7155"
+         id="tspan4443"
          x="-75.834595"
          y="377.65668"
-         style="font-size:9.25500298px;line-height:1.25">TZonCooSetOcc</tspan></text>
-    <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4445"
-       width="65"
-       height="20"
-       x="10"
-       y="352.36221" />
+         style="font-size:9.255px;line-height:1.25">TCooSetOcc</tspan></text>
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4939)"
-       d="m 75,362.3622 30,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.556299;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4939)"
+       d="M -74.999998,362.3622 H 105"
        id="path4449"
        inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="12.358242"
-       y="359.54303"
-       id="text4181-91"><tspan
-         sodipodi:role="line"
-         id="tspan7157"
-         x="12.358242"
-         y="359.54303"
-         style="font-size:8.14960957px;line-height:1.25">Highest zone</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7159"
-         x="12.358242"
-         y="369.73004"
-         style="font-size:8.14960957px;line-height:1.25">temperature</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.73109"
-       y="364.64417"
-       id="text4181-9-5"><tspan
-         sodipodi:role="line"
-         id="tspan7167"
-         x="108.73109"
-         y="364.64417"
-         style="font-size:8.14960957px;line-height:1.25">max(Tzon)</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7169"
-         x="108.73109"
-         y="374.83118"
-         style="font-size:8.14960957px;line-height:1.25">       &gt;</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7171"
-         x="108.73109"
-         y="385.01819"
-         style="font-size:8.14960957px;line-height:1.25">       TZonCooSetOcc?</tspan></text>
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 175,372.3622 310,0"
+       d="M 175,372.3622 H 485"
        id="path4509"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.53696001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="m 440,312.42911 143.83913,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.53696;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       d="M 440,312.42911 H 583.83913"
        id="path4513"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4865)"
-       d="m 485,372.3622 0,-60"
+       d="m 485,372.3622 v -60"
        id="path4515"
        inkscape:connector-curvature="0" />
     <text
@@ -579,16 +513,37 @@
        y="304.59512"
        id="text4181-1-7-1-9"><tspan
          sodipodi:role="line"
-         id="tspan7153"
+         id="tspan4541"
          x="509.96289"
          y="304.59512"
-         style="font-size:9.29969692px;line-height:1.25">Cool-down mode?</tspan></text>
+         style="font-size:9.2997px;line-height:1.25">Cooldown mode?</tspan></text>
     <rect
-       style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985"
        id="rect7100"
        width="515"
        height="210"
        x="-19.999998"
        y="192.36221" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:8.30425px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.207606px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="108.71133"
+       y="363.62582"
+       id="text7363"><tspan
+         sodipodi:role="line"
+         id="tspan7361"
+         x="108.71133"
+         y="363.62582"
+         style="stroke-width:0.207606px">TZon</tspan><tspan
+         sodipodi:role="line"
+         x="108.71133"
+         y="374.00613"
+         style="stroke-width:0.207606px"
+         id="tspan7365">       &gt;</tspan><tspan
+         sodipodi:role="line"
+         x="108.71133"
+         y="384.38644"
+         style="stroke-width:0.207606px"
+         id="tspan7367">       TCooSetOcc?</tspan></text>
   </g>
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.png b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.png
index 3604a1b2662..91ddfea0e4a 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.png and b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.svg b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.svg
index 726576137bb..e0082c8d3e1 100644
--- a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.svg
+++ b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,248 +7,315 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="156.55524mm"
-   height="35.983028mm"
-   viewBox="0 0 554.72329 127.49892"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 unknown"
-   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/OBC/ASHRAE/G36_PR1/SetbackModeDefinition.png"
-   inkscape:export-xdpi="108.331"
+   sodipodi:docname="SetbackModeDefinition.svg"
    inkscape:export-ydpi="108.331"
-   sodipodi:docname="SetbackModeDefinition.svg">
+   inkscape:export-xdpi="108.331"
+   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetbackModeDefinition.png"
+   inkscape:version="1.0 (6e3e5246a0, 2020-05-07)"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 684.40933 184.18705"
+   height="51.981678mm"
+   width="193.15552mm">
   <defs
      id="defs4">
     <marker
-       inkscape:stockid="Arrow2Lstart"
+       inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="Arrow2Lstart"
+       id="marker2977"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path4565"
+         id="path2975"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lstart"
+       inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="Arrow1Lstart"
+       id="marker2689"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path4547"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
+         id="path2687"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lend"
+       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker8486"
+       id="marker2635"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path8488"
+         id="path2633"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker8398"
+       id="Arrow2Lstart"
        refX="0"
        refY="0"
        orient="auto"
-       inkscape:stockid="Arrow2Lend"
-       inkscape:collect="always">
+       inkscape:stockid="Arrow2Lstart">
       <path
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path8400"
-         inkscape:connector-curvature="0" />
+         id="path4565" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker8316"
+       inkscape:isstock="true"
        style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         id="path4547" />
+    </marker>
+    <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
-       inkscape:collect="always">
+       style="overflow:visible"
+       id="marker8486"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
       <path
-         id="path8318"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path8488" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker8170"
+       id="marker8398"
        style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
+       inkscape:isstock="true">
       <path
-         id="path8172"
+         inkscape:connector-curvature="0"
+         id="path8400"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker8106"
+       id="marker8316"
        refX="0"
        refY="0"
        orient="auto"
-       inkscape:stockid="Arrow2Lend"
-       inkscape:collect="always">
+       inkscape:stockid="Arrow2Lend">
       <path
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path8108"
-         inkscape:connector-curvature="0" />
+         id="path8318" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker8048"
-       style="overflow:visible"
+       inkscape:collect="always"
        inkscape:isstock="true"
-       inkscape:collect="always">
+       style="overflow:visible"
+       id="marker8170"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
       <path
-         id="path8050"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path8172" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker7996"
+       id="marker8048"
        refX="0"
        refY="0"
        orient="auto"
-       inkscape:stockid="Arrow2Lend"
-       inkscape:collect="always">
+       inkscape:stockid="Arrow2Lend">
       <path
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path7998"
-         inkscape:connector-curvature="0" />
+         id="path8050" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="Arrow2Lend"
+       id="marker7996"
        style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path7998"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
-       inkscape:collect="always">
+       style="overflow:visible"
+       id="Arrow2Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
       <path
-         id="path4568"
+         inkscape:connector-curvature="0"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4568" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker5475"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path5477" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker4939"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4941" />
     </marker>
     <marker
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker5475"
+       id="marker4865"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path5477"
+         inkscape:connector-curvature="0"
+         id="path4867"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
     </marker>
     <marker
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker4939"
+       id="marker8316-7"
        style="overflow:visible"
-       inkscape:isstock="true">
+       inkscape:isstock="true"
+       inkscape:collect="always">
       <path
-         id="path4941"
+         id="path8318-6"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker4865"
-       refX="0"
-       refY="0"
+       inkscape:stockid="Arrow2Lend"
        orient="auto"
-       inkscape:stockid="Arrow2Lend">
+       refY="0"
+       refX="0"
+       id="marker8316-3"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
       <path
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path8318-2"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path4867"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
   </defs>
   <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.0996754"
-     inkscape:cx="193.18173"
-     inkscape:cy="22.961955"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
+     inkscape:snap-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:object-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="51"
+     inkscape:window-height="1841"
+     inkscape:window-width="1869"
      fit-margin-bottom="0"
-     inkscape:window-width="1332"
-     inkscape:window-height="798"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="79.526989"
+     inkscape:cx="344.03814"
+     inkscape:zoom="1.4846947"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
     <inkscape:grid
-       type="xygrid"
+       originy="-688.0272"
+       originx="34.962139"
        id="grid4136"
-       originx="21.837139"
-       originy="-688.16224" />
+       type="xygrid" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -260,206 +325,305 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
+     transform="translate(34.962141,-236.56602)"
      id="layer1"
-     transform="translate(21.837141,-236.70103)">
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.47763538px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.78980279px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="-21.537949"
+       id="text4181-3-36"
        y="250.63304"
-       id="text4181-3-36"><tspan
-         sodipodi:role="line"
-         id="tspan5533"
-         x="-21.537949"
+       x="-34.662949"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.47764px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.789803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.789803px"
          y="250.63304"
-         style="stroke-width:0.78980279px">TZon</tspan></text>
+         x="-34.662949"
+         id="tspan5533"
+         sodipodi:role="line">TZon[i]</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.29632092px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77469331px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="-21.809906"
+       id="text4181-3-36-1"
        y="296.56598"
-       id="text4181-3-36-1"><tspan
-         sodipodi:role="line"
-         id="tspan5535"
-         x="-21.809906"
+       x="-34.934906"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.29632px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.774693px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.774693px"
          y="296.56598"
-         style="stroke-width:0.77469331px">TZonHeaSetUno</tspan></text>
+         x="-34.934906"
+         id="tspan5535"
+         sodipodi:role="line">THeaSetUno[i]</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="53.412556"
+       id="text4181-91"
        y="251.22952"
-       id="text4181-91"><tspan
-         sodipodi:role="line"
-         id="tspan7750"
-         x="53.412556"
+       x="68.41256"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="251.22952"
-         style="font-size:8.14960957px;line-height:1.25">Any 5 zones (if more than 5 zones),</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7752"
-         x="53.412556"
+         x="68.41256"
+         id="tspan7750"
+         sodipodi:role="line">Any 5 zones (if more than 5 zones),</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="261.41653"
-         style="font-size:8.14960957px;line-height:1.25">or, </tspan><tspan
-         sodipodi:role="line"
-         id="tspan7754"
-         x="53.412556"
+         x="68.41256"
+         id="tspan7752"
+         sodipodi:role="line">or, </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="271.60355"
-         style="font-size:8.14960957px;line-height:1.25">all zones (if less than 5 zones),</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7756"
-         x="53.412556"
+         x="68.41256"
+         id="tspan7754"
+         sodipodi:role="line">all zones (if less than 5 zones),</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="281.79056"
-         style="font-size:8.14960957px;line-height:1.25"> </tspan></text>
+         x="68.41256"
+         id="tspan7756"
+         sodipodi:role="line"> </tspan></text>
     <text
-       xml:space="preserve"
+       id="text4181-1-7-1-9"
+       y="309.29861"
+       x="577.45831"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="461.28445"
-       y="286.55521"
-       id="text4181-1-7-1-9"><tspan
-         sodipodi:role="line"
+       xml:space="preserve"><tspan
+         style="font-size:9.2997px;line-height:1.25"
+         y="309.29861"
+         x="577.45831"
          id="tspan7976"
-         x="461.28445"
-         y="286.55521"
-         style="font-size:9.29969692px;line-height:1.25">Setback mode?</tspan></text>
+         sodipodi:role="line">Setback mode?</tspan></text>
     <rect
-       style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.03839839;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       y="237.40977"
+       x="36.752052"
+       height="182.49954"
+       width="536.86591"
        id="rect7100"
-       width="409.84259"
-       height="126.46052"
-       x="40.917046"
-       y="237.22023" />
+       style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.6875;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.6914835;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
-       id="rect7722"
-       width="150.23216"
+       y="242.7079"
+       x="65.345749"
        height="30.947531"
-       x="50.345749"
-       y="242.7079" />
+       width="150.23216"
+       id="rect7722"
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M -19.88248,257.36217 H 49.999996"
+       inkscape:connector-curvature="0"
        id="path7764"
-       inkscape:connector-curvature="0" />
+       d="M -32.59452,257.36217 H 65.529329"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7996)"
-       d="m 200,257.36217 h 30 v 30 h 25"
+       inkscape:connector-curvature="0"
        id="path7775"
-       inkscape:connector-curvature="0" />
+       d="m 215.62501,257.36217 h 33.23864 v 30 h 27.69886"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7996)" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       y="278.02072"
+       x="276.6694"
+       height="34.786175"
+       width="121.78094"
        id="rect7779"
-       width="75"
-       height="35"
-       x="255"
-       y="277.36218" />
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8048)"
-       d="M 330,294.36217 H 532.05029"
+       inkscape:connector-curvature="0"
        id="path7789"
-       inkscape:connector-curvature="0" />
+       d="M 515.62502,317.28882 H 648.50685"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8048)" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       y="378.34964"
+       x="276.68582"
+       height="34.753387"
+       width="121.47267"
        id="rect7779-8"
-       width="75"
-       height="35"
-       x="255"
-       y="323.36218" />
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8398)"
-       d="M 229.39008,332.36217 H 255"
+       inkscape:connector-curvature="0"
        id="path7810"
-       inkscape:connector-curvature="0" />
+       d="m 248.43751,387.60132 h 28.125"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8398)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart)"
-       d="M 255,347.36217 H 49.999996"
+       inkscape:connector-curvature="0"
        id="path7812"
-       inkscape:connector-curvature="0" />
+       d="M 276.64578,405.97631 H 63.026648"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 49.999996,347.36217 v -45"
+       inkscape:connector-curvature="0"
        id="path7814"
-       inkscape:connector-curvature="0" />
+       d="M 63.124996,406.35132 V 302.97655"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M -20.132547,302.36217 H 225.48195"
+       inkscape:connector-curvature="0"
        id="path7816"
-       inkscape:connector-curvature="0" />
+       d="M -32.275411,303.22632 H 241.87501"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316)"
-       d="M 235.9187,302.36217 H 255"
+       inkscape:connector-curvature="0"
        id="path7818"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 230,287.36217 v 45"
-       id="path7946"
-       inkscape:connector-curvature="0" />
+       d="m 255.00001,303.22632 h 21.5625"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316)" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
-       id="rect7948"
-       width="50"
+       y="377.22629"
+       x="465.3125"
        height="35"
-       x="365"
-       y="322.36215" />
+       width="50"
+       id="rect7948"
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <text
-       xml:space="preserve"
+       id="text4181-1-7-1-9-5"
+       y="399.37878"
+       x="478.6925"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="369.005"
-       y="342.63965"
-       id="text4181-1-7-1-9-5"><tspan
-         sodipodi:role="line"
+       xml:space="preserve"><tspan
+         style="font-size:9.2997px;line-height:1.25"
+         y="399.37878"
+         x="478.6925"
          id="tspan7968"
-         x="369.005"
-         y="342.63965"
-         style="font-size:9.29969692px;line-height:1.25">Not</tspan></text>
+         sodipodi:role="line">NOT</tspan></text>
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8170)"
-       d="m 330,340.36217 h 35"
+       inkscape:connector-curvature="0"
        id="path7972"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8106)"
-       d="m 415,339.36217 h 25 v -45"
-       id="path7974"
-       inkscape:connector-curvature="0" />
+       d="m 398.74393,395.22631 h 65.77364"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8170)" />
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212486px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.21680221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="257.50409"
-       y="287.55203"
-       id="text5545"><tspan
-         sodipodi:role="line"
+       id="text5545"
+       y="288.10367"
+       x="279.06659"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.216802px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="288.10367"
+         x="279.06659"
          id="tspan5557"
-         x="257.50409"
-         y="287.55203">TZon[i]</tspan><tspan
-         sodipodi:role="line"
+         sodipodi:role="line">TZon[i]</tspan><tspan
+         y="298.94382"
+         x="279.06659"
          id="tspan5559"
-         x="257.50409"
-         y="298.39218">           &lt;</tspan><tspan
-         sodipodi:role="line"
+         sodipodi:role="line">           &lt;</tspan><tspan
+         y="309.78397"
+         x="279.06659"
          id="tspan5561"
-         x="257.50409"
-         y="309.23233">     TZonHeaSetUno?</tspan></text>
+         sodipodi:role="line">     THeaSetUno[i]?</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212505px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.21680221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
-       x="255.62909"
-       y="333.48953"
-       id="text5545-4"
+       inkscape:export-ydpi="108.331"
        inkscape:export-xdpi="108.331"
-       inkscape:export-ydpi="108.331"><tspan
-         sodipodi:role="line"
-         id="tspan5695">All Zone Temp</tspan><tspan
-         sodipodi:role="line"
-         id="tspan5697">           &gt;</tspan><tspan
+       id="text5545-4"
+       y="388.35367"
+       x="279.06659"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.216802px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="388.35367"
+         x="279.06659"
+         id="tspan5695"
+         sodipodi:role="line">All TZon[i]</tspan><tspan
+         y="399.19382"
+         x="279.06659"
+         id="tspan5697"
+         sodipodi:role="line">           &gt;</tspan><tspan
+         y="410.03397"
+         x="279.06659"
+         id="tspan5699"
+         sodipodi:role="line">     THeaSetUno[i]+1 C?</tspan></text>
+    <rect
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985"
+       id="rect7722-3"
+       width="122.45951"
+       height="35.615383"
+       x="276.57233"
+       y="326.67365" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.216802px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="279.13245"
+       y="336.87033"
+       id="text5545-2"><tspan
+         y="336.87033"
+         x="279.13245"
+         id="tspan1156"
+         sodipodi:role="line">Average TZon[i]</tspan><tspan
+         y="347.71048"
+         x="279.13245"
+         id="tspan1158"
+         sodipodi:role="line">           &lt;</tspan><tspan
+         y="358.55063"
+         x="279.13245"
+         id="tspan1160"
+         sodipodi:role="line">     Average THeaSetUno[i]?</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 248.86224,387.75945 V 287.44695"
+       id="path7814-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316-7)"
+       d="m 248.43751,336.03882 h 28.125"
+       id="path7818-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 63.336506,353.17949 H 241.62358"
+       id="path7816-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316-3)"
+       d="m 254.74858,353.17949 h 21.5625"
+       id="path7818-5"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985"
+       id="rect7948-9"
+       width="49.999996"
+       height="35"
+       x="465.625"
+       y="300.10132" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="482.755"
+       y="320.37881"
+       id="text4181-1-7-1-9-5-9"><tspan
          sodipodi:role="line"
-         id="tspan5699">TZonHeaSetUno+1.1 C?</tspan></text>
+         id="tspan7968-1"
+         x="482.755"
+         y="320.37881"
+         style="font-size:9.2997px;line-height:1.25;stroke-width:1px">OR</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 398.87175,296.15857 H 422.0367"
+       id="path7816-0"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7816-0-7"
+       d="m 399.23451,344.59655 h 22.53596"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 421.94626,307.84805 V 296.23383"
+       id="path7814-5"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7816-0-8"
+       d="m 421.77679,307.84081 h 43.99947"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker2689)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7814-5-7"
+       d="M 421.88532,344.66745 V 328.6444"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8486)"
+       d="m 421.77908,328.82493 h 43.55309"
+       id="path7816-0-8-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 515.81459,395.54353 h 45.98497"
+       id="path7816-0-7-4"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker2977)"
+       d="M 561.60243,395.35688 V 317.45171"
+       id="path7814-5-7-8"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.png b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.png
index ed12f022a4d..795be57cea5 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.png and b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.svg b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.svg
index b35f4a965ee..64e0e4e5a5d 100644
--- a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.svg
+++ b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,248 +7,315 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="156.55296mm"
-   height="35.983028mm"
-   viewBox="0 0 554.71523 127.49892"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 unknown"
-   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/OBC/ASHRAE/G36_PR1/SetupModeDefinition.png"
-   inkscape:export-xdpi="108.331"
+   sodipodi:docname="SetupModeDefinition.svg"
    inkscape:export-ydpi="108.331"
-   sodipodi:docname="SetupModeDefinition.svg">
+   inkscape:export-xdpi="108.331"
+   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/SetupModeDefinition.png"
+   inkscape:version="1.0 (6e3e5246a0, 2020-05-07)"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 684.40933 184.18705"
+   height="51.981678mm"
+   width="193.15552mm">
   <defs
      id="defs4">
     <marker
-       inkscape:stockid="Arrow2Lstart"
+       inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="Arrow2Lstart"
+       id="marker2977"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path4565"
+         id="path2975"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lstart"
+       inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="Arrow1Lstart"
+       id="marker2689"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path4547"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
+         id="path2687"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lend"
+       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker8486"
+       id="marker2635"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path8488"
+         id="path2633"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker8398"
+       id="Arrow2Lstart"
        refX="0"
        refY="0"
        orient="auto"
-       inkscape:stockid="Arrow2Lend"
-       inkscape:collect="always">
+       inkscape:stockid="Arrow2Lstart">
       <path
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path8400"
-         inkscape:connector-curvature="0" />
+         id="path4565" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker8316"
+       inkscape:isstock="true"
        style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         id="path4547" />
+    </marker>
+    <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
-       inkscape:collect="always">
+       style="overflow:visible"
+       id="marker8486"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
       <path
-         id="path8318"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path8488" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker8170"
+       id="marker8398"
        style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
+       inkscape:isstock="true">
       <path
-         id="path8172"
+         inkscape:connector-curvature="0"
+         id="path8400"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker8106"
+       id="marker8316"
        refX="0"
        refY="0"
        orient="auto"
-       inkscape:stockid="Arrow2Lend"
-       inkscape:collect="always">
+       inkscape:stockid="Arrow2Lend">
       <path
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path8108"
-         inkscape:connector-curvature="0" />
+         id="path8318" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker8048"
-       style="overflow:visible"
+       inkscape:collect="always"
        inkscape:isstock="true"
-       inkscape:collect="always">
+       style="overflow:visible"
+       id="marker8170"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
       <path
-         id="path8050"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path8172" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker7996"
+       id="marker8048"
        refX="0"
        refY="0"
        orient="auto"
-       inkscape:stockid="Arrow2Lend"
-       inkscape:collect="always">
+       inkscape:stockid="Arrow2Lend">
       <path
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path7998"
-         inkscape:connector-curvature="0" />
+         id="path8050" />
     </marker>
     <marker
+       inkscape:collect="always"
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="Arrow2Lend"
+       id="marker7996"
        style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path7998"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       inkscape:collect="always"
        inkscape:isstock="true"
-       inkscape:collect="always">
+       style="overflow:visible"
+       id="Arrow2Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
       <path
-         id="path4568"
+         inkscape:connector-curvature="0"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4568" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker5475"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path5477" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker4939"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         inkscape:connector-curvature="0"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4941" />
     </marker>
     <marker
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker5475"
+       id="marker4865"
        style="overflow:visible"
        inkscape:isstock="true">
       <path
-         id="path5477"
+         inkscape:connector-curvature="0"
+         id="path4867"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
     </marker>
     <marker
        inkscape:stockid="Arrow2Lend"
        orient="auto"
        refY="0"
        refX="0"
-       id="marker4939"
+       id="marker8316-7"
        style="overflow:visible"
-       inkscape:isstock="true">
+       inkscape:isstock="true"
+       inkscape:collect="always">
       <path
-         id="path4941"
+         id="path8318-6"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
     <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker4865"
-       refX="0"
-       refY="0"
+       inkscape:stockid="Arrow2Lend"
        orient="auto"
-       inkscape:stockid="Arrow2Lend">
+       refY="0"
+       refX="0"
+       id="marker8316-3"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
       <path
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path8318-2"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path4867"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          inkscape:connector-curvature="0" />
     </marker>
   </defs>
   <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.0996754"
-     inkscape:cx="214.21219"
-     inkscape:cy="47.699612"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
+     inkscape:snap-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:object-nodes="true"
+     inkscape:document-rotation="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="51"
+     inkscape:window-height="1841"
+     inkscape:window-width="1869"
      fit-margin-bottom="0"
-     inkscape:window-width="1332"
-     inkscape:window-height="798"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="79.526989"
+     inkscape:cx="344.03814"
+     inkscape:zoom="1.4846947"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
     <inkscape:grid
-       type="xygrid"
+       originy="-688.0272"
+       originx="34.962139"
        id="grid4136"
-       originx="21.829075"
-       originy="-688.16225" />
+       type="xygrid" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -265,202 +330,300 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
+     transform="translate(34.962141,-236.56602)"
      id="layer1"
-     transform="translate(21.829078,-236.70103)">
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.47763538px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.78980285px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="-21.537939"
-       y="250.63307"
-       id="text4181-3-36"><tspan
-         sodipodi:role="line"
-         id="tspan6495"
-         x="-21.537939"
-         y="250.63307"
-         style="stroke-width:0.78980285px">TZon</tspan></text>
+       id="text4181-3-36"
+       y="250.63304"
+       x="-34.662949"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.47764px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.789803px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.789803px"
+         y="250.63304"
+         x="-34.662949"
+         id="tspan5533"
+         sodipodi:role="line">TZon[i]</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.30871582px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77572626px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="-21.809879"
-       y="296.56564"
-       id="text4181-3-36-1"><tspan
-         sodipodi:role="line"
-         id="tspan6497"
-         x="-21.809879"
-         y="296.56564"
-         style="stroke-width:0.77572626px">TZonCooSetUno</tspan></text>
+       id="text4181-3-36-1"
+       y="296.56598"
+       x="-34.934906"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.29632px;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.774693px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.774693px"
+         y="296.56598"
+         x="-34.934906"
+         id="tspan5535"
+         sodipodi:role="line">TCooSetUno[i]</tspan></text>
     <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="53.412556"
+       id="text4181-91"
        y="251.22952"
-       id="text4181-91"><tspan
-         sodipodi:role="line"
-         id="tspan7750"
-         x="53.412556"
+       x="68.41256"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="251.22952"
-         style="font-size:8.14960957px;line-height:1.25">Any 5 zones (if more than 5 zones),</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7752"
-         x="53.412556"
+         x="68.41256"
+         id="tspan7750"
+         sodipodi:role="line">Any 5 zones (if more than 5 zones),</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="261.41653"
-         style="font-size:8.14960957px;line-height:1.25">or, </tspan><tspan
-         sodipodi:role="line"
-         id="tspan7754"
-         x="53.412556"
+         x="68.41256"
+         id="tspan7752"
+         sodipodi:role="line">or, </tspan><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="271.60355"
-         style="font-size:8.14960957px;line-height:1.25">all zones (if less than 5 zones),</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7756"
-         x="53.412556"
+         x="68.41256"
+         id="tspan7754"
+         sodipodi:role="line">all zones (if less than 5 zones),</tspan><tspan
+         style="font-size:8.14961px;line-height:1.25"
          y="281.79056"
-         style="font-size:8.14960957px;line-height:1.25"> </tspan></text>
+         x="68.41256"
+         id="tspan7756"
+         sodipodi:role="line"> </tspan></text>
     <text
-       xml:space="preserve"
+       id="text4181-1-7-1-9"
+       y="309.29861"
+       x="577.45831"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="461.28445"
-       y="286.55521"
-       id="text4181-1-7-1-9"><tspan
-         sodipodi:role="line"
-         id="tspan8893"
-         x="461.28445"
-         y="286.55521"
-         style="font-size:9.29969692px;line-height:1.25">Setup mode?</tspan></text>
+       xml:space="preserve"><tspan
+         style="font-size:9.2997px;line-height:1.25"
+         y="309.29861"
+         x="577.45831"
+         id="tspan7976"
+         sodipodi:role="line">Setup mode?</tspan></text>
     <rect
-       style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.03839839;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       y="237.40977"
+       x="36.752052"
+       height="182.49954"
+       width="536.86591"
        id="rect7100"
-       width="409.84259"
-       height="126.46052"
-       x="40.917046"
-       y="237.22023" />
+       style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.6875;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1.6914835;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
-       id="rect7722"
-       width="150.23216"
+       y="242.7079"
+       x="65.345749"
        height="30.947531"
-       x="50.345749"
-       y="242.7079" />
+       width="150.23216"
+       id="rect7722"
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="m -19.88248,257.36217 69.882476,0"
+       inkscape:connector-curvature="0"
        id="path7764"
-       inkscape:connector-curvature="0" />
+       d="M -32.59452,257.36217 H 65.529329"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7996)"
-       d="m 200,257.36217 30,0 0,30 25,0"
+       inkscape:connector-curvature="0"
        id="path7775"
-       inkscape:connector-curvature="0" />
+       d="m 215.62501,257.36217 h 33.23864 v 30 h 27.69886"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7996)" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       y="278.02072"
+       x="276.6694"
+       height="34.786175"
+       width="121.78094"
        id="rect7779"
-       width="75"
-       height="35"
-       x="255"
-       y="277.36218" />
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8048)"
-       d="m 330,294.36217 202.05029,0"
+       inkscape:connector-curvature="0"
        id="path7789"
-       inkscape:connector-curvature="0" />
+       d="M 515.62502,317.28882 H 648.50685"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8048)" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
+       y="378.34964"
+       x="276.68582"
+       height="34.753387"
+       width="121.47267"
        id="rect7779-8"
-       width="75"
-       height="35"
-       x="255"
-       y="323.36218" />
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8398)"
-       d="m 229.39008,332.36217 25.60992,0"
+       inkscape:connector-curvature="0"
        id="path7810"
-       inkscape:connector-curvature="0" />
+       d="m 248.43751,387.60132 h 28.125"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8398)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart)"
-       d="m 255,347.36217 -205.000004,0"
+       inkscape:connector-curvature="0"
        id="path7812"
-       inkscape:connector-curvature="0" />
+       d="M 276.64578,405.97631 H 63.026648"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 49.999996,347.36217 0,-45"
+       inkscape:connector-curvature="0"
        id="path7814"
-       inkscape:connector-curvature="0" />
+       d="M 63.124996,406.35132 V 302.97655"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m -20.132547,302.36217 245.614497,0"
+       inkscape:connector-curvature="0"
        id="path7816"
-       inkscape:connector-curvature="0" />
+       d="M -32.275411,303.22632 H 241.87501"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316)"
-       d="m 235.9187,302.36217 19.0813,0"
+       inkscape:connector-curvature="0"
        id="path7818"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 230,287.36217 0,45"
-       id="path7946"
-       inkscape:connector-curvature="0" />
+       d="m 255.00001,303.22632 h 21.5625"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316)" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98500001"
-       id="rect7948"
-       width="50"
+       y="377.22629"
+       x="465.3125"
        height="35"
-       x="365"
-       y="322.36215" />
+       width="50"
+       id="rect7948"
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985" />
     <text
-       xml:space="preserve"
+       id="text4181-1-7-1-9-5"
+       y="399.37878"
+       x="478.6925"
        style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="369.005"
-       y="342.63965"
-       id="text4181-1-7-1-9-5"><tspan
-         sodipodi:role="line"
+       xml:space="preserve"><tspan
+         style="font-size:9.2997px;line-height:1.25"
+         y="399.37878"
+         x="478.6925"
          id="tspan7968"
-         x="369.005"
-         y="342.63965"
-         style="font-size:9.29969692px;line-height:1.25">Not</tspan></text>
+         sodipodi:role="line">NOT</tspan></text>
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8170)"
-       d="m 330,340.36217 35,0"
+       inkscape:connector-curvature="0"
        id="path7972"
+       d="m 398.74393,395.22631 h 65.77364"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8170)" />
+    <text
+       id="text5545"
+       y="288.10367"
+       x="279.06659"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.216802px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="288.10367"
+         x="279.06659"
+         id="tspan5557"
+         sodipodi:role="line">TZon[i]</tspan><tspan
+         y="298.94382"
+         x="279.06659"
+         id="tspan5559"
+         sodipodi:role="line">           &gt;</tspan><tspan
+         y="309.78397"
+         x="279.06659"
+         id="tspan5561"
+         sodipodi:role="line">     TCooSetUno[i]?</tspan></text>
+    <text
+       inkscape:export-ydpi="108.331"
+       inkscape:export-xdpi="108.331"
+       id="text5545-4"
+       y="388.35367"
+       x="279.06659"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.216802px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="388.35367"
+         x="279.06659"
+         id="tspan5695"
+         sodipodi:role="line">All TZon[i]</tspan><tspan
+         y="399.19382"
+         x="279.06659"
+         id="tspan5697"
+         sodipodi:role="line">           &lt;</tspan><tspan
+         y="410.03397"
+         x="279.06659"
+         id="tspan5699"
+         sodipodi:role="line">     TCooSetUno[i]+1 C?</tspan></text>
+    <rect
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.9375;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985"
+       id="rect7722-3"
+       width="122.45951"
+       height="35.615383"
+       x="276.57233"
+       y="326.67365" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.67212px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.216802px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="279.13245"
+       y="336.87033"
+       id="text5545-2"><tspan
+         y="336.87033"
+         x="279.13245"
+         id="tspan1156"
+         sodipodi:role="line">Average TZon[i]</tspan><tspan
+         y="347.71048"
+         x="279.13245"
+         id="tspan1158"
+         sodipodi:role="line">           &gt;</tspan><tspan
+         y="358.55063"
+         x="279.13245"
+         id="tspan1160"
+         sodipodi:role="line">     Average TCooSetUno[i]?</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 248.86224,387.75945 V 287.44695"
+       id="path7814-2"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8106)"
-       d="m 415,339.36217 25,0 0,-45"
-       id="path7974"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316-7)"
+       d="m 248.43751,336.03882 h 28.125"
+       id="path7818-1"
        inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 63.336506,353.17949 H 241.62358"
+       id="path7816-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8316-3)"
+       d="m 254.74858,353.17949 h 21.5625"
+       id="path7818-5"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:0.5;fill:none;fill-opacity:0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.985"
+       id="rect7948-9"
+       width="49.999996"
+       height="35"
+       x="465.625"
+       y="300.10132" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:8.18970966px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.20474268px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="255.27031"
-       y="288.09433"
-       id="text6507"><tspan
-         sodipodi:role="line"
-         id="tspan6505"
-         x="255.27031"
-         y="288.09433"
-         style="stroke-width:0.20474268px">TZon[i]</tspan><tspan
-         sodipodi:role="line"
-         x="255.27031"
-         y="298.33148"
-         style="stroke-width:0.20474268px"
-         id="tspan6509">       &gt;</tspan><tspan
-         sodipodi:role="line"
-         x="255.27031"
-         y="308.5686"
-         style="stroke-width:0.20474268px"
-         id="tspan6511">       TZonCooSetUno?</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:8.16112554px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.20402686px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;"
-       x="256.83212"
-       y="332.5849"
-       id="text6515"><tspan
-         sodipodi:role="line"
-         id="tspan6521">All Zone Temp</tspan><tspan
+       style="font-style:normal;font-weight:normal;font-size:12px;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="482.755"
+       y="320.37881"
+       id="text4181-1-7-1-9-5-9"><tspan
          sodipodi:role="line"
-         id="tspan6523">       &lt;</tspan><tspan
-         sodipodi:role="line"
-         id="tspan6525">TZonCooSetUno - 1.1 C?</tspan></text>
+         id="tspan7968-1"
+         x="482.755"
+         y="320.37881"
+         style="font-size:9.2997px;line-height:1.25;stroke-width:1px">OR</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 398.87175,296.15857 H 422.0367"
+       id="path7816-0"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7816-0-7"
+       d="m 399.23451,344.59655 h 22.53596"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 421.94626,307.84805 V 296.23383"
+       id="path7814-5"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7816-0-8"
+       d="m 421.77679,307.84081 h 43.99947"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker2689)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7814-5-7"
+       d="M 421.88532,344.66745 V 328.6444"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker8486)"
+       d="m 421.77908,328.82493 h 43.55309"
+       id="path7816-0-8-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 515.81459,395.54353 h 45.98497"
+       id="path7816-0-7-4"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker2977)"
+       d="M 561.60243,395.35688 V 317.45171"
+       id="path7814-5-7-8"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Warm-upModeDefinition.png b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Warm-upModeDefinition.png
index c1935462b85..0d8a30c608a 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Warm-upModeDefinition.png and b/Buildings/Resources/Images/Controls/OBC/ASHRAE/G36_PR1/Generic/OperationMode/Warm-upModeDefinition.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.png b/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.png
index f1c44c1272e..84526dbddec 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.png and b/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.svg
index 45ea3c8f5e6..bd62064c518 100644
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.svg
+++ b/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/Sources/Pulse.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,14 +7,14 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="189.31201mm"
+   width="210.20509mm"
    height="144.31464mm"
-   viewBox="0 0 670.79059 511.35107"
+   viewBox="0 0 744.8212 511.35107"
    id="svg6083"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    sodipodi:docname="Pulse.svg"
-   inkscape:export-filename="/home/jianjun/Desktop/FigConverter/Pulse.png"
+   inkscape:export-filename="Pulse.png"
    inkscape:export-xdpi="45.961899"
    inkscape:export-ydpi="45.961899">
   <defs
@@ -24,11 +22,74 @@
     <marker
        inkscape:isstock="true"
        style="overflow:visible"
-       id="marker6935"
+       id="marker1458"
        refX="0"
        refY="0"
        orient="auto"
        inkscape:stockid="Arrow2Lend">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1456"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1448"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lstart">
+      <path
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1446"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1204"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend"
+       inkscape:collect="always">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1202"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1194"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lstart"
+       inkscape:collect="always">
+      <path
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1192"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker6935"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend"
+       inkscape:collect="always">
       <path
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
@@ -73,7 +134,8 @@
        refX="0"
        refY="0"
        orient="auto"
-       inkscape:stockid="Arrow2Lstart">
+       inkscape:stockid="Arrow2Lstart"
+       inkscape:collect="always">
       <path
          transform="matrix(1.1,0,0,1.1,1.1,0)"
          d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
@@ -151,9 +213,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.2536482"
-     inkscape:cx="398.54097"
-     inkscape:cy="141.13643"
+     inkscape:zoom="2.5072964"
+     inkscape:cx="524.04411"
+     inkscape:cy="330.64915"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -161,16 +223,17 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1855"
-     inkscape:window-height="1098"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     inkscape:window-width="3773"
+     inkscape:window-height="2105"
+     inkscape:window-x="3907"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid6631"
-       originx="-20"
-       originy="-339.43951" />
+       originx="54.030643"
+       originy="-339.43947" />
   </sodipodi:namedview>
   <metadata
      id="metadata6088">
@@ -188,153 +251,151 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-20,-201.57163)">
+     transform="translate(54.030641,-201.57163)">
     <path
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 20,682.3622 640,0"
+       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.631679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 433.125,552.3622 h 79.85635"
+       id="path960"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.528127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -54.030641,682.3622 H 660"
        id="path6633"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 40,702.3622 0,-470"
+       d="m 150,702.3622 v -470"
        id="path6635"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 660,692.3622 0,-20 30,10 z"
+       d="m 660,692.3622 v -20 l 30,10 z"
        id="path6637"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 50,232.3622 -20,0 10,-30 z"
+       d="m 160.625,232.3622 h -20 l 10,-30 z"
        id="path6639"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 40,552.3622 110,0 0,-170 100,0 0,170 60,0 0,-170 100,0 0,170 60,0 0,-170 100,0 0,170 40,0"
+       d="M -28.538776,552.3622 13.125,552.2786 V 382.36219 h 100 v 170 h 60 v -170 h 100 v 170 h 60 v -170 h 100 v 170 h 40"
        id="path6641"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccc" />
     <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 100,382.3622 50,0 0,-100"
+       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.631679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 433.08328,382.32936 h 79.85635"
        id="path6643"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 310,382.3622 0,-100"
+       d="m 332.5,382.3622 v -100"
        id="path6645"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 250,382.3622 0,-60"
+       d="m 272.5,382.3622 v -60"
        id="path6647"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6711);marker-end:url(#marker6831)"
-       d="m 150,342.3622 100,0"
+       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.497461;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6711);marker-end:url(#marker6831)"
+       d="M 173.51317,342.3622 H 272.5"
        id="path6649"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6779);marker-end:url(#marker6935)"
-       d="m 150,292.3622 160,0"
+       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.497593;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6779);marker-end:url(#marker6935)"
+       d="M 174.03656,292.3622 H 332.5"
        id="path6651"
        inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1,0.5;opacity:0.5;stroke-dashoffset:0"
-       d="m 150,552.3622 0,130"
-       id="path6653"
-       inkscape:connector-curvature="0" />
     <path
        style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6745);marker-end:url(#marker6877)"
-       d="m 110,382.3622 0,170"
+       d="m 500,382.3622 v 170"
        id="path6655"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)"
-       d="m 110,552.3622 0,130"
+       d="m 500,552.3622 v 130"
        id="path6657"
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.8422718px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="32.665283"
-       y="624.25958"
-       id="text7029"
-       sodipodi:linespacing="125%"><tspan
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="510.31732"
+       y="633.16431"
+       id="text7029"><tspan
          sodipodi:role="line"
          id="tspan7031"
-         x="32.665283"
-         y="624.25958">offset</tspan></text>
+         x="510.31732"
+         y="633.16431"
+         style="font-size:25.8423px;line-height:1.25">offset</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.8422718px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="125.31602"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="159.06601"
        y="710.67267"
-       id="text7029-1"
-       sodipodi:linespacing="125%"><tspan
+       id="text7029-1"><tspan
          sodipodi:role="line"
          id="tspan7149"
-         x="125.31602"
-         y="710.67267">startTime</tspan></text>
+         x="159.06601"
+         y="710.67267"
+         style="font-size:25.8423px;line-height:1.25">0</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.8422718px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="624.63196"
        y="712.55676"
-       id="text7029-1-0"
-       sodipodi:linespacing="125%"><tspan
+       id="text7029-1-0"><tspan
          sodipodi:role="line"
          id="tspan7151"
          x="624.63196"
-         y="712.55676">time</tspan></text>
+         y="712.55676"
+         style="font-size:25.8423px;line-height:1.25">time</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.8422718px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="31.191002"
-       y="471.01172"
-       id="text7029-1-0-5"
-       sodipodi:linespacing="125%"><tspan
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="506.59448"
+       y="479.16183"
+       id="text7029-1-0-5"><tspan
          sodipodi:role="line"
          id="tspan7147"
-         x="31.191002"
-         y="471.01172">amplitude</tspan></text>
+         x="506.59448"
+         y="479.16183"
+         style="font-size:25.8423px;line-height:1.25">amplitude</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.8422718px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="163.46729"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="185.96729"
        y="333.8143"
-       id="text7029-1-0-5-6"
-       sodipodi:linespacing="125%"><tspan
+       id="text7029-1-0-5-6"><tspan
          sodipodi:role="line"
          id="tspan7145"
-         x="163.46729"
-         y="333.8143">width</tspan></text>
+         x="185.96729"
+         y="333.8143"
+         style="font-size:25.8423px;line-height:1.25">width</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.8422718px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="195.73177"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="218.23177"
        y="285.87976"
-       id="text7029-1-0-5-6-6"
-       sodipodi:linespacing="125%"><tspan
+       id="text7029-1-0-5-6-6"><tspan
          sodipodi:role="line"
          id="tspan7143"
-         x="195.73177"
-         y="285.87976">period</tspan></text>
+         x="218.23177"
+         y="285.87976"
+         style="font-size:25.8423px;line-height:1.25">period</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:25.8422718px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="54.011288"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="164.63628"
        y="226.24834"
        id="text7029-1-0-5-6-6-5"
-       sodipodi:linespacing="125%"
        inkscape:transform-center-x="-36.986584"
        inkscape:transform-center-y="25.66416"><tspan
          sodipodi:role="line"
          id="tspan7141"
-<<<<<<< HEAD
-         x="54.011288"
-         y="226.24834">y</tspan></text>
-=======
          x="164.63628"
          y="226.24834"
          style="font-size:25.8423px;line-height:1.25">y</tspan></text>
@@ -364,6 +425,5 @@
          x="73.647133"
          y="285.87976"
          style="font-size:25.8423px;line-height:1.25">shift</tspan></text>
->>>>>>> master
   </g>
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.png
index 62344e05aad..dac872a78fd 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.png and b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.svg
index 5cbee89319d..12c81e8c610 100644
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.svg
+++ b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.svg
@@ -7,16 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 1702.3725 861.07057"
+   viewBox="0 0 1694.7766 874.51179"
    version="1.1"
    id="svg180"
    sodipodi:docname="Latch.svg"
-   width="1702.3726"
-   height="861.07056"
-   inkscape:export-filename="Latch.png"
+   width="1694.7766"
+   height="874.51178"
+   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Latch.png"
    inkscape:export-xdpi="80"
    inkscape:export-ydpi="80"
-   inkscape:version="0.92.4 (33fec40, 2019-01-16)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
   <metadata
      id="metadata186">
     <rdf:RDF>
@@ -25,12 +25,18 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs184">
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714" />
     <clipPath
        id="clipArea1-3">
       <rect
@@ -139,6 +145,204 @@
          height="313"
          id="rect1017-2" />
     </clipPath>
+    <clipPath
+       id="clipArea1-54">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect1253" />
+    </clipPath>
+    <clipPath
+       id="clipPath1938">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect1936" />
+    </clipPath>
+    <clipPath
+       id="clipPath1942">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect1940" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-9">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect1342" />
+    </clipPath>
+    <clipPath
+       id="clipPath1948">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect1946" />
+    </clipPath>
+    <clipPath
+       id="clipPath1952">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect1950" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-4">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect2332" />
+    </clipPath>
+    <clipPath
+       id="clipPath3017">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3015" />
+    </clipPath>
+    <clipPath
+       id="clipPath3021">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3019" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-92">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect2421" />
+    </clipPath>
+    <clipPath
+       id="clipPath3027">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3025" />
+    </clipPath>
+    <clipPath
+       id="clipPath3031">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3029" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-30">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3411" />
+    </clipPath>
+    <clipPath
+       id="clipPath4410">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect4408" />
+    </clipPath>
+    <clipPath
+       id="clipPath4414">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect4412" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-87">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3500" />
+    </clipPath>
+    <clipPath
+       id="clipPath4420">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect4418" />
+    </clipPath>
+    <clipPath
+       id="clipPath4424">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect4422" />
+    </clipPath>
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714-9" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4727" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714-1" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4762" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714-1-4" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4797" />
   </defs>
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -149,236 +353,28 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="3773"
-     inkscape:window-height="2105"
+     inkscape:window-width="3153"
+     inkscape:window-height="1977"
      id="namedview182"
-     showgrid="true"
+     showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:zoom="1.0657461"
-     inkscape:cx="463.76986"
-     inkscape:cy="84.858967"
-     inkscape:window-x="67"
+     inkscape:cx="864.53441"
+     inkscape:cy="498.18176"
+     inkscape:window-x="51"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg180">
+     inkscape:current-layer="svg180"
+     inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid1215"
-       originx="45.949758"
-       originy="-0.065336593" />
+       originx="562.18065"
+       originy="1564.7303" />
   </sodipodi:namedview>
-  <polyline
-     points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline2"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="187.800000,34.000000 187.800000,347.000000"
-     id="polyline4"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="265.600000,34.000000 265.600000,347.000000"
-     id="polyline6"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="343.400000,34.000000 343.400000,347.000000"
-     id="polyline8"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="421.200000,34.000000 421.200000,347.000000"
-     id="polyline10"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="499.000000,34.000000 499.000000,347.000000"
-     id="polyline12"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <rect
-     x="67.831055"
-     y="95.445389"
-     width="389"
-     height="67.816704"
-     id="rect14"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="190.64986"
-     width="389"
-     height="67.816704"
-     id="rect16"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="285.85388"
-     width="389"
-     height="67.816704"
-     id="rect18"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <polyline
-     points="110.000000,347.000000 499.000000,347.000000"
-     id="polyline20"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="499.000000,347.000000 499.000000,34.000000"
-     id="polyline22"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="499.000000,34.000000 110.000000,34.000000"
-     id="polyline24"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline26"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="110.000000,347.000000 110.000000,355.000000"
-     id="polyline28"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="187.800000,347.000000 187.800000,355.000000"
-     id="polyline30"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="265.600000,347.000000 265.600000,355.000000"
-     id="polyline32"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="343.400000,347.000000 343.400000,355.000000"
-     id="polyline34"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="421.200000,347.000000 421.200000,355.000000"
-     id="polyline36"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="499.000000,347.000000 499.000000,355.000000"
-     id="polyline38"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     points="110.000000,347.000000 110.000000,359.800000"
-     id="polyline40"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="67.831055"
-     y="412.55789"
-     id="text42"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">0</text>
-  <polyline
-     points="265.600000,347.000000 265.600000,359.800000"
-     id="polyline44"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="223.43109"
-     y="412.55789"
-     id="text46"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">4</text>
-  <polyline
-     points="421.200000,347.000000 421.200000,359.800000"
-     id="polyline48"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="379.03107"
-     y="412.55789"
-     id="text50"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">8</text>
-  <polyline
-     points="102.000000,129.204167 110.000000,129.204167"
-     id="polyline52"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="163.26186"
-     id="text54"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,61.387500 110.000000,61.387500"
-     id="polyline56"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="95.445389"
-     id="text58"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,224.408333 110.000000,224.408333"
-     id="polyline60"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="258.46588"
-     id="text62"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,156.591667 110.000000,156.591667"
-     id="polyline64"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="190.64986"
-     id="text66"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,319.612500 110.000000,319.612500"
-     id="polyline68"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="353.6709"
-     id="text70"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,251.795833 110.000000,251.795833"
-     id="polyline72"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="285.85388"
-     id="text74"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
   <clipPath
      id="clipArea1">
     <rect
@@ -388,254 +384,6 @@
        height="313"
        id="rect76" />
   </clipPath>
-  <polyline
-     clip-path="url(#clipArea1)"
-     points="110.000000,61.387500 110.778000,61.387500 111.556000,61.387500 112.334000,61.387500 113.112000,61.387500 113.890000,61.387500 114.668000,61.387500 115.446000,61.387500 116.224000,61.387500 117.002000,61.387500 117.780000,61.387500 118.558000,61.387500 119.336000,61.387500 120.114000,61.387500 120.892000,61.387500 121.670000,61.387500 122.448000,61.387500 123.226000,61.387500 124.004001,61.387500 124.782000,61.387500 125.560000,61.387500 126.337999,61.387500 127.116000,61.387500 127.894000,61.387500 128.672000,61.387500 129.450000,61.387500 130.227999,61.387500 131.006001,61.387500 131.784000,61.387500 132.561999,61.387500 133.340001,61.387500 134.118000,61.387500 134.895999,61.387500 135.674001,61.387500 136.452000,61.387500 137.230000,61.387500 138.008001,61.387500 138.786000,61.387500 139.564000,61.387500 140.341999,61.387500 141.120000,61.387500 141.898000,61.387500 142.675999,61.387500 143.454001,61.387500 144.232000,61.387500 145.009999,61.387500 145.788001,61.387500 146.566000,61.387500 147.343999,61.387500 148.122001,61.387500 148.900000,61.387500 148.900000,129.204167 148.900000,129.204167 148.900000,129.204167 149.677999,129.204167 150.455999,129.204167 151.233998,129.204167 152.012002,129.204167 152.790001,129.204167 153.568000,129.204167 154.345999,129.204167 155.123999,129.204167 155.901998,129.204167 156.680002,129.204167 157.458001,129.204167 158.236000,129.204167 159.014000,129.204167 159.791999,129.204167 160.569998,129.204167 161.348002,129.204167 162.126001,129.204167 162.904001,129.204167 163.682000,129.204167 164.459999,129.204167 165.237998,129.204167 166.016002,129.204167 166.794001,129.204167 167.572001,129.204167 168.350000,129.204167 169.127999,129.204167 169.905999,129.204167 170.683998,129.204167 171.462002,129.204167 172.240001,129.204167 173.018000,129.204167 173.795999,129.204167 174.573999,129.204167 175.351998,129.204167 176.130002,129.204167 176.908001,129.204167 177.686000,129.204167 178.464000,129.204167 179.241999,129.204167 180.019998,129.204167 180.798002,129.204167 181.576001,129.204167 182.354001,129.204167 183.132000,129.204167 183.909999,129.204167 184.687998,129.204167 185.466002,129.204167 186.244001,129.204167 187.022001,129.204167 187.800000,129.204167 187.800000,61.387500 187.800000,61.387500 188.577999,61.387500 189.355999,61.387500 190.133998,61.387500 190.911997,61.387500 191.689996,61.387500 192.467996,61.387500 193.246004,61.387500 194.024003,61.387500 194.802003,61.387500 195.580002,61.387500 196.358001,61.387500 197.136000,61.387500 197.914000,61.387500 198.691999,61.387500 199.469998,61.387500 200.247997,61.387500 201.025997,61.387500 201.803996,61.387500 202.582004,61.387500 203.360004,61.387500 204.138003,61.387500 204.916002,61.387500 205.694001,61.387500 206.472001,61.387500 207.250000,61.387500 208.027999,61.387500 208.805999,61.387500 209.583998,61.387500 210.361997,61.387500 211.139996,61.387500 211.917996,61.387500 212.696004,61.387500 213.474003,61.387500 214.252003,61.387500 215.030002,61.387500 215.808001,61.387500 216.586000,61.387500 217.364000,61.387500 218.141999,61.387500 218.919998,61.387500 219.697997,61.387500 220.475997,61.387500 221.253996,61.387500 222.032004,61.387500 222.810004,61.387500 223.588003,61.387500 224.366002,61.387500 225.144001,61.387500 225.922001,61.387500 226.700000,61.387500 226.700000,129.204167 226.700000,129.204167 227.477999,129.204167 228.255999,129.204167 229.033998,129.204167 229.811997,129.204167 230.589996,129.204167 231.367996,129.204167 232.146004,129.204167 232.924003,129.204167 233.702003,129.204167 234.480002,129.204167 235.258001,129.204167 236.036000,129.204167 236.814000,129.204167 237.591999,129.204167 238.369998,129.204167 239.147997,129.204167 239.925997,129.204167 240.703996,129.204167 241.482004,129.204167 242.260004,129.204167 243.038003,129.204167 243.816002,129.204167 244.594001,129.204167 245.372001,129.204167 246.150000,129.204167 246.927999,129.204167 247.705999,129.204167 248.483998,129.204167 249.261997,129.204167 250.039996,129.204167 250.817996,129.204167 251.596004,129.204167 252.374003,129.204167 253.152003,129.204167 253.930002,129.204167 254.708001,129.204167 255.486000,129.204167 256.264000,129.204167 257.041999,129.204167 257.819998,129.204167 258.597997,129.204167 259.375997,129.204167 260.153996,129.204167 260.932004,129.204167 261.710004,129.204167 262.488003,129.204167 263.266002,129.204167 264.044001,129.204167 264.822001,129.204167 265.600000,129.204167 265.600000,61.387500 265.600000,61.387500 266.377999,61.387500 267.155999,61.387500 267.933998,61.387500 268.711997,61.387500 269.489996,61.387500 270.267996,61.387500 271.045995,61.387500 271.823994,61.387500 272.601993,61.387500 273.379993,61.387500 274.157992,61.387500 274.935991,61.387500 275.714009,61.387500 276.492008,61.387500 277.270007,61.387500 278.048007,61.387500 278.826006,61.387500 279.604005,61.387500 280.382004,61.387500 281.160004,61.387500 281.938003,61.387500 282.716002,61.387500 283.494001,61.387500 284.272001,61.387500 285.050000,61.387500 285.827999,61.387500 286.605999,61.387500 287.383998,61.387500 288.161997,61.387500 288.939996,61.387500 289.717996,61.387500 290.495995,61.387500 291.273994,61.387500 292.051993,61.387500 292.829993,61.387500 293.607992,61.387500 294.385991,61.387500 295.164009,61.387500 295.942008,61.387500 296.720007,61.387500 297.498007,61.387500 298.276006,61.387500 299.054005,61.387500 299.832004,61.387500 300.610004,61.387500 301.388003,61.387500 302.166002,61.387500 302.944001,61.387500 303.722001,61.387500 304.500000,61.387500 304.500000,129.204167 305.277999,129.204167 306.055999,129.204167 306.833998,129.204167 307.611997,129.204167 308.389996,129.204167 309.167996,129.204167 309.945995,129.204167 310.723994,129.204167 311.501993,129.204167 312.279993,129.204167 313.057992,129.204167 313.835991,129.204167 314.614009,129.204167 315.392008,129.204167 316.170007,129.204167 316.948007,129.204167 317.726006,129.204167 318.504005,129.204167 319.282004,129.204167 320.060004,129.204167 320.838003,129.204167 321.616002,129.204167 322.394001,129.204167 323.172001,129.204167 323.950000,129.204167 324.727999,129.204167 325.505999,129.204167 326.283998,129.204167 327.061997,129.204167 327.839996,129.204167 328.617996,129.204167 329.395995,129.204167 330.173994,129.204167 330.951993,129.204167 331.729993,129.204167 332.507992,129.204167 333.285991,129.204167 334.064009,129.204167 334.842008,129.204167 335.620007,129.204167 336.398007,129.204167 337.176006,129.204167 337.954005,129.204167 338.732004,129.204167 339.510004,129.204167 340.288003,129.204167 341.066002,129.204167 341.844001,129.204167 342.622001,129.204167 343.400000,129.204167 343.400000,61.387500 344.177999,61.387500 344.955999,61.387500 345.733998,61.387500 346.511997,61.387500 347.289996,61.387500 348.067996,61.387500 348.845995,61.387500 349.623994,61.387500 350.401993,61.387500 351.179993,61.387500 351.957992,61.387500 352.735991,61.387500 353.514009,61.387500 354.292008,61.387500 355.070007,61.387500 355.848007,61.387500 356.626006,61.387500 357.404005,61.387500 358.182004,61.387500 358.960004,61.387500 359.738003,61.387500 360.516002,61.387500 361.294001,61.387500 362.072001,61.387500 362.850000,61.387500 363.627999,61.387500 364.405999,61.387500 365.183998,61.387500 365.961997,61.387500 366.739996,61.387500 367.517996,61.387500 368.295995,61.387500 369.073994,61.387500 369.851993,61.387500 370.629993,61.387500 371.407992,61.387500 372.185991,61.387500 372.964009,61.387500 373.742008,61.387500 374.520007,61.387500 375.298007,61.387500 376.076006,61.387500 376.854005,61.387500 377.632004,61.387500 378.410004,61.387500 379.188003,61.387500 379.966002,61.387500 380.744001,61.387500 381.522001,61.387500 382.300000,61.387500 382.300000,129.204167 383.077999,129.204167 383.855999,129.204167 384.633998,129.204167 385.411997,129.204167 386.189996,129.204167 386.967996,129.204167 387.745995,129.204167 388.523994,129.204167 389.301993,129.204167 390.079993,129.204167 390.857992,129.204167 391.635991,129.204167 392.414009,129.204167 393.192008,129.204167 393.970007,129.204167 394.748007,129.204167 395.526006,129.204167 396.304005,129.204167 397.082004,129.204167 397.860004,129.204167 398.638003,129.204167 399.416002,129.204167 400.194001,129.204167 400.972001,129.204167 401.750000,129.204167 402.527999,129.204167 403.305999,129.204167 404.083998,129.204167 404.861997,129.204167 405.639996,129.204167 406.417996,129.204167 407.195995,129.204167 407.973994,129.204167 408.751993,129.204167 409.529993,129.204167 410.307992,129.204167 411.085991,129.204167 411.864009,129.204167 412.642008,129.204167 413.420007,129.204167 414.198007,129.204167 414.976006,129.204167 415.754005,129.204167 416.532004,129.204167 417.310004,129.204167 418.088003,129.204167 418.866002,129.204167 419.644001,129.204167 420.422001,129.204167 421.200000,129.204167 421.200000,61.387500 421.978018,61.387500 422.755999,61.387500 423.534016,61.387500 424.311997,61.387500 425.090015,61.387500 425.867996,61.387500 426.646013,61.387500 427.423994,61.387500 428.202012,61.387500 428.979993,61.387500 429.758010,61.387500 430.535991,61.387500 431.314009,61.387500 432.091990,61.387500 432.870007,61.387500 433.647988,61.387500 434.426006,61.387500 435.203987,61.387500 435.982004,61.387500 436.759985,61.387500 437.538003,61.387500 438.315984,61.387500 439.094001,61.387500 439.871982,61.387500 440.650000,61.387500 441.428018,61.387500 442.205999,61.387500 442.984016,61.387500 443.761997,61.387500 444.540015,61.387500 445.317996,61.387500 446.096013,61.387500 446.873994,61.387500 447.652012,61.387500 448.429993,61.387500 449.208010,61.387500 449.985991,61.387500 450.764009,61.387500 451.541990,61.387500 452.320007,61.387500 453.097988,61.387500 453.876006,61.387500 454.653987,61.387500 455.432004,61.387500 456.209985,61.387500 456.988003,61.387500 457.765984,61.387500 458.544001,61.387500 459.321982,61.387500 460.100000,61.387500 460.100000,129.204167 460.878018,129.204167 461.655999,129.204167 462.434016,129.204167 463.211997,129.204167 463.990015,129.204167 464.767996,129.204167 465.546013,129.204167 466.323994,129.204167 467.102012,129.204167 467.879993,129.204167 468.658010,129.204167 469.435991,129.204167 470.214009,129.204167 470.991990,129.204167 471.770007,129.204167 472.547988,129.204167 473.326006,129.204167 474.103987,129.204167 474.882004,129.204167 475.659985,129.204167 476.438003,129.204167 477.215984,129.204167 477.994001,129.204167 478.771982,129.204167 479.550000,129.204167 480.328018,129.204167 481.105999,129.204167 481.884016,129.204167 482.661997,129.204167 483.440015,129.204167 484.217996,129.204167 484.996013,129.204167 485.773994,129.204167 486.552012,129.204167 487.329993,129.204167 488.108010,129.204167 488.885991,129.204167 489.664009,129.204167 490.441990,129.204167 491.220007,129.204167 491.997988,129.204167 492.776006,129.204167 493.553987,129.204167 494.332004,129.204167 495.109985,129.204167 495.888003,129.204167 496.665984,129.204167 497.444001,129.204167 498.221982,129.204167 499.000000,129.204167 499.000000,61.387500"
-     id="polyline79"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     clip-path="url(#clipArea1)"
-     points="110.000000,224.408333 110.778000,224.408333 111.556000,224.408333 112.334000,224.408333 113.112000,224.408333 113.890000,224.408333 114.668000,224.408333 115.446000,224.408333 116.224000,224.408333 117.002000,224.408333 117.780000,224.408333 118.558000,224.408333 119.336000,224.408333 120.114000,224.408333 120.892000,224.408333 121.670000,224.408333 122.448000,224.408333 123.226000,224.408333 124.004001,224.408333 124.782000,224.408333 125.560000,224.408333 126.337999,224.408333 127.116000,224.408333 127.894000,224.408333 128.672000,224.408333 129.450000,224.408333 130.227999,224.408333 131.006001,224.408333 131.784000,224.408333 132.561999,224.408333 133.340001,224.408333 134.118000,224.408333 134.895999,224.408333 135.674001,224.408333 136.452000,224.408333 137.230000,224.408333 138.008001,224.408333 138.786000,224.408333 139.564000,224.408333 140.341999,224.408333 141.120000,224.408333 141.898000,224.408333 142.675999,224.408333 143.454001,224.408333 144.232000,224.408333 145.009999,224.408333 145.788001,224.408333 146.566000,224.408333 147.343999,224.408333 148.122001,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 149.677999,224.408333 150.455999,224.408333 151.233998,224.408333 152.012002,224.408333 152.790001,224.408333 153.568000,224.408333 154.345999,224.408333 155.123999,224.408333 155.901998,224.408333 156.680002,224.408333 157.458001,224.408333 158.236000,224.408333 159.014000,224.408333 159.791999,224.408333 160.569998,224.408333 161.348002,224.408333 162.126001,224.408333 162.904001,224.408333 163.682000,224.408333 164.459999,224.408333 165.237998,224.408333 166.016002,224.408333 166.794001,224.408333 167.572001,224.408333 168.350000,224.408333 169.127999,224.408333 169.905999,224.408333 170.683998,224.408333 171.462002,224.408333 172.240001,224.408333 173.018000,224.408333 173.795999,224.408333 174.573999,224.408333 175.351998,224.408333 176.130002,224.408333 176.908001,224.408333 177.686000,224.408333 178.464000,224.408333 179.241999,224.408333 180.019998,224.408333 180.798002,224.408333 181.576001,224.408333 182.354001,224.408333 183.132000,224.408333 183.909999,224.408333 184.687998,224.408333 185.466002,224.408333 186.244001,224.408333 187.022001,224.408333 187.800000,224.408333 187.800000,224.408333 187.800000,224.408333 188.577999,224.408333 189.355999,224.408333 190.133998,224.408333 190.911997,224.408333 191.689996,224.408333 192.467996,224.408333 193.246004,224.408333 194.024003,224.408333 194.802003,224.408333 195.580002,224.408333 196.358001,224.408333 197.136000,224.408333 197.914000,224.408333 198.691999,224.408333 199.469998,224.408333 200.247997,224.408333 201.025997,224.408333 201.803996,224.408333 202.582004,224.408333 203.360004,224.408333 204.138003,224.408333 204.916002,224.408333 205.694001,224.408333 206.472001,224.408333 207.250000,224.408333 208.027999,224.408333 208.805999,224.408333 209.583998,224.408333 210.361997,224.408333 211.139996,224.408333 211.917996,224.408333 212.696004,224.408333 213.474003,224.408333 214.252003,224.408333 215.030002,224.408333 215.808001,224.408333 216.586000,224.408333 217.364000,224.408333 218.141999,224.408333 218.919998,224.408333 219.697997,224.408333 220.475997,224.408333 221.253996,224.408333 222.032004,224.408333 222.810004,224.408333 223.588003,224.408333 224.366002,224.408333 225.144001,224.408333 225.922001,224.408333 226.700000,224.408333 226.700000,224.408333 226.700000,224.408333 227.477999,224.408333 228.255999,224.408333 229.033998,224.408333 229.811997,224.408333 230.589996,224.408333 231.367996,224.408333 232.146004,224.408333 232.924003,224.408333 233.702003,224.408333 234.480002,224.408333 235.258001,224.408333 236.036000,224.408333 236.814000,224.408333 237.591999,224.408333 238.369998,224.408333 239.147997,224.408333 239.925997,224.408333 240.703996,224.408333 241.482004,224.408333 242.260004,224.408333 243.038003,224.408333 243.816002,224.408333 244.594001,224.408333 245.372001,224.408333 246.150000,224.408333 246.927999,224.408333 247.705999,224.408333 248.483998,224.408333 249.261997,224.408333 250.039996,224.408333 250.817996,224.408333 251.596004,224.408333 252.374003,224.408333 253.152003,224.408333 253.930002,224.408333 254.708001,224.408333 255.486000,224.408333 256.264000,224.408333 257.041999,224.408333 257.819998,224.408333 258.597997,224.408333 259.375997,224.408333 260.153996,224.408333 260.932004,224.408333 261.710004,224.408333 262.488003,224.408333 263.266002,224.408333 264.044001,224.408333 264.822001,224.408333 265.600000,224.408333 265.600000,224.408333 265.600000,224.408333 266.377999,224.408333 267.155999,224.408333 267.933998,224.408333 268.711997,224.408333 269.489996,224.408333 270.267996,224.408333 271.045995,224.408333 271.823994,224.408333 272.601993,224.408333 273.379993,224.408333 274.157992,224.408333 274.935991,224.408333 275.714009,224.408333 276.492008,224.408333 277.270007,224.408333 278.048007,224.408333 278.826006,224.408333 279.604005,224.408333 280.382004,224.408333 281.160004,224.408333 281.938003,224.408333 282.716002,224.408333 283.494001,224.408333 284.272001,224.408333 285.050000,224.408333 285.827999,224.408333 286.605999,224.408333 287.383998,224.408333 288.161997,224.408333 288.939996,224.408333 289.717996,224.408333 290.495995,224.408333 291.273994,224.408333 292.051993,224.408333 292.829993,224.408333 293.607992,224.408333 294.385991,224.408333 295.164009,224.408333 295.942008,224.408333 296.720007,224.408333 297.498007,224.408333 298.276006,224.408333 299.054005,224.408333 299.832004,224.408333 300.610004,224.408333 301.388003,224.408333 302.166002,224.408333 302.944001,224.408333 303.722001,224.408333 304.500000,224.408333 304.500000,224.408333 305.277999,224.408333 306.055999,224.408333 306.833998,224.408333 307.611997,224.408333 308.389996,224.408333 309.167996,224.408333 309.945995,224.408333 310.723994,224.408333 311.501993,224.408333 312.279993,224.408333 313.057992,224.408333 313.835991,224.408333 314.614009,224.408333 315.392008,224.408333 316.170007,224.408333 316.948007,224.408333 317.726006,224.408333 318.504005,224.408333 319.282004,224.408333 320.060004,224.408333 320.838003,224.408333 321.616002,224.408333 322.394001,224.408333 323.172001,224.408333 323.950000,224.408333 324.727999,224.408333 325.505999,224.408333 326.283998,224.408333 327.061997,224.408333 327.839996,224.408333 328.617996,224.408333 329.395995,224.408333 330.173994,224.408333 330.951993,224.408333 331.729993,224.408333 332.507992,224.408333 333.285991,224.408333 334.064009,224.408333 334.842008,224.408333 335.620007,224.408333 336.398007,224.408333 337.176006,224.408333 337.954005,224.408333 338.732004,224.408333 339.510004,224.408333 340.288003,224.408333 341.066002,224.408333 341.844001,224.408333 342.622001,224.408333 343.400000,224.408333 343.400000,224.408333 344.177999,224.408333 344.955999,224.408333 345.733998,224.408333 346.511997,224.408333 347.289996,224.408333 348.067996,224.408333 348.845995,224.408333 349.623994,224.408333 350.401993,224.408333 351.179993,224.408333 351.957992,224.408333 352.735991,224.408333 353.514009,224.408333 354.292008,224.408333 355.070007,224.408333 355.848007,224.408333 356.626006,224.408333 357.404005,224.408333 358.182004,224.408333 358.960004,224.408333 359.738003,224.408333 360.516002,224.408333 361.294001,224.408333 362.072001,224.408333 362.850000,224.408333 363.627999,224.408333 364.405999,224.408333 365.183998,224.408333 365.961997,224.408333 366.739996,224.408333 367.517996,224.408333 368.295995,224.408333 369.073994,224.408333 369.851993,224.408333 370.629993,224.408333 371.407992,224.408333 372.185991,224.408333 372.964009,224.408333 373.742008,224.408333 374.520007,224.408333 375.298007,224.408333 376.076006,224.408333 376.854005,224.408333 377.632004,224.408333 378.410004,224.408333 379.188003,224.408333 379.966002,224.408333 380.744001,224.408333 381.522001,224.408333 382.300000,224.408333 382.300000,224.408333 383.077999,224.408333 383.855999,224.408333 384.633998,224.408333 385.411997,224.408333 386.189996,224.408333 386.967996,224.408333 387.745995,224.408333 388.523994,224.408333 389.301993,224.408333 390.079993,224.408333 390.857992,224.408333 391.635991,224.408333 392.414009,224.408333 393.192008,224.408333 393.970007,224.408333 394.748007,224.408333 395.526006,224.408333 396.304005,224.408333 397.082004,224.408333 397.860004,224.408333 398.638003,224.408333 399.416002,224.408333 400.194001,224.408333 400.972001,224.408333 401.750000,224.408333 402.527999,224.408333 403.305999,224.408333 404.083998,224.408333 404.861997,224.408333 405.639996,224.408333 406.417996,224.408333 407.195995,224.408333 407.973994,224.408333 408.751993,224.408333 409.529993,224.408333 410.307992,224.408333 411.085991,224.408333 411.864009,224.408333 412.642008,224.408333 413.420007,224.408333 414.198007,224.408333 414.976006,224.408333 415.754005,224.408333 416.532004,224.408333 417.310004,224.408333 418.088003,224.408333 418.866002,224.408333 419.644001,224.408333 420.422001,224.408333 421.200000,224.408333 421.200000,224.408333 421.978018,224.408333 422.755999,224.408333 423.534016,224.408333 424.311997,224.408333 425.090015,224.408333 425.867996,224.408333 426.646013,224.408333 427.423994,224.408333 428.202012,224.408333 428.979993,224.408333 429.758010,224.408333 430.535991,224.408333 431.314009,224.408333 432.091990,224.408333 432.870007,224.408333 433.647988,224.408333 434.426006,224.408333 435.203987,224.408333 435.982004,224.408333 436.759985,224.408333 437.538003,224.408333 438.315984,224.408333 439.094001,224.408333 439.871982,224.408333 440.650000,224.408333 441.428018,224.408333 442.205999,224.408333 442.984016,224.408333 443.761997,224.408333 444.540015,224.408333 445.317996,224.408333 446.096013,224.408333 446.873994,224.408333 447.652012,224.408333 448.429993,224.408333 449.208010,224.408333 449.985991,224.408333 450.764009,224.408333 451.541990,224.408333 452.320007,224.408333 453.097988,224.408333 453.876006,224.408333 454.653987,224.408333 455.432004,224.408333 456.209985,224.408333 456.988003,224.408333 457.765984,224.408333 458.544001,224.408333 459.321982,224.408333 460.100000,224.408333 460.100000,224.408333 460.878018,224.408333 461.655999,224.408333 462.434016,224.408333 463.211997,224.408333 463.990015,224.408333 464.767996,224.408333 465.546013,224.408333 466.323994,224.408333 467.102012,224.408333 467.879993,224.408333 468.658010,224.408333 469.435991,224.408333 470.214009,224.408333 470.991990,224.408333 471.770007,224.408333 472.547988,224.408333 473.326006,224.408333 474.103987,224.408333 474.882004,224.408333 475.659985,224.408333 476.438003,224.408333 477.215984,224.408333 477.994001,224.408333 478.771982,224.408333 479.550000,224.408333 480.328018,224.408333 481.105999,224.408333 481.884016,224.408333 482.661997,224.408333 483.440015,224.408333 484.217996,224.408333 484.996013,224.408333 485.773994,224.408333 486.552012,224.408333 487.329993,224.408333 488.108010,224.408333 488.885991,224.408333 489.664009,224.408333 490.441990,224.408333 491.220007,224.408333 491.997988,224.408333 492.776006,224.408333 493.553987,224.408333 494.332004,224.408333 495.109985,224.408333 495.888003,224.408333 496.665984,224.408333 497.444001,224.408333 498.221982,224.408333 499.000000,224.408333 499.000000,224.408333"
-     id="polyline81"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <polyline
-     clip-path="url(#clipArea1)"
-     points="110.000000,319.612500 110.778000,319.612500 111.556000,319.612500 112.334000,319.612500 113.112000,319.612500 113.890000,319.612500 114.668000,319.612500 115.446000,319.612500 116.224000,319.612500 117.002000,319.612500 117.780000,319.612500 118.558000,319.612500 119.336000,319.612500 120.114000,319.612500 120.892000,319.612500 121.670000,319.612500 122.448000,319.612500 123.226000,319.612500 124.004001,319.612500 124.782000,319.612500 125.560000,319.612500 126.337999,319.612500 127.116000,319.612500 127.894000,319.612500 128.672000,319.612500 129.450000,319.612500 130.227999,319.612500 131.006001,319.612500 131.784000,319.612500 132.561999,319.612500 133.340001,319.612500 134.118000,319.612500 134.895999,319.612500 135.674001,319.612500 136.452000,319.612500 137.230000,319.612500 138.008001,319.612500 138.786000,319.612500 139.564000,319.612500 140.341999,319.612500 141.120000,319.612500 141.898000,319.612500 142.675999,319.612500 143.454001,319.612500 144.232000,319.612500 145.009999,319.612500 145.788001,319.612500 146.566000,319.612500 147.343999,319.612500 148.122001,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 149.677999,319.612500 150.455999,319.612500 151.233998,319.612500 152.012002,319.612500 152.790001,319.612500 153.568000,319.612500 154.345999,319.612500 155.123999,319.612500 155.901998,319.612500 156.680002,319.612500 157.458001,319.612500 158.236000,319.612500 159.014000,319.612500 159.791999,319.612500 160.569998,319.612500 161.348002,319.612500 162.126001,319.612500 162.904001,319.612500 163.682000,319.612500 164.459999,319.612500 165.237998,319.612500 166.016002,319.612500 166.794001,319.612500 167.572001,319.612500 168.350000,319.612500 169.127999,319.612500 169.905999,319.612500 170.683998,319.612500 171.462002,319.612500 172.240001,319.612500 173.018000,319.612500 173.795999,319.612500 174.573999,319.612500 175.351998,319.612500 176.130002,319.612500 176.908001,319.612500 177.686000,319.612500 178.464000,319.612500 179.241999,319.612500 180.019998,319.612500 180.798002,319.612500 181.576001,319.612500 182.354001,319.612500 183.132000,319.612500 183.909999,319.612500 184.687998,319.612500 185.466002,319.612500 186.244001,319.612500 187.022001,319.612500 187.800000,319.612500 187.800000,251.795833 187.800000,251.795833 188.577999,251.795833 189.355999,251.795833 190.133998,251.795833 190.911997,251.795833 191.689996,251.795833 192.467996,251.795833 193.246004,251.795833 194.024003,251.795833 194.802003,251.795833 195.580002,251.795833 196.358001,251.795833 197.136000,251.795833 197.914000,251.795833 198.691999,251.795833 199.469998,251.795833 200.247997,251.795833 201.025997,251.795833 201.803996,251.795833 202.582004,251.795833 203.360004,251.795833 204.138003,251.795833 204.916002,251.795833 205.694001,251.795833 206.472001,251.795833 207.250000,251.795833 208.027999,251.795833 208.805999,251.795833 209.583998,251.795833 210.361997,251.795833 211.139996,251.795833 211.917996,251.795833 212.696004,251.795833 213.474003,251.795833 214.252003,251.795833 215.030002,251.795833 215.808001,251.795833 216.586000,251.795833 217.364000,251.795833 218.141999,251.795833 218.919998,251.795833 219.697997,251.795833 220.475997,251.795833 221.253996,251.795833 222.032004,251.795833 222.810004,251.795833 223.588003,251.795833 224.366002,251.795833 225.144001,251.795833 225.922001,251.795833 226.700000,251.795833 226.700000,251.795833 226.700000,251.795833 227.477999,251.795833 228.255999,251.795833 229.033998,251.795833 229.811997,251.795833 230.589996,251.795833 231.367996,251.795833 232.146004,251.795833 232.924003,251.795833 233.702003,251.795833 234.480002,251.795833 235.258001,251.795833 236.036000,251.795833 236.814000,251.795833 237.591999,251.795833 238.369998,251.795833 239.147997,251.795833 239.925997,251.795833 240.703996,251.795833 241.482004,251.795833 242.260004,251.795833 243.038003,251.795833 243.816002,251.795833 244.594001,251.795833 245.372001,251.795833 246.150000,251.795833 246.927999,251.795833 247.705999,251.795833 248.483998,251.795833 249.261997,251.795833 250.039996,251.795833 250.817996,251.795833 251.596004,251.795833 252.374003,251.795833 253.152003,251.795833 253.930002,251.795833 254.708001,251.795833 255.486000,251.795833 256.264000,251.795833 257.041999,251.795833 257.819998,251.795833 258.597997,251.795833 259.375997,251.795833 260.153996,251.795833 260.932004,251.795833 261.710004,251.795833 262.488003,251.795833 263.266002,251.795833 264.044001,251.795833 264.822001,251.795833 265.600000,251.795833 265.600000,251.795833 265.600000,251.795833 266.377999,251.795833 267.155999,251.795833 267.933998,251.795833 268.711997,251.795833 269.489996,251.795833 270.267996,251.795833 271.045995,251.795833 271.823994,251.795833 272.601993,251.795833 273.379993,251.795833 274.157992,251.795833 274.935991,251.795833 275.714009,251.795833 276.492008,251.795833 277.270007,251.795833 278.048007,251.795833 278.826006,251.795833 279.604005,251.795833 280.382004,251.795833 281.160004,251.795833 281.938003,251.795833 282.716002,251.795833 283.494001,251.795833 284.272001,251.795833 285.050000,251.795833 285.827999,251.795833 286.605999,251.795833 287.383998,251.795833 288.161997,251.795833 288.939996,251.795833 289.717996,251.795833 290.495995,251.795833 291.273994,251.795833 292.051993,251.795833 292.829993,251.795833 293.607992,251.795833 294.385991,251.795833 295.164009,251.795833 295.942008,251.795833 296.720007,251.795833 297.498007,251.795833 298.276006,251.795833 299.054005,251.795833 299.832004,251.795833 300.610004,251.795833 301.388003,251.795833 302.166002,251.795833 302.944001,251.795833 303.722001,251.795833 304.500000,251.795833 304.500000,251.795833 305.277999,251.795833 306.055999,251.795833 306.833998,251.795833 307.611997,251.795833 308.389996,251.795833 309.167996,251.795833 309.945995,251.795833 310.723994,251.795833 311.501993,251.795833 312.279993,251.795833 313.057992,251.795833 313.835991,251.795833 314.614009,251.795833 315.392008,251.795833 316.170007,251.795833 316.948007,251.795833 317.726006,251.795833 318.504005,251.795833 319.282004,251.795833 320.060004,251.795833 320.838003,251.795833 321.616002,251.795833 322.394001,251.795833 323.172001,251.795833 323.950000,251.795833 324.727999,251.795833 325.505999,251.795833 326.283998,251.795833 327.061997,251.795833 327.839996,251.795833 328.617996,251.795833 329.395995,251.795833 330.173994,251.795833 330.951993,251.795833 331.729993,251.795833 332.507992,251.795833 333.285991,251.795833 334.064009,251.795833 334.842008,251.795833 335.620007,251.795833 336.398007,251.795833 337.176006,251.795833 337.954005,251.795833 338.732004,251.795833 339.510004,251.795833 340.288003,251.795833 341.066002,251.795833 341.844001,251.795833 342.622001,251.795833 343.400000,251.795833 343.400000,251.795833 344.177999,251.795833 344.955999,251.795833 345.733998,251.795833 346.511997,251.795833 347.289996,251.795833 348.067996,251.795833 348.845995,251.795833 349.623994,251.795833 350.401993,251.795833 351.179993,251.795833 351.957992,251.795833 352.735991,251.795833 353.514009,251.795833 354.292008,251.795833 355.070007,251.795833 355.848007,251.795833 356.626006,251.795833 357.404005,251.795833 358.182004,251.795833 358.960004,251.795833 359.738003,251.795833 360.516002,251.795833 361.294001,251.795833 362.072001,251.795833 362.850000,251.795833 363.627999,251.795833 364.405999,251.795833 365.183998,251.795833 365.961997,251.795833 366.739996,251.795833 367.517996,251.795833 368.295995,251.795833 369.073994,251.795833 369.851993,251.795833 370.629993,251.795833 371.407992,251.795833 372.185991,251.795833 372.964009,251.795833 373.742008,251.795833 374.520007,251.795833 375.298007,251.795833 376.076006,251.795833 376.854005,251.795833 377.632004,251.795833 378.410004,251.795833 379.188003,251.795833 379.966002,251.795833 380.744001,251.795833 381.522001,251.795833 382.300000,251.795833 382.300000,251.795833 383.077999,251.795833 383.855999,251.795833 384.633998,251.795833 385.411997,251.795833 386.189996,251.795833 386.967996,251.795833 387.745995,251.795833 388.523994,251.795833 389.301993,251.795833 390.079993,251.795833 390.857992,251.795833 391.635991,251.795833 392.414009,251.795833 393.192008,251.795833 393.970007,251.795833 394.748007,251.795833 395.526006,251.795833 396.304005,251.795833 397.082004,251.795833 397.860004,251.795833 398.638003,251.795833 399.416002,251.795833 400.194001,251.795833 400.972001,251.795833 401.750000,251.795833 402.527999,251.795833 403.305999,251.795833 404.083998,251.795833 404.861997,251.795833 405.639996,251.795833 406.417996,251.795833 407.195995,251.795833 407.973994,251.795833 408.751993,251.795833 409.529993,251.795833 410.307992,251.795833 411.085991,251.795833 411.864009,251.795833 412.642008,251.795833 413.420007,251.795833 414.198007,251.795833 414.976006,251.795833 415.754005,251.795833 416.532004,251.795833 417.310004,251.795833 418.088003,251.795833 418.866002,251.795833 419.644001,251.795833 420.422001,251.795833 421.200000,251.795833 421.200000,251.795833 421.978018,251.795833 422.755999,251.795833 423.534016,251.795833 424.311997,251.795833 425.090015,251.795833 425.867996,251.795833 426.646013,251.795833 427.423994,251.795833 428.202012,251.795833 428.979993,251.795833 429.758010,251.795833 430.535991,251.795833 431.314009,251.795833 432.091990,251.795833 432.870007,251.795833 433.647988,251.795833 434.426006,251.795833 435.203987,251.795833 435.982004,251.795833 436.759985,251.795833 437.538003,251.795833 438.315984,251.795833 439.094001,251.795833 439.871982,251.795833 440.650000,251.795833 441.428018,251.795833 442.205999,251.795833 442.984016,251.795833 443.761997,251.795833 444.540015,251.795833 445.317996,251.795833 446.096013,251.795833 446.873994,251.795833 447.652012,251.795833 448.429993,251.795833 449.208010,251.795833 449.985991,251.795833 450.764009,251.795833 451.541990,251.795833 452.320007,251.795833 453.097988,251.795833 453.876006,251.795833 454.653987,251.795833 455.432004,251.795833 456.209985,251.795833 456.988003,251.795833 457.765984,251.795833 458.544001,251.795833 459.321982,251.795833 460.100000,251.795833 460.100000,251.795833 460.878018,251.795833 461.655999,251.795833 462.434016,251.795833 463.211997,251.795833 463.990015,251.795833 464.767996,251.795833 465.546013,251.795833 466.323994,251.795833 467.102012,251.795833 467.879993,251.795833 468.658010,251.795833 469.435991,251.795833 470.214009,251.795833 470.991990,251.795833 471.770007,251.795833 472.547988,251.795833 473.326006,251.795833 474.103987,251.795833 474.882004,251.795833 475.659985,251.795833 476.438003,251.795833 477.215984,251.795833 477.994001,251.795833 478.771982,251.795833 479.550000,251.795833 480.328018,251.795833 481.105999,251.795833 481.884016,251.795833 482.661997,251.795833 483.440015,251.795833 484.217996,251.795833 484.996013,251.795833 485.773994,251.795833 486.552012,251.795833 487.329993,251.795833 488.108010,251.795833 488.885991,251.795833 489.664009,251.795833 490.441990,251.795833 491.220007,251.795833 491.997988,251.795833 492.776006,251.795833 493.553987,251.795833 494.332004,251.795833 495.109985,251.795833 495.888003,251.795833 496.665984,251.795833 497.444001,251.795833 498.221982,251.795833 499.000000,251.795833 499.000000,251.795833"
-     id="polyline83"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,34.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="78.557877"
-     id="text85"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">falCle.u</text>
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="173.55788"
-     id="text87"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">falCle.clr</text>
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="268.55789"
-     id="text89"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">falCle.y</text>
-  <polyline
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline91"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="187.800000,434.000000 187.800000,747.000000"
-     id="polyline93"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="265.600000,434.000000 265.600000,747.000000"
-     id="polyline95"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="343.400000,434.000000 343.400000,747.000000"
-     id="polyline97"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="421.200000,434.000000 421.200000,747.000000"
-     id="polyline99"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="499.000000,434.000000 499.000000,747.000000"
-     id="polyline101"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <rect
-     x="67.831055"
-     y="537.44489"
-     width="389"
-     height="67.816704"
-     id="rect103"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="632.64984"
-     width="389"
-     height="67.816704"
-     id="rect105"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="727.85388"
-     width="389"
-     height="67.816704"
-     id="rect107"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <polyline
-     points="110.000000,747.000000 499.000000,747.000000"
-     id="polyline109"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="499.000000,747.000000 499.000000,434.000000"
-     id="polyline111"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="499.000000,434.000000 110.000000,434.000000"
-     id="polyline113"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline115"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="110.000000,747.000000 110.000000,755.000000"
-     id="polyline117"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="187.800000,747.000000 187.800000,755.000000"
-     id="polyline119"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="265.600000,747.000000 265.600000,755.000000"
-     id="polyline121"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="343.400000,747.000000 343.400000,755.000000"
-     id="polyline123"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="421.200000,747.000000 421.200000,755.000000"
-     id="polyline125"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="499.000000,747.000000 499.000000,755.000000"
-     id="polyline127"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     points="110.000000,747.000000 110.000000,759.800000"
-     id="polyline129"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="67.831055"
-     y="854.55786"
-     id="text131"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">0</text>
-  <polyline
-     points="265.600000,747.000000 265.600000,759.800000"
-     id="polyline133"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="223.43109"
-     y="854.55786"
-     id="text135"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">4</text>
-  <polyline
-     points="421.200000,747.000000 421.200000,759.800000"
-     id="polyline137"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="379.03107"
-     y="854.55786"
-     id="text139"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">8</text>
-  <polyline
-     points="102.000000,529.204167 110.000000,529.204167"
-     id="polyline141"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="605.26184"
-     id="text143"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,461.387500 110.000000,461.387500"
-     id="polyline145"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="537.44489"
-     id="text147"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,624.408333 110.000000,624.408333"
-     id="polyline149"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="700.46588"
-     id="text151"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,556.591667 110.000000,556.591667"
-     id="polyline153"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="632.64984"
-     id="text155"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,719.612500 110.000000,719.612500"
-     id="polyline157"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="795.66986"
-     id="text159"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,651.795833 110.000000,651.795833"
-     id="polyline161"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="727.85388"
-     id="text163"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
   <clipPath
      id="clipArea2">
     <rect
@@ -645,1127 +393,2286 @@
        height="313"
        id="rect165" />
   </clipPath>
-  <polyline
-     clip-path="url(#clipArea2)"
-     points="110.000000,461.387500 110.778000,461.387500 111.556000,461.387500 112.334000,461.387500 113.112000,461.387500 113.890000,461.387500 114.668000,461.387500 115.446000,461.387500 116.224000,461.387500 117.002000,461.387500 117.780000,461.387500 118.558000,461.387500 119.336000,461.387500 120.114000,461.387500 120.892000,461.387500 121.670000,461.387500 122.448000,461.387500 123.226000,461.387500 124.004001,461.387500 124.782000,461.387500 125.560000,461.387500 126.337999,461.387500 127.116000,461.387500 127.894000,461.387500 128.672000,461.387500 129.450000,461.387500 130.227999,461.387500 131.006001,461.387500 131.784000,461.387500 132.561999,461.387500 133.340001,461.387500 134.118000,461.387500 134.895999,461.387500 135.674001,461.387500 136.452000,461.387500 137.230000,461.387500 138.008001,461.387500 138.786000,461.387500 139.564000,461.387500 140.341999,461.387500 141.120000,461.387500 141.898000,461.387500 142.675999,461.387500 143.454001,461.387500 144.232000,461.387500 145.009999,461.387500 145.788001,461.387500 146.566000,461.387500 147.343999,461.387500 148.122001,461.387500 148.900000,461.387500 148.900000,529.204167 148.900000,529.204167 148.900000,529.204167 149.677999,529.204167 150.455999,529.204167 151.233998,529.204167 152.012002,529.204167 152.790001,529.204167 153.568000,529.204167 154.345999,529.204167 155.123999,529.204167 155.901998,529.204167 156.680002,529.204167 157.458001,529.204167 158.236000,529.204167 159.014000,529.204167 159.791999,529.204167 160.569998,529.204167 161.348002,529.204167 162.126001,529.204167 162.904001,529.204167 163.682000,529.204167 164.459999,529.204167 165.237998,529.204167 166.016002,529.204167 166.794001,529.204167 167.572001,529.204167 168.350000,529.204167 169.127999,529.204167 169.905999,529.204167 170.683998,529.204167 171.462002,529.204167 172.240001,529.204167 173.018000,529.204167 173.795999,529.204167 174.573999,529.204167 175.351998,529.204167 176.130002,529.204167 176.908001,529.204167 177.686000,529.204167 178.464000,529.204167 179.241999,529.204167 180.019998,529.204167 180.798002,529.204167 181.576001,529.204167 182.354001,529.204167 183.132000,529.204167 183.909999,529.204167 184.687998,529.204167 185.466002,529.204167 186.244001,529.204167 187.022001,529.204167 187.800000,529.204167 187.800000,461.387500 187.800000,461.387500 188.577999,461.387500 189.355999,461.387500 190.133998,461.387500 190.911997,461.387500 191.689996,461.387500 192.467996,461.387500 193.246004,461.387500 194.024003,461.387500 194.802003,461.387500 195.580002,461.387500 196.358001,461.387500 197.136000,461.387500 197.914000,461.387500 198.691999,461.387500 199.469998,461.387500 200.247997,461.387500 201.025997,461.387500 201.803996,461.387500 202.582004,461.387500 203.360004,461.387500 204.138003,461.387500 204.916002,461.387500 205.694001,461.387500 206.472001,461.387500 207.250000,461.387500 208.027999,461.387500 208.805999,461.387500 209.583998,461.387500 210.361997,461.387500 211.139996,461.387500 211.917996,461.387500 212.696004,461.387500 213.474003,461.387500 214.252003,461.387500 215.030002,461.387500 215.808001,461.387500 216.586000,461.387500 217.364000,461.387500 218.141999,461.387500 218.919998,461.387500 219.697997,461.387500 220.475997,461.387500 221.253996,461.387500 222.032004,461.387500 222.810004,461.387500 223.588003,461.387500 224.366002,461.387500 225.144001,461.387500 225.922001,461.387500 226.700000,461.387500 226.700000,529.204167 226.700000,529.204167 227.477999,529.204167 228.255999,529.204167 229.033998,529.204167 229.811997,529.204167 230.589996,529.204167 231.367996,529.204167 232.146004,529.204167 232.924003,529.204167 233.702003,529.204167 234.480002,529.204167 235.258001,529.204167 236.036000,529.204167 236.814000,529.204167 237.591999,529.204167 238.369998,529.204167 239.147997,529.204167 239.925997,529.204167 240.703996,529.204167 241.482004,529.204167 242.260004,529.204167 243.038003,529.204167 243.816002,529.204167 244.594001,529.204167 245.372001,529.204167 246.150000,529.204167 246.927999,529.204167 247.705999,529.204167 248.483998,529.204167 249.261997,529.204167 250.039996,529.204167 250.817996,529.204167 251.596004,529.204167 252.374003,529.204167 253.152003,529.204167 253.930002,529.204167 254.708001,529.204167 255.486000,529.204167 256.264000,529.204167 257.041999,529.204167 257.819998,529.204167 258.597997,529.204167 259.375997,529.204167 260.153996,529.204167 260.932004,529.204167 261.710004,529.204167 262.488003,529.204167 263.266002,529.204167 264.044001,529.204167 264.822001,529.204167 265.600000,529.204167 265.600000,461.387500 265.600000,461.387500 266.377999,461.387500 267.155999,461.387500 267.933998,461.387500 268.711997,461.387500 269.489996,461.387500 270.267996,461.387500 271.045995,461.387500 271.823994,461.387500 272.601993,461.387500 273.379993,461.387500 274.157992,461.387500 274.935991,461.387500 275.714009,461.387500 276.492008,461.387500 277.270007,461.387500 278.048007,461.387500 278.826006,461.387500 279.604005,461.387500 280.382004,461.387500 281.160004,461.387500 281.938003,461.387500 282.716002,461.387500 283.494001,461.387500 284.272001,461.387500 285.050000,461.387500 285.827999,461.387500 286.605999,461.387500 287.383998,461.387500 288.161997,461.387500 288.939996,461.387500 289.717996,461.387500 290.495995,461.387500 291.273994,461.387500 292.051993,461.387500 292.829993,461.387500 293.607992,461.387500 294.385991,461.387500 295.164009,461.387500 295.942008,461.387500 296.720007,461.387500 297.498007,461.387500 298.276006,461.387500 299.054005,461.387500 299.832004,461.387500 300.610004,461.387500 301.388003,461.387500 302.166002,461.387500 302.944001,461.387500 303.722001,461.387500 304.500000,461.387500 304.500000,529.204167 305.277999,529.204167 306.055999,529.204167 306.833998,529.204167 307.611997,529.204167 308.389996,529.204167 309.167996,529.204167 309.945995,529.204167 310.723994,529.204167 311.501993,529.204167 312.279993,529.204167 313.057992,529.204167 313.835991,529.204167 314.614009,529.204167 315.392008,529.204167 316.170007,529.204167 316.948007,529.204167 317.726006,529.204167 318.504005,529.204167 319.282004,529.204167 320.060004,529.204167 320.838003,529.204167 321.616002,529.204167 322.394001,529.204167 323.172001,529.204167 323.950000,529.204167 324.727999,529.204167 325.505999,529.204167 326.283998,529.204167 327.061997,529.204167 327.839996,529.204167 328.617996,529.204167 329.395995,529.204167 330.173994,529.204167 330.951993,529.204167 331.729993,529.204167 332.507992,529.204167 333.285991,529.204167 334.064009,529.204167 334.842008,529.204167 335.620007,529.204167 336.398007,529.204167 337.176006,529.204167 337.954005,529.204167 338.732004,529.204167 339.510004,529.204167 340.288003,529.204167 341.066002,529.204167 341.844001,529.204167 342.622001,529.204167 343.400000,529.204167 343.400000,461.387500 344.177999,461.387500 344.955999,461.387500 345.733998,461.387500 346.511997,461.387500 347.289996,461.387500 348.067996,461.387500 348.845995,461.387500 349.623994,461.387500 350.401993,461.387500 351.179993,461.387500 351.957992,461.387500 352.735991,461.387500 353.514009,461.387500 354.292008,461.387500 355.070007,461.387500 355.848007,461.387500 356.626006,461.387500 357.404005,461.387500 358.182004,461.387500 358.960004,461.387500 359.738003,461.387500 360.516002,461.387500 361.294001,461.387500 362.072001,461.387500 362.850000,461.387500 363.627999,461.387500 364.405999,461.387500 365.183998,461.387500 365.961997,461.387500 366.739996,461.387500 367.517996,461.387500 368.295995,461.387500 369.073994,461.387500 369.851993,461.387500 370.629993,461.387500 371.407992,461.387500 372.185991,461.387500 372.964009,461.387500 373.742008,461.387500 374.520007,461.387500 375.298007,461.387500 376.076006,461.387500 376.854005,461.387500 377.632004,461.387500 378.410004,461.387500 379.188003,461.387500 379.966002,461.387500 380.744001,461.387500 381.522001,461.387500 382.300000,461.387500 382.300000,529.204167 383.077999,529.204167 383.855999,529.204167 384.633998,529.204167 385.411997,529.204167 386.189996,529.204167 386.967996,529.204167 387.745995,529.204167 388.523994,529.204167 389.301993,529.204167 390.079993,529.204167 390.857992,529.204167 391.635991,529.204167 392.414009,529.204167 393.192008,529.204167 393.970007,529.204167 394.748007,529.204167 395.526006,529.204167 396.304005,529.204167 397.082004,529.204167 397.860004,529.204167 398.638003,529.204167 399.416002,529.204167 400.194001,529.204167 400.972001,529.204167 401.750000,529.204167 402.527999,529.204167 403.305999,529.204167 404.083998,529.204167 404.861997,529.204167 405.639996,529.204167 406.417996,529.204167 407.195995,529.204167 407.973994,529.204167 408.751993,529.204167 409.529993,529.204167 410.307992,529.204167 411.085991,529.204167 411.864009,529.204167 412.642008,529.204167 413.420007,529.204167 414.198007,529.204167 414.976006,529.204167 415.754005,529.204167 416.532004,529.204167 417.310004,529.204167 418.088003,529.204167 418.866002,529.204167 419.644001,529.204167 420.422001,529.204167 421.200000,529.204167 421.200000,461.387500 421.978018,461.387500 422.755999,461.387500 423.534016,461.387500 424.311997,461.387500 425.090015,461.387500 425.867996,461.387500 426.646013,461.387500 427.423994,461.387500 428.202012,461.387500 428.979993,461.387500 429.758010,461.387500 430.535991,461.387500 431.314009,461.387500 432.091990,461.387500 432.870007,461.387500 433.647988,461.387500 434.426006,461.387500 435.203987,461.387500 435.982004,461.387500 436.759985,461.387500 437.538003,461.387500 438.315984,461.387500 439.094001,461.387500 439.871982,461.387500 440.650000,461.387500 441.428018,461.387500 442.205999,461.387500 442.984016,461.387500 443.761997,461.387500 444.540015,461.387500 445.317996,461.387500 446.096013,461.387500 446.873994,461.387500 447.652012,461.387500 448.429993,461.387500 449.208010,461.387500 449.985991,461.387500 450.764009,461.387500 451.541990,461.387500 452.320007,461.387500 453.097988,461.387500 453.876006,461.387500 454.653987,461.387500 455.432004,461.387500 456.209985,461.387500 456.988003,461.387500 457.765984,461.387500 458.544001,461.387500 459.321982,461.387500 460.100000,461.387500 460.100000,529.204167 460.878018,529.204167 461.655999,529.204167 462.434016,529.204167 463.211997,529.204167 463.990015,529.204167 464.767996,529.204167 465.546013,529.204167 466.323994,529.204167 467.102012,529.204167 467.879993,529.204167 468.658010,529.204167 469.435991,529.204167 470.214009,529.204167 470.991990,529.204167 471.770007,529.204167 472.547988,529.204167 473.326006,529.204167 474.103987,529.204167 474.882004,529.204167 475.659985,529.204167 476.438003,529.204167 477.215984,529.204167 477.994001,529.204167 478.771982,529.204167 479.550000,529.204167 480.328018,529.204167 481.105999,529.204167 481.884016,529.204167 482.661997,529.204167 483.440015,529.204167 484.217996,529.204167 484.996013,529.204167 485.773994,529.204167 486.552012,529.204167 487.329993,529.204167 488.108010,529.204167 488.885991,529.204167 489.664009,529.204167 490.441990,529.204167 491.220007,529.204167 491.997988,529.204167 492.776006,529.204167 493.553987,529.204167 494.332004,529.204167 495.109985,529.204167 495.888003,529.204167 496.665984,529.204167 497.444001,529.204167 498.221982,529.204167 499.000000,529.204167 499.000000,461.387500"
-     id="polyline168"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     clip-path="url(#clipArea2)"
-     points="110.000000,556.591667 110.778000,556.591667 111.556000,556.591667 112.334000,556.591667 113.112000,556.591667 113.890000,556.591667 114.668000,556.591667 115.446000,556.591667 116.224000,556.591667 117.002000,556.591667 117.780000,556.591667 118.558000,556.591667 119.336000,556.591667 120.114000,556.591667 120.892000,556.591667 121.670000,556.591667 122.448000,556.591667 123.226000,556.591667 124.004001,556.591667 124.782000,556.591667 125.560000,556.591667 126.337999,556.591667 127.116000,556.591667 127.894000,556.591667 128.672000,556.591667 129.450000,556.591667 130.227999,556.591667 131.006001,556.591667 131.784000,556.591667 132.561999,556.591667 133.340001,556.591667 134.118000,556.591667 134.895999,556.591667 135.674001,556.591667 136.452000,556.591667 137.230000,556.591667 138.008001,556.591667 138.786000,556.591667 139.564000,556.591667 140.341999,556.591667 141.120000,556.591667 141.898000,556.591667 142.675999,556.591667 143.454001,556.591667 144.232000,556.591667 145.009999,556.591667 145.788001,556.591667 146.566000,556.591667 147.343999,556.591667 148.122001,556.591667 148.900000,556.591667 148.900000,556.591667 148.900000,556.591667 148.900000,556.591667 149.677999,556.591667 150.455999,556.591667 151.233998,556.591667 152.012002,556.591667 152.790001,556.591667 153.568000,556.591667 154.345999,556.591667 155.123999,556.591667 155.901998,556.591667 156.680002,556.591667 157.458001,556.591667 158.236000,556.591667 159.014000,556.591667 159.791999,556.591667 160.569998,556.591667 161.348002,556.591667 162.126001,556.591667 162.904001,556.591667 163.682000,556.591667 164.459999,556.591667 165.237998,556.591667 166.016002,556.591667 166.794001,556.591667 167.572001,556.591667 168.350000,556.591667 169.127999,556.591667 169.905999,556.591667 170.683998,556.591667 171.462002,556.591667 172.240001,556.591667 173.018000,556.591667 173.795999,556.591667 174.573999,556.591667 175.351998,556.591667 176.130002,556.591667 176.908001,556.591667 177.686000,556.591667 178.464000,556.591667 179.241999,556.591667 180.019998,556.591667 180.798002,556.591667 181.576001,556.591667 182.354001,556.591667 183.132000,556.591667 183.909999,556.591667 184.687998,556.591667 185.466002,556.591667 186.244001,556.591667 187.022001,556.591667 187.800000,556.591667 187.800000,556.591667 187.800000,556.591667 188.577999,556.591667 189.355999,556.591667 190.133998,556.591667 190.911997,556.591667 191.689996,556.591667 192.467996,556.591667 193.246004,556.591667 194.024003,556.591667 194.802003,556.591667 195.580002,556.591667 196.358001,556.591667 197.136000,556.591667 197.914000,556.591667 198.691999,556.591667 199.469998,556.591667 200.247997,556.591667 201.025997,556.591667 201.803996,556.591667 202.582004,556.591667 203.360004,556.591667 204.138003,556.591667 204.916002,556.591667 205.694001,556.591667 206.472001,556.591667 207.250000,556.591667 208.027999,556.591667 208.805999,556.591667 209.583998,556.591667 210.361997,556.591667 211.139996,556.591667 211.917996,556.591667 212.696004,556.591667 213.474003,556.591667 214.252003,556.591667 215.030002,556.591667 215.808001,556.591667 216.586000,556.591667 217.364000,556.591667 218.141999,556.591667 218.919998,556.591667 219.697997,556.591667 220.475997,556.591667 221.253996,556.591667 222.032004,556.591667 222.810004,556.591667 223.588003,556.591667 224.366002,556.591667 225.144001,556.591667 225.922001,556.591667 226.700000,556.591667 226.700000,556.591667 226.700000,556.591667 227.477999,556.591667 228.255999,556.591667 229.033998,556.591667 229.811997,556.591667 230.589996,556.591667 231.367996,556.591667 232.146004,556.591667 232.924003,556.591667 233.702003,556.591667 234.480002,556.591667 235.258001,556.591667 236.036000,556.591667 236.814000,556.591667 237.591999,556.591667 238.369998,556.591667 239.147997,556.591667 239.925997,556.591667 240.703996,556.591667 241.482004,556.591667 242.260004,556.591667 243.038003,556.591667 243.816002,556.591667 244.594001,556.591667 245.372001,556.591667 246.150000,556.591667 246.927999,556.591667 247.705999,556.591667 248.483998,556.591667 249.261997,556.591667 250.039996,556.591667 250.817996,556.591667 251.596004,556.591667 252.374003,556.591667 253.152003,556.591667 253.930002,556.591667 254.708001,556.591667 255.486000,556.591667 256.264000,556.591667 257.041999,556.591667 257.819998,556.591667 258.597997,556.591667 259.375997,556.591667 260.153996,556.591667 260.932004,556.591667 261.710004,556.591667 262.488003,556.591667 263.266002,556.591667 264.044001,556.591667 264.822001,556.591667 265.600000,556.591667 265.600000,556.591667 265.600000,556.591667 266.377999,556.591667 267.155999,556.591667 267.933998,556.591667 268.711997,556.591667 269.489996,556.591667 270.267996,556.591667 271.045995,556.591667 271.823994,556.591667 272.601993,556.591667 273.379993,556.591667 274.157992,556.591667 274.935991,556.591667 275.714009,556.591667 276.492008,556.591667 277.270007,556.591667 278.048007,556.591667 278.826006,556.591667 279.604005,556.591667 280.382004,556.591667 281.160004,556.591667 281.938003,556.591667 282.716002,556.591667 283.494001,556.591667 284.272001,556.591667 285.050000,556.591667 285.827999,556.591667 286.605999,556.591667 287.383998,556.591667 288.161997,556.591667 288.939996,556.591667 289.717996,556.591667 290.495995,556.591667 291.273994,556.591667 292.051993,556.591667 292.829993,556.591667 293.607992,556.591667 294.385991,556.591667 295.164009,556.591667 295.942008,556.591667 296.720007,556.591667 297.498007,556.591667 298.276006,556.591667 299.054005,556.591667 299.832004,556.591667 300.610004,556.591667 301.388003,556.591667 302.166002,556.591667 302.944001,556.591667 303.722001,556.591667 304.500000,556.591667 304.500000,556.591667 305.277999,556.591667 306.055999,556.591667 306.833998,556.591667 307.611997,556.591667 308.389996,556.591667 309.167996,556.591667 309.945995,556.591667 310.723994,556.591667 311.501993,556.591667 312.279993,556.591667 313.057992,556.591667 313.835991,556.591667 314.614009,556.591667 315.392008,556.591667 316.170007,556.591667 316.948007,556.591667 317.726006,556.591667 318.504005,556.591667 319.282004,556.591667 320.060004,556.591667 320.838003,556.591667 321.616002,556.591667 322.394001,556.591667 323.172001,556.591667 323.950000,556.591667 324.727999,556.591667 325.505999,556.591667 326.283998,556.591667 327.061997,556.591667 327.839996,556.591667 328.617996,556.591667 329.395995,556.591667 330.173994,556.591667 330.951993,556.591667 331.729993,556.591667 332.507992,556.591667 333.285991,556.591667 334.064009,556.591667 334.842008,556.591667 335.620007,556.591667 336.398007,556.591667 337.176006,556.591667 337.954005,556.591667 338.732004,556.591667 339.510004,556.591667 340.288003,556.591667 341.066002,556.591667 341.844001,556.591667 342.622001,556.591667 343.400000,556.591667 343.400000,556.591667 344.177999,556.591667 344.955999,556.591667 345.733998,556.591667 346.511997,556.591667 347.289996,556.591667 348.067996,556.591667 348.845995,556.591667 349.623994,556.591667 350.401993,556.591667 351.179993,556.591667 351.957992,556.591667 352.735991,556.591667 353.514009,556.591667 354.292008,556.591667 355.070007,556.591667 355.848007,556.591667 356.626006,556.591667 357.404005,556.591667 358.182004,556.591667 358.960004,556.591667 359.738003,556.591667 360.516002,556.591667 361.294001,556.591667 362.072001,556.591667 362.850000,556.591667 363.627999,556.591667 364.405999,556.591667 365.183998,556.591667 365.961997,556.591667 366.739996,556.591667 367.517996,556.591667 368.295995,556.591667 369.073994,556.591667 369.851993,556.591667 370.629993,556.591667 371.407992,556.591667 372.185991,556.591667 372.964009,556.591667 373.742008,556.591667 374.520007,556.591667 375.298007,556.591667 376.076006,556.591667 376.854005,556.591667 377.632004,556.591667 378.410004,556.591667 379.188003,556.591667 379.966002,556.591667 380.744001,556.591667 381.522001,556.591667 382.300000,556.591667 382.300000,556.591667 383.077999,556.591667 383.855999,556.591667 384.633998,556.591667 385.411997,556.591667 386.189996,556.591667 386.967996,556.591667 387.745995,556.591667 388.523994,556.591667 389.301993,556.591667 390.079993,556.591667 390.857992,556.591667 391.635991,556.591667 392.414009,556.591667 393.192008,556.591667 393.970007,556.591667 394.748007,556.591667 395.526006,556.591667 396.304005,556.591667 397.082004,556.591667 397.860004,556.591667 398.638003,556.591667 399.416002,556.591667 400.194001,556.591667 400.972001,556.591667 401.750000,556.591667 402.527999,556.591667 403.305999,556.591667 404.083998,556.591667 404.861997,556.591667 405.639996,556.591667 406.417996,556.591667 407.195995,556.591667 407.973994,556.591667 408.751993,556.591667 409.529993,556.591667 410.307992,556.591667 411.085991,556.591667 411.864009,556.591667 412.642008,556.591667 413.420007,556.591667 414.198007,556.591667 414.976006,556.591667 415.754005,556.591667 416.532004,556.591667 417.310004,556.591667 418.088003,556.591667 418.866002,556.591667 419.644001,556.591667 420.422001,556.591667 421.200000,556.591667 421.200000,556.591667 421.978018,556.591667 422.755999,556.591667 423.534016,556.591667 424.311997,556.591667 425.090015,556.591667 425.867996,556.591667 426.646013,556.591667 427.423994,556.591667 428.202012,556.591667 428.979993,556.591667 429.758010,556.591667 430.535991,556.591667 431.314009,556.591667 432.091990,556.591667 432.870007,556.591667 433.647988,556.591667 434.426006,556.591667 435.203987,556.591667 435.982004,556.591667 436.759985,556.591667 437.538003,556.591667 438.315984,556.591667 439.094001,556.591667 439.871982,556.591667 440.650000,556.591667 441.428018,556.591667 442.205999,556.591667 442.984016,556.591667 443.761997,556.591667 444.540015,556.591667 445.317996,556.591667 446.096013,556.591667 446.873994,556.591667 447.652012,556.591667 448.429993,556.591667 449.208010,556.591667 449.985991,556.591667 450.764009,556.591667 451.541990,556.591667 452.320007,556.591667 453.097988,556.591667 453.876006,556.591667 454.653987,556.591667 455.432004,556.591667 456.209985,556.591667 456.988003,556.591667 457.765984,556.591667 458.544001,556.591667 459.321982,556.591667 460.100000,556.591667 460.100000,556.591667 460.878018,556.591667 461.655999,556.591667 462.434016,556.591667 463.211997,556.591667 463.990015,556.591667 464.767996,556.591667 465.546013,556.591667 466.323994,556.591667 467.102012,556.591667 467.879993,556.591667 468.658010,556.591667 469.435991,556.591667 470.214009,556.591667 470.991990,556.591667 471.770007,556.591667 472.547988,556.591667 473.326006,556.591667 474.103987,556.591667 474.882004,556.591667 475.659985,556.591667 476.438003,556.591667 477.215984,556.591667 477.994001,556.591667 478.771982,556.591667 479.550000,556.591667 480.328018,556.591667 481.105999,556.591667 481.884016,556.591667 482.661997,556.591667 483.440015,556.591667 484.217996,556.591667 484.996013,556.591667 485.773994,556.591667 486.552012,556.591667 487.329993,556.591667 488.108010,556.591667 488.885991,556.591667 489.664009,556.591667 490.441990,556.591667 491.220007,556.591667 491.997988,556.591667 492.776006,556.591667 493.553987,556.591667 494.332004,556.591667 495.109985,556.591667 495.888003,556.591667 496.665984,556.591667 497.444001,556.591667 498.221982,556.591667 499.000000,556.591667 499.000000,556.591667"
-     id="polyline170"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <polyline
-     clip-path="url(#clipArea2)"
-     points="110.000000,719.612500 110.778000,719.612500 111.556000,719.612500 112.334000,719.612500 113.112000,719.612500 113.890000,719.612500 114.668000,719.612500 115.446000,719.612500 116.224000,719.612500 117.002000,719.612500 117.780000,719.612500 118.558000,719.612500 119.336000,719.612500 120.114000,719.612500 120.892000,719.612500 121.670000,719.612500 122.448000,719.612500 123.226000,719.612500 124.004001,719.612500 124.782000,719.612500 125.560000,719.612500 126.337999,719.612500 127.116000,719.612500 127.894000,719.612500 128.672000,719.612500 129.450000,719.612500 130.227999,719.612500 131.006001,719.612500 131.784000,719.612500 132.561999,719.612500 133.340001,719.612500 134.118000,719.612500 134.895999,719.612500 135.674001,719.612500 136.452000,719.612500 137.230000,719.612500 138.008001,719.612500 138.786000,719.612500 139.564000,719.612500 140.341999,719.612500 141.120000,719.612500 141.898000,719.612500 142.675999,719.612500 143.454001,719.612500 144.232000,719.612500 145.009999,719.612500 145.788001,719.612500 146.566000,719.612500 147.343999,719.612500 148.122001,719.612500 148.900000,719.612500 148.900000,719.612500 148.900000,719.612500 148.900000,719.612500 149.677999,719.612500 150.455999,719.612500 151.233998,719.612500 152.012002,719.612500 152.790001,719.612500 153.568000,719.612500 154.345999,719.612500 155.123999,719.612500 155.901998,719.612500 156.680002,719.612500 157.458001,719.612500 158.236000,719.612500 159.014000,719.612500 159.791999,719.612500 160.569998,719.612500 161.348002,719.612500 162.126001,719.612500 162.904001,719.612500 163.682000,719.612500 164.459999,719.612500 165.237998,719.612500 166.016002,719.612500 166.794001,719.612500 167.572001,719.612500 168.350000,719.612500 169.127999,719.612500 169.905999,719.612500 170.683998,719.612500 171.462002,719.612500 172.240001,719.612500 173.018000,719.612500 173.795999,719.612500 174.573999,719.612500 175.351998,719.612500 176.130002,719.612500 176.908001,719.612500 177.686000,719.612500 178.464000,719.612500 179.241999,719.612500 180.019998,719.612500 180.798002,719.612500 181.576001,719.612500 182.354001,719.612500 183.132000,719.612500 183.909999,719.612500 184.687998,719.612500 185.466002,719.612500 186.244001,719.612500 187.022001,719.612500 187.800000,719.612500 187.800000,719.612500 187.800000,719.612500 188.577999,719.612500 189.355999,719.612500 190.133998,719.612500 190.911997,719.612500 191.689996,719.612500 192.467996,719.612500 193.246004,719.612500 194.024003,719.612500 194.802003,719.612500 195.580002,719.612500 196.358001,719.612500 197.136000,719.612500 197.914000,719.612500 198.691999,719.612500 199.469998,719.612500 200.247997,719.612500 201.025997,719.612500 201.803996,719.612500 202.582004,719.612500 203.360004,719.612500 204.138003,719.612500 204.916002,719.612500 205.694001,719.612500 206.472001,719.612500 207.250000,719.612500 208.027999,719.612500 208.805999,719.612500 209.583998,719.612500 210.361997,719.612500 211.139996,719.612500 211.917996,719.612500 212.696004,719.612500 213.474003,719.612500 214.252003,719.612500 215.030002,719.612500 215.808001,719.612500 216.586000,719.612500 217.364000,719.612500 218.141999,719.612500 218.919998,719.612500 219.697997,719.612500 220.475997,719.612500 221.253996,719.612500 222.032004,719.612500 222.810004,719.612500 223.588003,719.612500 224.366002,719.612500 225.144001,719.612500 225.922001,719.612500 226.700000,719.612500 226.700000,719.612500 226.700000,719.612500 227.477999,719.612500 228.255999,719.612500 229.033998,719.612500 229.811997,719.612500 230.589996,719.612500 231.367996,719.612500 232.146004,719.612500 232.924003,719.612500 233.702003,719.612500 234.480002,719.612500 235.258001,719.612500 236.036000,719.612500 236.814000,719.612500 237.591999,719.612500 238.369998,719.612500 239.147997,719.612500 239.925997,719.612500 240.703996,719.612500 241.482004,719.612500 242.260004,719.612500 243.038003,719.612500 243.816002,719.612500 244.594001,719.612500 245.372001,719.612500 246.150000,719.612500 246.927999,719.612500 247.705999,719.612500 248.483998,719.612500 249.261997,719.612500 250.039996,719.612500 250.817996,719.612500 251.596004,719.612500 252.374003,719.612500 253.152003,719.612500 253.930002,719.612500 254.708001,719.612500 255.486000,719.612500 256.264000,719.612500 257.041999,719.612500 257.819998,719.612500 258.597997,719.612500 259.375997,719.612500 260.153996,719.612500 260.932004,719.612500 261.710004,719.612500 262.488003,719.612500 263.266002,719.612500 264.044001,719.612500 264.822001,719.612500 265.600000,719.612500 265.600000,719.612500 265.600000,719.612500 266.377999,719.612500 267.155999,719.612500 267.933998,719.612500 268.711997,719.612500 269.489996,719.612500 270.267996,719.612500 271.045995,719.612500 271.823994,719.612500 272.601993,719.612500 273.379993,719.612500 274.157992,719.612500 274.935991,719.612500 275.714009,719.612500 276.492008,719.612500 277.270007,719.612500 278.048007,719.612500 278.826006,719.612500 279.604005,719.612500 280.382004,719.612500 281.160004,719.612500 281.938003,719.612500 282.716002,719.612500 283.494001,719.612500 284.272001,719.612500 285.050000,719.612500 285.827999,719.612500 286.605999,719.612500 287.383998,719.612500 288.161997,719.612500 288.939996,719.612500 289.717996,719.612500 290.495995,719.612500 291.273994,719.612500 292.051993,719.612500 292.829993,719.612500 293.607992,719.612500 294.385991,719.612500 295.164009,719.612500 295.942008,719.612500 296.720007,719.612500 297.498007,719.612500 298.276006,719.612500 299.054005,719.612500 299.832004,719.612500 300.610004,719.612500 301.388003,719.612500 302.166002,719.612500 302.944001,719.612500 303.722001,719.612500 304.500000,719.612500 304.500000,719.612500 305.277999,719.612500 306.055999,719.612500 306.833998,719.612500 307.611997,719.612500 308.389996,719.612500 309.167996,719.612500 309.945995,719.612500 310.723994,719.612500 311.501993,719.612500 312.279993,719.612500 313.057992,719.612500 313.835991,719.612500 314.614009,719.612500 315.392008,719.612500 316.170007,719.612500 316.948007,719.612500 317.726006,719.612500 318.504005,719.612500 319.282004,719.612500 320.060004,719.612500 320.838003,719.612500 321.616002,719.612500 322.394001,719.612500 323.172001,719.612500 323.950000,719.612500 324.727999,719.612500 325.505999,719.612500 326.283998,719.612500 327.061997,719.612500 327.839996,719.612500 328.617996,719.612500 329.395995,719.612500 330.173994,719.612500 330.951993,719.612500 331.729993,719.612500 332.507992,719.612500 333.285991,719.612500 334.064009,719.612500 334.842008,719.612500 335.620007,719.612500 336.398007,719.612500 337.176006,719.612500 337.954005,719.612500 338.732004,719.612500 339.510004,719.612500 340.288003,719.612500 341.066002,719.612500 341.844001,719.612500 342.622001,719.612500 343.400000,719.612500 343.400000,719.612500 344.177999,719.612500 344.955999,719.612500 345.733998,719.612500 346.511997,719.612500 347.289996,719.612500 348.067996,719.612500 348.845995,719.612500 349.623994,719.612500 350.401993,719.612500 351.179993,719.612500 351.957992,719.612500 352.735991,719.612500 353.514009,719.612500 354.292008,719.612500 355.070007,719.612500 355.848007,719.612500 356.626006,719.612500 357.404005,719.612500 358.182004,719.612500 358.960004,719.612500 359.738003,719.612500 360.516002,719.612500 361.294001,719.612500 362.072001,719.612500 362.850000,719.612500 363.627999,719.612500 364.405999,719.612500 365.183998,719.612500 365.961997,719.612500 366.739996,719.612500 367.517996,719.612500 368.295995,719.612500 369.073994,719.612500 369.851993,719.612500 370.629993,719.612500 371.407992,719.612500 372.185991,719.612500 372.964009,719.612500 373.742008,719.612500 374.520007,719.612500 375.298007,719.612500 376.076006,719.612500 376.854005,719.612500 377.632004,719.612500 378.410004,719.612500 379.188003,719.612500 379.966002,719.612500 380.744001,719.612500 381.522001,719.612500 382.300000,719.612500 382.300000,719.612500 383.077999,719.612500 383.855999,719.612500 384.633998,719.612500 385.411997,719.612500 386.189996,719.612500 386.967996,719.612500 387.745995,719.612500 388.523994,719.612500 389.301993,719.612500 390.079993,719.612500 390.857992,719.612500 391.635991,719.612500 392.414009,719.612500 393.192008,719.612500 393.970007,719.612500 394.748007,719.612500 395.526006,719.612500 396.304005,719.612500 397.082004,719.612500 397.860004,719.612500 398.638003,719.612500 399.416002,719.612500 400.194001,719.612500 400.972001,719.612500 401.750000,719.612500 402.527999,719.612500 403.305999,719.612500 404.083998,719.612500 404.861997,719.612500 405.639996,719.612500 406.417996,719.612500 407.195995,719.612500 407.973994,719.612500 408.751993,719.612500 409.529993,719.612500 410.307992,719.612500 411.085991,719.612500 411.864009,719.612500 412.642008,719.612500 413.420007,719.612500 414.198007,719.612500 414.976006,719.612500 415.754005,719.612500 416.532004,719.612500 417.310004,719.612500 418.088003,719.612500 418.866002,719.612500 419.644001,719.612500 420.422001,719.612500 421.200000,719.612500 421.200000,719.612500 421.978018,719.612500 422.755999,719.612500 423.534016,719.612500 424.311997,719.612500 425.090015,719.612500 425.867996,719.612500 426.646013,719.612500 427.423994,719.612500 428.202012,719.612500 428.979993,719.612500 429.758010,719.612500 430.535991,719.612500 431.314009,719.612500 432.091990,719.612500 432.870007,719.612500 433.647988,719.612500 434.426006,719.612500 435.203987,719.612500 435.982004,719.612500 436.759985,719.612500 437.538003,719.612500 438.315984,719.612500 439.094001,719.612500 439.871982,719.612500 440.650000,719.612500 441.428018,719.612500 442.205999,719.612500 442.984016,719.612500 443.761997,719.612500 444.540015,719.612500 445.317996,719.612500 446.096013,719.612500 446.873994,719.612500 447.652012,719.612500 448.429993,719.612500 449.208010,719.612500 449.985991,719.612500 450.764009,719.612500 451.541990,719.612500 452.320007,719.612500 453.097988,719.612500 453.876006,719.612500 454.653987,719.612500 455.432004,719.612500 456.209985,719.612500 456.988003,719.612500 457.765984,719.612500 458.544001,719.612500 459.321982,719.612500 460.100000,719.612500 460.100000,719.612500 460.878018,719.612500 461.655999,719.612500 462.434016,719.612500 463.211997,719.612500 463.990015,719.612500 464.767996,719.612500 465.546013,719.612500 466.323994,719.612500 467.102012,719.612500 467.879993,719.612500 468.658010,719.612500 469.435991,719.612500 470.214009,719.612500 470.991990,719.612500 471.770007,719.612500 472.547988,719.612500 473.326006,719.612500 474.103987,719.612500 474.882004,719.612500 475.659985,719.612500 476.438003,719.612500 477.215984,719.612500 477.994001,719.612500 478.771982,719.612500 479.550000,719.612500 480.328018,719.612500 481.105999,719.612500 481.884016,719.612500 482.661997,719.612500 483.440015,719.612500 484.217996,719.612500 484.996013,719.612500 485.773994,719.612500 486.552012,719.612500 487.329993,719.612500 488.108010,719.612500 488.885991,719.612500 489.664009,719.612500 490.441990,719.612500 491.220007,719.612500 491.997988,719.612500 492.776006,719.612500 493.553987,719.612500 494.332004,719.612500 495.109985,719.612500 495.888003,719.612500 496.665984,719.612500 497.444001,719.612500 498.221982,719.612500 499.000000,719.612500 499.000000,719.612500"
-     id="polyline172"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168925,76.057863)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="520.55786"
-     id="text174"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">truCle.u</text>
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="615.55786"
-     id="text176"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">truCle.clr</text>
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="710.55786"
-     id="text178"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">truCle.y</text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="65.230194"
-     y="52.469131"
-     id="text995"><tspan
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.112px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.602783px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="1142.9438"
+     y="21.08676"
+     id="text995-4-2-9-5"><tspan
        sodipodi:role="line"
-       id="tspan1117"
-       x="65.230194"
-       y="52.469131">clear input: false</tspan></text>
+       id="tspan1154"
+       x="1142.9438"
+       y="21.08676">At same moments, </tspan><tspan
+       sodipodi:role="line"
+       id="tspan1156"
+       x="1142.9438"
+       y="51.226776">latch input rises (falls), clear input rises (falls)</tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026417px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="64.6138"
-     y="494.34314"
-     id="text995-4"><tspan
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.112px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.602783px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="1141.6394"
+     y="472.45724"
+     id="text995-4-2-9-5-8"><tspan
        sodipodi:role="line"
-       id="tspan1119"
-       x="64.6138"
-       y="494.34314">clear input: true</tspan></text>
+       id="tspan1158"
+       x="1141.6394"
+       y="472.45724">At same moments, </tspan><tspan
+       sodipodi:role="line"
+       id="tspan1160"
+       x="1141.6394"
+       y="502.59726">latch input falls (rises), clear input rises (falls)</tspan><tspan
+       sodipodi:role="line"
+       id="tspan1162"
+       x="1141.6394"
+       y="532.73724" /></text>
   <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline2-5" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,34.000000 187.800000,347.000000"
-     id="polyline4-6" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,34.000000 265.600000,347.000000"
-     id="polyline6-6" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,34.000000 343.400000,347.000000"
-     id="polyline8-4" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,34.000000 421.200000,347.000000"
-     id="polyline10-0" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 499.000000,347.000000"
-     id="polyline12-0" />
+     id="polyline1179"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,34.000000 182.000000,347.000000"
+     id="polyline1181"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,34.000000 254.000000,347.000000"
+     id="polyline1183"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,34.000000 326.000000,347.000000"
+     id="polyline1185"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,34.000000 398.000000,347.000000"
+     id="polyline1187"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 470.000000,347.000000"
+     id="polyline1189"
+     transform="translate(-47.819344,40.730323)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="607.44971"
-     y="95.135849"
-     width="389"
-     height="67.816704"
-     id="rect14-4" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="102.02609"
+     width="360"
+     height="68"
+     id="rect1191" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="607.44971"
-     y="190.34035"
-     width="389"
-     height="67.816704"
-     id="rect16-6" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="197.23032"
+     width="360"
+     height="68"
+     id="rect1193" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="607.44971"
-     y="285.54437"
-     width="389"
-     height="67.816704"
-     id="rect18-2" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,347.000000 499.000000,347.000000"
-     id="polyline20-6" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,34.000000"
-     id="polyline22-7" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 110.000000,34.000000"
-     id="polyline24-5" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="292.4343"
+     width="360"
+     height="68"
+     id="rect1195" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 470.000000,347.000000"
+     id="polyline1197"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,34.000000"
+     id="polyline1199"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 110.000000,34.000000"
+     id="polyline1201"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline26-6" />
+     id="polyline1203"
+     transform="translate(-47.819344,40.730323)" />
   <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,355.000000"
-     id="polyline28-9" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,347.000000 187.800000,355.000000"
-     id="polyline30-8" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,355.000000"
-     id="polyline32-7" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,347.000000 343.400000,355.000000"
-     id="polyline34-2" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,355.000000"
-     id="polyline36-8" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,355.000000"
-     id="polyline38-2" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1205"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,347.000000 182.000000,355.000000"
+     id="polyline1207"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,355.000000"
+     id="polyline1209"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,347.000000 326.000000,355.000000"
+     id="polyline1211"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,355.000000"
+     id="polyline1213"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,355.000000"
+     id="polyline1215"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,359.800000"
-     id="polyline40-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="607.44971"
-     y="412.24835"
-     id="text42-9">0</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,359.800000"
-     id="polyline44-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="763.04968"
-     y="412.24835"
-     id="text46-0">4</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,359.800000"
-     id="polyline48-2" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="918.64972"
-     y="412.24835"
-     id="text50-7">8</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1217"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="62.180664"
+     y="419.23032"
+     id="text1219">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,359.800000"
+     id="polyline1221"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="206.18066"
+     y="419.23032"
+     id="text1223">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,359.800000"
+     id="polyline1225"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="350.18066"
+     y="419.23032"
+     id="text1227">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,129.204167 110.000000,129.204167"
-     id="polyline52-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="162.95235"
-     id="text54-1">false</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1229"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="169.9343"
+     id="text1231">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,61.387500 110.000000,61.387500"
-     id="polyline56-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="95.135849"
-     id="text58-2">true</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1233"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="102.11777"
+     id="text1235">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,224.408333 110.000000,224.408333"
-     id="polyline60-1" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="258.15637"
-     id="text62-5">false</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1237"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="265.13828"
+     id="text1239">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,156.591667 110.000000,156.591667"
-     id="polyline64-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="190.34035"
-     id="text66-9">true</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1241"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="197.32236"
+     id="text1243">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,319.612500 110.000000,319.612500"
-     id="polyline68-1" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="353.36136"
-     id="text70-4">false</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1245"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="360.34335"
+     id="text1247">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,251.795833 110.000000,251.795833"
-     id="polyline72-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="285.54437"
-     id="text74-1">true</text>
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-3)"
-     points="110.000000,61.387500 110.778000,61.387500 111.556000,61.387500 112.334000,61.387500 113.112000,61.387500 113.890000,61.387500 114.668000,61.387500 115.446000,61.387500 116.224000,61.387500 117.002000,61.387500 117.780000,61.387500 118.558000,61.387500 119.336000,61.387500 120.114000,61.387500 120.892000,61.387500 121.670000,61.387500 122.448000,61.387500 123.226000,61.387500 124.004001,61.387500 124.782000,61.387500 125.560000,61.387500 126.337999,61.387500 127.116000,61.387500 127.894000,61.387500 128.672000,61.387500 129.450000,61.387500 130.227999,61.387500 131.006001,61.387500 131.784000,61.387500 132.561999,61.387500 133.340001,61.387500 134.118000,61.387500 134.895999,61.387500 135.674001,61.387500 136.452000,61.387500 137.230000,61.387500 138.008001,61.387500 138.786000,61.387500 139.564000,61.387500 140.341999,61.387500 141.120000,61.387500 141.898000,61.387500 142.675999,61.387500 143.454001,61.387500 144.232000,61.387500 145.009999,61.387500 145.788001,61.387500 146.566000,61.387500 147.343999,61.387500 148.122001,61.387500 148.900000,61.387500 148.900000,129.204167 148.900000,129.204167 148.900000,129.204167 149.677999,129.204167 150.455999,129.204167 151.233998,129.204167 152.012002,129.204167 152.790001,129.204167 153.568000,129.204167 154.345999,129.204167 155.123999,129.204167 155.901998,129.204167 156.680002,129.204167 157.458001,129.204167 158.236000,129.204167 159.014000,129.204167 159.791999,129.204167 160.569998,129.204167 161.348002,129.204167 162.126001,129.204167 162.904001,129.204167 163.682000,129.204167 164.459999,129.204167 165.237998,129.204167 166.016002,129.204167 166.794001,129.204167 167.572001,129.204167 168.350000,129.204167 169.127999,129.204167 169.905999,129.204167 170.683998,129.204167 171.462002,129.204167 172.240001,129.204167 173.018000,129.204167 173.795999,129.204167 174.573999,129.204167 175.351998,129.204167 176.130002,129.204167 176.908001,129.204167 177.686000,129.204167 178.464000,129.204167 179.241999,129.204167 180.019998,129.204167 180.798002,129.204167 181.576001,129.204167 182.354001,129.204167 183.132000,129.204167 183.909999,129.204167 184.687998,129.204167 185.466002,129.204167 186.244001,129.204167 187.022001,129.204167 187.800000,129.204167 187.800000,61.387500 187.800000,61.387500 188.577999,61.387500 189.355999,61.387500 190.133998,61.387500 190.911997,61.387500 191.689996,61.387500 192.467996,61.387500 193.246004,61.387500 194.024003,61.387500 194.802003,61.387500 195.580002,61.387500 196.358001,61.387500 197.136000,61.387500 197.914000,61.387500 198.691999,61.387500 199.469998,61.387500 200.247997,61.387500 201.025997,61.387500 201.803996,61.387500 202.582004,61.387500 203.360004,61.387500 204.138003,61.387500 204.916002,61.387500 205.694001,61.387500 206.472001,61.387500 207.250000,61.387500 208.027999,61.387500 208.805999,61.387500 209.583998,61.387500 210.361997,61.387500 211.139996,61.387500 211.917996,61.387500 212.696004,61.387500 213.474003,61.387500 214.252003,61.387500 215.030002,61.387500 215.808001,61.387500 216.586000,61.387500 217.364000,61.387500 218.141999,61.387500 218.919998,61.387500 219.697997,61.387500 220.475997,61.387500 221.253996,61.387500 222.032004,61.387500 222.810004,61.387500 223.588003,61.387500 224.366002,61.387500 225.144001,61.387500 225.922001,61.387500 226.700000,61.387500 226.700000,129.204167 226.700000,129.204167 227.477999,129.204167 228.255999,129.204167 229.033998,129.204167 229.811997,129.204167 230.589996,129.204167 231.367996,129.204167 232.146004,129.204167 232.924003,129.204167 233.702003,129.204167 234.480002,129.204167 235.258001,129.204167 236.036000,129.204167 236.814000,129.204167 237.591999,129.204167 238.369998,129.204167 239.147997,129.204167 239.925997,129.204167 240.703996,129.204167 241.482004,129.204167 242.260004,129.204167 243.038003,129.204167 243.816002,129.204167 244.594001,129.204167 245.372001,129.204167 246.150000,129.204167 246.927999,129.204167 247.705999,129.204167 248.483998,129.204167 249.261997,129.204167 250.039996,129.204167 250.817996,129.204167 251.596004,129.204167 252.374003,129.204167 253.152003,129.204167 253.930002,129.204167 254.708001,129.204167 255.486000,129.204167 256.264000,129.204167 257.041999,129.204167 257.819998,129.204167 258.597997,129.204167 259.375997,129.204167 260.153996,129.204167 260.932004,129.204167 261.710004,129.204167 262.488003,129.204167 263.266002,129.204167 264.044001,129.204167 264.822001,129.204167 265.600000,129.204167 265.600000,61.387500 265.600000,61.387500 266.377999,61.387500 267.155999,61.387500 267.933998,61.387500 268.711997,61.387500 269.489996,61.387500 270.267996,61.387500 271.045995,61.387500 271.823994,61.387500 272.601993,61.387500 273.379993,61.387500 274.157992,61.387500 274.935991,61.387500 275.714009,61.387500 276.492008,61.387500 277.270007,61.387500 278.048007,61.387500 278.826006,61.387500 279.604005,61.387500 280.382004,61.387500 281.160004,61.387500 281.938003,61.387500 282.716002,61.387500 283.494001,61.387500 284.272001,61.387500 285.050000,61.387500 285.827999,61.387500 286.605999,61.387500 287.383998,61.387500 288.161997,61.387500 288.939996,61.387500 289.717996,61.387500 290.495995,61.387500 291.273994,61.387500 292.051993,61.387500 292.829993,61.387500 293.607992,61.387500 294.385991,61.387500 295.164009,61.387500 295.942008,61.387500 296.720007,61.387500 297.498007,61.387500 298.276006,61.387500 299.054005,61.387500 299.832004,61.387500 300.610004,61.387500 301.388003,61.387500 302.166002,61.387500 302.944001,61.387500 303.722001,61.387500 304.500000,61.387500 304.500000,129.204167 305.277999,129.204167 306.055999,129.204167 306.833998,129.204167 307.611997,129.204167 308.389996,129.204167 309.167996,129.204167 309.945995,129.204167 310.723994,129.204167 311.501993,129.204167 312.279993,129.204167 313.057992,129.204167 313.835991,129.204167 314.614009,129.204167 315.392008,129.204167 316.170007,129.204167 316.948007,129.204167 317.726006,129.204167 318.504005,129.204167 319.282004,129.204167 320.060004,129.204167 320.838003,129.204167 321.616002,129.204167 322.394001,129.204167 323.172001,129.204167 323.950000,129.204167 324.727999,129.204167 325.505999,129.204167 326.283998,129.204167 327.061997,129.204167 327.839996,129.204167 328.617996,129.204167 329.395995,129.204167 330.173994,129.204167 330.951993,129.204167 331.729993,129.204167 332.507992,129.204167 333.285991,129.204167 334.064009,129.204167 334.842008,129.204167 335.620007,129.204167 336.398007,129.204167 337.176006,129.204167 337.954005,129.204167 338.732004,129.204167 339.510004,129.204167 340.288003,129.204167 341.066002,129.204167 341.844001,129.204167 342.622001,129.204167 343.400000,129.204167 343.400000,61.387500 344.177999,61.387500 344.955999,61.387500 345.733998,61.387500 346.511997,61.387500 347.289996,61.387500 348.067996,61.387500 348.845995,61.387500 349.623994,61.387500 350.401993,61.387500 351.179993,61.387500 351.957992,61.387500 352.735991,61.387500 353.514009,61.387500 354.292008,61.387500 355.070007,61.387500 355.848007,61.387500 356.626006,61.387500 357.404005,61.387500 358.182004,61.387500 358.960004,61.387500 359.738003,61.387500 360.516002,61.387500 361.294001,61.387500 362.072001,61.387500 362.850000,61.387500 363.627999,61.387500 364.405999,61.387500 365.183998,61.387500 365.961997,61.387500 366.739996,61.387500 367.517996,61.387500 368.295995,61.387500 369.073994,61.387500 369.851993,61.387500 370.629993,61.387500 371.407992,61.387500 372.185991,61.387500 372.964009,61.387500 373.742008,61.387500 374.520007,61.387500 375.298007,61.387500 376.076006,61.387500 376.854005,61.387500 377.632004,61.387500 378.410004,61.387500 379.188003,61.387500 379.966002,61.387500 380.744001,61.387500 381.522001,61.387500 382.300000,61.387500 382.300000,129.204167 383.077999,129.204167 383.855999,129.204167 384.633998,129.204167 385.411997,129.204167 386.189996,129.204167 386.967996,129.204167 387.745995,129.204167 388.523994,129.204167 389.301993,129.204167 390.079993,129.204167 390.857992,129.204167 391.635991,129.204167 392.414009,129.204167 393.192008,129.204167 393.970007,129.204167 394.748007,129.204167 395.526006,129.204167 396.304005,129.204167 397.082004,129.204167 397.860004,129.204167 398.638003,129.204167 399.416002,129.204167 400.194001,129.204167 400.972001,129.204167 401.750000,129.204167 402.527999,129.204167 403.305999,129.204167 404.083998,129.204167 404.861997,129.204167 405.639996,129.204167 406.417996,129.204167 407.195995,129.204167 407.973994,129.204167 408.751993,129.204167 409.529993,129.204167 410.307992,129.204167 411.085991,129.204167 411.864009,129.204167 412.642008,129.204167 413.420007,129.204167 414.198007,129.204167 414.976006,129.204167 415.754005,129.204167 416.532004,129.204167 417.310004,129.204167 418.088003,129.204167 418.866002,129.204167 419.644001,129.204167 420.422001,129.204167 421.200000,129.204167 421.200000,61.387500 421.978018,61.387500 422.755999,61.387500 423.534016,61.387500 424.311997,61.387500 425.090015,61.387500 425.867996,61.387500 426.646013,61.387500 427.423994,61.387500 428.202012,61.387500 428.979993,61.387500 429.758010,61.387500 430.535991,61.387500 431.314009,61.387500 432.091990,61.387500 432.870007,61.387500 433.647988,61.387500 434.426006,61.387500 435.203987,61.387500 435.982004,61.387500 436.759985,61.387500 437.538003,61.387500 438.315984,61.387500 439.094001,61.387500 439.871982,61.387500 440.650000,61.387500 441.428018,61.387500 442.205999,61.387500 442.984016,61.387500 443.761997,61.387500 444.540015,61.387500 445.317996,61.387500 446.096013,61.387500 446.873994,61.387500 447.652012,61.387500 448.429993,61.387500 449.208010,61.387500 449.985991,61.387500 450.764009,61.387500 451.541990,61.387500 452.320007,61.387500 453.097988,61.387500 453.876006,61.387500 454.653987,61.387500 455.432004,61.387500 456.209985,61.387500 456.988003,61.387500 457.765984,61.387500 458.544001,61.387500 459.321982,61.387500 460.100000,61.387500 460.100000,129.204167 460.878018,129.204167 461.655999,129.204167 462.434016,129.204167 463.211997,129.204167 463.990015,129.204167 464.767996,129.204167 465.546013,129.204167 466.323994,129.204167 467.102012,129.204167 467.879993,129.204167 468.658010,129.204167 469.435991,129.204167 470.214009,129.204167 470.991990,129.204167 471.770007,129.204167 472.547988,129.204167 473.326006,129.204167 474.103987,129.204167 474.882004,129.204167 475.659985,129.204167 476.438003,129.204167 477.215984,129.204167 477.994001,129.204167 478.771982,129.204167 479.550000,129.204167 480.328018,129.204167 481.105999,129.204167 481.884016,129.204167 482.661997,129.204167 483.440015,129.204167 484.217996,129.204167 484.996013,129.204167 485.773994,129.204167 486.552012,129.204167 487.329993,129.204167 488.108010,129.204167 488.885991,129.204167 489.664009,129.204167 490.441990,129.204167 491.220007,129.204167 491.997988,129.204167 492.776006,129.204167 493.553987,129.204167 494.332004,129.204167 495.109985,129.204167 495.888003,129.204167 496.665984,129.204167 497.444001,129.204167 498.221982,129.204167 499.000000,129.204167 499.000000,61.387500"
-     id="polyline79-0" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-3)"
-     points="110.000000,224.408333 110.778000,224.408333 111.556000,224.408333 112.334000,224.408333 113.112000,224.408333 113.890000,224.408333 114.668000,224.408333 115.446000,224.408333 116.224000,224.408333 117.002000,224.408333 117.780000,224.408333 118.558000,224.408333 119.336000,224.408333 120.114000,224.408333 120.892000,224.408333 121.670000,224.408333 122.448000,224.408333 123.226000,224.408333 124.004001,224.408333 124.782000,224.408333 125.560000,224.408333 126.337999,224.408333 127.116000,224.408333 127.894000,224.408333 128.672000,224.408333 129.450000,224.408333 130.227999,224.408333 131.006001,224.408333 131.784000,224.408333 132.561999,224.408333 133.340001,224.408333 134.118000,224.408333 134.895999,224.408333 135.674001,224.408333 136.452000,224.408333 137.230000,224.408333 138.008001,224.408333 138.786000,224.408333 139.564000,224.408333 140.341999,224.408333 141.120000,224.408333 141.898000,224.408333 142.675999,224.408333 143.454001,224.408333 144.232000,224.408333 145.009999,224.408333 145.788001,224.408333 146.566000,224.408333 147.343999,224.408333 148.122001,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 149.677999,224.408333 150.455999,224.408333 151.233998,224.408333 152.012002,224.408333 152.790001,224.408333 153.568000,224.408333 154.345999,224.408333 155.123999,224.408333 155.901998,224.408333 156.680002,224.408333 157.458001,224.408333 158.236000,224.408333 159.014000,224.408333 159.791999,224.408333 160.569998,224.408333 161.348002,224.408333 162.126001,224.408333 162.904001,224.408333 163.682000,224.408333 164.459999,224.408333 165.237998,224.408333 166.016002,224.408333 166.794001,224.408333 167.572001,224.408333 168.350000,224.408333 169.127999,224.408333 169.905999,224.408333 170.683998,224.408333 171.462002,224.408333 172.240001,224.408333 173.018000,224.408333 173.795999,224.408333 174.573999,224.408333 175.351998,224.408333 176.130002,224.408333 176.908001,224.408333 177.686000,224.408333 178.464000,224.408333 179.241999,224.408333 180.019998,224.408333 180.798002,224.408333 181.576001,224.408333 182.354001,224.408333 183.132000,224.408333 183.909999,224.408333 184.687998,224.408333 185.466002,224.408333 186.244001,224.408333 187.022001,224.408333 187.800000,224.408333 187.800000,224.408333 187.800000,224.408333 188.577999,224.408333 189.355999,224.408333 190.133998,224.408333 190.911997,224.408333 191.689996,224.408333 192.467996,224.408333 193.246004,224.408333 194.024003,224.408333 194.802003,224.408333 195.580002,224.408333 196.358001,224.408333 197.136000,224.408333 197.914000,224.408333 198.691999,224.408333 199.469998,224.408333 200.247997,224.408333 201.025997,224.408333 201.803996,224.408333 202.582004,224.408333 203.360004,224.408333 204.138003,224.408333 204.916002,224.408333 205.694001,224.408333 206.472001,224.408333 207.250000,224.408333 208.027999,224.408333 208.805999,224.408333 209.583998,224.408333 210.361997,224.408333 211.139996,224.408333 211.917996,224.408333 212.696004,224.408333 213.474003,224.408333 214.252003,224.408333 215.030002,224.408333 215.808001,224.408333 216.586000,224.408333 217.364000,224.408333 218.141999,224.408333 218.919998,224.408333 219.697997,224.408333 220.475997,224.408333 221.253996,224.408333 222.032004,224.408333 222.810004,224.408333 223.588003,224.408333 224.366002,224.408333 225.144001,224.408333 225.922001,224.408333 226.700000,224.408333 226.700000,224.408333 226.700000,224.408333 227.477999,224.408333 228.255999,224.408333 229.033998,224.408333 229.811997,224.408333 230.589996,224.408333 231.367996,224.408333 232.146004,224.408333 232.924003,224.408333 233.702003,224.408333 234.480002,224.408333 235.258001,224.408333 236.036000,224.408333 236.814000,224.408333 237.591999,224.408333 238.369998,224.408333 239.147997,224.408333 239.925997,224.408333 240.703996,224.408333 241.482004,224.408333 242.260004,224.408333 243.038003,224.408333 243.816002,224.408333 244.594001,224.408333 245.372001,224.408333 246.150000,224.408333 246.927999,224.408333 247.705999,224.408333 248.483998,224.408333 249.261997,224.408333 250.039996,224.408333 250.817996,224.408333 251.596004,224.408333 252.374003,224.408333 253.152003,224.408333 253.930002,224.408333 254.708001,224.408333 255.486000,224.408333 256.264000,224.408333 257.041999,224.408333 257.819998,224.408333 258.597997,224.408333 259.375997,224.408333 260.153996,224.408333 260.932004,224.408333 261.710004,224.408333 262.488003,224.408333 263.266002,224.408333 264.044001,224.408333 264.822001,224.408333 265.600000,224.408333 265.600000,224.408333 265.600000,224.408333 266.377999,224.408333 267.155999,224.408333 267.933998,224.408333 268.711997,224.408333 269.489996,224.408333 270.267996,224.408333 271.045995,224.408333 271.823994,224.408333 272.601993,224.408333 273.379993,224.408333 274.157992,224.408333 274.935991,224.408333 275.714009,224.408333 276.492008,224.408333 277.270007,224.408333 278.048007,224.408333 278.826006,224.408333 279.604005,224.408333 280.382004,224.408333 281.160004,224.408333 281.938003,224.408333 282.716002,224.408333 283.494001,224.408333 284.272001,224.408333 285.050000,224.408333 285.827999,224.408333 286.605999,224.408333 287.383998,224.408333 288.161997,224.408333 288.939996,224.408333 289.717996,224.408333 290.495995,224.408333 291.273994,224.408333 292.051993,224.408333 292.829993,224.408333 293.607992,224.408333 294.385991,224.408333 295.164009,224.408333 295.942008,224.408333 296.720007,224.408333 297.498007,224.408333 298.276006,224.408333 299.054005,224.408333 299.832004,224.408333 300.610004,224.408333 301.388003,224.408333 302.166002,224.408333 302.944001,224.408333 303.722001,224.408333 304.500000,224.408333 304.500000,224.408333 305.277999,224.408333 306.055999,224.408333 306.833998,224.408333 307.611997,224.408333 308.389996,224.408333 309.167996,224.408333 309.945995,224.408333 310.723994,224.408333 311.501993,224.408333 312.279993,224.408333 313.057992,224.408333 313.835991,224.408333 314.614009,224.408333 315.392008,224.408333 316.170007,224.408333 316.948007,224.408333 317.726006,224.408333 318.504005,224.408333 319.282004,224.408333 320.060004,224.408333 320.838003,224.408333 321.616002,224.408333 322.394001,224.408333 323.172001,224.408333 323.950000,224.408333 324.727999,224.408333 325.505999,224.408333 326.283998,224.408333 327.061997,224.408333 327.839996,224.408333 328.617996,224.408333 329.395995,224.408333 330.173994,224.408333 330.951993,224.408333 331.729993,224.408333 332.507992,224.408333 333.285991,224.408333 334.064009,224.408333 334.842008,224.408333 335.620007,224.408333 336.398007,224.408333 337.176006,224.408333 337.954005,224.408333 338.732004,224.408333 339.510004,224.408333 340.288003,224.408333 341.066002,224.408333 341.844001,224.408333 342.622001,224.408333 343.400000,224.408333 343.400000,224.408333 344.177999,224.408333 344.955999,224.408333 345.733998,224.408333 346.511997,224.408333 347.289996,224.408333 348.067996,224.408333 348.845995,224.408333 349.623994,224.408333 350.401993,224.408333 351.179993,224.408333 351.957992,224.408333 352.735991,224.408333 353.514009,224.408333 354.292008,224.408333 355.070007,224.408333 355.848007,224.408333 356.626006,224.408333 357.404005,224.408333 358.182004,224.408333 358.960004,224.408333 359.738003,224.408333 360.516002,224.408333 361.294001,224.408333 362.072001,224.408333 362.850000,224.408333 363.627999,224.408333 364.405999,224.408333 365.183998,224.408333 365.961997,224.408333 366.739996,224.408333 367.517996,224.408333 368.295995,224.408333 369.073994,224.408333 369.851993,224.408333 370.629993,224.408333 371.407992,224.408333 372.185991,224.408333 372.964009,224.408333 373.742008,224.408333 374.520007,224.408333 375.298007,224.408333 376.076006,224.408333 376.854005,224.408333 377.632004,224.408333 378.410004,224.408333 379.188003,224.408333 379.966002,224.408333 380.744001,224.408333 381.522001,224.408333 382.300000,224.408333 382.300000,224.408333 383.077999,224.408333 383.855999,224.408333 384.633998,224.408333 385.411997,224.408333 386.189996,224.408333 386.967996,224.408333 387.745995,224.408333 388.523994,224.408333 389.301993,224.408333 390.079993,224.408333 390.857992,224.408333 391.635991,224.408333 392.414009,224.408333 393.192008,224.408333 393.970007,224.408333 394.748007,224.408333 395.526006,224.408333 396.304005,224.408333 397.082004,224.408333 397.860004,224.408333 398.638003,224.408333 399.416002,224.408333 400.194001,224.408333 400.972001,224.408333 401.750000,224.408333 402.527999,224.408333 403.305999,224.408333 404.083998,224.408333 404.861997,224.408333 405.639996,224.408333 406.417996,224.408333 407.195995,224.408333 407.973994,224.408333 408.751993,224.408333 409.529993,224.408333 410.307992,224.408333 411.085991,224.408333 411.864009,224.408333 412.642008,224.408333 413.420007,224.408333 414.198007,224.408333 414.976006,224.408333 415.754005,224.408333 416.532004,224.408333 417.310004,224.408333 418.088003,224.408333 418.866002,224.408333 419.644001,224.408333 420.422001,224.408333 421.200000,224.408333 421.200000,224.408333 421.978018,224.408333 422.755999,224.408333 423.534016,224.408333 424.311997,224.408333 425.090015,224.408333 425.867996,224.408333 426.646013,224.408333 427.423994,224.408333 428.202012,224.408333 428.979993,224.408333 429.758010,224.408333 430.535991,224.408333 431.314009,224.408333 432.091990,224.408333 432.870007,224.408333 433.647988,224.408333 434.426006,224.408333 435.203987,224.408333 435.982004,224.408333 436.759985,224.408333 437.538003,224.408333 438.315984,224.408333 439.094001,224.408333 439.871982,224.408333 440.650000,224.408333 441.428018,224.408333 442.205999,224.408333 442.984016,224.408333 443.761997,224.408333 444.540015,224.408333 445.317996,224.408333 446.096013,224.408333 446.873994,224.408333 447.652012,224.408333 448.429993,224.408333 449.208010,224.408333 449.985991,224.408333 450.764009,224.408333 451.541990,224.408333 452.320007,224.408333 453.097988,224.408333 453.876006,224.408333 454.653987,224.408333 455.432004,224.408333 456.209985,224.408333 456.988003,224.408333 457.765984,224.408333 458.544001,224.408333 459.321982,224.408333 460.100000,224.408333 460.100000,224.408333 460.878018,224.408333 461.655999,224.408333 462.434016,224.408333 463.211997,224.408333 463.990015,224.408333 464.767996,224.408333 465.546013,224.408333 466.323994,224.408333 467.102012,224.408333 467.879993,224.408333 468.658010,224.408333 469.435991,224.408333 470.214009,224.408333 470.991990,224.408333 471.770007,224.408333 472.547988,224.408333 473.326006,224.408333 474.103987,224.408333 474.882004,224.408333 475.659985,224.408333 476.438003,224.408333 477.215984,224.408333 477.994001,224.408333 478.771982,224.408333 479.550000,224.408333 480.328018,224.408333 481.105999,224.408333 481.884016,224.408333 482.661997,224.408333 483.440015,224.408333 484.217996,224.408333 484.996013,224.408333 485.773994,224.408333 486.552012,224.408333 487.329993,224.408333 488.108010,224.408333 488.885991,224.408333 489.664009,224.408333 490.441990,224.408333 491.220007,224.408333 491.997988,224.408333 492.776006,224.408333 493.553987,224.408333 494.332004,224.408333 495.109985,224.408333 495.888003,224.408333 496.665984,224.408333 497.444001,224.408333 498.221982,224.408333 499.000000,224.408333 499.000000,224.408333"
-     id="polyline81-7" />
-  <polyline
-     transform="translate(497.44972,33.748343)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-3)"
-     points="110.000000,319.612500 110.778000,319.612500 111.556000,319.612500 112.334000,319.612500 113.112000,319.612500 113.890000,319.612500 114.668000,319.612500 115.446000,319.612500 116.224000,319.612500 117.002000,319.612500 117.780000,319.612500 118.558000,319.612500 119.336000,319.612500 120.114000,319.612500 120.892000,319.612500 121.670000,319.612500 122.448000,319.612500 123.226000,319.612500 124.004001,319.612500 124.782000,319.612500 125.560000,319.612500 126.337999,319.612500 127.116000,319.612500 127.894000,319.612500 128.672000,319.612500 129.450000,319.612500 130.227999,319.612500 131.006001,319.612500 131.784000,319.612500 132.561999,319.612500 133.340001,319.612500 134.118000,319.612500 134.895999,319.612500 135.674001,319.612500 136.452000,319.612500 137.230000,319.612500 138.008001,319.612500 138.786000,319.612500 139.564000,319.612500 140.341999,319.612500 141.120000,319.612500 141.898000,319.612500 142.675999,319.612500 143.454001,319.612500 144.232000,319.612500 145.009999,319.612500 145.788001,319.612500 146.566000,319.612500 147.343999,319.612500 148.122001,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 149.677999,319.612500 150.455999,319.612500 151.233998,319.612500 152.012002,319.612500 152.790001,319.612500 153.568000,319.612500 154.345999,319.612500 155.123999,319.612500 155.901998,319.612500 156.680002,319.612500 157.458001,319.612500 158.236000,319.612500 159.014000,319.612500 159.791999,319.612500 160.569998,319.612500 161.348002,319.612500 162.126001,319.612500 162.904001,319.612500 163.682000,319.612500 164.459999,319.612500 165.237998,319.612500 166.016002,319.612500 166.794001,319.612500 167.572001,319.612500 168.350000,319.612500 169.127999,319.612500 169.905999,319.612500 170.683998,319.612500 171.462002,319.612500 172.240001,319.612500 173.018000,319.612500 173.795999,319.612500 174.573999,319.612500 175.351998,319.612500 176.130002,319.612500 176.908001,319.612500 177.686000,319.612500 178.464000,319.612500 179.241999,319.612500 180.019998,319.612500 180.798002,319.612500 181.576001,319.612500 182.354001,319.612500 183.132000,319.612500 183.909999,319.612500 184.687998,319.612500 185.466002,319.612500 186.244001,319.612500 187.022001,319.612500 187.800000,319.612500 187.800000,251.795833 187.800000,251.795833 188.577999,251.795833 189.355999,251.795833 190.133998,251.795833 190.911997,251.795833 191.689996,251.795833 192.467996,251.795833 193.246004,251.795833 194.024003,251.795833 194.802003,251.795833 195.580002,251.795833 196.358001,251.795833 197.136000,251.795833 197.914000,251.795833 198.691999,251.795833 199.469998,251.795833 200.247997,251.795833 201.025997,251.795833 201.803996,251.795833 202.582004,251.795833 203.360004,251.795833 204.138003,251.795833 204.916002,251.795833 205.694001,251.795833 206.472001,251.795833 207.250000,251.795833 208.027999,251.795833 208.805999,251.795833 209.583998,251.795833 210.361997,251.795833 211.139996,251.795833 211.917996,251.795833 212.696004,251.795833 213.474003,251.795833 214.252003,251.795833 215.030002,251.795833 215.808001,251.795833 216.586000,251.795833 217.364000,251.795833 218.141999,251.795833 218.919998,251.795833 219.697997,251.795833 220.475997,251.795833 221.253996,251.795833 222.032004,251.795833 222.810004,251.795833 223.588003,251.795833 224.366002,251.795833 225.144001,251.795833 225.922001,251.795833 226.700000,251.795833 226.700000,251.795833 226.700000,251.795833 227.477999,251.795833 228.255999,251.795833 229.033998,251.795833 229.811997,251.795833 230.589996,251.795833 231.367996,251.795833 232.146004,251.795833 232.924003,251.795833 233.702003,251.795833 234.480002,251.795833 235.258001,251.795833 236.036000,251.795833 236.814000,251.795833 237.591999,251.795833 238.369998,251.795833 239.147997,251.795833 239.925997,251.795833 240.703996,251.795833 241.482004,251.795833 242.260004,251.795833 243.038003,251.795833 243.816002,251.795833 244.594001,251.795833 245.372001,251.795833 246.150000,251.795833 246.927999,251.795833 247.705999,251.795833 248.483998,251.795833 249.261997,251.795833 250.039996,251.795833 250.817996,251.795833 251.596004,251.795833 252.374003,251.795833 253.152003,251.795833 253.930002,251.795833 254.708001,251.795833 255.486000,251.795833 256.264000,251.795833 257.041999,251.795833 257.819998,251.795833 258.597997,251.795833 259.375997,251.795833 260.153996,251.795833 260.932004,251.795833 261.710004,251.795833 262.488003,251.795833 263.266002,251.795833 264.044001,251.795833 264.822001,251.795833 265.600000,251.795833 265.600000,251.795833 265.600000,251.795833 266.377999,251.795833 267.155999,251.795833 267.933998,251.795833 268.711997,251.795833 269.489996,251.795833 270.267996,251.795833 271.045995,251.795833 271.823994,251.795833 272.601993,251.795833 273.379993,251.795833 274.157992,251.795833 274.935991,251.795833 275.714009,251.795833 276.492008,251.795833 277.270007,251.795833 278.048007,251.795833 278.826006,251.795833 279.604005,251.795833 280.382004,251.795833 281.160004,251.795833 281.938003,251.795833 282.716002,251.795833 283.494001,251.795833 284.272001,251.795833 285.050000,251.795833 285.827999,251.795833 286.605999,251.795833 287.383998,251.795833 288.161997,251.795833 288.939996,251.795833 289.717996,251.795833 290.495995,251.795833 291.273994,251.795833 292.051993,251.795833 292.829993,251.795833 293.607992,251.795833 294.385991,251.795833 295.164009,251.795833 295.942008,251.795833 296.720007,251.795833 297.498007,251.795833 298.276006,251.795833 299.054005,251.795833 299.832004,251.795833 300.610004,251.795833 301.388003,251.795833 302.166002,251.795833 302.944001,251.795833 303.722001,251.795833 304.500000,251.795833 304.500000,251.795833 305.277999,251.795833 306.055999,251.795833 306.833998,251.795833 307.611997,251.795833 308.389996,251.795833 309.167996,251.795833 309.945995,251.795833 310.723994,251.795833 311.501993,251.795833 312.279993,251.795833 313.057992,251.795833 313.835991,251.795833 314.614009,251.795833 315.392008,251.795833 316.170007,251.795833 316.948007,251.795833 317.726006,251.795833 318.504005,251.795833 319.282004,251.795833 320.060004,251.795833 320.838003,251.795833 321.616002,251.795833 322.394001,251.795833 323.172001,251.795833 323.950000,251.795833 324.727999,251.795833 325.505999,251.795833 326.283998,251.795833 327.061997,251.795833 327.839996,251.795833 328.617996,251.795833 329.395995,251.795833 330.173994,251.795833 330.951993,251.795833 331.729993,251.795833 332.507992,251.795833 333.285991,251.795833 334.064009,251.795833 334.842008,251.795833 335.620007,251.795833 336.398007,251.795833 337.176006,251.795833 337.954005,251.795833 338.732004,251.795833 339.510004,251.795833 340.288003,251.795833 341.066002,251.795833 341.844001,251.795833 342.622001,251.795833 343.400000,251.795833 343.400000,251.795833 344.177999,251.795833 344.955999,251.795833 345.733998,251.795833 346.511997,251.795833 347.289996,251.795833 348.067996,251.795833 348.845995,251.795833 349.623994,251.795833 350.401993,251.795833 351.179993,251.795833 351.957992,251.795833 352.735991,251.795833 353.514009,251.795833 354.292008,251.795833 355.070007,251.795833 355.848007,251.795833 356.626006,251.795833 357.404005,251.795833 358.182004,251.795833 358.960004,251.795833 359.738003,251.795833 360.516002,251.795833 361.294001,251.795833 362.072001,251.795833 362.850000,251.795833 363.627999,251.795833 364.405999,251.795833 365.183998,251.795833 365.961997,251.795833 366.739996,251.795833 367.517996,251.795833 368.295995,251.795833 369.073994,251.795833 369.851993,251.795833 370.629993,251.795833 371.407992,251.795833 372.185991,251.795833 372.964009,251.795833 373.742008,251.795833 374.520007,251.795833 375.298007,251.795833 376.076006,251.795833 376.854005,251.795833 377.632004,251.795833 378.410004,251.795833 379.188003,251.795833 379.966002,251.795833 380.744001,251.795833 381.522001,251.795833 382.300000,251.795833 382.300000,251.795833 383.077999,251.795833 383.855999,251.795833 384.633998,251.795833 385.411997,251.795833 386.189996,251.795833 386.967996,251.795833 387.745995,251.795833 388.523994,251.795833 389.301993,251.795833 390.079993,251.795833 390.857992,251.795833 391.635991,251.795833 392.414009,251.795833 393.192008,251.795833 393.970007,251.795833 394.748007,251.795833 395.526006,251.795833 396.304005,251.795833 397.082004,251.795833 397.860004,251.795833 398.638003,251.795833 399.416002,251.795833 400.194001,251.795833 400.972001,251.795833 401.750000,251.795833 402.527999,251.795833 403.305999,251.795833 404.083998,251.795833 404.861997,251.795833 405.639996,251.795833 406.417996,251.795833 407.195995,251.795833 407.973994,251.795833 408.751993,251.795833 409.529993,251.795833 410.307992,251.795833 411.085991,251.795833 411.864009,251.795833 412.642008,251.795833 413.420007,251.795833 414.198007,251.795833 414.976006,251.795833 415.754005,251.795833 416.532004,251.795833 417.310004,251.795833 418.088003,251.795833 418.866002,251.795833 419.644001,251.795833 420.422001,251.795833 421.200000,251.795833 421.200000,251.795833 421.978018,251.795833 422.755999,251.795833 423.534016,251.795833 424.311997,251.795833 425.090015,251.795833 425.867996,251.795833 426.646013,251.795833 427.423994,251.795833 428.202012,251.795833 428.979993,251.795833 429.758010,251.795833 430.535991,251.795833 431.314009,251.795833 432.091990,251.795833 432.870007,251.795833 433.647988,251.795833 434.426006,251.795833 435.203987,251.795833 435.982004,251.795833 436.759985,251.795833 437.538003,251.795833 438.315984,251.795833 439.094001,251.795833 439.871982,251.795833 440.650000,251.795833 441.428018,251.795833 442.205999,251.795833 442.984016,251.795833 443.761997,251.795833 444.540015,251.795833 445.317996,251.795833 446.096013,251.795833 446.873994,251.795833 447.652012,251.795833 448.429993,251.795833 449.208010,251.795833 449.985991,251.795833 450.764009,251.795833 451.541990,251.795833 452.320007,251.795833 453.097988,251.795833 453.876006,251.795833 454.653987,251.795833 455.432004,251.795833 456.209985,251.795833 456.988003,251.795833 457.765984,251.795833 458.544001,251.795833 459.321982,251.795833 460.100000,251.795833 460.100000,251.795833 460.878018,251.795833 461.655999,251.795833 462.434016,251.795833 463.211997,251.795833 463.990015,251.795833 464.767996,251.795833 465.546013,251.795833 466.323994,251.795833 467.102012,251.795833 467.879993,251.795833 468.658010,251.795833 469.435991,251.795833 470.214009,251.795833 470.991990,251.795833 471.770007,251.795833 472.547988,251.795833 473.326006,251.795833 474.103987,251.795833 474.882004,251.795833 475.659985,251.795833 476.438003,251.795833 477.215984,251.795833 477.994001,251.795833 478.771982,251.795833 479.550000,251.795833 480.328018,251.795833 481.105999,251.795833 481.884016,251.795833 482.661997,251.795833 483.440015,251.795833 484.217996,251.795833 484.996013,251.795833 485.773994,251.795833 486.552012,251.795833 487.329993,251.795833 488.108010,251.795833 488.885991,251.795833 489.664009,251.795833 490.441990,251.795833 491.220007,251.795833 491.997988,251.795833 492.776006,251.795833 493.553987,251.795833 494.332004,251.795833 495.109985,251.795833 495.888003,251.795833 496.665984,251.795833 497.444001,251.795833 498.221982,251.795833 499.000000,251.795833 499.000000,251.795833"
-     id="polyline83-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="610.44971"
-     y="78.248337"
-     id="text85-8">iniFalOut.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="610.44971"
-     y="173.24834"
-     id="text87-7">iniFalOut.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="610.44971"
-     y="268.24835"
-     id="text89-0">iniFalOut.y</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline91-4" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,434.000000 187.800000,747.000000"
-     id="polyline93-8" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,434.000000 265.600000,747.000000"
-     id="polyline95-0" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,434.000000 343.400000,747.000000"
-     id="polyline97-4" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,434.000000 421.200000,747.000000"
-     id="polyline99-2" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 499.000000,747.000000"
-     id="polyline101-9" />
+     id="polyline1249"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="292.52634"
+     id="text1251">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-54)"
+     points="110.000000,61.387500 110.720000,61.387500 111.440000,61.387500 112.160000,61.387500 112.880000,61.387500 113.600000,61.387500 114.320000,61.387500 115.040000,61.387500 115.760000,61.387500 116.480000,61.387500 117.200000,61.387500 117.920000,61.387500 118.640000,61.387500 119.360000,61.387500 120.080000,61.387500 120.800000,61.387500 121.520000,61.387500 122.240000,61.387500 122.960001,61.387500 123.680000,61.387500 124.400000,61.387500 125.120000,61.387500 125.840000,61.387500 126.560000,61.387500 127.280000,61.387500 128.000000,61.387500 128.719999,61.387500 129.440001,61.387500 130.160000,61.387500 130.879999,61.387500 131.600001,61.387500 132.320000,61.387500 133.039999,61.387500 133.760001,61.387500 134.480000,61.387500 135.200000,61.387500 135.920001,61.387500 136.640000,61.387500 137.360000,61.387500 138.079999,61.387500 138.800000,61.387500 139.520000,61.387500 140.239999,61.387500 140.960001,61.387500 141.680000,61.387500 142.399999,61.387500 143.120001,61.387500 143.840000,61.387500 144.559999,61.387500 145.280001,61.387500 146.000000,61.387500 146.000000,129.204167 146.000000,129.204167 146.719999,129.204167 147.439999,129.204167 148.159998,129.204167 148.880002,129.204167 149.600001,129.204167 150.320000,129.204167 151.039999,129.204167 151.759999,129.204167 152.479998,129.204167 153.200002,129.204167 153.920001,129.204167 154.640000,129.204167 155.360000,129.204167 156.079999,129.204167 156.799998,129.204167 157.520002,129.204167 158.240001,129.204167 158.960001,129.204167 159.680000,129.204167 160.399999,129.204167 161.119998,129.204167 161.840002,129.204167 162.560001,129.204167 163.280001,129.204167 164.000000,129.204167 164.719999,129.204167 165.439999,129.204167 166.159998,129.204167 166.880002,129.204167 167.600001,129.204167 168.320000,129.204167 169.039999,129.204167 169.759999,129.204167 170.479998,129.204167 171.200002,129.204167 171.920001,129.204167 172.640000,129.204167 173.360000,129.204167 174.079999,129.204167 174.799998,129.204167 175.520002,129.204167 176.240001,129.204167 176.960001,129.204167 177.680000,129.204167 178.399999,129.204167 179.119998,129.204167 179.840002,129.204167 180.560001,129.204167 181.280001,129.204167 182.000000,129.204167 182.000000,61.387500 182.000000,61.387500 182.719999,61.387500 183.439999,61.387500 184.159998,61.387500 184.879997,61.387500 185.599997,61.387500 186.319996,61.387500 187.040004,61.387500 187.760003,61.387500 188.480002,61.387500 189.200002,61.387500 189.920001,61.387500 190.640000,61.387500 191.360000,61.387500 192.079999,61.387500 192.799998,61.387500 193.519998,61.387500 194.239997,61.387500 194.959996,61.387500 195.680004,61.387500 196.400003,61.387500 197.120003,61.387500 197.840002,61.387500 198.560001,61.387500 199.280001,61.387500 200.000000,61.387500 200.719999,61.387500 201.439999,61.387500 202.159998,61.387500 202.879997,61.387500 203.599997,61.387500 204.319996,61.387500 205.040004,61.387500 205.760003,61.387500 206.480002,61.387500 207.200002,61.387500 207.920001,61.387500 208.640000,61.387500 209.360000,61.387500 210.079999,61.387500 210.799998,61.387500 211.519998,61.387500 212.239997,61.387500 212.959996,61.387500 213.680004,61.387500 214.400003,61.387500 215.120003,61.387500 215.840002,61.387500 216.560001,61.387500 217.280001,61.387500 218.000000,61.387500 218.000000,129.204167 218.000000,129.204167 218.719999,129.204167 219.439999,129.204167 220.159998,129.204167 220.879997,129.204167 221.599997,129.204167 222.319996,129.204167 223.040004,129.204167 223.760003,129.204167 224.480002,129.204167 225.200002,129.204167 225.920001,129.204167 226.640000,129.204167 227.360000,129.204167 228.079999,129.204167 228.799998,129.204167 229.519998,129.204167 230.239997,129.204167 230.959996,129.204167 231.680004,129.204167 232.400003,129.204167 233.120003,129.204167 233.840002,129.204167 234.560001,129.204167 235.280001,129.204167 236.000000,129.204167 236.719999,129.204167 237.439999,129.204167 238.159998,129.204167 238.879997,129.204167 239.599997,129.204167 240.319996,129.204167 241.040004,129.204167 241.760003,129.204167 242.480002,129.204167 243.200002,129.204167 243.920001,129.204167 244.640000,129.204167 245.360000,129.204167 246.079999,129.204167 246.799998,129.204167 247.519998,129.204167 248.239997,129.204167 248.959996,129.204167 249.680004,129.204167 250.400003,129.204167 251.120003,129.204167 251.840002,129.204167 252.560001,129.204167 253.280001,129.204167 254.000000,129.204167 254.000000,61.387500 254.000000,61.387500 254.719999,61.387500 255.439999,61.387500 256.159998,61.387500 256.879997,61.387500 257.599997,61.387500 258.319996,61.387500 259.039995,61.387500 259.759995,61.387500 260.479994,61.387500 261.199993,61.387500 261.919992,61.387500 262.639992,61.387500 263.360008,61.387500 264.080008,61.387500 264.800007,61.387500 265.520006,61.387500 266.240005,61.387500 266.960005,61.387500 267.680004,61.387500 268.400003,61.387500 269.120003,61.387500 269.840002,61.387500 270.560001,61.387500 271.280001,61.387500 272.000000,61.387500 272.719999,61.387500 273.439999,61.387500 274.159998,61.387500 274.879997,61.387500 275.599997,61.387500 276.319996,61.387500 277.039995,61.387500 277.759995,61.387500 278.479994,61.387500 279.199993,61.387500 279.919992,61.387500 280.639992,61.387500 281.360008,61.387500 282.080008,61.387500 282.800007,61.387500 283.520006,61.387500 284.240005,61.387500 284.960005,61.387500 285.680004,61.387500 286.400003,61.387500 287.120003,61.387500 287.840002,61.387500 288.560001,61.387500 289.280001,61.387500 290.000000,61.387500 290.000000,129.204167 290.719999,129.204167 291.439999,129.204167 292.159998,129.204167 292.879997,129.204167 293.599997,129.204167 294.319996,129.204167 295.039995,129.204167 295.759995,129.204167 296.479994,129.204167 297.199993,129.204167 297.919992,129.204167 298.639992,129.204167 299.360008,129.204167 300.080008,129.204167 300.800007,129.204167 301.520006,129.204167 302.240005,129.204167 302.960005,129.204167 303.680004,129.204167 304.400003,129.204167 305.120003,129.204167 305.840002,129.204167 306.560001,129.204167 307.280001,129.204167 308.000000,129.204167 308.719999,129.204167 309.439999,129.204167 310.159998,129.204167 310.879997,129.204167 311.599997,129.204167 312.319996,129.204167 313.039995,129.204167 313.759995,129.204167 314.479994,129.204167 315.199993,129.204167 315.919992,129.204167 316.639992,129.204167 317.360008,129.204167 318.080008,129.204167 318.800007,129.204167 319.520006,129.204167 320.240005,129.204167 320.960005,129.204167 321.680004,129.204167 322.400003,129.204167 323.120003,129.204167 323.840002,129.204167 324.560001,129.204167 325.280001,129.204167 326.000000,129.204167 326.000000,61.387500 326.719999,61.387500 327.439999,61.387500 328.159998,61.387500 328.879997,61.387500 329.599997,61.387500 330.319996,61.387500 331.039995,61.387500 331.759995,61.387500 332.479994,61.387500 333.199993,61.387500 333.919992,61.387500 334.639992,61.387500 335.360008,61.387500 336.080008,61.387500 336.800007,61.387500 337.520006,61.387500 338.240005,61.387500 338.960005,61.387500 339.680004,61.387500 340.400003,61.387500 341.120003,61.387500 341.840002,61.387500 342.560001,61.387500 343.280001,61.387500 344.000000,61.387500 344.719999,61.387500 345.439999,61.387500 346.159998,61.387500 346.879997,61.387500 347.599997,61.387500 348.319996,61.387500 349.039995,61.387500 349.759995,61.387500 350.479994,61.387500 351.199993,61.387500 351.919992,61.387500 352.639992,61.387500 353.360008,61.387500 354.080008,61.387500 354.800007,61.387500 355.520006,61.387500 356.240005,61.387500 356.960005,61.387500 357.680004,61.387500 358.400003,61.387500 359.120003,61.387500 359.840002,61.387500 360.560001,61.387500 361.280001,61.387500 362.000000,61.387500 362.000000,129.204167 362.719999,129.204167 363.439999,129.204167 364.159998,129.204167 364.879997,129.204167 365.599997,129.204167 366.319996,129.204167 367.039995,129.204167 367.759995,129.204167 368.479994,129.204167 369.199993,129.204167 369.919992,129.204167 370.639992,129.204167 371.360008,129.204167 372.080008,129.204167 372.800007,129.204167 373.520006,129.204167 374.240005,129.204167 374.960005,129.204167 375.680004,129.204167 376.400003,129.204167 377.120003,129.204167 377.840002,129.204167 378.560001,129.204167 379.280001,129.204167 380.000000,129.204167 380.719999,129.204167 381.439999,129.204167 382.159998,129.204167 382.879997,129.204167 383.599997,129.204167 384.319996,129.204167 385.039995,129.204167 385.759995,129.204167 386.479994,129.204167 387.199993,129.204167 387.919992,129.204167 388.639992,129.204167 389.360008,129.204167 390.080008,129.204167 390.800007,129.204167 391.520006,129.204167 392.240005,129.204167 392.960005,129.204167 393.680004,129.204167 394.400003,129.204167 395.120003,129.204167 395.840002,129.204167 396.560001,129.204167 397.280001,129.204167 398.000000,129.204167 398.000000,61.387500 398.720016,61.387500 399.439999,61.387500 400.160015,61.387500 400.879997,61.387500 401.600014,61.387500 402.319996,61.387500 403.040012,61.387500 403.759995,61.387500 404.480011,61.387500 405.199993,61.387500 405.920010,61.387500 406.639992,61.387500 407.360008,61.387500 408.079990,61.387500 408.800007,61.387500 409.519989,61.387500 410.240005,61.387500 410.959988,61.387500 411.680004,61.387500 412.399986,61.387500 413.120003,61.387500 413.839985,61.387500 414.560001,61.387500 415.279984,61.387500 416.000000,61.387500 416.720016,61.387500 417.439999,61.387500 418.160015,61.387500 418.879997,61.387500 419.600014,61.387500 420.319996,61.387500 421.040012,61.387500 421.759995,61.387500 422.480011,61.387500 423.199993,61.387500 423.920010,61.387500 424.639992,61.387500 425.360008,61.387500 426.079990,61.387500 426.800007,61.387500 427.519989,61.387500 428.240005,61.387500 428.959988,61.387500 429.680004,61.387500 430.399986,61.387500 431.120003,61.387500 431.839985,61.387500 432.560001,61.387500 433.279984,61.387500 434.000000,61.387500 434.000000,129.204167 434.720016,129.204167 435.439999,129.204167 436.160015,129.204167 436.879997,129.204167 437.600014,129.204167 438.319996,129.204167 439.040012,129.204167 439.759995,129.204167 440.480011,129.204167 441.199993,129.204167 441.920010,129.204167 442.639992,129.204167 443.360008,129.204167 444.079990,129.204167 444.800007,129.204167 445.519989,129.204167 446.240005,129.204167 446.959988,129.204167 447.680004,129.204167 448.399986,129.204167 449.120003,129.204167 449.839985,129.204167 450.560001,129.204167 451.279984,129.204167 452.000000,129.204167 452.720016,129.204167 453.439999,129.204167 454.160015,129.204167 454.879997,129.204167 455.600014,129.204167 456.319996,129.204167 457.040012,129.204167 457.759995,129.204167 458.480011,129.204167 459.199993,129.204167 459.920010,129.204167 460.639992,129.204167 461.360008,129.204167 462.079990,129.204167 462.800007,129.204167 463.519989,129.204167 464.240005,129.204167 464.959988,129.204167 465.680004,129.204167 466.399986,129.204167 467.120003,129.204167 467.839985,129.204167 468.560001,129.204167 469.279984,129.204167 470.000000,129.204167 470.000000,61.387500"
+     id="polyline1256"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-54)"
+     points="110.000000,224.408333 110.720000,224.408333 111.440000,224.408333 112.160000,224.408333 112.880000,224.408333 113.600000,224.408333 114.320000,224.408333 115.040000,224.408333 115.760000,224.408333 116.480000,224.408333 117.200000,224.408333 117.920000,224.408333 118.640000,224.408333 119.360000,224.408333 120.080000,224.408333 120.800000,224.408333 121.520000,224.408333 122.240000,224.408333 122.960001,224.408333 123.680000,224.408333 124.400000,224.408333 125.120000,224.408333 125.840000,224.408333 126.560000,224.408333 127.280000,224.408333 128.000000,224.408333 128.719999,224.408333 129.440001,224.408333 130.160000,224.408333 130.879999,224.408333 131.600001,224.408333 132.320000,224.408333 133.039999,224.408333 133.760001,224.408333 134.480000,224.408333 135.200000,224.408333 135.920001,224.408333 136.640000,224.408333 137.360000,224.408333 138.079999,224.408333 138.800000,224.408333 139.520000,224.408333 140.239999,224.408333 140.960001,224.408333 141.680000,224.408333 142.399999,224.408333 143.120001,224.408333 143.840000,224.408333 144.559999,224.408333 145.280001,224.408333 146.000000,224.408333 146.000000,224.408333 146.000000,224.408333 146.719999,224.408333 147.439999,224.408333 148.159998,224.408333 148.880002,224.408333 149.600001,224.408333 150.320000,224.408333 151.039999,224.408333 151.759999,224.408333 152.479998,224.408333 153.200002,224.408333 153.920001,224.408333 154.640000,224.408333 155.360000,224.408333 156.079999,224.408333 156.799998,224.408333 157.520002,224.408333 158.240001,224.408333 158.960001,224.408333 159.680000,224.408333 160.399999,224.408333 161.119998,224.408333 161.840002,224.408333 162.560001,224.408333 163.280001,224.408333 164.000000,224.408333 164.719999,224.408333 165.439999,224.408333 166.159998,224.408333 166.880002,224.408333 167.600001,224.408333 168.320000,224.408333 169.039999,224.408333 169.759999,224.408333 170.479998,224.408333 171.200002,224.408333 171.920001,224.408333 172.640000,224.408333 173.360000,224.408333 174.079999,224.408333 174.799998,224.408333 175.520002,224.408333 176.240001,224.408333 176.960001,224.408333 177.680000,224.408333 178.399999,224.408333 179.119998,224.408333 179.840002,224.408333 180.560001,224.408333 181.280001,224.408333 182.000000,224.408333 182.000000,224.408333 182.000000,224.408333 182.719999,224.408333 183.439999,224.408333 184.159998,224.408333 184.879997,224.408333 185.599997,224.408333 186.319996,224.408333 187.040004,224.408333 187.760003,224.408333 188.480002,224.408333 189.200002,224.408333 189.920001,224.408333 190.640000,224.408333 191.360000,224.408333 192.079999,224.408333 192.799998,224.408333 193.519998,224.408333 194.239997,224.408333 194.959996,224.408333 195.680004,224.408333 196.400003,224.408333 197.120003,224.408333 197.840002,224.408333 198.560001,224.408333 199.280001,224.408333 200.000000,224.408333 200.719999,224.408333 201.439999,224.408333 202.159998,224.408333 202.879997,224.408333 203.599997,224.408333 204.319996,224.408333 205.040004,224.408333 205.760003,224.408333 206.480002,224.408333 207.200002,224.408333 207.920001,224.408333 208.640000,224.408333 209.360000,224.408333 210.079999,224.408333 210.799998,224.408333 211.519998,224.408333 212.239997,224.408333 212.959996,224.408333 213.680004,224.408333 214.400003,224.408333 215.120003,224.408333 215.840002,224.408333 216.560001,224.408333 217.280001,224.408333 218.000000,224.408333 218.000000,224.408333 218.000000,224.408333 218.719999,224.408333 219.439999,224.408333 220.159998,224.408333 220.879997,224.408333 221.599997,224.408333 222.319996,224.408333 223.040004,224.408333 223.760003,224.408333 224.480002,224.408333 225.200002,224.408333 225.920001,224.408333 226.640000,224.408333 227.360000,224.408333 228.079999,224.408333 228.799998,224.408333 229.519998,224.408333 230.239997,224.408333 230.959996,224.408333 231.680004,224.408333 232.400003,224.408333 233.120003,224.408333 233.840002,224.408333 234.560001,224.408333 235.280001,224.408333 236.000000,224.408333 236.719999,224.408333 237.439999,224.408333 238.159998,224.408333 238.879997,224.408333 239.599997,224.408333 240.319996,224.408333 241.040004,224.408333 241.760003,224.408333 242.480002,224.408333 243.200002,224.408333 243.920001,224.408333 244.640000,224.408333 245.360000,224.408333 246.079999,224.408333 246.799998,224.408333 247.519998,224.408333 248.239997,224.408333 248.959996,224.408333 249.680004,224.408333 250.400003,224.408333 251.120003,224.408333 251.840002,224.408333 252.560001,224.408333 253.280001,224.408333 254.000000,224.408333 254.000000,224.408333 254.000000,224.408333 254.719999,224.408333 255.439999,224.408333 256.159998,224.408333 256.879997,224.408333 257.599997,224.408333 258.319996,224.408333 259.039995,224.408333 259.759995,224.408333 260.479994,224.408333 261.199993,224.408333 261.919992,224.408333 262.639992,224.408333 263.360008,224.408333 264.080008,224.408333 264.800007,224.408333 265.520006,224.408333 266.240005,224.408333 266.960005,224.408333 267.680004,224.408333 268.400003,224.408333 269.120003,224.408333 269.840002,224.408333 270.560001,224.408333 271.280001,224.408333 272.000000,224.408333 272.719999,224.408333 273.439999,224.408333 274.159998,224.408333 274.879997,224.408333 275.599997,224.408333 276.319996,224.408333 277.039995,224.408333 277.759995,224.408333 278.479994,224.408333 279.199993,224.408333 279.919992,224.408333 280.639992,224.408333 281.360008,224.408333 282.080008,224.408333 282.800007,224.408333 283.520006,224.408333 284.240005,224.408333 284.960005,224.408333 285.680004,224.408333 286.400003,224.408333 287.120003,224.408333 287.840002,224.408333 288.560001,224.408333 289.280001,224.408333 290.000000,224.408333 290.000000,224.408333 290.719999,224.408333 291.439999,224.408333 292.159998,224.408333 292.879997,224.408333 293.599997,224.408333 294.319996,224.408333 295.039995,224.408333 295.759995,224.408333 296.479994,224.408333 297.199993,224.408333 297.919992,224.408333 298.639992,224.408333 299.360008,224.408333 300.080008,224.408333 300.800007,224.408333 301.520006,224.408333 302.240005,224.408333 302.960005,224.408333 303.680004,224.408333 304.400003,224.408333 305.120003,224.408333 305.840002,224.408333 306.560001,224.408333 307.280001,224.408333 308.000000,224.408333 308.719999,224.408333 309.439999,224.408333 310.159998,224.408333 310.879997,224.408333 311.599997,224.408333 312.319996,224.408333 313.039995,224.408333 313.759995,224.408333 314.479994,224.408333 315.199993,224.408333 315.919992,224.408333 316.639992,224.408333 317.360008,224.408333 318.080008,224.408333 318.800007,224.408333 319.520006,224.408333 320.240005,224.408333 320.960005,224.408333 321.680004,224.408333 322.400003,224.408333 323.120003,224.408333 323.840002,224.408333 324.560001,224.408333 325.280001,224.408333 326.000000,224.408333 326.000000,224.408333 326.719999,224.408333 327.439999,224.408333 328.159998,224.408333 328.879997,224.408333 329.599997,224.408333 330.319996,224.408333 331.039995,224.408333 331.759995,224.408333 332.479994,224.408333 333.199993,224.408333 333.919992,224.408333 334.639992,224.408333 335.360008,224.408333 336.080008,224.408333 336.800007,224.408333 337.520006,224.408333 338.240005,224.408333 338.960005,224.408333 339.680004,224.408333 340.400003,224.408333 341.120003,224.408333 341.840002,224.408333 342.560001,224.408333 343.280001,224.408333 344.000000,224.408333 344.719999,224.408333 345.439999,224.408333 346.159998,224.408333 346.879997,224.408333 347.599997,224.408333 348.319996,224.408333 349.039995,224.408333 349.759995,224.408333 350.479994,224.408333 351.199993,224.408333 351.919992,224.408333 352.639992,224.408333 353.360008,224.408333 354.080008,224.408333 354.800007,224.408333 355.520006,224.408333 356.240005,224.408333 356.960005,224.408333 357.680004,224.408333 358.400003,224.408333 359.120003,224.408333 359.840002,224.408333 360.560001,224.408333 361.280001,224.408333 362.000000,224.408333 362.000000,224.408333 362.719999,224.408333 363.439999,224.408333 364.159998,224.408333 364.879997,224.408333 365.599997,224.408333 366.319996,224.408333 367.039995,224.408333 367.759995,224.408333 368.479994,224.408333 369.199993,224.408333 369.919992,224.408333 370.639992,224.408333 371.360008,224.408333 372.080008,224.408333 372.800007,224.408333 373.520006,224.408333 374.240005,224.408333 374.960005,224.408333 375.680004,224.408333 376.400003,224.408333 377.120003,224.408333 377.840002,224.408333 378.560001,224.408333 379.280001,224.408333 380.000000,224.408333 380.719999,224.408333 381.439999,224.408333 382.159998,224.408333 382.879997,224.408333 383.599997,224.408333 384.319996,224.408333 385.039995,224.408333 385.759995,224.408333 386.479994,224.408333 387.199993,224.408333 387.919992,224.408333 388.639992,224.408333 389.360008,224.408333 390.080008,224.408333 390.800007,224.408333 391.520006,224.408333 392.240005,224.408333 392.960005,224.408333 393.680004,224.408333 394.400003,224.408333 395.120003,224.408333 395.840002,224.408333 396.560001,224.408333 397.280001,224.408333 398.000000,224.408333 398.000000,224.408333 398.720016,224.408333 399.439999,224.408333 400.160015,224.408333 400.879997,224.408333 401.600014,224.408333 402.319996,224.408333 403.040012,224.408333 403.759995,224.408333 404.480011,224.408333 405.199993,224.408333 405.920010,224.408333 406.639992,224.408333 407.360008,224.408333 408.079990,224.408333 408.800007,224.408333 409.519989,224.408333 410.240005,224.408333 410.959988,224.408333 411.680004,224.408333 412.399986,224.408333 413.120003,224.408333 413.839985,224.408333 414.560001,224.408333 415.279984,224.408333 416.000000,224.408333 416.720016,224.408333 417.439999,224.408333 418.160015,224.408333 418.879997,224.408333 419.600014,224.408333 420.319996,224.408333 421.040012,224.408333 421.759995,224.408333 422.480011,224.408333 423.199993,224.408333 423.920010,224.408333 424.639992,224.408333 425.360008,224.408333 426.079990,224.408333 426.800007,224.408333 427.519989,224.408333 428.240005,224.408333 428.959988,224.408333 429.680004,224.408333 430.399986,224.408333 431.120003,224.408333 431.839985,224.408333 432.560001,224.408333 433.279984,224.408333 434.000000,224.408333 434.000000,224.408333 434.720016,224.408333 435.439999,224.408333 436.160015,224.408333 436.879997,224.408333 437.600014,224.408333 438.319996,224.408333 439.040012,224.408333 439.759995,224.408333 440.480011,224.408333 441.199993,224.408333 441.920010,224.408333 442.639992,224.408333 443.360008,224.408333 444.079990,224.408333 444.800007,224.408333 445.519989,224.408333 446.240005,224.408333 446.959988,224.408333 447.680004,224.408333 448.399986,224.408333 449.120003,224.408333 449.839985,224.408333 450.560001,224.408333 451.279984,224.408333 452.000000,224.408333 452.720016,224.408333 453.439999,224.408333 454.160015,224.408333 454.879997,224.408333 455.600014,224.408333 456.319996,224.408333 457.040012,224.408333 457.759995,224.408333 458.480011,224.408333 459.199993,224.408333 459.920010,224.408333 460.639992,224.408333 461.360008,224.408333 462.079990,224.408333 462.800007,224.408333 463.519989,224.408333 464.240005,224.408333 464.959988,224.408333 465.680004,224.408333 466.399986,224.408333 467.120003,224.408333 467.839985,224.408333 468.560001,224.408333 469.279984,224.408333 470.000000,224.408333 470.000000,224.408333"
+     id="polyline1258"
+     transform="translate(-47.819344,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-54)"
+     points="110.000000,251.795833 110.720000,251.795833 111.440000,251.795833 112.160000,251.795833 112.880000,251.795833 113.600000,251.795833 114.320000,251.795833 115.040000,251.795833 115.760000,251.795833 116.480000,251.795833 117.200000,251.795833 117.920000,251.795833 118.640000,251.795833 119.360000,251.795833 120.080000,251.795833 120.800000,251.795833 121.520000,251.795833 122.240000,251.795833 122.960001,251.795833 123.680000,251.795833 124.400000,251.795833 125.120000,251.795833 125.840000,251.795833 126.560000,251.795833 127.280000,251.795833 128.000000,251.795833 128.719999,251.795833 129.440001,251.795833 130.160000,251.795833 130.879999,251.795833 131.600001,251.795833 132.320000,251.795833 133.039999,251.795833 133.760001,251.795833 134.480000,251.795833 135.200000,251.795833 135.920001,251.795833 136.640000,251.795833 137.360000,251.795833 138.079999,251.795833 138.800000,251.795833 139.520000,251.795833 140.239999,251.795833 140.960001,251.795833 141.680000,251.795833 142.399999,251.795833 143.120001,251.795833 143.840000,251.795833 144.559999,251.795833 145.280001,251.795833 146.000000,251.795833 146.000000,251.795833 146.000000,251.795833 146.719999,251.795833 147.439999,251.795833 148.159998,251.795833 148.880002,251.795833 149.600001,251.795833 150.320000,251.795833 151.039999,251.795833 151.759999,251.795833 152.479998,251.795833 153.200002,251.795833 153.920001,251.795833 154.640000,251.795833 155.360000,251.795833 156.079999,251.795833 156.799998,251.795833 157.520002,251.795833 158.240001,251.795833 158.960001,251.795833 159.680000,251.795833 160.399999,251.795833 161.119998,251.795833 161.840002,251.795833 162.560001,251.795833 163.280001,251.795833 164.000000,251.795833 164.719999,251.795833 165.439999,251.795833 166.159998,251.795833 166.880002,251.795833 167.600001,251.795833 168.320000,251.795833 169.039999,251.795833 169.759999,251.795833 170.479998,251.795833 171.200002,251.795833 171.920001,251.795833 172.640000,251.795833 173.360000,251.795833 174.079999,251.795833 174.799998,251.795833 175.520002,251.795833 176.240001,251.795833 176.960001,251.795833 177.680000,251.795833 178.399999,251.795833 179.119998,251.795833 179.840002,251.795833 180.560001,251.795833 181.280001,251.795833 182.000000,251.795833 182.000000,251.795833 182.000000,251.795833 182.719999,251.795833 183.439999,251.795833 184.159998,251.795833 184.879997,251.795833 185.599997,251.795833 186.319996,251.795833 187.040004,251.795833 187.760003,251.795833 188.480002,251.795833 189.200002,251.795833 189.920001,251.795833 190.640000,251.795833 191.360000,251.795833 192.079999,251.795833 192.799998,251.795833 193.519998,251.795833 194.239997,251.795833 194.959996,251.795833 195.680004,251.795833 196.400003,251.795833 197.120003,251.795833 197.840002,251.795833 198.560001,251.795833 199.280001,251.795833 200.000000,251.795833 200.719999,251.795833 201.439999,251.795833 202.159998,251.795833 202.879997,251.795833 203.599997,251.795833 204.319996,251.795833 205.040004,251.795833 205.760003,251.795833 206.480002,251.795833 207.200002,251.795833 207.920001,251.795833 208.640000,251.795833 209.360000,251.795833 210.079999,251.795833 210.799998,251.795833 211.519998,251.795833 212.239997,251.795833 212.959996,251.795833 213.680004,251.795833 214.400003,251.795833 215.120003,251.795833 215.840002,251.795833 216.560001,251.795833 217.280001,251.795833 218.000000,251.795833 218.000000,251.795833 218.000000,251.795833 218.719999,251.795833 219.439999,251.795833 220.159998,251.795833 220.879997,251.795833 221.599997,251.795833 222.319996,251.795833 223.040004,251.795833 223.760003,251.795833 224.480002,251.795833 225.200002,251.795833 225.920001,251.795833 226.640000,251.795833 227.360000,251.795833 228.079999,251.795833 228.799998,251.795833 229.519998,251.795833 230.239997,251.795833 230.959996,251.795833 231.680004,251.795833 232.400003,251.795833 233.120003,251.795833 233.840002,251.795833 234.560001,251.795833 235.280001,251.795833 236.000000,251.795833 236.719999,251.795833 237.439999,251.795833 238.159998,251.795833 238.879997,251.795833 239.599997,251.795833 240.319996,251.795833 241.040004,251.795833 241.760003,251.795833 242.480002,251.795833 243.200002,251.795833 243.920001,251.795833 244.640000,251.795833 245.360000,251.795833 246.079999,251.795833 246.799998,251.795833 247.519998,251.795833 248.239997,251.795833 248.959996,251.795833 249.680004,251.795833 250.400003,251.795833 251.120003,251.795833 251.840002,251.795833 252.560001,251.795833 253.280001,251.795833 254.000000,251.795833 254.000000,251.795833 254.000000,251.795833 254.719999,251.795833 255.439999,251.795833 256.159998,251.795833 256.879997,251.795833 257.599997,251.795833 258.319996,251.795833 259.039995,251.795833 259.759995,251.795833 260.479994,251.795833 261.199993,251.795833 261.919992,251.795833 262.639992,251.795833 263.360008,251.795833 264.080008,251.795833 264.800007,251.795833 265.520006,251.795833 266.240005,251.795833 266.960005,251.795833 267.680004,251.795833 268.400003,251.795833 269.120003,251.795833 269.840002,251.795833 270.560001,251.795833 271.280001,251.795833 272.000000,251.795833 272.719999,251.795833 273.439999,251.795833 274.159998,251.795833 274.879997,251.795833 275.599997,251.795833 276.319996,251.795833 277.039995,251.795833 277.759995,251.795833 278.479994,251.795833 279.199993,251.795833 279.919992,251.795833 280.639992,251.795833 281.360008,251.795833 282.080008,251.795833 282.800007,251.795833 283.520006,251.795833 284.240005,251.795833 284.960005,251.795833 285.680004,251.795833 286.400003,251.795833 287.120003,251.795833 287.840002,251.795833 288.560001,251.795833 289.280001,251.795833 290.000000,251.795833 290.000000,251.795833 290.719999,251.795833 291.439999,251.795833 292.159998,251.795833 292.879997,251.795833 293.599997,251.795833 294.319996,251.795833 295.039995,251.795833 295.759995,251.795833 296.479994,251.795833 297.199993,251.795833 297.919992,251.795833 298.639992,251.795833 299.360008,251.795833 300.080008,251.795833 300.800007,251.795833 301.520006,251.795833 302.240005,251.795833 302.960005,251.795833 303.680004,251.795833 304.400003,251.795833 305.120003,251.795833 305.840002,251.795833 306.560001,251.795833 307.280001,251.795833 308.000000,251.795833 308.719999,251.795833 309.439999,251.795833 310.159998,251.795833 310.879997,251.795833 311.599997,251.795833 312.319996,251.795833 313.039995,251.795833 313.759995,251.795833 314.479994,251.795833 315.199993,251.795833 315.919992,251.795833 316.639992,251.795833 317.360008,251.795833 318.080008,251.795833 318.800007,251.795833 319.520006,251.795833 320.240005,251.795833 320.960005,251.795833 321.680004,251.795833 322.400003,251.795833 323.120003,251.795833 323.840002,251.795833 324.560001,251.795833 325.280001,251.795833 326.000000,251.795833 326.000000,251.795833 326.719999,251.795833 327.439999,251.795833 328.159998,251.795833 328.879997,251.795833 329.599997,251.795833 330.319996,251.795833 331.039995,251.795833 331.759995,251.795833 332.479994,251.795833 333.199993,251.795833 333.919992,251.795833 334.639992,251.795833 335.360008,251.795833 336.080008,251.795833 336.800007,251.795833 337.520006,251.795833 338.240005,251.795833 338.960005,251.795833 339.680004,251.795833 340.400003,251.795833 341.120003,251.795833 341.840002,251.795833 342.560001,251.795833 343.280001,251.795833 344.000000,251.795833 344.719999,251.795833 345.439999,251.795833 346.159998,251.795833 346.879997,251.795833 347.599997,251.795833 348.319996,251.795833 349.039995,251.795833 349.759995,251.795833 350.479994,251.795833 351.199993,251.795833 351.919992,251.795833 352.639992,251.795833 353.360008,251.795833 354.080008,251.795833 354.800007,251.795833 355.520006,251.795833 356.240005,251.795833 356.960005,251.795833 357.680004,251.795833 358.400003,251.795833 359.120003,251.795833 359.840002,251.795833 360.560001,251.795833 361.280001,251.795833 362.000000,251.795833 362.000000,251.795833 362.719999,251.795833 363.439999,251.795833 364.159998,251.795833 364.879997,251.795833 365.599997,251.795833 366.319996,251.795833 367.039995,251.795833 367.759995,251.795833 368.479994,251.795833 369.199993,251.795833 369.919992,251.795833 370.639992,251.795833 371.360008,251.795833 372.080008,251.795833 372.800007,251.795833 373.520006,251.795833 374.240005,251.795833 374.960005,251.795833 375.680004,251.795833 376.400003,251.795833 377.120003,251.795833 377.840002,251.795833 378.560001,251.795833 379.280001,251.795833 380.000000,251.795833 380.719999,251.795833 381.439999,251.795833 382.159998,251.795833 382.879997,251.795833 383.599997,251.795833 384.319996,251.795833 385.039995,251.795833 385.759995,251.795833 386.479994,251.795833 387.199993,251.795833 387.919992,251.795833 388.639992,251.795833 389.360008,251.795833 390.080008,251.795833 390.800007,251.795833 391.520006,251.795833 392.240005,251.795833 392.960005,251.795833 393.680004,251.795833 394.400003,251.795833 395.120003,251.795833 395.840002,251.795833 396.560001,251.795833 397.280001,251.795833 398.000000,251.795833 398.000000,251.795833 398.720016,251.795833 399.439999,251.795833 400.160015,251.795833 400.879997,251.795833 401.600014,251.795833 402.319996,251.795833 403.040012,251.795833 403.759995,251.795833 404.480011,251.795833 405.199993,251.795833 405.920010,251.795833 406.639992,251.795833 407.360008,251.795833 408.079990,251.795833 408.800007,251.795833 409.519989,251.795833 410.240005,251.795833 410.959988,251.795833 411.680004,251.795833 412.399986,251.795833 413.120003,251.795833 413.839985,251.795833 414.560001,251.795833 415.279984,251.795833 416.000000,251.795833 416.720016,251.795833 417.439999,251.795833 418.160015,251.795833 418.879997,251.795833 419.600014,251.795833 420.319996,251.795833 421.040012,251.795833 421.759995,251.795833 422.480011,251.795833 423.199993,251.795833 423.920010,251.795833 424.639992,251.795833 425.360008,251.795833 426.079990,251.795833 426.800007,251.795833 427.519989,251.795833 428.240005,251.795833 428.959988,251.795833 429.680004,251.795833 430.399986,251.795833 431.120003,251.795833 431.839985,251.795833 432.560001,251.795833 433.279984,251.795833 434.000000,251.795833 434.000000,251.795833 434.720016,251.795833 435.439999,251.795833 436.160015,251.795833 436.879997,251.795833 437.600014,251.795833 438.319996,251.795833 439.040012,251.795833 439.759995,251.795833 440.480011,251.795833 441.199993,251.795833 441.920010,251.795833 442.639992,251.795833 443.360008,251.795833 444.079990,251.795833 444.800007,251.795833 445.519989,251.795833 446.240005,251.795833 446.959988,251.795833 447.680004,251.795833 448.399986,251.795833 449.120003,251.795833 449.839985,251.795833 450.560001,251.795833 451.279984,251.795833 452.000000,251.795833 452.720016,251.795833 453.439999,251.795833 454.160015,251.795833 454.879997,251.795833 455.600014,251.795833 456.319996,251.795833 457.040012,251.795833 457.759995,251.795833 458.480011,251.795833 459.199993,251.795833 459.920010,251.795833 460.639992,251.795833 461.360008,251.795833 462.079990,251.795833 462.800007,251.795833 463.519989,251.795833 464.240005,251.795833 464.959988,251.795833 465.680004,251.795833 466.399986,251.795833 467.120003,251.795833 467.839985,251.795833 468.560001,251.795833 469.279984,251.795833 470.000000,251.795833 470.000000,251.795833"
+     id="polyline1260"
+     transform="translate(-47.819344,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="85.230316"
+     id="text1262">falCleTruIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="180.23032"
+     id="text1264">falCleTruIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="275.23032"
+     id="text1266">falCleTruIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline1268"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,433.000000 182.000000,746.000000"
+     id="polyline1270"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,433.000000 254.000000,746.000000"
+     id="polyline1272"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,433.000000 326.000000,746.000000"
+     id="polyline1274"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,433.000000 398.000000,746.000000"
+     id="polyline1276"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 470.000000,746.000000"
+     id="polyline1278"
+     transform="translate(-47.819344,90.730323)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="607.44971"
-     y="537.13531"
-     width="389"
-     height="67.816704"
-     id="rect103-6" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="551.02631"
+     width="360"
+     height="68"
+     id="rect1280" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="607.44971"
-     y="632.34033"
-     width="389"
-     height="67.816704"
-     id="rect105-1" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="646.23029"
+     width="360"
+     height="68"
+     id="rect1282" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="607.44971"
-     y="727.54437"
-     width="389"
-     height="67.816704"
-     id="rect107-0" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 499.000000,747.000000"
-     id="polyline109-4" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,434.000000"
-     id="polyline111-2" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 110.000000,434.000000"
-     id="polyline113-2" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline115-2" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,755.000000"
-     id="polyline117-0" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,747.000000 187.800000,755.000000"
-     id="polyline119-5" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,755.000000"
-     id="polyline121-5" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,747.000000 343.400000,755.000000"
-     id="polyline123-2" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,755.000000"
-     id="polyline125-9" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,755.000000"
-     id="polyline127-0" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,759.800000"
-     id="polyline129-2" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="607.44971"
-     y="854.24835"
-     id="text131-8">0</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,759.800000"
-     id="polyline133-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="763.04968"
-     y="854.24835"
-     id="text135-8">4</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,759.800000"
-     id="polyline137-0" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="918.64972"
-     y="854.24835"
-     id="text139-4">8</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,529.204167 110.000000,529.204167"
-     id="polyline141-0" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="604.95233"
-     id="text143-9">false</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,461.387500 110.000000,461.387500"
-     id="polyline145-1" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="537.13531"
-     id="text147-9">true</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,624.408333 110.000000,624.408333"
-     id="polyline149-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="700.15637"
-     id="text151-2">false</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,556.591667 110.000000,556.591667"
-     id="polyline153-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="632.34033"
-     id="text155-4">true</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,719.612500 110.000000,719.612500"
-     id="polyline157-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="795.36035"
-     id="text159-9">false</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,651.795833 110.000000,651.795833"
-     id="polyline161-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="591.44971"
-     y="727.54437"
-     id="text163-3">true</text>
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-8)"
-     points="110.000000,461.387500 110.778000,461.387500 111.556000,461.387500 112.334000,461.387500 113.112000,461.387500 113.890000,461.387500 114.668000,461.387500 115.446000,461.387500 116.224000,461.387500 117.002000,461.387500 117.780000,461.387500 118.558000,461.387500 119.336000,461.387500 120.114000,461.387500 120.892000,461.387500 121.670000,461.387500 122.448000,461.387500 123.226000,461.387500 124.004001,461.387500 124.782000,461.387500 125.560000,461.387500 126.337999,461.387500 127.116000,461.387500 127.894000,461.387500 128.672000,461.387500 129.450000,461.387500 130.227999,461.387500 131.006001,461.387500 131.784000,461.387500 132.561999,461.387500 133.340001,461.387500 134.118000,461.387500 134.895999,461.387500 135.674001,461.387500 136.452000,461.387500 137.230000,461.387500 138.008001,461.387500 138.786000,461.387500 139.564000,461.387500 140.341999,461.387500 141.120000,461.387500 141.898000,461.387500 142.675999,461.387500 143.454001,461.387500 144.232000,461.387500 145.009999,461.387500 145.788001,461.387500 146.566000,461.387500 147.343999,461.387500 148.122001,461.387500 148.900000,461.387500 148.900000,529.204167 148.900000,529.204167 148.900000,529.204167 149.677999,529.204167 150.455999,529.204167 151.233998,529.204167 152.012002,529.204167 152.790001,529.204167 153.568000,529.204167 154.345999,529.204167 155.123999,529.204167 155.901998,529.204167 156.680002,529.204167 157.458001,529.204167 158.236000,529.204167 159.014000,529.204167 159.791999,529.204167 160.569998,529.204167 161.348002,529.204167 162.126001,529.204167 162.904001,529.204167 163.682000,529.204167 164.459999,529.204167 165.237998,529.204167 166.016002,529.204167 166.794001,529.204167 167.572001,529.204167 168.350000,529.204167 169.127999,529.204167 169.905999,529.204167 170.683998,529.204167 171.462002,529.204167 172.240001,529.204167 173.018000,529.204167 173.795999,529.204167 174.573999,529.204167 175.351998,529.204167 176.130002,529.204167 176.908001,529.204167 177.686000,529.204167 178.464000,529.204167 179.241999,529.204167 180.019998,529.204167 180.798002,529.204167 181.576001,529.204167 182.354001,529.204167 183.132000,529.204167 183.909999,529.204167 184.687998,529.204167 185.466002,529.204167 186.244001,529.204167 187.022001,529.204167 187.800000,529.204167 187.800000,461.387500 187.800000,461.387500 188.577999,461.387500 189.355999,461.387500 190.133998,461.387500 190.911997,461.387500 191.689996,461.387500 192.467996,461.387500 193.246004,461.387500 194.024003,461.387500 194.802003,461.387500 195.580002,461.387500 196.358001,461.387500 197.136000,461.387500 197.914000,461.387500 198.691999,461.387500 199.469998,461.387500 200.247997,461.387500 201.025997,461.387500 201.803996,461.387500 202.582004,461.387500 203.360004,461.387500 204.138003,461.387500 204.916002,461.387500 205.694001,461.387500 206.472001,461.387500 207.250000,461.387500 208.027999,461.387500 208.805999,461.387500 209.583998,461.387500 210.361997,461.387500 211.139996,461.387500 211.917996,461.387500 212.696004,461.387500 213.474003,461.387500 214.252003,461.387500 215.030002,461.387500 215.808001,461.387500 216.586000,461.387500 217.364000,461.387500 218.141999,461.387500 218.919998,461.387500 219.697997,461.387500 220.475997,461.387500 221.253996,461.387500 222.032004,461.387500 222.810004,461.387500 223.588003,461.387500 224.366002,461.387500 225.144001,461.387500 225.922001,461.387500 226.700000,461.387500 226.700000,529.204167 226.700000,529.204167 227.477999,529.204167 228.255999,529.204167 229.033998,529.204167 229.811997,529.204167 230.589996,529.204167 231.367996,529.204167 232.146004,529.204167 232.924003,529.204167 233.702003,529.204167 234.480002,529.204167 235.258001,529.204167 236.036000,529.204167 236.814000,529.204167 237.591999,529.204167 238.369998,529.204167 239.147997,529.204167 239.925997,529.204167 240.703996,529.204167 241.482004,529.204167 242.260004,529.204167 243.038003,529.204167 243.816002,529.204167 244.594001,529.204167 245.372001,529.204167 246.150000,529.204167 246.927999,529.204167 247.705999,529.204167 248.483998,529.204167 249.261997,529.204167 250.039996,529.204167 250.817996,529.204167 251.596004,529.204167 252.374003,529.204167 253.152003,529.204167 253.930002,529.204167 254.708001,529.204167 255.486000,529.204167 256.264000,529.204167 257.041999,529.204167 257.819998,529.204167 258.597997,529.204167 259.375997,529.204167 260.153996,529.204167 260.932004,529.204167 261.710004,529.204167 262.488003,529.204167 263.266002,529.204167 264.044001,529.204167 264.822001,529.204167 265.600000,529.204167 265.600000,461.387500 265.600000,461.387500 266.377999,461.387500 267.155999,461.387500 267.933998,461.387500 268.711997,461.387500 269.489996,461.387500 270.267996,461.387500 271.045995,461.387500 271.823994,461.387500 272.601993,461.387500 273.379993,461.387500 274.157992,461.387500 274.935991,461.387500 275.714009,461.387500 276.492008,461.387500 277.270007,461.387500 278.048007,461.387500 278.826006,461.387500 279.604005,461.387500 280.382004,461.387500 281.160004,461.387500 281.938003,461.387500 282.716002,461.387500 283.494001,461.387500 284.272001,461.387500 285.050000,461.387500 285.827999,461.387500 286.605999,461.387500 287.383998,461.387500 288.161997,461.387500 288.939996,461.387500 289.717996,461.387500 290.495995,461.387500 291.273994,461.387500 292.051993,461.387500 292.829993,461.387500 293.607992,461.387500 294.385991,461.387500 295.164009,461.387500 295.942008,461.387500 296.720007,461.387500 297.498007,461.387500 298.276006,461.387500 299.054005,461.387500 299.832004,461.387500 300.610004,461.387500 301.388003,461.387500 302.166002,461.387500 302.944001,461.387500 303.722001,461.387500 304.500000,461.387500 304.500000,529.204167 305.277999,529.204167 306.055999,529.204167 306.833998,529.204167 307.611997,529.204167 308.389996,529.204167 309.167996,529.204167 309.945995,529.204167 310.723994,529.204167 311.501993,529.204167 312.279993,529.204167 313.057992,529.204167 313.835991,529.204167 314.614009,529.204167 315.392008,529.204167 316.170007,529.204167 316.948007,529.204167 317.726006,529.204167 318.504005,529.204167 319.282004,529.204167 320.060004,529.204167 320.838003,529.204167 321.616002,529.204167 322.394001,529.204167 323.172001,529.204167 323.950000,529.204167 324.727999,529.204167 325.505999,529.204167 326.283998,529.204167 327.061997,529.204167 327.839996,529.204167 328.617996,529.204167 329.395995,529.204167 330.173994,529.204167 330.951993,529.204167 331.729993,529.204167 332.507992,529.204167 333.285991,529.204167 334.064009,529.204167 334.842008,529.204167 335.620007,529.204167 336.398007,529.204167 337.176006,529.204167 337.954005,529.204167 338.732004,529.204167 339.510004,529.204167 340.288003,529.204167 341.066002,529.204167 341.844001,529.204167 342.622001,529.204167 343.400000,529.204167 343.400000,461.387500 344.177999,461.387500 344.955999,461.387500 345.733998,461.387500 346.511997,461.387500 347.289996,461.387500 348.067996,461.387500 348.845995,461.387500 349.623994,461.387500 350.401993,461.387500 351.179993,461.387500 351.957992,461.387500 352.735991,461.387500 353.514009,461.387500 354.292008,461.387500 355.070007,461.387500 355.848007,461.387500 356.626006,461.387500 357.404005,461.387500 358.182004,461.387500 358.960004,461.387500 359.738003,461.387500 360.516002,461.387500 361.294001,461.387500 362.072001,461.387500 362.850000,461.387500 363.627999,461.387500 364.405999,461.387500 365.183998,461.387500 365.961997,461.387500 366.739996,461.387500 367.517996,461.387500 368.295995,461.387500 369.073994,461.387500 369.851993,461.387500 370.629993,461.387500 371.407992,461.387500 372.185991,461.387500 372.964009,461.387500 373.742008,461.387500 374.520007,461.387500 375.298007,461.387500 376.076006,461.387500 376.854005,461.387500 377.632004,461.387500 378.410004,461.387500 379.188003,461.387500 379.966002,461.387500 380.744001,461.387500 381.522001,461.387500 382.300000,461.387500 382.300000,529.204167 383.077999,529.204167 383.855999,529.204167 384.633998,529.204167 385.411997,529.204167 386.189996,529.204167 386.967996,529.204167 387.745995,529.204167 388.523994,529.204167 389.301993,529.204167 390.079993,529.204167 390.857992,529.204167 391.635991,529.204167 392.414009,529.204167 393.192008,529.204167 393.970007,529.204167 394.748007,529.204167 395.526006,529.204167 396.304005,529.204167 397.082004,529.204167 397.860004,529.204167 398.638003,529.204167 399.416002,529.204167 400.194001,529.204167 400.972001,529.204167 401.750000,529.204167 402.527999,529.204167 403.305999,529.204167 404.083998,529.204167 404.861997,529.204167 405.639996,529.204167 406.417996,529.204167 407.195995,529.204167 407.973994,529.204167 408.751993,529.204167 409.529993,529.204167 410.307992,529.204167 411.085991,529.204167 411.864009,529.204167 412.642008,529.204167 413.420007,529.204167 414.198007,529.204167 414.976006,529.204167 415.754005,529.204167 416.532004,529.204167 417.310004,529.204167 418.088003,529.204167 418.866002,529.204167 419.644001,529.204167 420.422001,529.204167 421.200000,529.204167 421.200000,461.387500 421.978018,461.387500 422.755999,461.387500 423.534016,461.387500 424.311997,461.387500 425.090015,461.387500 425.867996,461.387500 426.646013,461.387500 427.423994,461.387500 428.202012,461.387500 428.979993,461.387500 429.758010,461.387500 430.535991,461.387500 431.314009,461.387500 432.091990,461.387500 432.870007,461.387500 433.647988,461.387500 434.426006,461.387500 435.203987,461.387500 435.982004,461.387500 436.759985,461.387500 437.538003,461.387500 438.315984,461.387500 439.094001,461.387500 439.871982,461.387500 440.650000,461.387500 441.428018,461.387500 442.205999,461.387500 442.984016,461.387500 443.761997,461.387500 444.540015,461.387500 445.317996,461.387500 446.096013,461.387500 446.873994,461.387500 447.652012,461.387500 448.429993,461.387500 449.208010,461.387500 449.985991,461.387500 450.764009,461.387500 451.541990,461.387500 452.320007,461.387500 453.097988,461.387500 453.876006,461.387500 454.653987,461.387500 455.432004,461.387500 456.209985,461.387500 456.988003,461.387500 457.765984,461.387500 458.544001,461.387500 459.321982,461.387500 460.100000,461.387500 460.100000,529.204167 460.878018,529.204167 461.655999,529.204167 462.434016,529.204167 463.211997,529.204167 463.990015,529.204167 464.767996,529.204167 465.546013,529.204167 466.323994,529.204167 467.102012,529.204167 467.879993,529.204167 468.658010,529.204167 469.435991,529.204167 470.214009,529.204167 470.991990,529.204167 471.770007,529.204167 472.547988,529.204167 473.326006,529.204167 474.103987,529.204167 474.882004,529.204167 475.659985,529.204167 476.438003,529.204167 477.215984,529.204167 477.994001,529.204167 478.771982,529.204167 479.550000,529.204167 480.328018,529.204167 481.105999,529.204167 481.884016,529.204167 482.661997,529.204167 483.440015,529.204167 484.217996,529.204167 484.996013,529.204167 485.773994,529.204167 486.552012,529.204167 487.329993,529.204167 488.108010,529.204167 488.885991,529.204167 489.664009,529.204167 490.441990,529.204167 491.220007,529.204167 491.997988,529.204167 492.776006,529.204167 493.553987,529.204167 494.332004,529.204167 495.109985,529.204167 495.888003,529.204167 496.665984,529.204167 497.444001,529.204167 498.221982,529.204167 499.000000,529.204167 499.000000,461.387500"
-     id="polyline168-6" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-8)"
-     points="110.000000,624.408333 110.778000,624.408333 111.556000,624.408333 112.334000,624.408333 113.112000,624.408333 113.890000,624.408333 114.668000,624.408333 115.446000,624.408333 116.224000,624.408333 117.002000,624.408333 117.780000,624.408333 118.558000,624.408333 119.336000,624.408333 120.114000,624.408333 120.892000,624.408333 121.670000,624.408333 122.448000,624.408333 123.226000,624.408333 124.004001,624.408333 124.782000,624.408333 125.560000,624.408333 126.337999,624.408333 127.116000,624.408333 127.894000,624.408333 128.672000,624.408333 129.450000,624.408333 130.227999,624.408333 131.006001,624.408333 131.784000,624.408333 132.561999,624.408333 133.340001,624.408333 134.118000,624.408333 134.895999,624.408333 135.674001,624.408333 136.452000,624.408333 137.230000,624.408333 138.008001,624.408333 138.786000,624.408333 139.564000,624.408333 140.341999,624.408333 141.120000,624.408333 141.898000,624.408333 142.675999,624.408333 143.454001,624.408333 144.232000,624.408333 145.009999,624.408333 145.788001,624.408333 146.566000,624.408333 147.343999,624.408333 148.122001,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 149.677999,624.408333 150.455999,624.408333 151.233998,624.408333 152.012002,624.408333 152.790001,624.408333 153.568000,624.408333 154.345999,624.408333 155.123999,624.408333 155.901998,624.408333 156.680002,624.408333 157.458001,624.408333 158.236000,624.408333 159.014000,624.408333 159.791999,624.408333 160.569998,624.408333 161.348002,624.408333 162.126001,624.408333 162.904001,624.408333 163.682000,624.408333 164.459999,624.408333 165.237998,624.408333 166.016002,624.408333 166.794001,624.408333 167.572001,624.408333 168.350000,624.408333 169.127999,624.408333 169.905999,624.408333 170.683998,624.408333 171.462002,624.408333 172.240001,624.408333 173.018000,624.408333 173.795999,624.408333 174.573999,624.408333 175.351998,624.408333 176.130002,624.408333 176.908001,624.408333 177.686000,624.408333 178.464000,624.408333 179.241999,624.408333 180.019998,624.408333 180.798002,624.408333 181.576001,624.408333 182.354001,624.408333 183.132000,624.408333 183.909999,624.408333 184.687998,624.408333 185.466002,624.408333 186.244001,624.408333 187.022001,624.408333 187.800000,624.408333 187.800000,624.408333 187.800000,624.408333 188.577999,624.408333 189.355999,624.408333 190.133998,624.408333 190.911997,624.408333 191.689996,624.408333 192.467996,624.408333 193.246004,624.408333 194.024003,624.408333 194.802003,624.408333 195.580002,624.408333 196.358001,624.408333 197.136000,624.408333 197.914000,624.408333 198.691999,624.408333 199.469998,624.408333 200.247997,624.408333 201.025997,624.408333 201.803996,624.408333 202.582004,624.408333 203.360004,624.408333 204.138003,624.408333 204.916002,624.408333 205.694001,624.408333 206.472001,624.408333 207.250000,624.408333 208.027999,624.408333 208.805999,624.408333 209.583998,624.408333 210.361997,624.408333 211.139996,624.408333 211.917996,624.408333 212.696004,624.408333 213.474003,624.408333 214.252003,624.408333 215.030002,624.408333 215.808001,624.408333 216.586000,624.408333 217.364000,624.408333 218.141999,624.408333 218.919998,624.408333 219.697997,624.408333 220.475997,624.408333 221.253996,624.408333 222.032004,624.408333 222.810004,624.408333 223.588003,624.408333 224.366002,624.408333 225.144001,624.408333 225.922001,624.408333 226.700000,624.408333 226.700000,624.408333 226.700000,624.408333 227.477999,624.408333 228.255999,624.408333 229.033998,624.408333 229.811997,624.408333 230.589996,624.408333 231.367996,624.408333 232.146004,624.408333 232.924003,624.408333 233.702003,624.408333 234.480002,624.408333 235.258001,624.408333 236.036000,624.408333 236.814000,624.408333 237.591999,624.408333 238.369998,624.408333 239.147997,624.408333 239.925997,624.408333 240.703996,624.408333 241.482004,624.408333 242.260004,624.408333 243.038003,624.408333 243.816002,624.408333 244.594001,624.408333 245.372001,624.408333 246.150000,624.408333 246.927999,624.408333 247.705999,624.408333 248.483998,624.408333 249.261997,624.408333 250.039996,624.408333 250.817996,624.408333 251.596004,624.408333 252.374003,624.408333 253.152003,624.408333 253.930002,624.408333 254.708001,624.408333 255.486000,624.408333 256.264000,624.408333 257.041999,624.408333 257.819998,624.408333 258.597997,624.408333 259.375997,624.408333 260.153996,624.408333 260.932004,624.408333 261.710004,624.408333 262.488003,624.408333 263.266002,624.408333 264.044001,624.408333 264.822001,624.408333 265.600000,624.408333 265.600000,624.408333 265.600000,624.408333 266.377999,624.408333 267.155999,624.408333 267.933998,624.408333 268.711997,624.408333 269.489996,624.408333 270.267996,624.408333 271.045995,624.408333 271.823994,624.408333 272.601993,624.408333 273.379993,624.408333 274.157992,624.408333 274.935991,624.408333 275.714009,624.408333 276.492008,624.408333 277.270007,624.408333 278.048007,624.408333 278.826006,624.408333 279.604005,624.408333 280.382004,624.408333 281.160004,624.408333 281.938003,624.408333 282.716002,624.408333 283.494001,624.408333 284.272001,624.408333 285.050000,624.408333 285.827999,624.408333 286.605999,624.408333 287.383998,624.408333 288.161997,624.408333 288.939996,624.408333 289.717996,624.408333 290.495995,624.408333 291.273994,624.408333 292.051993,624.408333 292.829993,624.408333 293.607992,624.408333 294.385991,624.408333 295.164009,624.408333 295.942008,624.408333 296.720007,624.408333 297.498007,624.408333 298.276006,624.408333 299.054005,624.408333 299.832004,624.408333 300.610004,624.408333 301.388003,624.408333 302.166002,624.408333 302.944001,624.408333 303.722001,624.408333 304.500000,624.408333 304.500000,624.408333 305.277999,624.408333 306.055999,624.408333 306.833998,624.408333 307.611997,624.408333 308.389996,624.408333 309.167996,624.408333 309.945995,624.408333 310.723994,624.408333 311.501993,624.408333 312.279993,624.408333 313.057992,624.408333 313.835991,624.408333 314.614009,624.408333 315.392008,624.408333 316.170007,624.408333 316.948007,624.408333 317.726006,624.408333 318.504005,624.408333 319.282004,624.408333 320.060004,624.408333 320.838003,624.408333 321.616002,624.408333 322.394001,624.408333 323.172001,624.408333 323.950000,624.408333 324.727999,624.408333 325.505999,624.408333 326.283998,624.408333 327.061997,624.408333 327.839996,624.408333 328.617996,624.408333 329.395995,624.408333 330.173994,624.408333 330.951993,624.408333 331.729993,624.408333 332.507992,624.408333 333.285991,624.408333 334.064009,624.408333 334.842008,624.408333 335.620007,624.408333 336.398007,624.408333 337.176006,624.408333 337.954005,624.408333 338.732004,624.408333 339.510004,624.408333 340.288003,624.408333 341.066002,624.408333 341.844001,624.408333 342.622001,624.408333 343.400000,624.408333 343.400000,624.408333 344.177999,624.408333 344.955999,624.408333 345.733998,624.408333 346.511997,624.408333 347.289996,624.408333 348.067996,624.408333 348.845995,624.408333 349.623994,624.408333 350.401993,624.408333 351.179993,624.408333 351.957992,624.408333 352.735991,624.408333 353.514009,624.408333 354.292008,624.408333 355.070007,624.408333 355.848007,624.408333 356.626006,624.408333 357.404005,624.408333 358.182004,624.408333 358.960004,624.408333 359.738003,624.408333 360.516002,624.408333 361.294001,624.408333 362.072001,624.408333 362.850000,624.408333 363.627999,624.408333 364.405999,624.408333 365.183998,624.408333 365.961997,624.408333 366.739996,624.408333 367.517996,624.408333 368.295995,624.408333 369.073994,624.408333 369.851993,624.408333 370.629993,624.408333 371.407992,624.408333 372.185991,624.408333 372.964009,624.408333 373.742008,624.408333 374.520007,624.408333 375.298007,624.408333 376.076006,624.408333 376.854005,624.408333 377.632004,624.408333 378.410004,624.408333 379.188003,624.408333 379.966002,624.408333 380.744001,624.408333 381.522001,624.408333 382.300000,624.408333 382.300000,624.408333 383.077999,624.408333 383.855999,624.408333 384.633998,624.408333 385.411997,624.408333 386.189996,624.408333 386.967996,624.408333 387.745995,624.408333 388.523994,624.408333 389.301993,624.408333 390.079993,624.408333 390.857992,624.408333 391.635991,624.408333 392.414009,624.408333 393.192008,624.408333 393.970007,624.408333 394.748007,624.408333 395.526006,624.408333 396.304005,624.408333 397.082004,624.408333 397.860004,624.408333 398.638003,624.408333 399.416002,624.408333 400.194001,624.408333 400.972001,624.408333 401.750000,624.408333 402.527999,624.408333 403.305999,624.408333 404.083998,624.408333 404.861997,624.408333 405.639996,624.408333 406.417996,624.408333 407.195995,624.408333 407.973994,624.408333 408.751993,624.408333 409.529993,624.408333 410.307992,624.408333 411.085991,624.408333 411.864009,624.408333 412.642008,624.408333 413.420007,624.408333 414.198007,624.408333 414.976006,624.408333 415.754005,624.408333 416.532004,624.408333 417.310004,624.408333 418.088003,624.408333 418.866002,624.408333 419.644001,624.408333 420.422001,624.408333 421.200000,624.408333 421.200000,624.408333 421.978018,624.408333 422.755999,624.408333 423.534016,624.408333 424.311997,624.408333 425.090015,624.408333 425.867996,624.408333 426.646013,624.408333 427.423994,624.408333 428.202012,624.408333 428.979993,624.408333 429.758010,624.408333 430.535991,624.408333 431.314009,624.408333 432.091990,624.408333 432.870007,624.408333 433.647988,624.408333 434.426006,624.408333 435.203987,624.408333 435.982004,624.408333 436.759985,624.408333 437.538003,624.408333 438.315984,624.408333 439.094001,624.408333 439.871982,624.408333 440.650000,624.408333 441.428018,624.408333 442.205999,624.408333 442.984016,624.408333 443.761997,624.408333 444.540015,624.408333 445.317996,624.408333 446.096013,624.408333 446.873994,624.408333 447.652012,624.408333 448.429993,624.408333 449.208010,624.408333 449.985991,624.408333 450.764009,624.408333 451.541990,624.408333 452.320007,624.408333 453.097988,624.408333 453.876006,624.408333 454.653987,624.408333 455.432004,624.408333 456.209985,624.408333 456.988003,624.408333 457.765984,624.408333 458.544001,624.408333 459.321982,624.408333 460.100000,624.408333 460.100000,624.408333 460.878018,624.408333 461.655999,624.408333 462.434016,624.408333 463.211997,624.408333 463.990015,624.408333 464.767996,624.408333 465.546013,624.408333 466.323994,624.408333 467.102012,624.408333 467.879993,624.408333 468.658010,624.408333 469.435991,624.408333 470.214009,624.408333 470.991990,624.408333 471.770007,624.408333 472.547988,624.408333 473.326006,624.408333 474.103987,624.408333 474.882004,624.408333 475.659985,624.408333 476.438003,624.408333 477.215984,624.408333 477.994001,624.408333 478.771982,624.408333 479.550000,624.408333 480.328018,624.408333 481.105999,624.408333 481.884016,624.408333 482.661997,624.408333 483.440015,624.408333 484.217996,624.408333 484.996013,624.408333 485.773994,624.408333 486.552012,624.408333 487.329993,624.408333 488.108010,624.408333 488.885991,624.408333 489.664009,624.408333 490.441990,624.408333 491.220007,624.408333 491.997988,624.408333 492.776006,624.408333 493.553987,624.408333 494.332004,624.408333 495.109985,624.408333 495.888003,624.408333 496.665984,624.408333 497.444001,624.408333 498.221982,624.408333 499.000000,624.408333 499.000000,624.408333"
-     id="polyline170-0" />
-  <polyline
-     transform="translate(497.44972,75.748343)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-8)"
-     points="110.000000,651.795833 110.778000,651.795833 111.556000,651.795833 112.334000,651.795833 113.112000,651.795833 113.890000,651.795833 114.668000,651.795833 115.446000,651.795833 116.224000,651.795833 117.002000,651.795833 117.780000,651.795833 118.558000,651.795833 119.336000,651.795833 120.114000,651.795833 120.892000,651.795833 121.670000,651.795833 122.448000,651.795833 123.226000,651.795833 124.004001,651.795833 124.782000,651.795833 125.560000,651.795833 126.337999,651.795833 127.116000,651.795833 127.894000,651.795833 128.672000,651.795833 129.450000,651.795833 130.227999,651.795833 131.006001,651.795833 131.784000,651.795833 132.561999,651.795833 133.340001,651.795833 134.118000,651.795833 134.895999,651.795833 135.674001,651.795833 136.452000,651.795833 137.230000,651.795833 138.008001,651.795833 138.786000,651.795833 139.564000,651.795833 140.341999,651.795833 141.120000,651.795833 141.898000,651.795833 142.675999,651.795833 143.454001,651.795833 144.232000,651.795833 145.009999,651.795833 145.788001,651.795833 146.566000,651.795833 147.343999,651.795833 148.122001,651.795833 148.900000,651.795833 148.900000,651.795833 148.900000,651.795833 148.900000,651.795833 149.677999,651.795833 150.455999,651.795833 151.233998,651.795833 152.012002,651.795833 152.790001,651.795833 153.568000,651.795833 154.345999,651.795833 155.123999,651.795833 155.901998,651.795833 156.680002,651.795833 157.458001,651.795833 158.236000,651.795833 159.014000,651.795833 159.791999,651.795833 160.569998,651.795833 161.348002,651.795833 162.126001,651.795833 162.904001,651.795833 163.682000,651.795833 164.459999,651.795833 165.237998,651.795833 166.016002,651.795833 166.794001,651.795833 167.572001,651.795833 168.350000,651.795833 169.127999,651.795833 169.905999,651.795833 170.683998,651.795833 171.462002,651.795833 172.240001,651.795833 173.018000,651.795833 173.795999,651.795833 174.573999,651.795833 175.351998,651.795833 176.130002,651.795833 176.908001,651.795833 177.686000,651.795833 178.464000,651.795833 179.241999,651.795833 180.019998,651.795833 180.798002,651.795833 181.576001,651.795833 182.354001,651.795833 183.132000,651.795833 183.909999,651.795833 184.687998,651.795833 185.466002,651.795833 186.244001,651.795833 187.022001,651.795833 187.800000,651.795833 187.800000,651.795833 187.800000,651.795833 188.577999,651.795833 189.355999,651.795833 190.133998,651.795833 190.911997,651.795833 191.689996,651.795833 192.467996,651.795833 193.246004,651.795833 194.024003,651.795833 194.802003,651.795833 195.580002,651.795833 196.358001,651.795833 197.136000,651.795833 197.914000,651.795833 198.691999,651.795833 199.469998,651.795833 200.247997,651.795833 201.025997,651.795833 201.803996,651.795833 202.582004,651.795833 203.360004,651.795833 204.138003,651.795833 204.916002,651.795833 205.694001,651.795833 206.472001,651.795833 207.250000,651.795833 208.027999,651.795833 208.805999,651.795833 209.583998,651.795833 210.361997,651.795833 211.139996,651.795833 211.917996,651.795833 212.696004,651.795833 213.474003,651.795833 214.252003,651.795833 215.030002,651.795833 215.808001,651.795833 216.586000,651.795833 217.364000,651.795833 218.141999,651.795833 218.919998,651.795833 219.697997,651.795833 220.475997,651.795833 221.253996,651.795833 222.032004,651.795833 222.810004,651.795833 223.588003,651.795833 224.366002,651.795833 225.144001,651.795833 225.922001,651.795833 226.700000,651.795833 226.700000,651.795833 226.700000,651.795833 227.477999,651.795833 228.255999,651.795833 229.033998,651.795833 229.811997,651.795833 230.589996,651.795833 231.367996,651.795833 232.146004,651.795833 232.924003,651.795833 233.702003,651.795833 234.480002,651.795833 235.258001,651.795833 236.036000,651.795833 236.814000,651.795833 237.591999,651.795833 238.369998,651.795833 239.147997,651.795833 239.925997,651.795833 240.703996,651.795833 241.482004,651.795833 242.260004,651.795833 243.038003,651.795833 243.816002,651.795833 244.594001,651.795833 245.372001,651.795833 246.150000,651.795833 246.927999,651.795833 247.705999,651.795833 248.483998,651.795833 249.261997,651.795833 250.039996,651.795833 250.817996,651.795833 251.596004,651.795833 252.374003,651.795833 253.152003,651.795833 253.930002,651.795833 254.708001,651.795833 255.486000,651.795833 256.264000,651.795833 257.041999,651.795833 257.819998,651.795833 258.597997,651.795833 259.375997,651.795833 260.153996,651.795833 260.932004,651.795833 261.710004,651.795833 262.488003,651.795833 263.266002,651.795833 264.044001,651.795833 264.822001,651.795833 265.600000,651.795833 265.600000,651.795833 265.600000,651.795833 266.377999,651.795833 267.155999,651.795833 267.933998,651.795833 268.711997,651.795833 269.489996,651.795833 270.267996,651.795833 271.045995,651.795833 271.823994,651.795833 272.601993,651.795833 273.379993,651.795833 274.157992,651.795833 274.935991,651.795833 275.714009,651.795833 276.492008,651.795833 277.270007,651.795833 278.048007,651.795833 278.826006,651.795833 279.604005,651.795833 280.382004,651.795833 281.160004,651.795833 281.938003,651.795833 282.716002,651.795833 283.494001,651.795833 284.272001,651.795833 285.050000,651.795833 285.827999,651.795833 286.605999,651.795833 287.383998,651.795833 288.161997,651.795833 288.939996,651.795833 289.717996,651.795833 290.495995,651.795833 291.273994,651.795833 292.051993,651.795833 292.829993,651.795833 293.607992,651.795833 294.385991,651.795833 295.164009,651.795833 295.942008,651.795833 296.720007,651.795833 297.498007,651.795833 298.276006,651.795833 299.054005,651.795833 299.832004,651.795833 300.610004,651.795833 301.388003,651.795833 302.166002,651.795833 302.944001,651.795833 303.722001,651.795833 304.500000,651.795833 304.500000,651.795833 305.277999,651.795833 306.055999,651.795833 306.833998,651.795833 307.611997,651.795833 308.389996,651.795833 309.167996,651.795833 309.945995,651.795833 310.723994,651.795833 311.501993,651.795833 312.279993,651.795833 313.057992,651.795833 313.835991,651.795833 314.614009,651.795833 315.392008,651.795833 316.170007,651.795833 316.948007,651.795833 317.726006,651.795833 318.504005,651.795833 319.282004,651.795833 320.060004,651.795833 320.838003,651.795833 321.616002,651.795833 322.394001,651.795833 323.172001,651.795833 323.950000,651.795833 324.727999,651.795833 325.505999,651.795833 326.283998,651.795833 327.061997,651.795833 327.839996,651.795833 328.617996,651.795833 329.395995,651.795833 330.173994,651.795833 330.951993,651.795833 331.729993,651.795833 332.507992,651.795833 333.285991,651.795833 334.064009,651.795833 334.842008,651.795833 335.620007,651.795833 336.398007,651.795833 337.176006,651.795833 337.954005,651.795833 338.732004,651.795833 339.510004,651.795833 340.288003,651.795833 341.066002,651.795833 341.844001,651.795833 342.622001,651.795833 343.400000,651.795833 343.400000,651.795833 344.177999,651.795833 344.955999,651.795833 345.733998,651.795833 346.511997,651.795833 347.289996,651.795833 348.067996,651.795833 348.845995,651.795833 349.623994,651.795833 350.401993,651.795833 351.179993,651.795833 351.957992,651.795833 352.735991,651.795833 353.514009,651.795833 354.292008,651.795833 355.070007,651.795833 355.848007,651.795833 356.626006,651.795833 357.404005,651.795833 358.182004,651.795833 358.960004,651.795833 359.738003,651.795833 360.516002,651.795833 361.294001,651.795833 362.072001,651.795833 362.850000,651.795833 363.627999,651.795833 364.405999,651.795833 365.183998,651.795833 365.961997,651.795833 366.739996,651.795833 367.517996,651.795833 368.295995,651.795833 369.073994,651.795833 369.851993,651.795833 370.629993,651.795833 371.407992,651.795833 372.185991,651.795833 372.964009,651.795833 373.742008,651.795833 374.520007,651.795833 375.298007,651.795833 376.076006,651.795833 376.854005,651.795833 377.632004,651.795833 378.410004,651.795833 379.188003,651.795833 379.966002,651.795833 380.744001,651.795833 381.522001,651.795833 382.300000,651.795833 382.300000,651.795833 383.077999,651.795833 383.855999,651.795833 384.633998,651.795833 385.411997,651.795833 386.189996,651.795833 386.967996,651.795833 387.745995,651.795833 388.523994,651.795833 389.301993,651.795833 390.079993,651.795833 390.857992,651.795833 391.635991,651.795833 392.414009,651.795833 393.192008,651.795833 393.970007,651.795833 394.748007,651.795833 395.526006,651.795833 396.304005,651.795833 397.082004,651.795833 397.860004,651.795833 398.638003,651.795833 399.416002,651.795833 400.194001,651.795833 400.972001,651.795833 401.750000,651.795833 402.527999,651.795833 403.305999,651.795833 404.083998,651.795833 404.861997,651.795833 405.639996,651.795833 406.417996,651.795833 407.195995,651.795833 407.973994,651.795833 408.751993,651.795833 409.529993,651.795833 410.307992,651.795833 411.085991,651.795833 411.864009,651.795833 412.642008,651.795833 413.420007,651.795833 414.198007,651.795833 414.976006,651.795833 415.754005,651.795833 416.532004,651.795833 417.310004,651.795833 418.088003,651.795833 418.866002,651.795833 419.644001,651.795833 420.422001,651.795833 421.200000,651.795833 421.200000,651.795833 421.978018,651.795833 422.755999,651.795833 423.534016,651.795833 424.311997,651.795833 425.090015,651.795833 425.867996,651.795833 426.646013,651.795833 427.423994,651.795833 428.202012,651.795833 428.979993,651.795833 429.758010,651.795833 430.535991,651.795833 431.314009,651.795833 432.091990,651.795833 432.870007,651.795833 433.647988,651.795833 434.426006,651.795833 435.203987,651.795833 435.982004,651.795833 436.759985,651.795833 437.538003,651.795833 438.315984,651.795833 439.094001,651.795833 439.871982,651.795833 440.650000,651.795833 441.428018,651.795833 442.205999,651.795833 442.984016,651.795833 443.761997,651.795833 444.540015,651.795833 445.317996,651.795833 446.096013,651.795833 446.873994,651.795833 447.652012,651.795833 448.429993,651.795833 449.208010,651.795833 449.985991,651.795833 450.764009,651.795833 451.541990,651.795833 452.320007,651.795833 453.097988,651.795833 453.876006,651.795833 454.653987,651.795833 455.432004,651.795833 456.209985,651.795833 456.988003,651.795833 457.765984,651.795833 458.544001,651.795833 459.321982,651.795833 460.100000,651.795833 460.100000,651.795833 460.878018,651.795833 461.655999,651.795833 462.434016,651.795833 463.211997,651.795833 463.990015,651.795833 464.767996,651.795833 465.546013,651.795833 466.323994,651.795833 467.102012,651.795833 467.879993,651.795833 468.658010,651.795833 469.435991,651.795833 470.214009,651.795833 470.991990,651.795833 471.770007,651.795833 472.547988,651.795833 473.326006,651.795833 474.103987,651.795833 474.882004,651.795833 475.659985,651.795833 476.438003,651.795833 477.215984,651.795833 477.994001,651.795833 478.771982,651.795833 479.550000,651.795833 480.328018,651.795833 481.105999,651.795833 481.884016,651.795833 482.661997,651.795833 483.440015,651.795833 484.217996,651.795833 484.996013,651.795833 485.773994,651.795833 486.552012,651.795833 487.329993,651.795833 488.108010,651.795833 488.885991,651.795833 489.664009,651.795833 490.441990,651.795833 491.220007,651.795833 491.997988,651.795833 492.776006,651.795833 493.553987,651.795833 494.332004,651.795833 495.109985,651.795833 495.888003,651.795833 496.665984,651.795833 497.444001,651.795833 498.221982,651.795833 499.000000,651.795833 499.000000,651.795833"
-     id="polyline172-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="610.44971"
-     y="520.24835"
-     id="text174-0">iniTruOut.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="610.44971"
-     y="615.24835"
-     id="text176-2">iniTruOut.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="610.44971"
-     y="710.24835"
-     id="text178-9">iniTruOut.y</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="741.43427"
+     width="360"
+     height="68"
+     id="rect1284" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 470.000000,746.000000"
+     id="polyline1286"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,433.000000"
+     id="polyline1288"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 110.000000,433.000000"
+     id="polyline1290"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline1292"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,754.000000"
+     id="polyline1294"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,746.000000 182.000000,754.000000"
+     id="polyline1296"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,754.000000"
+     id="polyline1298"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,746.000000 326.000000,754.000000"
+     id="polyline1300"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,754.000000"
+     id="polyline1302"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,754.000000"
+     id="polyline1304"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,758.800000"
+     id="polyline1306"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="62.180664"
+     y="868.23029"
+     id="text1308">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,758.800000"
+     id="polyline1310"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="206.18066"
+     y="868.23029"
+     id="text1312">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,758.800000"
+     id="polyline1314"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="350.18066"
+     y="868.23029"
+     id="text1316">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,528.204167 110.000000,528.204167"
+     id="polyline1318"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="618.93427"
+     id="text1320">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,460.387500 110.000000,460.387500"
+     id="polyline1322"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="551.11731"
+     id="text1324">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,623.408333 110.000000,623.408333"
+     id="polyline1326"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="714.13831"
+     id="text1328">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,555.591667 110.000000,555.591667"
+     id="polyline1330"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="646.32227"
+     id="text1332">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,718.612500 110.000000,718.612500"
+     id="polyline1334"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="809.34229"
+     id="text1336">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,650.795833 110.000000,650.795833"
+     id="polyline1338"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="741.52631"
+     id="text1340">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-9)"
+     points="110.000000,528.204167 110.720000,528.204167 111.440000,528.204167 112.160000,528.204167 112.880000,528.204167 113.600000,528.204167 114.320000,528.204167 115.040000,528.204167 115.760000,528.204167 116.480000,528.204167 117.200000,528.204167 117.920000,528.204167 118.640000,528.204167 119.360000,528.204167 120.080000,528.204167 120.800000,528.204167 121.520000,528.204167 122.240000,528.204167 122.960001,528.204167 123.680000,528.204167 124.400000,528.204167 125.120000,528.204167 125.840000,528.204167 126.560000,528.204167 127.280000,528.204167 128.000000,528.204167 128.719999,528.204167 129.440001,528.204167 130.160000,528.204167 130.879999,528.204167 131.600001,528.204167 132.320000,528.204167 133.039999,528.204167 133.760001,528.204167 134.480000,528.204167 135.200000,528.204167 135.920001,528.204167 136.640000,528.204167 137.360000,528.204167 138.079999,528.204167 138.800000,528.204167 139.520000,528.204167 140.239999,528.204167 140.960001,528.204167 141.680000,528.204167 142.399999,528.204167 143.120001,528.204167 143.840000,528.204167 144.559999,528.204167 145.280001,528.204167 146.000000,528.204167 146.000000,460.387500 146.000000,460.387500 146.719999,460.387500 147.439999,460.387500 148.159998,460.387500 148.880002,460.387500 149.600001,460.387500 150.320000,460.387500 151.039999,460.387500 151.759999,460.387500 152.479998,460.387500 153.200002,460.387500 153.920001,460.387500 154.640000,460.387500 155.360000,460.387500 156.079999,460.387500 156.799998,460.387500 157.520002,460.387500 158.240001,460.387500 158.960001,460.387500 159.680000,460.387500 160.399999,460.387500 161.119998,460.387500 161.840002,460.387500 162.560001,460.387500 163.280001,460.387500 164.000000,460.387500 164.719999,460.387500 165.439999,460.387500 166.159998,460.387500 166.880002,460.387500 167.600001,460.387500 168.320000,460.387500 169.039999,460.387500 169.759999,460.387500 170.479998,460.387500 171.200002,460.387500 171.920001,460.387500 172.640000,460.387500 173.360000,460.387500 174.079999,460.387500 174.799998,460.387500 175.520002,460.387500 176.240001,460.387500 176.960001,460.387500 177.680000,460.387500 178.399999,460.387500 179.119998,460.387500 179.840002,460.387500 180.560001,460.387500 181.280001,460.387500 182.000000,460.387500 182.000000,528.204167 182.000000,528.204167 182.719999,528.204167 183.439999,528.204167 184.159998,528.204167 184.879997,528.204167 185.599997,528.204167 186.319996,528.204167 187.040004,528.204167 187.760003,528.204167 188.480002,528.204167 189.200002,528.204167 189.920001,528.204167 190.640000,528.204167 191.360000,528.204167 192.079999,528.204167 192.799998,528.204167 193.519998,528.204167 194.239997,528.204167 194.959996,528.204167 195.680004,528.204167 196.400003,528.204167 197.120003,528.204167 197.840002,528.204167 198.560001,528.204167 199.280001,528.204167 200.000000,528.204167 200.719999,528.204167 201.439999,528.204167 202.159998,528.204167 202.879997,528.204167 203.599997,528.204167 204.319996,528.204167 205.040004,528.204167 205.760003,528.204167 206.480002,528.204167 207.200002,528.204167 207.920001,528.204167 208.640000,528.204167 209.360000,528.204167 210.079999,528.204167 210.799998,528.204167 211.519998,528.204167 212.239997,528.204167 212.959996,528.204167 213.680004,528.204167 214.400003,528.204167 215.120003,528.204167 215.840002,528.204167 216.560001,528.204167 217.280001,528.204167 218.000000,528.204167 218.000000,460.387500 218.000000,460.387500 218.719999,460.387500 219.439999,460.387500 220.159998,460.387500 220.879997,460.387500 221.599997,460.387500 222.319996,460.387500 223.040004,460.387500 223.760003,460.387500 224.480002,460.387500 225.200002,460.387500 225.920001,460.387500 226.640000,460.387500 227.360000,460.387500 228.079999,460.387500 228.799998,460.387500 229.519998,460.387500 230.239997,460.387500 230.959996,460.387500 231.680004,460.387500 232.400003,460.387500 233.120003,460.387500 233.840002,460.387500 234.560001,460.387500 235.280001,460.387500 236.000000,460.387500 236.719999,460.387500 237.439999,460.387500 238.159998,460.387500 238.879997,460.387500 239.599997,460.387500 240.319996,460.387500 241.040004,460.387500 241.760003,460.387500 242.480002,460.387500 243.200002,460.387500 243.920001,460.387500 244.640000,460.387500 245.360000,460.387500 246.079999,460.387500 246.799998,460.387500 247.519998,460.387500 248.239997,460.387500 248.959996,460.387500 249.680004,460.387500 250.400003,460.387500 251.120003,460.387500 251.840002,460.387500 252.560001,460.387500 253.280001,460.387500 254.000000,460.387500 254.000000,528.204167 254.000000,528.204167 254.719999,528.204167 255.439999,528.204167 256.159998,528.204167 256.879997,528.204167 257.599997,528.204167 258.319996,528.204167 259.039995,528.204167 259.759995,528.204167 260.479994,528.204167 261.199993,528.204167 261.919992,528.204167 262.639992,528.204167 263.360008,528.204167 264.080008,528.204167 264.800007,528.204167 265.520006,528.204167 266.240005,528.204167 266.960005,528.204167 267.680004,528.204167 268.400003,528.204167 269.120003,528.204167 269.840002,528.204167 270.560001,528.204167 271.280001,528.204167 272.000000,528.204167 272.719999,528.204167 273.439999,528.204167 274.159998,528.204167 274.879997,528.204167 275.599997,528.204167 276.319996,528.204167 277.039995,528.204167 277.759995,528.204167 278.479994,528.204167 279.199993,528.204167 279.919992,528.204167 280.639992,528.204167 281.360008,528.204167 282.080008,528.204167 282.800007,528.204167 283.520006,528.204167 284.240005,528.204167 284.960005,528.204167 285.680004,528.204167 286.400003,528.204167 287.120003,528.204167 287.840002,528.204167 288.560001,528.204167 289.280001,528.204167 290.000000,528.204167 290.000000,460.387500 290.719999,460.387500 291.439999,460.387500 292.159998,460.387500 292.879997,460.387500 293.599997,460.387500 294.319996,460.387500 295.039995,460.387500 295.759995,460.387500 296.479994,460.387500 297.199993,460.387500 297.919992,460.387500 298.639992,460.387500 299.360008,460.387500 300.080008,460.387500 300.800007,460.387500 301.520006,460.387500 302.240005,460.387500 302.960005,460.387500 303.680004,460.387500 304.400003,460.387500 305.120003,460.387500 305.840002,460.387500 306.560001,460.387500 307.280001,460.387500 308.000000,460.387500 308.719999,460.387500 309.439999,460.387500 310.159998,460.387500 310.879997,460.387500 311.599997,460.387500 312.319996,460.387500 313.039995,460.387500 313.759995,460.387500 314.479994,460.387500 315.199993,460.387500 315.919992,460.387500 316.639992,460.387500 317.360008,460.387500 318.080008,460.387500 318.800007,460.387500 319.520006,460.387500 320.240005,460.387500 320.960005,460.387500 321.680004,460.387500 322.400003,460.387500 323.120003,460.387500 323.840002,460.387500 324.560001,460.387500 325.280001,460.387500 326.000000,460.387500 326.000000,528.204167 326.719999,528.204167 327.439999,528.204167 328.159998,528.204167 328.879997,528.204167 329.599997,528.204167 330.319996,528.204167 331.039995,528.204167 331.759995,528.204167 332.479994,528.204167 333.199993,528.204167 333.919992,528.204167 334.639992,528.204167 335.360008,528.204167 336.080008,528.204167 336.800007,528.204167 337.520006,528.204167 338.240005,528.204167 338.960005,528.204167 339.680004,528.204167 340.400003,528.204167 341.120003,528.204167 341.840002,528.204167 342.560001,528.204167 343.280001,528.204167 344.000000,528.204167 344.719999,528.204167 345.439999,528.204167 346.159998,528.204167 346.879997,528.204167 347.599997,528.204167 348.319996,528.204167 349.039995,528.204167 349.759995,528.204167 350.479994,528.204167 351.199993,528.204167 351.919992,528.204167 352.639992,528.204167 353.360008,528.204167 354.080008,528.204167 354.800007,528.204167 355.520006,528.204167 356.240005,528.204167 356.960005,528.204167 357.680004,528.204167 358.400003,528.204167 359.120003,528.204167 359.840002,528.204167 360.560001,528.204167 361.280001,528.204167 362.000000,528.204167 362.000000,460.387500 362.719999,460.387500 363.439999,460.387500 364.159998,460.387500 364.879997,460.387500 365.599997,460.387500 366.319996,460.387500 367.039995,460.387500 367.759995,460.387500 368.479994,460.387500 369.199993,460.387500 369.919992,460.387500 370.639992,460.387500 371.360008,460.387500 372.080008,460.387500 372.800007,460.387500 373.520006,460.387500 374.240005,460.387500 374.960005,460.387500 375.680004,460.387500 376.400003,460.387500 377.120003,460.387500 377.840002,460.387500 378.560001,460.387500 379.280001,460.387500 380.000000,460.387500 380.719999,460.387500 381.439999,460.387500 382.159998,460.387500 382.879997,460.387500 383.599997,460.387500 384.319996,460.387500 385.039995,460.387500 385.759995,460.387500 386.479994,460.387500 387.199993,460.387500 387.919992,460.387500 388.639992,460.387500 389.360008,460.387500 390.080008,460.387500 390.800007,460.387500 391.520006,460.387500 392.240005,460.387500 392.960005,460.387500 393.680004,460.387500 394.400003,460.387500 395.120003,460.387500 395.840002,460.387500 396.560001,460.387500 397.280001,460.387500 398.000000,460.387500 398.000000,528.204167 398.720016,528.204167 399.439999,528.204167 400.160015,528.204167 400.879997,528.204167 401.600014,528.204167 402.319996,528.204167 403.040012,528.204167 403.759995,528.204167 404.480011,528.204167 405.199993,528.204167 405.920010,528.204167 406.639992,528.204167 407.360008,528.204167 408.079990,528.204167 408.800007,528.204167 409.519989,528.204167 410.240005,528.204167 410.959988,528.204167 411.680004,528.204167 412.399986,528.204167 413.120003,528.204167 413.839985,528.204167 414.560001,528.204167 415.279984,528.204167 416.000000,528.204167 416.720016,528.204167 417.439999,528.204167 418.160015,528.204167 418.879997,528.204167 419.600014,528.204167 420.319996,528.204167 421.040012,528.204167 421.759995,528.204167 422.480011,528.204167 423.199993,528.204167 423.920010,528.204167 424.639992,528.204167 425.360008,528.204167 426.079990,528.204167 426.800007,528.204167 427.519989,528.204167 428.240005,528.204167 428.959988,528.204167 429.680004,528.204167 430.399986,528.204167 431.120003,528.204167 431.839985,528.204167 432.560001,528.204167 433.279984,528.204167 434.000000,528.204167 434.000000,460.387500 434.720016,460.387500 435.439999,460.387500 436.160015,460.387500 436.879997,460.387500 437.600014,460.387500 438.319996,460.387500 439.040012,460.387500 439.759995,460.387500 440.480011,460.387500 441.199993,460.387500 441.920010,460.387500 442.639992,460.387500 443.360008,460.387500 444.079990,460.387500 444.800007,460.387500 445.519989,460.387500 446.240005,460.387500 446.959988,460.387500 447.680004,460.387500 448.399986,460.387500 449.120003,460.387500 449.839985,460.387500 450.560001,460.387500 451.279984,460.387500 452.000000,460.387500 452.720016,460.387500 453.439999,460.387500 454.160015,460.387500 454.879997,460.387500 455.600014,460.387500 456.319996,460.387500 457.040012,460.387500 457.759995,460.387500 458.480011,460.387500 459.199993,460.387500 459.920010,460.387500 460.639992,460.387500 461.360008,460.387500 462.079990,460.387500 462.800007,460.387500 463.519989,460.387500 464.240005,460.387500 464.959988,460.387500 465.680004,460.387500 466.399986,460.387500 467.120003,460.387500 467.839985,460.387500 468.560001,460.387500 469.279984,460.387500 470.000000,460.387500 470.000000,528.204167"
+     id="polyline1345"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-9)"
+     points="110.000000,623.408333 110.720000,623.408333 111.440000,623.408333 112.160000,623.408333 112.880000,623.408333 113.600000,623.408333 114.320000,623.408333 115.040000,623.408333 115.760000,623.408333 116.480000,623.408333 117.200000,623.408333 117.920000,623.408333 118.640000,623.408333 119.360000,623.408333 120.080000,623.408333 120.800000,623.408333 121.520000,623.408333 122.240000,623.408333 122.960001,623.408333 123.680000,623.408333 124.400000,623.408333 125.120000,623.408333 125.840000,623.408333 126.560000,623.408333 127.280000,623.408333 128.000000,623.408333 128.719999,623.408333 129.440001,623.408333 130.160000,623.408333 130.879999,623.408333 131.600001,623.408333 132.320000,623.408333 133.039999,623.408333 133.760001,623.408333 134.480000,623.408333 135.200000,623.408333 135.920001,623.408333 136.640000,623.408333 137.360000,623.408333 138.079999,623.408333 138.800000,623.408333 139.520000,623.408333 140.239999,623.408333 140.960001,623.408333 141.680000,623.408333 142.399999,623.408333 143.120001,623.408333 143.840000,623.408333 144.559999,623.408333 145.280001,623.408333 146.000000,623.408333 146.000000,623.408333 146.000000,623.408333 146.719999,623.408333 147.439999,623.408333 148.159998,623.408333 148.880002,623.408333 149.600001,623.408333 150.320000,623.408333 151.039999,623.408333 151.759999,623.408333 152.479998,623.408333 153.200002,623.408333 153.920001,623.408333 154.640000,623.408333 155.360000,623.408333 156.079999,623.408333 156.799998,623.408333 157.520002,623.408333 158.240001,623.408333 158.960001,623.408333 159.680000,623.408333 160.399999,623.408333 161.119998,623.408333 161.840002,623.408333 162.560001,623.408333 163.280001,623.408333 164.000000,623.408333 164.719999,623.408333 165.439999,623.408333 166.159998,623.408333 166.880002,623.408333 167.600001,623.408333 168.320000,623.408333 169.039999,623.408333 169.759999,623.408333 170.479998,623.408333 171.200002,623.408333 171.920001,623.408333 172.640000,623.408333 173.360000,623.408333 174.079999,623.408333 174.799998,623.408333 175.520002,623.408333 176.240001,623.408333 176.960001,623.408333 177.680000,623.408333 178.399999,623.408333 179.119998,623.408333 179.840002,623.408333 180.560001,623.408333 181.280001,623.408333 182.000000,623.408333 182.000000,623.408333 182.000000,623.408333 182.719999,623.408333 183.439999,623.408333 184.159998,623.408333 184.879997,623.408333 185.599997,623.408333 186.319996,623.408333 187.040004,623.408333 187.760003,623.408333 188.480002,623.408333 189.200002,623.408333 189.920001,623.408333 190.640000,623.408333 191.360000,623.408333 192.079999,623.408333 192.799998,623.408333 193.519998,623.408333 194.239997,623.408333 194.959996,623.408333 195.680004,623.408333 196.400003,623.408333 197.120003,623.408333 197.840002,623.408333 198.560001,623.408333 199.280001,623.408333 200.000000,623.408333 200.719999,623.408333 201.439999,623.408333 202.159998,623.408333 202.879997,623.408333 203.599997,623.408333 204.319996,623.408333 205.040004,623.408333 205.760003,623.408333 206.480002,623.408333 207.200002,623.408333 207.920001,623.408333 208.640000,623.408333 209.360000,623.408333 210.079999,623.408333 210.799998,623.408333 211.519998,623.408333 212.239997,623.408333 212.959996,623.408333 213.680004,623.408333 214.400003,623.408333 215.120003,623.408333 215.840002,623.408333 216.560001,623.408333 217.280001,623.408333 218.000000,623.408333 218.000000,623.408333 218.000000,623.408333 218.719999,623.408333 219.439999,623.408333 220.159998,623.408333 220.879997,623.408333 221.599997,623.408333 222.319996,623.408333 223.040004,623.408333 223.760003,623.408333 224.480002,623.408333 225.200002,623.408333 225.920001,623.408333 226.640000,623.408333 227.360000,623.408333 228.079999,623.408333 228.799998,623.408333 229.519998,623.408333 230.239997,623.408333 230.959996,623.408333 231.680004,623.408333 232.400003,623.408333 233.120003,623.408333 233.840002,623.408333 234.560001,623.408333 235.280001,623.408333 236.000000,623.408333 236.719999,623.408333 237.439999,623.408333 238.159998,623.408333 238.879997,623.408333 239.599997,623.408333 240.319996,623.408333 241.040004,623.408333 241.760003,623.408333 242.480002,623.408333 243.200002,623.408333 243.920001,623.408333 244.640000,623.408333 245.360000,623.408333 246.079999,623.408333 246.799998,623.408333 247.519998,623.408333 248.239997,623.408333 248.959996,623.408333 249.680004,623.408333 250.400003,623.408333 251.120003,623.408333 251.840002,623.408333 252.560001,623.408333 253.280001,623.408333 254.000000,623.408333 254.000000,623.408333 254.000000,623.408333 254.719999,623.408333 255.439999,623.408333 256.159998,623.408333 256.879997,623.408333 257.599997,623.408333 258.319996,623.408333 259.039995,623.408333 259.759995,623.408333 260.479994,623.408333 261.199993,623.408333 261.919992,623.408333 262.639992,623.408333 263.360008,623.408333 264.080008,623.408333 264.800007,623.408333 265.520006,623.408333 266.240005,623.408333 266.960005,623.408333 267.680004,623.408333 268.400003,623.408333 269.120003,623.408333 269.840002,623.408333 270.560001,623.408333 271.280001,623.408333 272.000000,623.408333 272.719999,623.408333 273.439999,623.408333 274.159998,623.408333 274.879997,623.408333 275.599997,623.408333 276.319996,623.408333 277.039995,623.408333 277.759995,623.408333 278.479994,623.408333 279.199993,623.408333 279.919992,623.408333 280.639992,623.408333 281.360008,623.408333 282.080008,623.408333 282.800007,623.408333 283.520006,623.408333 284.240005,623.408333 284.960005,623.408333 285.680004,623.408333 286.400003,623.408333 287.120003,623.408333 287.840002,623.408333 288.560001,623.408333 289.280001,623.408333 290.000000,623.408333 290.000000,623.408333 290.719999,623.408333 291.439999,623.408333 292.159998,623.408333 292.879997,623.408333 293.599997,623.408333 294.319996,623.408333 295.039995,623.408333 295.759995,623.408333 296.479994,623.408333 297.199993,623.408333 297.919992,623.408333 298.639992,623.408333 299.360008,623.408333 300.080008,623.408333 300.800007,623.408333 301.520006,623.408333 302.240005,623.408333 302.960005,623.408333 303.680004,623.408333 304.400003,623.408333 305.120003,623.408333 305.840002,623.408333 306.560001,623.408333 307.280001,623.408333 308.000000,623.408333 308.719999,623.408333 309.439999,623.408333 310.159998,623.408333 310.879997,623.408333 311.599997,623.408333 312.319996,623.408333 313.039995,623.408333 313.759995,623.408333 314.479994,623.408333 315.199993,623.408333 315.919992,623.408333 316.639992,623.408333 317.360008,623.408333 318.080008,623.408333 318.800007,623.408333 319.520006,623.408333 320.240005,623.408333 320.960005,623.408333 321.680004,623.408333 322.400003,623.408333 323.120003,623.408333 323.840002,623.408333 324.560001,623.408333 325.280001,623.408333 326.000000,623.408333 326.000000,623.408333 326.719999,623.408333 327.439999,623.408333 328.159998,623.408333 328.879997,623.408333 329.599997,623.408333 330.319996,623.408333 331.039995,623.408333 331.759995,623.408333 332.479994,623.408333 333.199993,623.408333 333.919992,623.408333 334.639992,623.408333 335.360008,623.408333 336.080008,623.408333 336.800007,623.408333 337.520006,623.408333 338.240005,623.408333 338.960005,623.408333 339.680004,623.408333 340.400003,623.408333 341.120003,623.408333 341.840002,623.408333 342.560001,623.408333 343.280001,623.408333 344.000000,623.408333 344.719999,623.408333 345.439999,623.408333 346.159998,623.408333 346.879997,623.408333 347.599997,623.408333 348.319996,623.408333 349.039995,623.408333 349.759995,623.408333 350.479994,623.408333 351.199993,623.408333 351.919992,623.408333 352.639992,623.408333 353.360008,623.408333 354.080008,623.408333 354.800007,623.408333 355.520006,623.408333 356.240005,623.408333 356.960005,623.408333 357.680004,623.408333 358.400003,623.408333 359.120003,623.408333 359.840002,623.408333 360.560001,623.408333 361.280001,623.408333 362.000000,623.408333 362.000000,623.408333 362.719999,623.408333 363.439999,623.408333 364.159998,623.408333 364.879997,623.408333 365.599997,623.408333 366.319996,623.408333 367.039995,623.408333 367.759995,623.408333 368.479994,623.408333 369.199993,623.408333 369.919992,623.408333 370.639992,623.408333 371.360008,623.408333 372.080008,623.408333 372.800007,623.408333 373.520006,623.408333 374.240005,623.408333 374.960005,623.408333 375.680004,623.408333 376.400003,623.408333 377.120003,623.408333 377.840002,623.408333 378.560001,623.408333 379.280001,623.408333 380.000000,623.408333 380.719999,623.408333 381.439999,623.408333 382.159998,623.408333 382.879997,623.408333 383.599997,623.408333 384.319996,623.408333 385.039995,623.408333 385.759995,623.408333 386.479994,623.408333 387.199993,623.408333 387.919992,623.408333 388.639992,623.408333 389.360008,623.408333 390.080008,623.408333 390.800007,623.408333 391.520006,623.408333 392.240005,623.408333 392.960005,623.408333 393.680004,623.408333 394.400003,623.408333 395.120003,623.408333 395.840002,623.408333 396.560001,623.408333 397.280001,623.408333 398.000000,623.408333 398.000000,623.408333 398.720016,623.408333 399.439999,623.408333 400.160015,623.408333 400.879997,623.408333 401.600014,623.408333 402.319996,623.408333 403.040012,623.408333 403.759995,623.408333 404.480011,623.408333 405.199993,623.408333 405.920010,623.408333 406.639992,623.408333 407.360008,623.408333 408.079990,623.408333 408.800007,623.408333 409.519989,623.408333 410.240005,623.408333 410.959988,623.408333 411.680004,623.408333 412.399986,623.408333 413.120003,623.408333 413.839985,623.408333 414.560001,623.408333 415.279984,623.408333 416.000000,623.408333 416.720016,623.408333 417.439999,623.408333 418.160015,623.408333 418.879997,623.408333 419.600014,623.408333 420.319996,623.408333 421.040012,623.408333 421.759995,623.408333 422.480011,623.408333 423.199993,623.408333 423.920010,623.408333 424.639992,623.408333 425.360008,623.408333 426.079990,623.408333 426.800007,623.408333 427.519989,623.408333 428.240005,623.408333 428.959988,623.408333 429.680004,623.408333 430.399986,623.408333 431.120003,623.408333 431.839985,623.408333 432.560001,623.408333 433.279984,623.408333 434.000000,623.408333 434.000000,623.408333 434.720016,623.408333 435.439999,623.408333 436.160015,623.408333 436.879997,623.408333 437.600014,623.408333 438.319996,623.408333 439.040012,623.408333 439.759995,623.408333 440.480011,623.408333 441.199993,623.408333 441.920010,623.408333 442.639992,623.408333 443.360008,623.408333 444.079990,623.408333 444.800007,623.408333 445.519989,623.408333 446.240005,623.408333 446.959988,623.408333 447.680004,623.408333 448.399986,623.408333 449.120003,623.408333 449.839985,623.408333 450.560001,623.408333 451.279984,623.408333 452.000000,623.408333 452.720016,623.408333 453.439999,623.408333 454.160015,623.408333 454.879997,623.408333 455.600014,623.408333 456.319996,623.408333 457.040012,623.408333 457.759995,623.408333 458.480011,623.408333 459.199993,623.408333 459.920010,623.408333 460.639992,623.408333 461.360008,623.408333 462.079990,623.408333 462.800007,623.408333 463.519989,623.408333 464.240005,623.408333 464.959988,623.408333 465.680004,623.408333 466.399986,623.408333 467.120003,623.408333 467.839985,623.408333 468.560001,623.408333 469.279984,623.408333 470.000000,623.408333 470.000000,623.408333"
+     id="polyline1347"
+     transform="translate(-47.819344,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-9)"
+     points="110.000000,718.612500 110.720000,718.612500 111.440000,718.612500 112.160000,718.612500 112.880000,718.612500 113.600000,718.612500 114.320000,718.612500 115.040000,718.612500 115.760000,718.612500 116.480000,718.612500 117.200000,718.612500 117.920000,718.612500 118.640000,718.612500 119.360000,718.612500 120.080000,718.612500 120.800000,718.612500 121.520000,718.612500 122.240000,718.612500 122.960001,718.612500 123.680000,718.612500 124.400000,718.612500 125.120000,718.612500 125.840000,718.612500 126.560000,718.612500 127.280000,718.612500 128.000000,718.612500 128.719999,718.612500 129.440001,718.612500 130.160000,718.612500 130.879999,718.612500 131.600001,718.612500 132.320000,718.612500 133.039999,718.612500 133.760001,718.612500 134.480000,718.612500 135.200000,718.612500 135.920001,718.612500 136.640000,718.612500 137.360000,718.612500 138.079999,718.612500 138.800000,718.612500 139.520000,718.612500 140.239999,718.612500 140.960001,718.612500 141.680000,718.612500 142.399999,718.612500 143.120001,718.612500 143.840000,718.612500 144.559999,718.612500 145.280001,718.612500 146.000000,718.612500 146.000000,650.795833 146.000000,650.795833 146.719999,650.795833 147.439999,650.795833 148.159998,650.795833 148.880002,650.795833 149.600001,650.795833 150.320000,650.795833 151.039999,650.795833 151.759999,650.795833 152.479998,650.795833 153.200002,650.795833 153.920001,650.795833 154.640000,650.795833 155.360000,650.795833 156.079999,650.795833 156.799998,650.795833 157.520002,650.795833 158.240001,650.795833 158.960001,650.795833 159.680000,650.795833 160.399999,650.795833 161.119998,650.795833 161.840002,650.795833 162.560001,650.795833 163.280001,650.795833 164.000000,650.795833 164.719999,650.795833 165.439999,650.795833 166.159998,650.795833 166.880002,650.795833 167.600001,650.795833 168.320000,650.795833 169.039999,650.795833 169.759999,650.795833 170.479998,650.795833 171.200002,650.795833 171.920001,650.795833 172.640000,650.795833 173.360000,650.795833 174.079999,650.795833 174.799998,650.795833 175.520002,650.795833 176.240001,650.795833 176.960001,650.795833 177.680000,650.795833 178.399999,650.795833 179.119998,650.795833 179.840002,650.795833 180.560001,650.795833 181.280001,650.795833 182.000000,650.795833 182.000000,650.795833 182.000000,650.795833 182.719999,650.795833 183.439999,650.795833 184.159998,650.795833 184.879997,650.795833 185.599997,650.795833 186.319996,650.795833 187.040004,650.795833 187.760003,650.795833 188.480002,650.795833 189.200002,650.795833 189.920001,650.795833 190.640000,650.795833 191.360000,650.795833 192.079999,650.795833 192.799998,650.795833 193.519998,650.795833 194.239997,650.795833 194.959996,650.795833 195.680004,650.795833 196.400003,650.795833 197.120003,650.795833 197.840002,650.795833 198.560001,650.795833 199.280001,650.795833 200.000000,650.795833 200.719999,650.795833 201.439999,650.795833 202.159998,650.795833 202.879997,650.795833 203.599997,650.795833 204.319996,650.795833 205.040004,650.795833 205.760003,650.795833 206.480002,650.795833 207.200002,650.795833 207.920001,650.795833 208.640000,650.795833 209.360000,650.795833 210.079999,650.795833 210.799998,650.795833 211.519998,650.795833 212.239997,650.795833 212.959996,650.795833 213.680004,650.795833 214.400003,650.795833 215.120003,650.795833 215.840002,650.795833 216.560001,650.795833 217.280001,650.795833 218.000000,650.795833 218.000000,650.795833 218.000000,650.795833 218.719999,650.795833 219.439999,650.795833 220.159998,650.795833 220.879997,650.795833 221.599997,650.795833 222.319996,650.795833 223.040004,650.795833 223.760003,650.795833 224.480002,650.795833 225.200002,650.795833 225.920001,650.795833 226.640000,650.795833 227.360000,650.795833 228.079999,650.795833 228.799998,650.795833 229.519998,650.795833 230.239997,650.795833 230.959996,650.795833 231.680004,650.795833 232.400003,650.795833 233.120003,650.795833 233.840002,650.795833 234.560001,650.795833 235.280001,650.795833 236.000000,650.795833 236.719999,650.795833 237.439999,650.795833 238.159998,650.795833 238.879997,650.795833 239.599997,650.795833 240.319996,650.795833 241.040004,650.795833 241.760003,650.795833 242.480002,650.795833 243.200002,650.795833 243.920001,650.795833 244.640000,650.795833 245.360000,650.795833 246.079999,650.795833 246.799998,650.795833 247.519998,650.795833 248.239997,650.795833 248.959996,650.795833 249.680004,650.795833 250.400003,650.795833 251.120003,650.795833 251.840002,650.795833 252.560001,650.795833 253.280001,650.795833 254.000000,650.795833 254.000000,650.795833 254.000000,650.795833 254.719999,650.795833 255.439999,650.795833 256.159998,650.795833 256.879997,650.795833 257.599997,650.795833 258.319996,650.795833 259.039995,650.795833 259.759995,650.795833 260.479994,650.795833 261.199993,650.795833 261.919992,650.795833 262.639992,650.795833 263.360008,650.795833 264.080008,650.795833 264.800007,650.795833 265.520006,650.795833 266.240005,650.795833 266.960005,650.795833 267.680004,650.795833 268.400003,650.795833 269.120003,650.795833 269.840002,650.795833 270.560001,650.795833 271.280001,650.795833 272.000000,650.795833 272.719999,650.795833 273.439999,650.795833 274.159998,650.795833 274.879997,650.795833 275.599997,650.795833 276.319996,650.795833 277.039995,650.795833 277.759995,650.795833 278.479994,650.795833 279.199993,650.795833 279.919992,650.795833 280.639992,650.795833 281.360008,650.795833 282.080008,650.795833 282.800007,650.795833 283.520006,650.795833 284.240005,650.795833 284.960005,650.795833 285.680004,650.795833 286.400003,650.795833 287.120003,650.795833 287.840002,650.795833 288.560001,650.795833 289.280001,650.795833 290.000000,650.795833 290.000000,650.795833 290.719999,650.795833 291.439999,650.795833 292.159998,650.795833 292.879997,650.795833 293.599997,650.795833 294.319996,650.795833 295.039995,650.795833 295.759995,650.795833 296.479994,650.795833 297.199993,650.795833 297.919992,650.795833 298.639992,650.795833 299.360008,650.795833 300.080008,650.795833 300.800007,650.795833 301.520006,650.795833 302.240005,650.795833 302.960005,650.795833 303.680004,650.795833 304.400003,650.795833 305.120003,650.795833 305.840002,650.795833 306.560001,650.795833 307.280001,650.795833 308.000000,650.795833 308.719999,650.795833 309.439999,650.795833 310.159998,650.795833 310.879997,650.795833 311.599997,650.795833 312.319996,650.795833 313.039995,650.795833 313.759995,650.795833 314.479994,650.795833 315.199993,650.795833 315.919992,650.795833 316.639992,650.795833 317.360008,650.795833 318.080008,650.795833 318.800007,650.795833 319.520006,650.795833 320.240005,650.795833 320.960005,650.795833 321.680004,650.795833 322.400003,650.795833 323.120003,650.795833 323.840002,650.795833 324.560001,650.795833 325.280001,650.795833 326.000000,650.795833 326.000000,650.795833 326.719999,650.795833 327.439999,650.795833 328.159998,650.795833 328.879997,650.795833 329.599997,650.795833 330.319996,650.795833 331.039995,650.795833 331.759995,650.795833 332.479994,650.795833 333.199993,650.795833 333.919992,650.795833 334.639992,650.795833 335.360008,650.795833 336.080008,650.795833 336.800007,650.795833 337.520006,650.795833 338.240005,650.795833 338.960005,650.795833 339.680004,650.795833 340.400003,650.795833 341.120003,650.795833 341.840002,650.795833 342.560001,650.795833 343.280001,650.795833 344.000000,650.795833 344.719999,650.795833 345.439999,650.795833 346.159998,650.795833 346.879997,650.795833 347.599997,650.795833 348.319996,650.795833 349.039995,650.795833 349.759995,650.795833 350.479994,650.795833 351.199993,650.795833 351.919992,650.795833 352.639992,650.795833 353.360008,650.795833 354.080008,650.795833 354.800007,650.795833 355.520006,650.795833 356.240005,650.795833 356.960005,650.795833 357.680004,650.795833 358.400003,650.795833 359.120003,650.795833 359.840002,650.795833 360.560001,650.795833 361.280001,650.795833 362.000000,650.795833 362.000000,650.795833 362.719999,650.795833 363.439999,650.795833 364.159998,650.795833 364.879997,650.795833 365.599997,650.795833 366.319996,650.795833 367.039995,650.795833 367.759995,650.795833 368.479994,650.795833 369.199993,650.795833 369.919992,650.795833 370.639992,650.795833 371.360008,650.795833 372.080008,650.795833 372.800007,650.795833 373.520006,650.795833 374.240005,650.795833 374.960005,650.795833 375.680004,650.795833 376.400003,650.795833 377.120003,650.795833 377.840002,650.795833 378.560001,650.795833 379.280001,650.795833 380.000000,650.795833 380.719999,650.795833 381.439999,650.795833 382.159998,650.795833 382.879997,650.795833 383.599997,650.795833 384.319996,650.795833 385.039995,650.795833 385.759995,650.795833 386.479994,650.795833 387.199993,650.795833 387.919992,650.795833 388.639992,650.795833 389.360008,650.795833 390.080008,650.795833 390.800007,650.795833 391.520006,650.795833 392.240005,650.795833 392.960005,650.795833 393.680004,650.795833 394.400003,650.795833 395.120003,650.795833 395.840002,650.795833 396.560001,650.795833 397.280001,650.795833 398.000000,650.795833 398.000000,650.795833 398.720016,650.795833 399.439999,650.795833 400.160015,650.795833 400.879997,650.795833 401.600014,650.795833 402.319996,650.795833 403.040012,650.795833 403.759995,650.795833 404.480011,650.795833 405.199993,650.795833 405.920010,650.795833 406.639992,650.795833 407.360008,650.795833 408.079990,650.795833 408.800007,650.795833 409.519989,650.795833 410.240005,650.795833 410.959988,650.795833 411.680004,650.795833 412.399986,650.795833 413.120003,650.795833 413.839985,650.795833 414.560001,650.795833 415.279984,650.795833 416.000000,650.795833 416.720016,650.795833 417.439999,650.795833 418.160015,650.795833 418.879997,650.795833 419.600014,650.795833 420.319996,650.795833 421.040012,650.795833 421.759995,650.795833 422.480011,650.795833 423.199993,650.795833 423.920010,650.795833 424.639992,650.795833 425.360008,650.795833 426.079990,650.795833 426.800007,650.795833 427.519989,650.795833 428.240005,650.795833 428.959988,650.795833 429.680004,650.795833 430.399986,650.795833 431.120003,650.795833 431.839985,650.795833 432.560001,650.795833 433.279984,650.795833 434.000000,650.795833 434.000000,650.795833 434.720016,650.795833 435.439999,650.795833 436.160015,650.795833 436.879997,650.795833 437.600014,650.795833 438.319996,650.795833 439.040012,650.795833 439.759995,650.795833 440.480011,650.795833 441.199993,650.795833 441.920010,650.795833 442.639992,650.795833 443.360008,650.795833 444.079990,650.795833 444.800007,650.795833 445.519989,650.795833 446.240005,650.795833 446.959988,650.795833 447.680004,650.795833 448.399986,650.795833 449.120003,650.795833 449.839985,650.795833 450.560001,650.795833 451.279984,650.795833 452.000000,650.795833 452.720016,650.795833 453.439999,650.795833 454.160015,650.795833 454.879997,650.795833 455.600014,650.795833 456.319996,650.795833 457.040012,650.795833 457.759995,650.795833 458.480011,650.795833 459.199993,650.795833 459.920010,650.795833 460.639992,650.795833 461.360008,650.795833 462.079990,650.795833 462.800007,650.795833 463.519989,650.795833 464.240005,650.795833 464.959988,650.795833 465.680004,650.795833 466.399986,650.795833 467.120003,650.795833 467.839985,650.795833 468.560001,650.795833 469.279984,650.795833 470.000000,650.795833 470.000000,650.795833"
+     id="polyline1349"
+     transform="translate(-47.819344,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="534.23029"
+     id="text1351">falCleFalIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="629.23029"
+     id="text1353">falCleFalIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="724.23029"
+     id="text1355">falCleFalIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline2-6" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,34.000000 187.800000,347.000000"
-     id="polyline4-4" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,34.000000 265.600000,347.000000"
-     id="polyline6-1" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,34.000000 343.400000,347.000000"
-     id="polyline8-2" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,34.000000 421.200000,347.000000"
-     id="polyline10-8" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 499.000000,347.000000"
-     id="polyline12-8" />
+     id="polyline2258"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,34.000000 182.000000,347.000000"
+     id="polyline2260"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,34.000000 254.000000,347.000000"
+     id="polyline2262"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,34.000000 326.000000,347.000000"
+     id="polyline2264"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,34.000000 398.000000,347.000000"
+     id="polyline2266"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 470.000000,347.000000"
+     id="polyline2268"
+     transform="translate(488.18065,39.342823)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1149.2498"
-     y="95.931686"
-     width="389"
-     height="67.816704"
-     id="rect14-9" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="598.18066"
+     y="100.6384"
+     width="360"
+     height="68"
+     id="rect2270" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1149.2498"
-     y="191.13618"
-     width="389"
-     height="67.816704"
-     id="rect16-2" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="598.18066"
+     y="195.84262"
+     width="360"
+     height="68"
+     id="rect2272" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1149.2498"
-     y="286.34021"
-     width="389"
-     height="67.816704"
-     id="rect18-8" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,347.000000 499.000000,347.000000"
-     id="polyline20-8" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,34.000000"
-     id="polyline22-8" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 110.000000,34.000000"
-     id="polyline24-6" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="598.18066"
+     y="291.0466"
+     width="360"
+     height="68"
+     id="rect2274" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 470.000000,347.000000"
+     id="polyline2276"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,34.000000"
+     id="polyline2278"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 110.000000,34.000000"
+     id="polyline2280"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline26-8" />
+     id="polyline2282"
+     transform="translate(488.18065,39.342823)" />
   <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,355.000000"
-     id="polyline28-3" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,347.000000 187.800000,355.000000"
-     id="polyline30-83" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,355.000000"
-     id="polyline32-3" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,347.000000 343.400000,355.000000"
-     id="polyline34-3" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,355.000000"
-     id="polyline36-80" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,355.000000"
-     id="polyline38-4" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2284"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,347.000000 182.000000,355.000000"
+     id="polyline2286"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,355.000000"
+     id="polyline2288"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,347.000000 326.000000,355.000000"
+     id="polyline2290"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,355.000000"
+     id="polyline2292"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,355.000000"
+     id="polyline2294"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,359.800000"
-     id="polyline40-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1149.2498"
-     y="413.04419"
-     id="text42-6">0</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,359.800000"
-     id="polyline44-8" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1304.8497"
-     y="413.04419"
-     id="text46-9">4</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,359.800000"
-     id="polyline48-0" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1460.4498"
-     y="413.04419"
-     id="text50-6">8</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2296"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="598.18066"
+     y="417.84262"
+     id="text2298">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,359.800000"
+     id="polyline2300"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="742.18066"
+     y="417.84262"
+     id="text2302">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,359.800000"
+     id="polyline2304"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="886.18066"
+     y="417.84262"
+     id="text2306">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,129.204167 110.000000,129.204167"
-     id="polyline52-8" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="163.74818"
-     id="text54-7">false</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2308"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="168.5466"
+     id="text2310">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,61.387500 110.000000,61.387500"
-     id="polyline56-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="95.931686"
-     id="text58-0">true</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2312"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="100.73007"
+     id="text2314">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,224.408333 110.000000,224.408333"
-     id="polyline60-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="258.95221"
-     id="text62-3">false</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2316"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="263.75058"
+     id="text2318">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,156.591667 110.000000,156.591667"
-     id="polyline64-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="191.13618"
-     id="text66-7">true</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2320"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="195.93466"
+     id="text2322">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,319.612500 110.000000,319.612500"
-     id="polyline68-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="354.1572"
-     id="text70-2">false</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2324"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="358.95566"
+     id="text2326">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,251.795833 110.000000,251.795833"
-     id="polyline72-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="286.34021"
-     id="text74-5">true</text>
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-5)"
-     points="110.000000,61.387500 110.778000,61.387500 111.556000,61.387500 112.334000,61.387500 113.112000,61.387500 113.890000,61.387500 114.668000,61.387500 115.446000,61.387500 116.224000,61.387500 117.002000,61.387500 117.780000,61.387500 118.558000,61.387500 119.336000,61.387500 120.114000,61.387500 120.892000,61.387500 121.670000,61.387500 122.448000,61.387500 123.226000,61.387500 124.004001,61.387500 124.782000,61.387500 125.560000,61.387500 126.337999,61.387500 127.116000,61.387500 127.894000,61.387500 128.672000,61.387500 129.450000,61.387500 130.227999,61.387500 131.006001,61.387500 131.784000,61.387500 132.561999,61.387500 133.340001,61.387500 134.118000,61.387500 134.895999,61.387500 135.674001,61.387500 136.452000,61.387500 137.230000,61.387500 138.008001,61.387500 138.786000,61.387500 139.564000,61.387500 140.341999,61.387500 141.120000,61.387500 141.898000,61.387500 142.675999,61.387500 143.454001,61.387500 144.232000,61.387500 145.009999,61.387500 145.788001,61.387500 146.566000,61.387500 147.343999,61.387500 148.122001,61.387500 148.900000,61.387500 148.900000,129.204167 148.900000,129.204167 148.900000,129.204167 149.677999,129.204167 150.455999,129.204167 151.233998,129.204167 152.012002,129.204167 152.790001,129.204167 153.568000,129.204167 154.345999,129.204167 155.123999,129.204167 155.901998,129.204167 156.680002,129.204167 157.458001,129.204167 158.236000,129.204167 159.014000,129.204167 159.791999,129.204167 160.569998,129.204167 161.348002,129.204167 162.126001,129.204167 162.904001,129.204167 163.682000,129.204167 164.459999,129.204167 165.237998,129.204167 166.016002,129.204167 166.794001,129.204167 167.572001,129.204167 168.350000,129.204167 169.127999,129.204167 169.905999,129.204167 170.683998,129.204167 171.462002,129.204167 172.240001,129.204167 173.018000,129.204167 173.795999,129.204167 174.573999,129.204167 175.351998,129.204167 176.130002,129.204167 176.908001,129.204167 177.686000,129.204167 178.464000,129.204167 179.241999,129.204167 180.019998,129.204167 180.798002,129.204167 181.576001,129.204167 182.354001,129.204167 183.132000,129.204167 183.909999,129.204167 184.687998,129.204167 185.466002,129.204167 186.244001,129.204167 187.022001,129.204167 187.800000,129.204167 187.800000,61.387500 187.800000,61.387500 188.577999,61.387500 189.355999,61.387500 190.133998,61.387500 190.911997,61.387500 191.689996,61.387500 192.467996,61.387500 193.246004,61.387500 194.024003,61.387500 194.802003,61.387500 195.580002,61.387500 196.358001,61.387500 197.136000,61.387500 197.914000,61.387500 198.691999,61.387500 199.469998,61.387500 200.247997,61.387500 201.025997,61.387500 201.803996,61.387500 202.582004,61.387500 203.360004,61.387500 204.138003,61.387500 204.916002,61.387500 205.694001,61.387500 206.472001,61.387500 207.250000,61.387500 208.027999,61.387500 208.805999,61.387500 209.583998,61.387500 210.361997,61.387500 211.139996,61.387500 211.917996,61.387500 212.696004,61.387500 213.474003,61.387500 214.252003,61.387500 215.030002,61.387500 215.808001,61.387500 216.586000,61.387500 217.364000,61.387500 218.141999,61.387500 218.919998,61.387500 219.697997,61.387500 220.475997,61.387500 221.253996,61.387500 222.032004,61.387500 222.810004,61.387500 223.588003,61.387500 224.366002,61.387500 225.144001,61.387500 225.922001,61.387500 226.700000,61.387500 226.700000,129.204167 226.700000,129.204167 227.477999,129.204167 228.255999,129.204167 229.033998,129.204167 229.811997,129.204167 230.589996,129.204167 231.367996,129.204167 232.146004,129.204167 232.924003,129.204167 233.702003,129.204167 234.480002,129.204167 235.258001,129.204167 236.036000,129.204167 236.814000,129.204167 237.591999,129.204167 238.369998,129.204167 239.147997,129.204167 239.925997,129.204167 240.703996,129.204167 241.482004,129.204167 242.260004,129.204167 243.038003,129.204167 243.816002,129.204167 244.594001,129.204167 245.372001,129.204167 246.150000,129.204167 246.927999,129.204167 247.705999,129.204167 248.483998,129.204167 249.261997,129.204167 250.039996,129.204167 250.817996,129.204167 251.596004,129.204167 252.374003,129.204167 253.152003,129.204167 253.930002,129.204167 254.708001,129.204167 255.486000,129.204167 256.264000,129.204167 257.041999,129.204167 257.819998,129.204167 258.597997,129.204167 259.375997,129.204167 260.153996,129.204167 260.932004,129.204167 261.710004,129.204167 262.488003,129.204167 263.266002,129.204167 264.044001,129.204167 264.822001,129.204167 265.600000,129.204167 265.600000,61.387500 265.600000,61.387500 266.377999,61.387500 267.155999,61.387500 267.933998,61.387500 268.711997,61.387500 269.489996,61.387500 270.267996,61.387500 271.045995,61.387500 271.823994,61.387500 272.601993,61.387500 273.379993,61.387500 274.157992,61.387500 274.935991,61.387500 275.714009,61.387500 276.492008,61.387500 277.270007,61.387500 278.048007,61.387500 278.826006,61.387500 279.604005,61.387500 280.382004,61.387500 281.160004,61.387500 281.938003,61.387500 282.716002,61.387500 283.494001,61.387500 284.272001,61.387500 285.050000,61.387500 285.827999,61.387500 286.605999,61.387500 287.383998,61.387500 288.161997,61.387500 288.939996,61.387500 289.717996,61.387500 290.495995,61.387500 291.273994,61.387500 292.051993,61.387500 292.829993,61.387500 293.607992,61.387500 294.385991,61.387500 295.164009,61.387500 295.942008,61.387500 296.720007,61.387500 297.498007,61.387500 298.276006,61.387500 299.054005,61.387500 299.832004,61.387500 300.610004,61.387500 301.388003,61.387500 302.166002,61.387500 302.944001,61.387500 303.722001,61.387500 304.500000,61.387500 304.500000,129.204167 305.277999,129.204167 306.055999,129.204167 306.833998,129.204167 307.611997,129.204167 308.389996,129.204167 309.167996,129.204167 309.945995,129.204167 310.723994,129.204167 311.501993,129.204167 312.279993,129.204167 313.057992,129.204167 313.835991,129.204167 314.614009,129.204167 315.392008,129.204167 316.170007,129.204167 316.948007,129.204167 317.726006,129.204167 318.504005,129.204167 319.282004,129.204167 320.060004,129.204167 320.838003,129.204167 321.616002,129.204167 322.394001,129.204167 323.172001,129.204167 323.950000,129.204167 324.727999,129.204167 325.505999,129.204167 326.283998,129.204167 327.061997,129.204167 327.839996,129.204167 328.617996,129.204167 329.395995,129.204167 330.173994,129.204167 330.951993,129.204167 331.729993,129.204167 332.507992,129.204167 333.285991,129.204167 334.064009,129.204167 334.842008,129.204167 335.620007,129.204167 336.398007,129.204167 337.176006,129.204167 337.954005,129.204167 338.732004,129.204167 339.510004,129.204167 340.288003,129.204167 341.066002,129.204167 341.844001,129.204167 342.622001,129.204167 343.400000,129.204167 343.400000,61.387500 344.177999,61.387500 344.955999,61.387500 345.733998,61.387500 346.511997,61.387500 347.289996,61.387500 348.067996,61.387500 348.845995,61.387500 349.623994,61.387500 350.401993,61.387500 351.179993,61.387500 351.957992,61.387500 352.735991,61.387500 353.514009,61.387500 354.292008,61.387500 355.070007,61.387500 355.848007,61.387500 356.626006,61.387500 357.404005,61.387500 358.182004,61.387500 358.960004,61.387500 359.738003,61.387500 360.516002,61.387500 361.294001,61.387500 362.072001,61.387500 362.850000,61.387500 363.627999,61.387500 364.405999,61.387500 365.183998,61.387500 365.961997,61.387500 366.739996,61.387500 367.517996,61.387500 368.295995,61.387500 369.073994,61.387500 369.851993,61.387500 370.629993,61.387500 371.407992,61.387500 372.185991,61.387500 372.964009,61.387500 373.742008,61.387500 374.520007,61.387500 375.298007,61.387500 376.076006,61.387500 376.854005,61.387500 377.632004,61.387500 378.410004,61.387500 379.188003,61.387500 379.966002,61.387500 380.744001,61.387500 381.522001,61.387500 382.300000,61.387500 382.300000,129.204167 383.077999,129.204167 383.855999,129.204167 384.633998,129.204167 385.411997,129.204167 386.189996,129.204167 386.967996,129.204167 387.745995,129.204167 388.523994,129.204167 389.301993,129.204167 390.079993,129.204167 390.857992,129.204167 391.635991,129.204167 392.414009,129.204167 393.192008,129.204167 393.970007,129.204167 394.748007,129.204167 395.526006,129.204167 396.304005,129.204167 397.082004,129.204167 397.860004,129.204167 398.638003,129.204167 399.416002,129.204167 400.194001,129.204167 400.972001,129.204167 401.750000,129.204167 402.527999,129.204167 403.305999,129.204167 404.083998,129.204167 404.861997,129.204167 405.639996,129.204167 406.417996,129.204167 407.195995,129.204167 407.973994,129.204167 408.751993,129.204167 409.529993,129.204167 410.307992,129.204167 411.085991,129.204167 411.864009,129.204167 412.642008,129.204167 413.420007,129.204167 414.198007,129.204167 414.976006,129.204167 415.754005,129.204167 416.532004,129.204167 417.310004,129.204167 418.088003,129.204167 418.866002,129.204167 419.644001,129.204167 420.422001,129.204167 421.200000,129.204167 421.200000,61.387500 421.978018,61.387500 422.755999,61.387500 423.534016,61.387500 424.311997,61.387500 425.090015,61.387500 425.867996,61.387500 426.646013,61.387500 427.423994,61.387500 428.202012,61.387500 428.979993,61.387500 429.758010,61.387500 430.535991,61.387500 431.314009,61.387500 432.091990,61.387500 432.870007,61.387500 433.647988,61.387500 434.426006,61.387500 435.203987,61.387500 435.982004,61.387500 436.759985,61.387500 437.538003,61.387500 438.315984,61.387500 439.094001,61.387500 439.871982,61.387500 440.650000,61.387500 441.428018,61.387500 442.205999,61.387500 442.984016,61.387500 443.761997,61.387500 444.540015,61.387500 445.317996,61.387500 446.096013,61.387500 446.873994,61.387500 447.652012,61.387500 448.429993,61.387500 449.208010,61.387500 449.985991,61.387500 450.764009,61.387500 451.541990,61.387500 452.320007,61.387500 453.097988,61.387500 453.876006,61.387500 454.653987,61.387500 455.432004,61.387500 456.209985,61.387500 456.988003,61.387500 457.765984,61.387500 458.544001,61.387500 459.321982,61.387500 460.100000,61.387500 460.100000,129.204167 460.878018,129.204167 461.655999,129.204167 462.434016,129.204167 463.211997,129.204167 463.990015,129.204167 464.767996,129.204167 465.546013,129.204167 466.323994,129.204167 467.102012,129.204167 467.879993,129.204167 468.658010,129.204167 469.435991,129.204167 470.214009,129.204167 470.991990,129.204167 471.770007,129.204167 472.547988,129.204167 473.326006,129.204167 474.103987,129.204167 474.882004,129.204167 475.659985,129.204167 476.438003,129.204167 477.215984,129.204167 477.994001,129.204167 478.771982,129.204167 479.550000,129.204167 480.328018,129.204167 481.105999,129.204167 481.884016,129.204167 482.661997,129.204167 483.440015,129.204167 484.217996,129.204167 484.996013,129.204167 485.773994,129.204167 486.552012,129.204167 487.329993,129.204167 488.108010,129.204167 488.885991,129.204167 489.664009,129.204167 490.441990,129.204167 491.220007,129.204167 491.997988,129.204167 492.776006,129.204167 493.553987,129.204167 494.332004,129.204167 495.109985,129.204167 495.888003,129.204167 496.665984,129.204167 497.444001,129.204167 498.221982,129.204167 499.000000,129.204167 499.000000,61.387500"
-     id="polyline79-2" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-5)"
-     points="110.000000,156.591667 110.778000,156.591667 111.556000,156.591667 112.334000,156.591667 113.112000,156.591667 113.890000,156.591667 114.668000,156.591667 115.446000,156.591667 116.224000,156.591667 117.002000,156.591667 117.780000,156.591667 118.558000,156.591667 119.336000,156.591667 120.114000,156.591667 120.892000,156.591667 121.670000,156.591667 122.448000,156.591667 123.226000,156.591667 124.004001,156.591667 124.782000,156.591667 125.560000,156.591667 126.337999,156.591667 127.116000,156.591667 127.894000,156.591667 128.672000,156.591667 129.450000,156.591667 130.227999,156.591667 131.006001,156.591667 131.784000,156.591667 132.561999,156.591667 133.340001,156.591667 134.118000,156.591667 134.895999,156.591667 135.674001,156.591667 136.452000,156.591667 137.230000,156.591667 138.008001,156.591667 138.786000,156.591667 139.564000,156.591667 140.341999,156.591667 141.120000,156.591667 141.898000,156.591667 142.675999,156.591667 143.454001,156.591667 144.232000,156.591667 145.009999,156.591667 145.788001,156.591667 146.566000,156.591667 147.343999,156.591667 148.122001,156.591667 148.900000,156.591667 148.900000,156.591667 148.900000,156.591667 148.900000,156.591667 149.677999,156.591667 150.455999,156.591667 151.233998,156.591667 152.012002,156.591667 152.790001,156.591667 153.568000,156.591667 154.345999,156.591667 155.123999,156.591667 155.901998,156.591667 156.680002,156.591667 157.458001,156.591667 158.236000,156.591667 159.014000,156.591667 159.791999,156.591667 160.569998,156.591667 161.348002,156.591667 162.126001,156.591667 162.904001,156.591667 163.682000,156.591667 164.459999,156.591667 165.237998,156.591667 166.016002,156.591667 166.794001,156.591667 167.572001,156.591667 168.350000,156.591667 169.127999,156.591667 169.905999,156.591667 170.683998,156.591667 171.462002,156.591667 172.240001,156.591667 173.018000,156.591667 173.795999,156.591667 174.573999,156.591667 175.351998,156.591667 176.130002,156.591667 176.908001,156.591667 177.686000,156.591667 178.464000,156.591667 179.241999,156.591667 180.019998,156.591667 180.798002,156.591667 181.576001,156.591667 182.354001,156.591667 183.132000,156.591667 183.909999,156.591667 184.687998,156.591667 185.466002,156.591667 186.244001,156.591667 187.022001,156.591667 187.800000,156.591667 187.800000,156.591667 187.800000,156.591667 188.577999,156.591667 189.355999,156.591667 190.133998,156.591667 190.911997,156.591667 191.689996,156.591667 192.467996,156.591667 193.246004,156.591667 194.024003,156.591667 194.802003,156.591667 195.580002,156.591667 196.358001,156.591667 197.136000,156.591667 197.914000,156.591667 198.691999,156.591667 199.469998,156.591667 200.247997,156.591667 201.025997,156.591667 201.803996,156.591667 202.582004,156.591667 203.360004,156.591667 204.138003,156.591667 204.916002,156.591667 205.694001,156.591667 206.472001,156.591667 207.250000,156.591667 208.027999,156.591667 208.805999,156.591667 209.583998,156.591667 210.361997,156.591667 211.139996,156.591667 211.917996,156.591667 212.696004,156.591667 213.474003,156.591667 214.252003,156.591667 215.030002,156.591667 215.808001,156.591667 216.586000,156.591667 217.364000,156.591667 218.141999,156.591667 218.919998,156.591667 219.697997,156.591667 220.475997,156.591667 221.253996,156.591667 222.032004,156.591667 222.810004,156.591667 223.588003,156.591667 224.366002,156.591667 225.144001,156.591667 225.922001,156.591667 226.700000,156.591667 226.700000,224.408333 226.700000,224.408333 227.477999,224.408333 228.255999,224.408333 229.033998,224.408333 229.811997,224.408333 230.589996,224.408333 231.367996,224.408333 232.146004,224.408333 232.924003,224.408333 233.702003,224.408333 234.480002,224.408333 235.258001,224.408333 236.036000,224.408333 236.814000,224.408333 237.591999,224.408333 238.369998,224.408333 239.147997,224.408333 239.925997,224.408333 240.703996,224.408333 241.482004,224.408333 242.260004,224.408333 243.038003,224.408333 243.816002,224.408333 244.594001,224.408333 245.372001,224.408333 246.150000,224.408333 246.927999,224.408333 247.705999,224.408333 248.483998,224.408333 249.261997,224.408333 250.039996,224.408333 250.817996,224.408333 251.596004,224.408333 252.374003,224.408333 253.152003,224.408333 253.930002,224.408333 254.708001,224.408333 255.486000,224.408333 256.264000,224.408333 257.041999,224.408333 257.819998,224.408333 258.597997,224.408333 259.375997,224.408333 260.153996,224.408333 260.932004,224.408333 261.710004,224.408333 262.488003,224.408333 263.266002,224.408333 264.044001,224.408333 264.822001,224.408333 265.600000,224.408333 265.600000,224.408333 265.600000,224.408333 266.377999,224.408333 267.155999,224.408333 267.933998,224.408333 268.711997,224.408333 269.489996,224.408333 270.267996,224.408333 271.045995,224.408333 271.823994,224.408333 272.601993,224.408333 273.379993,224.408333 274.157992,224.408333 274.935991,224.408333 275.714009,224.408333 276.492008,224.408333 277.270007,224.408333 278.048007,224.408333 278.826006,224.408333 279.604005,224.408333 280.382004,224.408333 281.160004,224.408333 281.938003,224.408333 282.716002,224.408333 283.494001,224.408333 284.272001,224.408333 285.050000,224.408333 285.827999,224.408333 286.605999,224.408333 287.383998,224.408333 288.161997,224.408333 288.939996,224.408333 289.717996,224.408333 290.495995,224.408333 291.273994,224.408333 292.051993,224.408333 292.829993,224.408333 293.607992,224.408333 294.385991,224.408333 295.164009,224.408333 295.942008,224.408333 296.720007,224.408333 297.498007,224.408333 298.276006,224.408333 299.054005,224.408333 299.832004,224.408333 300.610004,224.408333 301.388003,224.408333 302.166002,224.408333 302.944001,224.408333 303.722001,224.408333 304.500000,224.408333 304.500000,224.408333 305.277999,224.408333 306.055999,224.408333 306.833998,224.408333 307.611997,224.408333 308.389996,224.408333 309.167996,224.408333 309.945995,224.408333 310.723994,224.408333 311.501993,224.408333 312.279993,224.408333 313.057992,224.408333 313.835991,224.408333 314.614009,224.408333 315.392008,224.408333 316.170007,224.408333 316.948007,224.408333 317.726006,224.408333 318.504005,224.408333 319.282004,224.408333 320.060004,224.408333 320.838003,224.408333 321.616002,224.408333 322.394001,224.408333 323.172001,224.408333 323.950000,224.408333 324.727999,224.408333 325.505999,224.408333 326.283998,224.408333 327.061997,224.408333 327.839996,224.408333 328.617996,224.408333 329.395995,224.408333 330.173994,224.408333 330.951993,224.408333 331.729993,224.408333 332.507992,224.408333 333.285991,224.408333 334.064009,224.408333 334.842008,224.408333 335.620007,224.408333 336.398007,224.408333 337.176006,224.408333 337.954005,224.408333 338.732004,224.408333 339.510004,224.408333 340.288003,224.408333 341.066002,224.408333 341.844001,224.408333 342.622001,224.408333 343.400000,224.408333 343.400000,156.591667 344.177999,156.591667 344.955999,156.591667 345.733998,156.591667 346.511997,156.591667 347.289996,156.591667 348.067996,156.591667 348.845995,156.591667 349.623994,156.591667 350.401993,156.591667 351.179993,156.591667 351.957992,156.591667 352.735991,156.591667 353.514009,156.591667 354.292008,156.591667 355.070007,156.591667 355.848007,156.591667 356.626006,156.591667 357.404005,156.591667 358.182004,156.591667 358.960004,156.591667 359.738003,156.591667 360.516002,156.591667 361.294001,156.591667 362.072001,156.591667 362.850000,156.591667 363.627999,156.591667 364.405999,156.591667 365.183998,156.591667 365.961997,156.591667 366.739996,156.591667 367.517996,156.591667 368.295995,156.591667 369.073994,156.591667 369.851993,156.591667 370.629993,156.591667 371.407992,156.591667 372.185991,156.591667 372.964009,156.591667 373.742008,156.591667 374.520007,156.591667 375.298007,156.591667 376.076006,156.591667 376.854005,156.591667 377.632004,156.591667 378.410004,156.591667 379.188003,156.591667 379.966002,156.591667 380.744001,156.591667 381.522001,156.591667 382.300000,156.591667 382.300000,156.591667 383.077999,156.591667 383.855999,156.591667 384.633998,156.591667 385.411997,156.591667 386.189996,156.591667 386.967996,156.591667 387.745995,156.591667 388.523994,156.591667 389.301993,156.591667 390.079993,156.591667 390.857992,156.591667 391.635991,156.591667 392.414009,156.591667 393.192008,156.591667 393.970007,156.591667 394.748007,156.591667 395.526006,156.591667 396.304005,156.591667 397.082004,156.591667 397.860004,156.591667 398.638003,156.591667 399.416002,156.591667 400.194001,156.591667 400.972001,156.591667 401.750000,156.591667 402.527999,156.591667 403.305999,156.591667 404.083998,156.591667 404.861997,156.591667 405.639996,156.591667 406.417996,156.591667 407.195995,156.591667 407.973994,156.591667 408.751993,156.591667 409.529993,156.591667 410.307992,156.591667 411.085991,156.591667 411.864009,156.591667 412.642008,156.591667 413.420007,156.591667 414.198007,156.591667 414.976006,156.591667 415.754005,156.591667 416.532004,156.591667 417.310004,156.591667 418.088003,156.591667 418.866002,156.591667 419.644001,156.591667 420.422001,156.591667 421.200000,156.591667 421.200000,156.591667 421.978018,156.591667 422.755999,156.591667 423.534016,156.591667 424.311997,156.591667 425.090015,156.591667 425.867996,156.591667 426.646013,156.591667 427.423994,156.591667 428.202012,156.591667 428.979993,156.591667 429.758010,156.591667 430.535991,156.591667 431.314009,156.591667 432.091990,156.591667 432.870007,156.591667 433.647988,156.591667 434.426006,156.591667 435.203987,156.591667 435.982004,156.591667 436.759985,156.591667 437.538003,156.591667 438.315984,156.591667 439.094001,156.591667 439.871982,156.591667 440.650000,156.591667 441.428018,156.591667 442.205999,156.591667 442.984016,156.591667 443.761997,156.591667 444.540015,156.591667 445.317996,156.591667 446.096013,156.591667 446.873994,156.591667 447.652012,156.591667 448.429993,156.591667 449.208010,156.591667 449.985991,156.591667 450.764009,156.591667 451.541990,156.591667 452.320007,156.591667 453.097988,156.591667 453.876006,156.591667 454.653987,156.591667 455.432004,156.591667 456.209985,156.591667 456.988003,156.591667 457.765984,156.591667 458.544001,156.591667 459.321982,156.591667 460.100000,156.591667 460.100000,224.408333 460.878018,224.408333 461.655999,224.408333 462.434016,224.408333 463.211997,224.408333 463.990015,224.408333 464.767996,224.408333 465.546013,224.408333 466.323994,224.408333 467.102012,224.408333 467.879993,224.408333 468.658010,224.408333 469.435991,224.408333 470.214009,224.408333 470.991990,224.408333 471.770007,224.408333 472.547988,224.408333 473.326006,224.408333 474.103987,224.408333 474.882004,224.408333 475.659985,224.408333 476.438003,224.408333 477.215984,224.408333 477.994001,224.408333 478.771982,224.408333 479.550000,224.408333 480.328018,224.408333 481.105999,224.408333 481.884016,224.408333 482.661997,224.408333 483.440015,224.408333 484.217996,224.408333 484.996013,224.408333 485.773994,224.408333 486.552012,224.408333 487.329993,224.408333 488.108010,224.408333 488.885991,224.408333 489.664009,224.408333 490.441990,224.408333 491.220007,224.408333 491.997988,224.408333 492.776006,224.408333 493.553987,224.408333 494.332004,224.408333 495.109985,224.408333 495.888003,224.408333 496.665984,224.408333 497.444001,224.408333 498.221982,224.408333 499.000000,224.408333 499.000000,224.408333"
-     id="polyline81-6" />
-  <polyline
-     transform="translate(1039.2497,34.544173)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-5)"
-     points="110.000000,319.612500 110.778000,319.612500 111.556000,319.612500 112.334000,319.612500 113.112000,319.612500 113.890000,319.612500 114.668000,319.612500 115.446000,319.612500 116.224000,319.612500 117.002000,319.612500 117.780000,319.612500 118.558000,319.612500 119.336000,319.612500 120.114000,319.612500 120.892000,319.612500 121.670000,319.612500 122.448000,319.612500 123.226000,319.612500 124.004001,319.612500 124.782000,319.612500 125.560000,319.612500 126.337999,319.612500 127.116000,319.612500 127.894000,319.612500 128.672000,319.612500 129.450000,319.612500 130.227999,319.612500 131.006001,319.612500 131.784000,319.612500 132.561999,319.612500 133.340001,319.612500 134.118000,319.612500 134.895999,319.612500 135.674001,319.612500 136.452000,319.612500 137.230000,319.612500 138.008001,319.612500 138.786000,319.612500 139.564000,319.612500 140.341999,319.612500 141.120000,319.612500 141.898000,319.612500 142.675999,319.612500 143.454001,319.612500 144.232000,319.612500 145.009999,319.612500 145.788001,319.612500 146.566000,319.612500 147.343999,319.612500 148.122001,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 149.677999,319.612500 150.455999,319.612500 151.233998,319.612500 152.012002,319.612500 152.790001,319.612500 153.568000,319.612500 154.345999,319.612500 155.123999,319.612500 155.901998,319.612500 156.680002,319.612500 157.458001,319.612500 158.236000,319.612500 159.014000,319.612500 159.791999,319.612500 160.569998,319.612500 161.348002,319.612500 162.126001,319.612500 162.904001,319.612500 163.682000,319.612500 164.459999,319.612500 165.237998,319.612500 166.016002,319.612500 166.794001,319.612500 167.572001,319.612500 168.350000,319.612500 169.127999,319.612500 169.905999,319.612500 170.683998,319.612500 171.462002,319.612500 172.240001,319.612500 173.018000,319.612500 173.795999,319.612500 174.573999,319.612500 175.351998,319.612500 176.130002,319.612500 176.908001,319.612500 177.686000,319.612500 178.464000,319.612500 179.241999,319.612500 180.019998,319.612500 180.798002,319.612500 181.576001,319.612500 182.354001,319.612500 183.132000,319.612500 183.909999,319.612500 184.687998,319.612500 185.466002,319.612500 186.244001,319.612500 187.022001,319.612500 187.800000,319.612500 187.800000,319.612500 187.800000,319.612500 188.577999,319.612500 189.355999,319.612500 190.133998,319.612500 190.911997,319.612500 191.689996,319.612500 192.467996,319.612500 193.246004,319.612500 194.024003,319.612500 194.802003,319.612500 195.580002,319.612500 196.358001,319.612500 197.136000,319.612500 197.914000,319.612500 198.691999,319.612500 199.469998,319.612500 200.247997,319.612500 201.025997,319.612500 201.803996,319.612500 202.582004,319.612500 203.360004,319.612500 204.138003,319.612500 204.916002,319.612500 205.694001,319.612500 206.472001,319.612500 207.250000,319.612500 208.027999,319.612500 208.805999,319.612500 209.583998,319.612500 210.361997,319.612500 211.139996,319.612500 211.917996,319.612500 212.696004,319.612500 213.474003,319.612500 214.252003,319.612500 215.030002,319.612500 215.808001,319.612500 216.586000,319.612500 217.364000,319.612500 218.141999,319.612500 218.919998,319.612500 219.697997,319.612500 220.475997,319.612500 221.253996,319.612500 222.032004,319.612500 222.810004,319.612500 223.588003,319.612500 224.366002,319.612500 225.144001,319.612500 225.922001,319.612500 226.700000,319.612500 226.700000,319.612500 226.700000,319.612500 227.477999,319.612500 228.255999,319.612500 229.033998,319.612500 229.811997,319.612500 230.589996,319.612500 231.367996,319.612500 232.146004,319.612500 232.924003,319.612500 233.702003,319.612500 234.480002,319.612500 235.258001,319.612500 236.036000,319.612500 236.814000,319.612500 237.591999,319.612500 238.369998,319.612500 239.147997,319.612500 239.925997,319.612500 240.703996,319.612500 241.482004,319.612500 242.260004,319.612500 243.038003,319.612500 243.816002,319.612500 244.594001,319.612500 245.372001,319.612500 246.150000,319.612500 246.927999,319.612500 247.705999,319.612500 248.483998,319.612500 249.261997,319.612500 250.039996,319.612500 250.817996,319.612500 251.596004,319.612500 252.374003,319.612500 253.152003,319.612500 253.930002,319.612500 254.708001,319.612500 255.486000,319.612500 256.264000,319.612500 257.041999,319.612500 257.819998,319.612500 258.597997,319.612500 259.375997,319.612500 260.153996,319.612500 260.932004,319.612500 261.710004,319.612500 262.488003,319.612500 263.266002,319.612500 264.044001,319.612500 264.822001,319.612500 265.600000,319.612500 265.600000,251.795833 265.600000,251.795833 266.377999,251.795833 267.155999,251.795833 267.933998,251.795833 268.711997,251.795833 269.489996,251.795833 270.267996,251.795833 271.045995,251.795833 271.823994,251.795833 272.601993,251.795833 273.379993,251.795833 274.157992,251.795833 274.935991,251.795833 275.714009,251.795833 276.492008,251.795833 277.270007,251.795833 278.048007,251.795833 278.826006,251.795833 279.604005,251.795833 280.382004,251.795833 281.160004,251.795833 281.938003,251.795833 282.716002,251.795833 283.494001,251.795833 284.272001,251.795833 285.050000,251.795833 285.827999,251.795833 286.605999,251.795833 287.383998,251.795833 288.161997,251.795833 288.939996,251.795833 289.717996,251.795833 290.495995,251.795833 291.273994,251.795833 292.051993,251.795833 292.829993,251.795833 293.607992,251.795833 294.385991,251.795833 295.164009,251.795833 295.942008,251.795833 296.720007,251.795833 297.498007,251.795833 298.276006,251.795833 299.054005,251.795833 299.832004,251.795833 300.610004,251.795833 301.388003,251.795833 302.166002,251.795833 302.944001,251.795833 303.722001,251.795833 304.500000,251.795833 304.500000,251.795833 305.277999,251.795833 306.055999,251.795833 306.833998,251.795833 307.611997,251.795833 308.389996,251.795833 309.167996,251.795833 309.945995,251.795833 310.723994,251.795833 311.501993,251.795833 312.279993,251.795833 313.057992,251.795833 313.835991,251.795833 314.614009,251.795833 315.392008,251.795833 316.170007,251.795833 316.948007,251.795833 317.726006,251.795833 318.504005,251.795833 319.282004,251.795833 320.060004,251.795833 320.838003,251.795833 321.616002,251.795833 322.394001,251.795833 323.172001,251.795833 323.950000,251.795833 324.727999,251.795833 325.505999,251.795833 326.283998,251.795833 327.061997,251.795833 327.839996,251.795833 328.617996,251.795833 329.395995,251.795833 330.173994,251.795833 330.951993,251.795833 331.729993,251.795833 332.507992,251.795833 333.285991,251.795833 334.064009,251.795833 334.842008,251.795833 335.620007,251.795833 336.398007,251.795833 337.176006,251.795833 337.954005,251.795833 338.732004,251.795833 339.510004,251.795833 340.288003,251.795833 341.066002,251.795833 341.844001,251.795833 342.622001,251.795833 343.400000,251.795833 343.400000,319.612500 344.177999,319.612500 344.955999,319.612500 345.733998,319.612500 346.511997,319.612500 347.289996,319.612500 348.067996,319.612500 348.845995,319.612500 349.623994,319.612500 350.401993,319.612500 351.179993,319.612500 351.957992,319.612500 352.735991,319.612500 353.514009,319.612500 354.292008,319.612500 355.070007,319.612500 355.848007,319.612500 356.626006,319.612500 357.404005,319.612500 358.182004,319.612500 358.960004,319.612500 359.738003,319.612500 360.516002,319.612500 361.294001,319.612500 362.072001,319.612500 362.850000,319.612500 363.627999,319.612500 364.405999,319.612500 365.183998,319.612500 365.961997,319.612500 366.739996,319.612500 367.517996,319.612500 368.295995,319.612500 369.073994,319.612500 369.851993,319.612500 370.629993,319.612500 371.407992,319.612500 372.185991,319.612500 372.964009,319.612500 373.742008,319.612500 374.520007,319.612500 375.298007,319.612500 376.076006,319.612500 376.854005,319.612500 377.632004,319.612500 378.410004,319.612500 379.188003,319.612500 379.966002,319.612500 380.744001,319.612500 381.522001,319.612500 382.300000,319.612500 382.300000,319.612500 383.077999,319.612500 383.855999,319.612500 384.633998,319.612500 385.411997,319.612500 386.189996,319.612500 386.967996,319.612500 387.745995,319.612500 388.523994,319.612500 389.301993,319.612500 390.079993,319.612500 390.857992,319.612500 391.635991,319.612500 392.414009,319.612500 393.192008,319.612500 393.970007,319.612500 394.748007,319.612500 395.526006,319.612500 396.304005,319.612500 397.082004,319.612500 397.860004,319.612500 398.638003,319.612500 399.416002,319.612500 400.194001,319.612500 400.972001,319.612500 401.750000,319.612500 402.527999,319.612500 403.305999,319.612500 404.083998,319.612500 404.861997,319.612500 405.639996,319.612500 406.417996,319.612500 407.195995,319.612500 407.973994,319.612500 408.751993,319.612500 409.529993,319.612500 410.307992,319.612500 411.085991,319.612500 411.864009,319.612500 412.642008,319.612500 413.420007,319.612500 414.198007,319.612500 414.976006,319.612500 415.754005,319.612500 416.532004,319.612500 417.310004,319.612500 418.088003,319.612500 418.866002,319.612500 419.644001,319.612500 420.422001,319.612500 421.200000,319.612500 421.200000,319.612500 421.978018,319.612500 422.755999,319.612500 423.534016,319.612500 424.311997,319.612500 425.090015,319.612500 425.867996,319.612500 426.646013,319.612500 427.423994,319.612500 428.202012,319.612500 428.979993,319.612500 429.758010,319.612500 430.535991,319.612500 431.314009,319.612500 432.091990,319.612500 432.870007,319.612500 433.647988,319.612500 434.426006,319.612500 435.203987,319.612500 435.982004,319.612500 436.759985,319.612500 437.538003,319.612500 438.315984,319.612500 439.094001,319.612500 439.871982,319.612500 440.650000,319.612500 441.428018,319.612500 442.205999,319.612500 442.984016,319.612500 443.761997,319.612500 444.540015,319.612500 445.317996,319.612500 446.096013,319.612500 446.873994,319.612500 447.652012,319.612500 448.429993,319.612500 449.208010,319.612500 449.985991,319.612500 450.764009,319.612500 451.541990,319.612500 452.320007,319.612500 453.097988,319.612500 453.876006,319.612500 454.653987,319.612500 455.432004,319.612500 456.209985,319.612500 456.988003,319.612500 457.765984,319.612500 458.544001,319.612500 459.321982,319.612500 460.100000,319.612500 460.100000,319.612500 460.878018,319.612500 461.655999,319.612500 462.434016,319.612500 463.211997,319.612500 463.990015,319.612500 464.767996,319.612500 465.546013,319.612500 466.323994,319.612500 467.102012,319.612500 467.879993,319.612500 468.658010,319.612500 469.435991,319.612500 470.214009,319.612500 470.991990,319.612500 471.770007,319.612500 472.547988,319.612500 473.326006,319.612500 474.103987,319.612500 474.882004,319.612500 475.659985,319.612500 476.438003,319.612500 477.215984,319.612500 477.994001,319.612500 478.771982,319.612500 479.550000,319.612500 480.328018,319.612500 481.105999,319.612500 481.884016,319.612500 482.661997,319.612500 483.440015,319.612500 484.217996,319.612500 484.996013,319.612500 485.773994,319.612500 486.552012,319.612500 487.329993,319.612500 488.108010,319.612500 488.885991,319.612500 489.664009,319.612500 490.441990,319.612500 491.220007,319.612500 491.997988,319.612500 492.776006,319.612500 493.553987,319.612500 494.332004,319.612500 495.109985,319.612500 495.888003,319.612500 496.665984,319.612500 497.444001,319.612500 498.221982,319.612500 499.000000,319.612500 499.000000,251.795833"
-     id="polyline83-58" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1152.2498"
-     y="79.044174"
-     id="text85-7">swiCleInp.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1152.2498"
-     y="174.04417"
-     id="text87-9">swiCleInp.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1152.2498"
-     y="269.04419"
-     id="text89-6">swiCleInp.y</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline91-0" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,434.000000 187.800000,747.000000"
-     id="polyline93-4" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,434.000000 265.600000,747.000000"
-     id="polyline95-1" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,434.000000 343.400000,747.000000"
-     id="polyline97-0" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,434.000000 421.200000,747.000000"
-     id="polyline99-4" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 499.000000,747.000000"
-     id="polyline101-8" />
+     id="polyline2328"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="291.13864"
+     id="text2330">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-4)"
+     points="110.000000,61.387500 110.720000,61.387500 111.440000,61.387500 112.160000,61.387500 112.880000,61.387500 113.600000,61.387500 114.320000,61.387500 115.040000,61.387500 115.760000,61.387500 116.480000,61.387500 117.200000,61.387500 117.920000,61.387500 118.640000,61.387500 119.360000,61.387500 120.080000,61.387500 120.800000,61.387500 121.520000,61.387500 122.240000,61.387500 122.960001,61.387500 123.680000,61.387500 124.400000,61.387500 125.120000,61.387500 125.840000,61.387500 126.560000,61.387500 127.280000,61.387500 128.000000,61.387500 128.719999,61.387500 129.440001,61.387500 130.160000,61.387500 130.879999,61.387500 131.600001,61.387500 132.320000,61.387500 133.039999,61.387500 133.760001,61.387500 134.480000,61.387500 135.200000,61.387500 135.920001,61.387500 136.640000,61.387500 137.360000,61.387500 138.079999,61.387500 138.800000,61.387500 139.520000,61.387500 140.239999,61.387500 140.960001,61.387500 141.680000,61.387500 142.399999,61.387500 143.120001,61.387500 143.840000,61.387500 144.559999,61.387500 145.280001,61.387500 146.000000,61.387500 146.000000,129.204167 146.000000,129.204167 146.719999,129.204167 147.439999,129.204167 148.159998,129.204167 148.880002,129.204167 149.600001,129.204167 150.320000,129.204167 151.039999,129.204167 151.759999,129.204167 152.479998,129.204167 153.200002,129.204167 153.920001,129.204167 154.640000,129.204167 155.360000,129.204167 156.079999,129.204167 156.799998,129.204167 157.520002,129.204167 158.240001,129.204167 158.960001,129.204167 159.680000,129.204167 160.399999,129.204167 161.119998,129.204167 161.840002,129.204167 162.560001,129.204167 163.280001,129.204167 164.000000,129.204167 164.719999,129.204167 165.439999,129.204167 166.159998,129.204167 166.880002,129.204167 167.600001,129.204167 168.320000,129.204167 169.039999,129.204167 169.759999,129.204167 170.479998,129.204167 171.200002,129.204167 171.920001,129.204167 172.640000,129.204167 173.360000,129.204167 174.079999,129.204167 174.799998,129.204167 175.520002,129.204167 176.240001,129.204167 176.960001,129.204167 177.680000,129.204167 178.399999,129.204167 179.119998,129.204167 179.840002,129.204167 180.560001,129.204167 181.280001,129.204167 182.000000,129.204167 182.000000,61.387500 182.000000,61.387500 182.719999,61.387500 183.439999,61.387500 184.159998,61.387500 184.879997,61.387500 185.599997,61.387500 186.319996,61.387500 187.040004,61.387500 187.760003,61.387500 188.480002,61.387500 189.200002,61.387500 189.920001,61.387500 190.640000,61.387500 191.360000,61.387500 192.079999,61.387500 192.799998,61.387500 193.519998,61.387500 194.239997,61.387500 194.959996,61.387500 195.680004,61.387500 196.400003,61.387500 197.120003,61.387500 197.840002,61.387500 198.560001,61.387500 199.280001,61.387500 200.000000,61.387500 200.719999,61.387500 201.439999,61.387500 202.159998,61.387500 202.879997,61.387500 203.599997,61.387500 204.319996,61.387500 205.040004,61.387500 205.760003,61.387500 206.480002,61.387500 207.200002,61.387500 207.920001,61.387500 208.640000,61.387500 209.360000,61.387500 210.079999,61.387500 210.799998,61.387500 211.519998,61.387500 212.239997,61.387500 212.959996,61.387500 213.680004,61.387500 214.400003,61.387500 215.120003,61.387500 215.840002,61.387500 216.560001,61.387500 217.280001,61.387500 218.000000,61.387500 218.000000,129.204167 218.000000,129.204167 218.719999,129.204167 219.439999,129.204167 220.159998,129.204167 220.879997,129.204167 221.599997,129.204167 222.319996,129.204167 223.040004,129.204167 223.760003,129.204167 224.480002,129.204167 225.200002,129.204167 225.920001,129.204167 226.640000,129.204167 227.360000,129.204167 228.079999,129.204167 228.799998,129.204167 229.519998,129.204167 230.239997,129.204167 230.959996,129.204167 231.680004,129.204167 232.400003,129.204167 233.120003,129.204167 233.840002,129.204167 234.560001,129.204167 235.280001,129.204167 236.000000,129.204167 236.719999,129.204167 237.439999,129.204167 238.159998,129.204167 238.879997,129.204167 239.599997,129.204167 240.319996,129.204167 241.040004,129.204167 241.760003,129.204167 242.480002,129.204167 243.200002,129.204167 243.920001,129.204167 244.640000,129.204167 245.360000,129.204167 246.079999,129.204167 246.799998,129.204167 247.519998,129.204167 248.239997,129.204167 248.959996,129.204167 249.680004,129.204167 250.400003,129.204167 251.120003,129.204167 251.840002,129.204167 252.560001,129.204167 253.280001,129.204167 254.000000,129.204167 254.000000,61.387500 254.000000,61.387500 254.719999,61.387500 255.439999,61.387500 256.159998,61.387500 256.879997,61.387500 257.599997,61.387500 258.319996,61.387500 259.039995,61.387500 259.759995,61.387500 260.479994,61.387500 261.199993,61.387500 261.919992,61.387500 262.639992,61.387500 263.360008,61.387500 264.080008,61.387500 264.800007,61.387500 265.520006,61.387500 266.240005,61.387500 266.960005,61.387500 267.680004,61.387500 268.400003,61.387500 269.120003,61.387500 269.840002,61.387500 270.560001,61.387500 271.280001,61.387500 272.000000,61.387500 272.719999,61.387500 273.439999,61.387500 274.159998,61.387500 274.879997,61.387500 275.599997,61.387500 276.319996,61.387500 277.039995,61.387500 277.759995,61.387500 278.479994,61.387500 279.199993,61.387500 279.919992,61.387500 280.639992,61.387500 281.360008,61.387500 282.080008,61.387500 282.800007,61.387500 283.520006,61.387500 284.240005,61.387500 284.960005,61.387500 285.680004,61.387500 286.400003,61.387500 287.120003,61.387500 287.840002,61.387500 288.560001,61.387500 289.280001,61.387500 290.000000,61.387500 290.000000,129.204167 290.719999,129.204167 291.439999,129.204167 292.159998,129.204167 292.879997,129.204167 293.599997,129.204167 294.319996,129.204167 295.039995,129.204167 295.759995,129.204167 296.479994,129.204167 297.199993,129.204167 297.919992,129.204167 298.639992,129.204167 299.360008,129.204167 300.080008,129.204167 300.800007,129.204167 301.520006,129.204167 302.240005,129.204167 302.960005,129.204167 303.680004,129.204167 304.400003,129.204167 305.120003,129.204167 305.840002,129.204167 306.560001,129.204167 307.280001,129.204167 308.000000,129.204167 308.719999,129.204167 309.439999,129.204167 310.159998,129.204167 310.879997,129.204167 311.599997,129.204167 312.319996,129.204167 313.039995,129.204167 313.759995,129.204167 314.479994,129.204167 315.199993,129.204167 315.919992,129.204167 316.639992,129.204167 317.360008,129.204167 318.080008,129.204167 318.800007,129.204167 319.520006,129.204167 320.240005,129.204167 320.960005,129.204167 321.680004,129.204167 322.400003,129.204167 323.120003,129.204167 323.840002,129.204167 324.560001,129.204167 325.280001,129.204167 326.000000,129.204167 326.000000,61.387500 326.719999,61.387500 327.439999,61.387500 328.159998,61.387500 328.879997,61.387500 329.599997,61.387500 330.319996,61.387500 331.039995,61.387500 331.759995,61.387500 332.479994,61.387500 333.199993,61.387500 333.919992,61.387500 334.639992,61.387500 335.360008,61.387500 336.080008,61.387500 336.800007,61.387500 337.520006,61.387500 338.240005,61.387500 338.960005,61.387500 339.680004,61.387500 340.400003,61.387500 341.120003,61.387500 341.840002,61.387500 342.560001,61.387500 343.280001,61.387500 344.000000,61.387500 344.719999,61.387500 345.439999,61.387500 346.159998,61.387500 346.879997,61.387500 347.599997,61.387500 348.319996,61.387500 349.039995,61.387500 349.759995,61.387500 350.479994,61.387500 351.199993,61.387500 351.919992,61.387500 352.639992,61.387500 353.360008,61.387500 354.080008,61.387500 354.800007,61.387500 355.520006,61.387500 356.240005,61.387500 356.960005,61.387500 357.680004,61.387500 358.400003,61.387500 359.120003,61.387500 359.840002,61.387500 360.560001,61.387500 361.280001,61.387500 362.000000,61.387500 362.000000,129.204167 362.719999,129.204167 363.439999,129.204167 364.159998,129.204167 364.879997,129.204167 365.599997,129.204167 366.319996,129.204167 367.039995,129.204167 367.759995,129.204167 368.479994,129.204167 369.199993,129.204167 369.919992,129.204167 370.639992,129.204167 371.360008,129.204167 372.080008,129.204167 372.800007,129.204167 373.520006,129.204167 374.240005,129.204167 374.960005,129.204167 375.680004,129.204167 376.400003,129.204167 377.120003,129.204167 377.840002,129.204167 378.560001,129.204167 379.280001,129.204167 380.000000,129.204167 380.719999,129.204167 381.439999,129.204167 382.159998,129.204167 382.879997,129.204167 383.599997,129.204167 384.319996,129.204167 385.039995,129.204167 385.759995,129.204167 386.479994,129.204167 387.199993,129.204167 387.919992,129.204167 388.639992,129.204167 389.360008,129.204167 390.080008,129.204167 390.800007,129.204167 391.520006,129.204167 392.240005,129.204167 392.960005,129.204167 393.680004,129.204167 394.400003,129.204167 395.120003,129.204167 395.840002,129.204167 396.560001,129.204167 397.280001,129.204167 398.000000,129.204167 398.000000,61.387500 398.720016,61.387500 399.439999,61.387500 400.160015,61.387500 400.879997,61.387500 401.600014,61.387500 402.319996,61.387500 403.040012,61.387500 403.759995,61.387500 404.480011,61.387500 405.199993,61.387500 405.920010,61.387500 406.639992,61.387500 407.360008,61.387500 408.079990,61.387500 408.800007,61.387500 409.519989,61.387500 410.240005,61.387500 410.959988,61.387500 411.680004,61.387500 412.399986,61.387500 413.120003,61.387500 413.839985,61.387500 414.560001,61.387500 415.279984,61.387500 416.000000,61.387500 416.720016,61.387500 417.439999,61.387500 418.160015,61.387500 418.879997,61.387500 419.600014,61.387500 420.319996,61.387500 421.040012,61.387500 421.759995,61.387500 422.480011,61.387500 423.199993,61.387500 423.920010,61.387500 424.639992,61.387500 425.360008,61.387500 426.079990,61.387500 426.800007,61.387500 427.519989,61.387500 428.240005,61.387500 428.959988,61.387500 429.680004,61.387500 430.399986,61.387500 431.120003,61.387500 431.839985,61.387500 432.560001,61.387500 433.279984,61.387500 434.000000,61.387500 434.000000,129.204167 434.720016,129.204167 435.439999,129.204167 436.160015,129.204167 436.879997,129.204167 437.600014,129.204167 438.319996,129.204167 439.040012,129.204167 439.759995,129.204167 440.480011,129.204167 441.199993,129.204167 441.920010,129.204167 442.639992,129.204167 443.360008,129.204167 444.079990,129.204167 444.800007,129.204167 445.519989,129.204167 446.240005,129.204167 446.959988,129.204167 447.680004,129.204167 448.399986,129.204167 449.120003,129.204167 449.839985,129.204167 450.560001,129.204167 451.279984,129.204167 452.000000,129.204167 452.720016,129.204167 453.439999,129.204167 454.160015,129.204167 454.879997,129.204167 455.600014,129.204167 456.319996,129.204167 457.040012,129.204167 457.759995,129.204167 458.480011,129.204167 459.199993,129.204167 459.920010,129.204167 460.639992,129.204167 461.360008,129.204167 462.079990,129.204167 462.800007,129.204167 463.519989,129.204167 464.240005,129.204167 464.959988,129.204167 465.680004,129.204167 466.399986,129.204167 467.120003,129.204167 467.839985,129.204167 468.560001,129.204167 469.279984,129.204167 470.000000,129.204167 470.000000,61.387500"
+     id="polyline2335"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-4)"
+     points="110.000000,156.591667 110.720000,156.591667 111.440000,156.591667 112.160000,156.591667 112.880000,156.591667 113.600000,156.591667 114.320000,156.591667 115.040000,156.591667 115.760000,156.591667 116.480000,156.591667 117.200000,156.591667 117.920000,156.591667 118.640000,156.591667 119.360000,156.591667 120.080000,156.591667 120.800000,156.591667 121.520000,156.591667 122.240000,156.591667 122.960001,156.591667 123.680000,156.591667 124.400000,156.591667 125.120000,156.591667 125.840000,156.591667 126.560000,156.591667 127.280000,156.591667 128.000000,156.591667 128.719999,156.591667 129.440001,156.591667 130.160000,156.591667 130.879999,156.591667 131.600001,156.591667 132.320000,156.591667 133.039999,156.591667 133.760001,156.591667 134.480000,156.591667 135.200000,156.591667 135.920001,156.591667 136.640000,156.591667 137.360000,156.591667 138.079999,156.591667 138.800000,156.591667 139.520000,156.591667 140.239999,156.591667 140.960001,156.591667 141.680000,156.591667 142.399999,156.591667 143.120001,156.591667 143.840000,156.591667 144.559999,156.591667 145.280001,156.591667 146.000000,156.591667 146.000000,156.591667 146.000000,156.591667 146.719999,156.591667 147.439999,156.591667 148.159998,156.591667 148.880002,156.591667 149.600001,156.591667 150.320000,156.591667 151.039999,156.591667 151.759999,156.591667 152.479998,156.591667 153.200002,156.591667 153.920001,156.591667 154.640000,156.591667 155.360000,156.591667 156.079999,156.591667 156.799998,156.591667 157.520002,156.591667 158.240001,156.591667 158.960001,156.591667 159.680000,156.591667 160.399999,156.591667 161.119998,156.591667 161.840002,156.591667 162.560001,156.591667 163.280001,156.591667 164.000000,156.591667 164.719999,156.591667 165.439999,156.591667 166.159998,156.591667 166.880002,156.591667 167.600001,156.591667 168.320000,156.591667 169.039999,156.591667 169.759999,156.591667 170.479998,156.591667 171.200002,156.591667 171.920001,156.591667 172.640000,156.591667 173.360000,156.591667 174.079999,156.591667 174.799998,156.591667 175.520002,156.591667 176.240001,156.591667 176.960001,156.591667 177.680000,156.591667 178.399999,156.591667 179.119998,156.591667 179.840002,156.591667 180.560001,156.591667 181.280001,156.591667 182.000000,156.591667 182.000000,156.591667 182.000000,156.591667 182.719999,156.591667 183.439999,156.591667 184.159998,156.591667 184.879997,156.591667 185.599997,156.591667 186.319996,156.591667 187.040004,156.591667 187.760003,156.591667 188.480002,156.591667 189.200002,156.591667 189.920001,156.591667 190.640000,156.591667 191.360000,156.591667 192.079999,156.591667 192.799998,156.591667 193.519998,156.591667 194.239997,156.591667 194.959996,156.591667 195.680004,156.591667 196.400003,156.591667 197.120003,156.591667 197.840002,156.591667 198.560001,156.591667 199.280001,156.591667 200.000000,156.591667 200.719999,156.591667 201.439999,156.591667 202.159998,156.591667 202.879997,156.591667 203.599997,156.591667 204.319996,156.591667 205.040004,156.591667 205.760003,156.591667 206.480002,156.591667 207.200002,156.591667 207.920001,156.591667 208.640000,156.591667 209.360000,156.591667 210.079999,156.591667 210.799998,156.591667 211.519998,156.591667 212.239997,156.591667 212.959996,156.591667 213.680004,156.591667 214.400003,156.591667 215.120003,156.591667 215.840002,156.591667 216.560001,156.591667 217.280001,156.591667 218.000000,156.591667 218.000000,156.591667 218.000000,156.591667 218.719999,156.591667 219.439999,156.591667 220.159998,156.591667 220.879997,156.591667 221.599997,156.591667 222.319996,156.591667 223.040004,156.591667 223.760003,156.591667 224.480002,156.591667 225.200002,156.591667 225.920001,156.591667 226.640000,156.591667 227.360000,156.591667 228.079999,156.591667 228.799998,156.591667 229.519998,156.591667 230.239997,156.591667 230.959996,156.591667 231.680004,156.591667 232.400003,156.591667 233.120003,156.591667 233.840002,156.591667 234.560001,156.591667 235.280001,156.591667 236.000000,156.591667 236.719999,156.591667 237.439999,156.591667 238.159998,156.591667 238.879997,156.591667 239.599997,156.591667 240.319996,156.591667 241.040004,156.591667 241.760003,156.591667 242.480002,156.591667 243.200002,156.591667 243.920001,156.591667 244.640000,156.591667 245.360000,156.591667 246.079999,156.591667 246.799998,156.591667 247.519998,156.591667 248.239997,156.591667 248.959996,156.591667 249.680004,156.591667 250.400003,156.591667 251.120003,156.591667 251.840002,156.591667 252.560001,156.591667 253.280001,156.591667 254.000000,156.591667 254.000000,156.591667 254.000000,156.591667 254.719999,156.591667 255.439999,156.591667 256.159998,156.591667 256.879997,156.591667 257.599997,156.591667 258.319996,156.591667 259.039995,156.591667 259.759995,156.591667 260.479994,156.591667 261.199993,156.591667 261.919992,156.591667 262.639992,156.591667 263.360008,156.591667 264.080008,156.591667 264.800007,156.591667 265.520006,156.591667 266.240005,156.591667 266.960005,156.591667 267.680004,156.591667 268.400003,156.591667 269.120003,156.591667 269.840002,156.591667 270.560001,156.591667 271.280001,156.591667 272.000000,156.591667 272.719999,156.591667 273.439999,156.591667 274.159998,156.591667 274.879997,156.591667 275.599997,156.591667 276.319996,156.591667 277.039995,156.591667 277.759995,156.591667 278.479994,156.591667 279.199993,156.591667 279.919992,156.591667 280.639992,156.591667 281.360008,156.591667 282.080008,156.591667 282.800007,156.591667 283.520006,156.591667 284.240005,156.591667 284.960005,156.591667 285.680004,156.591667 286.400003,156.591667 287.120003,156.591667 287.840002,156.591667 288.560001,156.591667 289.280001,156.591667 290.000000,156.591667 290.000000,156.591667 290.719999,156.591667 291.439999,156.591667 292.159998,156.591667 292.879997,156.591667 293.599997,156.591667 294.319996,156.591667 295.039995,156.591667 295.759995,156.591667 296.479994,156.591667 297.199993,156.591667 297.919992,156.591667 298.639992,156.591667 299.360008,156.591667 300.080008,156.591667 300.800007,156.591667 301.520006,156.591667 302.240005,156.591667 302.960005,156.591667 303.680004,156.591667 304.400003,156.591667 305.120003,156.591667 305.840002,156.591667 306.560001,156.591667 307.280001,156.591667 308.000000,156.591667 308.719999,156.591667 309.439999,156.591667 310.159998,156.591667 310.879997,156.591667 311.599997,156.591667 312.319996,156.591667 313.039995,156.591667 313.759995,156.591667 314.479994,156.591667 315.199993,156.591667 315.919992,156.591667 316.639992,156.591667 317.360008,156.591667 318.080008,156.591667 318.800007,156.591667 319.520006,156.591667 320.240005,156.591667 320.960005,156.591667 321.680004,156.591667 322.400003,156.591667 323.120003,156.591667 323.840002,156.591667 324.560001,156.591667 325.280001,156.591667 326.000000,156.591667 326.000000,156.591667 326.719999,156.591667 327.439999,156.591667 328.159998,156.591667 328.879997,156.591667 329.599997,156.591667 330.319996,156.591667 331.039995,156.591667 331.759995,156.591667 332.479994,156.591667 333.199993,156.591667 333.919992,156.591667 334.639992,156.591667 335.360008,156.591667 336.080008,156.591667 336.800007,156.591667 337.520006,156.591667 338.240005,156.591667 338.960005,156.591667 339.680004,156.591667 340.400003,156.591667 341.120003,156.591667 341.840002,156.591667 342.560001,156.591667 343.280001,156.591667 344.000000,156.591667 344.719999,156.591667 345.439999,156.591667 346.159998,156.591667 346.879997,156.591667 347.599997,156.591667 348.319996,156.591667 349.039995,156.591667 349.759995,156.591667 350.479994,156.591667 351.199993,156.591667 351.919992,156.591667 352.639992,156.591667 353.360008,156.591667 354.080008,156.591667 354.800007,156.591667 355.520006,156.591667 356.240005,156.591667 356.960005,156.591667 357.680004,156.591667 358.400003,156.591667 359.120003,156.591667 359.840002,156.591667 360.560001,156.591667 361.280001,156.591667 362.000000,156.591667 362.000000,156.591667 362.719999,156.591667 363.439999,156.591667 364.159998,156.591667 364.879997,156.591667 365.599997,156.591667 366.319996,156.591667 367.039995,156.591667 367.759995,156.591667 368.479994,156.591667 369.199993,156.591667 369.919992,156.591667 370.639992,156.591667 371.360008,156.591667 372.080008,156.591667 372.800007,156.591667 373.520006,156.591667 374.240005,156.591667 374.960005,156.591667 375.680004,156.591667 376.400003,156.591667 377.120003,156.591667 377.840002,156.591667 378.560001,156.591667 379.280001,156.591667 380.000000,156.591667 380.719999,156.591667 381.439999,156.591667 382.159998,156.591667 382.879997,156.591667 383.599997,156.591667 384.319996,156.591667 385.039995,156.591667 385.759995,156.591667 386.479994,156.591667 387.199993,156.591667 387.919992,156.591667 388.639992,156.591667 389.360008,156.591667 390.080008,156.591667 390.800007,156.591667 391.520006,156.591667 392.240005,156.591667 392.960005,156.591667 393.680004,156.591667 394.400003,156.591667 395.120003,156.591667 395.840002,156.591667 396.560001,156.591667 397.280001,156.591667 398.000000,156.591667 398.000000,156.591667 398.720016,156.591667 399.439999,156.591667 400.160015,156.591667 400.879997,156.591667 401.600014,156.591667 402.319996,156.591667 403.040012,156.591667 403.759995,156.591667 404.480011,156.591667 405.199993,156.591667 405.920010,156.591667 406.639992,156.591667 407.360008,156.591667 408.079990,156.591667 408.800007,156.591667 409.519989,156.591667 410.240005,156.591667 410.959988,156.591667 411.680004,156.591667 412.399986,156.591667 413.120003,156.591667 413.839985,156.591667 414.560001,156.591667 415.279984,156.591667 416.000000,156.591667 416.720016,156.591667 417.439999,156.591667 418.160015,156.591667 418.879997,156.591667 419.600014,156.591667 420.319996,156.591667 421.040012,156.591667 421.759995,156.591667 422.480011,156.591667 423.199993,156.591667 423.920010,156.591667 424.639992,156.591667 425.360008,156.591667 426.079990,156.591667 426.800007,156.591667 427.519989,156.591667 428.240005,156.591667 428.959988,156.591667 429.680004,156.591667 430.399986,156.591667 431.120003,156.591667 431.839985,156.591667 432.560001,156.591667 433.279984,156.591667 434.000000,156.591667 434.000000,156.591667 434.720016,156.591667 435.439999,156.591667 436.160015,156.591667 436.879997,156.591667 437.600014,156.591667 438.319996,156.591667 439.040012,156.591667 439.759995,156.591667 440.480011,156.591667 441.199993,156.591667 441.920010,156.591667 442.639992,156.591667 443.360008,156.591667 444.079990,156.591667 444.800007,156.591667 445.519989,156.591667 446.240005,156.591667 446.959988,156.591667 447.680004,156.591667 448.399986,156.591667 449.120003,156.591667 449.839985,156.591667 450.560001,156.591667 451.279984,156.591667 452.000000,156.591667 452.720016,156.591667 453.439999,156.591667 454.160015,156.591667 454.879997,156.591667 455.600014,156.591667 456.319996,156.591667 457.040012,156.591667 457.759995,156.591667 458.480011,156.591667 459.199993,156.591667 459.920010,156.591667 460.639992,156.591667 461.360008,156.591667 462.079990,156.591667 462.800007,156.591667 463.519989,156.591667 464.240005,156.591667 464.959988,156.591667 465.680004,156.591667 466.399986,156.591667 467.120003,156.591667 467.839985,156.591667 468.560001,156.591667 469.279984,156.591667 470.000000,156.591667 470.000000,156.591667"
+     id="polyline2337"
+     transform="translate(488.18065,39.342823)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-4)"
+     points="110.000000,319.612500 110.720000,319.612500 111.440000,319.612500 112.160000,319.612500 112.880000,319.612500 113.600000,319.612500 114.320000,319.612500 115.040000,319.612500 115.760000,319.612500 116.480000,319.612500 117.200000,319.612500 117.920000,319.612500 118.640000,319.612500 119.360000,319.612500 120.080000,319.612500 120.800000,319.612500 121.520000,319.612500 122.240000,319.612500 122.960001,319.612500 123.680000,319.612500 124.400000,319.612500 125.120000,319.612500 125.840000,319.612500 126.560000,319.612500 127.280000,319.612500 128.000000,319.612500 128.719999,319.612500 129.440001,319.612500 130.160000,319.612500 130.879999,319.612500 131.600001,319.612500 132.320000,319.612500 133.039999,319.612500 133.760001,319.612500 134.480000,319.612500 135.200000,319.612500 135.920001,319.612500 136.640000,319.612500 137.360000,319.612500 138.079999,319.612500 138.800000,319.612500 139.520000,319.612500 140.239999,319.612500 140.960001,319.612500 141.680000,319.612500 142.399999,319.612500 143.120001,319.612500 143.840000,319.612500 144.559999,319.612500 145.280001,319.612500 146.000000,319.612500 146.000000,319.612500 146.000000,319.612500 146.719999,319.612500 147.439999,319.612500 148.159998,319.612500 148.880002,319.612500 149.600001,319.612500 150.320000,319.612500 151.039999,319.612500 151.759999,319.612500 152.479998,319.612500 153.200002,319.612500 153.920001,319.612500 154.640000,319.612500 155.360000,319.612500 156.079999,319.612500 156.799998,319.612500 157.520002,319.612500 158.240001,319.612500 158.960001,319.612500 159.680000,319.612500 160.399999,319.612500 161.119998,319.612500 161.840002,319.612500 162.560001,319.612500 163.280001,319.612500 164.000000,319.612500 164.719999,319.612500 165.439999,319.612500 166.159998,319.612500 166.880002,319.612500 167.600001,319.612500 168.320000,319.612500 169.039999,319.612500 169.759999,319.612500 170.479998,319.612500 171.200002,319.612500 171.920001,319.612500 172.640000,319.612500 173.360000,319.612500 174.079999,319.612500 174.799998,319.612500 175.520002,319.612500 176.240001,319.612500 176.960001,319.612500 177.680000,319.612500 178.399999,319.612500 179.119998,319.612500 179.840002,319.612500 180.560001,319.612500 181.280001,319.612500 182.000000,319.612500 182.000000,319.612500 182.000000,319.612500 182.719999,319.612500 183.439999,319.612500 184.159998,319.612500 184.879997,319.612500 185.599997,319.612500 186.319996,319.612500 187.040004,319.612500 187.760003,319.612500 188.480002,319.612500 189.200002,319.612500 189.920001,319.612500 190.640000,319.612500 191.360000,319.612500 192.079999,319.612500 192.799998,319.612500 193.519998,319.612500 194.239997,319.612500 194.959996,319.612500 195.680004,319.612500 196.400003,319.612500 197.120003,319.612500 197.840002,319.612500 198.560001,319.612500 199.280001,319.612500 200.000000,319.612500 200.719999,319.612500 201.439999,319.612500 202.159998,319.612500 202.879997,319.612500 203.599997,319.612500 204.319996,319.612500 205.040004,319.612500 205.760003,319.612500 206.480002,319.612500 207.200002,319.612500 207.920001,319.612500 208.640000,319.612500 209.360000,319.612500 210.079999,319.612500 210.799998,319.612500 211.519998,319.612500 212.239997,319.612500 212.959996,319.612500 213.680004,319.612500 214.400003,319.612500 215.120003,319.612500 215.840002,319.612500 216.560001,319.612500 217.280001,319.612500 218.000000,319.612500 218.000000,319.612500 218.000000,319.612500 218.719999,319.612500 219.439999,319.612500 220.159998,319.612500 220.879997,319.612500 221.599997,319.612500 222.319996,319.612500 223.040004,319.612500 223.760003,319.612500 224.480002,319.612500 225.200002,319.612500 225.920001,319.612500 226.640000,319.612500 227.360000,319.612500 228.079999,319.612500 228.799998,319.612500 229.519998,319.612500 230.239997,319.612500 230.959996,319.612500 231.680004,319.612500 232.400003,319.612500 233.120003,319.612500 233.840002,319.612500 234.560001,319.612500 235.280001,319.612500 236.000000,319.612500 236.719999,319.612500 237.439999,319.612500 238.159998,319.612500 238.879997,319.612500 239.599997,319.612500 240.319996,319.612500 241.040004,319.612500 241.760003,319.612500 242.480002,319.612500 243.200002,319.612500 243.920001,319.612500 244.640000,319.612500 245.360000,319.612500 246.079999,319.612500 246.799998,319.612500 247.519998,319.612500 248.239997,319.612500 248.959996,319.612500 249.680004,319.612500 250.400003,319.612500 251.120003,319.612500 251.840002,319.612500 252.560001,319.612500 253.280001,319.612500 254.000000,319.612500 254.000000,319.612500 254.000000,319.612500 254.719999,319.612500 255.439999,319.612500 256.159998,319.612500 256.879997,319.612500 257.599997,319.612500 258.319996,319.612500 259.039995,319.612500 259.759995,319.612500 260.479994,319.612500 261.199993,319.612500 261.919992,319.612500 262.639992,319.612500 263.360008,319.612500 264.080008,319.612500 264.800007,319.612500 265.520006,319.612500 266.240005,319.612500 266.960005,319.612500 267.680004,319.612500 268.400003,319.612500 269.120003,319.612500 269.840002,319.612500 270.560001,319.612500 271.280001,319.612500 272.000000,319.612500 272.719999,319.612500 273.439999,319.612500 274.159998,319.612500 274.879997,319.612500 275.599997,319.612500 276.319996,319.612500 277.039995,319.612500 277.759995,319.612500 278.479994,319.612500 279.199993,319.612500 279.919992,319.612500 280.639992,319.612500 281.360008,319.612500 282.080008,319.612500 282.800007,319.612500 283.520006,319.612500 284.240005,319.612500 284.960005,319.612500 285.680004,319.612500 286.400003,319.612500 287.120003,319.612500 287.840002,319.612500 288.560001,319.612500 289.280001,319.612500 290.000000,319.612500 290.000000,319.612500 290.719999,319.612500 291.439999,319.612500 292.159998,319.612500 292.879997,319.612500 293.599997,319.612500 294.319996,319.612500 295.039995,319.612500 295.759995,319.612500 296.479994,319.612500 297.199993,319.612500 297.919992,319.612500 298.639992,319.612500 299.360008,319.612500 300.080008,319.612500 300.800007,319.612500 301.520006,319.612500 302.240005,319.612500 302.960005,319.612500 303.680004,319.612500 304.400003,319.612500 305.120003,319.612500 305.840002,319.612500 306.560001,319.612500 307.280001,319.612500 308.000000,319.612500 308.719999,319.612500 309.439999,319.612500 310.159998,319.612500 310.879997,319.612500 311.599997,319.612500 312.319996,319.612500 313.039995,319.612500 313.759995,319.612500 314.479994,319.612500 315.199993,319.612500 315.919992,319.612500 316.639992,319.612500 317.360008,319.612500 318.080008,319.612500 318.800007,319.612500 319.520006,319.612500 320.240005,319.612500 320.960005,319.612500 321.680004,319.612500 322.400003,319.612500 323.120003,319.612500 323.840002,319.612500 324.560001,319.612500 325.280001,319.612500 326.000000,319.612500 326.000000,319.612500 326.719999,319.612500 327.439999,319.612500 328.159998,319.612500 328.879997,319.612500 329.599997,319.612500 330.319996,319.612500 331.039995,319.612500 331.759995,319.612500 332.479994,319.612500 333.199993,319.612500 333.919992,319.612500 334.639992,319.612500 335.360008,319.612500 336.080008,319.612500 336.800007,319.612500 337.520006,319.612500 338.240005,319.612500 338.960005,319.612500 339.680004,319.612500 340.400003,319.612500 341.120003,319.612500 341.840002,319.612500 342.560001,319.612500 343.280001,319.612500 344.000000,319.612500 344.719999,319.612500 345.439999,319.612500 346.159998,319.612500 346.879997,319.612500 347.599997,319.612500 348.319996,319.612500 349.039995,319.612500 349.759995,319.612500 350.479994,319.612500 351.199993,319.612500 351.919992,319.612500 352.639992,319.612500 353.360008,319.612500 354.080008,319.612500 354.800007,319.612500 355.520006,319.612500 356.240005,319.612500 356.960005,319.612500 357.680004,319.612500 358.400003,319.612500 359.120003,319.612500 359.840002,319.612500 360.560001,319.612500 361.280001,319.612500 362.000000,319.612500 362.000000,319.612500 362.719999,319.612500 363.439999,319.612500 364.159998,319.612500 364.879997,319.612500 365.599997,319.612500 366.319996,319.612500 367.039995,319.612500 367.759995,319.612500 368.479994,319.612500 369.199993,319.612500 369.919992,319.612500 370.639992,319.612500 371.360008,319.612500 372.080008,319.612500 372.800007,319.612500 373.520006,319.612500 374.240005,319.612500 374.960005,319.612500 375.680004,319.612500 376.400003,319.612500 377.120003,319.612500 377.840002,319.612500 378.560001,319.612500 379.280001,319.612500 380.000000,319.612500 380.719999,319.612500 381.439999,319.612500 382.159998,319.612500 382.879997,319.612500 383.599997,319.612500 384.319996,319.612500 385.039995,319.612500 385.759995,319.612500 386.479994,319.612500 387.199993,319.612500 387.919992,319.612500 388.639992,319.612500 389.360008,319.612500 390.080008,319.612500 390.800007,319.612500 391.520006,319.612500 392.240005,319.612500 392.960005,319.612500 393.680004,319.612500 394.400003,319.612500 395.120003,319.612500 395.840002,319.612500 396.560001,319.612500 397.280001,319.612500 398.000000,319.612500 398.000000,319.612500 398.720016,319.612500 399.439999,319.612500 400.160015,319.612500 400.879997,319.612500 401.600014,319.612500 402.319996,319.612500 403.040012,319.612500 403.759995,319.612500 404.480011,319.612500 405.199993,319.612500 405.920010,319.612500 406.639992,319.612500 407.360008,319.612500 408.079990,319.612500 408.800007,319.612500 409.519989,319.612500 410.240005,319.612500 410.959988,319.612500 411.680004,319.612500 412.399986,319.612500 413.120003,319.612500 413.839985,319.612500 414.560001,319.612500 415.279984,319.612500 416.000000,319.612500 416.720016,319.612500 417.439999,319.612500 418.160015,319.612500 418.879997,319.612500 419.600014,319.612500 420.319996,319.612500 421.040012,319.612500 421.759995,319.612500 422.480011,319.612500 423.199993,319.612500 423.920010,319.612500 424.639992,319.612500 425.360008,319.612500 426.079990,319.612500 426.800007,319.612500 427.519989,319.612500 428.240005,319.612500 428.959988,319.612500 429.680004,319.612500 430.399986,319.612500 431.120003,319.612500 431.839985,319.612500 432.560001,319.612500 433.279984,319.612500 434.000000,319.612500 434.000000,319.612500 434.720016,319.612500 435.439999,319.612500 436.160015,319.612500 436.879997,319.612500 437.600014,319.612500 438.319996,319.612500 439.040012,319.612500 439.759995,319.612500 440.480011,319.612500 441.199993,319.612500 441.920010,319.612500 442.639992,319.612500 443.360008,319.612500 444.079990,319.612500 444.800007,319.612500 445.519989,319.612500 446.240005,319.612500 446.959988,319.612500 447.680004,319.612500 448.399986,319.612500 449.120003,319.612500 449.839985,319.612500 450.560001,319.612500 451.279984,319.612500 452.000000,319.612500 452.720016,319.612500 453.439999,319.612500 454.160015,319.612500 454.879997,319.612500 455.600014,319.612500 456.319996,319.612500 457.040012,319.612500 457.759995,319.612500 458.480011,319.612500 459.199993,319.612500 459.920010,319.612500 460.639992,319.612500 461.360008,319.612500 462.079990,319.612500 462.800007,319.612500 463.519989,319.612500 464.240005,319.612500 464.959988,319.612500 465.680004,319.612500 466.399986,319.612500 467.120003,319.612500 467.839985,319.612500 468.560001,319.612500 469.279984,319.612500 470.000000,319.612500 470.000000,319.612500"
+     id="polyline2339"
+     transform="translate(488.18065,39.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="601.18066"
+     y="83.842621"
+     id="text2341">truCleTruIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="601.18066"
+     y="178.84262"
+     id="text2343">truCleTruIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="601.18066"
+     y="273.84262"
+     id="text2345">truCleTruIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline2347"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,433.000000 182.000000,746.000000"
+     id="polyline2349"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,433.000000 254.000000,746.000000"
+     id="polyline2351"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,433.000000 326.000000,746.000000"
+     id="polyline2353"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,433.000000 398.000000,746.000000"
+     id="polyline2355"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 470.000000,746.000000"
+     id="polyline2357"
+     transform="translate(488.18065,89.342823)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1149.2498"
-     y="537.93115"
-     width="389"
-     height="67.816704"
-     id="rect103-7" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="598.18066"
+     y="549.63861"
+     width="360"
+     height="68"
+     id="rect2359" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1149.2498"
-     y="633.13617"
-     width="389"
-     height="67.816704"
-     id="rect105-0" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="598.18066"
+     y="644.84271"
+     width="360"
+     height="68"
+     id="rect2361" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1149.2498"
-     y="728.34021"
-     width="389"
-     height="67.816704"
-     id="rect107-8" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 499.000000,747.000000"
-     id="polyline109-6" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,434.000000"
-     id="polyline111-24" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 110.000000,434.000000"
-     id="polyline113-7" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline115-9" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,755.000000"
-     id="polyline117-3" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,747.000000 187.800000,755.000000"
-     id="polyline119-9" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,755.000000"
-     id="polyline121-2" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,747.000000 343.400000,755.000000"
-     id="polyline123-8" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,755.000000"
-     id="polyline125-3" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,755.000000"
-     id="polyline127-01" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,759.800000"
-     id="polyline129-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1149.2498"
-     y="855.04419"
-     id="text131-89">0</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,759.800000"
-     id="polyline133-1" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1304.8497"
-     y="855.04419"
-     id="text135-5">4</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,759.800000"
-     id="polyline137-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1460.4498"
-     y="855.04419"
-     id="text139-9">8</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,529.204167 110.000000,529.204167"
-     id="polyline141-2" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="605.74817"
-     id="text143-5">false</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,461.387500 110.000000,461.387500"
-     id="polyline145-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="537.93115"
-     id="text147-4">true</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,624.408333 110.000000,624.408333"
-     id="polyline149-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="700.95221"
-     id="text151-9">false</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,556.591667 110.000000,556.591667"
-     id="polyline153-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="633.13617"
-     id="text155-5">true</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,719.612500 110.000000,719.612500"
-     id="polyline157-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="796.15619"
-     id="text159-3">false</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,651.795833 110.000000,651.795833"
-     id="polyline161-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1133.2498"
-     y="728.34021"
-     id="text163-7">true</text>
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-4)"
-     points="110.000000,461.387500 110.778000,461.387500 111.556000,461.387500 112.334000,461.387500 113.112000,461.387500 113.890000,461.387500 114.668000,461.387500 115.446000,461.387500 116.224000,461.387500 117.002000,461.387500 117.780000,461.387500 118.558000,461.387500 119.336000,461.387500 120.114000,461.387500 120.892000,461.387500 121.670000,461.387500 122.448000,461.387500 123.226000,461.387500 124.004001,461.387500 124.782000,461.387500 125.560000,461.387500 126.337999,461.387500 127.116000,461.387500 127.894000,461.387500 128.672000,461.387500 129.450000,461.387500 130.227999,461.387500 131.006001,461.387500 131.784000,461.387500 132.561999,461.387500 133.340001,461.387500 134.118000,461.387500 134.895999,461.387500 135.674001,461.387500 136.452000,461.387500 137.230000,461.387500 138.008001,461.387500 138.786000,461.387500 139.564000,461.387500 140.341999,461.387500 141.120000,461.387500 141.898000,461.387500 142.675999,461.387500 143.454001,461.387500 144.232000,461.387500 145.009999,461.387500 145.788001,461.387500 146.566000,461.387500 147.343999,461.387500 148.122001,461.387500 148.900000,461.387500 148.900000,529.204167 148.900000,529.204167 148.900000,529.204167 149.677999,529.204167 150.455999,529.204167 151.233998,529.204167 152.012002,529.204167 152.790001,529.204167 153.568000,529.204167 154.345999,529.204167 155.123999,529.204167 155.901998,529.204167 156.680002,529.204167 157.458001,529.204167 158.236000,529.204167 159.014000,529.204167 159.791999,529.204167 160.569998,529.204167 161.348002,529.204167 162.126001,529.204167 162.904001,529.204167 163.682000,529.204167 164.459999,529.204167 165.237998,529.204167 166.016002,529.204167 166.794001,529.204167 167.572001,529.204167 168.350000,529.204167 169.127999,529.204167 169.905999,529.204167 170.683998,529.204167 171.462002,529.204167 172.240001,529.204167 173.018000,529.204167 173.795999,529.204167 174.573999,529.204167 175.351998,529.204167 176.130002,529.204167 176.908001,529.204167 177.686000,529.204167 178.464000,529.204167 179.241999,529.204167 180.019998,529.204167 180.798002,529.204167 181.576001,529.204167 182.354001,529.204167 183.132000,529.204167 183.909999,529.204167 184.687998,529.204167 185.466002,529.204167 186.244001,529.204167 187.022001,529.204167 187.800000,529.204167 187.800000,461.387500 187.800000,461.387500 188.577999,461.387500 189.355999,461.387500 190.133998,461.387500 190.911997,461.387500 191.689996,461.387500 192.467996,461.387500 193.246004,461.387500 194.024003,461.387500 194.802003,461.387500 195.580002,461.387500 196.358001,461.387500 197.136000,461.387500 197.914000,461.387500 198.691999,461.387500 199.469998,461.387500 200.247997,461.387500 201.025997,461.387500 201.803996,461.387500 202.582004,461.387500 203.360004,461.387500 204.138003,461.387500 204.916002,461.387500 205.694001,461.387500 206.472001,461.387500 207.250000,461.387500 208.027999,461.387500 208.805999,461.387500 209.583998,461.387500 210.361997,461.387500 211.139996,461.387500 211.917996,461.387500 212.696004,461.387500 213.474003,461.387500 214.252003,461.387500 215.030002,461.387500 215.808001,461.387500 216.586000,461.387500 217.364000,461.387500 218.141999,461.387500 218.919998,461.387500 219.697997,461.387500 220.475997,461.387500 221.253996,461.387500 222.032004,461.387500 222.810004,461.387500 223.588003,461.387500 224.366002,461.387500 225.144001,461.387500 225.922001,461.387500 226.700000,461.387500 226.700000,529.204167 226.700000,529.204167 227.477999,529.204167 228.255999,529.204167 229.033998,529.204167 229.811997,529.204167 230.589996,529.204167 231.367996,529.204167 232.146004,529.204167 232.924003,529.204167 233.702003,529.204167 234.480002,529.204167 235.258001,529.204167 236.036000,529.204167 236.814000,529.204167 237.591999,529.204167 238.369998,529.204167 239.147997,529.204167 239.925997,529.204167 240.703996,529.204167 241.482004,529.204167 242.260004,529.204167 243.038003,529.204167 243.816002,529.204167 244.594001,529.204167 245.372001,529.204167 246.150000,529.204167 246.927999,529.204167 247.705999,529.204167 248.483998,529.204167 249.261997,529.204167 250.039996,529.204167 250.817996,529.204167 251.596004,529.204167 252.374003,529.204167 253.152003,529.204167 253.930002,529.204167 254.708001,529.204167 255.486000,529.204167 256.264000,529.204167 257.041999,529.204167 257.819998,529.204167 258.597997,529.204167 259.375997,529.204167 260.153996,529.204167 260.932004,529.204167 261.710004,529.204167 262.488003,529.204167 263.266002,529.204167 264.044001,529.204167 264.822001,529.204167 265.600000,529.204167 265.600000,461.387500 265.600000,461.387500 266.377999,461.387500 267.155999,461.387500 267.933998,461.387500 268.711997,461.387500 269.489996,461.387500 270.267996,461.387500 271.045995,461.387500 271.823994,461.387500 272.601993,461.387500 273.379993,461.387500 274.157992,461.387500 274.935991,461.387500 275.714009,461.387500 276.492008,461.387500 277.270007,461.387500 278.048007,461.387500 278.826006,461.387500 279.604005,461.387500 280.382004,461.387500 281.160004,461.387500 281.938003,461.387500 282.716002,461.387500 283.494001,461.387500 284.272001,461.387500 285.050000,461.387500 285.827999,461.387500 286.605999,461.387500 287.383998,461.387500 288.161997,461.387500 288.939996,461.387500 289.717996,461.387500 290.495995,461.387500 291.273994,461.387500 292.051993,461.387500 292.829993,461.387500 293.607992,461.387500 294.385991,461.387500 295.164009,461.387500 295.942008,461.387500 296.720007,461.387500 297.498007,461.387500 298.276006,461.387500 299.054005,461.387500 299.832004,461.387500 300.610004,461.387500 301.388003,461.387500 302.166002,461.387500 302.944001,461.387500 303.722001,461.387500 304.500000,461.387500 304.500000,529.204167 305.277999,529.204167 306.055999,529.204167 306.833998,529.204167 307.611997,529.204167 308.389996,529.204167 309.167996,529.204167 309.945995,529.204167 310.723994,529.204167 311.501993,529.204167 312.279993,529.204167 313.057992,529.204167 313.835991,529.204167 314.614009,529.204167 315.392008,529.204167 316.170007,529.204167 316.948007,529.204167 317.726006,529.204167 318.504005,529.204167 319.282004,529.204167 320.060004,529.204167 320.838003,529.204167 321.616002,529.204167 322.394001,529.204167 323.172001,529.204167 323.950000,529.204167 324.727999,529.204167 325.505999,529.204167 326.283998,529.204167 327.061997,529.204167 327.839996,529.204167 328.617996,529.204167 329.395995,529.204167 330.173994,529.204167 330.951993,529.204167 331.729993,529.204167 332.507992,529.204167 333.285991,529.204167 334.064009,529.204167 334.842008,529.204167 335.620007,529.204167 336.398007,529.204167 337.176006,529.204167 337.954005,529.204167 338.732004,529.204167 339.510004,529.204167 340.288003,529.204167 341.066002,529.204167 341.844001,529.204167 342.622001,529.204167 343.400000,529.204167 343.400000,461.387500 344.177999,461.387500 344.955999,461.387500 345.733998,461.387500 346.511997,461.387500 347.289996,461.387500 348.067996,461.387500 348.845995,461.387500 349.623994,461.387500 350.401993,461.387500 351.179993,461.387500 351.957992,461.387500 352.735991,461.387500 353.514009,461.387500 354.292008,461.387500 355.070007,461.387500 355.848007,461.387500 356.626006,461.387500 357.404005,461.387500 358.182004,461.387500 358.960004,461.387500 359.738003,461.387500 360.516002,461.387500 361.294001,461.387500 362.072001,461.387500 362.850000,461.387500 363.627999,461.387500 364.405999,461.387500 365.183998,461.387500 365.961997,461.387500 366.739996,461.387500 367.517996,461.387500 368.295995,461.387500 369.073994,461.387500 369.851993,461.387500 370.629993,461.387500 371.407992,461.387500 372.185991,461.387500 372.964009,461.387500 373.742008,461.387500 374.520007,461.387500 375.298007,461.387500 376.076006,461.387500 376.854005,461.387500 377.632004,461.387500 378.410004,461.387500 379.188003,461.387500 379.966002,461.387500 380.744001,461.387500 381.522001,461.387500 382.300000,461.387500 382.300000,529.204167 383.077999,529.204167 383.855999,529.204167 384.633998,529.204167 385.411997,529.204167 386.189996,529.204167 386.967996,529.204167 387.745995,529.204167 388.523994,529.204167 389.301993,529.204167 390.079993,529.204167 390.857992,529.204167 391.635991,529.204167 392.414009,529.204167 393.192008,529.204167 393.970007,529.204167 394.748007,529.204167 395.526006,529.204167 396.304005,529.204167 397.082004,529.204167 397.860004,529.204167 398.638003,529.204167 399.416002,529.204167 400.194001,529.204167 400.972001,529.204167 401.750000,529.204167 402.527999,529.204167 403.305999,529.204167 404.083998,529.204167 404.861997,529.204167 405.639996,529.204167 406.417996,529.204167 407.195995,529.204167 407.973994,529.204167 408.751993,529.204167 409.529993,529.204167 410.307992,529.204167 411.085991,529.204167 411.864009,529.204167 412.642008,529.204167 413.420007,529.204167 414.198007,529.204167 414.976006,529.204167 415.754005,529.204167 416.532004,529.204167 417.310004,529.204167 418.088003,529.204167 418.866002,529.204167 419.644001,529.204167 420.422001,529.204167 421.200000,529.204167 421.200000,461.387500 421.978018,461.387500 422.755999,461.387500 423.534016,461.387500 424.311997,461.387500 425.090015,461.387500 425.867996,461.387500 426.646013,461.387500 427.423994,461.387500 428.202012,461.387500 428.979993,461.387500 429.758010,461.387500 430.535991,461.387500 431.314009,461.387500 432.091990,461.387500 432.870007,461.387500 433.647988,461.387500 434.426006,461.387500 435.203987,461.387500 435.982004,461.387500 436.759985,461.387500 437.538003,461.387500 438.315984,461.387500 439.094001,461.387500 439.871982,461.387500 440.650000,461.387500 441.428018,461.387500 442.205999,461.387500 442.984016,461.387500 443.761997,461.387500 444.540015,461.387500 445.317996,461.387500 446.096013,461.387500 446.873994,461.387500 447.652012,461.387500 448.429993,461.387500 449.208010,461.387500 449.985991,461.387500 450.764009,461.387500 451.541990,461.387500 452.320007,461.387500 453.097988,461.387500 453.876006,461.387500 454.653987,461.387500 455.432004,461.387500 456.209985,461.387500 456.988003,461.387500 457.765984,461.387500 458.544001,461.387500 459.321982,461.387500 460.100000,461.387500 460.100000,529.204167 460.878018,529.204167 461.655999,529.204167 462.434016,529.204167 463.211997,529.204167 463.990015,529.204167 464.767996,529.204167 465.546013,529.204167 466.323994,529.204167 467.102012,529.204167 467.879993,529.204167 468.658010,529.204167 469.435991,529.204167 470.214009,529.204167 470.991990,529.204167 471.770007,529.204167 472.547988,529.204167 473.326006,529.204167 474.103987,529.204167 474.882004,529.204167 475.659985,529.204167 476.438003,529.204167 477.215984,529.204167 477.994001,529.204167 478.771982,529.204167 479.550000,529.204167 480.328018,529.204167 481.105999,529.204167 481.884016,529.204167 482.661997,529.204167 483.440015,529.204167 484.217996,529.204167 484.996013,529.204167 485.773994,529.204167 486.552012,529.204167 487.329993,529.204167 488.108010,529.204167 488.885991,529.204167 489.664009,529.204167 490.441990,529.204167 491.220007,529.204167 491.997988,529.204167 492.776006,529.204167 493.553987,529.204167 494.332004,529.204167 495.109985,529.204167 495.888003,529.204167 496.665984,529.204167 497.444001,529.204167 498.221982,529.204167 499.000000,529.204167 499.000000,461.387500"
-     id="polyline168-0" />
-  <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-4)"
-     points="110.000000,624.408333 110.778000,624.408333 111.556000,624.408333 112.334000,624.408333 113.112000,624.408333 113.890000,624.408333 114.668000,624.408333 115.446000,624.408333 116.224000,624.408333 117.002000,624.408333 117.780000,624.408333 118.558000,624.408333 119.336000,624.408333 120.114000,624.408333 120.892000,624.408333 121.670000,624.408333 122.448000,624.408333 123.226000,624.408333 124.004001,624.408333 124.782000,624.408333 125.560000,624.408333 126.337999,624.408333 127.116000,624.408333 127.894000,624.408333 128.672000,624.408333 129.450000,624.408333 130.227999,624.408333 131.006001,624.408333 131.784000,624.408333 132.561999,624.408333 133.340001,624.408333 134.118000,624.408333 134.895999,624.408333 135.674001,624.408333 136.452000,624.408333 137.230000,624.408333 138.008001,624.408333 138.786000,624.408333 139.564000,624.408333 140.341999,624.408333 141.120000,624.408333 141.898000,624.408333 142.675999,624.408333 143.454001,624.408333 144.232000,624.408333 145.009999,624.408333 145.788001,624.408333 146.566000,624.408333 147.343999,624.408333 148.122001,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 149.677999,624.408333 150.455999,624.408333 151.233998,624.408333 152.012002,624.408333 152.790001,624.408333 153.568000,624.408333 154.345999,624.408333 155.123999,624.408333 155.901998,624.408333 156.680002,624.408333 157.458001,624.408333 158.236000,624.408333 159.014000,624.408333 159.791999,624.408333 160.569998,624.408333 161.348002,624.408333 162.126001,624.408333 162.904001,624.408333 163.682000,624.408333 164.459999,624.408333 165.237998,624.408333 166.016002,624.408333 166.794001,624.408333 167.572001,624.408333 168.350000,624.408333 169.127999,624.408333 169.905999,624.408333 170.683998,624.408333 171.462002,624.408333 172.240001,624.408333 173.018000,624.408333 173.795999,624.408333 174.573999,624.408333 175.351998,624.408333 176.130002,624.408333 176.908001,624.408333 177.686000,624.408333 178.464000,624.408333 179.241999,624.408333 180.019998,624.408333 180.798002,624.408333 181.576001,624.408333 182.354001,624.408333 183.132000,624.408333 183.909999,624.408333 184.687998,624.408333 185.466002,624.408333 186.244001,624.408333 187.022001,624.408333 187.800000,624.408333 187.800000,624.408333 187.800000,624.408333 188.577999,624.408333 189.355999,624.408333 190.133998,624.408333 190.911997,624.408333 191.689996,624.408333 192.467996,624.408333 193.246004,624.408333 194.024003,624.408333 194.802003,624.408333 195.580002,624.408333 196.358001,624.408333 197.136000,624.408333 197.914000,624.408333 198.691999,624.408333 199.469998,624.408333 200.247997,624.408333 201.025997,624.408333 201.803996,624.408333 202.582004,624.408333 203.360004,624.408333 204.138003,624.408333 204.916002,624.408333 205.694001,624.408333 206.472001,624.408333 207.250000,624.408333 208.027999,624.408333 208.805999,624.408333 209.583998,624.408333 210.361997,624.408333 211.139996,624.408333 211.917996,624.408333 212.696004,624.408333 213.474003,624.408333 214.252003,624.408333 215.030002,624.408333 215.808001,624.408333 216.586000,624.408333 217.364000,624.408333 218.141999,624.408333 218.919998,624.408333 219.697997,624.408333 220.475997,624.408333 221.253996,624.408333 222.032004,624.408333 222.810004,624.408333 223.588003,624.408333 224.366002,624.408333 225.144001,624.408333 225.922001,624.408333 226.700000,624.408333 226.700000,556.591667 226.700000,556.591667 227.477999,556.591667 228.255999,556.591667 229.033998,556.591667 229.811997,556.591667 230.589996,556.591667 231.367996,556.591667 232.146004,556.591667 232.924003,556.591667 233.702003,556.591667 234.480002,556.591667 235.258001,556.591667 236.036000,556.591667 236.814000,556.591667 237.591999,556.591667 238.369998,556.591667 239.147997,556.591667 239.925997,556.591667 240.703996,556.591667 241.482004,556.591667 242.260004,556.591667 243.038003,556.591667 243.816002,556.591667 244.594001,556.591667 245.372001,556.591667 246.150000,556.591667 246.927999,556.591667 247.705999,556.591667 248.483998,556.591667 249.261997,556.591667 250.039996,556.591667 250.817996,556.591667 251.596004,556.591667 252.374003,556.591667 253.152003,556.591667 253.930002,556.591667 254.708001,556.591667 255.486000,556.591667 256.264000,556.591667 257.041999,556.591667 257.819998,556.591667 258.597997,556.591667 259.375997,556.591667 260.153996,556.591667 260.932004,556.591667 261.710004,556.591667 262.488003,556.591667 263.266002,556.591667 264.044001,556.591667 264.822001,556.591667 265.600000,556.591667 265.600000,556.591667 265.600000,556.591667 266.377999,556.591667 267.155999,556.591667 267.933998,556.591667 268.711997,556.591667 269.489996,556.591667 270.267996,556.591667 271.045995,556.591667 271.823994,556.591667 272.601993,556.591667 273.379993,556.591667 274.157992,556.591667 274.935991,556.591667 275.714009,556.591667 276.492008,556.591667 277.270007,556.591667 278.048007,556.591667 278.826006,556.591667 279.604005,556.591667 280.382004,556.591667 281.160004,556.591667 281.938003,556.591667 282.716002,556.591667 283.494001,556.591667 284.272001,556.591667 285.050000,556.591667 285.827999,556.591667 286.605999,556.591667 287.383998,556.591667 288.161997,556.591667 288.939996,556.591667 289.717996,556.591667 290.495995,556.591667 291.273994,556.591667 292.051993,556.591667 292.829993,556.591667 293.607992,556.591667 294.385991,556.591667 295.164009,556.591667 295.942008,556.591667 296.720007,556.591667 297.498007,556.591667 298.276006,556.591667 299.054005,556.591667 299.832004,556.591667 300.610004,556.591667 301.388003,556.591667 302.166002,556.591667 302.944001,556.591667 303.722001,556.591667 304.500000,556.591667 304.500000,556.591667 305.277999,556.591667 306.055999,556.591667 306.833998,556.591667 307.611997,556.591667 308.389996,556.591667 309.167996,556.591667 309.945995,556.591667 310.723994,556.591667 311.501993,556.591667 312.279993,556.591667 313.057992,556.591667 313.835991,556.591667 314.614009,556.591667 315.392008,556.591667 316.170007,556.591667 316.948007,556.591667 317.726006,556.591667 318.504005,556.591667 319.282004,556.591667 320.060004,556.591667 320.838003,556.591667 321.616002,556.591667 322.394001,556.591667 323.172001,556.591667 323.950000,556.591667 324.727999,556.591667 325.505999,556.591667 326.283998,556.591667 327.061997,556.591667 327.839996,556.591667 328.617996,556.591667 329.395995,556.591667 330.173994,556.591667 330.951993,556.591667 331.729993,556.591667 332.507992,556.591667 333.285991,556.591667 334.064009,556.591667 334.842008,556.591667 335.620007,556.591667 336.398007,556.591667 337.176006,556.591667 337.954005,556.591667 338.732004,556.591667 339.510004,556.591667 340.288003,556.591667 341.066002,556.591667 341.844001,556.591667 342.622001,556.591667 343.400000,556.591667 343.400000,624.408333 344.177999,624.408333 344.955999,624.408333 345.733998,624.408333 346.511997,624.408333 347.289996,624.408333 348.067996,624.408333 348.845995,624.408333 349.623994,624.408333 350.401993,624.408333 351.179993,624.408333 351.957992,624.408333 352.735991,624.408333 353.514009,624.408333 354.292008,624.408333 355.070007,624.408333 355.848007,624.408333 356.626006,624.408333 357.404005,624.408333 358.182004,624.408333 358.960004,624.408333 359.738003,624.408333 360.516002,624.408333 361.294001,624.408333 362.072001,624.408333 362.850000,624.408333 363.627999,624.408333 364.405999,624.408333 365.183998,624.408333 365.961997,624.408333 366.739996,624.408333 367.517996,624.408333 368.295995,624.408333 369.073994,624.408333 369.851993,624.408333 370.629993,624.408333 371.407992,624.408333 372.185991,624.408333 372.964009,624.408333 373.742008,624.408333 374.520007,624.408333 375.298007,624.408333 376.076006,624.408333 376.854005,624.408333 377.632004,624.408333 378.410004,624.408333 379.188003,624.408333 379.966002,624.408333 380.744001,624.408333 381.522001,624.408333 382.300000,624.408333 382.300000,624.408333 383.077999,624.408333 383.855999,624.408333 384.633998,624.408333 385.411997,624.408333 386.189996,624.408333 386.967996,624.408333 387.745995,624.408333 388.523994,624.408333 389.301993,624.408333 390.079993,624.408333 390.857992,624.408333 391.635991,624.408333 392.414009,624.408333 393.192008,624.408333 393.970007,624.408333 394.748007,624.408333 395.526006,624.408333 396.304005,624.408333 397.082004,624.408333 397.860004,624.408333 398.638003,624.408333 399.416002,624.408333 400.194001,624.408333 400.972001,624.408333 401.750000,624.408333 402.527999,624.408333 403.305999,624.408333 404.083998,624.408333 404.861997,624.408333 405.639996,624.408333 406.417996,624.408333 407.195995,624.408333 407.973994,624.408333 408.751993,624.408333 409.529993,624.408333 410.307992,624.408333 411.085991,624.408333 411.864009,624.408333 412.642008,624.408333 413.420007,624.408333 414.198007,624.408333 414.976006,624.408333 415.754005,624.408333 416.532004,624.408333 417.310004,624.408333 418.088003,624.408333 418.866002,624.408333 419.644001,624.408333 420.422001,624.408333 421.200000,624.408333 421.200000,624.408333 421.978018,624.408333 422.755999,624.408333 423.534016,624.408333 424.311997,624.408333 425.090015,624.408333 425.867996,624.408333 426.646013,624.408333 427.423994,624.408333 428.202012,624.408333 428.979993,624.408333 429.758010,624.408333 430.535991,624.408333 431.314009,624.408333 432.091990,624.408333 432.870007,624.408333 433.647988,624.408333 434.426006,624.408333 435.203987,624.408333 435.982004,624.408333 436.759985,624.408333 437.538003,624.408333 438.315984,624.408333 439.094001,624.408333 439.871982,624.408333 440.650000,624.408333 441.428018,624.408333 442.205999,624.408333 442.984016,624.408333 443.761997,624.408333 444.540015,624.408333 445.317996,624.408333 446.096013,624.408333 446.873994,624.408333 447.652012,624.408333 448.429993,624.408333 449.208010,624.408333 449.985991,624.408333 450.764009,624.408333 451.541990,624.408333 452.320007,624.408333 453.097988,624.408333 453.876006,624.408333 454.653987,624.408333 455.432004,624.408333 456.209985,624.408333 456.988003,624.408333 457.765984,624.408333 458.544001,624.408333 459.321982,624.408333 460.100000,624.408333 460.100000,556.591667 460.878018,556.591667 461.655999,556.591667 462.434016,556.591667 463.211997,556.591667 463.990015,556.591667 464.767996,556.591667 465.546013,556.591667 466.323994,556.591667 467.102012,556.591667 467.879993,556.591667 468.658010,556.591667 469.435991,556.591667 470.214009,556.591667 470.991990,556.591667 471.770007,556.591667 472.547988,556.591667 473.326006,556.591667 474.103987,556.591667 474.882004,556.591667 475.659985,556.591667 476.438003,556.591667 477.215984,556.591667 477.994001,556.591667 478.771982,556.591667 479.550000,556.591667 480.328018,556.591667 481.105999,556.591667 481.884016,556.591667 482.661997,556.591667 483.440015,556.591667 484.217996,556.591667 484.996013,556.591667 485.773994,556.591667 486.552012,556.591667 487.329993,556.591667 488.108010,556.591667 488.885991,556.591667 489.664009,556.591667 490.441990,556.591667 491.220007,556.591667 491.997988,556.591667 492.776006,556.591667 493.553987,556.591667 494.332004,556.591667 495.109985,556.591667 495.888003,556.591667 496.665984,556.591667 497.444001,556.591667 498.221982,556.591667 499.000000,556.591667 499.000000,556.591667"
-     id="polyline170-8" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="598.18066"
+     y="740.04669"
+     width="360"
+     height="68"
+     id="rect2363" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 470.000000,746.000000"
+     id="polyline2365"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,433.000000"
+     id="polyline2367"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 110.000000,433.000000"
+     id="polyline2369"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline2371"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,754.000000"
+     id="polyline2373"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,746.000000 182.000000,754.000000"
+     id="polyline2375"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,754.000000"
+     id="polyline2377"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,746.000000 326.000000,754.000000"
+     id="polyline2379"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,754.000000"
+     id="polyline2381"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,754.000000"
+     id="polyline2383"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,758.800000"
+     id="polyline2385"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="598.18066"
+     y="866.84271"
+     id="text2387">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,758.800000"
+     id="polyline2389"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="742.18066"
+     y="866.84271"
+     id="text2391">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,758.800000"
+     id="polyline2393"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="886.18066"
+     y="866.84271"
+     id="text2395">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,528.204167 110.000000,528.204167"
+     id="polyline2397"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="617.54669"
+     id="text2399">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,460.387500 110.000000,460.387500"
+     id="polyline2401"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="549.72961"
+     id="text2403">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,623.408333 110.000000,623.408333"
+     id="polyline2405"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="712.75073"
+     id="text2407">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,555.591667 110.000000,555.591667"
+     id="polyline2409"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="644.93463"
+     id="text2411">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,718.612500 110.000000,718.612500"
+     id="polyline2413"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="807.95471"
+     id="text2415">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,650.795833 110.000000,650.795833"
+     id="polyline2417"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="582.18066"
+     y="740.13873"
+     id="text2419">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-92)"
+     points="110.000000,528.204167 110.720000,528.204167 111.440000,528.204167 112.160000,528.204167 112.880000,528.204167 113.600000,528.204167 114.320000,528.204167 115.040000,528.204167 115.760000,528.204167 116.480000,528.204167 117.200000,528.204167 117.920000,528.204167 118.640000,528.204167 119.360000,528.204167 120.080000,528.204167 120.800000,528.204167 121.520000,528.204167 122.240000,528.204167 122.960001,528.204167 123.680000,528.204167 124.400000,528.204167 125.120000,528.204167 125.840000,528.204167 126.560000,528.204167 127.280000,528.204167 128.000000,528.204167 128.719999,528.204167 129.440001,528.204167 130.160000,528.204167 130.879999,528.204167 131.600001,528.204167 132.320000,528.204167 133.039999,528.204167 133.760001,528.204167 134.480000,528.204167 135.200000,528.204167 135.920001,528.204167 136.640000,528.204167 137.360000,528.204167 138.079999,528.204167 138.800000,528.204167 139.520000,528.204167 140.239999,528.204167 140.960001,528.204167 141.680000,528.204167 142.399999,528.204167 143.120001,528.204167 143.840000,528.204167 144.559999,528.204167 145.280001,528.204167 146.000000,528.204167 146.000000,460.387500 146.000000,460.387500 146.719999,460.387500 147.439999,460.387500 148.159998,460.387500 148.880002,460.387500 149.600001,460.387500 150.320000,460.387500 151.039999,460.387500 151.759999,460.387500 152.479998,460.387500 153.200002,460.387500 153.920001,460.387500 154.640000,460.387500 155.360000,460.387500 156.079999,460.387500 156.799998,460.387500 157.520002,460.387500 158.240001,460.387500 158.960001,460.387500 159.680000,460.387500 160.399999,460.387500 161.119998,460.387500 161.840002,460.387500 162.560001,460.387500 163.280001,460.387500 164.000000,460.387500 164.719999,460.387500 165.439999,460.387500 166.159998,460.387500 166.880002,460.387500 167.600001,460.387500 168.320000,460.387500 169.039999,460.387500 169.759999,460.387500 170.479998,460.387500 171.200002,460.387500 171.920001,460.387500 172.640000,460.387500 173.360000,460.387500 174.079999,460.387500 174.799998,460.387500 175.520002,460.387500 176.240001,460.387500 176.960001,460.387500 177.680000,460.387500 178.399999,460.387500 179.119998,460.387500 179.840002,460.387500 180.560001,460.387500 181.280001,460.387500 182.000000,460.387500 182.000000,528.204167 182.000000,528.204167 182.719999,528.204167 183.439999,528.204167 184.159998,528.204167 184.879997,528.204167 185.599997,528.204167 186.319996,528.204167 187.040004,528.204167 187.760003,528.204167 188.480002,528.204167 189.200002,528.204167 189.920001,528.204167 190.640000,528.204167 191.360000,528.204167 192.079999,528.204167 192.799998,528.204167 193.519998,528.204167 194.239997,528.204167 194.959996,528.204167 195.680004,528.204167 196.400003,528.204167 197.120003,528.204167 197.840002,528.204167 198.560001,528.204167 199.280001,528.204167 200.000000,528.204167 200.719999,528.204167 201.439999,528.204167 202.159998,528.204167 202.879997,528.204167 203.599997,528.204167 204.319996,528.204167 205.040004,528.204167 205.760003,528.204167 206.480002,528.204167 207.200002,528.204167 207.920001,528.204167 208.640000,528.204167 209.360000,528.204167 210.079999,528.204167 210.799998,528.204167 211.519998,528.204167 212.239997,528.204167 212.959996,528.204167 213.680004,528.204167 214.400003,528.204167 215.120003,528.204167 215.840002,528.204167 216.560001,528.204167 217.280001,528.204167 218.000000,528.204167 218.000000,460.387500 218.000000,460.387500 218.719999,460.387500 219.439999,460.387500 220.159998,460.387500 220.879997,460.387500 221.599997,460.387500 222.319996,460.387500 223.040004,460.387500 223.760003,460.387500 224.480002,460.387500 225.200002,460.387500 225.920001,460.387500 226.640000,460.387500 227.360000,460.387500 228.079999,460.387500 228.799998,460.387500 229.519998,460.387500 230.239997,460.387500 230.959996,460.387500 231.680004,460.387500 232.400003,460.387500 233.120003,460.387500 233.840002,460.387500 234.560001,460.387500 235.280001,460.387500 236.000000,460.387500 236.719999,460.387500 237.439999,460.387500 238.159998,460.387500 238.879997,460.387500 239.599997,460.387500 240.319996,460.387500 241.040004,460.387500 241.760003,460.387500 242.480002,460.387500 243.200002,460.387500 243.920001,460.387500 244.640000,460.387500 245.360000,460.387500 246.079999,460.387500 246.799998,460.387500 247.519998,460.387500 248.239997,460.387500 248.959996,460.387500 249.680004,460.387500 250.400003,460.387500 251.120003,460.387500 251.840002,460.387500 252.560001,460.387500 253.280001,460.387500 254.000000,460.387500 254.000000,528.204167 254.000000,528.204167 254.719999,528.204167 255.439999,528.204167 256.159998,528.204167 256.879997,528.204167 257.599997,528.204167 258.319996,528.204167 259.039995,528.204167 259.759995,528.204167 260.479994,528.204167 261.199993,528.204167 261.919992,528.204167 262.639992,528.204167 263.360008,528.204167 264.080008,528.204167 264.800007,528.204167 265.520006,528.204167 266.240005,528.204167 266.960005,528.204167 267.680004,528.204167 268.400003,528.204167 269.120003,528.204167 269.840002,528.204167 270.560001,528.204167 271.280001,528.204167 272.000000,528.204167 272.719999,528.204167 273.439999,528.204167 274.159998,528.204167 274.879997,528.204167 275.599997,528.204167 276.319996,528.204167 277.039995,528.204167 277.759995,528.204167 278.479994,528.204167 279.199993,528.204167 279.919992,528.204167 280.639992,528.204167 281.360008,528.204167 282.080008,528.204167 282.800007,528.204167 283.520006,528.204167 284.240005,528.204167 284.960005,528.204167 285.680004,528.204167 286.400003,528.204167 287.120003,528.204167 287.840002,528.204167 288.560001,528.204167 289.280001,528.204167 290.000000,528.204167 290.000000,460.387500 290.719999,460.387500 291.439999,460.387500 292.159998,460.387500 292.879997,460.387500 293.599997,460.387500 294.319996,460.387500 295.039995,460.387500 295.759995,460.387500 296.479994,460.387500 297.199993,460.387500 297.919992,460.387500 298.639992,460.387500 299.360008,460.387500 300.080008,460.387500 300.800007,460.387500 301.520006,460.387500 302.240005,460.387500 302.960005,460.387500 303.680004,460.387500 304.400003,460.387500 305.120003,460.387500 305.840002,460.387500 306.560001,460.387500 307.280001,460.387500 308.000000,460.387500 308.719999,460.387500 309.439999,460.387500 310.159998,460.387500 310.879997,460.387500 311.599997,460.387500 312.319996,460.387500 313.039995,460.387500 313.759995,460.387500 314.479994,460.387500 315.199993,460.387500 315.919992,460.387500 316.639992,460.387500 317.360008,460.387500 318.080008,460.387500 318.800007,460.387500 319.520006,460.387500 320.240005,460.387500 320.960005,460.387500 321.680004,460.387500 322.400003,460.387500 323.120003,460.387500 323.840002,460.387500 324.560001,460.387500 325.280001,460.387500 326.000000,460.387500 326.000000,528.204167 326.719999,528.204167 327.439999,528.204167 328.159998,528.204167 328.879997,528.204167 329.599997,528.204167 330.319996,528.204167 331.039995,528.204167 331.759995,528.204167 332.479994,528.204167 333.199993,528.204167 333.919992,528.204167 334.639992,528.204167 335.360008,528.204167 336.080008,528.204167 336.800007,528.204167 337.520006,528.204167 338.240005,528.204167 338.960005,528.204167 339.680004,528.204167 340.400003,528.204167 341.120003,528.204167 341.840002,528.204167 342.560001,528.204167 343.280001,528.204167 344.000000,528.204167 344.719999,528.204167 345.439999,528.204167 346.159998,528.204167 346.879997,528.204167 347.599997,528.204167 348.319996,528.204167 349.039995,528.204167 349.759995,528.204167 350.479994,528.204167 351.199993,528.204167 351.919992,528.204167 352.639992,528.204167 353.360008,528.204167 354.080008,528.204167 354.800007,528.204167 355.520006,528.204167 356.240005,528.204167 356.960005,528.204167 357.680004,528.204167 358.400003,528.204167 359.120003,528.204167 359.840002,528.204167 360.560001,528.204167 361.280001,528.204167 362.000000,528.204167 362.000000,460.387500 362.719999,460.387500 363.439999,460.387500 364.159998,460.387500 364.879997,460.387500 365.599997,460.387500 366.319996,460.387500 367.039995,460.387500 367.759995,460.387500 368.479994,460.387500 369.199993,460.387500 369.919992,460.387500 370.639992,460.387500 371.360008,460.387500 372.080008,460.387500 372.800007,460.387500 373.520006,460.387500 374.240005,460.387500 374.960005,460.387500 375.680004,460.387500 376.400003,460.387500 377.120003,460.387500 377.840002,460.387500 378.560001,460.387500 379.280001,460.387500 380.000000,460.387500 380.719999,460.387500 381.439999,460.387500 382.159998,460.387500 382.879997,460.387500 383.599997,460.387500 384.319996,460.387500 385.039995,460.387500 385.759995,460.387500 386.479994,460.387500 387.199993,460.387500 387.919992,460.387500 388.639992,460.387500 389.360008,460.387500 390.080008,460.387500 390.800007,460.387500 391.520006,460.387500 392.240005,460.387500 392.960005,460.387500 393.680004,460.387500 394.400003,460.387500 395.120003,460.387500 395.840002,460.387500 396.560001,460.387500 397.280001,460.387500 398.000000,460.387500 398.000000,528.204167 398.720016,528.204167 399.439999,528.204167 400.160015,528.204167 400.879997,528.204167 401.600014,528.204167 402.319996,528.204167 403.040012,528.204167 403.759995,528.204167 404.480011,528.204167 405.199993,528.204167 405.920010,528.204167 406.639992,528.204167 407.360008,528.204167 408.079990,528.204167 408.800007,528.204167 409.519989,528.204167 410.240005,528.204167 410.959988,528.204167 411.680004,528.204167 412.399986,528.204167 413.120003,528.204167 413.839985,528.204167 414.560001,528.204167 415.279984,528.204167 416.000000,528.204167 416.720016,528.204167 417.439999,528.204167 418.160015,528.204167 418.879997,528.204167 419.600014,528.204167 420.319996,528.204167 421.040012,528.204167 421.759995,528.204167 422.480011,528.204167 423.199993,528.204167 423.920010,528.204167 424.639992,528.204167 425.360008,528.204167 426.079990,528.204167 426.800007,528.204167 427.519989,528.204167 428.240005,528.204167 428.959988,528.204167 429.680004,528.204167 430.399986,528.204167 431.120003,528.204167 431.839985,528.204167 432.560001,528.204167 433.279984,528.204167 434.000000,528.204167 434.000000,460.387500 434.720016,460.387500 435.439999,460.387500 436.160015,460.387500 436.879997,460.387500 437.600014,460.387500 438.319996,460.387500 439.040012,460.387500 439.759995,460.387500 440.480011,460.387500 441.199993,460.387500 441.920010,460.387500 442.639992,460.387500 443.360008,460.387500 444.079990,460.387500 444.800007,460.387500 445.519989,460.387500 446.240005,460.387500 446.959988,460.387500 447.680004,460.387500 448.399986,460.387500 449.120003,460.387500 449.839985,460.387500 450.560001,460.387500 451.279984,460.387500 452.000000,460.387500 452.720016,460.387500 453.439999,460.387500 454.160015,460.387500 454.879997,460.387500 455.600014,460.387500 456.319996,460.387500 457.040012,460.387500 457.759995,460.387500 458.480011,460.387500 459.199993,460.387500 459.920010,460.387500 460.639992,460.387500 461.360008,460.387500 462.079990,460.387500 462.800007,460.387500 463.519989,460.387500 464.240005,460.387500 464.959988,460.387500 465.680004,460.387500 466.399986,460.387500 467.120003,460.387500 467.839985,460.387500 468.560001,460.387500 469.279984,460.387500 470.000000,460.387500 470.000000,528.204167"
+     id="polyline2424"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-92)"
+     points="110.000000,555.591667 110.720000,555.591667 111.440000,555.591667 112.160000,555.591667 112.880000,555.591667 113.600000,555.591667 114.320000,555.591667 115.040000,555.591667 115.760000,555.591667 116.480000,555.591667 117.200000,555.591667 117.920000,555.591667 118.640000,555.591667 119.360000,555.591667 120.080000,555.591667 120.800000,555.591667 121.520000,555.591667 122.240000,555.591667 122.960001,555.591667 123.680000,555.591667 124.400000,555.591667 125.120000,555.591667 125.840000,555.591667 126.560000,555.591667 127.280000,555.591667 128.000000,555.591667 128.719999,555.591667 129.440001,555.591667 130.160000,555.591667 130.879999,555.591667 131.600001,555.591667 132.320000,555.591667 133.039999,555.591667 133.760001,555.591667 134.480000,555.591667 135.200000,555.591667 135.920001,555.591667 136.640000,555.591667 137.360000,555.591667 138.079999,555.591667 138.800000,555.591667 139.520000,555.591667 140.239999,555.591667 140.960001,555.591667 141.680000,555.591667 142.399999,555.591667 143.120001,555.591667 143.840000,555.591667 144.559999,555.591667 145.280001,555.591667 146.000000,555.591667 146.000000,555.591667 146.000000,555.591667 146.719999,555.591667 147.439999,555.591667 148.159998,555.591667 148.880002,555.591667 149.600001,555.591667 150.320000,555.591667 151.039999,555.591667 151.759999,555.591667 152.479998,555.591667 153.200002,555.591667 153.920001,555.591667 154.640000,555.591667 155.360000,555.591667 156.079999,555.591667 156.799998,555.591667 157.520002,555.591667 158.240001,555.591667 158.960001,555.591667 159.680000,555.591667 160.399999,555.591667 161.119998,555.591667 161.840002,555.591667 162.560001,555.591667 163.280001,555.591667 164.000000,555.591667 164.719999,555.591667 165.439999,555.591667 166.159998,555.591667 166.880002,555.591667 167.600001,555.591667 168.320000,555.591667 169.039999,555.591667 169.759999,555.591667 170.479998,555.591667 171.200002,555.591667 171.920001,555.591667 172.640000,555.591667 173.360000,555.591667 174.079999,555.591667 174.799998,555.591667 175.520002,555.591667 176.240001,555.591667 176.960001,555.591667 177.680000,555.591667 178.399999,555.591667 179.119998,555.591667 179.840002,555.591667 180.560001,555.591667 181.280001,555.591667 182.000000,555.591667 182.000000,555.591667 182.000000,555.591667 182.719999,555.591667 183.439999,555.591667 184.159998,555.591667 184.879997,555.591667 185.599997,555.591667 186.319996,555.591667 187.040004,555.591667 187.760003,555.591667 188.480002,555.591667 189.200002,555.591667 189.920001,555.591667 190.640000,555.591667 191.360000,555.591667 192.079999,555.591667 192.799998,555.591667 193.519998,555.591667 194.239997,555.591667 194.959996,555.591667 195.680004,555.591667 196.400003,555.591667 197.120003,555.591667 197.840002,555.591667 198.560001,555.591667 199.280001,555.591667 200.000000,555.591667 200.719999,555.591667 201.439999,555.591667 202.159998,555.591667 202.879997,555.591667 203.599997,555.591667 204.319996,555.591667 205.040004,555.591667 205.760003,555.591667 206.480002,555.591667 207.200002,555.591667 207.920001,555.591667 208.640000,555.591667 209.360000,555.591667 210.079999,555.591667 210.799998,555.591667 211.519998,555.591667 212.239997,555.591667 212.959996,555.591667 213.680004,555.591667 214.400003,555.591667 215.120003,555.591667 215.840002,555.591667 216.560001,555.591667 217.280001,555.591667 218.000000,555.591667 218.000000,555.591667 218.000000,555.591667 218.719999,555.591667 219.439999,555.591667 220.159998,555.591667 220.879997,555.591667 221.599997,555.591667 222.319996,555.591667 223.040004,555.591667 223.760003,555.591667 224.480002,555.591667 225.200002,555.591667 225.920001,555.591667 226.640000,555.591667 227.360000,555.591667 228.079999,555.591667 228.799998,555.591667 229.519998,555.591667 230.239997,555.591667 230.959996,555.591667 231.680004,555.591667 232.400003,555.591667 233.120003,555.591667 233.840002,555.591667 234.560001,555.591667 235.280001,555.591667 236.000000,555.591667 236.719999,555.591667 237.439999,555.591667 238.159998,555.591667 238.879997,555.591667 239.599997,555.591667 240.319996,555.591667 241.040004,555.591667 241.760003,555.591667 242.480002,555.591667 243.200002,555.591667 243.920001,555.591667 244.640000,555.591667 245.360000,555.591667 246.079999,555.591667 246.799998,555.591667 247.519998,555.591667 248.239997,555.591667 248.959996,555.591667 249.680004,555.591667 250.400003,555.591667 251.120003,555.591667 251.840002,555.591667 252.560001,555.591667 253.280001,555.591667 254.000000,555.591667 254.000000,555.591667 254.000000,555.591667 254.719999,555.591667 255.439999,555.591667 256.159998,555.591667 256.879997,555.591667 257.599997,555.591667 258.319996,555.591667 259.039995,555.591667 259.759995,555.591667 260.479994,555.591667 261.199993,555.591667 261.919992,555.591667 262.639992,555.591667 263.360008,555.591667 264.080008,555.591667 264.800007,555.591667 265.520006,555.591667 266.240005,555.591667 266.960005,555.591667 267.680004,555.591667 268.400003,555.591667 269.120003,555.591667 269.840002,555.591667 270.560001,555.591667 271.280001,555.591667 272.000000,555.591667 272.719999,555.591667 273.439999,555.591667 274.159998,555.591667 274.879997,555.591667 275.599997,555.591667 276.319996,555.591667 277.039995,555.591667 277.759995,555.591667 278.479994,555.591667 279.199993,555.591667 279.919992,555.591667 280.639992,555.591667 281.360008,555.591667 282.080008,555.591667 282.800007,555.591667 283.520006,555.591667 284.240005,555.591667 284.960005,555.591667 285.680004,555.591667 286.400003,555.591667 287.120003,555.591667 287.840002,555.591667 288.560001,555.591667 289.280001,555.591667 290.000000,555.591667 290.000000,555.591667 290.719999,555.591667 291.439999,555.591667 292.159998,555.591667 292.879997,555.591667 293.599997,555.591667 294.319996,555.591667 295.039995,555.591667 295.759995,555.591667 296.479994,555.591667 297.199993,555.591667 297.919992,555.591667 298.639992,555.591667 299.360008,555.591667 300.080008,555.591667 300.800007,555.591667 301.520006,555.591667 302.240005,555.591667 302.960005,555.591667 303.680004,555.591667 304.400003,555.591667 305.120003,555.591667 305.840002,555.591667 306.560001,555.591667 307.280001,555.591667 308.000000,555.591667 308.719999,555.591667 309.439999,555.591667 310.159998,555.591667 310.879997,555.591667 311.599997,555.591667 312.319996,555.591667 313.039995,555.591667 313.759995,555.591667 314.479994,555.591667 315.199993,555.591667 315.919992,555.591667 316.639992,555.591667 317.360008,555.591667 318.080008,555.591667 318.800007,555.591667 319.520006,555.591667 320.240005,555.591667 320.960005,555.591667 321.680004,555.591667 322.400003,555.591667 323.120003,555.591667 323.840002,555.591667 324.560001,555.591667 325.280001,555.591667 326.000000,555.591667 326.000000,555.591667 326.719999,555.591667 327.439999,555.591667 328.159998,555.591667 328.879997,555.591667 329.599997,555.591667 330.319996,555.591667 331.039995,555.591667 331.759995,555.591667 332.479994,555.591667 333.199993,555.591667 333.919992,555.591667 334.639992,555.591667 335.360008,555.591667 336.080008,555.591667 336.800007,555.591667 337.520006,555.591667 338.240005,555.591667 338.960005,555.591667 339.680004,555.591667 340.400003,555.591667 341.120003,555.591667 341.840002,555.591667 342.560001,555.591667 343.280001,555.591667 344.000000,555.591667 344.719999,555.591667 345.439999,555.591667 346.159998,555.591667 346.879997,555.591667 347.599997,555.591667 348.319996,555.591667 349.039995,555.591667 349.759995,555.591667 350.479994,555.591667 351.199993,555.591667 351.919992,555.591667 352.639992,555.591667 353.360008,555.591667 354.080008,555.591667 354.800007,555.591667 355.520006,555.591667 356.240005,555.591667 356.960005,555.591667 357.680004,555.591667 358.400003,555.591667 359.120003,555.591667 359.840002,555.591667 360.560001,555.591667 361.280001,555.591667 362.000000,555.591667 362.000000,555.591667 362.719999,555.591667 363.439999,555.591667 364.159998,555.591667 364.879997,555.591667 365.599997,555.591667 366.319996,555.591667 367.039995,555.591667 367.759995,555.591667 368.479994,555.591667 369.199993,555.591667 369.919992,555.591667 370.639992,555.591667 371.360008,555.591667 372.080008,555.591667 372.800007,555.591667 373.520006,555.591667 374.240005,555.591667 374.960005,555.591667 375.680004,555.591667 376.400003,555.591667 377.120003,555.591667 377.840002,555.591667 378.560001,555.591667 379.280001,555.591667 380.000000,555.591667 380.719999,555.591667 381.439999,555.591667 382.159998,555.591667 382.879997,555.591667 383.599997,555.591667 384.319996,555.591667 385.039995,555.591667 385.759995,555.591667 386.479994,555.591667 387.199993,555.591667 387.919992,555.591667 388.639992,555.591667 389.360008,555.591667 390.080008,555.591667 390.800007,555.591667 391.520006,555.591667 392.240005,555.591667 392.960005,555.591667 393.680004,555.591667 394.400003,555.591667 395.120003,555.591667 395.840002,555.591667 396.560001,555.591667 397.280001,555.591667 398.000000,555.591667 398.000000,555.591667 398.720016,555.591667 399.439999,555.591667 400.160015,555.591667 400.879997,555.591667 401.600014,555.591667 402.319996,555.591667 403.040012,555.591667 403.759995,555.591667 404.480011,555.591667 405.199993,555.591667 405.920010,555.591667 406.639992,555.591667 407.360008,555.591667 408.079990,555.591667 408.800007,555.591667 409.519989,555.591667 410.240005,555.591667 410.959988,555.591667 411.680004,555.591667 412.399986,555.591667 413.120003,555.591667 413.839985,555.591667 414.560001,555.591667 415.279984,555.591667 416.000000,555.591667 416.720016,555.591667 417.439999,555.591667 418.160015,555.591667 418.879997,555.591667 419.600014,555.591667 420.319996,555.591667 421.040012,555.591667 421.759995,555.591667 422.480011,555.591667 423.199993,555.591667 423.920010,555.591667 424.639992,555.591667 425.360008,555.591667 426.079990,555.591667 426.800007,555.591667 427.519989,555.591667 428.240005,555.591667 428.959988,555.591667 429.680004,555.591667 430.399986,555.591667 431.120003,555.591667 431.839985,555.591667 432.560001,555.591667 433.279984,555.591667 434.000000,555.591667 434.000000,555.591667 434.720016,555.591667 435.439999,555.591667 436.160015,555.591667 436.879997,555.591667 437.600014,555.591667 438.319996,555.591667 439.040012,555.591667 439.759995,555.591667 440.480011,555.591667 441.199993,555.591667 441.920010,555.591667 442.639992,555.591667 443.360008,555.591667 444.079990,555.591667 444.800007,555.591667 445.519989,555.591667 446.240005,555.591667 446.959988,555.591667 447.680004,555.591667 448.399986,555.591667 449.120003,555.591667 449.839985,555.591667 450.560001,555.591667 451.279984,555.591667 452.000000,555.591667 452.720016,555.591667 453.439999,555.591667 454.160015,555.591667 454.879997,555.591667 455.600014,555.591667 456.319996,555.591667 457.040012,555.591667 457.759995,555.591667 458.480011,555.591667 459.199993,555.591667 459.920010,555.591667 460.639992,555.591667 461.360008,555.591667 462.079990,555.591667 462.800007,555.591667 463.519989,555.591667 464.240005,555.591667 464.959988,555.591667 465.680004,555.591667 466.399986,555.591667 467.120003,555.591667 467.839985,555.591667 468.560001,555.591667 469.279984,555.591667 470.000000,555.591667 470.000000,555.591667"
+     id="polyline2426"
+     transform="translate(488.18065,89.342823)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-92)"
+     points="110.000000,718.612500 110.720000,718.612500 111.440000,718.612500 112.160000,718.612500 112.880000,718.612500 113.600000,718.612500 114.320000,718.612500 115.040000,718.612500 115.760000,718.612500 116.480000,718.612500 117.200000,718.612500 117.920000,718.612500 118.640000,718.612500 119.360000,718.612500 120.080000,718.612500 120.800000,718.612500 121.520000,718.612500 122.240000,718.612500 122.960001,718.612500 123.680000,718.612500 124.400000,718.612500 125.120000,718.612500 125.840000,718.612500 126.560000,718.612500 127.280000,718.612500 128.000000,718.612500 128.719999,718.612500 129.440001,718.612500 130.160000,718.612500 130.879999,718.612500 131.600001,718.612500 132.320000,718.612500 133.039999,718.612500 133.760001,718.612500 134.480000,718.612500 135.200000,718.612500 135.920001,718.612500 136.640000,718.612500 137.360000,718.612500 138.079999,718.612500 138.800000,718.612500 139.520000,718.612500 140.239999,718.612500 140.960001,718.612500 141.680000,718.612500 142.399999,718.612500 143.120001,718.612500 143.840000,718.612500 144.559999,718.612500 145.280001,718.612500 146.000000,718.612500 146.000000,718.612500 146.000000,718.612500 146.719999,718.612500 147.439999,718.612500 148.159998,718.612500 148.880002,718.612500 149.600001,718.612500 150.320000,718.612500 151.039999,718.612500 151.759999,718.612500 152.479998,718.612500 153.200002,718.612500 153.920001,718.612500 154.640000,718.612500 155.360000,718.612500 156.079999,718.612500 156.799998,718.612500 157.520002,718.612500 158.240001,718.612500 158.960001,718.612500 159.680000,718.612500 160.399999,718.612500 161.119998,718.612500 161.840002,718.612500 162.560001,718.612500 163.280001,718.612500 164.000000,718.612500 164.719999,718.612500 165.439999,718.612500 166.159998,718.612500 166.880002,718.612500 167.600001,718.612500 168.320000,718.612500 169.039999,718.612500 169.759999,718.612500 170.479998,718.612500 171.200002,718.612500 171.920001,718.612500 172.640000,718.612500 173.360000,718.612500 174.079999,718.612500 174.799998,718.612500 175.520002,718.612500 176.240001,718.612500 176.960001,718.612500 177.680000,718.612500 178.399999,718.612500 179.119998,718.612500 179.840002,718.612500 180.560001,718.612500 181.280001,718.612500 182.000000,718.612500 182.000000,718.612500 182.000000,718.612500 182.719999,718.612500 183.439999,718.612500 184.159998,718.612500 184.879997,718.612500 185.599997,718.612500 186.319996,718.612500 187.040004,718.612500 187.760003,718.612500 188.480002,718.612500 189.200002,718.612500 189.920001,718.612500 190.640000,718.612500 191.360000,718.612500 192.079999,718.612500 192.799998,718.612500 193.519998,718.612500 194.239997,718.612500 194.959996,718.612500 195.680004,718.612500 196.400003,718.612500 197.120003,718.612500 197.840002,718.612500 198.560001,718.612500 199.280001,718.612500 200.000000,718.612500 200.719999,718.612500 201.439999,718.612500 202.159998,718.612500 202.879997,718.612500 203.599997,718.612500 204.319996,718.612500 205.040004,718.612500 205.760003,718.612500 206.480002,718.612500 207.200002,718.612500 207.920001,718.612500 208.640000,718.612500 209.360000,718.612500 210.079999,718.612500 210.799998,718.612500 211.519998,718.612500 212.239997,718.612500 212.959996,718.612500 213.680004,718.612500 214.400003,718.612500 215.120003,718.612500 215.840002,718.612500 216.560001,718.612500 217.280001,718.612500 218.000000,718.612500 218.000000,718.612500 218.000000,718.612500 218.719999,718.612500 219.439999,718.612500 220.159998,718.612500 220.879997,718.612500 221.599997,718.612500 222.319996,718.612500 223.040004,718.612500 223.760003,718.612500 224.480002,718.612500 225.200002,718.612500 225.920001,718.612500 226.640000,718.612500 227.360000,718.612500 228.079999,718.612500 228.799998,718.612500 229.519998,718.612500 230.239997,718.612500 230.959996,718.612500 231.680004,718.612500 232.400003,718.612500 233.120003,718.612500 233.840002,718.612500 234.560001,718.612500 235.280001,718.612500 236.000000,718.612500 236.719999,718.612500 237.439999,718.612500 238.159998,718.612500 238.879997,718.612500 239.599997,718.612500 240.319996,718.612500 241.040004,718.612500 241.760003,718.612500 242.480002,718.612500 243.200002,718.612500 243.920001,718.612500 244.640000,718.612500 245.360000,718.612500 246.079999,718.612500 246.799998,718.612500 247.519998,718.612500 248.239997,718.612500 248.959996,718.612500 249.680004,718.612500 250.400003,718.612500 251.120003,718.612500 251.840002,718.612500 252.560001,718.612500 253.280001,718.612500 254.000000,718.612500 254.000000,718.612500 254.000000,718.612500 254.719999,718.612500 255.439999,718.612500 256.159998,718.612500 256.879997,718.612500 257.599997,718.612500 258.319996,718.612500 259.039995,718.612500 259.759995,718.612500 260.479994,718.612500 261.199993,718.612500 261.919992,718.612500 262.639992,718.612500 263.360008,718.612500 264.080008,718.612500 264.800007,718.612500 265.520006,718.612500 266.240005,718.612500 266.960005,718.612500 267.680004,718.612500 268.400003,718.612500 269.120003,718.612500 269.840002,718.612500 270.560001,718.612500 271.280001,718.612500 272.000000,718.612500 272.719999,718.612500 273.439999,718.612500 274.159998,718.612500 274.879997,718.612500 275.599997,718.612500 276.319996,718.612500 277.039995,718.612500 277.759995,718.612500 278.479994,718.612500 279.199993,718.612500 279.919992,718.612500 280.639992,718.612500 281.360008,718.612500 282.080008,718.612500 282.800007,718.612500 283.520006,718.612500 284.240005,718.612500 284.960005,718.612500 285.680004,718.612500 286.400003,718.612500 287.120003,718.612500 287.840002,718.612500 288.560001,718.612500 289.280001,718.612500 290.000000,718.612500 290.000000,718.612500 290.719999,718.612500 291.439999,718.612500 292.159998,718.612500 292.879997,718.612500 293.599997,718.612500 294.319996,718.612500 295.039995,718.612500 295.759995,718.612500 296.479994,718.612500 297.199993,718.612500 297.919992,718.612500 298.639992,718.612500 299.360008,718.612500 300.080008,718.612500 300.800007,718.612500 301.520006,718.612500 302.240005,718.612500 302.960005,718.612500 303.680004,718.612500 304.400003,718.612500 305.120003,718.612500 305.840002,718.612500 306.560001,718.612500 307.280001,718.612500 308.000000,718.612500 308.719999,718.612500 309.439999,718.612500 310.159998,718.612500 310.879997,718.612500 311.599997,718.612500 312.319996,718.612500 313.039995,718.612500 313.759995,718.612500 314.479994,718.612500 315.199993,718.612500 315.919992,718.612500 316.639992,718.612500 317.360008,718.612500 318.080008,718.612500 318.800007,718.612500 319.520006,718.612500 320.240005,718.612500 320.960005,718.612500 321.680004,718.612500 322.400003,718.612500 323.120003,718.612500 323.840002,718.612500 324.560001,718.612500 325.280001,718.612500 326.000000,718.612500 326.000000,718.612500 326.719999,718.612500 327.439999,718.612500 328.159998,718.612500 328.879997,718.612500 329.599997,718.612500 330.319996,718.612500 331.039995,718.612500 331.759995,718.612500 332.479994,718.612500 333.199993,718.612500 333.919992,718.612500 334.639992,718.612500 335.360008,718.612500 336.080008,718.612500 336.800007,718.612500 337.520006,718.612500 338.240005,718.612500 338.960005,718.612500 339.680004,718.612500 340.400003,718.612500 341.120003,718.612500 341.840002,718.612500 342.560001,718.612500 343.280001,718.612500 344.000000,718.612500 344.719999,718.612500 345.439999,718.612500 346.159998,718.612500 346.879997,718.612500 347.599997,718.612500 348.319996,718.612500 349.039995,718.612500 349.759995,718.612500 350.479994,718.612500 351.199993,718.612500 351.919992,718.612500 352.639992,718.612500 353.360008,718.612500 354.080008,718.612500 354.800007,718.612500 355.520006,718.612500 356.240005,718.612500 356.960005,718.612500 357.680004,718.612500 358.400003,718.612500 359.120003,718.612500 359.840002,718.612500 360.560001,718.612500 361.280001,718.612500 362.000000,718.612500 362.000000,718.612500 362.719999,718.612500 363.439999,718.612500 364.159998,718.612500 364.879997,718.612500 365.599997,718.612500 366.319996,718.612500 367.039995,718.612500 367.759995,718.612500 368.479994,718.612500 369.199993,718.612500 369.919992,718.612500 370.639992,718.612500 371.360008,718.612500 372.080008,718.612500 372.800007,718.612500 373.520006,718.612500 374.240005,718.612500 374.960005,718.612500 375.680004,718.612500 376.400003,718.612500 377.120003,718.612500 377.840002,718.612500 378.560001,718.612500 379.280001,718.612500 380.000000,718.612500 380.719999,718.612500 381.439999,718.612500 382.159998,718.612500 382.879997,718.612500 383.599997,718.612500 384.319996,718.612500 385.039995,718.612500 385.759995,718.612500 386.479994,718.612500 387.199993,718.612500 387.919992,718.612500 388.639992,718.612500 389.360008,718.612500 390.080008,718.612500 390.800007,718.612500 391.520006,718.612500 392.240005,718.612500 392.960005,718.612500 393.680004,718.612500 394.400003,718.612500 395.120003,718.612500 395.840002,718.612500 396.560001,718.612500 397.280001,718.612500 398.000000,718.612500 398.000000,718.612500 398.720016,718.612500 399.439999,718.612500 400.160015,718.612500 400.879997,718.612500 401.600014,718.612500 402.319996,718.612500 403.040012,718.612500 403.759995,718.612500 404.480011,718.612500 405.199993,718.612500 405.920010,718.612500 406.639992,718.612500 407.360008,718.612500 408.079990,718.612500 408.800007,718.612500 409.519989,718.612500 410.240005,718.612500 410.959988,718.612500 411.680004,718.612500 412.399986,718.612500 413.120003,718.612500 413.839985,718.612500 414.560001,718.612500 415.279984,718.612500 416.000000,718.612500 416.720016,718.612500 417.439999,718.612500 418.160015,718.612500 418.879997,718.612500 419.600014,718.612500 420.319996,718.612500 421.040012,718.612500 421.759995,718.612500 422.480011,718.612500 423.199993,718.612500 423.920010,718.612500 424.639992,718.612500 425.360008,718.612500 426.079990,718.612500 426.800007,718.612500 427.519989,718.612500 428.240005,718.612500 428.959988,718.612500 429.680004,718.612500 430.399986,718.612500 431.120003,718.612500 431.839985,718.612500 432.560001,718.612500 433.279984,718.612500 434.000000,718.612500 434.000000,718.612500 434.720016,718.612500 435.439999,718.612500 436.160015,718.612500 436.879997,718.612500 437.600014,718.612500 438.319996,718.612500 439.040012,718.612500 439.759995,718.612500 440.480011,718.612500 441.199993,718.612500 441.920010,718.612500 442.639992,718.612500 443.360008,718.612500 444.079990,718.612500 444.800007,718.612500 445.519989,718.612500 446.240005,718.612500 446.959988,718.612500 447.680004,718.612500 448.399986,718.612500 449.120003,718.612500 449.839985,718.612500 450.560001,718.612500 451.279984,718.612500 452.000000,718.612500 452.720016,718.612500 453.439999,718.612500 454.160015,718.612500 454.879997,718.612500 455.600014,718.612500 456.319996,718.612500 457.040012,718.612500 457.759995,718.612500 458.480011,718.612500 459.199993,718.612500 459.920010,718.612500 460.639992,718.612500 461.360008,718.612500 462.079990,718.612500 462.800007,718.612500 463.519989,718.612500 464.240005,718.612500 464.959988,718.612500 465.680004,718.612500 466.399986,718.612500 467.120003,718.612500 467.839985,718.612500 468.560001,718.612500 469.279984,718.612500 470.000000,718.612500 470.000000,718.612500"
+     id="polyline2428"
+     transform="translate(488.18065,89.342823)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="601.18066"
+     y="532.84259"
+     id="text2430">truCleFalIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="601.18066"
+     y="627.84265"
+     id="text2432">truCleFalIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="601.18066"
+     y="722.84271"
+     id="text2434">truCleFalIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,34.000000 110.000000,347.000000"
+     id="polyline3337"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,34.000000 182.000000,347.000000"
+     id="polyline3339"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,34.000000 254.000000,347.000000"
+     id="polyline3341"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,34.000000 326.000000,347.000000"
+     id="polyline3343"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,34.000000 398.000000,347.000000"
+     id="polyline3345"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 470.000000,347.000000"
+     id="polyline3347"
+     transform="translate(1038.1807,40.730323)" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1148.1807"
+     y="102.02597"
+     width="360"
+     height="68"
+     id="rect3349" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1148.1807"
+     y="197.23019"
+     width="360"
+     height="68"
+     id="rect3351" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1148.1807"
+     y="292.43417"
+     width="360"
+     height="68"
+     id="rect3353" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 470.000000,347.000000"
+     id="polyline3355"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,34.000000"
+     id="polyline3357"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 110.000000,34.000000"
+     id="polyline3359"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,34.000000 110.000000,347.000000"
+     id="polyline3361"
+     transform="translate(1038.1807,40.730323)" />
   <polyline
-     transform="translate(1039.2497,76.544173)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-4)"
-     points="110.000000,719.612500 110.778000,719.612500 111.556000,719.612500 112.334000,719.612500 113.112000,719.612500 113.890000,719.612500 114.668000,719.612500 115.446000,719.612500 116.224000,719.612500 117.002000,719.612500 117.780000,719.612500 118.558000,719.612500 119.336000,719.612500 120.114000,719.612500 120.892000,719.612500 121.670000,719.612500 122.448000,719.612500 123.226000,719.612500 124.004001,719.612500 124.782000,719.612500 125.560000,719.612500 126.337999,719.612500 127.116000,719.612500 127.894000,719.612500 128.672000,719.612500 129.450000,719.612500 130.227999,719.612500 131.006001,719.612500 131.784000,719.612500 132.561999,719.612500 133.340001,719.612500 134.118000,719.612500 134.895999,719.612500 135.674001,719.612500 136.452000,719.612500 137.230000,719.612500 138.008001,719.612500 138.786000,719.612500 139.564000,719.612500 140.341999,719.612500 141.120000,719.612500 141.898000,719.612500 142.675999,719.612500 143.454001,719.612500 144.232000,719.612500 145.009999,719.612500 145.788001,719.612500 146.566000,719.612500 147.343999,719.612500 148.122001,719.612500 148.900000,719.612500 148.900000,719.612500 148.900000,719.612500 148.900000,719.612500 149.677999,719.612500 150.455999,719.612500 151.233998,719.612500 152.012002,719.612500 152.790001,719.612500 153.568000,719.612500 154.345999,719.612500 155.123999,719.612500 155.901998,719.612500 156.680002,719.612500 157.458001,719.612500 158.236000,719.612500 159.014000,719.612500 159.791999,719.612500 160.569998,719.612500 161.348002,719.612500 162.126001,719.612500 162.904001,719.612500 163.682000,719.612500 164.459999,719.612500 165.237998,719.612500 166.016002,719.612500 166.794001,719.612500 167.572001,719.612500 168.350000,719.612500 169.127999,719.612500 169.905999,719.612500 170.683998,719.612500 171.462002,719.612500 172.240001,719.612500 173.018000,719.612500 173.795999,719.612500 174.573999,719.612500 175.351998,719.612500 176.130002,719.612500 176.908001,719.612500 177.686000,719.612500 178.464000,719.612500 179.241999,719.612500 180.019998,719.612500 180.798002,719.612500 181.576001,719.612500 182.354001,719.612500 183.132000,719.612500 183.909999,719.612500 184.687998,719.612500 185.466002,719.612500 186.244001,719.612500 187.022001,719.612500 187.800000,719.612500 187.800000,651.795833 187.800000,651.795833 188.577999,651.795833 189.355999,651.795833 190.133998,651.795833 190.911997,651.795833 191.689996,651.795833 192.467996,651.795833 193.246004,651.795833 194.024003,651.795833 194.802003,651.795833 195.580002,651.795833 196.358001,651.795833 197.136000,651.795833 197.914000,651.795833 198.691999,651.795833 199.469998,651.795833 200.247997,651.795833 201.025997,651.795833 201.803996,651.795833 202.582004,651.795833 203.360004,651.795833 204.138003,651.795833 204.916002,651.795833 205.694001,651.795833 206.472001,651.795833 207.250000,651.795833 208.027999,651.795833 208.805999,651.795833 209.583998,651.795833 210.361997,651.795833 211.139996,651.795833 211.917996,651.795833 212.696004,651.795833 213.474003,651.795833 214.252003,651.795833 215.030002,651.795833 215.808001,651.795833 216.586000,651.795833 217.364000,651.795833 218.141999,651.795833 218.919998,651.795833 219.697997,651.795833 220.475997,651.795833 221.253996,651.795833 222.032004,651.795833 222.810004,651.795833 223.588003,651.795833 224.366002,651.795833 225.144001,651.795833 225.922001,651.795833 226.700000,651.795833 226.700000,719.612500 226.700000,719.612500 227.477999,719.612500 228.255999,719.612500 229.033998,719.612500 229.811997,719.612500 230.589996,719.612500 231.367996,719.612500 232.146004,719.612500 232.924003,719.612500 233.702003,719.612500 234.480002,719.612500 235.258001,719.612500 236.036000,719.612500 236.814000,719.612500 237.591999,719.612500 238.369998,719.612500 239.147997,719.612500 239.925997,719.612500 240.703996,719.612500 241.482004,719.612500 242.260004,719.612500 243.038003,719.612500 243.816002,719.612500 244.594001,719.612500 245.372001,719.612500 246.150000,719.612500 246.927999,719.612500 247.705999,719.612500 248.483998,719.612500 249.261997,719.612500 250.039996,719.612500 250.817996,719.612500 251.596004,719.612500 252.374003,719.612500 253.152003,719.612500 253.930002,719.612500 254.708001,719.612500 255.486000,719.612500 256.264000,719.612500 257.041999,719.612500 257.819998,719.612500 258.597997,719.612500 259.375997,719.612500 260.153996,719.612500 260.932004,719.612500 261.710004,719.612500 262.488003,719.612500 263.266002,719.612500 264.044001,719.612500 264.822001,719.612500 265.600000,719.612500 265.600000,719.612500 265.600000,719.612500 266.377999,719.612500 267.155999,719.612500 267.933998,719.612500 268.711997,719.612500 269.489996,719.612500 270.267996,719.612500 271.045995,719.612500 271.823994,719.612500 272.601993,719.612500 273.379993,719.612500 274.157992,719.612500 274.935991,719.612500 275.714009,719.612500 276.492008,719.612500 277.270007,719.612500 278.048007,719.612500 278.826006,719.612500 279.604005,719.612500 280.382004,719.612500 281.160004,719.612500 281.938003,719.612500 282.716002,719.612500 283.494001,719.612500 284.272001,719.612500 285.050000,719.612500 285.827999,719.612500 286.605999,719.612500 287.383998,719.612500 288.161997,719.612500 288.939996,719.612500 289.717996,719.612500 290.495995,719.612500 291.273994,719.612500 292.051993,719.612500 292.829993,719.612500 293.607992,719.612500 294.385991,719.612500 295.164009,719.612500 295.942008,719.612500 296.720007,719.612500 297.498007,719.612500 298.276006,719.612500 299.054005,719.612500 299.832004,719.612500 300.610004,719.612500 301.388003,719.612500 302.166002,719.612500 302.944001,719.612500 303.722001,719.612500 304.500000,719.612500 304.500000,719.612500 305.277999,719.612500 306.055999,719.612500 306.833998,719.612500 307.611997,719.612500 308.389996,719.612500 309.167996,719.612500 309.945995,719.612500 310.723994,719.612500 311.501993,719.612500 312.279993,719.612500 313.057992,719.612500 313.835991,719.612500 314.614009,719.612500 315.392008,719.612500 316.170007,719.612500 316.948007,719.612500 317.726006,719.612500 318.504005,719.612500 319.282004,719.612500 320.060004,719.612500 320.838003,719.612500 321.616002,719.612500 322.394001,719.612500 323.172001,719.612500 323.950000,719.612500 324.727999,719.612500 325.505999,719.612500 326.283998,719.612500 327.061997,719.612500 327.839996,719.612500 328.617996,719.612500 329.395995,719.612500 330.173994,719.612500 330.951993,719.612500 331.729993,719.612500 332.507992,719.612500 333.285991,719.612500 334.064009,719.612500 334.842008,719.612500 335.620007,719.612500 336.398007,719.612500 337.176006,719.612500 337.954005,719.612500 338.732004,719.612500 339.510004,719.612500 340.288003,719.612500 341.066002,719.612500 341.844001,719.612500 342.622001,719.612500 343.400000,719.612500 343.400000,651.795833 344.177999,651.795833 344.955999,651.795833 345.733998,651.795833 346.511997,651.795833 347.289996,651.795833 348.067996,651.795833 348.845995,651.795833 349.623994,651.795833 350.401993,651.795833 351.179993,651.795833 351.957992,651.795833 352.735991,651.795833 353.514009,651.795833 354.292008,651.795833 355.070007,651.795833 355.848007,651.795833 356.626006,651.795833 357.404005,651.795833 358.182004,651.795833 358.960004,651.795833 359.738003,651.795833 360.516002,651.795833 361.294001,651.795833 362.072001,651.795833 362.850000,651.795833 363.627999,651.795833 364.405999,651.795833 365.183998,651.795833 365.961997,651.795833 366.739996,651.795833 367.517996,651.795833 368.295995,651.795833 369.073994,651.795833 369.851993,651.795833 370.629993,651.795833 371.407992,651.795833 372.185991,651.795833 372.964009,651.795833 373.742008,651.795833 374.520007,651.795833 375.298007,651.795833 376.076006,651.795833 376.854005,651.795833 377.632004,651.795833 378.410004,651.795833 379.188003,651.795833 379.966002,651.795833 380.744001,651.795833 381.522001,651.795833 382.300000,651.795833 382.300000,651.795833 383.077999,651.795833 383.855999,651.795833 384.633998,651.795833 385.411997,651.795833 386.189996,651.795833 386.967996,651.795833 387.745995,651.795833 388.523994,651.795833 389.301993,651.795833 390.079993,651.795833 390.857992,651.795833 391.635991,651.795833 392.414009,651.795833 393.192008,651.795833 393.970007,651.795833 394.748007,651.795833 395.526006,651.795833 396.304005,651.795833 397.082004,651.795833 397.860004,651.795833 398.638003,651.795833 399.416002,651.795833 400.194001,651.795833 400.972001,651.795833 401.750000,651.795833 402.527999,651.795833 403.305999,651.795833 404.083998,651.795833 404.861997,651.795833 405.639996,651.795833 406.417996,651.795833 407.195995,651.795833 407.973994,651.795833 408.751993,651.795833 409.529993,651.795833 410.307992,651.795833 411.085991,651.795833 411.864009,651.795833 412.642008,651.795833 413.420007,651.795833 414.198007,651.795833 414.976006,651.795833 415.754005,651.795833 416.532004,651.795833 417.310004,651.795833 418.088003,651.795833 418.866002,651.795833 419.644001,651.795833 420.422001,651.795833 421.200000,651.795833 421.200000,651.795833 421.978018,651.795833 422.755999,651.795833 423.534016,651.795833 424.311997,651.795833 425.090015,651.795833 425.867996,651.795833 426.646013,651.795833 427.423994,651.795833 428.202012,651.795833 428.979993,651.795833 429.758010,651.795833 430.535991,651.795833 431.314009,651.795833 432.091990,651.795833 432.870007,651.795833 433.647988,651.795833 434.426006,651.795833 435.203987,651.795833 435.982004,651.795833 436.759985,651.795833 437.538003,651.795833 438.315984,651.795833 439.094001,651.795833 439.871982,651.795833 440.650000,651.795833 441.428018,651.795833 442.205999,651.795833 442.984016,651.795833 443.761997,651.795833 444.540015,651.795833 445.317996,651.795833 446.096013,651.795833 446.873994,651.795833 447.652012,651.795833 448.429993,651.795833 449.208010,651.795833 449.985991,651.795833 450.764009,651.795833 451.541990,651.795833 452.320007,651.795833 453.097988,651.795833 453.876006,651.795833 454.653987,651.795833 455.432004,651.795833 456.209985,651.795833 456.988003,651.795833 457.765984,651.795833 458.544001,651.795833 459.321982,651.795833 460.100000,651.795833 460.100000,719.612500 460.878018,719.612500 461.655999,719.612500 462.434016,719.612500 463.211997,719.612500 463.990015,719.612500 464.767996,719.612500 465.546013,719.612500 466.323994,719.612500 467.102012,719.612500 467.879993,719.612500 468.658010,719.612500 469.435991,719.612500 470.214009,719.612500 470.991990,719.612500 471.770007,719.612500 472.547988,719.612500 473.326006,719.612500 474.103987,719.612500 474.882004,719.612500 475.659985,719.612500 476.438003,719.612500 477.215984,719.612500 477.994001,719.612500 478.771982,719.612500 479.550000,719.612500 480.328018,719.612500 481.105999,719.612500 481.884016,719.612500 482.661997,719.612500 483.440015,719.612500 484.217996,719.612500 484.996013,719.612500 485.773994,719.612500 486.552012,719.612500 487.329993,719.612500 488.108010,719.612500 488.885991,719.612500 489.664009,719.612500 490.441990,719.612500 491.220007,719.612500 491.997988,719.612500 492.776006,719.612500 493.553987,719.612500 494.332004,719.612500 495.109985,719.612500 495.888003,719.612500 496.665984,719.612500 497.444001,719.612500 498.221982,719.612500 499.000000,719.612500 499.000000,719.612500"
-     id="polyline172-1" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1152.2498"
-     y="521.04419"
-     id="text174-9">swiCleInp1.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1152.2498"
-     y="616.04419"
-     id="text176-9">swiCleInp1.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1152.2498"
-     y="711.04419"
-     id="text178-7">swiCleInp1.y</text>
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 110.000000,355.000000"
+     id="polyline3363"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,347.000000 182.000000,355.000000"
+     id="polyline3365"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,355.000000"
+     id="polyline3367"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,347.000000 326.000000,355.000000"
+     id="polyline3369"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,355.000000"
+     id="polyline3371"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,355.000000"
+     id="polyline3373"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 110.000000,359.800000"
+     id="polyline3375"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1148.1807"
+     y="419.23019"
+     id="text3377">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,359.800000"
+     id="polyline3379"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1292.1807"
+     y="419.23019"
+     id="text3381">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,359.800000"
+     id="polyline3383"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1436.1807"
+     y="419.23019"
+     id="text3385">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,129.204167 110.000000,129.204167"
+     id="polyline3387"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="169.93417"
+     id="text3389">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,61.387500 110.000000,61.387500"
+     id="polyline3391"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="102.11765"
+     id="text3393">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,224.408333 110.000000,224.408333"
+     id="polyline3395"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="265.13815"
+     id="text3397">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,156.591667 110.000000,156.591667"
+     id="polyline3399"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="197.32224"
+     id="text3401">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,319.612500 110.000000,319.612500"
+     id="polyline3403"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="360.34323"
+     id="text3405">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,251.795833 110.000000,251.795833"
+     id="polyline3407"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="292.52621"
+     id="text3409">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-30)"
+     points="110.000000,61.387500 110.720000,61.387500 111.440000,61.387500 112.160000,61.387500 112.880000,61.387500 113.600000,61.387500 114.320000,61.387500 115.040000,61.387500 115.760000,61.387500 116.480000,61.387500 117.200000,61.387500 117.920000,61.387500 118.640000,61.387500 119.360000,61.387500 120.080000,61.387500 120.800000,61.387500 121.520000,61.387500 122.240000,61.387500 122.960001,61.387500 123.680000,61.387500 124.400000,61.387500 125.120000,61.387500 125.840000,61.387500 126.560000,61.387500 127.280000,61.387500 128.000000,61.387500 128.719999,61.387500 129.440001,61.387500 130.160000,61.387500 130.879999,61.387500 131.600001,61.387500 132.320000,61.387500 133.039999,61.387500 133.760001,61.387500 134.480000,61.387500 135.200000,61.387500 135.920001,61.387500 136.640000,61.387500 137.360000,61.387500 138.079999,61.387500 138.800000,61.387500 139.520000,61.387500 140.239999,61.387500 140.960001,61.387500 141.680000,61.387500 142.399999,61.387500 143.120001,61.387500 143.840000,61.387500 144.559999,61.387500 145.280001,61.387500 146.000000,61.387500 146.000000,129.204167 146.000000,129.204167 146.719999,129.204167 147.439999,129.204167 148.159998,129.204167 148.880002,129.204167 149.600001,129.204167 150.320000,129.204167 151.039999,129.204167 151.759999,129.204167 152.479998,129.204167 153.200002,129.204167 153.920001,129.204167 154.640000,129.204167 155.360000,129.204167 156.079999,129.204167 156.799998,129.204167 157.520002,129.204167 158.240001,129.204167 158.960001,129.204167 159.680000,129.204167 160.399999,129.204167 161.119998,129.204167 161.840002,129.204167 162.560001,129.204167 163.280001,129.204167 164.000000,129.204167 164.719999,129.204167 165.439999,129.204167 166.159998,129.204167 166.880002,129.204167 167.600001,129.204167 168.320000,129.204167 169.039999,129.204167 169.759999,129.204167 170.479998,129.204167 171.200002,129.204167 171.920001,129.204167 172.640000,129.204167 173.360000,129.204167 174.079999,129.204167 174.799998,129.204167 175.520002,129.204167 176.240001,129.204167 176.960001,129.204167 177.680000,129.204167 178.399999,129.204167 179.119998,129.204167 179.840002,129.204167 180.560001,129.204167 181.280001,129.204167 182.000000,129.204167 182.000000,61.387500 182.000000,61.387500 182.719999,61.387500 183.439999,61.387500 184.159998,61.387500 184.879997,61.387500 185.599997,61.387500 186.319996,61.387500 187.040004,61.387500 187.760003,61.387500 188.480002,61.387500 189.200002,61.387500 189.920001,61.387500 190.640000,61.387500 191.360000,61.387500 192.079999,61.387500 192.799998,61.387500 193.519998,61.387500 194.239997,61.387500 194.959996,61.387500 195.680004,61.387500 196.400003,61.387500 197.120003,61.387500 197.840002,61.387500 198.560001,61.387500 199.280001,61.387500 200.000000,61.387500 200.719999,61.387500 201.439999,61.387500 202.159998,61.387500 202.879997,61.387500 203.599997,61.387500 204.319996,61.387500 205.040004,61.387500 205.760003,61.387500 206.480002,61.387500 207.200002,61.387500 207.920001,61.387500 208.640000,61.387500 209.360000,61.387500 210.079999,61.387500 210.799998,61.387500 211.519998,61.387500 212.239997,61.387500 212.959996,61.387500 213.680004,61.387500 214.400003,61.387500 215.120003,61.387500 215.840002,61.387500 216.560001,61.387500 217.280001,61.387500 218.000000,61.387500 218.000000,129.204167 218.000000,129.204167 218.719999,129.204167 219.439999,129.204167 220.159998,129.204167 220.879997,129.204167 221.599997,129.204167 222.319996,129.204167 223.040004,129.204167 223.760003,129.204167 224.480002,129.204167 225.200002,129.204167 225.920001,129.204167 226.640000,129.204167 227.360000,129.204167 228.079999,129.204167 228.799998,129.204167 229.519998,129.204167 230.239997,129.204167 230.959996,129.204167 231.680004,129.204167 232.400003,129.204167 233.120003,129.204167 233.840002,129.204167 234.560001,129.204167 235.280001,129.204167 236.000000,129.204167 236.719999,129.204167 237.439999,129.204167 238.159998,129.204167 238.879997,129.204167 239.599997,129.204167 240.319996,129.204167 241.040004,129.204167 241.760003,129.204167 242.480002,129.204167 243.200002,129.204167 243.920001,129.204167 244.640000,129.204167 245.360000,129.204167 246.079999,129.204167 246.799998,129.204167 247.519998,129.204167 248.239997,129.204167 248.959996,129.204167 249.680004,129.204167 250.400003,129.204167 251.120003,129.204167 251.840002,129.204167 252.560001,129.204167 253.280001,129.204167 254.000000,129.204167 254.000000,61.387500 254.000000,61.387500 254.719999,61.387500 255.439999,61.387500 256.159998,61.387500 256.879997,61.387500 257.599997,61.387500 258.319996,61.387500 259.039995,61.387500 259.759995,61.387500 260.479994,61.387500 261.199993,61.387500 261.919992,61.387500 262.639992,61.387500 263.360008,61.387500 264.080008,61.387500 264.800007,61.387500 265.520006,61.387500 266.240005,61.387500 266.960005,61.387500 267.680004,61.387500 268.400003,61.387500 269.120003,61.387500 269.840002,61.387500 270.560001,61.387500 271.280001,61.387500 272.000000,61.387500 272.719999,61.387500 273.439999,61.387500 274.159998,61.387500 274.879997,61.387500 275.599997,61.387500 276.319996,61.387500 277.039995,61.387500 277.759995,61.387500 278.479994,61.387500 279.199993,61.387500 279.919992,61.387500 280.639992,61.387500 281.360008,61.387500 282.080008,61.387500 282.800007,61.387500 283.520006,61.387500 284.240005,61.387500 284.960005,61.387500 285.680004,61.387500 286.400003,61.387500 287.120003,61.387500 287.840002,61.387500 288.560001,61.387500 289.280001,61.387500 290.000000,61.387500 290.000000,129.204167 290.719999,129.204167 291.439999,129.204167 292.159998,129.204167 292.879997,129.204167 293.599997,129.204167 294.319996,129.204167 295.039995,129.204167 295.759995,129.204167 296.479994,129.204167 297.199993,129.204167 297.919992,129.204167 298.639992,129.204167 299.360008,129.204167 300.080008,129.204167 300.800007,129.204167 301.520006,129.204167 302.240005,129.204167 302.960005,129.204167 303.680004,129.204167 304.400003,129.204167 305.120003,129.204167 305.840002,129.204167 306.560001,129.204167 307.280001,129.204167 308.000000,129.204167 308.719999,129.204167 309.439999,129.204167 310.159998,129.204167 310.879997,129.204167 311.599997,129.204167 312.319996,129.204167 313.039995,129.204167 313.759995,129.204167 314.479994,129.204167 315.199993,129.204167 315.919992,129.204167 316.639992,129.204167 317.360008,129.204167 318.080008,129.204167 318.800007,129.204167 319.520006,129.204167 320.240005,129.204167 320.960005,129.204167 321.680004,129.204167 322.400003,129.204167 323.120003,129.204167 323.840002,129.204167 324.560001,129.204167 325.280001,129.204167 326.000000,129.204167 326.000000,61.387500 326.719999,61.387500 327.439999,61.387500 328.159998,61.387500 328.879997,61.387500 329.599997,61.387500 330.319996,61.387500 331.039995,61.387500 331.759995,61.387500 332.479994,61.387500 333.199993,61.387500 333.919992,61.387500 334.639992,61.387500 335.360008,61.387500 336.080008,61.387500 336.800007,61.387500 337.520006,61.387500 338.240005,61.387500 338.960005,61.387500 339.680004,61.387500 340.400003,61.387500 341.120003,61.387500 341.840002,61.387500 342.560001,61.387500 343.280001,61.387500 344.000000,61.387500 344.719999,61.387500 345.439999,61.387500 346.159998,61.387500 346.879997,61.387500 347.599997,61.387500 348.319996,61.387500 349.039995,61.387500 349.759995,61.387500 350.479994,61.387500 351.199993,61.387500 351.919992,61.387500 352.639992,61.387500 353.360008,61.387500 354.080008,61.387500 354.800007,61.387500 355.520006,61.387500 356.240005,61.387500 356.960005,61.387500 357.680004,61.387500 358.400003,61.387500 359.120003,61.387500 359.840002,61.387500 360.560001,61.387500 361.280001,61.387500 362.000000,61.387500 362.000000,129.204167 362.719999,129.204167 363.439999,129.204167 364.159998,129.204167 364.879997,129.204167 365.599997,129.204167 366.319996,129.204167 367.039995,129.204167 367.759995,129.204167 368.479994,129.204167 369.199993,129.204167 369.919992,129.204167 370.639992,129.204167 371.360008,129.204167 372.080008,129.204167 372.800007,129.204167 373.520006,129.204167 374.240005,129.204167 374.960005,129.204167 375.680004,129.204167 376.400003,129.204167 377.120003,129.204167 377.840002,129.204167 378.560001,129.204167 379.280001,129.204167 380.000000,129.204167 380.719999,129.204167 381.439999,129.204167 382.159998,129.204167 382.879997,129.204167 383.599997,129.204167 384.319996,129.204167 385.039995,129.204167 385.759995,129.204167 386.479994,129.204167 387.199993,129.204167 387.919992,129.204167 388.639992,129.204167 389.360008,129.204167 390.080008,129.204167 390.800007,129.204167 391.520006,129.204167 392.240005,129.204167 392.960005,129.204167 393.680004,129.204167 394.400003,129.204167 395.120003,129.204167 395.840002,129.204167 396.560001,129.204167 397.280001,129.204167 398.000000,129.204167 398.000000,61.387500 398.720016,61.387500 399.439999,61.387500 400.160015,61.387500 400.879997,61.387500 401.600014,61.387500 402.319996,61.387500 403.040012,61.387500 403.759995,61.387500 404.480011,61.387500 405.199993,61.387500 405.920010,61.387500 406.639992,61.387500 407.360008,61.387500 408.079990,61.387500 408.800007,61.387500 409.519989,61.387500 410.240005,61.387500 410.959988,61.387500 411.680004,61.387500 412.399986,61.387500 413.120003,61.387500 413.839985,61.387500 414.560001,61.387500 415.279984,61.387500 416.000000,61.387500 416.720016,61.387500 417.439999,61.387500 418.160015,61.387500 418.879997,61.387500 419.600014,61.387500 420.319996,61.387500 421.040012,61.387500 421.759995,61.387500 422.480011,61.387500 423.199993,61.387500 423.920010,61.387500 424.639992,61.387500 425.360008,61.387500 426.079990,61.387500 426.800007,61.387500 427.519989,61.387500 428.240005,61.387500 428.959988,61.387500 429.680004,61.387500 430.399986,61.387500 431.120003,61.387500 431.839985,61.387500 432.560001,61.387500 433.279984,61.387500 434.000000,61.387500 434.000000,129.204167 434.720016,129.204167 435.439999,129.204167 436.160015,129.204167 436.879997,129.204167 437.600014,129.204167 438.319996,129.204167 439.040012,129.204167 439.759995,129.204167 440.480011,129.204167 441.199993,129.204167 441.920010,129.204167 442.639992,129.204167 443.360008,129.204167 444.079990,129.204167 444.800007,129.204167 445.519989,129.204167 446.240005,129.204167 446.959988,129.204167 447.680004,129.204167 448.399986,129.204167 449.120003,129.204167 449.839985,129.204167 450.560001,129.204167 451.279984,129.204167 452.000000,129.204167 452.720016,129.204167 453.439999,129.204167 454.160015,129.204167 454.879997,129.204167 455.600014,129.204167 456.319996,129.204167 457.040012,129.204167 457.759995,129.204167 458.480011,129.204167 459.199993,129.204167 459.920010,129.204167 460.639992,129.204167 461.360008,129.204167 462.079990,129.204167 462.800007,129.204167 463.519989,129.204167 464.240005,129.204167 464.959988,129.204167 465.680004,129.204167 466.399986,129.204167 467.120003,129.204167 467.839985,129.204167 468.560001,129.204167 469.279984,129.204167 470.000000,129.204167 470.000000,61.387500"
+     id="polyline3414"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-30)"
+     points="110.000000,156.591667 110.720000,156.591667 111.440000,156.591667 112.160000,156.591667 112.880000,156.591667 113.600000,156.591667 114.320000,156.591667 115.040000,156.591667 115.760000,156.591667 116.480000,156.591667 117.200000,156.591667 117.920000,156.591667 118.640000,156.591667 119.360000,156.591667 120.080000,156.591667 120.800000,156.591667 121.520000,156.591667 122.240000,156.591667 122.960001,156.591667 123.680000,156.591667 124.400000,156.591667 125.120000,156.591667 125.840000,156.591667 126.560000,156.591667 127.280000,156.591667 128.000000,156.591667 128.719999,156.591667 129.440001,156.591667 130.160000,156.591667 130.879999,156.591667 131.600001,156.591667 132.320000,156.591667 133.039999,156.591667 133.760001,156.591667 134.480000,156.591667 135.200000,156.591667 135.920001,156.591667 136.640000,156.591667 137.360000,156.591667 138.079999,156.591667 138.800000,156.591667 139.520000,156.591667 140.239999,156.591667 140.960001,156.591667 141.680000,156.591667 142.399999,156.591667 143.120001,156.591667 143.840000,156.591667 144.559999,156.591667 145.280001,156.591667 146.000000,156.591667 146.000000,156.591667 146.000000,156.591667 146.719999,156.591667 147.439999,156.591667 148.159998,156.591667 148.880002,156.591667 149.600001,156.591667 150.320000,156.591667 151.039999,156.591667 151.759999,156.591667 152.479998,156.591667 153.200002,156.591667 153.920001,156.591667 154.640000,156.591667 155.360000,156.591667 156.079999,156.591667 156.799998,156.591667 157.520002,156.591667 158.240001,156.591667 158.960001,156.591667 159.680000,156.591667 160.399999,156.591667 161.119998,156.591667 161.840002,156.591667 162.560001,156.591667 163.280001,156.591667 164.000000,156.591667 164.719999,156.591667 165.439999,156.591667 166.159998,156.591667 166.880002,156.591667 167.600001,156.591667 168.320000,156.591667 169.039999,156.591667 169.759999,156.591667 170.479998,156.591667 171.200002,156.591667 171.920001,156.591667 172.640000,156.591667 173.360000,156.591667 174.079999,156.591667 174.799998,156.591667 175.520002,156.591667 176.240001,156.591667 176.960001,156.591667 177.680000,156.591667 178.399999,156.591667 179.119998,156.591667 179.840002,156.591667 180.560001,156.591667 181.280001,156.591667 182.000000,156.591667 182.000000,156.591667 182.000000,156.591667 182.719999,156.591667 183.439999,156.591667 184.159998,156.591667 184.879997,156.591667 185.599997,156.591667 186.319996,156.591667 187.040004,156.591667 187.760003,156.591667 188.480002,156.591667 189.200002,156.591667 189.920001,156.591667 190.640000,156.591667 191.360000,156.591667 192.079999,156.591667 192.799998,156.591667 193.519998,156.591667 194.239997,156.591667 194.959996,156.591667 195.680004,156.591667 196.400003,156.591667 197.120003,156.591667 197.840002,156.591667 198.560001,156.591667 199.280001,156.591667 200.000000,156.591667 200.719999,156.591667 201.439999,156.591667 202.159998,156.591667 202.879997,156.591667 203.599997,156.591667 204.319996,156.591667 205.040004,156.591667 205.760003,156.591667 206.480002,156.591667 207.200002,156.591667 207.920001,156.591667 208.640000,156.591667 209.360000,156.591667 210.079999,156.591667 210.799998,156.591667 211.519998,156.591667 212.239997,156.591667 212.959996,156.591667 213.680004,156.591667 214.400003,156.591667 215.120003,156.591667 215.840002,156.591667 216.560001,156.591667 217.280001,156.591667 218.000000,156.591667 218.000000,224.408333 218.000000,224.408333 218.719999,224.408333 219.439999,224.408333 220.159998,224.408333 220.879997,224.408333 221.599997,224.408333 222.319996,224.408333 223.040004,224.408333 223.760003,224.408333 224.480002,224.408333 225.200002,224.408333 225.920001,224.408333 226.640000,224.408333 227.360000,224.408333 228.079999,224.408333 228.799998,224.408333 229.519998,224.408333 230.239997,224.408333 230.959996,224.408333 231.680004,224.408333 232.400003,224.408333 233.120003,224.408333 233.840002,224.408333 234.560001,224.408333 235.280001,224.408333 236.000000,224.408333 236.719999,224.408333 237.439999,224.408333 238.159998,224.408333 238.879997,224.408333 239.599997,224.408333 240.319996,224.408333 241.040004,224.408333 241.760003,224.408333 242.480002,224.408333 243.200002,224.408333 243.920001,224.408333 244.640000,224.408333 245.360000,224.408333 246.079999,224.408333 246.799998,224.408333 247.519998,224.408333 248.239997,224.408333 248.959996,224.408333 249.680004,224.408333 250.400003,224.408333 251.120003,224.408333 251.840002,224.408333 252.560001,224.408333 253.280001,224.408333 254.000000,224.408333 254.000000,224.408333 254.000000,224.408333 254.719999,224.408333 255.439999,224.408333 256.159998,224.408333 256.879997,224.408333 257.599997,224.408333 258.319996,224.408333 259.039995,224.408333 259.759995,224.408333 260.479994,224.408333 261.199993,224.408333 261.919992,224.408333 262.639992,224.408333 263.360008,224.408333 264.080008,224.408333 264.800007,224.408333 265.520006,224.408333 266.240005,224.408333 266.960005,224.408333 267.680004,224.408333 268.400003,224.408333 269.120003,224.408333 269.840002,224.408333 270.560001,224.408333 271.280001,224.408333 272.000000,224.408333 272.719999,224.408333 273.439999,224.408333 274.159998,224.408333 274.879997,224.408333 275.599997,224.408333 276.319996,224.408333 277.039995,224.408333 277.759995,224.408333 278.479994,224.408333 279.199993,224.408333 279.919992,224.408333 280.639992,224.408333 281.360008,224.408333 282.080008,224.408333 282.800007,224.408333 283.520006,224.408333 284.240005,224.408333 284.960005,224.408333 285.680004,224.408333 286.400003,224.408333 287.120003,224.408333 287.840002,224.408333 288.560001,224.408333 289.280001,224.408333 290.000000,224.408333 290.000000,224.408333 290.719999,224.408333 291.439999,224.408333 292.159998,224.408333 292.879997,224.408333 293.599997,224.408333 294.319996,224.408333 295.039995,224.408333 295.759995,224.408333 296.479994,224.408333 297.199993,224.408333 297.919992,224.408333 298.639992,224.408333 299.360008,224.408333 300.080008,224.408333 300.800007,224.408333 301.520006,224.408333 302.240005,224.408333 302.960005,224.408333 303.680004,224.408333 304.400003,224.408333 305.120003,224.408333 305.840002,224.408333 306.560001,224.408333 307.280001,224.408333 308.000000,224.408333 308.719999,224.408333 309.439999,224.408333 310.159998,224.408333 310.879997,224.408333 311.599997,224.408333 312.319996,224.408333 313.039995,224.408333 313.759995,224.408333 314.479994,224.408333 315.199993,224.408333 315.919992,224.408333 316.639992,224.408333 317.360008,224.408333 318.080008,224.408333 318.800007,224.408333 319.520006,224.408333 320.240005,224.408333 320.960005,224.408333 321.680004,224.408333 322.400003,224.408333 323.120003,224.408333 323.840002,224.408333 324.560001,224.408333 325.280001,224.408333 326.000000,224.408333 326.000000,156.591667 326.719999,156.591667 327.439999,156.591667 328.159998,156.591667 328.879997,156.591667 329.599997,156.591667 330.319996,156.591667 331.039995,156.591667 331.759995,156.591667 332.479994,156.591667 333.199993,156.591667 333.919992,156.591667 334.639992,156.591667 335.360008,156.591667 336.080008,156.591667 336.800007,156.591667 337.520006,156.591667 338.240005,156.591667 338.960005,156.591667 339.680004,156.591667 340.400003,156.591667 341.120003,156.591667 341.840002,156.591667 342.560001,156.591667 343.280001,156.591667 344.000000,156.591667 344.719999,156.591667 345.439999,156.591667 346.159998,156.591667 346.879997,156.591667 347.599997,156.591667 348.319996,156.591667 349.039995,156.591667 349.759995,156.591667 350.479994,156.591667 351.199993,156.591667 351.919992,156.591667 352.639992,156.591667 353.360008,156.591667 354.080008,156.591667 354.800007,156.591667 355.520006,156.591667 356.240005,156.591667 356.960005,156.591667 357.680004,156.591667 358.400003,156.591667 359.120003,156.591667 359.840002,156.591667 360.560001,156.591667 361.280001,156.591667 362.000000,156.591667 362.000000,156.591667 362.719999,156.591667 363.439999,156.591667 364.159998,156.591667 364.879997,156.591667 365.599997,156.591667 366.319996,156.591667 367.039995,156.591667 367.759995,156.591667 368.479994,156.591667 369.199993,156.591667 369.919992,156.591667 370.639992,156.591667 371.360008,156.591667 372.080008,156.591667 372.800007,156.591667 373.520006,156.591667 374.240005,156.591667 374.960005,156.591667 375.680004,156.591667 376.400003,156.591667 377.120003,156.591667 377.840002,156.591667 378.560001,156.591667 379.280001,156.591667 380.000000,156.591667 380.719999,156.591667 381.439999,156.591667 382.159998,156.591667 382.879997,156.591667 383.599997,156.591667 384.319996,156.591667 385.039995,156.591667 385.759995,156.591667 386.479994,156.591667 387.199993,156.591667 387.919992,156.591667 388.639992,156.591667 389.360008,156.591667 390.080008,156.591667 390.800007,156.591667 391.520006,156.591667 392.240005,156.591667 392.960005,156.591667 393.680004,156.591667 394.400003,156.591667 395.120003,156.591667 395.840002,156.591667 396.560001,156.591667 397.280001,156.591667 398.000000,156.591667 398.000000,156.591667 398.720016,156.591667 399.439999,156.591667 400.160015,156.591667 400.879997,156.591667 401.600014,156.591667 402.319996,156.591667 403.040012,156.591667 403.759995,156.591667 404.480011,156.591667 405.199993,156.591667 405.920010,156.591667 406.639992,156.591667 407.360008,156.591667 408.079990,156.591667 408.800007,156.591667 409.519989,156.591667 410.240005,156.591667 410.959988,156.591667 411.680004,156.591667 412.399986,156.591667 413.120003,156.591667 413.839985,156.591667 414.560001,156.591667 415.279984,156.591667 416.000000,156.591667 416.720016,156.591667 417.439999,156.591667 418.160015,156.591667 418.879997,156.591667 419.600014,156.591667 420.319996,156.591667 421.040012,156.591667 421.759995,156.591667 422.480011,156.591667 423.199993,156.591667 423.920010,156.591667 424.639992,156.591667 425.360008,156.591667 426.079990,156.591667 426.800007,156.591667 427.519989,156.591667 428.240005,156.591667 428.959988,156.591667 429.680004,156.591667 430.399986,156.591667 431.120003,156.591667 431.839985,156.591667 432.560001,156.591667 433.279984,156.591667 434.000000,156.591667 434.000000,224.408333 434.720016,224.408333 435.439999,224.408333 436.160015,224.408333 436.879997,224.408333 437.600014,224.408333 438.319996,224.408333 439.040012,224.408333 439.759995,224.408333 440.480011,224.408333 441.199993,224.408333 441.920010,224.408333 442.639992,224.408333 443.360008,224.408333 444.079990,224.408333 444.800007,224.408333 445.519989,224.408333 446.240005,224.408333 446.959988,224.408333 447.680004,224.408333 448.399986,224.408333 449.120003,224.408333 449.839985,224.408333 450.560001,224.408333 451.279984,224.408333 452.000000,224.408333 452.720016,224.408333 453.439999,224.408333 454.160015,224.408333 454.879997,224.408333 455.600014,224.408333 456.319996,224.408333 457.040012,224.408333 457.759995,224.408333 458.480011,224.408333 459.199993,224.408333 459.920010,224.408333 460.639992,224.408333 461.360008,224.408333 462.079990,224.408333 462.800007,224.408333 463.519989,224.408333 464.240005,224.408333 464.959988,224.408333 465.680004,224.408333 466.399986,224.408333 467.120003,224.408333 467.839985,224.408333 468.560001,224.408333 469.279984,224.408333 470.000000,224.408333 470.000000,224.408333"
+     id="polyline3416"
+     transform="translate(1038.1807,40.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-30)"
+     points="110.000000,319.612500 110.720000,319.612500 111.440000,319.612500 112.160000,319.612500 112.880000,319.612500 113.600000,319.612500 114.320000,319.612500 115.040000,319.612500 115.760000,319.612500 116.480000,319.612500 117.200000,319.612500 117.920000,319.612500 118.640000,319.612500 119.360000,319.612500 120.080000,319.612500 120.800000,319.612500 121.520000,319.612500 122.240000,319.612500 122.960001,319.612500 123.680000,319.612500 124.400000,319.612500 125.120000,319.612500 125.840000,319.612500 126.560000,319.612500 127.280000,319.612500 128.000000,319.612500 128.719999,319.612500 129.440001,319.612500 130.160000,319.612500 130.879999,319.612500 131.600001,319.612500 132.320000,319.612500 133.039999,319.612500 133.760001,319.612500 134.480000,319.612500 135.200000,319.612500 135.920001,319.612500 136.640000,319.612500 137.360000,319.612500 138.079999,319.612500 138.800000,319.612500 139.520000,319.612500 140.239999,319.612500 140.960001,319.612500 141.680000,319.612500 142.399999,319.612500 143.120001,319.612500 143.840000,319.612500 144.559999,319.612500 145.280001,319.612500 146.000000,319.612500 146.000000,319.612500 146.000000,319.612500 146.719999,319.612500 147.439999,319.612500 148.159998,319.612500 148.880002,319.612500 149.600001,319.612500 150.320000,319.612500 151.039999,319.612500 151.759999,319.612500 152.479998,319.612500 153.200002,319.612500 153.920001,319.612500 154.640000,319.612500 155.360000,319.612500 156.079999,319.612500 156.799998,319.612500 157.520002,319.612500 158.240001,319.612500 158.960001,319.612500 159.680000,319.612500 160.399999,319.612500 161.119998,319.612500 161.840002,319.612500 162.560001,319.612500 163.280001,319.612500 164.000000,319.612500 164.719999,319.612500 165.439999,319.612500 166.159998,319.612500 166.880002,319.612500 167.600001,319.612500 168.320000,319.612500 169.039999,319.612500 169.759999,319.612500 170.479998,319.612500 171.200002,319.612500 171.920001,319.612500 172.640000,319.612500 173.360000,319.612500 174.079999,319.612500 174.799998,319.612500 175.520002,319.612500 176.240001,319.612500 176.960001,319.612500 177.680000,319.612500 178.399999,319.612500 179.119998,319.612500 179.840002,319.612500 180.560001,319.612500 181.280001,319.612500 182.000000,319.612500 182.000000,319.612500 182.000000,319.612500 182.719999,319.612500 183.439999,319.612500 184.159998,319.612500 184.879997,319.612500 185.599997,319.612500 186.319996,319.612500 187.040004,319.612500 187.760003,319.612500 188.480002,319.612500 189.200002,319.612500 189.920001,319.612500 190.640000,319.612500 191.360000,319.612500 192.079999,319.612500 192.799998,319.612500 193.519998,319.612500 194.239997,319.612500 194.959996,319.612500 195.680004,319.612500 196.400003,319.612500 197.120003,319.612500 197.840002,319.612500 198.560001,319.612500 199.280001,319.612500 200.000000,319.612500 200.719999,319.612500 201.439999,319.612500 202.159998,319.612500 202.879997,319.612500 203.599997,319.612500 204.319996,319.612500 205.040004,319.612500 205.760003,319.612500 206.480002,319.612500 207.200002,319.612500 207.920001,319.612500 208.640000,319.612500 209.360000,319.612500 210.079999,319.612500 210.799998,319.612500 211.519998,319.612500 212.239997,319.612500 212.959996,319.612500 213.680004,319.612500 214.400003,319.612500 215.120003,319.612500 215.840002,319.612500 216.560001,319.612500 217.280001,319.612500 218.000000,319.612500 218.000000,319.612500 218.000000,319.612500 218.719999,319.612500 219.439999,319.612500 220.159998,319.612500 220.879997,319.612500 221.599997,319.612500 222.319996,319.612500 223.040004,319.612500 223.760003,319.612500 224.480002,319.612500 225.200002,319.612500 225.920001,319.612500 226.640000,319.612500 227.360000,319.612500 228.079999,319.612500 228.799998,319.612500 229.519998,319.612500 230.239997,319.612500 230.959996,319.612500 231.680004,319.612500 232.400003,319.612500 233.120003,319.612500 233.840002,319.612500 234.560001,319.612500 235.280001,319.612500 236.000000,319.612500 236.719999,319.612500 237.439999,319.612500 238.159998,319.612500 238.879997,319.612500 239.599997,319.612500 240.319996,319.612500 241.040004,319.612500 241.760003,319.612500 242.480002,319.612500 243.200002,319.612500 243.920001,319.612500 244.640000,319.612500 245.360000,319.612500 246.079999,319.612500 246.799998,319.612500 247.519998,319.612500 248.239997,319.612500 248.959996,319.612500 249.680004,319.612500 250.400003,319.612500 251.120003,319.612500 251.840002,319.612500 252.560001,319.612500 253.280001,319.612500 254.000000,319.612500 254.000000,251.795833 254.000000,251.795833 254.719999,251.795833 255.439999,251.795833 256.159998,251.795833 256.879997,251.795833 257.599997,251.795833 258.319996,251.795833 259.039995,251.795833 259.759995,251.795833 260.479994,251.795833 261.199993,251.795833 261.919992,251.795833 262.639992,251.795833 263.360008,251.795833 264.080008,251.795833 264.800007,251.795833 265.520006,251.795833 266.240005,251.795833 266.960005,251.795833 267.680004,251.795833 268.400003,251.795833 269.120003,251.795833 269.840002,251.795833 270.560001,251.795833 271.280001,251.795833 272.000000,251.795833 272.719999,251.795833 273.439999,251.795833 274.159998,251.795833 274.879997,251.795833 275.599997,251.795833 276.319996,251.795833 277.039995,251.795833 277.759995,251.795833 278.479994,251.795833 279.199993,251.795833 279.919992,251.795833 280.639992,251.795833 281.360008,251.795833 282.080008,251.795833 282.800007,251.795833 283.520006,251.795833 284.240005,251.795833 284.960005,251.795833 285.680004,251.795833 286.400003,251.795833 287.120003,251.795833 287.840002,251.795833 288.560001,251.795833 289.280001,251.795833 290.000000,251.795833 290.000000,251.795833 290.719999,251.795833 291.439999,251.795833 292.159998,251.795833 292.879997,251.795833 293.599997,251.795833 294.319996,251.795833 295.039995,251.795833 295.759995,251.795833 296.479994,251.795833 297.199993,251.795833 297.919992,251.795833 298.639992,251.795833 299.360008,251.795833 300.080008,251.795833 300.800007,251.795833 301.520006,251.795833 302.240005,251.795833 302.960005,251.795833 303.680004,251.795833 304.400003,251.795833 305.120003,251.795833 305.840002,251.795833 306.560001,251.795833 307.280001,251.795833 308.000000,251.795833 308.719999,251.795833 309.439999,251.795833 310.159998,251.795833 310.879997,251.795833 311.599997,251.795833 312.319996,251.795833 313.039995,251.795833 313.759995,251.795833 314.479994,251.795833 315.199993,251.795833 315.919992,251.795833 316.639992,251.795833 317.360008,251.795833 318.080008,251.795833 318.800007,251.795833 319.520006,251.795833 320.240005,251.795833 320.960005,251.795833 321.680004,251.795833 322.400003,251.795833 323.120003,251.795833 323.840002,251.795833 324.560001,251.795833 325.280001,251.795833 326.000000,251.795833 326.000000,319.612500 326.719999,319.612500 327.439999,319.612500 328.159998,319.612500 328.879997,319.612500 329.599997,319.612500 330.319996,319.612500 331.039995,319.612500 331.759995,319.612500 332.479994,319.612500 333.199993,319.612500 333.919992,319.612500 334.639992,319.612500 335.360008,319.612500 336.080008,319.612500 336.800007,319.612500 337.520006,319.612500 338.240005,319.612500 338.960005,319.612500 339.680004,319.612500 340.400003,319.612500 341.120003,319.612500 341.840002,319.612500 342.560001,319.612500 343.280001,319.612500 344.000000,319.612500 344.719999,319.612500 345.439999,319.612500 346.159998,319.612500 346.879997,319.612500 347.599997,319.612500 348.319996,319.612500 349.039995,319.612500 349.759995,319.612500 350.479994,319.612500 351.199993,319.612500 351.919992,319.612500 352.639992,319.612500 353.360008,319.612500 354.080008,319.612500 354.800007,319.612500 355.520006,319.612500 356.240005,319.612500 356.960005,319.612500 357.680004,319.612500 358.400003,319.612500 359.120003,319.612500 359.840002,319.612500 360.560001,319.612500 361.280001,319.612500 362.000000,319.612500 362.000000,319.612500 362.719999,319.612500 363.439999,319.612500 364.159998,319.612500 364.879997,319.612500 365.599997,319.612500 366.319996,319.612500 367.039995,319.612500 367.759995,319.612500 368.479994,319.612500 369.199993,319.612500 369.919992,319.612500 370.639992,319.612500 371.360008,319.612500 372.080008,319.612500 372.800007,319.612500 373.520006,319.612500 374.240005,319.612500 374.960005,319.612500 375.680004,319.612500 376.400003,319.612500 377.120003,319.612500 377.840002,319.612500 378.560001,319.612500 379.280001,319.612500 380.000000,319.612500 380.719999,319.612500 381.439999,319.612500 382.159998,319.612500 382.879997,319.612500 383.599997,319.612500 384.319996,319.612500 385.039995,319.612500 385.759995,319.612500 386.479994,319.612500 387.199993,319.612500 387.919992,319.612500 388.639992,319.612500 389.360008,319.612500 390.080008,319.612500 390.800007,319.612500 391.520006,319.612500 392.240005,319.612500 392.960005,319.612500 393.680004,319.612500 394.400003,319.612500 395.120003,319.612500 395.840002,319.612500 396.560001,319.612500 397.280001,319.612500 398.000000,319.612500 398.000000,319.612500 398.720016,319.612500 399.439999,319.612500 400.160015,319.612500 400.879997,319.612500 401.600014,319.612500 402.319996,319.612500 403.040012,319.612500 403.759995,319.612500 404.480011,319.612500 405.199993,319.612500 405.920010,319.612500 406.639992,319.612500 407.360008,319.612500 408.079990,319.612500 408.800007,319.612500 409.519989,319.612500 410.240005,319.612500 410.959988,319.612500 411.680004,319.612500 412.399986,319.612500 413.120003,319.612500 413.839985,319.612500 414.560001,319.612500 415.279984,319.612500 416.000000,319.612500 416.720016,319.612500 417.439999,319.612500 418.160015,319.612500 418.879997,319.612500 419.600014,319.612500 420.319996,319.612500 421.040012,319.612500 421.759995,319.612500 422.480011,319.612500 423.199993,319.612500 423.920010,319.612500 424.639992,319.612500 425.360008,319.612500 426.079990,319.612500 426.800007,319.612500 427.519989,319.612500 428.240005,319.612500 428.959988,319.612500 429.680004,319.612500 430.399986,319.612500 431.120003,319.612500 431.839985,319.612500 432.560001,319.612500 433.279984,319.612500 434.000000,319.612500 434.000000,319.612500 434.720016,319.612500 435.439999,319.612500 436.160015,319.612500 436.879997,319.612500 437.600014,319.612500 438.319996,319.612500 439.040012,319.612500 439.759995,319.612500 440.480011,319.612500 441.199993,319.612500 441.920010,319.612500 442.639992,319.612500 443.360008,319.612500 444.079990,319.612500 444.800007,319.612500 445.519989,319.612500 446.240005,319.612500 446.959988,319.612500 447.680004,319.612500 448.399986,319.612500 449.120003,319.612500 449.839985,319.612500 450.560001,319.612500 451.279984,319.612500 452.000000,319.612500 452.720016,319.612500 453.439999,319.612500 454.160015,319.612500 454.879997,319.612500 455.600014,319.612500 456.319996,319.612500 457.040012,319.612500 457.759995,319.612500 458.480011,319.612500 459.199993,319.612500 459.920010,319.612500 460.639992,319.612500 461.360008,319.612500 462.079990,319.612500 462.800007,319.612500 463.519989,319.612500 464.240005,319.612500 464.959988,319.612500 465.680004,319.612500 466.399986,319.612500 467.120003,319.612500 467.839985,319.612500 468.560001,319.612500 469.279984,319.612500 470.000000,319.612500 470.000000,251.795833"
+     id="polyline3418"
+     transform="translate(1038.1807,40.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1151.1807"
+     y="85.230194"
+     id="text3420">swiCleInp.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1151.1807"
+     y="180.23019"
+     id="text3422">swiCleInp.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1151.1807"
+     y="275.23019"
+     id="text3424">swiCleInp.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline3426"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,433.000000 182.000000,746.000000"
+     id="polyline3428"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,433.000000 254.000000,746.000000"
+     id="polyline3430"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,433.000000 326.000000,746.000000"
+     id="polyline3432"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,433.000000 398.000000,746.000000"
+     id="polyline3434"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 470.000000,746.000000"
+     id="polyline3436"
+     transform="translate(1038.1807,90.730323)" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1148.1807"
+     y="551.02618"
+     width="360"
+     height="68"
+     id="rect3438" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1148.1807"
+     y="646.23022"
+     width="360"
+     height="68"
+     id="rect3440" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1148.1807"
+     y="741.4342"
+     width="360"
+     height="68"
+     id="rect3442" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 470.000000,746.000000"
+     id="polyline3444"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,433.000000"
+     id="polyline3446"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 110.000000,433.000000"
+     id="polyline3448"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline3450"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,754.000000"
+     id="polyline3452"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,746.000000 182.000000,754.000000"
+     id="polyline3454"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,754.000000"
+     id="polyline3456"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,746.000000 326.000000,754.000000"
+     id="polyline3458"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,754.000000"
+     id="polyline3460"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,754.000000"
+     id="polyline3462"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,758.800000"
+     id="polyline3464"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1148.1807"
+     y="868.23022"
+     id="text3466">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,758.800000"
+     id="polyline3468"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1292.1807"
+     y="868.23022"
+     id="text3470">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,758.800000"
+     id="polyline3472"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1436.1807"
+     y="868.23022"
+     id="text3474">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,528.204167 110.000000,528.204167"
+     id="polyline3476"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="618.9342"
+     id="text3478">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,460.387500 110.000000,460.387500"
+     id="polyline3480"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="551.11707"
+     id="text3482">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,623.408333 110.000000,623.408333"
+     id="polyline3484"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="714.13818"
+     id="text3486">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,555.591667 110.000000,555.591667"
+     id="polyline3488"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="646.32214"
+     id="text3490">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,718.612500 110.000000,718.612500"
+     id="polyline3492"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="809.34216"
+     id="text3494">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,650.795833 110.000000,650.795833"
+     id="polyline3496"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1132.1807"
+     y="741.52625"
+     id="text3498">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-87)"
+     points="110.000000,460.387500 110.720000,460.387500 111.440000,460.387500 112.160000,460.387500 112.880000,460.387500 113.600000,460.387500 114.320000,460.387500 115.040000,460.387500 115.760000,460.387500 116.480000,460.387500 117.200000,460.387500 117.920000,460.387500 118.640000,460.387500 119.360000,460.387500 120.080000,460.387500 120.800000,460.387500 121.520000,460.387500 122.240000,460.387500 122.960001,460.387500 123.680000,460.387500 124.400000,460.387500 125.120000,460.387500 125.840000,460.387500 126.560000,460.387500 127.280000,460.387500 128.000000,460.387500 128.719999,460.387500 129.440001,460.387500 130.160000,460.387500 130.879999,460.387500 131.600001,460.387500 132.320000,460.387500 133.039999,460.387500 133.760001,460.387500 134.480000,460.387500 135.200000,460.387500 135.920001,460.387500 136.640000,460.387500 137.360000,460.387500 138.079999,460.387500 138.800000,460.387500 139.520000,460.387500 140.239999,460.387500 140.960001,460.387500 141.680000,460.387500 142.399999,460.387500 143.120001,460.387500 143.840000,460.387500 144.559999,460.387500 145.280001,460.387500 146.000000,460.387500 146.000000,528.204167 146.000000,528.204167 146.719999,528.204167 147.439999,528.204167 148.159998,528.204167 148.880002,528.204167 149.600001,528.204167 150.320000,528.204167 151.039999,528.204167 151.759999,528.204167 152.479998,528.204167 153.200002,528.204167 153.920001,528.204167 154.640000,528.204167 155.360000,528.204167 156.079999,528.204167 156.799998,528.204167 157.520002,528.204167 158.240001,528.204167 158.960001,528.204167 159.680000,528.204167 160.399999,528.204167 161.119998,528.204167 161.840002,528.204167 162.560001,528.204167 163.280001,528.204167 164.000000,528.204167 164.719999,528.204167 165.439999,528.204167 166.159998,528.204167 166.880002,528.204167 167.600001,528.204167 168.320000,528.204167 169.039999,528.204167 169.759999,528.204167 170.479998,528.204167 171.200002,528.204167 171.920001,528.204167 172.640000,528.204167 173.360000,528.204167 174.079999,528.204167 174.799998,528.204167 175.520002,528.204167 176.240001,528.204167 176.960001,528.204167 177.680000,528.204167 178.399999,528.204167 179.119998,528.204167 179.840002,528.204167 180.560001,528.204167 181.280001,528.204167 182.000000,528.204167 182.000000,460.387500 182.000000,460.387500 182.719999,460.387500 183.439999,460.387500 184.159998,460.387500 184.879997,460.387500 185.599997,460.387500 186.319996,460.387500 187.040004,460.387500 187.760003,460.387500 188.480002,460.387500 189.200002,460.387500 189.920001,460.387500 190.640000,460.387500 191.360000,460.387500 192.079999,460.387500 192.799998,460.387500 193.519998,460.387500 194.239997,460.387500 194.959996,460.387500 195.680004,460.387500 196.400003,460.387500 197.120003,460.387500 197.840002,460.387500 198.560001,460.387500 199.280001,460.387500 200.000000,460.387500 200.719999,460.387500 201.439999,460.387500 202.159998,460.387500 202.879997,460.387500 203.599997,460.387500 204.319996,460.387500 205.040004,460.387500 205.760003,460.387500 206.480002,460.387500 207.200002,460.387500 207.920001,460.387500 208.640000,460.387500 209.360000,460.387500 210.079999,460.387500 210.799998,460.387500 211.519998,460.387500 212.239997,460.387500 212.959996,460.387500 213.680004,460.387500 214.400003,460.387500 215.120003,460.387500 215.840002,460.387500 216.560001,460.387500 217.280001,460.387500 218.000000,460.387500 218.000000,528.204167 218.000000,528.204167 218.719999,528.204167 219.439999,528.204167 220.159998,528.204167 220.879997,528.204167 221.599997,528.204167 222.319996,528.204167 223.040004,528.204167 223.760003,528.204167 224.480002,528.204167 225.200002,528.204167 225.920001,528.204167 226.640000,528.204167 227.360000,528.204167 228.079999,528.204167 228.799998,528.204167 229.519998,528.204167 230.239997,528.204167 230.959996,528.204167 231.680004,528.204167 232.400003,528.204167 233.120003,528.204167 233.840002,528.204167 234.560001,528.204167 235.280001,528.204167 236.000000,528.204167 236.719999,528.204167 237.439999,528.204167 238.159998,528.204167 238.879997,528.204167 239.599997,528.204167 240.319996,528.204167 241.040004,528.204167 241.760003,528.204167 242.480002,528.204167 243.200002,528.204167 243.920001,528.204167 244.640000,528.204167 245.360000,528.204167 246.079999,528.204167 246.799998,528.204167 247.519998,528.204167 248.239997,528.204167 248.959996,528.204167 249.680004,528.204167 250.400003,528.204167 251.120003,528.204167 251.840002,528.204167 252.560001,528.204167 253.280001,528.204167 254.000000,528.204167 254.000000,460.387500 254.000000,460.387500 254.719999,460.387500 255.439999,460.387500 256.159998,460.387500 256.879997,460.387500 257.599997,460.387500 258.319996,460.387500 259.039995,460.387500 259.759995,460.387500 260.479994,460.387500 261.199993,460.387500 261.919992,460.387500 262.639992,460.387500 263.360008,460.387500 264.080008,460.387500 264.800007,460.387500 265.520006,460.387500 266.240005,460.387500 266.960005,460.387500 267.680004,460.387500 268.400003,460.387500 269.120003,460.387500 269.840002,460.387500 270.560001,460.387500 271.280001,460.387500 272.000000,460.387500 272.719999,460.387500 273.439999,460.387500 274.159998,460.387500 274.879997,460.387500 275.599997,460.387500 276.319996,460.387500 277.039995,460.387500 277.759995,460.387500 278.479994,460.387500 279.199993,460.387500 279.919992,460.387500 280.639992,460.387500 281.360008,460.387500 282.080008,460.387500 282.800007,460.387500 283.520006,460.387500 284.240005,460.387500 284.960005,460.387500 285.680004,460.387500 286.400003,460.387500 287.120003,460.387500 287.840002,460.387500 288.560001,460.387500 289.280001,460.387500 290.000000,460.387500 290.000000,528.204167 290.719999,528.204167 291.439999,528.204167 292.159998,528.204167 292.879997,528.204167 293.599997,528.204167 294.319996,528.204167 295.039995,528.204167 295.759995,528.204167 296.479994,528.204167 297.199993,528.204167 297.919992,528.204167 298.639992,528.204167 299.360008,528.204167 300.080008,528.204167 300.800007,528.204167 301.520006,528.204167 302.240005,528.204167 302.960005,528.204167 303.680004,528.204167 304.400003,528.204167 305.120003,528.204167 305.840002,528.204167 306.560001,528.204167 307.280001,528.204167 308.000000,528.204167 308.719999,528.204167 309.439999,528.204167 310.159998,528.204167 310.879997,528.204167 311.599997,528.204167 312.319996,528.204167 313.039995,528.204167 313.759995,528.204167 314.479994,528.204167 315.199993,528.204167 315.919992,528.204167 316.639992,528.204167 317.360008,528.204167 318.080008,528.204167 318.800007,528.204167 319.520006,528.204167 320.240005,528.204167 320.960005,528.204167 321.680004,528.204167 322.400003,528.204167 323.120003,528.204167 323.840002,528.204167 324.560001,528.204167 325.280001,528.204167 326.000000,528.204167 326.000000,460.387500 326.719999,460.387500 327.439999,460.387500 328.159998,460.387500 328.879997,460.387500 329.599997,460.387500 330.319996,460.387500 331.039995,460.387500 331.759995,460.387500 332.479994,460.387500 333.199993,460.387500 333.919992,460.387500 334.639992,460.387500 335.360008,460.387500 336.080008,460.387500 336.800007,460.387500 337.520006,460.387500 338.240005,460.387500 338.960005,460.387500 339.680004,460.387500 340.400003,460.387500 341.120003,460.387500 341.840002,460.387500 342.560001,460.387500 343.280001,460.387500 344.000000,460.387500 344.719999,460.387500 345.439999,460.387500 346.159998,460.387500 346.879997,460.387500 347.599997,460.387500 348.319996,460.387500 349.039995,460.387500 349.759995,460.387500 350.479994,460.387500 351.199993,460.387500 351.919992,460.387500 352.639992,460.387500 353.360008,460.387500 354.080008,460.387500 354.800007,460.387500 355.520006,460.387500 356.240005,460.387500 356.960005,460.387500 357.680004,460.387500 358.400003,460.387500 359.120003,460.387500 359.840002,460.387500 360.560001,460.387500 361.280001,460.387500 362.000000,460.387500 362.000000,528.204167 362.719999,528.204167 363.439999,528.204167 364.159998,528.204167 364.879997,528.204167 365.599997,528.204167 366.319996,528.204167 367.039995,528.204167 367.759995,528.204167 368.479994,528.204167 369.199993,528.204167 369.919992,528.204167 370.639992,528.204167 371.360008,528.204167 372.080008,528.204167 372.800007,528.204167 373.520006,528.204167 374.240005,528.204167 374.960005,528.204167 375.680004,528.204167 376.400003,528.204167 377.120003,528.204167 377.840002,528.204167 378.560001,528.204167 379.280001,528.204167 380.000000,528.204167 380.719999,528.204167 381.439999,528.204167 382.159998,528.204167 382.879997,528.204167 383.599997,528.204167 384.319996,528.204167 385.039995,528.204167 385.759995,528.204167 386.479994,528.204167 387.199993,528.204167 387.919992,528.204167 388.639992,528.204167 389.360008,528.204167 390.080008,528.204167 390.800007,528.204167 391.520006,528.204167 392.240005,528.204167 392.960005,528.204167 393.680004,528.204167 394.400003,528.204167 395.120003,528.204167 395.840002,528.204167 396.560001,528.204167 397.280001,528.204167 398.000000,528.204167 398.000000,460.387500 398.720016,460.387500 399.439999,460.387500 400.160015,460.387500 400.879997,460.387500 401.600014,460.387500 402.319996,460.387500 403.040012,460.387500 403.759995,460.387500 404.480011,460.387500 405.199993,460.387500 405.920010,460.387500 406.639992,460.387500 407.360008,460.387500 408.079990,460.387500 408.800007,460.387500 409.519989,460.387500 410.240005,460.387500 410.959988,460.387500 411.680004,460.387500 412.399986,460.387500 413.120003,460.387500 413.839985,460.387500 414.560001,460.387500 415.279984,460.387500 416.000000,460.387500 416.720016,460.387500 417.439999,460.387500 418.160015,460.387500 418.879997,460.387500 419.600014,460.387500 420.319996,460.387500 421.040012,460.387500 421.759995,460.387500 422.480011,460.387500 423.199993,460.387500 423.920010,460.387500 424.639992,460.387500 425.360008,460.387500 426.079990,460.387500 426.800007,460.387500 427.519989,460.387500 428.240005,460.387500 428.959988,460.387500 429.680004,460.387500 430.399986,460.387500 431.120003,460.387500 431.839985,460.387500 432.560001,460.387500 433.279984,460.387500 434.000000,460.387500 434.000000,528.204167 434.720016,528.204167 435.439999,528.204167 436.160015,528.204167 436.879997,528.204167 437.600014,528.204167 438.319996,528.204167 439.040012,528.204167 439.759995,528.204167 440.480011,528.204167 441.199993,528.204167 441.920010,528.204167 442.639992,528.204167 443.360008,528.204167 444.079990,528.204167 444.800007,528.204167 445.519989,528.204167 446.240005,528.204167 446.959988,528.204167 447.680004,528.204167 448.399986,528.204167 449.120003,528.204167 449.839985,528.204167 450.560001,528.204167 451.279984,528.204167 452.000000,528.204167 452.720016,528.204167 453.439999,528.204167 454.160015,528.204167 454.879997,528.204167 455.600014,528.204167 456.319996,528.204167 457.040012,528.204167 457.759995,528.204167 458.480011,528.204167 459.199993,528.204167 459.920010,528.204167 460.639992,528.204167 461.360008,528.204167 462.079990,528.204167 462.800007,528.204167 463.519989,528.204167 464.240005,528.204167 464.959988,528.204167 465.680004,528.204167 466.399986,528.204167 467.120003,528.204167 467.839985,528.204167 468.560001,528.204167 469.279984,528.204167 470.000000,528.204167 470.000000,460.387500"
+     id="polyline3503"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-87)"
+     points="110.000000,623.408333 110.720000,623.408333 111.440000,623.408333 112.160000,623.408333 112.880000,623.408333 113.600000,623.408333 114.320000,623.408333 115.040000,623.408333 115.760000,623.408333 116.480000,623.408333 117.200000,623.408333 117.920000,623.408333 118.640000,623.408333 119.360000,623.408333 120.080000,623.408333 120.800000,623.408333 121.520000,623.408333 122.240000,623.408333 122.960001,623.408333 123.680000,623.408333 124.400000,623.408333 125.120000,623.408333 125.840000,623.408333 126.560000,623.408333 127.280000,623.408333 128.000000,623.408333 128.719999,623.408333 129.440001,623.408333 130.160000,623.408333 130.879999,623.408333 131.600001,623.408333 132.320000,623.408333 133.039999,623.408333 133.760001,623.408333 134.480000,623.408333 135.200000,623.408333 135.920001,623.408333 136.640000,623.408333 137.360000,623.408333 138.079999,623.408333 138.800000,623.408333 139.520000,623.408333 140.239999,623.408333 140.960001,623.408333 141.680000,623.408333 142.399999,623.408333 143.120001,623.408333 143.840000,623.408333 144.559999,623.408333 145.280001,623.408333 146.000000,623.408333 146.000000,623.408333 146.000000,623.408333 146.719999,623.408333 147.439999,623.408333 148.159998,623.408333 148.880002,623.408333 149.600001,623.408333 150.320000,623.408333 151.039999,623.408333 151.759999,623.408333 152.479998,623.408333 153.200002,623.408333 153.920001,623.408333 154.640000,623.408333 155.360000,623.408333 156.079999,623.408333 156.799998,623.408333 157.520002,623.408333 158.240001,623.408333 158.960001,623.408333 159.680000,623.408333 160.399999,623.408333 161.119998,623.408333 161.840002,623.408333 162.560001,623.408333 163.280001,623.408333 164.000000,623.408333 164.719999,623.408333 165.439999,623.408333 166.159998,623.408333 166.880002,623.408333 167.600001,623.408333 168.320000,623.408333 169.039999,623.408333 169.759999,623.408333 170.479998,623.408333 171.200002,623.408333 171.920001,623.408333 172.640000,623.408333 173.360000,623.408333 174.079999,623.408333 174.799998,623.408333 175.520002,623.408333 176.240001,623.408333 176.960001,623.408333 177.680000,623.408333 178.399999,623.408333 179.119998,623.408333 179.840002,623.408333 180.560001,623.408333 181.280001,623.408333 182.000000,623.408333 182.000000,623.408333 182.000000,623.408333 182.719999,623.408333 183.439999,623.408333 184.159998,623.408333 184.879997,623.408333 185.599997,623.408333 186.319996,623.408333 187.040004,623.408333 187.760003,623.408333 188.480002,623.408333 189.200002,623.408333 189.920001,623.408333 190.640000,623.408333 191.360000,623.408333 192.079999,623.408333 192.799998,623.408333 193.519998,623.408333 194.239997,623.408333 194.959996,623.408333 195.680004,623.408333 196.400003,623.408333 197.120003,623.408333 197.840002,623.408333 198.560001,623.408333 199.280001,623.408333 200.000000,623.408333 200.719999,623.408333 201.439999,623.408333 202.159998,623.408333 202.879997,623.408333 203.599997,623.408333 204.319996,623.408333 205.040004,623.408333 205.760003,623.408333 206.480002,623.408333 207.200002,623.408333 207.920001,623.408333 208.640000,623.408333 209.360000,623.408333 210.079999,623.408333 210.799998,623.408333 211.519998,623.408333 212.239997,623.408333 212.959996,623.408333 213.680004,623.408333 214.400003,623.408333 215.120003,623.408333 215.840002,623.408333 216.560001,623.408333 217.280001,623.408333 218.000000,623.408333 218.000000,555.591667 218.000000,555.591667 218.719999,555.591667 219.439999,555.591667 220.159998,555.591667 220.879997,555.591667 221.599997,555.591667 222.319996,555.591667 223.040004,555.591667 223.760003,555.591667 224.480002,555.591667 225.200002,555.591667 225.920001,555.591667 226.640000,555.591667 227.360000,555.591667 228.079999,555.591667 228.799998,555.591667 229.519998,555.591667 230.239997,555.591667 230.959996,555.591667 231.680004,555.591667 232.400003,555.591667 233.120003,555.591667 233.840002,555.591667 234.560001,555.591667 235.280001,555.591667 236.000000,555.591667 236.719999,555.591667 237.439999,555.591667 238.159998,555.591667 238.879997,555.591667 239.599997,555.591667 240.319996,555.591667 241.040004,555.591667 241.760003,555.591667 242.480002,555.591667 243.200002,555.591667 243.920001,555.591667 244.640000,555.591667 245.360000,555.591667 246.079999,555.591667 246.799998,555.591667 247.519998,555.591667 248.239997,555.591667 248.959996,555.591667 249.680004,555.591667 250.400003,555.591667 251.120003,555.591667 251.840002,555.591667 252.560001,555.591667 253.280001,555.591667 254.000000,555.591667 254.000000,555.591667 254.000000,555.591667 254.719999,555.591667 255.439999,555.591667 256.159998,555.591667 256.879997,555.591667 257.599997,555.591667 258.319996,555.591667 259.039995,555.591667 259.759995,555.591667 260.479994,555.591667 261.199993,555.591667 261.919992,555.591667 262.639992,555.591667 263.360008,555.591667 264.080008,555.591667 264.800007,555.591667 265.520006,555.591667 266.240005,555.591667 266.960005,555.591667 267.680004,555.591667 268.400003,555.591667 269.120003,555.591667 269.840002,555.591667 270.560001,555.591667 271.280001,555.591667 272.000000,555.591667 272.719999,555.591667 273.439999,555.591667 274.159998,555.591667 274.879997,555.591667 275.599997,555.591667 276.319996,555.591667 277.039995,555.591667 277.759995,555.591667 278.479994,555.591667 279.199993,555.591667 279.919992,555.591667 280.639992,555.591667 281.360008,555.591667 282.080008,555.591667 282.800007,555.591667 283.520006,555.591667 284.240005,555.591667 284.960005,555.591667 285.680004,555.591667 286.400003,555.591667 287.120003,555.591667 287.840002,555.591667 288.560001,555.591667 289.280001,555.591667 290.000000,555.591667 290.000000,555.591667 290.719999,555.591667 291.439999,555.591667 292.159998,555.591667 292.879997,555.591667 293.599997,555.591667 294.319996,555.591667 295.039995,555.591667 295.759995,555.591667 296.479994,555.591667 297.199993,555.591667 297.919992,555.591667 298.639992,555.591667 299.360008,555.591667 300.080008,555.591667 300.800007,555.591667 301.520006,555.591667 302.240005,555.591667 302.960005,555.591667 303.680004,555.591667 304.400003,555.591667 305.120003,555.591667 305.840002,555.591667 306.560001,555.591667 307.280001,555.591667 308.000000,555.591667 308.719999,555.591667 309.439999,555.591667 310.159998,555.591667 310.879997,555.591667 311.599997,555.591667 312.319996,555.591667 313.039995,555.591667 313.759995,555.591667 314.479994,555.591667 315.199993,555.591667 315.919992,555.591667 316.639992,555.591667 317.360008,555.591667 318.080008,555.591667 318.800007,555.591667 319.520006,555.591667 320.240005,555.591667 320.960005,555.591667 321.680004,555.591667 322.400003,555.591667 323.120003,555.591667 323.840002,555.591667 324.560001,555.591667 325.280001,555.591667 326.000000,555.591667 326.000000,623.408333 326.719999,623.408333 327.439999,623.408333 328.159998,623.408333 328.879997,623.408333 329.599997,623.408333 330.319996,623.408333 331.039995,623.408333 331.759995,623.408333 332.479994,623.408333 333.199993,623.408333 333.919992,623.408333 334.639992,623.408333 335.360008,623.408333 336.080008,623.408333 336.800007,623.408333 337.520006,623.408333 338.240005,623.408333 338.960005,623.408333 339.680004,623.408333 340.400003,623.408333 341.120003,623.408333 341.840002,623.408333 342.560001,623.408333 343.280001,623.408333 344.000000,623.408333 344.719999,623.408333 345.439999,623.408333 346.159998,623.408333 346.879997,623.408333 347.599997,623.408333 348.319996,623.408333 349.039995,623.408333 349.759995,623.408333 350.479994,623.408333 351.199993,623.408333 351.919992,623.408333 352.639992,623.408333 353.360008,623.408333 354.080008,623.408333 354.800007,623.408333 355.520006,623.408333 356.240005,623.408333 356.960005,623.408333 357.680004,623.408333 358.400003,623.408333 359.120003,623.408333 359.840002,623.408333 360.560001,623.408333 361.280001,623.408333 362.000000,623.408333 362.000000,623.408333 362.719999,623.408333 363.439999,623.408333 364.159998,623.408333 364.879997,623.408333 365.599997,623.408333 366.319996,623.408333 367.039995,623.408333 367.759995,623.408333 368.479994,623.408333 369.199993,623.408333 369.919992,623.408333 370.639992,623.408333 371.360008,623.408333 372.080008,623.408333 372.800007,623.408333 373.520006,623.408333 374.240005,623.408333 374.960005,623.408333 375.680004,623.408333 376.400003,623.408333 377.120003,623.408333 377.840002,623.408333 378.560001,623.408333 379.280001,623.408333 380.000000,623.408333 380.719999,623.408333 381.439999,623.408333 382.159998,623.408333 382.879997,623.408333 383.599997,623.408333 384.319996,623.408333 385.039995,623.408333 385.759995,623.408333 386.479994,623.408333 387.199993,623.408333 387.919992,623.408333 388.639992,623.408333 389.360008,623.408333 390.080008,623.408333 390.800007,623.408333 391.520006,623.408333 392.240005,623.408333 392.960005,623.408333 393.680004,623.408333 394.400003,623.408333 395.120003,623.408333 395.840002,623.408333 396.560001,623.408333 397.280001,623.408333 398.000000,623.408333 398.000000,623.408333 398.720016,623.408333 399.439999,623.408333 400.160015,623.408333 400.879997,623.408333 401.600014,623.408333 402.319996,623.408333 403.040012,623.408333 403.759995,623.408333 404.480011,623.408333 405.199993,623.408333 405.920010,623.408333 406.639992,623.408333 407.360008,623.408333 408.079990,623.408333 408.800007,623.408333 409.519989,623.408333 410.240005,623.408333 410.959988,623.408333 411.680004,623.408333 412.399986,623.408333 413.120003,623.408333 413.839985,623.408333 414.560001,623.408333 415.279984,623.408333 416.000000,623.408333 416.720016,623.408333 417.439999,623.408333 418.160015,623.408333 418.879997,623.408333 419.600014,623.408333 420.319996,623.408333 421.040012,623.408333 421.759995,623.408333 422.480011,623.408333 423.199993,623.408333 423.920010,623.408333 424.639992,623.408333 425.360008,623.408333 426.079990,623.408333 426.800007,623.408333 427.519989,623.408333 428.240005,623.408333 428.959988,623.408333 429.680004,623.408333 430.399986,623.408333 431.120003,623.408333 431.839985,623.408333 432.560001,623.408333 433.279984,623.408333 434.000000,623.408333 434.000000,555.591667 434.720016,555.591667 435.439999,555.591667 436.160015,555.591667 436.879997,555.591667 437.600014,555.591667 438.319996,555.591667 439.040012,555.591667 439.759995,555.591667 440.480011,555.591667 441.199993,555.591667 441.920010,555.591667 442.639992,555.591667 443.360008,555.591667 444.079990,555.591667 444.800007,555.591667 445.519989,555.591667 446.240005,555.591667 446.959988,555.591667 447.680004,555.591667 448.399986,555.591667 449.120003,555.591667 449.839985,555.591667 450.560001,555.591667 451.279984,555.591667 452.000000,555.591667 452.720016,555.591667 453.439999,555.591667 454.160015,555.591667 454.879997,555.591667 455.600014,555.591667 456.319996,555.591667 457.040012,555.591667 457.759995,555.591667 458.480011,555.591667 459.199993,555.591667 459.920010,555.591667 460.639992,555.591667 461.360008,555.591667 462.079990,555.591667 462.800007,555.591667 463.519989,555.591667 464.240005,555.591667 464.959988,555.591667 465.680004,555.591667 466.399986,555.591667 467.120003,555.591667 467.839985,555.591667 468.560001,555.591667 469.279984,555.591667 470.000000,555.591667 470.000000,555.591667"
+     id="polyline3505"
+     transform="translate(1038.1807,90.730323)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-87)"
+     points="110.000000,650.795833 110.720000,650.795833 111.440000,650.795833 112.160000,650.795833 112.880000,650.795833 113.600000,650.795833 114.320000,650.795833 115.040000,650.795833 115.760000,650.795833 116.480000,650.795833 117.200000,650.795833 117.920000,650.795833 118.640000,650.795833 119.360000,650.795833 120.080000,650.795833 120.800000,650.795833 121.520000,650.795833 122.240000,650.795833 122.960001,650.795833 123.680000,650.795833 124.400000,650.795833 125.120000,650.795833 125.840000,650.795833 126.560000,650.795833 127.280000,650.795833 128.000000,650.795833 128.719999,650.795833 129.440001,650.795833 130.160000,650.795833 130.879999,650.795833 131.600001,650.795833 132.320000,650.795833 133.039999,650.795833 133.760001,650.795833 134.480000,650.795833 135.200000,650.795833 135.920001,650.795833 136.640000,650.795833 137.360000,650.795833 138.079999,650.795833 138.800000,650.795833 139.520000,650.795833 140.239999,650.795833 140.960001,650.795833 141.680000,650.795833 142.399999,650.795833 143.120001,650.795833 143.840000,650.795833 144.559999,650.795833 145.280001,650.795833 146.000000,650.795833 146.000000,650.795833 146.000000,650.795833 146.719999,650.795833 147.439999,650.795833 148.159998,650.795833 148.880002,650.795833 149.600001,650.795833 150.320000,650.795833 151.039999,650.795833 151.759999,650.795833 152.479998,650.795833 153.200002,650.795833 153.920001,650.795833 154.640000,650.795833 155.360000,650.795833 156.079999,650.795833 156.799998,650.795833 157.520002,650.795833 158.240001,650.795833 158.960001,650.795833 159.680000,650.795833 160.399999,650.795833 161.119998,650.795833 161.840002,650.795833 162.560001,650.795833 163.280001,650.795833 164.000000,650.795833 164.719999,650.795833 165.439999,650.795833 166.159998,650.795833 166.880002,650.795833 167.600001,650.795833 168.320000,650.795833 169.039999,650.795833 169.759999,650.795833 170.479998,650.795833 171.200002,650.795833 171.920001,650.795833 172.640000,650.795833 173.360000,650.795833 174.079999,650.795833 174.799998,650.795833 175.520002,650.795833 176.240001,650.795833 176.960001,650.795833 177.680000,650.795833 178.399999,650.795833 179.119998,650.795833 179.840002,650.795833 180.560001,650.795833 181.280001,650.795833 182.000000,650.795833 182.000000,650.795833 182.000000,650.795833 182.719999,650.795833 183.439999,650.795833 184.159998,650.795833 184.879997,650.795833 185.599997,650.795833 186.319996,650.795833 187.040004,650.795833 187.760003,650.795833 188.480002,650.795833 189.200002,650.795833 189.920001,650.795833 190.640000,650.795833 191.360000,650.795833 192.079999,650.795833 192.799998,650.795833 193.519998,650.795833 194.239997,650.795833 194.959996,650.795833 195.680004,650.795833 196.400003,650.795833 197.120003,650.795833 197.840002,650.795833 198.560001,650.795833 199.280001,650.795833 200.000000,650.795833 200.719999,650.795833 201.439999,650.795833 202.159998,650.795833 202.879997,650.795833 203.599997,650.795833 204.319996,650.795833 205.040004,650.795833 205.760003,650.795833 206.480002,650.795833 207.200002,650.795833 207.920001,650.795833 208.640000,650.795833 209.360000,650.795833 210.079999,650.795833 210.799998,650.795833 211.519998,650.795833 212.239997,650.795833 212.959996,650.795833 213.680004,650.795833 214.400003,650.795833 215.120003,650.795833 215.840002,650.795833 216.560001,650.795833 217.280001,650.795833 218.000000,650.795833 218.000000,718.612500 218.000000,718.612500 218.719999,718.612500 219.439999,718.612500 220.159998,718.612500 220.879997,718.612500 221.599997,718.612500 222.319996,718.612500 223.040004,718.612500 223.760003,718.612500 224.480002,718.612500 225.200002,718.612500 225.920001,718.612500 226.640000,718.612500 227.360000,718.612500 228.079999,718.612500 228.799998,718.612500 229.519998,718.612500 230.239997,718.612500 230.959996,718.612500 231.680004,718.612500 232.400003,718.612500 233.120003,718.612500 233.840002,718.612500 234.560001,718.612500 235.280001,718.612500 236.000000,718.612500 236.719999,718.612500 237.439999,718.612500 238.159998,718.612500 238.879997,718.612500 239.599997,718.612500 240.319996,718.612500 241.040004,718.612500 241.760003,718.612500 242.480002,718.612500 243.200002,718.612500 243.920001,718.612500 244.640000,718.612500 245.360000,718.612500 246.079999,718.612500 246.799998,718.612500 247.519998,718.612500 248.239997,718.612500 248.959996,718.612500 249.680004,718.612500 250.400003,718.612500 251.120003,718.612500 251.840002,718.612500 252.560001,718.612500 253.280001,718.612500 254.000000,718.612500 254.000000,718.612500 254.000000,718.612500 254.719999,718.612500 255.439999,718.612500 256.159998,718.612500 256.879997,718.612500 257.599997,718.612500 258.319996,718.612500 259.039995,718.612500 259.759995,718.612500 260.479994,718.612500 261.199993,718.612500 261.919992,718.612500 262.639992,718.612500 263.360008,718.612500 264.080008,718.612500 264.800007,718.612500 265.520006,718.612500 266.240005,718.612500 266.960005,718.612500 267.680004,718.612500 268.400003,718.612500 269.120003,718.612500 269.840002,718.612500 270.560001,718.612500 271.280001,718.612500 272.000000,718.612500 272.719999,718.612500 273.439999,718.612500 274.159998,718.612500 274.879997,718.612500 275.599997,718.612500 276.319996,718.612500 277.039995,718.612500 277.759995,718.612500 278.479994,718.612500 279.199993,718.612500 279.919992,718.612500 280.639992,718.612500 281.360008,718.612500 282.080008,718.612500 282.800007,718.612500 283.520006,718.612500 284.240005,718.612500 284.960005,718.612500 285.680004,718.612500 286.400003,718.612500 287.120003,718.612500 287.840002,718.612500 288.560001,718.612500 289.280001,718.612500 290.000000,718.612500 290.000000,718.612500 290.719999,718.612500 291.439999,718.612500 292.159998,718.612500 292.879997,718.612500 293.599997,718.612500 294.319996,718.612500 295.039995,718.612500 295.759995,718.612500 296.479994,718.612500 297.199993,718.612500 297.919992,718.612500 298.639992,718.612500 299.360008,718.612500 300.080008,718.612500 300.800007,718.612500 301.520006,718.612500 302.240005,718.612500 302.960005,718.612500 303.680004,718.612500 304.400003,718.612500 305.120003,718.612500 305.840002,718.612500 306.560001,718.612500 307.280001,718.612500 308.000000,718.612500 308.719999,718.612500 309.439999,718.612500 310.159998,718.612500 310.879997,718.612500 311.599997,718.612500 312.319996,718.612500 313.039995,718.612500 313.759995,718.612500 314.479994,718.612500 315.199993,718.612500 315.919992,718.612500 316.639992,718.612500 317.360008,718.612500 318.080008,718.612500 318.800007,718.612500 319.520006,718.612500 320.240005,718.612500 320.960005,718.612500 321.680004,718.612500 322.400003,718.612500 323.120003,718.612500 323.840002,718.612500 324.560001,718.612500 325.280001,718.612500 326.000000,718.612500 326.000000,650.795833 326.719999,650.795833 327.439999,650.795833 328.159998,650.795833 328.879997,650.795833 329.599997,650.795833 330.319996,650.795833 331.039995,650.795833 331.759995,650.795833 332.479994,650.795833 333.199993,650.795833 333.919992,650.795833 334.639992,650.795833 335.360008,650.795833 336.080008,650.795833 336.800007,650.795833 337.520006,650.795833 338.240005,650.795833 338.960005,650.795833 339.680004,650.795833 340.400003,650.795833 341.120003,650.795833 341.840002,650.795833 342.560001,650.795833 343.280001,650.795833 344.000000,650.795833 344.719999,650.795833 345.439999,650.795833 346.159998,650.795833 346.879997,650.795833 347.599997,650.795833 348.319996,650.795833 349.039995,650.795833 349.759995,650.795833 350.479994,650.795833 351.199993,650.795833 351.919992,650.795833 352.639992,650.795833 353.360008,650.795833 354.080008,650.795833 354.800007,650.795833 355.520006,650.795833 356.240005,650.795833 356.960005,650.795833 357.680004,650.795833 358.400003,650.795833 359.120003,650.795833 359.840002,650.795833 360.560001,650.795833 361.280001,650.795833 362.000000,650.795833 362.000000,650.795833 362.719999,650.795833 363.439999,650.795833 364.159998,650.795833 364.879997,650.795833 365.599997,650.795833 366.319996,650.795833 367.039995,650.795833 367.759995,650.795833 368.479994,650.795833 369.199993,650.795833 369.919992,650.795833 370.639992,650.795833 371.360008,650.795833 372.080008,650.795833 372.800007,650.795833 373.520006,650.795833 374.240005,650.795833 374.960005,650.795833 375.680004,650.795833 376.400003,650.795833 377.120003,650.795833 377.840002,650.795833 378.560001,650.795833 379.280001,650.795833 380.000000,650.795833 380.719999,650.795833 381.439999,650.795833 382.159998,650.795833 382.879997,650.795833 383.599997,650.795833 384.319996,650.795833 385.039995,650.795833 385.759995,650.795833 386.479994,650.795833 387.199993,650.795833 387.919992,650.795833 388.639992,650.795833 389.360008,650.795833 390.080008,650.795833 390.800007,650.795833 391.520006,650.795833 392.240005,650.795833 392.960005,650.795833 393.680004,650.795833 394.400003,650.795833 395.120003,650.795833 395.840002,650.795833 396.560001,650.795833 397.280001,650.795833 398.000000,650.795833 398.000000,650.795833 398.720016,650.795833 399.439999,650.795833 400.160015,650.795833 400.879997,650.795833 401.600014,650.795833 402.319996,650.795833 403.040012,650.795833 403.759995,650.795833 404.480011,650.795833 405.199993,650.795833 405.920010,650.795833 406.639992,650.795833 407.360008,650.795833 408.079990,650.795833 408.800007,650.795833 409.519989,650.795833 410.240005,650.795833 410.959988,650.795833 411.680004,650.795833 412.399986,650.795833 413.120003,650.795833 413.839985,650.795833 414.560001,650.795833 415.279984,650.795833 416.000000,650.795833 416.720016,650.795833 417.439999,650.795833 418.160015,650.795833 418.879997,650.795833 419.600014,650.795833 420.319996,650.795833 421.040012,650.795833 421.759995,650.795833 422.480011,650.795833 423.199993,650.795833 423.920010,650.795833 424.639992,650.795833 425.360008,650.795833 426.079990,650.795833 426.800007,650.795833 427.519989,650.795833 428.240005,650.795833 428.959988,650.795833 429.680004,650.795833 430.399986,650.795833 431.120003,650.795833 431.839985,650.795833 432.560001,650.795833 433.279984,650.795833 434.000000,650.795833 434.000000,718.612500 434.720016,718.612500 435.439999,718.612500 436.160015,718.612500 436.879997,718.612500 437.600014,718.612500 438.319996,718.612500 439.040012,718.612500 439.759995,718.612500 440.480011,718.612500 441.199993,718.612500 441.920010,718.612500 442.639992,718.612500 443.360008,718.612500 444.079990,718.612500 444.800007,718.612500 445.519989,718.612500 446.240005,718.612500 446.959988,718.612500 447.680004,718.612500 448.399986,718.612500 449.120003,718.612500 449.839985,718.612500 450.560001,718.612500 451.279984,718.612500 452.000000,718.612500 452.720016,718.612500 453.439999,718.612500 454.160015,718.612500 454.879997,718.612500 455.600014,718.612500 456.319996,718.612500 457.040012,718.612500 457.759995,718.612500 458.480011,718.612500 459.199993,718.612500 459.920010,718.612500 460.639992,718.612500 461.360008,718.612500 462.079990,718.612500 462.800007,718.612500 463.519989,718.612500 464.240005,718.612500 464.959988,718.612500 465.680004,718.612500 466.399986,718.612500 467.120003,718.612500 467.839985,718.612500 468.560001,718.612500 469.279984,718.612500 470.000000,718.612500 470.000000,718.612500"
+     id="polyline3507"
+     transform="translate(1038.1807,90.730323)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1151.1807"
+     y="534.23016"
+     id="text3509">swiCleInp1.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1151.1807"
+     y="629.23022"
+     id="text3511">swiCleInp1.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1151.1807"
+     y="724.23022"
+     id="text3513">swiCleInp1.y</text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026411px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="605.24707"
-     y="493.66162"
-     id="text995-4-2"><tspan
-       sodipodi:role="line"
-       id="tspan1123"
-       x="605.24707"
-       y="493.66162">initial output value: true</tspan></text>
+     id="text4712"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,395.91939,1204.6243)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: false
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: true</tspan></tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026417px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="605.85925"
-     y="51.553757"
-     id="text995-4-2-9"><tspan
-       sodipodi:role="line"
-       id="tspan1121"
-       x="605.85925"
-       y="51.553757">initial output value: false</tspan></text>
+     id="text4712-0"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714-9);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,394.63417,1657.3929)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: false
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: false</tspan></tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.11199951px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.6027832px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="1146.5398"
-     y="17.577742"
-     id="text995-4-2-9-5"><tspan
-       sodipodi:role="line"
-       id="tspan1154"
-       x="1146.5398"
-       y="17.577742">At same moments, </tspan><tspan
-       sodipodi:role="line"
-       id="tspan1156"
-       x="1146.5398"
-       y="47.717743">latch input rises (falls), clear input rises (falls)</tspan></text>
+     id="text4712-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714-1);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,934.27283,1208.539)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: true
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: true</tspan></tspan></text>
   <text
      xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.11199951px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.6027832px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="1143.3545"
-     y="465.30411"
-     id="text995-4-2-9-5-8"><tspan
-       sodipodi:role="line"
-       id="tspan1158"
-       x="1143.3545"
-       y="465.30411">At same moments, </tspan><tspan
-       sodipodi:role="line"
-       id="tspan1160"
-       x="1143.3545"
-       y="495.44409">latch input falls (rises), clear input rises (falls)</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1162"
-       x="1143.3545"
-       y="525.58411" /></text>
+     id="text4712-3-8"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714-1-4);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,930.46357,1656.5991)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: true
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: false</tspan></tspan></text>
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 1265.9497,66.135843 V 386.13584"
-     id="path1558"
+     d="M 1256.1807,66.730323 V 386.73032"
+     id="path1558-5"
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 1382.9497,66.135843 V 386.13584"
-     id="path1558-3"
+     d="M 1365.1807,66.730323 V 386.73032"
+     id="path1558-3-82"
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 1265.9497,511.13584 v 320"
-     id="path1558-7"
+     d="M 1255.2618,520.33192 V 840.33189"
+     id="path1558-5-2"
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 1382.9497,511.13584 v 320"
-     id="path1558-3-8"
+     d="M 1364.2618,520.33192 V 840.33189"
+     id="path1558-3-82-0"
      inkscape:connector-curvature="0" />
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.png
deleted file mode 100644
index d890690ca8b..00000000000
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.png and /dev/null differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.svg
deleted file mode 100644
index 9a205cfb57c..00000000000
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/BooleanPulse.svg
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="197.39944mm"
-   height="131.76924mm"
-   viewBox="0 0 699.44685 466.89888"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="BooleanPulse.svg">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker4805"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4807"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker4705"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4707"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4202"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4199"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker4541"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lend">
-      <path
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path4543"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker4495"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart">
-      <path
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         id="path4497"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.93677838"
-     inkscape:cx="396.03347"
-     inkscape:cy="152.87747"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1855"
-     inkscape:window-height="1098"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4136"
-       originx="-9.3577541"
-       originy="-298.8917" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-9.3577539,-286.57163)">
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 50,722.3622 630,0"
-       id="path4138"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 80,752.3622 0,-450"
-       id="path4140"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 680,727.3622 0,-10 15,5 z"
-       id="path4144"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 85,302.3622 -10,0 5,-15 z"
-       id="path4146"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 80,722.3622 60,0 0,-290 220,0 0,290 90,0 0,-290 180,0"
-       id="path4148"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 140,432.3622 0,-90"
-       id="path4150"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 450,432.3622 0,-90"
-       id="path4167"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 360,432.3622 0,-55"
-       id="path4169"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)"
-       d="m 140,402.3622 220,0"
-       id="path4171"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4705);marker-end:url(#marker4805)"
-       d="m 140,352.3622 310,0"
-       id="path4173"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 140,432.3622 -60,0"
-       id="path4175"
-       inkscape:connector-curvature="0"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="14.324385"
-       y="442.53342"
-       id="text4905"
-       sodipodi:linespacing="125%"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899"><tspan
-         sodipodi:role="line"
-         id="tspan4907"
-         x="14.324385"
-         y="442.53342">true</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="8.7169905"
-       y="718.66901"
-       id="text4905-6"
-       sodipodi:linespacing="125%"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899"><tspan
-         sodipodi:role="line"
-         id="tspan5009"
-         x="8.7169905"
-         y="718.66901">false</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="274.31146"
-       y="344.96362"
-       id="text4905-6-5"
-       sodipodi:linespacing="125%"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899"><tspan
-         sodipodi:role="line"
-         id="tspan5017"
-         x="274.31146"
-         y="344.96362">period</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="218.51979"
-       y="392.32571"
-       id="text4905-6-5-5"
-       sodipodi:linespacing="125%"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899"><tspan
-         sodipodi:role="line"
-         id="tspan5015"
-         x="218.51979"
-         y="392.32571">width</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="116.15124"
-       y="748.80518"
-       id="text4905-6-5-5-2"
-       sodipodi:linespacing="125%"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899"><tspan
-         sodipodi:role="line"
-         id="tspan5011"
-         x="116.15124"
-         y="748.80518">startTime</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="647.19586"
-       y="753.07513"
-       id="text4905-6-5-5-2-1"
-       sodipodi:linespacing="125%"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899"><tspan
-         sodipodi:role="line"
-         id="tspan5013"
-         x="647.19586"
-         y="753.07513">time</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="94.064972"
-       y="304.4736"
-       id="text4905-6-5-5-2-7"
-       sodipodi:linespacing="125%"
-       inkscape:transform-center-x="-45.901999"
-       inkscape:transform-center-y="18.147302"
-       inkscape:export-xdpi="45.961899"
-       inkscape:export-ydpi="45.961899"><tspan
-         sodipodi:role="line"
-         id="tspan5007"
-         x="94.064972"
-         y="304.4736">y</tspan></text>
-  </g>
-</svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.png
index 2b4707e6abf..339a13706d7 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.png and b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.svg
index 79e42de6e59..306f78695db 100644
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.svg
+++ b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Sources/SampleTrigger.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,13 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="190.02612mm"
+   width="161.34576mm"
    height="139.21526mm"
-   viewBox="0 0 673.32091 493.2824"
+   viewBox="0 0 571.6976 493.28241"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="SampleTrigger.svg">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="SampleTrigger.svg"
+   inkscape:export-filename="SampleTrigger.png"
+   inkscape:export-xdpi="45.961899"
+   inkscape:export-ydpi="45.961899">
   <defs
      id="defs4">
     <marker
@@ -23,9 +24,40 @@
        orient="auto"
        refY="0"
        refX="0"
-       id="Arrow2Lend"
+       id="marker975"
        style="overflow:visible"
        inkscape:isstock="true">
+      <path
+         id="path973"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker965"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path963"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
       <path
          id="path4331"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
@@ -40,7 +72,8 @@
        refX="0"
        id="Arrow2Lstart"
        style="overflow:visible"
-       inkscape:isstock="true">
+       inkscape:isstock="true"
+       inkscape:collect="always">
       <path
          id="path4328"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
@@ -56,9 +89,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.3248047"
-     inkscape:cx="384.78807"
-     inkscape:cy="222.63113"
+     inkscape:zoom="1.8735568"
+     inkscape:cx="578.86358"
+     inkscape:cy="67.846163"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -66,16 +99,17 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1855"
-     inkscape:window-height="1098"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     inkscape:window-width="3773"
+     inkscape:window-height="2105"
+     inkscape:window-x="3907"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid4136"
-       originx="-16.204429"
-       originy="-257.50816" />
+       originx="9.6722917"
+       originy="-257.50815" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -93,140 +127,131 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-16.204429,-301.57163)">
+     transform="translate(9.6722941,-301.57163)">
     <path
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 66,762.3622 590,0"
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.49968749;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 56.164793,762.31387 H 528.49617"
        id="path4138"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 86,782.3622 0,-450"
+       d="m 86,782.3622 v -450"
        id="path4140"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 656,772.3622 0,-20 30,10 z"
+       d="m 528.5,772.3622 v -20 l 30,10 z"
        id="path4142"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 96,332.3622 -20,0 10,-30 z"
+       d="M 96,332.3622 H 76 l 10,-30 z"
        id="path4144"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 236,762.3622 0,-290"
+       d="m 69.125,762.3622 v -290"
        id="path4146"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 336,762.3622 0,-290"
+       d="m 169.125,762.3622 v -290"
        id="path4148"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 636,762.3622 0,-290"
+       d="m 469.125,762.3622 v -290"
        id="path4212"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 436,762.3622 0,-290"
+       d="m 269.125,762.3622 v -290"
        id="path4214"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#0000c8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 536,762.3622 0,-290"
+       d="m 369.125,762.3622 v -290"
        id="path4216"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 236,472.3622 0,-70"
+       d="m 168.5,472.3622 v -70"
        id="path4218"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 336,472.3622 0,-70"
+       d="m 268.5,472.3622 v -70"
        id="path4220"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)"
-       d="m 236,412.3622 100,0"
+       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.49968749;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#Arrow2Lend)"
+       d="m 168.5,412.3622 h 100"
        id="path4222"
        inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 0.5;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 236,472.3622 -150,0"
-       id="path4224"
-       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="21.415058"
-       y="480.26877"
-       id="text4226"
-       sodipodi:linespacing="125%"><tspan
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.5123892"
+       y="485.31784"
+       id="text4226"><tspan
          sodipodi:role="line"
-         x="21.415058"
-         y="480.26877"
-         id="tspan4230">true</tspan></text>
+         x="2.5123892"
+         y="485.31784"
+         id="tspan4230"
+         style="font-size:27.9209px;line-height:1.25">true</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="15.563665"
-       y="757.29071"
-       id="text4226-3"
-       sodipodi:linespacing="125%"><tspan
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-10.313057"
+       y="757.42938"
+       id="text4226-3"><tspan
          sodipodi:role="line"
          id="tspan4618"
-         x="15.563665"
-         y="757.29071">false</tspan></text>
+         x="-10.313057"
+         y="757.42938"
+         style="font-size:27.9209px;line-height:1.25">false</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="177.85173"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="89.72673"
        y="792.94904"
-       id="text4226-3-6"
-       sodipodi:linespacing="125%"><tspan
+       id="text4226-3-6"><tspan
          sodipodi:role="line"
          id="tspan4622"
-         x="177.85173"
-         y="792.94904">startTime</tspan></text>
+         x="89.72673"
+         y="792.94904"
+         style="font-size:27.9209px;line-height:1.25">0</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="627.91663"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="500.41663"
        y="794.45868"
-       id="text4226-3-6-9"
-       sodipodi:linespacing="125%"><tspan
+       id="text4226-3-6-9"><tspan
          sodipodi:role="line"
          id="tspan4624"
-         x="627.91663"
-         y="794.45868">time</tspan></text>
+         x="500.41663"
+         y="794.45868"
+         style="font-size:27.9209px;line-height:1.25">time</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="243.5513"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="176.0513"
        y="400.8187"
-       id="text4226-3-6-9-2"
-       sodipodi:linespacing="125%"><tspan
+       id="text4226-3-6-9-2"><tspan
          sodipodi:role="line"
          id="tspan4620"
-         x="243.5513"
-         y="400.8187">period</tspan></text>
+         x="176.0513"
+         y="400.8187"
+         style="font-size:27.9209px;line-height:1.25">period</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:27.92092705px;line-height:125%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="102.269"
        y="323.74481"
-       id="text4226-7"
-       sodipodi:linespacing="125%"><tspan
+       id="text4226-7"><tspan
          sodipodi:role="line"
          id="tspan4646"
          x="102.269"
-<<<<<<< HEAD
-         y="323.74481">y</tspan></text>
-=======
          y="323.74481"
          style="font-size:27.9209px;line-height:1.25">y</tspan></text>
     <path
@@ -245,6 +270,5 @@
          x="87.9263"
          y="400.8187"
          style="font-size:27.9209px;line-height:1.25">shift</tspan></text>
->>>>>>> master
   </g>
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.png
index edf2bcb04d1..4393734965c 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.png and b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.svg
index c8e2d896c4b..a06875da332 100644
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.svg
+++ b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.svg
@@ -7,16 +7,16 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 1721.1851 856.27471"
+   viewBox="0 0 1696.7766 872.30738"
    version="1.1"
    id="svg180"
    sodipodi:docname="Toggle.svg"
-   inkscape:version="0.92.4 (33fec40, 2019-01-16)"
-   width="1721.1851"
-   height="856.27472"
+   width="1696.7766"
+   height="872.30737"
    inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/CDL/Logical/Toggle.png"
    inkscape:export-xdpi="80"
-   inkscape:export-ydpi="80">
+   inkscape:export-ydpi="80"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
   <metadata
      id="metadata186">
     <rdf:RDF>
@@ -31,20 +31,26 @@
   </metadata>
   <defs
      id="defs184">
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714" />
     <clipPath
-       id="clipArea2-3">
+       id="clipArea1-3">
       <rect
          x="110"
-         y="434"
+         y="34"
          width="389"
          height="313"
-         id="rect165-6" />
+         id="rect76-3" />
     </clipPath>
     <clipPath
        id="clipPath1005">
       <rect
          x="110"
-         y="434"
+         y="34"
          width="389"
          height="313"
          id="rect1003" />
@@ -53,25 +59,25 @@
        id="clipPath1009">
       <rect
          x="110"
-         y="434"
+         y="34"
          width="389"
          height="313"
          id="rect1007" />
     </clipPath>
     <clipPath
-       id="clipArea1-7">
+       id="clipArea2-8">
       <rect
          x="110"
-         y="34"
+         y="434"
          width="389"
          height="313"
-         id="rect76-5" />
+         id="rect165-0" />
     </clipPath>
     <clipPath
        id="clipPath1015">
       <rect
          x="110"
-         y="34"
+         y="434"
          width="389"
          height="313"
          id="rect1013" />
@@ -80,46 +86,46 @@
        id="clipPath1019">
       <rect
          x="110"
-         y="34"
+         y="434"
          width="389"
          height="313"
          id="rect1017" />
     </clipPath>
     <clipPath
-       id="clipArea1-2">
+       id="clipArea1-5">
       <rect
          x="110"
          y="34"
          width="389"
          height="313"
-         id="rect76-0" />
+         id="rect76-1" />
     </clipPath>
     <clipPath
-       id="clipPath1005-6">
+       id="clipPath1005-7">
       <rect
          x="110"
          y="34"
          width="389"
          height="313"
-         id="rect1003-8" />
+         id="rect1003-4" />
     </clipPath>
     <clipPath
-       id="clipPath1009-9">
+       id="clipPath1009-3">
       <rect
          x="110"
          y="34"
          width="389"
          height="313"
-         id="rect1007-2" />
+         id="rect1007-1" />
     </clipPath>
     <clipPath
-       id="clipArea2-6">
+       id="clipArea2-4">
       <rect
          x="110"
          y="434"
          width="389"
          height="313"
-         id="rect165-64" />
+         id="rect165-6" />
     </clipPath>
     <clipPath
        id="clipPath1015-9">
@@ -128,16 +134,376 @@
          y="434"
          width="389"
          height="313"
-         id="rect1013-5" />
+         id="rect1013-4" />
     </clipPath>
     <clipPath
-       id="clipPath1019-0">
+       id="clipPath1019-2">
       <rect
          x="110"
          y="434"
          width="389"
          height="313"
-         id="rect1017-4" />
+         id="rect1017-2" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-54">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect1253" />
+    </clipPath>
+    <clipPath
+       id="clipPath1938">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect1936" />
+    </clipPath>
+    <clipPath
+       id="clipPath1942">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect1940" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-9">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect1342" />
+    </clipPath>
+    <clipPath
+       id="clipPath1948">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect1946" />
+    </clipPath>
+    <clipPath
+       id="clipPath1952">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect1950" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-4">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect2332" />
+    </clipPath>
+    <clipPath
+       id="clipPath3017">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3015" />
+    </clipPath>
+    <clipPath
+       id="clipPath3021">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3019" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-92">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect2421" />
+    </clipPath>
+    <clipPath
+       id="clipPath3027">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3025" />
+    </clipPath>
+    <clipPath
+       id="clipPath3031">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3029" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-30">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3411" />
+    </clipPath>
+    <clipPath
+       id="clipPath4410">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect4408" />
+    </clipPath>
+    <clipPath
+       id="clipPath4414">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect4412" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-87">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3500" />
+    </clipPath>
+    <clipPath
+       id="clipPath4420">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect4418" />
+    </clipPath>
+    <clipPath
+       id="clipPath4424">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect4422" />
+    </clipPath>
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714-9" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4727" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714-1" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4762" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4714-1-4" />
+    <rect
+       x="-574.05023"
+       y="-2060.0652"
+       width="1210"
+       height="350"
+       id="rect4797" />
+    <clipPath
+       id="clipArea2-5">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect1744" />
+    </clipPath>
+    <clipPath
+       id="clipPath2340">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect2338" />
+    </clipPath>
+    <clipPath
+       id="clipPath2344">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect2342" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-6">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect1655" />
+    </clipPath>
+    <clipPath
+       id="clipPath2350">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect2348" />
+    </clipPath>
+    <clipPath
+       id="clipPath2354">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect2352" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-8">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect2734" />
+    </clipPath>
+    <clipPath
+       id="clipPath3419">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3417" />
+    </clipPath>
+    <clipPath
+       id="clipPath3423">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3421" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-6">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect2823" />
+    </clipPath>
+    <clipPath
+       id="clipPath3429">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3427" />
+    </clipPath>
+    <clipPath
+       id="clipPath3433">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3431" />
+    </clipPath>
+    <clipPath
+       id="clipArea2-66">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect3902" />
+    </clipPath>
+    <clipPath
+       id="clipPath4498">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect4496" />
+    </clipPath>
+    <clipPath
+       id="clipPath4502">
+      <rect
+         x="110"
+         y="433"
+         width="360"
+         height="313"
+         id="rect4500" />
+    </clipPath>
+    <clipPath
+       id="clipArea1-2">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect3813" />
+    </clipPath>
+    <clipPath
+       id="clipPath4508">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect4506" />
+    </clipPath>
+    <clipPath
+       id="clipPath4512">
+      <rect
+         x="110"
+         y="34"
+         width="360"
+         height="313"
+         id="rect4510" />
     </clipPath>
   </defs>
   <sodipodi:namedview
@@ -149,236 +515,28 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="3773"
-     inkscape:window-height="2105"
+     inkscape:window-width="2507"
+     inkscape:window-height="1977"
      id="namedview182"
-     showgrid="true"
-     inkscape:zoom="1.4818478"
-     inkscape:cx="888.2703"
-     inkscape:cy="362.39401"
-     inkscape:window-x="67"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg180"
+     showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0">
+     fit-margin-bottom="0"
+     inkscape:zoom="0.75359629"
+     inkscape:cx="977.04189"
+     inkscape:cy="738.15802"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg180"
+     inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
-       id="grid993"
-       originx="-2.1689443"
-       originy="-15.473642" />
+       id="grid1215"
+       originx="564.1806"
+       originy="1564.7303" />
   </sodipodi:namedview>
-  <polyline
-     points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline2"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="187.800000,34.000000 187.800000,347.000000"
-     id="polyline4"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="265.600000,34.000000 265.600000,347.000000"
-     id="polyline6"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="343.400000,34.000000 343.400000,347.000000"
-     id="polyline8"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="421.200000,34.000000 421.200000,347.000000"
-     id="polyline10"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="499.000000,34.000000 499.000000,347.000000"
-     id="polyline12"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <rect
-     x="67.831055"
-     y="91.135841"
-     width="389"
-     height="67.816704"
-     id="rect14"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="186.34033"
-     width="389"
-     height="67.816704"
-     id="rect16"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="281.54434"
-     width="389"
-     height="67.816704"
-     id="rect18"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <polyline
-     points="110.000000,347.000000 499.000000,347.000000"
-     id="polyline20"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="499.000000,347.000000 499.000000,34.000000"
-     id="polyline22"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="499.000000,34.000000 110.000000,34.000000"
-     id="polyline24"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline26"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="110.000000,347.000000 110.000000,355.000000"
-     id="polyline28"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="187.800000,347.000000 187.800000,355.000000"
-     id="polyline30"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="265.600000,347.000000 265.600000,355.000000"
-     id="polyline32"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="343.400000,347.000000 343.400000,355.000000"
-     id="polyline34"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="421.200000,347.000000 421.200000,355.000000"
-     id="polyline36"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="499.000000,347.000000 499.000000,355.000000"
-     id="polyline38"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     points="110.000000,347.000000 110.000000,359.800000"
-     id="polyline40"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="67.831055"
-     y="408.24835"
-     id="text42"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">0</text>
-  <polyline
-     points="265.600000,347.000000 265.600000,359.800000"
-     id="polyline44"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="223.43106"
-     y="408.24835"
-     id="text46"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">4</text>
-  <polyline
-     points="421.200000,347.000000 421.200000,359.800000"
-     id="polyline48"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="379.03107"
-     y="408.24835"
-     id="text50"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">8</text>
-  <polyline
-     points="102.000000,129.204167 110.000000,129.204167"
-     id="polyline52"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="158.95233"
-     id="text54"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,61.387500 110.000000,61.387500"
-     id="polyline56"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="91.135841"
-     id="text58"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,224.408333 110.000000,224.408333"
-     id="polyline60"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="254.15634"
-     id="text62"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,156.591667 110.000000,156.591667"
-     id="polyline64"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="186.34033"
-     id="text66"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,319.612500 110.000000,319.612500"
-     id="polyline68"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="349.36136"
-     id="text70"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,251.795833 110.000000,251.795833"
-     id="polyline72"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="281.54434"
-     id="text74"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
   <clipPath
      id="clipArea1">
     <rect
@@ -388,254 +546,6 @@
        height="313"
        id="rect76" />
   </clipPath>
-  <polyline
-     clip-path="url(#clipArea1)"
-     points="110.000000,61.387500 110.778000,61.387500 111.556000,61.387500 112.334000,61.387500 113.112000,61.387500 113.890000,61.387500 114.668000,61.387500 115.446000,61.387500 116.224000,61.387500 117.002000,61.387500 117.780000,61.387500 118.558000,61.387500 119.336000,61.387500 120.114000,61.387500 120.892000,61.387500 121.670000,61.387500 122.448000,61.387500 123.226000,61.387500 124.004001,61.387500 124.782000,61.387500 125.560000,61.387500 126.337999,61.387500 127.116000,61.387500 127.894000,61.387500 128.672000,61.387500 129.450000,61.387500 130.227999,61.387500 131.006001,61.387500 131.784000,61.387500 132.561999,61.387500 133.340001,61.387500 134.118000,61.387500 134.895999,61.387500 135.674001,61.387500 136.452000,61.387500 137.230000,61.387500 138.008001,61.387500 138.786000,61.387500 139.564000,61.387500 140.341999,61.387500 141.120000,61.387500 141.898000,61.387500 142.675999,61.387500 143.454001,61.387500 144.232000,61.387500 145.009999,61.387500 145.788001,61.387500 146.566000,61.387500 147.343999,61.387500 148.122001,61.387500 148.900000,61.387500 148.900000,129.204167 148.900000,129.204167 148.900000,129.204167 149.677999,129.204167 150.455999,129.204167 151.233998,129.204167 152.012002,129.204167 152.790001,129.204167 153.568000,129.204167 154.345999,129.204167 155.123999,129.204167 155.901998,129.204167 156.680002,129.204167 157.458001,129.204167 158.236000,129.204167 159.014000,129.204167 159.791999,129.204167 160.569998,129.204167 161.348002,129.204167 162.126001,129.204167 162.904001,129.204167 163.682000,129.204167 164.459999,129.204167 165.237998,129.204167 166.016002,129.204167 166.794001,129.204167 167.572001,129.204167 168.350000,129.204167 169.127999,129.204167 169.905999,129.204167 170.683998,129.204167 171.462002,129.204167 172.240001,129.204167 173.018000,129.204167 173.795999,129.204167 174.573999,129.204167 175.351998,129.204167 176.130002,129.204167 176.908001,129.204167 177.686000,129.204167 178.464000,129.204167 179.241999,129.204167 180.019998,129.204167 180.798002,129.204167 181.576001,129.204167 182.354001,129.204167 183.132000,129.204167 183.909999,129.204167 184.687998,129.204167 185.466002,129.204167 186.244001,129.204167 187.022001,129.204167 187.800000,129.204167 187.800000,61.387500 187.800000,61.387500 188.577999,61.387500 189.355999,61.387500 190.133998,61.387500 190.911997,61.387500 191.689996,61.387500 192.467996,61.387500 193.246004,61.387500 194.024003,61.387500 194.802003,61.387500 195.580002,61.387500 196.358001,61.387500 197.136000,61.387500 197.914000,61.387500 198.691999,61.387500 199.469998,61.387500 200.247997,61.387500 201.025997,61.387500 201.803996,61.387500 202.582004,61.387500 203.360004,61.387500 204.138003,61.387500 204.916002,61.387500 205.694001,61.387500 206.472001,61.387500 207.250000,61.387500 208.027999,61.387500 208.805999,61.387500 209.583998,61.387500 210.361997,61.387500 211.139996,61.387500 211.917996,61.387500 212.696004,61.387500 213.474003,61.387500 214.252003,61.387500 215.030002,61.387500 215.808001,61.387500 216.586000,61.387500 217.364000,61.387500 218.141999,61.387500 218.919998,61.387500 219.697997,61.387500 220.475997,61.387500 221.253996,61.387500 222.032004,61.387500 222.810004,61.387500 223.588003,61.387500 224.366002,61.387500 225.144001,61.387500 225.922001,61.387500 226.700000,61.387500 226.700000,129.204167 226.700000,129.204167 227.477999,129.204167 228.255999,129.204167 229.033998,129.204167 229.811997,129.204167 230.589996,129.204167 231.367996,129.204167 232.146004,129.204167 232.924003,129.204167 233.702003,129.204167 234.480002,129.204167 235.258001,129.204167 236.036000,129.204167 236.814000,129.204167 237.591999,129.204167 238.369998,129.204167 239.147997,129.204167 239.925997,129.204167 240.703996,129.204167 241.482004,129.204167 242.260004,129.204167 243.038003,129.204167 243.816002,129.204167 244.594001,129.204167 245.372001,129.204167 246.150000,129.204167 246.927999,129.204167 247.705999,129.204167 248.483998,129.204167 249.261997,129.204167 250.039996,129.204167 250.817996,129.204167 251.596004,129.204167 252.374003,129.204167 253.152003,129.204167 253.930002,129.204167 254.708001,129.204167 255.486000,129.204167 256.264000,129.204167 257.041999,129.204167 257.819998,129.204167 258.597997,129.204167 259.375997,129.204167 260.153996,129.204167 260.932004,129.204167 261.710004,129.204167 262.488003,129.204167 263.266002,129.204167 264.044001,129.204167 264.822001,129.204167 265.600000,129.204167 265.600000,61.387500 265.600000,61.387500 266.377999,61.387500 267.155999,61.387500 267.933998,61.387500 268.711997,61.387500 269.489996,61.387500 270.267996,61.387500 271.045995,61.387500 271.823994,61.387500 272.601993,61.387500 273.379993,61.387500 274.157992,61.387500 274.935991,61.387500 275.714009,61.387500 276.492008,61.387500 277.270007,61.387500 278.048007,61.387500 278.826006,61.387500 279.604005,61.387500 280.382004,61.387500 281.160004,61.387500 281.938003,61.387500 282.716002,61.387500 283.494001,61.387500 284.272001,61.387500 285.050000,61.387500 285.827999,61.387500 286.605999,61.387500 287.383998,61.387500 288.161997,61.387500 288.939996,61.387500 289.717996,61.387500 290.495995,61.387500 291.273994,61.387500 292.051993,61.387500 292.829993,61.387500 293.607992,61.387500 294.385991,61.387500 295.164009,61.387500 295.942008,61.387500 296.720007,61.387500 297.498007,61.387500 298.276006,61.387500 299.054005,61.387500 299.832004,61.387500 300.610004,61.387500 301.388003,61.387500 302.166002,61.387500 302.944001,61.387500 303.722001,61.387500 304.500000,61.387500 304.500000,129.204167 305.277999,129.204167 306.055999,129.204167 306.833998,129.204167 307.611997,129.204167 308.389996,129.204167 309.167996,129.204167 309.945995,129.204167 310.723994,129.204167 311.501993,129.204167 312.279993,129.204167 313.057992,129.204167 313.835991,129.204167 314.614009,129.204167 315.392008,129.204167 316.170007,129.204167 316.948007,129.204167 317.726006,129.204167 318.504005,129.204167 319.282004,129.204167 320.060004,129.204167 320.838003,129.204167 321.616002,129.204167 322.394001,129.204167 323.172001,129.204167 323.950000,129.204167 324.727999,129.204167 325.505999,129.204167 326.283998,129.204167 327.061997,129.204167 327.839996,129.204167 328.617996,129.204167 329.395995,129.204167 330.173994,129.204167 330.951993,129.204167 331.729993,129.204167 332.507992,129.204167 333.285991,129.204167 334.064009,129.204167 334.842008,129.204167 335.620007,129.204167 336.398007,129.204167 337.176006,129.204167 337.954005,129.204167 338.732004,129.204167 339.510004,129.204167 340.288003,129.204167 341.066002,129.204167 341.844001,129.204167 342.622001,129.204167 343.400000,129.204167 343.400000,61.387500 344.177999,61.387500 344.955999,61.387500 345.733998,61.387500 346.511997,61.387500 347.289996,61.387500 348.067996,61.387500 348.845995,61.387500 349.623994,61.387500 350.401993,61.387500 351.179993,61.387500 351.957992,61.387500 352.735991,61.387500 353.514009,61.387500 354.292008,61.387500 355.070007,61.387500 355.848007,61.387500 356.626006,61.387500 357.404005,61.387500 358.182004,61.387500 358.960004,61.387500 359.738003,61.387500 360.516002,61.387500 361.294001,61.387500 362.072001,61.387500 362.850000,61.387500 363.627999,61.387500 364.405999,61.387500 365.183998,61.387500 365.961997,61.387500 366.739996,61.387500 367.517996,61.387500 368.295995,61.387500 369.073994,61.387500 369.851993,61.387500 370.629993,61.387500 371.407992,61.387500 372.185991,61.387500 372.964009,61.387500 373.742008,61.387500 374.520007,61.387500 375.298007,61.387500 376.076006,61.387500 376.854005,61.387500 377.632004,61.387500 378.410004,61.387500 379.188003,61.387500 379.966002,61.387500 380.744001,61.387500 381.522001,61.387500 382.300000,61.387500 382.300000,129.204167 383.077999,129.204167 383.855999,129.204167 384.633998,129.204167 385.411997,129.204167 386.189996,129.204167 386.967996,129.204167 387.745995,129.204167 388.523994,129.204167 389.301993,129.204167 390.079993,129.204167 390.857992,129.204167 391.635991,129.204167 392.414009,129.204167 393.192008,129.204167 393.970007,129.204167 394.748007,129.204167 395.526006,129.204167 396.304005,129.204167 397.082004,129.204167 397.860004,129.204167 398.638003,129.204167 399.416002,129.204167 400.194001,129.204167 400.972001,129.204167 401.750000,129.204167 402.527999,129.204167 403.305999,129.204167 404.083998,129.204167 404.861997,129.204167 405.639996,129.204167 406.417996,129.204167 407.195995,129.204167 407.973994,129.204167 408.751993,129.204167 409.529993,129.204167 410.307992,129.204167 411.085991,129.204167 411.864009,129.204167 412.642008,129.204167 413.420007,129.204167 414.198007,129.204167 414.976006,129.204167 415.754005,129.204167 416.532004,129.204167 417.310004,129.204167 418.088003,129.204167 418.866002,129.204167 419.644001,129.204167 420.422001,129.204167 421.200000,129.204167 421.200000,61.387500 421.978018,61.387500 422.755999,61.387500 423.534016,61.387500 424.311997,61.387500 425.090015,61.387500 425.867996,61.387500 426.646013,61.387500 427.423994,61.387500 428.202012,61.387500 428.979993,61.387500 429.758010,61.387500 430.535991,61.387500 431.314009,61.387500 432.091990,61.387500 432.870007,61.387500 433.647988,61.387500 434.426006,61.387500 435.203987,61.387500 435.982004,61.387500 436.759985,61.387500 437.538003,61.387500 438.315984,61.387500 439.094001,61.387500 439.871982,61.387500 440.650000,61.387500 441.428018,61.387500 442.205999,61.387500 442.984016,61.387500 443.761997,61.387500 444.540015,61.387500 445.317996,61.387500 446.096013,61.387500 446.873994,61.387500 447.652012,61.387500 448.429993,61.387500 449.208010,61.387500 449.985991,61.387500 450.764009,61.387500 451.541990,61.387500 452.320007,61.387500 453.097988,61.387500 453.876006,61.387500 454.653987,61.387500 455.432004,61.387500 456.209985,61.387500 456.988003,61.387500 457.765984,61.387500 458.544001,61.387500 459.321982,61.387500 460.100000,61.387500 460.100000,129.204167 460.878018,129.204167 461.655999,129.204167 462.434016,129.204167 463.211997,129.204167 463.990015,129.204167 464.767996,129.204167 465.546013,129.204167 466.323994,129.204167 467.102012,129.204167 467.879993,129.204167 468.658010,129.204167 469.435991,129.204167 470.214009,129.204167 470.991990,129.204167 471.770007,129.204167 472.547988,129.204167 473.326006,129.204167 474.103987,129.204167 474.882004,129.204167 475.659985,129.204167 476.438003,129.204167 477.215984,129.204167 477.994001,129.204167 478.771982,129.204167 479.550000,129.204167 480.328018,129.204167 481.105999,129.204167 481.884016,129.204167 482.661997,129.204167 483.440015,129.204167 484.217996,129.204167 484.996013,129.204167 485.773994,129.204167 486.552012,129.204167 487.329993,129.204167 488.108010,129.204167 488.885991,129.204167 489.664009,129.204167 490.441990,129.204167 491.220007,129.204167 491.997988,129.204167 492.776006,129.204167 493.553987,129.204167 494.332004,129.204167 495.109985,129.204167 495.888003,129.204167 496.665984,129.204167 497.444001,129.204167 498.221982,129.204167 499.000000,129.204167 499.000000,61.387500"
-     id="polyline79"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     clip-path="url(#clipArea1)"
-     points="110.000000,224.408333 110.778000,224.408333 111.556000,224.408333 112.334000,224.408333 113.112000,224.408333 113.890000,224.408333 114.668000,224.408333 115.446000,224.408333 116.224000,224.408333 117.002000,224.408333 117.780000,224.408333 118.558000,224.408333 119.336000,224.408333 120.114000,224.408333 120.892000,224.408333 121.670000,224.408333 122.448000,224.408333 123.226000,224.408333 124.004001,224.408333 124.782000,224.408333 125.560000,224.408333 126.337999,224.408333 127.116000,224.408333 127.894000,224.408333 128.672000,224.408333 129.450000,224.408333 130.227999,224.408333 131.006001,224.408333 131.784000,224.408333 132.561999,224.408333 133.340001,224.408333 134.118000,224.408333 134.895999,224.408333 135.674001,224.408333 136.452000,224.408333 137.230000,224.408333 138.008001,224.408333 138.786000,224.408333 139.564000,224.408333 140.341999,224.408333 141.120000,224.408333 141.898000,224.408333 142.675999,224.408333 143.454001,224.408333 144.232000,224.408333 145.009999,224.408333 145.788001,224.408333 146.566000,224.408333 147.343999,224.408333 148.122001,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 149.677999,224.408333 150.455999,224.408333 151.233998,224.408333 152.012002,224.408333 152.790001,224.408333 153.568000,224.408333 154.345999,224.408333 155.123999,224.408333 155.901998,224.408333 156.680002,224.408333 157.458001,224.408333 158.236000,224.408333 159.014000,224.408333 159.791999,224.408333 160.569998,224.408333 161.348002,224.408333 162.126001,224.408333 162.904001,224.408333 163.682000,224.408333 164.459999,224.408333 165.237998,224.408333 166.016002,224.408333 166.794001,224.408333 167.572001,224.408333 168.350000,224.408333 169.127999,224.408333 169.905999,224.408333 170.683998,224.408333 171.462002,224.408333 172.240001,224.408333 173.018000,224.408333 173.795999,224.408333 174.573999,224.408333 175.351998,224.408333 176.130002,224.408333 176.908001,224.408333 177.686000,224.408333 178.464000,224.408333 179.241999,224.408333 180.019998,224.408333 180.798002,224.408333 181.576001,224.408333 182.354001,224.408333 183.132000,224.408333 183.909999,224.408333 184.687998,224.408333 185.466002,224.408333 186.244001,224.408333 187.022001,224.408333 187.800000,224.408333 187.800000,224.408333 187.800000,224.408333 188.577999,224.408333 189.355999,224.408333 190.133998,224.408333 190.911997,224.408333 191.689996,224.408333 192.467996,224.408333 193.246004,224.408333 194.024003,224.408333 194.802003,224.408333 195.580002,224.408333 196.358001,224.408333 197.136000,224.408333 197.914000,224.408333 198.691999,224.408333 199.469998,224.408333 200.247997,224.408333 201.025997,224.408333 201.803996,224.408333 202.582004,224.408333 203.360004,224.408333 204.138003,224.408333 204.916002,224.408333 205.694001,224.408333 206.472001,224.408333 207.250000,224.408333 208.027999,224.408333 208.805999,224.408333 209.583998,224.408333 210.361997,224.408333 211.139996,224.408333 211.917996,224.408333 212.696004,224.408333 213.474003,224.408333 214.252003,224.408333 215.030002,224.408333 215.808001,224.408333 216.586000,224.408333 217.364000,224.408333 218.141999,224.408333 218.919998,224.408333 219.697997,224.408333 220.475997,224.408333 221.253996,224.408333 222.032004,224.408333 222.810004,224.408333 223.588003,224.408333 224.366002,224.408333 225.144001,224.408333 225.922001,224.408333 226.700000,224.408333 226.700000,224.408333 226.700000,224.408333 227.477999,224.408333 228.255999,224.408333 229.033998,224.408333 229.811997,224.408333 230.589996,224.408333 231.367996,224.408333 232.146004,224.408333 232.924003,224.408333 233.702003,224.408333 234.480002,224.408333 235.258001,224.408333 236.036000,224.408333 236.814000,224.408333 237.591999,224.408333 238.369998,224.408333 239.147997,224.408333 239.925997,224.408333 240.703996,224.408333 241.482004,224.408333 242.260004,224.408333 243.038003,224.408333 243.816002,224.408333 244.594001,224.408333 245.372001,224.408333 246.150000,224.408333 246.927999,224.408333 247.705999,224.408333 248.483998,224.408333 249.261997,224.408333 250.039996,224.408333 250.817996,224.408333 251.596004,224.408333 252.374003,224.408333 253.152003,224.408333 253.930002,224.408333 254.708001,224.408333 255.486000,224.408333 256.264000,224.408333 257.041999,224.408333 257.819998,224.408333 258.597997,224.408333 259.375997,224.408333 260.153996,224.408333 260.932004,224.408333 261.710004,224.408333 262.488003,224.408333 263.266002,224.408333 264.044001,224.408333 264.822001,224.408333 265.600000,224.408333 265.600000,224.408333 265.600000,224.408333 266.377999,224.408333 267.155999,224.408333 267.933998,224.408333 268.711997,224.408333 269.489996,224.408333 270.267996,224.408333 271.045995,224.408333 271.823994,224.408333 272.601993,224.408333 273.379993,224.408333 274.157992,224.408333 274.935991,224.408333 275.714009,224.408333 276.492008,224.408333 277.270007,224.408333 278.048007,224.408333 278.826006,224.408333 279.604005,224.408333 280.382004,224.408333 281.160004,224.408333 281.938003,224.408333 282.716002,224.408333 283.494001,224.408333 284.272001,224.408333 285.050000,224.408333 285.827999,224.408333 286.605999,224.408333 287.383998,224.408333 288.161997,224.408333 288.939996,224.408333 289.717996,224.408333 290.495995,224.408333 291.273994,224.408333 292.051993,224.408333 292.829993,224.408333 293.607992,224.408333 294.385991,224.408333 295.164009,224.408333 295.942008,224.408333 296.720007,224.408333 297.498007,224.408333 298.276006,224.408333 299.054005,224.408333 299.832004,224.408333 300.610004,224.408333 301.388003,224.408333 302.166002,224.408333 302.944001,224.408333 303.722001,224.408333 304.500000,224.408333 304.500000,224.408333 305.277999,224.408333 306.055999,224.408333 306.833998,224.408333 307.611997,224.408333 308.389996,224.408333 309.167996,224.408333 309.945995,224.408333 310.723994,224.408333 311.501993,224.408333 312.279993,224.408333 313.057992,224.408333 313.835991,224.408333 314.614009,224.408333 315.392008,224.408333 316.170007,224.408333 316.948007,224.408333 317.726006,224.408333 318.504005,224.408333 319.282004,224.408333 320.060004,224.408333 320.838003,224.408333 321.616002,224.408333 322.394001,224.408333 323.172001,224.408333 323.950000,224.408333 324.727999,224.408333 325.505999,224.408333 326.283998,224.408333 327.061997,224.408333 327.839996,224.408333 328.617996,224.408333 329.395995,224.408333 330.173994,224.408333 330.951993,224.408333 331.729993,224.408333 332.507992,224.408333 333.285991,224.408333 334.064009,224.408333 334.842008,224.408333 335.620007,224.408333 336.398007,224.408333 337.176006,224.408333 337.954005,224.408333 338.732004,224.408333 339.510004,224.408333 340.288003,224.408333 341.066002,224.408333 341.844001,224.408333 342.622001,224.408333 343.400000,224.408333 343.400000,224.408333 344.177999,224.408333 344.955999,224.408333 345.733998,224.408333 346.511997,224.408333 347.289996,224.408333 348.067996,224.408333 348.845995,224.408333 349.623994,224.408333 350.401993,224.408333 351.179993,224.408333 351.957992,224.408333 352.735991,224.408333 353.514009,224.408333 354.292008,224.408333 355.070007,224.408333 355.848007,224.408333 356.626006,224.408333 357.404005,224.408333 358.182004,224.408333 358.960004,224.408333 359.738003,224.408333 360.516002,224.408333 361.294001,224.408333 362.072001,224.408333 362.850000,224.408333 363.627999,224.408333 364.405999,224.408333 365.183998,224.408333 365.961997,224.408333 366.739996,224.408333 367.517996,224.408333 368.295995,224.408333 369.073994,224.408333 369.851993,224.408333 370.629993,224.408333 371.407992,224.408333 372.185991,224.408333 372.964009,224.408333 373.742008,224.408333 374.520007,224.408333 375.298007,224.408333 376.076006,224.408333 376.854005,224.408333 377.632004,224.408333 378.410004,224.408333 379.188003,224.408333 379.966002,224.408333 380.744001,224.408333 381.522001,224.408333 382.300000,224.408333 382.300000,224.408333 383.077999,224.408333 383.855999,224.408333 384.633998,224.408333 385.411997,224.408333 386.189996,224.408333 386.967996,224.408333 387.745995,224.408333 388.523994,224.408333 389.301993,224.408333 390.079993,224.408333 390.857992,224.408333 391.635991,224.408333 392.414009,224.408333 393.192008,224.408333 393.970007,224.408333 394.748007,224.408333 395.526006,224.408333 396.304005,224.408333 397.082004,224.408333 397.860004,224.408333 398.638003,224.408333 399.416002,224.408333 400.194001,224.408333 400.972001,224.408333 401.750000,224.408333 402.527999,224.408333 403.305999,224.408333 404.083998,224.408333 404.861997,224.408333 405.639996,224.408333 406.417996,224.408333 407.195995,224.408333 407.973994,224.408333 408.751993,224.408333 409.529993,224.408333 410.307992,224.408333 411.085991,224.408333 411.864009,224.408333 412.642008,224.408333 413.420007,224.408333 414.198007,224.408333 414.976006,224.408333 415.754005,224.408333 416.532004,224.408333 417.310004,224.408333 418.088003,224.408333 418.866002,224.408333 419.644001,224.408333 420.422001,224.408333 421.200000,224.408333 421.200000,224.408333 421.978018,224.408333 422.755999,224.408333 423.534016,224.408333 424.311997,224.408333 425.090015,224.408333 425.867996,224.408333 426.646013,224.408333 427.423994,224.408333 428.202012,224.408333 428.979993,224.408333 429.758010,224.408333 430.535991,224.408333 431.314009,224.408333 432.091990,224.408333 432.870007,224.408333 433.647988,224.408333 434.426006,224.408333 435.203987,224.408333 435.982004,224.408333 436.759985,224.408333 437.538003,224.408333 438.315984,224.408333 439.094001,224.408333 439.871982,224.408333 440.650000,224.408333 441.428018,224.408333 442.205999,224.408333 442.984016,224.408333 443.761997,224.408333 444.540015,224.408333 445.317996,224.408333 446.096013,224.408333 446.873994,224.408333 447.652012,224.408333 448.429993,224.408333 449.208010,224.408333 449.985991,224.408333 450.764009,224.408333 451.541990,224.408333 452.320007,224.408333 453.097988,224.408333 453.876006,224.408333 454.653987,224.408333 455.432004,224.408333 456.209985,224.408333 456.988003,224.408333 457.765984,224.408333 458.544001,224.408333 459.321982,224.408333 460.100000,224.408333 460.100000,224.408333 460.878018,224.408333 461.655999,224.408333 462.434016,224.408333 463.211997,224.408333 463.990015,224.408333 464.767996,224.408333 465.546013,224.408333 466.323994,224.408333 467.102012,224.408333 467.879993,224.408333 468.658010,224.408333 469.435991,224.408333 470.214009,224.408333 470.991990,224.408333 471.770007,224.408333 472.547988,224.408333 473.326006,224.408333 474.103987,224.408333 474.882004,224.408333 475.659985,224.408333 476.438003,224.408333 477.215984,224.408333 477.994001,224.408333 478.771982,224.408333 479.550000,224.408333 480.328018,224.408333 481.105999,224.408333 481.884016,224.408333 482.661997,224.408333 483.440015,224.408333 484.217996,224.408333 484.996013,224.408333 485.773994,224.408333 486.552012,224.408333 487.329993,224.408333 488.108010,224.408333 488.885991,224.408333 489.664009,224.408333 490.441990,224.408333 491.220007,224.408333 491.997988,224.408333 492.776006,224.408333 493.553987,224.408333 494.332004,224.408333 495.109985,224.408333 495.888003,224.408333 496.665984,224.408333 497.444001,224.408333 498.221982,224.408333 499.000000,224.408333 499.000000,224.408333"
-     id="polyline81"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <polyline
-     clip-path="url(#clipArea1)"
-     points="110.000000,319.612500 110.778000,319.612500 111.556000,319.612500 112.334000,319.612500 113.112000,319.612500 113.890000,319.612500 114.668000,319.612500 115.446000,319.612500 116.224000,319.612500 117.002000,319.612500 117.780000,319.612500 118.558000,319.612500 119.336000,319.612500 120.114000,319.612500 120.892000,319.612500 121.670000,319.612500 122.448000,319.612500 123.226000,319.612500 124.004001,319.612500 124.782000,319.612500 125.560000,319.612500 126.337999,319.612500 127.116000,319.612500 127.894000,319.612500 128.672000,319.612500 129.450000,319.612500 130.227999,319.612500 131.006001,319.612500 131.784000,319.612500 132.561999,319.612500 133.340001,319.612500 134.118000,319.612500 134.895999,319.612500 135.674001,319.612500 136.452000,319.612500 137.230000,319.612500 138.008001,319.612500 138.786000,319.612500 139.564000,319.612500 140.341999,319.612500 141.120000,319.612500 141.898000,319.612500 142.675999,319.612500 143.454001,319.612500 144.232000,319.612500 145.009999,319.612500 145.788001,319.612500 146.566000,319.612500 147.343999,319.612500 148.122001,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 149.677999,319.612500 150.455999,319.612500 151.233998,319.612500 152.012002,319.612500 152.790001,319.612500 153.568000,319.612500 154.345999,319.612500 155.123999,319.612500 155.901998,319.612500 156.680002,319.612500 157.458001,319.612500 158.236000,319.612500 159.014000,319.612500 159.791999,319.612500 160.569998,319.612500 161.348002,319.612500 162.126001,319.612500 162.904001,319.612500 163.682000,319.612500 164.459999,319.612500 165.237998,319.612500 166.016002,319.612500 166.794001,319.612500 167.572001,319.612500 168.350000,319.612500 169.127999,319.612500 169.905999,319.612500 170.683998,319.612500 171.462002,319.612500 172.240001,319.612500 173.018000,319.612500 173.795999,319.612500 174.573999,319.612500 175.351998,319.612500 176.130002,319.612500 176.908001,319.612500 177.686000,319.612500 178.464000,319.612500 179.241999,319.612500 180.019998,319.612500 180.798002,319.612500 181.576001,319.612500 182.354001,319.612500 183.132000,319.612500 183.909999,319.612500 184.687998,319.612500 185.466002,319.612500 186.244001,319.612500 187.022001,319.612500 187.800000,319.612500 187.800000,251.795833 187.800000,251.795833 188.577999,251.795833 189.355999,251.795833 190.133998,251.795833 190.911997,251.795833 191.689996,251.795833 192.467996,251.795833 193.246004,251.795833 194.024003,251.795833 194.802003,251.795833 195.580002,251.795833 196.358001,251.795833 197.136000,251.795833 197.914000,251.795833 198.691999,251.795833 199.469998,251.795833 200.247997,251.795833 201.025997,251.795833 201.803996,251.795833 202.582004,251.795833 203.360004,251.795833 204.138003,251.795833 204.916002,251.795833 205.694001,251.795833 206.472001,251.795833 207.250000,251.795833 208.027999,251.795833 208.805999,251.795833 209.583998,251.795833 210.361997,251.795833 211.139996,251.795833 211.917996,251.795833 212.696004,251.795833 213.474003,251.795833 214.252003,251.795833 215.030002,251.795833 215.808001,251.795833 216.586000,251.795833 217.364000,251.795833 218.141999,251.795833 218.919998,251.795833 219.697997,251.795833 220.475997,251.795833 221.253996,251.795833 222.032004,251.795833 222.810004,251.795833 223.588003,251.795833 224.366002,251.795833 225.144001,251.795833 225.922001,251.795833 226.700000,251.795833 226.700000,251.795833 226.700000,251.795833 227.477999,251.795833 228.255999,251.795833 229.033998,251.795833 229.811997,251.795833 230.589996,251.795833 231.367996,251.795833 232.146004,251.795833 232.924003,251.795833 233.702003,251.795833 234.480002,251.795833 235.258001,251.795833 236.036000,251.795833 236.814000,251.795833 237.591999,251.795833 238.369998,251.795833 239.147997,251.795833 239.925997,251.795833 240.703996,251.795833 241.482004,251.795833 242.260004,251.795833 243.038003,251.795833 243.816002,251.795833 244.594001,251.795833 245.372001,251.795833 246.150000,251.795833 246.927999,251.795833 247.705999,251.795833 248.483998,251.795833 249.261997,251.795833 250.039996,251.795833 250.817996,251.795833 251.596004,251.795833 252.374003,251.795833 253.152003,251.795833 253.930002,251.795833 254.708001,251.795833 255.486000,251.795833 256.264000,251.795833 257.041999,251.795833 257.819998,251.795833 258.597997,251.795833 259.375997,251.795833 260.153996,251.795833 260.932004,251.795833 261.710004,251.795833 262.488003,251.795833 263.266002,251.795833 264.044001,251.795833 264.822001,251.795833 265.600000,251.795833 265.600000,319.612500 265.600000,319.612500 266.377999,319.612500 267.155999,319.612500 267.933998,319.612500 268.711997,319.612500 269.489996,319.612500 270.267996,319.612500 271.045995,319.612500 271.823994,319.612500 272.601993,319.612500 273.379993,319.612500 274.157992,319.612500 274.935991,319.612500 275.714009,319.612500 276.492008,319.612500 277.270007,319.612500 278.048007,319.612500 278.826006,319.612500 279.604005,319.612500 280.382004,319.612500 281.160004,319.612500 281.938003,319.612500 282.716002,319.612500 283.494001,319.612500 284.272001,319.612500 285.050000,319.612500 285.827999,319.612500 286.605999,319.612500 287.383998,319.612500 288.161997,319.612500 288.939996,319.612500 289.717996,319.612500 290.495995,319.612500 291.273994,319.612500 292.051993,319.612500 292.829993,319.612500 293.607992,319.612500 294.385991,319.612500 295.164009,319.612500 295.942008,319.612500 296.720007,319.612500 297.498007,319.612500 298.276006,319.612500 299.054005,319.612500 299.832004,319.612500 300.610004,319.612500 301.388003,319.612500 302.166002,319.612500 302.944001,319.612500 303.722001,319.612500 304.500000,319.612500 304.500000,319.612500 305.277999,319.612500 306.055999,319.612500 306.833998,319.612500 307.611997,319.612500 308.389996,319.612500 309.167996,319.612500 309.945995,319.612500 310.723994,319.612500 311.501993,319.612500 312.279993,319.612500 313.057992,319.612500 313.835991,319.612500 314.614009,319.612500 315.392008,319.612500 316.170007,319.612500 316.948007,319.612500 317.726006,319.612500 318.504005,319.612500 319.282004,319.612500 320.060004,319.612500 320.838003,319.612500 321.616002,319.612500 322.394001,319.612500 323.172001,319.612500 323.950000,319.612500 324.727999,319.612500 325.505999,319.612500 326.283998,319.612500 327.061997,319.612500 327.839996,319.612500 328.617996,319.612500 329.395995,319.612500 330.173994,319.612500 330.951993,319.612500 331.729993,319.612500 332.507992,319.612500 333.285991,319.612500 334.064009,319.612500 334.842008,319.612500 335.620007,319.612500 336.398007,319.612500 337.176006,319.612500 337.954005,319.612500 338.732004,319.612500 339.510004,319.612500 340.288003,319.612500 341.066002,319.612500 341.844001,319.612500 342.622001,319.612500 343.400000,319.612500 343.400000,251.795833 344.177999,251.795833 344.955999,251.795833 345.733998,251.795833 346.511997,251.795833 347.289996,251.795833 348.067996,251.795833 348.845995,251.795833 349.623994,251.795833 350.401993,251.795833 351.179993,251.795833 351.957992,251.795833 352.735991,251.795833 353.514009,251.795833 354.292008,251.795833 355.070007,251.795833 355.848007,251.795833 356.626006,251.795833 357.404005,251.795833 358.182004,251.795833 358.960004,251.795833 359.738003,251.795833 360.516002,251.795833 361.294001,251.795833 362.072001,251.795833 362.850000,251.795833 363.627999,251.795833 364.405999,251.795833 365.183998,251.795833 365.961997,251.795833 366.739996,251.795833 367.517996,251.795833 368.295995,251.795833 369.073994,251.795833 369.851993,251.795833 370.629993,251.795833 371.407992,251.795833 372.185991,251.795833 372.964009,251.795833 373.742008,251.795833 374.520007,251.795833 375.298007,251.795833 376.076006,251.795833 376.854005,251.795833 377.632004,251.795833 378.410004,251.795833 379.188003,251.795833 379.966002,251.795833 380.744001,251.795833 381.522001,251.795833 382.300000,251.795833 382.300000,251.795833 383.077999,251.795833 383.855999,251.795833 384.633998,251.795833 385.411997,251.795833 386.189996,251.795833 386.967996,251.795833 387.745995,251.795833 388.523994,251.795833 389.301993,251.795833 390.079993,251.795833 390.857992,251.795833 391.635991,251.795833 392.414009,251.795833 393.192008,251.795833 393.970007,251.795833 394.748007,251.795833 395.526006,251.795833 396.304005,251.795833 397.082004,251.795833 397.860004,251.795833 398.638003,251.795833 399.416002,251.795833 400.194001,251.795833 400.972001,251.795833 401.750000,251.795833 402.527999,251.795833 403.305999,251.795833 404.083998,251.795833 404.861997,251.795833 405.639996,251.795833 406.417996,251.795833 407.195995,251.795833 407.973994,251.795833 408.751993,251.795833 409.529993,251.795833 410.307992,251.795833 411.085991,251.795833 411.864009,251.795833 412.642008,251.795833 413.420007,251.795833 414.198007,251.795833 414.976006,251.795833 415.754005,251.795833 416.532004,251.795833 417.310004,251.795833 418.088003,251.795833 418.866002,251.795833 419.644001,251.795833 420.422001,251.795833 421.200000,251.795833 421.200000,319.612500 421.978018,319.612500 422.755999,319.612500 423.534016,319.612500 424.311997,319.612500 425.090015,319.612500 425.867996,319.612500 426.646013,319.612500 427.423994,319.612500 428.202012,319.612500 428.979993,319.612500 429.758010,319.612500 430.535991,319.612500 431.314009,319.612500 432.091990,319.612500 432.870007,319.612500 433.647988,319.612500 434.426006,319.612500 435.203987,319.612500 435.982004,319.612500 436.759985,319.612500 437.538003,319.612500 438.315984,319.612500 439.094001,319.612500 439.871982,319.612500 440.650000,319.612500 441.428018,319.612500 442.205999,319.612500 442.984016,319.612500 443.761997,319.612500 444.540015,319.612500 445.317996,319.612500 446.096013,319.612500 446.873994,319.612500 447.652012,319.612500 448.429993,319.612500 449.208010,319.612500 449.985991,319.612500 450.764009,319.612500 451.541990,319.612500 452.320007,319.612500 453.097988,319.612500 453.876006,319.612500 454.653987,319.612500 455.432004,319.612500 456.209985,319.612500 456.988003,319.612500 457.765984,319.612500 458.544001,319.612500 459.321982,319.612500 460.100000,319.612500 460.100000,319.612500 460.878018,319.612500 461.655999,319.612500 462.434016,319.612500 463.211997,319.612500 463.990015,319.612500 464.767996,319.612500 465.546013,319.612500 466.323994,319.612500 467.102012,319.612500 467.879993,319.612500 468.658010,319.612500 469.435991,319.612500 470.214009,319.612500 470.991990,319.612500 471.770007,319.612500 472.547988,319.612500 473.326006,319.612500 474.103987,319.612500 474.882004,319.612500 475.659985,319.612500 476.438003,319.612500 477.215984,319.612500 477.994001,319.612500 478.771982,319.612500 479.550000,319.612500 480.328018,319.612500 481.105999,319.612500 481.884016,319.612500 482.661997,319.612500 483.440015,319.612500 484.217996,319.612500 484.996013,319.612500 485.773994,319.612500 486.552012,319.612500 487.329993,319.612500 488.108010,319.612500 488.885991,319.612500 489.664009,319.612500 490.441990,319.612500 491.220007,319.612500 491.997988,319.612500 492.776006,319.612500 493.553987,319.612500 494.332004,319.612500 495.109985,319.612500 495.888003,319.612500 496.665984,319.612500 497.444001,319.612500 498.221982,319.612500 499.000000,319.612500 499.000000,251.795833"
-     id="polyline83"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,29.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="74.248337"
-     id="text85"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">falCle.u</text>
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="169.24834"
-     id="text87"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">falCle.clr</text>
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="264.24832"
-     id="text89"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">falCle.y</text>
-  <polyline
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline91"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="187.800000,434.000000 187.800000,747.000000"
-     id="polyline93"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="265.600000,434.000000 265.600000,747.000000"
-     id="polyline95"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="343.400000,434.000000 343.400000,747.000000"
-     id="polyline97"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="421.200000,434.000000 421.200000,747.000000"
-     id="polyline99"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="499.000000,434.000000 499.000000,747.000000"
-     id="polyline101"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <rect
-     x="67.831055"
-     y="533.13531"
-     width="389"
-     height="67.816704"
-     id="rect103"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="628.34033"
-     width="389"
-     height="67.816704"
-     id="rect105"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <rect
-     x="67.831055"
-     y="723.54437"
-     width="389"
-     height="67.816704"
-     id="rect107"
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1" />
-  <polyline
-     points="110.000000,747.000000 499.000000,747.000000"
-     id="polyline109"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="499.000000,747.000000 499.000000,434.000000"
-     id="polyline111"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="499.000000,434.000000 110.000000,434.000000"
-     id="polyline113"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline115"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="110.000000,747.000000 110.000000,755.000000"
-     id="polyline117"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="187.800000,747.000000 187.800000,755.000000"
-     id="polyline119"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="265.600000,747.000000 265.600000,755.000000"
-     id="polyline121"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="343.400000,747.000000 343.400000,755.000000"
-     id="polyline123"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="421.200000,747.000000 421.200000,755.000000"
-     id="polyline125"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="499.000000,747.000000 499.000000,755.000000"
-     id="polyline127"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     points="110.000000,747.000000 110.000000,759.800000"
-     id="polyline129"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="67.831055"
-     y="850.24835"
-     id="text131"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">0</text>
-  <polyline
-     points="265.600000,747.000000 265.600000,759.800000"
-     id="polyline133"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="223.43106"
-     y="850.24835"
-     id="text135"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">4</text>
-  <polyline
-     points="421.200000,747.000000 421.200000,759.800000"
-     id="polyline137"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="379.03107"
-     y="850.24835"
-     id="text139"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000">8</text>
-  <polyline
-     points="102.000000,529.204167 110.000000,529.204167"
-     id="polyline141"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="600.95233"
-     id="text143"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,461.387500 110.000000,461.387500"
-     id="polyline145"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="533.13531"
-     id="text147"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,624.408333 110.000000,624.408333"
-     id="polyline149"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="696.15637"
-     id="text151"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,556.591667 110.000000,556.591667"
-     id="polyline153"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="628.34033"
-     id="text155"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
-  <polyline
-     points="102.000000,719.612500 110.000000,719.612500"
-     id="polyline157"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="791.36035"
-     id="text159"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">false</text>
-  <polyline
-     points="102.000000,651.795833 110.000000,651.795833"
-     id="polyline161"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <text
-     font-size="22"
-     dominant-baseline="central"
-     x="51.831055"
-     y="723.54437"
-     id="text163"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000">true</text>
   <clipPath
      id="clipArea2">
     <rect
@@ -645,1141 +555,2286 @@
        height="313"
        id="rect165" />
   </clipPath>
-  <polyline
-     clip-path="url(#clipArea2)"
-     points="110.000000,461.387500 110.778000,461.387500 111.556000,461.387500 112.334000,461.387500 113.112000,461.387500 113.890000,461.387500 114.668000,461.387500 115.446000,461.387500 116.224000,461.387500 117.002000,461.387500 117.780000,461.387500 118.558000,461.387500 119.336000,461.387500 120.114000,461.387500 120.892000,461.387500 121.670000,461.387500 122.448000,461.387500 123.226000,461.387500 124.004001,461.387500 124.782000,461.387500 125.560000,461.387500 126.337999,461.387500 127.116000,461.387500 127.894000,461.387500 128.672000,461.387500 129.450000,461.387500 130.227999,461.387500 131.006001,461.387500 131.784000,461.387500 132.561999,461.387500 133.340001,461.387500 134.118000,461.387500 134.895999,461.387500 135.674001,461.387500 136.452000,461.387500 137.230000,461.387500 138.008001,461.387500 138.786000,461.387500 139.564000,461.387500 140.341999,461.387500 141.120000,461.387500 141.898000,461.387500 142.675999,461.387500 143.454001,461.387500 144.232000,461.387500 145.009999,461.387500 145.788001,461.387500 146.566000,461.387500 147.343999,461.387500 148.122001,461.387500 148.900000,461.387500 148.900000,529.204167 148.900000,529.204167 148.900000,529.204167 149.677999,529.204167 150.455999,529.204167 151.233998,529.204167 152.012002,529.204167 152.790001,529.204167 153.568000,529.204167 154.345999,529.204167 155.123999,529.204167 155.901998,529.204167 156.680002,529.204167 157.458001,529.204167 158.236000,529.204167 159.014000,529.204167 159.791999,529.204167 160.569998,529.204167 161.348002,529.204167 162.126001,529.204167 162.904001,529.204167 163.682000,529.204167 164.459999,529.204167 165.237998,529.204167 166.016002,529.204167 166.794001,529.204167 167.572001,529.204167 168.350000,529.204167 169.127999,529.204167 169.905999,529.204167 170.683998,529.204167 171.462002,529.204167 172.240001,529.204167 173.018000,529.204167 173.795999,529.204167 174.573999,529.204167 175.351998,529.204167 176.130002,529.204167 176.908001,529.204167 177.686000,529.204167 178.464000,529.204167 179.241999,529.204167 180.019998,529.204167 180.798002,529.204167 181.576001,529.204167 182.354001,529.204167 183.132000,529.204167 183.909999,529.204167 184.687998,529.204167 185.466002,529.204167 186.244001,529.204167 187.022001,529.204167 187.800000,529.204167 187.800000,461.387500 187.800000,461.387500 188.577999,461.387500 189.355999,461.387500 190.133998,461.387500 190.911997,461.387500 191.689996,461.387500 192.467996,461.387500 193.246004,461.387500 194.024003,461.387500 194.802003,461.387500 195.580002,461.387500 196.358001,461.387500 197.136000,461.387500 197.914000,461.387500 198.691999,461.387500 199.469998,461.387500 200.247997,461.387500 201.025997,461.387500 201.803996,461.387500 202.582004,461.387500 203.360004,461.387500 204.138003,461.387500 204.916002,461.387500 205.694001,461.387500 206.472001,461.387500 207.250000,461.387500 208.027999,461.387500 208.805999,461.387500 209.583998,461.387500 210.361997,461.387500 211.139996,461.387500 211.917996,461.387500 212.696004,461.387500 213.474003,461.387500 214.252003,461.387500 215.030002,461.387500 215.808001,461.387500 216.586000,461.387500 217.364000,461.387500 218.141999,461.387500 218.919998,461.387500 219.697997,461.387500 220.475997,461.387500 221.253996,461.387500 222.032004,461.387500 222.810004,461.387500 223.588003,461.387500 224.366002,461.387500 225.144001,461.387500 225.922001,461.387500 226.700000,461.387500 226.700000,529.204167 226.700000,529.204167 227.477999,529.204167 228.255999,529.204167 229.033998,529.204167 229.811997,529.204167 230.589996,529.204167 231.367996,529.204167 232.146004,529.204167 232.924003,529.204167 233.702003,529.204167 234.480002,529.204167 235.258001,529.204167 236.036000,529.204167 236.814000,529.204167 237.591999,529.204167 238.369998,529.204167 239.147997,529.204167 239.925997,529.204167 240.703996,529.204167 241.482004,529.204167 242.260004,529.204167 243.038003,529.204167 243.816002,529.204167 244.594001,529.204167 245.372001,529.204167 246.150000,529.204167 246.927999,529.204167 247.705999,529.204167 248.483998,529.204167 249.261997,529.204167 250.039996,529.204167 250.817996,529.204167 251.596004,529.204167 252.374003,529.204167 253.152003,529.204167 253.930002,529.204167 254.708001,529.204167 255.486000,529.204167 256.264000,529.204167 257.041999,529.204167 257.819998,529.204167 258.597997,529.204167 259.375997,529.204167 260.153996,529.204167 260.932004,529.204167 261.710004,529.204167 262.488003,529.204167 263.266002,529.204167 264.044001,529.204167 264.822001,529.204167 265.600000,529.204167 265.600000,461.387500 265.600000,461.387500 266.377999,461.387500 267.155999,461.387500 267.933998,461.387500 268.711997,461.387500 269.489996,461.387500 270.267996,461.387500 271.045995,461.387500 271.823994,461.387500 272.601993,461.387500 273.379993,461.387500 274.157992,461.387500 274.935991,461.387500 275.714009,461.387500 276.492008,461.387500 277.270007,461.387500 278.048007,461.387500 278.826006,461.387500 279.604005,461.387500 280.382004,461.387500 281.160004,461.387500 281.938003,461.387500 282.716002,461.387500 283.494001,461.387500 284.272001,461.387500 285.050000,461.387500 285.827999,461.387500 286.605999,461.387500 287.383998,461.387500 288.161997,461.387500 288.939996,461.387500 289.717996,461.387500 290.495995,461.387500 291.273994,461.387500 292.051993,461.387500 292.829993,461.387500 293.607992,461.387500 294.385991,461.387500 295.164009,461.387500 295.942008,461.387500 296.720007,461.387500 297.498007,461.387500 298.276006,461.387500 299.054005,461.387500 299.832004,461.387500 300.610004,461.387500 301.388003,461.387500 302.166002,461.387500 302.944001,461.387500 303.722001,461.387500 304.500000,461.387500 304.500000,529.204167 305.277999,529.204167 306.055999,529.204167 306.833998,529.204167 307.611997,529.204167 308.389996,529.204167 309.167996,529.204167 309.945995,529.204167 310.723994,529.204167 311.501993,529.204167 312.279993,529.204167 313.057992,529.204167 313.835991,529.204167 314.614009,529.204167 315.392008,529.204167 316.170007,529.204167 316.948007,529.204167 317.726006,529.204167 318.504005,529.204167 319.282004,529.204167 320.060004,529.204167 320.838003,529.204167 321.616002,529.204167 322.394001,529.204167 323.172001,529.204167 323.950000,529.204167 324.727999,529.204167 325.505999,529.204167 326.283998,529.204167 327.061997,529.204167 327.839996,529.204167 328.617996,529.204167 329.395995,529.204167 330.173994,529.204167 330.951993,529.204167 331.729993,529.204167 332.507992,529.204167 333.285991,529.204167 334.064009,529.204167 334.842008,529.204167 335.620007,529.204167 336.398007,529.204167 337.176006,529.204167 337.954005,529.204167 338.732004,529.204167 339.510004,529.204167 340.288003,529.204167 341.066002,529.204167 341.844001,529.204167 342.622001,529.204167 343.400000,529.204167 343.400000,461.387500 344.177999,461.387500 344.955999,461.387500 345.733998,461.387500 346.511997,461.387500 347.289996,461.387500 348.067996,461.387500 348.845995,461.387500 349.623994,461.387500 350.401993,461.387500 351.179993,461.387500 351.957992,461.387500 352.735991,461.387500 353.514009,461.387500 354.292008,461.387500 355.070007,461.387500 355.848007,461.387500 356.626006,461.387500 357.404005,461.387500 358.182004,461.387500 358.960004,461.387500 359.738003,461.387500 360.516002,461.387500 361.294001,461.387500 362.072001,461.387500 362.850000,461.387500 363.627999,461.387500 364.405999,461.387500 365.183998,461.387500 365.961997,461.387500 366.739996,461.387500 367.517996,461.387500 368.295995,461.387500 369.073994,461.387500 369.851993,461.387500 370.629993,461.387500 371.407992,461.387500 372.185991,461.387500 372.964009,461.387500 373.742008,461.387500 374.520007,461.387500 375.298007,461.387500 376.076006,461.387500 376.854005,461.387500 377.632004,461.387500 378.410004,461.387500 379.188003,461.387500 379.966002,461.387500 380.744001,461.387500 381.522001,461.387500 382.300000,461.387500 382.300000,529.204167 383.077999,529.204167 383.855999,529.204167 384.633998,529.204167 385.411997,529.204167 386.189996,529.204167 386.967996,529.204167 387.745995,529.204167 388.523994,529.204167 389.301993,529.204167 390.079993,529.204167 390.857992,529.204167 391.635991,529.204167 392.414009,529.204167 393.192008,529.204167 393.970007,529.204167 394.748007,529.204167 395.526006,529.204167 396.304005,529.204167 397.082004,529.204167 397.860004,529.204167 398.638003,529.204167 399.416002,529.204167 400.194001,529.204167 400.972001,529.204167 401.750000,529.204167 402.527999,529.204167 403.305999,529.204167 404.083998,529.204167 404.861997,529.204167 405.639996,529.204167 406.417996,529.204167 407.195995,529.204167 407.973994,529.204167 408.751993,529.204167 409.529993,529.204167 410.307992,529.204167 411.085991,529.204167 411.864009,529.204167 412.642008,529.204167 413.420007,529.204167 414.198007,529.204167 414.976006,529.204167 415.754005,529.204167 416.532004,529.204167 417.310004,529.204167 418.088003,529.204167 418.866002,529.204167 419.644001,529.204167 420.422001,529.204167 421.200000,529.204167 421.200000,461.387500 421.978018,461.387500 422.755999,461.387500 423.534016,461.387500 424.311997,461.387500 425.090015,461.387500 425.867996,461.387500 426.646013,461.387500 427.423994,461.387500 428.202012,461.387500 428.979993,461.387500 429.758010,461.387500 430.535991,461.387500 431.314009,461.387500 432.091990,461.387500 432.870007,461.387500 433.647988,461.387500 434.426006,461.387500 435.203987,461.387500 435.982004,461.387500 436.759985,461.387500 437.538003,461.387500 438.315984,461.387500 439.094001,461.387500 439.871982,461.387500 440.650000,461.387500 441.428018,461.387500 442.205999,461.387500 442.984016,461.387500 443.761997,461.387500 444.540015,461.387500 445.317996,461.387500 446.096013,461.387500 446.873994,461.387500 447.652012,461.387500 448.429993,461.387500 449.208010,461.387500 449.985991,461.387500 450.764009,461.387500 451.541990,461.387500 452.320007,461.387500 453.097988,461.387500 453.876006,461.387500 454.653987,461.387500 455.432004,461.387500 456.209985,461.387500 456.988003,461.387500 457.765984,461.387500 458.544001,461.387500 459.321982,461.387500 460.100000,461.387500 460.100000,529.204167 460.878018,529.204167 461.655999,529.204167 462.434016,529.204167 463.211997,529.204167 463.990015,529.204167 464.767996,529.204167 465.546013,529.204167 466.323994,529.204167 467.102012,529.204167 467.879993,529.204167 468.658010,529.204167 469.435991,529.204167 470.214009,529.204167 470.991990,529.204167 471.770007,529.204167 472.547988,529.204167 473.326006,529.204167 474.103987,529.204167 474.882004,529.204167 475.659985,529.204167 476.438003,529.204167 477.215984,529.204167 477.994001,529.204167 478.771982,529.204167 479.550000,529.204167 480.328018,529.204167 481.105999,529.204167 481.884016,529.204167 482.661997,529.204167 483.440015,529.204167 484.217996,529.204167 484.996013,529.204167 485.773994,529.204167 486.552012,529.204167 487.329993,529.204167 488.108010,529.204167 488.885991,529.204167 489.664009,529.204167 490.441990,529.204167 491.220007,529.204167 491.997988,529.204167 492.776006,529.204167 493.553987,529.204167 494.332004,529.204167 495.109985,529.204167 495.888003,529.204167 496.665984,529.204167 497.444001,529.204167 498.221982,529.204167 499.000000,529.204167 499.000000,461.387500"
-     id="polyline168"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     clip-path="url(#clipArea2)"
-     points="110.000000,556.591667 110.778000,556.591667 111.556000,556.591667 112.334000,556.591667 113.112000,556.591667 113.890000,556.591667 114.668000,556.591667 115.446000,556.591667 116.224000,556.591667 117.002000,556.591667 117.780000,556.591667 118.558000,556.591667 119.336000,556.591667 120.114000,556.591667 120.892000,556.591667 121.670000,556.591667 122.448000,556.591667 123.226000,556.591667 124.004001,556.591667 124.782000,556.591667 125.560000,556.591667 126.337999,556.591667 127.116000,556.591667 127.894000,556.591667 128.672000,556.591667 129.450000,556.591667 130.227999,556.591667 131.006001,556.591667 131.784000,556.591667 132.561999,556.591667 133.340001,556.591667 134.118000,556.591667 134.895999,556.591667 135.674001,556.591667 136.452000,556.591667 137.230000,556.591667 138.008001,556.591667 138.786000,556.591667 139.564000,556.591667 140.341999,556.591667 141.120000,556.591667 141.898000,556.591667 142.675999,556.591667 143.454001,556.591667 144.232000,556.591667 145.009999,556.591667 145.788001,556.591667 146.566000,556.591667 147.343999,556.591667 148.122001,556.591667 148.900000,556.591667 148.900000,556.591667 148.900000,556.591667 148.900000,556.591667 149.677999,556.591667 150.455999,556.591667 151.233998,556.591667 152.012002,556.591667 152.790001,556.591667 153.568000,556.591667 154.345999,556.591667 155.123999,556.591667 155.901998,556.591667 156.680002,556.591667 157.458001,556.591667 158.236000,556.591667 159.014000,556.591667 159.791999,556.591667 160.569998,556.591667 161.348002,556.591667 162.126001,556.591667 162.904001,556.591667 163.682000,556.591667 164.459999,556.591667 165.237998,556.591667 166.016002,556.591667 166.794001,556.591667 167.572001,556.591667 168.350000,556.591667 169.127999,556.591667 169.905999,556.591667 170.683998,556.591667 171.462002,556.591667 172.240001,556.591667 173.018000,556.591667 173.795999,556.591667 174.573999,556.591667 175.351998,556.591667 176.130002,556.591667 176.908001,556.591667 177.686000,556.591667 178.464000,556.591667 179.241999,556.591667 180.019998,556.591667 180.798002,556.591667 181.576001,556.591667 182.354001,556.591667 183.132000,556.591667 183.909999,556.591667 184.687998,556.591667 185.466002,556.591667 186.244001,556.591667 187.022001,556.591667 187.800000,556.591667 187.800000,556.591667 187.800000,556.591667 188.577999,556.591667 189.355999,556.591667 190.133998,556.591667 190.911997,556.591667 191.689996,556.591667 192.467996,556.591667 193.246004,556.591667 194.024003,556.591667 194.802003,556.591667 195.580002,556.591667 196.358001,556.591667 197.136000,556.591667 197.914000,556.591667 198.691999,556.591667 199.469998,556.591667 200.247997,556.591667 201.025997,556.591667 201.803996,556.591667 202.582004,556.591667 203.360004,556.591667 204.138003,556.591667 204.916002,556.591667 205.694001,556.591667 206.472001,556.591667 207.250000,556.591667 208.027999,556.591667 208.805999,556.591667 209.583998,556.591667 210.361997,556.591667 211.139996,556.591667 211.917996,556.591667 212.696004,556.591667 213.474003,556.591667 214.252003,556.591667 215.030002,556.591667 215.808001,556.591667 216.586000,556.591667 217.364000,556.591667 218.141999,556.591667 218.919998,556.591667 219.697997,556.591667 220.475997,556.591667 221.253996,556.591667 222.032004,556.591667 222.810004,556.591667 223.588003,556.591667 224.366002,556.591667 225.144001,556.591667 225.922001,556.591667 226.700000,556.591667 226.700000,556.591667 226.700000,556.591667 227.477999,556.591667 228.255999,556.591667 229.033998,556.591667 229.811997,556.591667 230.589996,556.591667 231.367996,556.591667 232.146004,556.591667 232.924003,556.591667 233.702003,556.591667 234.480002,556.591667 235.258001,556.591667 236.036000,556.591667 236.814000,556.591667 237.591999,556.591667 238.369998,556.591667 239.147997,556.591667 239.925997,556.591667 240.703996,556.591667 241.482004,556.591667 242.260004,556.591667 243.038003,556.591667 243.816002,556.591667 244.594001,556.591667 245.372001,556.591667 246.150000,556.591667 246.927999,556.591667 247.705999,556.591667 248.483998,556.591667 249.261997,556.591667 250.039996,556.591667 250.817996,556.591667 251.596004,556.591667 252.374003,556.591667 253.152003,556.591667 253.930002,556.591667 254.708001,556.591667 255.486000,556.591667 256.264000,556.591667 257.041999,556.591667 257.819998,556.591667 258.597997,556.591667 259.375997,556.591667 260.153996,556.591667 260.932004,556.591667 261.710004,556.591667 262.488003,556.591667 263.266002,556.591667 264.044001,556.591667 264.822001,556.591667 265.600000,556.591667 265.600000,556.591667 265.600000,556.591667 266.377999,556.591667 267.155999,556.591667 267.933998,556.591667 268.711997,556.591667 269.489996,556.591667 270.267996,556.591667 271.045995,556.591667 271.823994,556.591667 272.601993,556.591667 273.379993,556.591667 274.157992,556.591667 274.935991,556.591667 275.714009,556.591667 276.492008,556.591667 277.270007,556.591667 278.048007,556.591667 278.826006,556.591667 279.604005,556.591667 280.382004,556.591667 281.160004,556.591667 281.938003,556.591667 282.716002,556.591667 283.494001,556.591667 284.272001,556.591667 285.050000,556.591667 285.827999,556.591667 286.605999,556.591667 287.383998,556.591667 288.161997,556.591667 288.939996,556.591667 289.717996,556.591667 290.495995,556.591667 291.273994,556.591667 292.051993,556.591667 292.829993,556.591667 293.607992,556.591667 294.385991,556.591667 295.164009,556.591667 295.942008,556.591667 296.720007,556.591667 297.498007,556.591667 298.276006,556.591667 299.054005,556.591667 299.832004,556.591667 300.610004,556.591667 301.388003,556.591667 302.166002,556.591667 302.944001,556.591667 303.722001,556.591667 304.500000,556.591667 304.500000,556.591667 305.277999,556.591667 306.055999,556.591667 306.833998,556.591667 307.611997,556.591667 308.389996,556.591667 309.167996,556.591667 309.945995,556.591667 310.723994,556.591667 311.501993,556.591667 312.279993,556.591667 313.057992,556.591667 313.835991,556.591667 314.614009,556.591667 315.392008,556.591667 316.170007,556.591667 316.948007,556.591667 317.726006,556.591667 318.504005,556.591667 319.282004,556.591667 320.060004,556.591667 320.838003,556.591667 321.616002,556.591667 322.394001,556.591667 323.172001,556.591667 323.950000,556.591667 324.727999,556.591667 325.505999,556.591667 326.283998,556.591667 327.061997,556.591667 327.839996,556.591667 328.617996,556.591667 329.395995,556.591667 330.173994,556.591667 330.951993,556.591667 331.729993,556.591667 332.507992,556.591667 333.285991,556.591667 334.064009,556.591667 334.842008,556.591667 335.620007,556.591667 336.398007,556.591667 337.176006,556.591667 337.954005,556.591667 338.732004,556.591667 339.510004,556.591667 340.288003,556.591667 341.066002,556.591667 341.844001,556.591667 342.622001,556.591667 343.400000,556.591667 343.400000,556.591667 344.177999,556.591667 344.955999,556.591667 345.733998,556.591667 346.511997,556.591667 347.289996,556.591667 348.067996,556.591667 348.845995,556.591667 349.623994,556.591667 350.401993,556.591667 351.179993,556.591667 351.957992,556.591667 352.735991,556.591667 353.514009,556.591667 354.292008,556.591667 355.070007,556.591667 355.848007,556.591667 356.626006,556.591667 357.404005,556.591667 358.182004,556.591667 358.960004,556.591667 359.738003,556.591667 360.516002,556.591667 361.294001,556.591667 362.072001,556.591667 362.850000,556.591667 363.627999,556.591667 364.405999,556.591667 365.183998,556.591667 365.961997,556.591667 366.739996,556.591667 367.517996,556.591667 368.295995,556.591667 369.073994,556.591667 369.851993,556.591667 370.629993,556.591667 371.407992,556.591667 372.185991,556.591667 372.964009,556.591667 373.742008,556.591667 374.520007,556.591667 375.298007,556.591667 376.076006,556.591667 376.854005,556.591667 377.632004,556.591667 378.410004,556.591667 379.188003,556.591667 379.966002,556.591667 380.744001,556.591667 381.522001,556.591667 382.300000,556.591667 382.300000,556.591667 383.077999,556.591667 383.855999,556.591667 384.633998,556.591667 385.411997,556.591667 386.189996,556.591667 386.967996,556.591667 387.745995,556.591667 388.523994,556.591667 389.301993,556.591667 390.079993,556.591667 390.857992,556.591667 391.635991,556.591667 392.414009,556.591667 393.192008,556.591667 393.970007,556.591667 394.748007,556.591667 395.526006,556.591667 396.304005,556.591667 397.082004,556.591667 397.860004,556.591667 398.638003,556.591667 399.416002,556.591667 400.194001,556.591667 400.972001,556.591667 401.750000,556.591667 402.527999,556.591667 403.305999,556.591667 404.083998,556.591667 404.861997,556.591667 405.639996,556.591667 406.417996,556.591667 407.195995,556.591667 407.973994,556.591667 408.751993,556.591667 409.529993,556.591667 410.307992,556.591667 411.085991,556.591667 411.864009,556.591667 412.642008,556.591667 413.420007,556.591667 414.198007,556.591667 414.976006,556.591667 415.754005,556.591667 416.532004,556.591667 417.310004,556.591667 418.088003,556.591667 418.866002,556.591667 419.644001,556.591667 420.422001,556.591667 421.200000,556.591667 421.200000,556.591667 421.978018,556.591667 422.755999,556.591667 423.534016,556.591667 424.311997,556.591667 425.090015,556.591667 425.867996,556.591667 426.646013,556.591667 427.423994,556.591667 428.202012,556.591667 428.979993,556.591667 429.758010,556.591667 430.535991,556.591667 431.314009,556.591667 432.091990,556.591667 432.870007,556.591667 433.647988,556.591667 434.426006,556.591667 435.203987,556.591667 435.982004,556.591667 436.759985,556.591667 437.538003,556.591667 438.315984,556.591667 439.094001,556.591667 439.871982,556.591667 440.650000,556.591667 441.428018,556.591667 442.205999,556.591667 442.984016,556.591667 443.761997,556.591667 444.540015,556.591667 445.317996,556.591667 446.096013,556.591667 446.873994,556.591667 447.652012,556.591667 448.429993,556.591667 449.208010,556.591667 449.985991,556.591667 450.764009,556.591667 451.541990,556.591667 452.320007,556.591667 453.097988,556.591667 453.876006,556.591667 454.653987,556.591667 455.432004,556.591667 456.209985,556.591667 456.988003,556.591667 457.765984,556.591667 458.544001,556.591667 459.321982,556.591667 460.100000,556.591667 460.100000,556.591667 460.878018,556.591667 461.655999,556.591667 462.434016,556.591667 463.211997,556.591667 463.990015,556.591667 464.767996,556.591667 465.546013,556.591667 466.323994,556.591667 467.102012,556.591667 467.879993,556.591667 468.658010,556.591667 469.435991,556.591667 470.214009,556.591667 470.991990,556.591667 471.770007,556.591667 472.547988,556.591667 473.326006,556.591667 474.103987,556.591667 474.882004,556.591667 475.659985,556.591667 476.438003,556.591667 477.215984,556.591667 477.994001,556.591667 478.771982,556.591667 479.550000,556.591667 480.328018,556.591667 481.105999,556.591667 481.884016,556.591667 482.661997,556.591667 483.440015,556.591667 484.217996,556.591667 484.996013,556.591667 485.773994,556.591667 486.552012,556.591667 487.329993,556.591667 488.108010,556.591667 488.885991,556.591667 489.664009,556.591667 490.441990,556.591667 491.220007,556.591667 491.997988,556.591667 492.776006,556.591667 493.553987,556.591667 494.332004,556.591667 495.109985,556.591667 495.888003,556.591667 496.665984,556.591667 497.444001,556.591667 498.221982,556.591667 499.000000,556.591667 499.000000,556.591667"
-     id="polyline170"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
-  <polyline
-     clip-path="url(#clipArea2)"
-     points="110.000000,651.795833 110.778000,651.795833 111.556000,651.795833 112.334000,651.795833 113.112000,651.795833 113.890000,651.795833 114.668000,651.795833 115.446000,651.795833 116.224000,651.795833 117.002000,651.795833 117.780000,651.795833 118.558000,651.795833 119.336000,651.795833 120.114000,651.795833 120.892000,651.795833 121.670000,651.795833 122.448000,651.795833 123.226000,651.795833 124.004001,651.795833 124.782000,651.795833 125.560000,651.795833 126.337999,651.795833 127.116000,651.795833 127.894000,651.795833 128.672000,651.795833 129.450000,651.795833 130.227999,651.795833 131.006001,651.795833 131.784000,651.795833 132.561999,651.795833 133.340001,651.795833 134.118000,651.795833 134.895999,651.795833 135.674001,651.795833 136.452000,651.795833 137.230000,651.795833 138.008001,651.795833 138.786000,651.795833 139.564000,651.795833 140.341999,651.795833 141.120000,651.795833 141.898000,651.795833 142.675999,651.795833 143.454001,651.795833 144.232000,651.795833 145.009999,651.795833 145.788001,651.795833 146.566000,651.795833 147.343999,651.795833 148.122001,651.795833 148.900000,651.795833 148.900000,651.795833 148.900000,651.795833 148.900000,651.795833 149.677999,651.795833 150.455999,651.795833 151.233998,651.795833 152.012002,651.795833 152.790001,651.795833 153.568000,651.795833 154.345999,651.795833 155.123999,651.795833 155.901998,651.795833 156.680002,651.795833 157.458001,651.795833 158.236000,651.795833 159.014000,651.795833 159.791999,651.795833 160.569998,651.795833 161.348002,651.795833 162.126001,651.795833 162.904001,651.795833 163.682000,651.795833 164.459999,651.795833 165.237998,651.795833 166.016002,651.795833 166.794001,651.795833 167.572001,651.795833 168.350000,651.795833 169.127999,651.795833 169.905999,651.795833 170.683998,651.795833 171.462002,651.795833 172.240001,651.795833 173.018000,651.795833 173.795999,651.795833 174.573999,651.795833 175.351998,651.795833 176.130002,651.795833 176.908001,651.795833 177.686000,651.795833 178.464000,651.795833 179.241999,651.795833 180.019998,651.795833 180.798002,651.795833 181.576001,651.795833 182.354001,651.795833 183.132000,651.795833 183.909999,651.795833 184.687998,651.795833 185.466002,651.795833 186.244001,651.795833 187.022001,651.795833 187.800000,651.795833 187.800000,651.795833 187.800000,651.795833 188.577999,651.795833 189.355999,651.795833 190.133998,651.795833 190.911997,651.795833 191.689996,651.795833 192.467996,651.795833 193.246004,651.795833 194.024003,651.795833 194.802003,651.795833 195.580002,651.795833 196.358001,651.795833 197.136000,651.795833 197.914000,651.795833 198.691999,651.795833 199.469998,651.795833 200.247997,651.795833 201.025997,651.795833 201.803996,651.795833 202.582004,651.795833 203.360004,651.795833 204.138003,651.795833 204.916002,651.795833 205.694001,651.795833 206.472001,651.795833 207.250000,651.795833 208.027999,651.795833 208.805999,651.795833 209.583998,651.795833 210.361997,651.795833 211.139996,651.795833 211.917996,651.795833 212.696004,651.795833 213.474003,651.795833 214.252003,651.795833 215.030002,651.795833 215.808001,651.795833 216.586000,651.795833 217.364000,651.795833 218.141999,651.795833 218.919998,651.795833 219.697997,651.795833 220.475997,651.795833 221.253996,651.795833 222.032004,651.795833 222.810004,651.795833 223.588003,651.795833 224.366002,651.795833 225.144001,651.795833 225.922001,651.795833 226.700000,651.795833 226.700000,651.795833 226.700000,651.795833 227.477999,651.795833 228.255999,651.795833 229.033998,651.795833 229.811997,651.795833 230.589996,651.795833 231.367996,651.795833 232.146004,651.795833 232.924003,651.795833 233.702003,651.795833 234.480002,651.795833 235.258001,651.795833 236.036000,651.795833 236.814000,651.795833 237.591999,651.795833 238.369998,651.795833 239.147997,651.795833 239.925997,651.795833 240.703996,651.795833 241.482004,651.795833 242.260004,651.795833 243.038003,651.795833 243.816002,651.795833 244.594001,651.795833 245.372001,651.795833 246.150000,651.795833 246.927999,651.795833 247.705999,651.795833 248.483998,651.795833 249.261997,651.795833 250.039996,651.795833 250.817996,651.795833 251.596004,651.795833 252.374003,651.795833 253.152003,651.795833 253.930002,651.795833 254.708001,651.795833 255.486000,651.795833 256.264000,651.795833 257.041999,651.795833 257.819998,651.795833 258.597997,651.795833 259.375997,651.795833 260.153996,651.795833 260.932004,651.795833 261.710004,651.795833 262.488003,651.795833 263.266002,651.795833 264.044001,651.795833 264.822001,651.795833 265.600000,651.795833 265.600000,651.795833 265.600000,651.795833 266.377999,651.795833 267.155999,651.795833 267.933998,651.795833 268.711997,651.795833 269.489996,651.795833 270.267996,651.795833 271.045995,651.795833 271.823994,651.795833 272.601993,651.795833 273.379993,651.795833 274.157992,651.795833 274.935991,651.795833 275.714009,651.795833 276.492008,651.795833 277.270007,651.795833 278.048007,651.795833 278.826006,651.795833 279.604005,651.795833 280.382004,651.795833 281.160004,651.795833 281.938003,651.795833 282.716002,651.795833 283.494001,651.795833 284.272001,651.795833 285.050000,651.795833 285.827999,651.795833 286.605999,651.795833 287.383998,651.795833 288.161997,651.795833 288.939996,651.795833 289.717996,651.795833 290.495995,651.795833 291.273994,651.795833 292.051993,651.795833 292.829993,651.795833 293.607992,651.795833 294.385991,651.795833 295.164009,651.795833 295.942008,651.795833 296.720007,651.795833 297.498007,651.795833 298.276006,651.795833 299.054005,651.795833 299.832004,651.795833 300.610004,651.795833 301.388003,651.795833 302.166002,651.795833 302.944001,651.795833 303.722001,651.795833 304.500000,651.795833 304.500000,651.795833 305.277999,651.795833 306.055999,651.795833 306.833998,651.795833 307.611997,651.795833 308.389996,651.795833 309.167996,651.795833 309.945995,651.795833 310.723994,651.795833 311.501993,651.795833 312.279993,651.795833 313.057992,651.795833 313.835991,651.795833 314.614009,651.795833 315.392008,651.795833 316.170007,651.795833 316.948007,651.795833 317.726006,651.795833 318.504005,651.795833 319.282004,651.795833 320.060004,651.795833 320.838003,651.795833 321.616002,651.795833 322.394001,651.795833 323.172001,651.795833 323.950000,651.795833 324.727999,651.795833 325.505999,651.795833 326.283998,651.795833 327.061997,651.795833 327.839996,651.795833 328.617996,651.795833 329.395995,651.795833 330.173994,651.795833 330.951993,651.795833 331.729993,651.795833 332.507992,651.795833 333.285991,651.795833 334.064009,651.795833 334.842008,651.795833 335.620007,651.795833 336.398007,651.795833 337.176006,651.795833 337.954005,651.795833 338.732004,651.795833 339.510004,651.795833 340.288003,651.795833 341.066002,651.795833 341.844001,651.795833 342.622001,651.795833 343.400000,651.795833 343.400000,651.795833 344.177999,651.795833 344.955999,651.795833 345.733998,651.795833 346.511997,651.795833 347.289996,651.795833 348.067996,651.795833 348.845995,651.795833 349.623994,651.795833 350.401993,651.795833 351.179993,651.795833 351.957992,651.795833 352.735991,651.795833 353.514009,651.795833 354.292008,651.795833 355.070007,651.795833 355.848007,651.795833 356.626006,651.795833 357.404005,651.795833 358.182004,651.795833 358.960004,651.795833 359.738003,651.795833 360.516002,651.795833 361.294001,651.795833 362.072001,651.795833 362.850000,651.795833 363.627999,651.795833 364.405999,651.795833 365.183998,651.795833 365.961997,651.795833 366.739996,651.795833 367.517996,651.795833 368.295995,651.795833 369.073994,651.795833 369.851993,651.795833 370.629993,651.795833 371.407992,651.795833 372.185991,651.795833 372.964009,651.795833 373.742008,651.795833 374.520007,651.795833 375.298007,651.795833 376.076006,651.795833 376.854005,651.795833 377.632004,651.795833 378.410004,651.795833 379.188003,651.795833 379.966002,651.795833 380.744001,651.795833 381.522001,651.795833 382.300000,651.795833 382.300000,651.795833 383.077999,651.795833 383.855999,651.795833 384.633998,651.795833 385.411997,651.795833 386.189996,651.795833 386.967996,651.795833 387.745995,651.795833 388.523994,651.795833 389.301993,651.795833 390.079993,651.795833 390.857992,651.795833 391.635991,651.795833 392.414009,651.795833 393.192008,651.795833 393.970007,651.795833 394.748007,651.795833 395.526006,651.795833 396.304005,651.795833 397.082004,651.795833 397.860004,651.795833 398.638003,651.795833 399.416002,651.795833 400.194001,651.795833 400.972001,651.795833 401.750000,651.795833 402.527999,651.795833 403.305999,651.795833 404.083998,651.795833 404.861997,651.795833 405.639996,651.795833 406.417996,651.795833 407.195995,651.795833 407.973994,651.795833 408.751993,651.795833 409.529993,651.795833 410.307992,651.795833 411.085991,651.795833 411.864009,651.795833 412.642008,651.795833 413.420007,651.795833 414.198007,651.795833 414.976006,651.795833 415.754005,651.795833 416.532004,651.795833 417.310004,651.795833 418.088003,651.795833 418.866002,651.795833 419.644001,651.795833 420.422001,651.795833 421.200000,651.795833 421.200000,651.795833 421.978018,651.795833 422.755999,651.795833 423.534016,651.795833 424.311997,651.795833 425.090015,651.795833 425.867996,651.795833 426.646013,651.795833 427.423994,651.795833 428.202012,651.795833 428.979993,651.795833 429.758010,651.795833 430.535991,651.795833 431.314009,651.795833 432.091990,651.795833 432.870007,651.795833 433.647988,651.795833 434.426006,651.795833 435.203987,651.795833 435.982004,651.795833 436.759985,651.795833 437.538003,651.795833 438.315984,651.795833 439.094001,651.795833 439.871982,651.795833 440.650000,651.795833 441.428018,651.795833 442.205999,651.795833 442.984016,651.795833 443.761997,651.795833 444.540015,651.795833 445.317996,651.795833 446.096013,651.795833 446.873994,651.795833 447.652012,651.795833 448.429993,651.795833 449.208010,651.795833 449.985991,651.795833 450.764009,651.795833 451.541990,651.795833 452.320007,651.795833 453.097988,651.795833 453.876006,651.795833 454.653987,651.795833 455.432004,651.795833 456.209985,651.795833 456.988003,651.795833 457.765984,651.795833 458.544001,651.795833 459.321982,651.795833 460.100000,651.795833 460.100000,651.795833 460.878018,651.795833 461.655999,651.795833 462.434016,651.795833 463.211997,651.795833 463.990015,651.795833 464.767996,651.795833 465.546013,651.795833 466.323994,651.795833 467.102012,651.795833 467.879993,651.795833 468.658010,651.795833 469.435991,651.795833 470.214009,651.795833 470.991990,651.795833 471.770007,651.795833 472.547988,651.795833 473.326006,651.795833 474.103987,651.795833 474.882004,651.795833 475.659985,651.795833 476.438003,651.795833 477.215984,651.795833 477.994001,651.795833 478.771982,651.795833 479.550000,651.795833 480.328018,651.795833 481.105999,651.795833 481.884016,651.795833 482.661997,651.795833 483.440015,651.795833 484.217996,651.795833 484.996013,651.795833 485.773994,651.795833 486.552012,651.795833 487.329993,651.795833 488.108010,651.795833 488.885991,651.795833 489.664009,651.795833 490.441990,651.795833 491.220007,651.795833 491.997988,651.795833 492.776006,651.795833 493.553987,651.795833 494.332004,651.795833 495.109985,651.795833 495.888003,651.795833 496.665984,651.795833 497.444001,651.795833 498.221982,651.795833 499.000000,651.795833 499.000000,651.795833"
-     id="polyline172"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     transform="translate(-42.168945,71.748338)" />
   <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="516.24835"
-     id="text174"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">truCle.u</text>
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.112px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.602783px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="1144.9438"
+     y="21.086761"
+     id="text995-4-2-9-5"><tspan
+       sodipodi:role="line"
+       id="tspan1154"
+       x="1144.9438"
+       y="21.086761">At same moments, </tspan><tspan
+       sodipodi:role="line"
+       id="tspan1156"
+       x="1144.9438"
+       y="51.226765">latch input rises (falls), clear input rises (falls)</tspan></text>
   <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="611.24835"
-     id="text176"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">truCle.clr</text>
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.112px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.602783px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="1143.6394"
+     y="472.45724"
+     id="text995-4-2-9-5-8"><tspan
+       sodipodi:role="line"
+       id="tspan1158"
+       x="1143.6394"
+       y="472.45724">At same moments, </tspan><tspan
+       sodipodi:role="line"
+       id="tspan1160"
+       x="1143.6394"
+       y="502.59723">latch input falls (rises), clear input rises (falls)</tspan><tspan
+       sodipodi:role="line"
+       id="tspan1162"
+       x="1143.6394"
+       y="532.73724" /></text>
   <text
-     font-size="22"
-     dominant-baseline="central"
-     x="70.831055"
-     y="706.24835"
-     id="text178"
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000">truCle.y</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
+     xml:space="preserve"
+     id="text4712"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,397.91934,1204.6243)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: false
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: true</tspan></tspan></text>
+  <text
+     xml:space="preserve"
+     id="text4712-0"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714-9);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,396.63412,1657.3929)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: false
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: false</tspan></tspan></text>
+  <text
+     xml:space="preserve"
+     id="text4712-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714-1);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,936.27278,1208.539)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: true
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: true</tspan></tspan></text>
+  <text
+     xml:space="preserve"
+     id="text4712-3-8"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect4714-1-4);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     transform="matrix(0.58617349,0,0,0.58617349,932.46352,1656.5991)"><tspan
+       x="-574.05078"
+       y="-2024.6738"><tspan>clear input: true
+</tspan></tspan><tspan
+       x="-574.05078"
+       y="-1974.6738"><tspan>initial latch input: false</tspan></tspan></text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline2-3" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,34.000000 187.800000,347.000000"
-     id="polyline4-5" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,34.000000 265.600000,347.000000"
-     id="polyline6-6" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,34.000000 343.400000,347.000000"
-     id="polyline8-2" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,34.000000 421.200000,347.000000"
-     id="polyline10-9" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 499.000000,347.000000"
-     id="polyline12-1" />
+     id="polyline1581"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,34.000000 182.000000,347.000000"
+     id="polyline1583"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,34.000000 254.000000,347.000000"
+     id="polyline1585"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,34.000000 326.000000,347.000000"
+     id="polyline1587"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,34.000000 398.000000,347.000000"
+     id="polyline1589"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 470.000000,347.000000"
+     id="polyline1591"
+     transform="translate(-45.215317,39.318317)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="613.13104"
-     y="89.748337"
-     width="389"
-     height="67.816704"
-     id="rect14-2" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="64.784744"
+     y="100.61404"
+     width="360"
+     height="68"
+     id="rect1593" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="613.13104"
-     y="184.95284"
-     width="389"
-     height="67.816704"
-     id="rect16-7" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="64.784744"
+     y="195.81827"
+     width="360"
+     height="68"
+     id="rect1595" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="613.13104"
-     y="280.15683"
-     width="389"
-     height="67.816704"
-     id="rect18-0" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,347.000000 499.000000,347.000000"
-     id="polyline20-9" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,34.000000"
-     id="polyline22-3" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 110.000000,34.000000"
-     id="polyline24-6" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="64.784744"
+     y="291.02225"
+     width="360"
+     height="68"
+     id="rect1597" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 470.000000,347.000000"
+     id="polyline1599"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,34.000000"
+     id="polyline1601"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 110.000000,34.000000"
+     id="polyline1603"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline26-0" />
+     id="polyline1605"
+     transform="translate(-45.215317,39.318317)" />
   <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,355.000000"
-     id="polyline28-6" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,347.000000 187.800000,355.000000"
-     id="polyline30-2" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,355.000000"
-     id="polyline32-6" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,347.000000 343.400000,355.000000"
-     id="polyline34-1" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,355.000000"
-     id="polyline36-8" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,355.000000"
-     id="polyline38-7" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1607"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,347.000000 182.000000,355.000000"
+     id="polyline1609"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,355.000000"
+     id="polyline1611"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,347.000000 326.000000,355.000000"
+     id="polyline1613"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,355.000000"
+     id="polyline1615"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,355.000000"
+     id="polyline1617"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,359.800000"
-     id="polyline40-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="613.13104"
-     y="406.86084"
-     id="text42-2">0</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,359.800000"
-     id="polyline44-0" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="768.73108"
-     y="406.86084"
-     id="text46-2">4</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,359.800000"
-     id="polyline48-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="924.33105"
-     y="406.86084"
-     id="text50-7">8</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1619"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="64.784744"
+     y="417.81827"
+     id="text1621">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,359.800000"
+     id="polyline1623"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="208.78474"
+     y="417.81827"
+     id="text1625">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,359.800000"
+     id="polyline1627"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="352.78473"
+     y="417.81827"
+     id="text1629">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,129.204167 110.000000,129.204167"
-     id="polyline52-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="157.56483"
-     id="text54-9">false</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1631"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="48.78474"
+     y="168.52225"
+     id="text1633">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,61.387500 110.000000,61.387500"
-     id="polyline56-2" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="89.748337"
-     id="text58-2">true</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1635"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="48.78474"
+     y="100.70584"
+     id="text1637">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,224.408333 110.000000,224.408333"
-     id="polyline60-8" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="252.76883"
-     id="text62-9">false</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1639"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="48.78474"
+     y="263.72623"
+     id="text1641">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,156.591667 110.000000,156.591667"
-     id="polyline64-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="184.95284"
-     id="text66-3">true</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1643"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="48.78474"
+     y="195.91031"
+     id="text1645">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,319.612500 110.000000,319.612500"
-     id="polyline68-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="347.97385"
-     id="text70-1">false</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline1647"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="48.78474"
+     y="358.9313"
+     id="text1649">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,251.795833 110.000000,251.795833"
-     id="polyline72-2" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="280.15683"
-     id="text74-9">true</text>
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-7)"
-     points="110.000000,61.387500 110.778000,61.387500 111.556000,61.387500 112.334000,61.387500 113.112000,61.387500 113.890000,61.387500 114.668000,61.387500 115.446000,61.387500 116.224000,61.387500 117.002000,61.387500 117.780000,61.387500 118.558000,61.387500 119.336000,61.387500 120.114000,61.387500 120.892000,61.387500 121.670000,61.387500 122.448000,61.387500 123.226000,61.387500 124.004001,61.387500 124.782000,61.387500 125.560000,61.387500 126.337999,61.387500 127.116000,61.387500 127.894000,61.387500 128.672000,61.387500 129.450000,61.387500 130.227999,61.387500 131.006001,61.387500 131.784000,61.387500 132.561999,61.387500 133.340001,61.387500 134.118000,61.387500 134.895999,61.387500 135.674001,61.387500 136.452000,61.387500 137.230000,61.387500 138.008001,61.387500 138.786000,61.387500 139.564000,61.387500 140.341999,61.387500 141.120000,61.387500 141.898000,61.387500 142.675999,61.387500 143.454001,61.387500 144.232000,61.387500 145.009999,61.387500 145.788001,61.387500 146.566000,61.387500 147.343999,61.387500 148.122001,61.387500 148.900000,61.387500 148.900000,129.204167 148.900000,129.204167 148.900000,129.204167 149.677999,129.204167 150.455999,129.204167 151.233998,129.204167 152.012002,129.204167 152.790001,129.204167 153.568000,129.204167 154.345999,129.204167 155.123999,129.204167 155.901998,129.204167 156.680002,129.204167 157.458001,129.204167 158.236000,129.204167 159.014000,129.204167 159.791999,129.204167 160.569998,129.204167 161.348002,129.204167 162.126001,129.204167 162.904001,129.204167 163.682000,129.204167 164.459999,129.204167 165.237998,129.204167 166.016002,129.204167 166.794001,129.204167 167.572001,129.204167 168.350000,129.204167 169.127999,129.204167 169.905999,129.204167 170.683998,129.204167 171.462002,129.204167 172.240001,129.204167 173.018000,129.204167 173.795999,129.204167 174.573999,129.204167 175.351998,129.204167 176.130002,129.204167 176.908001,129.204167 177.686000,129.204167 178.464000,129.204167 179.241999,129.204167 180.019998,129.204167 180.798002,129.204167 181.576001,129.204167 182.354001,129.204167 183.132000,129.204167 183.909999,129.204167 184.687998,129.204167 185.466002,129.204167 186.244001,129.204167 187.022001,129.204167 187.800000,129.204167 187.800000,61.387500 187.800000,61.387500 188.577999,61.387500 189.355999,61.387500 190.133998,61.387500 190.911997,61.387500 191.689996,61.387500 192.467996,61.387500 193.246004,61.387500 194.024003,61.387500 194.802003,61.387500 195.580002,61.387500 196.358001,61.387500 197.136000,61.387500 197.914000,61.387500 198.691999,61.387500 199.469998,61.387500 200.247997,61.387500 201.025997,61.387500 201.803996,61.387500 202.582004,61.387500 203.360004,61.387500 204.138003,61.387500 204.916002,61.387500 205.694001,61.387500 206.472001,61.387500 207.250000,61.387500 208.027999,61.387500 208.805999,61.387500 209.583998,61.387500 210.361997,61.387500 211.139996,61.387500 211.917996,61.387500 212.696004,61.387500 213.474003,61.387500 214.252003,61.387500 215.030002,61.387500 215.808001,61.387500 216.586000,61.387500 217.364000,61.387500 218.141999,61.387500 218.919998,61.387500 219.697997,61.387500 220.475997,61.387500 221.253996,61.387500 222.032004,61.387500 222.810004,61.387500 223.588003,61.387500 224.366002,61.387500 225.144001,61.387500 225.922001,61.387500 226.700000,61.387500 226.700000,129.204167 226.700000,129.204167 227.477999,129.204167 228.255999,129.204167 229.033998,129.204167 229.811997,129.204167 230.589996,129.204167 231.367996,129.204167 232.146004,129.204167 232.924003,129.204167 233.702003,129.204167 234.480002,129.204167 235.258001,129.204167 236.036000,129.204167 236.814000,129.204167 237.591999,129.204167 238.369998,129.204167 239.147997,129.204167 239.925997,129.204167 240.703996,129.204167 241.482004,129.204167 242.260004,129.204167 243.038003,129.204167 243.816002,129.204167 244.594001,129.204167 245.372001,129.204167 246.150000,129.204167 246.927999,129.204167 247.705999,129.204167 248.483998,129.204167 249.261997,129.204167 250.039996,129.204167 250.817996,129.204167 251.596004,129.204167 252.374003,129.204167 253.152003,129.204167 253.930002,129.204167 254.708001,129.204167 255.486000,129.204167 256.264000,129.204167 257.041999,129.204167 257.819998,129.204167 258.597997,129.204167 259.375997,129.204167 260.153996,129.204167 260.932004,129.204167 261.710004,129.204167 262.488003,129.204167 263.266002,129.204167 264.044001,129.204167 264.822001,129.204167 265.600000,129.204167 265.600000,61.387500 265.600000,61.387500 266.377999,61.387500 267.155999,61.387500 267.933998,61.387500 268.711997,61.387500 269.489996,61.387500 270.267996,61.387500 271.045995,61.387500 271.823994,61.387500 272.601993,61.387500 273.379993,61.387500 274.157992,61.387500 274.935991,61.387500 275.714009,61.387500 276.492008,61.387500 277.270007,61.387500 278.048007,61.387500 278.826006,61.387500 279.604005,61.387500 280.382004,61.387500 281.160004,61.387500 281.938003,61.387500 282.716002,61.387500 283.494001,61.387500 284.272001,61.387500 285.050000,61.387500 285.827999,61.387500 286.605999,61.387500 287.383998,61.387500 288.161997,61.387500 288.939996,61.387500 289.717996,61.387500 290.495995,61.387500 291.273994,61.387500 292.051993,61.387500 292.829993,61.387500 293.607992,61.387500 294.385991,61.387500 295.164009,61.387500 295.942008,61.387500 296.720007,61.387500 297.498007,61.387500 298.276006,61.387500 299.054005,61.387500 299.832004,61.387500 300.610004,61.387500 301.388003,61.387500 302.166002,61.387500 302.944001,61.387500 303.722001,61.387500 304.500000,61.387500 304.500000,129.204167 305.277999,129.204167 306.055999,129.204167 306.833998,129.204167 307.611997,129.204167 308.389996,129.204167 309.167996,129.204167 309.945995,129.204167 310.723994,129.204167 311.501993,129.204167 312.279993,129.204167 313.057992,129.204167 313.835991,129.204167 314.614009,129.204167 315.392008,129.204167 316.170007,129.204167 316.948007,129.204167 317.726006,129.204167 318.504005,129.204167 319.282004,129.204167 320.060004,129.204167 320.838003,129.204167 321.616002,129.204167 322.394001,129.204167 323.172001,129.204167 323.950000,129.204167 324.727999,129.204167 325.505999,129.204167 326.283998,129.204167 327.061997,129.204167 327.839996,129.204167 328.617996,129.204167 329.395995,129.204167 330.173994,129.204167 330.951993,129.204167 331.729993,129.204167 332.507992,129.204167 333.285991,129.204167 334.064009,129.204167 334.842008,129.204167 335.620007,129.204167 336.398007,129.204167 337.176006,129.204167 337.954005,129.204167 338.732004,129.204167 339.510004,129.204167 340.288003,129.204167 341.066002,129.204167 341.844001,129.204167 342.622001,129.204167 343.400000,129.204167 343.400000,61.387500 344.177999,61.387500 344.955999,61.387500 345.733998,61.387500 346.511997,61.387500 347.289996,61.387500 348.067996,61.387500 348.845995,61.387500 349.623994,61.387500 350.401993,61.387500 351.179993,61.387500 351.957992,61.387500 352.735991,61.387500 353.514009,61.387500 354.292008,61.387500 355.070007,61.387500 355.848007,61.387500 356.626006,61.387500 357.404005,61.387500 358.182004,61.387500 358.960004,61.387500 359.738003,61.387500 360.516002,61.387500 361.294001,61.387500 362.072001,61.387500 362.850000,61.387500 363.627999,61.387500 364.405999,61.387500 365.183998,61.387500 365.961997,61.387500 366.739996,61.387500 367.517996,61.387500 368.295995,61.387500 369.073994,61.387500 369.851993,61.387500 370.629993,61.387500 371.407992,61.387500 372.185991,61.387500 372.964009,61.387500 373.742008,61.387500 374.520007,61.387500 375.298007,61.387500 376.076006,61.387500 376.854005,61.387500 377.632004,61.387500 378.410004,61.387500 379.188003,61.387500 379.966002,61.387500 380.744001,61.387500 381.522001,61.387500 382.300000,61.387500 382.300000,129.204167 383.077999,129.204167 383.855999,129.204167 384.633998,129.204167 385.411997,129.204167 386.189996,129.204167 386.967996,129.204167 387.745995,129.204167 388.523994,129.204167 389.301993,129.204167 390.079993,129.204167 390.857992,129.204167 391.635991,129.204167 392.414009,129.204167 393.192008,129.204167 393.970007,129.204167 394.748007,129.204167 395.526006,129.204167 396.304005,129.204167 397.082004,129.204167 397.860004,129.204167 398.638003,129.204167 399.416002,129.204167 400.194001,129.204167 400.972001,129.204167 401.750000,129.204167 402.527999,129.204167 403.305999,129.204167 404.083998,129.204167 404.861997,129.204167 405.639996,129.204167 406.417996,129.204167 407.195995,129.204167 407.973994,129.204167 408.751993,129.204167 409.529993,129.204167 410.307992,129.204167 411.085991,129.204167 411.864009,129.204167 412.642008,129.204167 413.420007,129.204167 414.198007,129.204167 414.976006,129.204167 415.754005,129.204167 416.532004,129.204167 417.310004,129.204167 418.088003,129.204167 418.866002,129.204167 419.644001,129.204167 420.422001,129.204167 421.200000,129.204167 421.200000,61.387500 421.978018,61.387500 422.755999,61.387500 423.534016,61.387500 424.311997,61.387500 425.090015,61.387500 425.867996,61.387500 426.646013,61.387500 427.423994,61.387500 428.202012,61.387500 428.979993,61.387500 429.758010,61.387500 430.535991,61.387500 431.314009,61.387500 432.091990,61.387500 432.870007,61.387500 433.647988,61.387500 434.426006,61.387500 435.203987,61.387500 435.982004,61.387500 436.759985,61.387500 437.538003,61.387500 438.315984,61.387500 439.094001,61.387500 439.871982,61.387500 440.650000,61.387500 441.428018,61.387500 442.205999,61.387500 442.984016,61.387500 443.761997,61.387500 444.540015,61.387500 445.317996,61.387500 446.096013,61.387500 446.873994,61.387500 447.652012,61.387500 448.429993,61.387500 449.208010,61.387500 449.985991,61.387500 450.764009,61.387500 451.541990,61.387500 452.320007,61.387500 453.097988,61.387500 453.876006,61.387500 454.653987,61.387500 455.432004,61.387500 456.209985,61.387500 456.988003,61.387500 457.765984,61.387500 458.544001,61.387500 459.321982,61.387500 460.100000,61.387500 460.100000,129.204167 460.878018,129.204167 461.655999,129.204167 462.434016,129.204167 463.211997,129.204167 463.990015,129.204167 464.767996,129.204167 465.546013,129.204167 466.323994,129.204167 467.102012,129.204167 467.879993,129.204167 468.658010,129.204167 469.435991,129.204167 470.214009,129.204167 470.991990,129.204167 471.770007,129.204167 472.547988,129.204167 473.326006,129.204167 474.103987,129.204167 474.882004,129.204167 475.659985,129.204167 476.438003,129.204167 477.215984,129.204167 477.994001,129.204167 478.771982,129.204167 479.550000,129.204167 480.328018,129.204167 481.105999,129.204167 481.884016,129.204167 482.661997,129.204167 483.440015,129.204167 484.217996,129.204167 484.996013,129.204167 485.773994,129.204167 486.552012,129.204167 487.329993,129.204167 488.108010,129.204167 488.885991,129.204167 489.664009,129.204167 490.441990,129.204167 491.220007,129.204167 491.997988,129.204167 492.776006,129.204167 493.553987,129.204167 494.332004,129.204167 495.109985,129.204167 495.888003,129.204167 496.665984,129.204167 497.444001,129.204167 498.221982,129.204167 499.000000,129.204167 499.000000,61.387500"
-     id="polyline79-3" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-7)"
-     points="110.000000,224.408333 110.778000,224.408333 111.556000,224.408333 112.334000,224.408333 113.112000,224.408333 113.890000,224.408333 114.668000,224.408333 115.446000,224.408333 116.224000,224.408333 117.002000,224.408333 117.780000,224.408333 118.558000,224.408333 119.336000,224.408333 120.114000,224.408333 120.892000,224.408333 121.670000,224.408333 122.448000,224.408333 123.226000,224.408333 124.004001,224.408333 124.782000,224.408333 125.560000,224.408333 126.337999,224.408333 127.116000,224.408333 127.894000,224.408333 128.672000,224.408333 129.450000,224.408333 130.227999,224.408333 131.006001,224.408333 131.784000,224.408333 132.561999,224.408333 133.340001,224.408333 134.118000,224.408333 134.895999,224.408333 135.674001,224.408333 136.452000,224.408333 137.230000,224.408333 138.008001,224.408333 138.786000,224.408333 139.564000,224.408333 140.341999,224.408333 141.120000,224.408333 141.898000,224.408333 142.675999,224.408333 143.454001,224.408333 144.232000,224.408333 145.009999,224.408333 145.788001,224.408333 146.566000,224.408333 147.343999,224.408333 148.122001,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 148.900000,224.408333 149.677999,224.408333 150.455999,224.408333 151.233998,224.408333 152.012002,224.408333 152.790001,224.408333 153.568000,224.408333 154.345999,224.408333 155.123999,224.408333 155.901998,224.408333 156.680002,224.408333 157.458001,224.408333 158.236000,224.408333 159.014000,224.408333 159.791999,224.408333 160.569998,224.408333 161.348002,224.408333 162.126001,224.408333 162.904001,224.408333 163.682000,224.408333 164.459999,224.408333 165.237998,224.408333 166.016002,224.408333 166.794001,224.408333 167.572001,224.408333 168.350000,224.408333 169.127999,224.408333 169.905999,224.408333 170.683998,224.408333 171.462002,224.408333 172.240001,224.408333 173.018000,224.408333 173.795999,224.408333 174.573999,224.408333 175.351998,224.408333 176.130002,224.408333 176.908001,224.408333 177.686000,224.408333 178.464000,224.408333 179.241999,224.408333 180.019998,224.408333 180.798002,224.408333 181.576001,224.408333 182.354001,224.408333 183.132000,224.408333 183.909999,224.408333 184.687998,224.408333 185.466002,224.408333 186.244001,224.408333 187.022001,224.408333 187.800000,224.408333 187.800000,224.408333 187.800000,224.408333 188.577999,224.408333 189.355999,224.408333 190.133998,224.408333 190.911997,224.408333 191.689996,224.408333 192.467996,224.408333 193.246004,224.408333 194.024003,224.408333 194.802003,224.408333 195.580002,224.408333 196.358001,224.408333 197.136000,224.408333 197.914000,224.408333 198.691999,224.408333 199.469998,224.408333 200.247997,224.408333 201.025997,224.408333 201.803996,224.408333 202.582004,224.408333 203.360004,224.408333 204.138003,224.408333 204.916002,224.408333 205.694001,224.408333 206.472001,224.408333 207.250000,224.408333 208.027999,224.408333 208.805999,224.408333 209.583998,224.408333 210.361997,224.408333 211.139996,224.408333 211.917996,224.408333 212.696004,224.408333 213.474003,224.408333 214.252003,224.408333 215.030002,224.408333 215.808001,224.408333 216.586000,224.408333 217.364000,224.408333 218.141999,224.408333 218.919998,224.408333 219.697997,224.408333 220.475997,224.408333 221.253996,224.408333 222.032004,224.408333 222.810004,224.408333 223.588003,224.408333 224.366002,224.408333 225.144001,224.408333 225.922001,224.408333 226.700000,224.408333 226.700000,224.408333 226.700000,224.408333 227.477999,224.408333 228.255999,224.408333 229.033998,224.408333 229.811997,224.408333 230.589996,224.408333 231.367996,224.408333 232.146004,224.408333 232.924003,224.408333 233.702003,224.408333 234.480002,224.408333 235.258001,224.408333 236.036000,224.408333 236.814000,224.408333 237.591999,224.408333 238.369998,224.408333 239.147997,224.408333 239.925997,224.408333 240.703996,224.408333 241.482004,224.408333 242.260004,224.408333 243.038003,224.408333 243.816002,224.408333 244.594001,224.408333 245.372001,224.408333 246.150000,224.408333 246.927999,224.408333 247.705999,224.408333 248.483998,224.408333 249.261997,224.408333 250.039996,224.408333 250.817996,224.408333 251.596004,224.408333 252.374003,224.408333 253.152003,224.408333 253.930002,224.408333 254.708001,224.408333 255.486000,224.408333 256.264000,224.408333 257.041999,224.408333 257.819998,224.408333 258.597997,224.408333 259.375997,224.408333 260.153996,224.408333 260.932004,224.408333 261.710004,224.408333 262.488003,224.408333 263.266002,224.408333 264.044001,224.408333 264.822001,224.408333 265.600000,224.408333 265.600000,224.408333 265.600000,224.408333 266.377999,224.408333 267.155999,224.408333 267.933998,224.408333 268.711997,224.408333 269.489996,224.408333 270.267996,224.408333 271.045995,224.408333 271.823994,224.408333 272.601993,224.408333 273.379993,224.408333 274.157992,224.408333 274.935991,224.408333 275.714009,224.408333 276.492008,224.408333 277.270007,224.408333 278.048007,224.408333 278.826006,224.408333 279.604005,224.408333 280.382004,224.408333 281.160004,224.408333 281.938003,224.408333 282.716002,224.408333 283.494001,224.408333 284.272001,224.408333 285.050000,224.408333 285.827999,224.408333 286.605999,224.408333 287.383998,224.408333 288.161997,224.408333 288.939996,224.408333 289.717996,224.408333 290.495995,224.408333 291.273994,224.408333 292.051993,224.408333 292.829993,224.408333 293.607992,224.408333 294.385991,224.408333 295.164009,224.408333 295.942008,224.408333 296.720007,224.408333 297.498007,224.408333 298.276006,224.408333 299.054005,224.408333 299.832004,224.408333 300.610004,224.408333 301.388003,224.408333 302.166002,224.408333 302.944001,224.408333 303.722001,224.408333 304.500000,224.408333 304.500000,224.408333 305.277999,224.408333 306.055999,224.408333 306.833998,224.408333 307.611997,224.408333 308.389996,224.408333 309.167996,224.408333 309.945995,224.408333 310.723994,224.408333 311.501993,224.408333 312.279993,224.408333 313.057992,224.408333 313.835991,224.408333 314.614009,224.408333 315.392008,224.408333 316.170007,224.408333 316.948007,224.408333 317.726006,224.408333 318.504005,224.408333 319.282004,224.408333 320.060004,224.408333 320.838003,224.408333 321.616002,224.408333 322.394001,224.408333 323.172001,224.408333 323.950000,224.408333 324.727999,224.408333 325.505999,224.408333 326.283998,224.408333 327.061997,224.408333 327.839996,224.408333 328.617996,224.408333 329.395995,224.408333 330.173994,224.408333 330.951993,224.408333 331.729993,224.408333 332.507992,224.408333 333.285991,224.408333 334.064009,224.408333 334.842008,224.408333 335.620007,224.408333 336.398007,224.408333 337.176006,224.408333 337.954005,224.408333 338.732004,224.408333 339.510004,224.408333 340.288003,224.408333 341.066002,224.408333 341.844001,224.408333 342.622001,224.408333 343.400000,224.408333 343.400000,224.408333 344.177999,224.408333 344.955999,224.408333 345.733998,224.408333 346.511997,224.408333 347.289996,224.408333 348.067996,224.408333 348.845995,224.408333 349.623994,224.408333 350.401993,224.408333 351.179993,224.408333 351.957992,224.408333 352.735991,224.408333 353.514009,224.408333 354.292008,224.408333 355.070007,224.408333 355.848007,224.408333 356.626006,224.408333 357.404005,224.408333 358.182004,224.408333 358.960004,224.408333 359.738003,224.408333 360.516002,224.408333 361.294001,224.408333 362.072001,224.408333 362.850000,224.408333 363.627999,224.408333 364.405999,224.408333 365.183998,224.408333 365.961997,224.408333 366.739996,224.408333 367.517996,224.408333 368.295995,224.408333 369.073994,224.408333 369.851993,224.408333 370.629993,224.408333 371.407992,224.408333 372.185991,224.408333 372.964009,224.408333 373.742008,224.408333 374.520007,224.408333 375.298007,224.408333 376.076006,224.408333 376.854005,224.408333 377.632004,224.408333 378.410004,224.408333 379.188003,224.408333 379.966002,224.408333 380.744001,224.408333 381.522001,224.408333 382.300000,224.408333 382.300000,224.408333 383.077999,224.408333 383.855999,224.408333 384.633998,224.408333 385.411997,224.408333 386.189996,224.408333 386.967996,224.408333 387.745995,224.408333 388.523994,224.408333 389.301993,224.408333 390.079993,224.408333 390.857992,224.408333 391.635991,224.408333 392.414009,224.408333 393.192008,224.408333 393.970007,224.408333 394.748007,224.408333 395.526006,224.408333 396.304005,224.408333 397.082004,224.408333 397.860004,224.408333 398.638003,224.408333 399.416002,224.408333 400.194001,224.408333 400.972001,224.408333 401.750000,224.408333 402.527999,224.408333 403.305999,224.408333 404.083998,224.408333 404.861997,224.408333 405.639996,224.408333 406.417996,224.408333 407.195995,224.408333 407.973994,224.408333 408.751993,224.408333 409.529993,224.408333 410.307992,224.408333 411.085991,224.408333 411.864009,224.408333 412.642008,224.408333 413.420007,224.408333 414.198007,224.408333 414.976006,224.408333 415.754005,224.408333 416.532004,224.408333 417.310004,224.408333 418.088003,224.408333 418.866002,224.408333 419.644001,224.408333 420.422001,224.408333 421.200000,224.408333 421.200000,224.408333 421.978018,224.408333 422.755999,224.408333 423.534016,224.408333 424.311997,224.408333 425.090015,224.408333 425.867996,224.408333 426.646013,224.408333 427.423994,224.408333 428.202012,224.408333 428.979993,224.408333 429.758010,224.408333 430.535991,224.408333 431.314009,224.408333 432.091990,224.408333 432.870007,224.408333 433.647988,224.408333 434.426006,224.408333 435.203987,224.408333 435.982004,224.408333 436.759985,224.408333 437.538003,224.408333 438.315984,224.408333 439.094001,224.408333 439.871982,224.408333 440.650000,224.408333 441.428018,224.408333 442.205999,224.408333 442.984016,224.408333 443.761997,224.408333 444.540015,224.408333 445.317996,224.408333 446.096013,224.408333 446.873994,224.408333 447.652012,224.408333 448.429993,224.408333 449.208010,224.408333 449.985991,224.408333 450.764009,224.408333 451.541990,224.408333 452.320007,224.408333 453.097988,224.408333 453.876006,224.408333 454.653987,224.408333 455.432004,224.408333 456.209985,224.408333 456.988003,224.408333 457.765984,224.408333 458.544001,224.408333 459.321982,224.408333 460.100000,224.408333 460.100000,224.408333 460.878018,224.408333 461.655999,224.408333 462.434016,224.408333 463.211997,224.408333 463.990015,224.408333 464.767996,224.408333 465.546013,224.408333 466.323994,224.408333 467.102012,224.408333 467.879993,224.408333 468.658010,224.408333 469.435991,224.408333 470.214009,224.408333 470.991990,224.408333 471.770007,224.408333 472.547988,224.408333 473.326006,224.408333 474.103987,224.408333 474.882004,224.408333 475.659985,224.408333 476.438003,224.408333 477.215984,224.408333 477.994001,224.408333 478.771982,224.408333 479.550000,224.408333 480.328018,224.408333 481.105999,224.408333 481.884016,224.408333 482.661997,224.408333 483.440015,224.408333 484.217996,224.408333 484.996013,224.408333 485.773994,224.408333 486.552012,224.408333 487.329993,224.408333 488.108010,224.408333 488.885991,224.408333 489.664009,224.408333 490.441990,224.408333 491.220007,224.408333 491.997988,224.408333 492.776006,224.408333 493.553987,224.408333 494.332004,224.408333 495.109985,224.408333 495.888003,224.408333 496.665984,224.408333 497.444001,224.408333 498.221982,224.408333 499.000000,224.408333 499.000000,224.408333"
-     id="polyline81-1" />
-  <polyline
-     transform="translate(503.13105,28.360838)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea1-7)"
-     points="110.000000,319.612500 110.778000,319.612500 111.556000,319.612500 112.334000,319.612500 113.112000,319.612500 113.890000,319.612500 114.668000,319.612500 115.446000,319.612500 116.224000,319.612500 117.002000,319.612500 117.780000,319.612500 118.558000,319.612500 119.336000,319.612500 120.114000,319.612500 120.892000,319.612500 121.670000,319.612500 122.448000,319.612500 123.226000,319.612500 124.004001,319.612500 124.782000,319.612500 125.560000,319.612500 126.337999,319.612500 127.116000,319.612500 127.894000,319.612500 128.672000,319.612500 129.450000,319.612500 130.227999,319.612500 131.006001,319.612500 131.784000,319.612500 132.561999,319.612500 133.340001,319.612500 134.118000,319.612500 134.895999,319.612500 135.674001,319.612500 136.452000,319.612500 137.230000,319.612500 138.008001,319.612500 138.786000,319.612500 139.564000,319.612500 140.341999,319.612500 141.120000,319.612500 141.898000,319.612500 142.675999,319.612500 143.454001,319.612500 144.232000,319.612500 145.009999,319.612500 145.788001,319.612500 146.566000,319.612500 147.343999,319.612500 148.122001,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 149.677999,319.612500 150.455999,319.612500 151.233998,319.612500 152.012002,319.612500 152.790001,319.612500 153.568000,319.612500 154.345999,319.612500 155.123999,319.612500 155.901998,319.612500 156.680002,319.612500 157.458001,319.612500 158.236000,319.612500 159.014000,319.612500 159.791999,319.612500 160.569998,319.612500 161.348002,319.612500 162.126001,319.612500 162.904001,319.612500 163.682000,319.612500 164.459999,319.612500 165.237998,319.612500 166.016002,319.612500 166.794001,319.612500 167.572001,319.612500 168.350000,319.612500 169.127999,319.612500 169.905999,319.612500 170.683998,319.612500 171.462002,319.612500 172.240001,319.612500 173.018000,319.612500 173.795999,319.612500 174.573999,319.612500 175.351998,319.612500 176.130002,319.612500 176.908001,319.612500 177.686000,319.612500 178.464000,319.612500 179.241999,319.612500 180.019998,319.612500 180.798002,319.612500 181.576001,319.612500 182.354001,319.612500 183.132000,319.612500 183.909999,319.612500 184.687998,319.612500 185.466002,319.612500 186.244001,319.612500 187.022001,319.612500 187.800000,319.612500 187.800000,251.795833 187.800000,251.795833 188.577999,251.795833 189.355999,251.795833 190.133998,251.795833 190.911997,251.795833 191.689996,251.795833 192.467996,251.795833 193.246004,251.795833 194.024003,251.795833 194.802003,251.795833 195.580002,251.795833 196.358001,251.795833 197.136000,251.795833 197.914000,251.795833 198.691999,251.795833 199.469998,251.795833 200.247997,251.795833 201.025997,251.795833 201.803996,251.795833 202.582004,251.795833 203.360004,251.795833 204.138003,251.795833 204.916002,251.795833 205.694001,251.795833 206.472001,251.795833 207.250000,251.795833 208.027999,251.795833 208.805999,251.795833 209.583998,251.795833 210.361997,251.795833 211.139996,251.795833 211.917996,251.795833 212.696004,251.795833 213.474003,251.795833 214.252003,251.795833 215.030002,251.795833 215.808001,251.795833 216.586000,251.795833 217.364000,251.795833 218.141999,251.795833 218.919998,251.795833 219.697997,251.795833 220.475997,251.795833 221.253996,251.795833 222.032004,251.795833 222.810004,251.795833 223.588003,251.795833 224.366002,251.795833 225.144001,251.795833 225.922001,251.795833 226.700000,251.795833 226.700000,251.795833 226.700000,251.795833 227.477999,251.795833 228.255999,251.795833 229.033998,251.795833 229.811997,251.795833 230.589996,251.795833 231.367996,251.795833 232.146004,251.795833 232.924003,251.795833 233.702003,251.795833 234.480002,251.795833 235.258001,251.795833 236.036000,251.795833 236.814000,251.795833 237.591999,251.795833 238.369998,251.795833 239.147997,251.795833 239.925997,251.795833 240.703996,251.795833 241.482004,251.795833 242.260004,251.795833 243.038003,251.795833 243.816002,251.795833 244.594001,251.795833 245.372001,251.795833 246.150000,251.795833 246.927999,251.795833 247.705999,251.795833 248.483998,251.795833 249.261997,251.795833 250.039996,251.795833 250.817996,251.795833 251.596004,251.795833 252.374003,251.795833 253.152003,251.795833 253.930002,251.795833 254.708001,251.795833 255.486000,251.795833 256.264000,251.795833 257.041999,251.795833 257.819998,251.795833 258.597997,251.795833 259.375997,251.795833 260.153996,251.795833 260.932004,251.795833 261.710004,251.795833 262.488003,251.795833 263.266002,251.795833 264.044001,251.795833 264.822001,251.795833 265.600000,251.795833 265.600000,319.612500 265.600000,319.612500 266.377999,319.612500 267.155999,319.612500 267.933998,319.612500 268.711997,319.612500 269.489996,319.612500 270.267996,319.612500 271.045995,319.612500 271.823994,319.612500 272.601993,319.612500 273.379993,319.612500 274.157992,319.612500 274.935991,319.612500 275.714009,319.612500 276.492008,319.612500 277.270007,319.612500 278.048007,319.612500 278.826006,319.612500 279.604005,319.612500 280.382004,319.612500 281.160004,319.612500 281.938003,319.612500 282.716002,319.612500 283.494001,319.612500 284.272001,319.612500 285.050000,319.612500 285.827999,319.612500 286.605999,319.612500 287.383998,319.612500 288.161997,319.612500 288.939996,319.612500 289.717996,319.612500 290.495995,319.612500 291.273994,319.612500 292.051993,319.612500 292.829993,319.612500 293.607992,319.612500 294.385991,319.612500 295.164009,319.612500 295.942008,319.612500 296.720007,319.612500 297.498007,319.612500 298.276006,319.612500 299.054005,319.612500 299.832004,319.612500 300.610004,319.612500 301.388003,319.612500 302.166002,319.612500 302.944001,319.612500 303.722001,319.612500 304.500000,319.612500 304.500000,319.612500 305.277999,319.612500 306.055999,319.612500 306.833998,319.612500 307.611997,319.612500 308.389996,319.612500 309.167996,319.612500 309.945995,319.612500 310.723994,319.612500 311.501993,319.612500 312.279993,319.612500 313.057992,319.612500 313.835991,319.612500 314.614009,319.612500 315.392008,319.612500 316.170007,319.612500 316.948007,319.612500 317.726006,319.612500 318.504005,319.612500 319.282004,319.612500 320.060004,319.612500 320.838003,319.612500 321.616002,319.612500 322.394001,319.612500 323.172001,319.612500 323.950000,319.612500 324.727999,319.612500 325.505999,319.612500 326.283998,319.612500 327.061997,319.612500 327.839996,319.612500 328.617996,319.612500 329.395995,319.612500 330.173994,319.612500 330.951993,319.612500 331.729993,319.612500 332.507992,319.612500 333.285991,319.612500 334.064009,319.612500 334.842008,319.612500 335.620007,319.612500 336.398007,319.612500 337.176006,319.612500 337.954005,319.612500 338.732004,319.612500 339.510004,319.612500 340.288003,319.612500 341.066002,319.612500 341.844001,319.612500 342.622001,319.612500 343.400000,319.612500 343.400000,251.795833 344.177999,251.795833 344.955999,251.795833 345.733998,251.795833 346.511997,251.795833 347.289996,251.795833 348.067996,251.795833 348.845995,251.795833 349.623994,251.795833 350.401993,251.795833 351.179993,251.795833 351.957992,251.795833 352.735991,251.795833 353.514009,251.795833 354.292008,251.795833 355.070007,251.795833 355.848007,251.795833 356.626006,251.795833 357.404005,251.795833 358.182004,251.795833 358.960004,251.795833 359.738003,251.795833 360.516002,251.795833 361.294001,251.795833 362.072001,251.795833 362.850000,251.795833 363.627999,251.795833 364.405999,251.795833 365.183998,251.795833 365.961997,251.795833 366.739996,251.795833 367.517996,251.795833 368.295995,251.795833 369.073994,251.795833 369.851993,251.795833 370.629993,251.795833 371.407992,251.795833 372.185991,251.795833 372.964009,251.795833 373.742008,251.795833 374.520007,251.795833 375.298007,251.795833 376.076006,251.795833 376.854005,251.795833 377.632004,251.795833 378.410004,251.795833 379.188003,251.795833 379.966002,251.795833 380.744001,251.795833 381.522001,251.795833 382.300000,251.795833 382.300000,251.795833 383.077999,251.795833 383.855999,251.795833 384.633998,251.795833 385.411997,251.795833 386.189996,251.795833 386.967996,251.795833 387.745995,251.795833 388.523994,251.795833 389.301993,251.795833 390.079993,251.795833 390.857992,251.795833 391.635991,251.795833 392.414009,251.795833 393.192008,251.795833 393.970007,251.795833 394.748007,251.795833 395.526006,251.795833 396.304005,251.795833 397.082004,251.795833 397.860004,251.795833 398.638003,251.795833 399.416002,251.795833 400.194001,251.795833 400.972001,251.795833 401.750000,251.795833 402.527999,251.795833 403.305999,251.795833 404.083998,251.795833 404.861997,251.795833 405.639996,251.795833 406.417996,251.795833 407.195995,251.795833 407.973994,251.795833 408.751993,251.795833 409.529993,251.795833 410.307992,251.795833 411.085991,251.795833 411.864009,251.795833 412.642008,251.795833 413.420007,251.795833 414.198007,251.795833 414.976006,251.795833 415.754005,251.795833 416.532004,251.795833 417.310004,251.795833 418.088003,251.795833 418.866002,251.795833 419.644001,251.795833 420.422001,251.795833 421.200000,251.795833 421.200000,319.612500 421.978018,319.612500 422.755999,319.612500 423.534016,319.612500 424.311997,319.612500 425.090015,319.612500 425.867996,319.612500 426.646013,319.612500 427.423994,319.612500 428.202012,319.612500 428.979993,319.612500 429.758010,319.612500 430.535991,319.612500 431.314009,319.612500 432.091990,319.612500 432.870007,319.612500 433.647988,319.612500 434.426006,319.612500 435.203987,319.612500 435.982004,319.612500 436.759985,319.612500 437.538003,319.612500 438.315984,319.612500 439.094001,319.612500 439.871982,319.612500 440.650000,319.612500 441.428018,319.612500 442.205999,319.612500 442.984016,319.612500 443.761997,319.612500 444.540015,319.612500 445.317996,319.612500 446.096013,319.612500 446.873994,319.612500 447.652012,319.612500 448.429993,319.612500 449.208010,319.612500 449.985991,319.612500 450.764009,319.612500 451.541990,319.612500 452.320007,319.612500 453.097988,319.612500 453.876006,319.612500 454.653987,319.612500 455.432004,319.612500 456.209985,319.612500 456.988003,319.612500 457.765984,319.612500 458.544001,319.612500 459.321982,319.612500 460.100000,319.612500 460.100000,319.612500 460.878018,319.612500 461.655999,319.612500 462.434016,319.612500 463.211997,319.612500 463.990015,319.612500 464.767996,319.612500 465.546013,319.612500 466.323994,319.612500 467.102012,319.612500 467.879993,319.612500 468.658010,319.612500 469.435991,319.612500 470.214009,319.612500 470.991990,319.612500 471.770007,319.612500 472.547988,319.612500 473.326006,319.612500 474.103987,319.612500 474.882004,319.612500 475.659985,319.612500 476.438003,319.612500 477.215984,319.612500 477.994001,319.612500 478.771982,319.612500 479.550000,319.612500 480.328018,319.612500 481.105999,319.612500 481.884016,319.612500 482.661997,319.612500 483.440015,319.612500 484.217996,319.612500 484.996013,319.612500 485.773994,319.612500 486.552012,319.612500 487.329993,319.612500 488.108010,319.612500 488.885991,319.612500 489.664009,319.612500 490.441990,319.612500 491.220007,319.612500 491.997988,319.612500 492.776006,319.612500 493.553987,319.612500 494.332004,319.612500 495.109985,319.612500 495.888003,319.612500 496.665984,319.612500 497.444001,319.612500 498.221982,319.612500 499.000000,319.612500 499.000000,251.795833"
-     id="polyline83-9" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="616.13104"
-     y="72.86084"
-     id="text85-4">iniFalOut.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="616.13104"
-     y="167.86084"
-     id="text87-7">iniFalOut.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="616.13104"
-     y="262.86084"
-     id="text89-8">iniFalOut.y</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline91-4" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,434.000000 187.800000,747.000000"
-     id="polyline93-5" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,434.000000 265.600000,747.000000"
-     id="polyline95-0" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,434.000000 343.400000,747.000000"
-     id="polyline97-3" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,434.000000 421.200000,747.000000"
-     id="polyline99-6" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 499.000000,747.000000"
-     id="polyline101-1" />
+     id="polyline1651"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="48.78474"
+     y="291.11429"
+     id="text1653">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-6)"
+     points="110.000000,61.387500 110.720000,61.387500 111.440000,61.387500 112.160000,61.387500 112.880000,61.387500 113.600000,61.387500 114.320000,61.387500 115.040000,61.387500 115.760000,61.387500 116.480000,61.387500 117.200000,61.387500 117.920000,61.387500 118.640000,61.387500 119.360000,61.387500 120.080000,61.387500 120.800000,61.387500 121.520000,61.387500 122.240000,61.387500 122.960001,61.387500 123.680000,61.387500 124.400000,61.387500 125.120000,61.387500 125.840000,61.387500 126.560000,61.387500 127.280000,61.387500 128.000000,61.387500 128.719999,61.387500 129.440001,61.387500 130.160000,61.387500 130.879999,61.387500 131.600001,61.387500 132.320000,61.387500 133.039999,61.387500 133.760001,61.387500 134.480000,61.387500 135.200000,61.387500 135.920001,61.387500 136.640000,61.387500 137.360000,61.387500 138.079999,61.387500 138.800000,61.387500 139.520000,61.387500 140.239999,61.387500 140.960001,61.387500 141.680000,61.387500 142.399999,61.387500 143.120001,61.387500 143.840000,61.387500 144.559999,61.387500 145.280001,61.387500 146.000000,61.387500 146.000000,129.204167 146.000000,129.204167 146.719999,129.204167 147.439999,129.204167 148.159998,129.204167 148.880002,129.204167 149.600001,129.204167 150.320000,129.204167 151.039999,129.204167 151.759999,129.204167 152.479998,129.204167 153.200002,129.204167 153.920001,129.204167 154.640000,129.204167 155.360000,129.204167 156.079999,129.204167 156.799998,129.204167 157.520002,129.204167 158.240001,129.204167 158.960001,129.204167 159.680000,129.204167 160.399999,129.204167 161.119998,129.204167 161.840002,129.204167 162.560001,129.204167 163.280001,129.204167 164.000000,129.204167 164.719999,129.204167 165.439999,129.204167 166.159998,129.204167 166.880002,129.204167 167.600001,129.204167 168.320000,129.204167 169.039999,129.204167 169.759999,129.204167 170.479998,129.204167 171.200002,129.204167 171.920001,129.204167 172.640000,129.204167 173.360000,129.204167 174.079999,129.204167 174.799998,129.204167 175.520002,129.204167 176.240001,129.204167 176.960001,129.204167 177.680000,129.204167 178.399999,129.204167 179.119998,129.204167 179.840002,129.204167 180.560001,129.204167 181.280001,129.204167 182.000000,129.204167 182.000000,61.387500 182.000000,61.387500 182.719999,61.387500 183.439999,61.387500 184.159998,61.387500 184.879997,61.387500 185.599997,61.387500 186.319996,61.387500 187.040004,61.387500 187.760003,61.387500 188.480002,61.387500 189.200002,61.387500 189.920001,61.387500 190.640000,61.387500 191.360000,61.387500 192.079999,61.387500 192.799998,61.387500 193.519998,61.387500 194.239997,61.387500 194.959996,61.387500 195.680004,61.387500 196.400003,61.387500 197.120003,61.387500 197.840002,61.387500 198.560001,61.387500 199.280001,61.387500 200.000000,61.387500 200.719999,61.387500 201.439999,61.387500 202.159998,61.387500 202.879997,61.387500 203.599997,61.387500 204.319996,61.387500 205.040004,61.387500 205.760003,61.387500 206.480002,61.387500 207.200002,61.387500 207.920001,61.387500 208.640000,61.387500 209.360000,61.387500 210.079999,61.387500 210.799998,61.387500 211.519998,61.387500 212.239997,61.387500 212.959996,61.387500 213.680004,61.387500 214.400003,61.387500 215.120003,61.387500 215.840002,61.387500 216.560001,61.387500 217.280001,61.387500 218.000000,61.387500 218.000000,129.204167 218.000000,129.204167 218.719999,129.204167 219.439999,129.204167 220.159998,129.204167 220.879997,129.204167 221.599997,129.204167 222.319996,129.204167 223.040004,129.204167 223.760003,129.204167 224.480002,129.204167 225.200002,129.204167 225.920001,129.204167 226.640000,129.204167 227.360000,129.204167 228.079999,129.204167 228.799998,129.204167 229.519998,129.204167 230.239997,129.204167 230.959996,129.204167 231.680004,129.204167 232.400003,129.204167 233.120003,129.204167 233.840002,129.204167 234.560001,129.204167 235.280001,129.204167 236.000000,129.204167 236.719999,129.204167 237.439999,129.204167 238.159998,129.204167 238.879997,129.204167 239.599997,129.204167 240.319996,129.204167 241.040004,129.204167 241.760003,129.204167 242.480002,129.204167 243.200002,129.204167 243.920001,129.204167 244.640000,129.204167 245.360000,129.204167 246.079999,129.204167 246.799998,129.204167 247.519998,129.204167 248.239997,129.204167 248.959996,129.204167 249.680004,129.204167 250.400003,129.204167 251.120003,129.204167 251.840002,129.204167 252.560001,129.204167 253.280001,129.204167 254.000000,129.204167 254.000000,61.387500 254.000000,61.387500 254.719999,61.387500 255.439999,61.387500 256.159998,61.387500 256.879997,61.387500 257.599997,61.387500 258.319996,61.387500 259.039995,61.387500 259.759995,61.387500 260.479994,61.387500 261.199993,61.387500 261.919992,61.387500 262.639992,61.387500 263.360008,61.387500 264.080008,61.387500 264.800007,61.387500 265.520006,61.387500 266.240005,61.387500 266.960005,61.387500 267.680004,61.387500 268.400003,61.387500 269.120003,61.387500 269.840002,61.387500 270.560001,61.387500 271.280001,61.387500 272.000000,61.387500 272.719999,61.387500 273.439999,61.387500 274.159998,61.387500 274.879997,61.387500 275.599997,61.387500 276.319996,61.387500 277.039995,61.387500 277.759995,61.387500 278.479994,61.387500 279.199993,61.387500 279.919992,61.387500 280.639992,61.387500 281.360008,61.387500 282.080008,61.387500 282.800007,61.387500 283.520006,61.387500 284.240005,61.387500 284.960005,61.387500 285.680004,61.387500 286.400003,61.387500 287.120003,61.387500 287.840002,61.387500 288.560001,61.387500 289.280001,61.387500 290.000000,61.387500 290.000000,129.204167 290.719999,129.204167 291.439999,129.204167 292.159998,129.204167 292.879997,129.204167 293.599997,129.204167 294.319996,129.204167 295.039995,129.204167 295.759995,129.204167 296.479994,129.204167 297.199993,129.204167 297.919992,129.204167 298.639992,129.204167 299.360008,129.204167 300.080008,129.204167 300.800007,129.204167 301.520006,129.204167 302.240005,129.204167 302.960005,129.204167 303.680004,129.204167 304.400003,129.204167 305.120003,129.204167 305.840002,129.204167 306.560001,129.204167 307.280001,129.204167 308.000000,129.204167 308.719999,129.204167 309.439999,129.204167 310.159998,129.204167 310.879997,129.204167 311.599997,129.204167 312.319996,129.204167 313.039995,129.204167 313.759995,129.204167 314.479994,129.204167 315.199993,129.204167 315.919992,129.204167 316.639992,129.204167 317.360008,129.204167 318.080008,129.204167 318.800007,129.204167 319.520006,129.204167 320.240005,129.204167 320.960005,129.204167 321.680004,129.204167 322.400003,129.204167 323.120003,129.204167 323.840002,129.204167 324.560001,129.204167 325.280001,129.204167 326.000000,129.204167 326.000000,61.387500 326.719999,61.387500 327.439999,61.387500 328.159998,61.387500 328.879997,61.387500 329.599997,61.387500 330.319996,61.387500 331.039995,61.387500 331.759995,61.387500 332.479994,61.387500 333.199993,61.387500 333.919992,61.387500 334.639992,61.387500 335.360008,61.387500 336.080008,61.387500 336.800007,61.387500 337.520006,61.387500 338.240005,61.387500 338.960005,61.387500 339.680004,61.387500 340.400003,61.387500 341.120003,61.387500 341.840002,61.387500 342.560001,61.387500 343.280001,61.387500 344.000000,61.387500 344.719999,61.387500 345.439999,61.387500 346.159998,61.387500 346.879997,61.387500 347.599997,61.387500 348.319996,61.387500 349.039995,61.387500 349.759995,61.387500 350.479994,61.387500 351.199993,61.387500 351.919992,61.387500 352.639992,61.387500 353.360008,61.387500 354.080008,61.387500 354.800007,61.387500 355.520006,61.387500 356.240005,61.387500 356.960005,61.387500 357.680004,61.387500 358.400003,61.387500 359.120003,61.387500 359.840002,61.387500 360.560001,61.387500 361.280001,61.387500 362.000000,61.387500 362.000000,129.204167 362.719999,129.204167 363.439999,129.204167 364.159998,129.204167 364.879997,129.204167 365.599997,129.204167 366.319996,129.204167 367.039995,129.204167 367.759995,129.204167 368.479994,129.204167 369.199993,129.204167 369.919992,129.204167 370.639992,129.204167 371.360008,129.204167 372.080008,129.204167 372.800007,129.204167 373.520006,129.204167 374.240005,129.204167 374.960005,129.204167 375.680004,129.204167 376.400003,129.204167 377.120003,129.204167 377.840002,129.204167 378.560001,129.204167 379.280001,129.204167 380.000000,129.204167 380.719999,129.204167 381.439999,129.204167 382.159998,129.204167 382.879997,129.204167 383.599997,129.204167 384.319996,129.204167 385.039995,129.204167 385.759995,129.204167 386.479994,129.204167 387.199993,129.204167 387.919992,129.204167 388.639992,129.204167 389.360008,129.204167 390.080008,129.204167 390.800007,129.204167 391.520006,129.204167 392.240005,129.204167 392.960005,129.204167 393.680004,129.204167 394.400003,129.204167 395.120003,129.204167 395.840002,129.204167 396.560001,129.204167 397.280001,129.204167 398.000000,129.204167 398.000000,61.387500 398.720016,61.387500 399.439999,61.387500 400.160015,61.387500 400.879997,61.387500 401.600014,61.387500 402.319996,61.387500 403.040012,61.387500 403.759995,61.387500 404.480011,61.387500 405.199993,61.387500 405.920010,61.387500 406.639992,61.387500 407.360008,61.387500 408.079990,61.387500 408.800007,61.387500 409.519989,61.387500 410.240005,61.387500 410.959988,61.387500 411.680004,61.387500 412.399986,61.387500 413.120003,61.387500 413.839985,61.387500 414.560001,61.387500 415.279984,61.387500 416.000000,61.387500 416.720016,61.387500 417.439999,61.387500 418.160015,61.387500 418.879997,61.387500 419.600014,61.387500 420.319996,61.387500 421.040012,61.387500 421.759995,61.387500 422.480011,61.387500 423.199993,61.387500 423.920010,61.387500 424.639992,61.387500 425.360008,61.387500 426.079990,61.387500 426.800007,61.387500 427.519989,61.387500 428.240005,61.387500 428.959988,61.387500 429.680004,61.387500 430.399986,61.387500 431.120003,61.387500 431.839985,61.387500 432.560001,61.387500 433.279984,61.387500 434.000000,61.387500 434.000000,129.204167 434.720016,129.204167 435.439999,129.204167 436.160015,129.204167 436.879997,129.204167 437.600014,129.204167 438.319996,129.204167 439.040012,129.204167 439.759995,129.204167 440.480011,129.204167 441.199993,129.204167 441.920010,129.204167 442.639992,129.204167 443.360008,129.204167 444.079990,129.204167 444.800007,129.204167 445.519989,129.204167 446.240005,129.204167 446.959988,129.204167 447.680004,129.204167 448.399986,129.204167 449.120003,129.204167 449.839985,129.204167 450.560001,129.204167 451.279984,129.204167 452.000000,129.204167 452.720016,129.204167 453.439999,129.204167 454.160015,129.204167 454.879997,129.204167 455.600014,129.204167 456.319996,129.204167 457.040012,129.204167 457.759995,129.204167 458.480011,129.204167 459.199993,129.204167 459.920010,129.204167 460.639992,129.204167 461.360008,129.204167 462.079990,129.204167 462.800007,129.204167 463.519989,129.204167 464.240005,129.204167 464.959988,129.204167 465.680004,129.204167 466.399986,129.204167 467.120003,129.204167 467.839985,129.204167 468.560001,129.204167 469.279984,129.204167 470.000000,129.204167 470.000000,61.387500"
+     id="polyline1658"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-6)"
+     points="110.000000,224.408333 110.720000,224.408333 111.440000,224.408333 112.160000,224.408333 112.880000,224.408333 113.600000,224.408333 114.320000,224.408333 115.040000,224.408333 115.760000,224.408333 116.480000,224.408333 117.200000,224.408333 117.920000,224.408333 118.640000,224.408333 119.360000,224.408333 120.080000,224.408333 120.800000,224.408333 121.520000,224.408333 122.240000,224.408333 122.960001,224.408333 123.680000,224.408333 124.400000,224.408333 125.120000,224.408333 125.840000,224.408333 126.560000,224.408333 127.280000,224.408333 128.000000,224.408333 128.719999,224.408333 129.440001,224.408333 130.160000,224.408333 130.879999,224.408333 131.600001,224.408333 132.320000,224.408333 133.039999,224.408333 133.760001,224.408333 134.480000,224.408333 135.200000,224.408333 135.920001,224.408333 136.640000,224.408333 137.360000,224.408333 138.079999,224.408333 138.800000,224.408333 139.520000,224.408333 140.239999,224.408333 140.960001,224.408333 141.680000,224.408333 142.399999,224.408333 143.120001,224.408333 143.840000,224.408333 144.559999,224.408333 145.280001,224.408333 146.000000,224.408333 146.000000,224.408333 146.000000,224.408333 146.719999,224.408333 147.439999,224.408333 148.159998,224.408333 148.880002,224.408333 149.600001,224.408333 150.320000,224.408333 151.039999,224.408333 151.759999,224.408333 152.479998,224.408333 153.200002,224.408333 153.920001,224.408333 154.640000,224.408333 155.360000,224.408333 156.079999,224.408333 156.799998,224.408333 157.520002,224.408333 158.240001,224.408333 158.960001,224.408333 159.680000,224.408333 160.399999,224.408333 161.119998,224.408333 161.840002,224.408333 162.560001,224.408333 163.280001,224.408333 164.000000,224.408333 164.719999,224.408333 165.439999,224.408333 166.159998,224.408333 166.880002,224.408333 167.600001,224.408333 168.320000,224.408333 169.039999,224.408333 169.759999,224.408333 170.479998,224.408333 171.200002,224.408333 171.920001,224.408333 172.640000,224.408333 173.360000,224.408333 174.079999,224.408333 174.799998,224.408333 175.520002,224.408333 176.240001,224.408333 176.960001,224.408333 177.680000,224.408333 178.399999,224.408333 179.119998,224.408333 179.840002,224.408333 180.560001,224.408333 181.280001,224.408333 182.000000,224.408333 182.000000,224.408333 182.000000,224.408333 182.719999,224.408333 183.439999,224.408333 184.159998,224.408333 184.879997,224.408333 185.599997,224.408333 186.319996,224.408333 187.040004,224.408333 187.760003,224.408333 188.480002,224.408333 189.200002,224.408333 189.920001,224.408333 190.640000,224.408333 191.360000,224.408333 192.079999,224.408333 192.799998,224.408333 193.519998,224.408333 194.239997,224.408333 194.959996,224.408333 195.680004,224.408333 196.400003,224.408333 197.120003,224.408333 197.840002,224.408333 198.560001,224.408333 199.280001,224.408333 200.000000,224.408333 200.719999,224.408333 201.439999,224.408333 202.159998,224.408333 202.879997,224.408333 203.599997,224.408333 204.319996,224.408333 205.040004,224.408333 205.760003,224.408333 206.480002,224.408333 207.200002,224.408333 207.920001,224.408333 208.640000,224.408333 209.360000,224.408333 210.079999,224.408333 210.799998,224.408333 211.519998,224.408333 212.239997,224.408333 212.959996,224.408333 213.680004,224.408333 214.400003,224.408333 215.120003,224.408333 215.840002,224.408333 216.560001,224.408333 217.280001,224.408333 218.000000,224.408333 218.000000,224.408333 218.000000,224.408333 218.719999,224.408333 219.439999,224.408333 220.159998,224.408333 220.879997,224.408333 221.599997,224.408333 222.319996,224.408333 223.040004,224.408333 223.760003,224.408333 224.480002,224.408333 225.200002,224.408333 225.920001,224.408333 226.640000,224.408333 227.360000,224.408333 228.079999,224.408333 228.799998,224.408333 229.519998,224.408333 230.239997,224.408333 230.959996,224.408333 231.680004,224.408333 232.400003,224.408333 233.120003,224.408333 233.840002,224.408333 234.560001,224.408333 235.280001,224.408333 236.000000,224.408333 236.719999,224.408333 237.439999,224.408333 238.159998,224.408333 238.879997,224.408333 239.599997,224.408333 240.319996,224.408333 241.040004,224.408333 241.760003,224.408333 242.480002,224.408333 243.200002,224.408333 243.920001,224.408333 244.640000,224.408333 245.360000,224.408333 246.079999,224.408333 246.799998,224.408333 247.519998,224.408333 248.239997,224.408333 248.959996,224.408333 249.680004,224.408333 250.400003,224.408333 251.120003,224.408333 251.840002,224.408333 252.560001,224.408333 253.280001,224.408333 254.000000,224.408333 254.000000,224.408333 254.000000,224.408333 254.719999,224.408333 255.439999,224.408333 256.159998,224.408333 256.879997,224.408333 257.599997,224.408333 258.319996,224.408333 259.039995,224.408333 259.759995,224.408333 260.479994,224.408333 261.199993,224.408333 261.919992,224.408333 262.639992,224.408333 263.360008,224.408333 264.080008,224.408333 264.800007,224.408333 265.520006,224.408333 266.240005,224.408333 266.960005,224.408333 267.680004,224.408333 268.400003,224.408333 269.120003,224.408333 269.840002,224.408333 270.560001,224.408333 271.280001,224.408333 272.000000,224.408333 272.719999,224.408333 273.439999,224.408333 274.159998,224.408333 274.879997,224.408333 275.599997,224.408333 276.319996,224.408333 277.039995,224.408333 277.759995,224.408333 278.479994,224.408333 279.199993,224.408333 279.919992,224.408333 280.639992,224.408333 281.360008,224.408333 282.080008,224.408333 282.800007,224.408333 283.520006,224.408333 284.240005,224.408333 284.960005,224.408333 285.680004,224.408333 286.400003,224.408333 287.120003,224.408333 287.840002,224.408333 288.560001,224.408333 289.280001,224.408333 290.000000,224.408333 290.000000,224.408333 290.719999,224.408333 291.439999,224.408333 292.159998,224.408333 292.879997,224.408333 293.599997,224.408333 294.319996,224.408333 295.039995,224.408333 295.759995,224.408333 296.479994,224.408333 297.199993,224.408333 297.919992,224.408333 298.639992,224.408333 299.360008,224.408333 300.080008,224.408333 300.800007,224.408333 301.520006,224.408333 302.240005,224.408333 302.960005,224.408333 303.680004,224.408333 304.400003,224.408333 305.120003,224.408333 305.840002,224.408333 306.560001,224.408333 307.280001,224.408333 308.000000,224.408333 308.719999,224.408333 309.439999,224.408333 310.159998,224.408333 310.879997,224.408333 311.599997,224.408333 312.319996,224.408333 313.039995,224.408333 313.759995,224.408333 314.479994,224.408333 315.199993,224.408333 315.919992,224.408333 316.639992,224.408333 317.360008,224.408333 318.080008,224.408333 318.800007,224.408333 319.520006,224.408333 320.240005,224.408333 320.960005,224.408333 321.680004,224.408333 322.400003,224.408333 323.120003,224.408333 323.840002,224.408333 324.560001,224.408333 325.280001,224.408333 326.000000,224.408333 326.000000,224.408333 326.719999,224.408333 327.439999,224.408333 328.159998,224.408333 328.879997,224.408333 329.599997,224.408333 330.319996,224.408333 331.039995,224.408333 331.759995,224.408333 332.479994,224.408333 333.199993,224.408333 333.919992,224.408333 334.639992,224.408333 335.360008,224.408333 336.080008,224.408333 336.800007,224.408333 337.520006,224.408333 338.240005,224.408333 338.960005,224.408333 339.680004,224.408333 340.400003,224.408333 341.120003,224.408333 341.840002,224.408333 342.560001,224.408333 343.280001,224.408333 344.000000,224.408333 344.719999,224.408333 345.439999,224.408333 346.159998,224.408333 346.879997,224.408333 347.599997,224.408333 348.319996,224.408333 349.039995,224.408333 349.759995,224.408333 350.479994,224.408333 351.199993,224.408333 351.919992,224.408333 352.639992,224.408333 353.360008,224.408333 354.080008,224.408333 354.800007,224.408333 355.520006,224.408333 356.240005,224.408333 356.960005,224.408333 357.680004,224.408333 358.400003,224.408333 359.120003,224.408333 359.840002,224.408333 360.560001,224.408333 361.280001,224.408333 362.000000,224.408333 362.000000,224.408333 362.719999,224.408333 363.439999,224.408333 364.159998,224.408333 364.879997,224.408333 365.599997,224.408333 366.319996,224.408333 367.039995,224.408333 367.759995,224.408333 368.479994,224.408333 369.199993,224.408333 369.919992,224.408333 370.639992,224.408333 371.360008,224.408333 372.080008,224.408333 372.800007,224.408333 373.520006,224.408333 374.240005,224.408333 374.960005,224.408333 375.680004,224.408333 376.400003,224.408333 377.120003,224.408333 377.840002,224.408333 378.560001,224.408333 379.280001,224.408333 380.000000,224.408333 380.719999,224.408333 381.439999,224.408333 382.159998,224.408333 382.879997,224.408333 383.599997,224.408333 384.319996,224.408333 385.039995,224.408333 385.759995,224.408333 386.479994,224.408333 387.199993,224.408333 387.919992,224.408333 388.639992,224.408333 389.360008,224.408333 390.080008,224.408333 390.800007,224.408333 391.520006,224.408333 392.240005,224.408333 392.960005,224.408333 393.680004,224.408333 394.400003,224.408333 395.120003,224.408333 395.840002,224.408333 396.560001,224.408333 397.280001,224.408333 398.000000,224.408333 398.000000,224.408333 398.720016,224.408333 399.439999,224.408333 400.160015,224.408333 400.879997,224.408333 401.600014,224.408333 402.319996,224.408333 403.040012,224.408333 403.759995,224.408333 404.480011,224.408333 405.199993,224.408333 405.920010,224.408333 406.639992,224.408333 407.360008,224.408333 408.079990,224.408333 408.800007,224.408333 409.519989,224.408333 410.240005,224.408333 410.959988,224.408333 411.680004,224.408333 412.399986,224.408333 413.120003,224.408333 413.839985,224.408333 414.560001,224.408333 415.279984,224.408333 416.000000,224.408333 416.720016,224.408333 417.439999,224.408333 418.160015,224.408333 418.879997,224.408333 419.600014,224.408333 420.319996,224.408333 421.040012,224.408333 421.759995,224.408333 422.480011,224.408333 423.199993,224.408333 423.920010,224.408333 424.639992,224.408333 425.360008,224.408333 426.079990,224.408333 426.800007,224.408333 427.519989,224.408333 428.240005,224.408333 428.959988,224.408333 429.680004,224.408333 430.399986,224.408333 431.120003,224.408333 431.839985,224.408333 432.560001,224.408333 433.279984,224.408333 434.000000,224.408333 434.000000,224.408333 434.720016,224.408333 435.439999,224.408333 436.160015,224.408333 436.879997,224.408333 437.600014,224.408333 438.319996,224.408333 439.040012,224.408333 439.759995,224.408333 440.480011,224.408333 441.199993,224.408333 441.920010,224.408333 442.639992,224.408333 443.360008,224.408333 444.079990,224.408333 444.800007,224.408333 445.519989,224.408333 446.240005,224.408333 446.959988,224.408333 447.680004,224.408333 448.399986,224.408333 449.120003,224.408333 449.839985,224.408333 450.560001,224.408333 451.279984,224.408333 452.000000,224.408333 452.720016,224.408333 453.439999,224.408333 454.160015,224.408333 454.879997,224.408333 455.600014,224.408333 456.319996,224.408333 457.040012,224.408333 457.759995,224.408333 458.480011,224.408333 459.199993,224.408333 459.920010,224.408333 460.639992,224.408333 461.360008,224.408333 462.079990,224.408333 462.800007,224.408333 463.519989,224.408333 464.240005,224.408333 464.959988,224.408333 465.680004,224.408333 466.399986,224.408333 467.120003,224.408333 467.839985,224.408333 468.560001,224.408333 469.279984,224.408333 470.000000,224.408333 470.000000,224.408333"
+     id="polyline1660"
+     transform="translate(-45.215317,39.318317)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-6)"
+     points="110.000000,251.795833 110.720000,251.795833 111.440000,251.795833 112.160000,251.795833 112.880000,251.795833 113.600000,251.795833 114.320000,251.795833 115.040000,251.795833 115.760000,251.795833 116.480000,251.795833 117.200000,251.795833 117.920000,251.795833 118.640000,251.795833 119.360000,251.795833 120.080000,251.795833 120.800000,251.795833 121.520000,251.795833 122.240000,251.795833 122.960001,251.795833 123.680000,251.795833 124.400000,251.795833 125.120000,251.795833 125.840000,251.795833 126.560000,251.795833 127.280000,251.795833 128.000000,251.795833 128.719999,251.795833 129.440001,251.795833 130.160000,251.795833 130.879999,251.795833 131.600001,251.795833 132.320000,251.795833 133.039999,251.795833 133.760001,251.795833 134.480000,251.795833 135.200000,251.795833 135.920001,251.795833 136.640000,251.795833 137.360000,251.795833 138.079999,251.795833 138.800000,251.795833 139.520000,251.795833 140.239999,251.795833 140.960001,251.795833 141.680000,251.795833 142.399999,251.795833 143.120001,251.795833 143.840000,251.795833 144.559999,251.795833 145.280001,251.795833 146.000000,251.795833 146.000000,251.795833 146.000000,251.795833 146.719999,251.795833 147.439999,251.795833 148.159998,251.795833 148.880002,251.795833 149.600001,251.795833 150.320000,251.795833 151.039999,251.795833 151.759999,251.795833 152.479998,251.795833 153.200002,251.795833 153.920001,251.795833 154.640000,251.795833 155.360000,251.795833 156.079999,251.795833 156.799998,251.795833 157.520002,251.795833 158.240001,251.795833 158.960001,251.795833 159.680000,251.795833 160.399999,251.795833 161.119998,251.795833 161.840002,251.795833 162.560001,251.795833 163.280001,251.795833 164.000000,251.795833 164.719999,251.795833 165.439999,251.795833 166.159998,251.795833 166.880002,251.795833 167.600001,251.795833 168.320000,251.795833 169.039999,251.795833 169.759999,251.795833 170.479998,251.795833 171.200002,251.795833 171.920001,251.795833 172.640000,251.795833 173.360000,251.795833 174.079999,251.795833 174.799998,251.795833 175.520002,251.795833 176.240001,251.795833 176.960001,251.795833 177.680000,251.795833 178.399999,251.795833 179.119998,251.795833 179.840002,251.795833 180.560001,251.795833 181.280001,251.795833 182.000000,251.795833 182.000000,319.612500 182.000000,319.612500 182.719999,319.612500 183.439999,319.612500 184.159998,319.612500 184.879997,319.612500 185.599997,319.612500 186.319996,319.612500 187.040004,319.612500 187.760003,319.612500 188.480002,319.612500 189.200002,319.612500 189.920001,319.612500 190.640000,319.612500 191.360000,319.612500 192.079999,319.612500 192.799998,319.612500 193.519998,319.612500 194.239997,319.612500 194.959996,319.612500 195.680004,319.612500 196.400003,319.612500 197.120003,319.612500 197.840002,319.612500 198.560001,319.612500 199.280001,319.612500 200.000000,319.612500 200.719999,319.612500 201.439999,319.612500 202.159998,319.612500 202.879997,319.612500 203.599997,319.612500 204.319996,319.612500 205.040004,319.612500 205.760003,319.612500 206.480002,319.612500 207.200002,319.612500 207.920001,319.612500 208.640000,319.612500 209.360000,319.612500 210.079999,319.612500 210.799998,319.612500 211.519998,319.612500 212.239997,319.612500 212.959996,319.612500 213.680004,319.612500 214.400003,319.612500 215.120003,319.612500 215.840002,319.612500 216.560001,319.612500 217.280001,319.612500 218.000000,319.612500 218.000000,319.612500 218.000000,319.612500 218.719999,319.612500 219.439999,319.612500 220.159998,319.612500 220.879997,319.612500 221.599997,319.612500 222.319996,319.612500 223.040004,319.612500 223.760003,319.612500 224.480002,319.612500 225.200002,319.612500 225.920001,319.612500 226.640000,319.612500 227.360000,319.612500 228.079999,319.612500 228.799998,319.612500 229.519998,319.612500 230.239997,319.612500 230.959996,319.612500 231.680004,319.612500 232.400003,319.612500 233.120003,319.612500 233.840002,319.612500 234.560001,319.612500 235.280001,319.612500 236.000000,319.612500 236.719999,319.612500 237.439999,319.612500 238.159998,319.612500 238.879997,319.612500 239.599997,319.612500 240.319996,319.612500 241.040004,319.612500 241.760003,319.612500 242.480002,319.612500 243.200002,319.612500 243.920001,319.612500 244.640000,319.612500 245.360000,319.612500 246.079999,319.612500 246.799998,319.612500 247.519998,319.612500 248.239997,319.612500 248.959996,319.612500 249.680004,319.612500 250.400003,319.612500 251.120003,319.612500 251.840002,319.612500 252.560001,319.612500 253.280001,319.612500 254.000000,319.612500 254.000000,251.795833 254.000000,251.795833 254.719999,251.795833 255.439999,251.795833 256.159998,251.795833 256.879997,251.795833 257.599997,251.795833 258.319996,251.795833 259.039995,251.795833 259.759995,251.795833 260.479994,251.795833 261.199993,251.795833 261.919992,251.795833 262.639992,251.795833 263.360008,251.795833 264.080008,251.795833 264.800007,251.795833 265.520006,251.795833 266.240005,251.795833 266.960005,251.795833 267.680004,251.795833 268.400003,251.795833 269.120003,251.795833 269.840002,251.795833 270.560001,251.795833 271.280001,251.795833 272.000000,251.795833 272.719999,251.795833 273.439999,251.795833 274.159998,251.795833 274.879997,251.795833 275.599997,251.795833 276.319996,251.795833 277.039995,251.795833 277.759995,251.795833 278.479994,251.795833 279.199993,251.795833 279.919992,251.795833 280.639992,251.795833 281.360008,251.795833 282.080008,251.795833 282.800007,251.795833 283.520006,251.795833 284.240005,251.795833 284.960005,251.795833 285.680004,251.795833 286.400003,251.795833 287.120003,251.795833 287.840002,251.795833 288.560001,251.795833 289.280001,251.795833 290.000000,251.795833 290.000000,251.795833 290.719999,251.795833 291.439999,251.795833 292.159998,251.795833 292.879997,251.795833 293.599997,251.795833 294.319996,251.795833 295.039995,251.795833 295.759995,251.795833 296.479994,251.795833 297.199993,251.795833 297.919992,251.795833 298.639992,251.795833 299.360008,251.795833 300.080008,251.795833 300.800007,251.795833 301.520006,251.795833 302.240005,251.795833 302.960005,251.795833 303.680004,251.795833 304.400003,251.795833 305.120003,251.795833 305.840002,251.795833 306.560001,251.795833 307.280001,251.795833 308.000000,251.795833 308.719999,251.795833 309.439999,251.795833 310.159998,251.795833 310.879997,251.795833 311.599997,251.795833 312.319996,251.795833 313.039995,251.795833 313.759995,251.795833 314.479994,251.795833 315.199993,251.795833 315.919992,251.795833 316.639992,251.795833 317.360008,251.795833 318.080008,251.795833 318.800007,251.795833 319.520006,251.795833 320.240005,251.795833 320.960005,251.795833 321.680004,251.795833 322.400003,251.795833 323.120003,251.795833 323.840002,251.795833 324.560001,251.795833 325.280001,251.795833 326.000000,251.795833 326.000000,319.612500 326.719999,319.612500 327.439999,319.612500 328.159998,319.612500 328.879997,319.612500 329.599997,319.612500 330.319996,319.612500 331.039995,319.612500 331.759995,319.612500 332.479994,319.612500 333.199993,319.612500 333.919992,319.612500 334.639992,319.612500 335.360008,319.612500 336.080008,319.612500 336.800007,319.612500 337.520006,319.612500 338.240005,319.612500 338.960005,319.612500 339.680004,319.612500 340.400003,319.612500 341.120003,319.612500 341.840002,319.612500 342.560001,319.612500 343.280001,319.612500 344.000000,319.612500 344.719999,319.612500 345.439999,319.612500 346.159998,319.612500 346.879997,319.612500 347.599997,319.612500 348.319996,319.612500 349.039995,319.612500 349.759995,319.612500 350.479994,319.612500 351.199993,319.612500 351.919992,319.612500 352.639992,319.612500 353.360008,319.612500 354.080008,319.612500 354.800007,319.612500 355.520006,319.612500 356.240005,319.612500 356.960005,319.612500 357.680004,319.612500 358.400003,319.612500 359.120003,319.612500 359.840002,319.612500 360.560001,319.612500 361.280001,319.612500 362.000000,319.612500 362.000000,319.612500 362.719999,319.612500 363.439999,319.612500 364.159998,319.612500 364.879997,319.612500 365.599997,319.612500 366.319996,319.612500 367.039995,319.612500 367.759995,319.612500 368.479994,319.612500 369.199993,319.612500 369.919992,319.612500 370.639992,319.612500 371.360008,319.612500 372.080008,319.612500 372.800007,319.612500 373.520006,319.612500 374.240005,319.612500 374.960005,319.612500 375.680004,319.612500 376.400003,319.612500 377.120003,319.612500 377.840002,319.612500 378.560001,319.612500 379.280001,319.612500 380.000000,319.612500 380.719999,319.612500 381.439999,319.612500 382.159998,319.612500 382.879997,319.612500 383.599997,319.612500 384.319996,319.612500 385.039995,319.612500 385.759995,319.612500 386.479994,319.612500 387.199993,319.612500 387.919992,319.612500 388.639992,319.612500 389.360008,319.612500 390.080008,319.612500 390.800007,319.612500 391.520006,319.612500 392.240005,319.612500 392.960005,319.612500 393.680004,319.612500 394.400003,319.612500 395.120003,319.612500 395.840002,319.612500 396.560001,319.612500 397.280001,319.612500 398.000000,319.612500 398.000000,251.795833 398.720016,251.795833 399.439999,251.795833 400.160015,251.795833 400.879997,251.795833 401.600014,251.795833 402.319996,251.795833 403.040012,251.795833 403.759995,251.795833 404.480011,251.795833 405.199993,251.795833 405.920010,251.795833 406.639992,251.795833 407.360008,251.795833 408.079990,251.795833 408.800007,251.795833 409.519989,251.795833 410.240005,251.795833 410.959988,251.795833 411.680004,251.795833 412.399986,251.795833 413.120003,251.795833 413.839985,251.795833 414.560001,251.795833 415.279984,251.795833 416.000000,251.795833 416.720016,251.795833 417.439999,251.795833 418.160015,251.795833 418.879997,251.795833 419.600014,251.795833 420.319996,251.795833 421.040012,251.795833 421.759995,251.795833 422.480011,251.795833 423.199993,251.795833 423.920010,251.795833 424.639992,251.795833 425.360008,251.795833 426.079990,251.795833 426.800007,251.795833 427.519989,251.795833 428.240005,251.795833 428.959988,251.795833 429.680004,251.795833 430.399986,251.795833 431.120003,251.795833 431.839985,251.795833 432.560001,251.795833 433.279984,251.795833 434.000000,251.795833 434.000000,251.795833 434.720016,251.795833 435.439999,251.795833 436.160015,251.795833 436.879997,251.795833 437.600014,251.795833 438.319996,251.795833 439.040012,251.795833 439.759995,251.795833 440.480011,251.795833 441.199993,251.795833 441.920010,251.795833 442.639992,251.795833 443.360008,251.795833 444.079990,251.795833 444.800007,251.795833 445.519989,251.795833 446.240005,251.795833 446.959988,251.795833 447.680004,251.795833 448.399986,251.795833 449.120003,251.795833 449.839985,251.795833 450.560001,251.795833 451.279984,251.795833 452.000000,251.795833 452.720016,251.795833 453.439999,251.795833 454.160015,251.795833 454.879997,251.795833 455.600014,251.795833 456.319996,251.795833 457.040012,251.795833 457.759995,251.795833 458.480011,251.795833 459.199993,251.795833 459.920010,251.795833 460.639992,251.795833 461.360008,251.795833 462.079990,251.795833 462.800007,251.795833 463.519989,251.795833 464.240005,251.795833 464.959988,251.795833 465.680004,251.795833 466.399986,251.795833 467.120003,251.795833 467.839985,251.795833 468.560001,251.795833 469.279984,251.795833 470.000000,251.795833 470.000000,319.612500"
+     id="polyline1662"
+     transform="translate(-45.215317,39.318317)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="67.784744"
+     y="83.818268"
+     id="text1664">falCleTruIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="67.784744"
+     y="178.81827"
+     id="text1666">falCleTruIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="67.784744"
+     y="273.81827"
+     id="text1668">falCleTruIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline1670"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,433.000000 182.000000,746.000000"
+     id="polyline1672"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,433.000000 254.000000,746.000000"
+     id="polyline1674"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,433.000000 326.000000,746.000000"
+     id="polyline1676"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,433.000000 398.000000,746.000000"
+     id="polyline1678"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 470.000000,746.000000"
+     id="polyline1680"
+     transform="translate(-47.819396,88.342803)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="613.13104"
-     y="531.7478"
-     width="389"
-     height="67.816704"
-     id="rect103-0" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="548.63861"
+     width="360"
+     height="68"
+     id="rect1682" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="613.13104"
-     y="626.95282"
-     width="389"
-     height="67.816704"
-     id="rect105-6" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="643.84271"
+     width="360"
+     height="68"
+     id="rect1684" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="613.13104"
-     y="722.15686"
-     width="389"
-     height="67.816704"
-     id="rect107-3" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 499.000000,747.000000"
-     id="polyline109-2" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,434.000000"
-     id="polyline111-0" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 110.000000,434.000000"
-     id="polyline113-6" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline115-1" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,755.000000"
-     id="polyline117-5" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,747.000000 187.800000,755.000000"
-     id="polyline119-5" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,755.000000"
-     id="polyline121-4" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,747.000000 343.400000,755.000000"
-     id="polyline123-7" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,755.000000"
-     id="polyline125-6" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,755.000000"
-     id="polyline127-5" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,759.800000"
-     id="polyline129-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="613.13104"
-     y="848.86084"
-     id="text131-9">0</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,759.800000"
-     id="polyline133-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="768.73108"
-     y="848.86084"
-     id="text135-7">4</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,759.800000"
-     id="polyline137-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="924.33105"
-     y="848.86084"
-     id="text139-5">8</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,529.204167 110.000000,529.204167"
-     id="polyline141-2" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="599.56482"
-     id="text143-5">false</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,461.387500 110.000000,461.387500"
-     id="polyline145-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="531.7478"
-     id="text147-7">true</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,624.408333 110.000000,624.408333"
-     id="polyline149-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="694.76886"
-     id="text151-4">false</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,556.591667 110.000000,556.591667"
-     id="polyline153-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="626.95282"
-     id="text155-0">true</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,719.612500 110.000000,719.612500"
-     id="polyline157-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="789.97284"
-     id="text159-8">false</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,651.795833 110.000000,651.795833"
-     id="polyline161-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="597.13104"
-     y="722.15686"
-     id="text163-8">true</text>
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-3)"
-     points="110.000000,461.387500 110.778000,461.387500 111.556000,461.387500 112.334000,461.387500 113.112000,461.387500 113.890000,461.387500 114.668000,461.387500 115.446000,461.387500 116.224000,461.387500 117.002000,461.387500 117.780000,461.387500 118.558000,461.387500 119.336000,461.387500 120.114000,461.387500 120.892000,461.387500 121.670000,461.387500 122.448000,461.387500 123.226000,461.387500 124.004001,461.387500 124.782000,461.387500 125.560000,461.387500 126.337999,461.387500 127.116000,461.387500 127.894000,461.387500 128.672000,461.387500 129.450000,461.387500 130.227999,461.387500 131.006001,461.387500 131.784000,461.387500 132.561999,461.387500 133.340001,461.387500 134.118000,461.387500 134.895999,461.387500 135.674001,461.387500 136.452000,461.387500 137.230000,461.387500 138.008001,461.387500 138.786000,461.387500 139.564000,461.387500 140.341999,461.387500 141.120000,461.387500 141.898000,461.387500 142.675999,461.387500 143.454001,461.387500 144.232000,461.387500 145.009999,461.387500 145.788001,461.387500 146.566000,461.387500 147.343999,461.387500 148.122001,461.387500 148.900000,461.387500 148.900000,529.204167 148.900000,529.204167 148.900000,529.204167 149.677999,529.204167 150.455999,529.204167 151.233998,529.204167 152.012002,529.204167 152.790001,529.204167 153.568000,529.204167 154.345999,529.204167 155.123999,529.204167 155.901998,529.204167 156.680002,529.204167 157.458001,529.204167 158.236000,529.204167 159.014000,529.204167 159.791999,529.204167 160.569998,529.204167 161.348002,529.204167 162.126001,529.204167 162.904001,529.204167 163.682000,529.204167 164.459999,529.204167 165.237998,529.204167 166.016002,529.204167 166.794001,529.204167 167.572001,529.204167 168.350000,529.204167 169.127999,529.204167 169.905999,529.204167 170.683998,529.204167 171.462002,529.204167 172.240001,529.204167 173.018000,529.204167 173.795999,529.204167 174.573999,529.204167 175.351998,529.204167 176.130002,529.204167 176.908001,529.204167 177.686000,529.204167 178.464000,529.204167 179.241999,529.204167 180.019998,529.204167 180.798002,529.204167 181.576001,529.204167 182.354001,529.204167 183.132000,529.204167 183.909999,529.204167 184.687998,529.204167 185.466002,529.204167 186.244001,529.204167 187.022001,529.204167 187.800000,529.204167 187.800000,461.387500 187.800000,461.387500 188.577999,461.387500 189.355999,461.387500 190.133998,461.387500 190.911997,461.387500 191.689996,461.387500 192.467996,461.387500 193.246004,461.387500 194.024003,461.387500 194.802003,461.387500 195.580002,461.387500 196.358001,461.387500 197.136000,461.387500 197.914000,461.387500 198.691999,461.387500 199.469998,461.387500 200.247997,461.387500 201.025997,461.387500 201.803996,461.387500 202.582004,461.387500 203.360004,461.387500 204.138003,461.387500 204.916002,461.387500 205.694001,461.387500 206.472001,461.387500 207.250000,461.387500 208.027999,461.387500 208.805999,461.387500 209.583998,461.387500 210.361997,461.387500 211.139996,461.387500 211.917996,461.387500 212.696004,461.387500 213.474003,461.387500 214.252003,461.387500 215.030002,461.387500 215.808001,461.387500 216.586000,461.387500 217.364000,461.387500 218.141999,461.387500 218.919998,461.387500 219.697997,461.387500 220.475997,461.387500 221.253996,461.387500 222.032004,461.387500 222.810004,461.387500 223.588003,461.387500 224.366002,461.387500 225.144001,461.387500 225.922001,461.387500 226.700000,461.387500 226.700000,529.204167 226.700000,529.204167 227.477999,529.204167 228.255999,529.204167 229.033998,529.204167 229.811997,529.204167 230.589996,529.204167 231.367996,529.204167 232.146004,529.204167 232.924003,529.204167 233.702003,529.204167 234.480002,529.204167 235.258001,529.204167 236.036000,529.204167 236.814000,529.204167 237.591999,529.204167 238.369998,529.204167 239.147997,529.204167 239.925997,529.204167 240.703996,529.204167 241.482004,529.204167 242.260004,529.204167 243.038003,529.204167 243.816002,529.204167 244.594001,529.204167 245.372001,529.204167 246.150000,529.204167 246.927999,529.204167 247.705999,529.204167 248.483998,529.204167 249.261997,529.204167 250.039996,529.204167 250.817996,529.204167 251.596004,529.204167 252.374003,529.204167 253.152003,529.204167 253.930002,529.204167 254.708001,529.204167 255.486000,529.204167 256.264000,529.204167 257.041999,529.204167 257.819998,529.204167 258.597997,529.204167 259.375997,529.204167 260.153996,529.204167 260.932004,529.204167 261.710004,529.204167 262.488003,529.204167 263.266002,529.204167 264.044001,529.204167 264.822001,529.204167 265.600000,529.204167 265.600000,461.387500 265.600000,461.387500 266.377999,461.387500 267.155999,461.387500 267.933998,461.387500 268.711997,461.387500 269.489996,461.387500 270.267996,461.387500 271.045995,461.387500 271.823994,461.387500 272.601993,461.387500 273.379993,461.387500 274.157992,461.387500 274.935991,461.387500 275.714009,461.387500 276.492008,461.387500 277.270007,461.387500 278.048007,461.387500 278.826006,461.387500 279.604005,461.387500 280.382004,461.387500 281.160004,461.387500 281.938003,461.387500 282.716002,461.387500 283.494001,461.387500 284.272001,461.387500 285.050000,461.387500 285.827999,461.387500 286.605999,461.387500 287.383998,461.387500 288.161997,461.387500 288.939996,461.387500 289.717996,461.387500 290.495995,461.387500 291.273994,461.387500 292.051993,461.387500 292.829993,461.387500 293.607992,461.387500 294.385991,461.387500 295.164009,461.387500 295.942008,461.387500 296.720007,461.387500 297.498007,461.387500 298.276006,461.387500 299.054005,461.387500 299.832004,461.387500 300.610004,461.387500 301.388003,461.387500 302.166002,461.387500 302.944001,461.387500 303.722001,461.387500 304.500000,461.387500 304.500000,529.204167 305.277999,529.204167 306.055999,529.204167 306.833998,529.204167 307.611997,529.204167 308.389996,529.204167 309.167996,529.204167 309.945995,529.204167 310.723994,529.204167 311.501993,529.204167 312.279993,529.204167 313.057992,529.204167 313.835991,529.204167 314.614009,529.204167 315.392008,529.204167 316.170007,529.204167 316.948007,529.204167 317.726006,529.204167 318.504005,529.204167 319.282004,529.204167 320.060004,529.204167 320.838003,529.204167 321.616002,529.204167 322.394001,529.204167 323.172001,529.204167 323.950000,529.204167 324.727999,529.204167 325.505999,529.204167 326.283998,529.204167 327.061997,529.204167 327.839996,529.204167 328.617996,529.204167 329.395995,529.204167 330.173994,529.204167 330.951993,529.204167 331.729993,529.204167 332.507992,529.204167 333.285991,529.204167 334.064009,529.204167 334.842008,529.204167 335.620007,529.204167 336.398007,529.204167 337.176006,529.204167 337.954005,529.204167 338.732004,529.204167 339.510004,529.204167 340.288003,529.204167 341.066002,529.204167 341.844001,529.204167 342.622001,529.204167 343.400000,529.204167 343.400000,461.387500 344.177999,461.387500 344.955999,461.387500 345.733998,461.387500 346.511997,461.387500 347.289996,461.387500 348.067996,461.387500 348.845995,461.387500 349.623994,461.387500 350.401993,461.387500 351.179993,461.387500 351.957992,461.387500 352.735991,461.387500 353.514009,461.387500 354.292008,461.387500 355.070007,461.387500 355.848007,461.387500 356.626006,461.387500 357.404005,461.387500 358.182004,461.387500 358.960004,461.387500 359.738003,461.387500 360.516002,461.387500 361.294001,461.387500 362.072001,461.387500 362.850000,461.387500 363.627999,461.387500 364.405999,461.387500 365.183998,461.387500 365.961997,461.387500 366.739996,461.387500 367.517996,461.387500 368.295995,461.387500 369.073994,461.387500 369.851993,461.387500 370.629993,461.387500 371.407992,461.387500 372.185991,461.387500 372.964009,461.387500 373.742008,461.387500 374.520007,461.387500 375.298007,461.387500 376.076006,461.387500 376.854005,461.387500 377.632004,461.387500 378.410004,461.387500 379.188003,461.387500 379.966002,461.387500 380.744001,461.387500 381.522001,461.387500 382.300000,461.387500 382.300000,529.204167 383.077999,529.204167 383.855999,529.204167 384.633998,529.204167 385.411997,529.204167 386.189996,529.204167 386.967996,529.204167 387.745995,529.204167 388.523994,529.204167 389.301993,529.204167 390.079993,529.204167 390.857992,529.204167 391.635991,529.204167 392.414009,529.204167 393.192008,529.204167 393.970007,529.204167 394.748007,529.204167 395.526006,529.204167 396.304005,529.204167 397.082004,529.204167 397.860004,529.204167 398.638003,529.204167 399.416002,529.204167 400.194001,529.204167 400.972001,529.204167 401.750000,529.204167 402.527999,529.204167 403.305999,529.204167 404.083998,529.204167 404.861997,529.204167 405.639996,529.204167 406.417996,529.204167 407.195995,529.204167 407.973994,529.204167 408.751993,529.204167 409.529993,529.204167 410.307992,529.204167 411.085991,529.204167 411.864009,529.204167 412.642008,529.204167 413.420007,529.204167 414.198007,529.204167 414.976006,529.204167 415.754005,529.204167 416.532004,529.204167 417.310004,529.204167 418.088003,529.204167 418.866002,529.204167 419.644001,529.204167 420.422001,529.204167 421.200000,529.204167 421.200000,461.387500 421.978018,461.387500 422.755999,461.387500 423.534016,461.387500 424.311997,461.387500 425.090015,461.387500 425.867996,461.387500 426.646013,461.387500 427.423994,461.387500 428.202012,461.387500 428.979993,461.387500 429.758010,461.387500 430.535991,461.387500 431.314009,461.387500 432.091990,461.387500 432.870007,461.387500 433.647988,461.387500 434.426006,461.387500 435.203987,461.387500 435.982004,461.387500 436.759985,461.387500 437.538003,461.387500 438.315984,461.387500 439.094001,461.387500 439.871982,461.387500 440.650000,461.387500 441.428018,461.387500 442.205999,461.387500 442.984016,461.387500 443.761997,461.387500 444.540015,461.387500 445.317996,461.387500 446.096013,461.387500 446.873994,461.387500 447.652012,461.387500 448.429993,461.387500 449.208010,461.387500 449.985991,461.387500 450.764009,461.387500 451.541990,461.387500 452.320007,461.387500 453.097988,461.387500 453.876006,461.387500 454.653987,461.387500 455.432004,461.387500 456.209985,461.387500 456.988003,461.387500 457.765984,461.387500 458.544001,461.387500 459.321982,461.387500 460.100000,461.387500 460.100000,529.204167 460.878018,529.204167 461.655999,529.204167 462.434016,529.204167 463.211997,529.204167 463.990015,529.204167 464.767996,529.204167 465.546013,529.204167 466.323994,529.204167 467.102012,529.204167 467.879993,529.204167 468.658010,529.204167 469.435991,529.204167 470.214009,529.204167 470.991990,529.204167 471.770007,529.204167 472.547988,529.204167 473.326006,529.204167 474.103987,529.204167 474.882004,529.204167 475.659985,529.204167 476.438003,529.204167 477.215984,529.204167 477.994001,529.204167 478.771982,529.204167 479.550000,529.204167 480.328018,529.204167 481.105999,529.204167 481.884016,529.204167 482.661997,529.204167 483.440015,529.204167 484.217996,529.204167 484.996013,529.204167 485.773994,529.204167 486.552012,529.204167 487.329993,529.204167 488.108010,529.204167 488.885991,529.204167 489.664009,529.204167 490.441990,529.204167 491.220007,529.204167 491.997988,529.204167 492.776006,529.204167 493.553987,529.204167 494.332004,529.204167 495.109985,529.204167 495.888003,529.204167 496.665984,529.204167 497.444001,529.204167 498.221982,529.204167 499.000000,529.204167 499.000000,461.387500"
-     id="polyline168-8" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-3)"
-     points="110.000000,624.408333 110.778000,624.408333 111.556000,624.408333 112.334000,624.408333 113.112000,624.408333 113.890000,624.408333 114.668000,624.408333 115.446000,624.408333 116.224000,624.408333 117.002000,624.408333 117.780000,624.408333 118.558000,624.408333 119.336000,624.408333 120.114000,624.408333 120.892000,624.408333 121.670000,624.408333 122.448000,624.408333 123.226000,624.408333 124.004001,624.408333 124.782000,624.408333 125.560000,624.408333 126.337999,624.408333 127.116000,624.408333 127.894000,624.408333 128.672000,624.408333 129.450000,624.408333 130.227999,624.408333 131.006001,624.408333 131.784000,624.408333 132.561999,624.408333 133.340001,624.408333 134.118000,624.408333 134.895999,624.408333 135.674001,624.408333 136.452000,624.408333 137.230000,624.408333 138.008001,624.408333 138.786000,624.408333 139.564000,624.408333 140.341999,624.408333 141.120000,624.408333 141.898000,624.408333 142.675999,624.408333 143.454001,624.408333 144.232000,624.408333 145.009999,624.408333 145.788001,624.408333 146.566000,624.408333 147.343999,624.408333 148.122001,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 149.677999,624.408333 150.455999,624.408333 151.233998,624.408333 152.012002,624.408333 152.790001,624.408333 153.568000,624.408333 154.345999,624.408333 155.123999,624.408333 155.901998,624.408333 156.680002,624.408333 157.458001,624.408333 158.236000,624.408333 159.014000,624.408333 159.791999,624.408333 160.569998,624.408333 161.348002,624.408333 162.126001,624.408333 162.904001,624.408333 163.682000,624.408333 164.459999,624.408333 165.237998,624.408333 166.016002,624.408333 166.794001,624.408333 167.572001,624.408333 168.350000,624.408333 169.127999,624.408333 169.905999,624.408333 170.683998,624.408333 171.462002,624.408333 172.240001,624.408333 173.018000,624.408333 173.795999,624.408333 174.573999,624.408333 175.351998,624.408333 176.130002,624.408333 176.908001,624.408333 177.686000,624.408333 178.464000,624.408333 179.241999,624.408333 180.019998,624.408333 180.798002,624.408333 181.576001,624.408333 182.354001,624.408333 183.132000,624.408333 183.909999,624.408333 184.687998,624.408333 185.466002,624.408333 186.244001,624.408333 187.022001,624.408333 187.800000,624.408333 187.800000,624.408333 187.800000,624.408333 188.577999,624.408333 189.355999,624.408333 190.133998,624.408333 190.911997,624.408333 191.689996,624.408333 192.467996,624.408333 193.246004,624.408333 194.024003,624.408333 194.802003,624.408333 195.580002,624.408333 196.358001,624.408333 197.136000,624.408333 197.914000,624.408333 198.691999,624.408333 199.469998,624.408333 200.247997,624.408333 201.025997,624.408333 201.803996,624.408333 202.582004,624.408333 203.360004,624.408333 204.138003,624.408333 204.916002,624.408333 205.694001,624.408333 206.472001,624.408333 207.250000,624.408333 208.027999,624.408333 208.805999,624.408333 209.583998,624.408333 210.361997,624.408333 211.139996,624.408333 211.917996,624.408333 212.696004,624.408333 213.474003,624.408333 214.252003,624.408333 215.030002,624.408333 215.808001,624.408333 216.586000,624.408333 217.364000,624.408333 218.141999,624.408333 218.919998,624.408333 219.697997,624.408333 220.475997,624.408333 221.253996,624.408333 222.032004,624.408333 222.810004,624.408333 223.588003,624.408333 224.366002,624.408333 225.144001,624.408333 225.922001,624.408333 226.700000,624.408333 226.700000,624.408333 226.700000,624.408333 227.477999,624.408333 228.255999,624.408333 229.033998,624.408333 229.811997,624.408333 230.589996,624.408333 231.367996,624.408333 232.146004,624.408333 232.924003,624.408333 233.702003,624.408333 234.480002,624.408333 235.258001,624.408333 236.036000,624.408333 236.814000,624.408333 237.591999,624.408333 238.369998,624.408333 239.147997,624.408333 239.925997,624.408333 240.703996,624.408333 241.482004,624.408333 242.260004,624.408333 243.038003,624.408333 243.816002,624.408333 244.594001,624.408333 245.372001,624.408333 246.150000,624.408333 246.927999,624.408333 247.705999,624.408333 248.483998,624.408333 249.261997,624.408333 250.039996,624.408333 250.817996,624.408333 251.596004,624.408333 252.374003,624.408333 253.152003,624.408333 253.930002,624.408333 254.708001,624.408333 255.486000,624.408333 256.264000,624.408333 257.041999,624.408333 257.819998,624.408333 258.597997,624.408333 259.375997,624.408333 260.153996,624.408333 260.932004,624.408333 261.710004,624.408333 262.488003,624.408333 263.266002,624.408333 264.044001,624.408333 264.822001,624.408333 265.600000,624.408333 265.600000,624.408333 265.600000,624.408333 266.377999,624.408333 267.155999,624.408333 267.933998,624.408333 268.711997,624.408333 269.489996,624.408333 270.267996,624.408333 271.045995,624.408333 271.823994,624.408333 272.601993,624.408333 273.379993,624.408333 274.157992,624.408333 274.935991,624.408333 275.714009,624.408333 276.492008,624.408333 277.270007,624.408333 278.048007,624.408333 278.826006,624.408333 279.604005,624.408333 280.382004,624.408333 281.160004,624.408333 281.938003,624.408333 282.716002,624.408333 283.494001,624.408333 284.272001,624.408333 285.050000,624.408333 285.827999,624.408333 286.605999,624.408333 287.383998,624.408333 288.161997,624.408333 288.939996,624.408333 289.717996,624.408333 290.495995,624.408333 291.273994,624.408333 292.051993,624.408333 292.829993,624.408333 293.607992,624.408333 294.385991,624.408333 295.164009,624.408333 295.942008,624.408333 296.720007,624.408333 297.498007,624.408333 298.276006,624.408333 299.054005,624.408333 299.832004,624.408333 300.610004,624.408333 301.388003,624.408333 302.166002,624.408333 302.944001,624.408333 303.722001,624.408333 304.500000,624.408333 304.500000,624.408333 305.277999,624.408333 306.055999,624.408333 306.833998,624.408333 307.611997,624.408333 308.389996,624.408333 309.167996,624.408333 309.945995,624.408333 310.723994,624.408333 311.501993,624.408333 312.279993,624.408333 313.057992,624.408333 313.835991,624.408333 314.614009,624.408333 315.392008,624.408333 316.170007,624.408333 316.948007,624.408333 317.726006,624.408333 318.504005,624.408333 319.282004,624.408333 320.060004,624.408333 320.838003,624.408333 321.616002,624.408333 322.394001,624.408333 323.172001,624.408333 323.950000,624.408333 324.727999,624.408333 325.505999,624.408333 326.283998,624.408333 327.061997,624.408333 327.839996,624.408333 328.617996,624.408333 329.395995,624.408333 330.173994,624.408333 330.951993,624.408333 331.729993,624.408333 332.507992,624.408333 333.285991,624.408333 334.064009,624.408333 334.842008,624.408333 335.620007,624.408333 336.398007,624.408333 337.176006,624.408333 337.954005,624.408333 338.732004,624.408333 339.510004,624.408333 340.288003,624.408333 341.066002,624.408333 341.844001,624.408333 342.622001,624.408333 343.400000,624.408333 343.400000,624.408333 344.177999,624.408333 344.955999,624.408333 345.733998,624.408333 346.511997,624.408333 347.289996,624.408333 348.067996,624.408333 348.845995,624.408333 349.623994,624.408333 350.401993,624.408333 351.179993,624.408333 351.957992,624.408333 352.735991,624.408333 353.514009,624.408333 354.292008,624.408333 355.070007,624.408333 355.848007,624.408333 356.626006,624.408333 357.404005,624.408333 358.182004,624.408333 358.960004,624.408333 359.738003,624.408333 360.516002,624.408333 361.294001,624.408333 362.072001,624.408333 362.850000,624.408333 363.627999,624.408333 364.405999,624.408333 365.183998,624.408333 365.961997,624.408333 366.739996,624.408333 367.517996,624.408333 368.295995,624.408333 369.073994,624.408333 369.851993,624.408333 370.629993,624.408333 371.407992,624.408333 372.185991,624.408333 372.964009,624.408333 373.742008,624.408333 374.520007,624.408333 375.298007,624.408333 376.076006,624.408333 376.854005,624.408333 377.632004,624.408333 378.410004,624.408333 379.188003,624.408333 379.966002,624.408333 380.744001,624.408333 381.522001,624.408333 382.300000,624.408333 382.300000,624.408333 383.077999,624.408333 383.855999,624.408333 384.633998,624.408333 385.411997,624.408333 386.189996,624.408333 386.967996,624.408333 387.745995,624.408333 388.523994,624.408333 389.301993,624.408333 390.079993,624.408333 390.857992,624.408333 391.635991,624.408333 392.414009,624.408333 393.192008,624.408333 393.970007,624.408333 394.748007,624.408333 395.526006,624.408333 396.304005,624.408333 397.082004,624.408333 397.860004,624.408333 398.638003,624.408333 399.416002,624.408333 400.194001,624.408333 400.972001,624.408333 401.750000,624.408333 402.527999,624.408333 403.305999,624.408333 404.083998,624.408333 404.861997,624.408333 405.639996,624.408333 406.417996,624.408333 407.195995,624.408333 407.973994,624.408333 408.751993,624.408333 409.529993,624.408333 410.307992,624.408333 411.085991,624.408333 411.864009,624.408333 412.642008,624.408333 413.420007,624.408333 414.198007,624.408333 414.976006,624.408333 415.754005,624.408333 416.532004,624.408333 417.310004,624.408333 418.088003,624.408333 418.866002,624.408333 419.644001,624.408333 420.422001,624.408333 421.200000,624.408333 421.200000,624.408333 421.978018,624.408333 422.755999,624.408333 423.534016,624.408333 424.311997,624.408333 425.090015,624.408333 425.867996,624.408333 426.646013,624.408333 427.423994,624.408333 428.202012,624.408333 428.979993,624.408333 429.758010,624.408333 430.535991,624.408333 431.314009,624.408333 432.091990,624.408333 432.870007,624.408333 433.647988,624.408333 434.426006,624.408333 435.203987,624.408333 435.982004,624.408333 436.759985,624.408333 437.538003,624.408333 438.315984,624.408333 439.094001,624.408333 439.871982,624.408333 440.650000,624.408333 441.428018,624.408333 442.205999,624.408333 442.984016,624.408333 443.761997,624.408333 444.540015,624.408333 445.317996,624.408333 446.096013,624.408333 446.873994,624.408333 447.652012,624.408333 448.429993,624.408333 449.208010,624.408333 449.985991,624.408333 450.764009,624.408333 451.541990,624.408333 452.320007,624.408333 453.097988,624.408333 453.876006,624.408333 454.653987,624.408333 455.432004,624.408333 456.209985,624.408333 456.988003,624.408333 457.765984,624.408333 458.544001,624.408333 459.321982,624.408333 460.100000,624.408333 460.100000,624.408333 460.878018,624.408333 461.655999,624.408333 462.434016,624.408333 463.211997,624.408333 463.990015,624.408333 464.767996,624.408333 465.546013,624.408333 466.323994,624.408333 467.102012,624.408333 467.879993,624.408333 468.658010,624.408333 469.435991,624.408333 470.214009,624.408333 470.991990,624.408333 471.770007,624.408333 472.547988,624.408333 473.326006,624.408333 474.103987,624.408333 474.882004,624.408333 475.659985,624.408333 476.438003,624.408333 477.215984,624.408333 477.994001,624.408333 478.771982,624.408333 479.550000,624.408333 480.328018,624.408333 481.105999,624.408333 481.884016,624.408333 482.661997,624.408333 483.440015,624.408333 484.217996,624.408333 484.996013,624.408333 485.773994,624.408333 486.552012,624.408333 487.329993,624.408333 488.108010,624.408333 488.885991,624.408333 489.664009,624.408333 490.441990,624.408333 491.220007,624.408333 491.997988,624.408333 492.776006,624.408333 493.553987,624.408333 494.332004,624.408333 495.109985,624.408333 495.888003,624.408333 496.665984,624.408333 497.444001,624.408333 498.221982,624.408333 499.000000,624.408333 499.000000,624.408333"
-     id="polyline170-4" />
-  <polyline
-     transform="translate(503.13105,70.360838)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-3)"
-     points="110.000000,651.795833 110.778000,651.795833 111.556000,651.795833 112.334000,651.795833 113.112000,651.795833 113.890000,651.795833 114.668000,651.795833 115.446000,651.795833 116.224000,651.795833 117.002000,651.795833 117.780000,651.795833 118.558000,651.795833 119.336000,651.795833 120.114000,651.795833 120.892000,651.795833 121.670000,651.795833 122.448000,651.795833 123.226000,651.795833 124.004001,651.795833 124.782000,651.795833 125.560000,651.795833 126.337999,651.795833 127.116000,651.795833 127.894000,651.795833 128.672000,651.795833 129.450000,651.795833 130.227999,651.795833 131.006001,651.795833 131.784000,651.795833 132.561999,651.795833 133.340001,651.795833 134.118000,651.795833 134.895999,651.795833 135.674001,651.795833 136.452000,651.795833 137.230000,651.795833 138.008001,651.795833 138.786000,651.795833 139.564000,651.795833 140.341999,651.795833 141.120000,651.795833 141.898000,651.795833 142.675999,651.795833 143.454001,651.795833 144.232000,651.795833 145.009999,651.795833 145.788001,651.795833 146.566000,651.795833 147.343999,651.795833 148.122001,651.795833 148.900000,651.795833 148.900000,651.795833 148.900000,651.795833 148.900000,651.795833 149.677999,651.795833 150.455999,651.795833 151.233998,651.795833 152.012002,651.795833 152.790001,651.795833 153.568000,651.795833 154.345999,651.795833 155.123999,651.795833 155.901998,651.795833 156.680002,651.795833 157.458001,651.795833 158.236000,651.795833 159.014000,651.795833 159.791999,651.795833 160.569998,651.795833 161.348002,651.795833 162.126001,651.795833 162.904001,651.795833 163.682000,651.795833 164.459999,651.795833 165.237998,651.795833 166.016002,651.795833 166.794001,651.795833 167.572001,651.795833 168.350000,651.795833 169.127999,651.795833 169.905999,651.795833 170.683998,651.795833 171.462002,651.795833 172.240001,651.795833 173.018000,651.795833 173.795999,651.795833 174.573999,651.795833 175.351998,651.795833 176.130002,651.795833 176.908001,651.795833 177.686000,651.795833 178.464000,651.795833 179.241999,651.795833 180.019998,651.795833 180.798002,651.795833 181.576001,651.795833 182.354001,651.795833 183.132000,651.795833 183.909999,651.795833 184.687998,651.795833 185.466002,651.795833 186.244001,651.795833 187.022001,651.795833 187.800000,651.795833 187.800000,719.612500 187.800000,719.612500 188.577999,719.612500 189.355999,719.612500 190.133998,719.612500 190.911997,719.612500 191.689996,719.612500 192.467996,719.612500 193.246004,719.612500 194.024003,719.612500 194.802003,719.612500 195.580002,719.612500 196.358001,719.612500 197.136000,719.612500 197.914000,719.612500 198.691999,719.612500 199.469998,719.612500 200.247997,719.612500 201.025997,719.612500 201.803996,719.612500 202.582004,719.612500 203.360004,719.612500 204.138003,719.612500 204.916002,719.612500 205.694001,719.612500 206.472001,719.612500 207.250000,719.612500 208.027999,719.612500 208.805999,719.612500 209.583998,719.612500 210.361997,719.612500 211.139996,719.612500 211.917996,719.612500 212.696004,719.612500 213.474003,719.612500 214.252003,719.612500 215.030002,719.612500 215.808001,719.612500 216.586000,719.612500 217.364000,719.612500 218.141999,719.612500 218.919998,719.612500 219.697997,719.612500 220.475997,719.612500 221.253996,719.612500 222.032004,719.612500 222.810004,719.612500 223.588003,719.612500 224.366002,719.612500 225.144001,719.612500 225.922001,719.612500 226.700000,719.612500 226.700000,719.612500 226.700000,719.612500 227.477999,719.612500 228.255999,719.612500 229.033998,719.612500 229.811997,719.612500 230.589996,719.612500 231.367996,719.612500 232.146004,719.612500 232.924003,719.612500 233.702003,719.612500 234.480002,719.612500 235.258001,719.612500 236.036000,719.612500 236.814000,719.612500 237.591999,719.612500 238.369998,719.612500 239.147997,719.612500 239.925997,719.612500 240.703996,719.612500 241.482004,719.612500 242.260004,719.612500 243.038003,719.612500 243.816002,719.612500 244.594001,719.612500 245.372001,719.612500 246.150000,719.612500 246.927999,719.612500 247.705999,719.612500 248.483998,719.612500 249.261997,719.612500 250.039996,719.612500 250.817996,719.612500 251.596004,719.612500 252.374003,719.612500 253.152003,719.612500 253.930002,719.612500 254.708001,719.612500 255.486000,719.612500 256.264000,719.612500 257.041999,719.612500 257.819998,719.612500 258.597997,719.612500 259.375997,719.612500 260.153996,719.612500 260.932004,719.612500 261.710004,719.612500 262.488003,719.612500 263.266002,719.612500 264.044001,719.612500 264.822001,719.612500 265.600000,719.612500 265.600000,651.795833 265.600000,651.795833 266.377999,651.795833 267.155999,651.795833 267.933998,651.795833 268.711997,651.795833 269.489996,651.795833 270.267996,651.795833 271.045995,651.795833 271.823994,651.795833 272.601993,651.795833 273.379993,651.795833 274.157992,651.795833 274.935991,651.795833 275.714009,651.795833 276.492008,651.795833 277.270007,651.795833 278.048007,651.795833 278.826006,651.795833 279.604005,651.795833 280.382004,651.795833 281.160004,651.795833 281.938003,651.795833 282.716002,651.795833 283.494001,651.795833 284.272001,651.795833 285.050000,651.795833 285.827999,651.795833 286.605999,651.795833 287.383998,651.795833 288.161997,651.795833 288.939996,651.795833 289.717996,651.795833 290.495995,651.795833 291.273994,651.795833 292.051993,651.795833 292.829993,651.795833 293.607992,651.795833 294.385991,651.795833 295.164009,651.795833 295.942008,651.795833 296.720007,651.795833 297.498007,651.795833 298.276006,651.795833 299.054005,651.795833 299.832004,651.795833 300.610004,651.795833 301.388003,651.795833 302.166002,651.795833 302.944001,651.795833 303.722001,651.795833 304.500000,651.795833 304.500000,651.795833 305.277999,651.795833 306.055999,651.795833 306.833998,651.795833 307.611997,651.795833 308.389996,651.795833 309.167996,651.795833 309.945995,651.795833 310.723994,651.795833 311.501993,651.795833 312.279993,651.795833 313.057992,651.795833 313.835991,651.795833 314.614009,651.795833 315.392008,651.795833 316.170007,651.795833 316.948007,651.795833 317.726006,651.795833 318.504005,651.795833 319.282004,651.795833 320.060004,651.795833 320.838003,651.795833 321.616002,651.795833 322.394001,651.795833 323.172001,651.795833 323.950000,651.795833 324.727999,651.795833 325.505999,651.795833 326.283998,651.795833 327.061997,651.795833 327.839996,651.795833 328.617996,651.795833 329.395995,651.795833 330.173994,651.795833 330.951993,651.795833 331.729993,651.795833 332.507992,651.795833 333.285991,651.795833 334.064009,651.795833 334.842008,651.795833 335.620007,651.795833 336.398007,651.795833 337.176006,651.795833 337.954005,651.795833 338.732004,651.795833 339.510004,651.795833 340.288003,651.795833 341.066002,651.795833 341.844001,651.795833 342.622001,651.795833 343.400000,651.795833 343.400000,719.612500 344.177999,719.612500 344.955999,719.612500 345.733998,719.612500 346.511997,719.612500 347.289996,719.612500 348.067996,719.612500 348.845995,719.612500 349.623994,719.612500 350.401993,719.612500 351.179993,719.612500 351.957992,719.612500 352.735991,719.612500 353.514009,719.612500 354.292008,719.612500 355.070007,719.612500 355.848007,719.612500 356.626006,719.612500 357.404005,719.612500 358.182004,719.612500 358.960004,719.612500 359.738003,719.612500 360.516002,719.612500 361.294001,719.612500 362.072001,719.612500 362.850000,719.612500 363.627999,719.612500 364.405999,719.612500 365.183998,719.612500 365.961997,719.612500 366.739996,719.612500 367.517996,719.612500 368.295995,719.612500 369.073994,719.612500 369.851993,719.612500 370.629993,719.612500 371.407992,719.612500 372.185991,719.612500 372.964009,719.612500 373.742008,719.612500 374.520007,719.612500 375.298007,719.612500 376.076006,719.612500 376.854005,719.612500 377.632004,719.612500 378.410004,719.612500 379.188003,719.612500 379.966002,719.612500 380.744001,719.612500 381.522001,719.612500 382.300000,719.612500 382.300000,719.612500 383.077999,719.612500 383.855999,719.612500 384.633998,719.612500 385.411997,719.612500 386.189996,719.612500 386.967996,719.612500 387.745995,719.612500 388.523994,719.612500 389.301993,719.612500 390.079993,719.612500 390.857992,719.612500 391.635991,719.612500 392.414009,719.612500 393.192008,719.612500 393.970007,719.612500 394.748007,719.612500 395.526006,719.612500 396.304005,719.612500 397.082004,719.612500 397.860004,719.612500 398.638003,719.612500 399.416002,719.612500 400.194001,719.612500 400.972001,719.612500 401.750000,719.612500 402.527999,719.612500 403.305999,719.612500 404.083998,719.612500 404.861997,719.612500 405.639996,719.612500 406.417996,719.612500 407.195995,719.612500 407.973994,719.612500 408.751993,719.612500 409.529993,719.612500 410.307992,719.612500 411.085991,719.612500 411.864009,719.612500 412.642008,719.612500 413.420007,719.612500 414.198007,719.612500 414.976006,719.612500 415.754005,719.612500 416.532004,719.612500 417.310004,719.612500 418.088003,719.612500 418.866002,719.612500 419.644001,719.612500 420.422001,719.612500 421.200000,719.612500 421.200000,651.795833 421.978018,651.795833 422.755999,651.795833 423.534016,651.795833 424.311997,651.795833 425.090015,651.795833 425.867996,651.795833 426.646013,651.795833 427.423994,651.795833 428.202012,651.795833 428.979993,651.795833 429.758010,651.795833 430.535991,651.795833 431.314009,651.795833 432.091990,651.795833 432.870007,651.795833 433.647988,651.795833 434.426006,651.795833 435.203987,651.795833 435.982004,651.795833 436.759985,651.795833 437.538003,651.795833 438.315984,651.795833 439.094001,651.795833 439.871982,651.795833 440.650000,651.795833 441.428018,651.795833 442.205999,651.795833 442.984016,651.795833 443.761997,651.795833 444.540015,651.795833 445.317996,651.795833 446.096013,651.795833 446.873994,651.795833 447.652012,651.795833 448.429993,651.795833 449.208010,651.795833 449.985991,651.795833 450.764009,651.795833 451.541990,651.795833 452.320007,651.795833 453.097988,651.795833 453.876006,651.795833 454.653987,651.795833 455.432004,651.795833 456.209985,651.795833 456.988003,651.795833 457.765984,651.795833 458.544001,651.795833 459.321982,651.795833 460.100000,651.795833 460.100000,651.795833 460.878018,651.795833 461.655999,651.795833 462.434016,651.795833 463.211997,651.795833 463.990015,651.795833 464.767996,651.795833 465.546013,651.795833 466.323994,651.795833 467.102012,651.795833 467.879993,651.795833 468.658010,651.795833 469.435991,651.795833 470.214009,651.795833 470.991990,651.795833 471.770007,651.795833 472.547988,651.795833 473.326006,651.795833 474.103987,651.795833 474.882004,651.795833 475.659985,651.795833 476.438003,651.795833 477.215984,651.795833 477.994001,651.795833 478.771982,651.795833 479.550000,651.795833 480.328018,651.795833 481.105999,651.795833 481.884016,651.795833 482.661997,651.795833 483.440015,651.795833 484.217996,651.795833 484.996013,651.795833 485.773994,651.795833 486.552012,651.795833 487.329993,651.795833 488.108010,651.795833 488.885991,651.795833 489.664009,651.795833 490.441990,651.795833 491.220007,651.795833 491.997988,651.795833 492.776006,651.795833 493.553987,651.795833 494.332004,651.795833 495.109985,651.795833 495.888003,651.795833 496.665984,651.795833 497.444001,651.795833 498.221982,651.795833 499.000000,651.795833 499.000000,719.612500"
-     id="polyline172-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="616.13104"
-     y="514.86084"
-     id="text174-1">iniTruOut.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="616.13104"
-     y="609.86084"
-     id="text176-4">iniTruOut.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="616.13104"
-     y="704.86084"
-     id="text178-9">iniTruOut.y</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="62.180664"
+     y="739.04669"
+     width="360"
+     height="68"
+     id="rect1686" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 470.000000,746.000000"
+     id="polyline1688"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,433.000000"
+     id="polyline1690"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 110.000000,433.000000"
+     id="polyline1692"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline1694"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,754.000000"
+     id="polyline1696"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,746.000000 182.000000,754.000000"
+     id="polyline1698"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,754.000000"
+     id="polyline1700"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,746.000000 326.000000,754.000000"
+     id="polyline1702"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,754.000000"
+     id="polyline1704"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,754.000000"
+     id="polyline1706"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,758.800000"
+     id="polyline1708"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="62.180664"
+     y="865.84259"
+     id="text1710">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,758.800000"
+     id="polyline1712"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="206.18066"
+     y="865.84259"
+     id="text1714">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,758.800000"
+     id="polyline1716"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="350.18066"
+     y="865.84259"
+     id="text1718">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,528.204167 110.000000,528.204167"
+     id="polyline1720"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="616.54681"
+     id="text1722">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,460.387500 110.000000,460.387500"
+     id="polyline1724"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="548.72968"
+     id="text1726">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,623.408333 110.000000,623.408333"
+     id="polyline1728"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="711.75055"
+     id="text1730">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,555.591667 110.000000,555.591667"
+     id="polyline1732"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="643.93475"
+     id="text1734">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,718.612500 110.000000,718.612500"
+     id="polyline1736"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="806.95465"
+     id="text1738">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,650.795833 110.000000,650.795833"
+     id="polyline1740"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="46.180664"
+     y="739.13873"
+     id="text1742">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-5)"
+     points="110.000000,528.204167 110.720000,528.204167 111.440000,528.204167 112.160000,528.204167 112.880000,528.204167 113.600000,528.204167 114.320000,528.204167 115.040000,528.204167 115.760000,528.204167 116.480000,528.204167 117.200000,528.204167 117.920000,528.204167 118.640000,528.204167 119.360000,528.204167 120.080000,528.204167 120.800000,528.204167 121.520000,528.204167 122.240000,528.204167 122.960001,528.204167 123.680000,528.204167 124.400000,528.204167 125.120000,528.204167 125.840000,528.204167 126.560000,528.204167 127.280000,528.204167 128.000000,528.204167 128.719999,528.204167 129.440001,528.204167 130.160000,528.204167 130.879999,528.204167 131.600001,528.204167 132.320000,528.204167 133.039999,528.204167 133.760001,528.204167 134.480000,528.204167 135.200000,528.204167 135.920001,528.204167 136.640000,528.204167 137.360000,528.204167 138.079999,528.204167 138.800000,528.204167 139.520000,528.204167 140.239999,528.204167 140.960001,528.204167 141.680000,528.204167 142.399999,528.204167 143.120001,528.204167 143.840000,528.204167 144.559999,528.204167 145.280001,528.204167 146.000000,528.204167 146.000000,460.387500 146.000000,460.387500 146.719999,460.387500 147.439999,460.387500 148.159998,460.387500 148.880002,460.387500 149.600001,460.387500 150.320000,460.387500 151.039999,460.387500 151.759999,460.387500 152.479998,460.387500 153.200002,460.387500 153.920001,460.387500 154.640000,460.387500 155.360000,460.387500 156.079999,460.387500 156.799998,460.387500 157.520002,460.387500 158.240001,460.387500 158.960001,460.387500 159.680000,460.387500 160.399999,460.387500 161.119998,460.387500 161.840002,460.387500 162.560001,460.387500 163.280001,460.387500 164.000000,460.387500 164.719999,460.387500 165.439999,460.387500 166.159998,460.387500 166.880002,460.387500 167.600001,460.387500 168.320000,460.387500 169.039999,460.387500 169.759999,460.387500 170.479998,460.387500 171.200002,460.387500 171.920001,460.387500 172.640000,460.387500 173.360000,460.387500 174.079999,460.387500 174.799998,460.387500 175.520002,460.387500 176.240001,460.387500 176.960001,460.387500 177.680000,460.387500 178.399999,460.387500 179.119998,460.387500 179.840002,460.387500 180.560001,460.387500 181.280001,460.387500 182.000000,460.387500 182.000000,528.204167 182.000000,528.204167 182.719999,528.204167 183.439999,528.204167 184.159998,528.204167 184.879997,528.204167 185.599997,528.204167 186.319996,528.204167 187.040004,528.204167 187.760003,528.204167 188.480002,528.204167 189.200002,528.204167 189.920001,528.204167 190.640000,528.204167 191.360000,528.204167 192.079999,528.204167 192.799998,528.204167 193.519998,528.204167 194.239997,528.204167 194.959996,528.204167 195.680004,528.204167 196.400003,528.204167 197.120003,528.204167 197.840002,528.204167 198.560001,528.204167 199.280001,528.204167 200.000000,528.204167 200.719999,528.204167 201.439999,528.204167 202.159998,528.204167 202.879997,528.204167 203.599997,528.204167 204.319996,528.204167 205.040004,528.204167 205.760003,528.204167 206.480002,528.204167 207.200002,528.204167 207.920001,528.204167 208.640000,528.204167 209.360000,528.204167 210.079999,528.204167 210.799998,528.204167 211.519998,528.204167 212.239997,528.204167 212.959996,528.204167 213.680004,528.204167 214.400003,528.204167 215.120003,528.204167 215.840002,528.204167 216.560001,528.204167 217.280001,528.204167 218.000000,528.204167 218.000000,460.387500 218.000000,460.387500 218.719999,460.387500 219.439999,460.387500 220.159998,460.387500 220.879997,460.387500 221.599997,460.387500 222.319996,460.387500 223.040004,460.387500 223.760003,460.387500 224.480002,460.387500 225.200002,460.387500 225.920001,460.387500 226.640000,460.387500 227.360000,460.387500 228.079999,460.387500 228.799998,460.387500 229.519998,460.387500 230.239997,460.387500 230.959996,460.387500 231.680004,460.387500 232.400003,460.387500 233.120003,460.387500 233.840002,460.387500 234.560001,460.387500 235.280001,460.387500 236.000000,460.387500 236.719999,460.387500 237.439999,460.387500 238.159998,460.387500 238.879997,460.387500 239.599997,460.387500 240.319996,460.387500 241.040004,460.387500 241.760003,460.387500 242.480002,460.387500 243.200002,460.387500 243.920001,460.387500 244.640000,460.387500 245.360000,460.387500 246.079999,460.387500 246.799998,460.387500 247.519998,460.387500 248.239997,460.387500 248.959996,460.387500 249.680004,460.387500 250.400003,460.387500 251.120003,460.387500 251.840002,460.387500 252.560001,460.387500 253.280001,460.387500 254.000000,460.387500 254.000000,528.204167 254.000000,528.204167 254.719999,528.204167 255.439999,528.204167 256.159998,528.204167 256.879997,528.204167 257.599997,528.204167 258.319996,528.204167 259.039995,528.204167 259.759995,528.204167 260.479994,528.204167 261.199993,528.204167 261.919992,528.204167 262.639992,528.204167 263.360008,528.204167 264.080008,528.204167 264.800007,528.204167 265.520006,528.204167 266.240005,528.204167 266.960005,528.204167 267.680004,528.204167 268.400003,528.204167 269.120003,528.204167 269.840002,528.204167 270.560001,528.204167 271.280001,528.204167 272.000000,528.204167 272.719999,528.204167 273.439999,528.204167 274.159998,528.204167 274.879997,528.204167 275.599997,528.204167 276.319996,528.204167 277.039995,528.204167 277.759995,528.204167 278.479994,528.204167 279.199993,528.204167 279.919992,528.204167 280.639992,528.204167 281.360008,528.204167 282.080008,528.204167 282.800007,528.204167 283.520006,528.204167 284.240005,528.204167 284.960005,528.204167 285.680004,528.204167 286.400003,528.204167 287.120003,528.204167 287.840002,528.204167 288.560001,528.204167 289.280001,528.204167 290.000000,528.204167 290.000000,460.387500 290.719999,460.387500 291.439999,460.387500 292.159998,460.387500 292.879997,460.387500 293.599997,460.387500 294.319996,460.387500 295.039995,460.387500 295.759995,460.387500 296.479994,460.387500 297.199993,460.387500 297.919992,460.387500 298.639992,460.387500 299.360008,460.387500 300.080008,460.387500 300.800007,460.387500 301.520006,460.387500 302.240005,460.387500 302.960005,460.387500 303.680004,460.387500 304.400003,460.387500 305.120003,460.387500 305.840002,460.387500 306.560001,460.387500 307.280001,460.387500 308.000000,460.387500 308.719999,460.387500 309.439999,460.387500 310.159998,460.387500 310.879997,460.387500 311.599997,460.387500 312.319996,460.387500 313.039995,460.387500 313.759995,460.387500 314.479994,460.387500 315.199993,460.387500 315.919992,460.387500 316.639992,460.387500 317.360008,460.387500 318.080008,460.387500 318.800007,460.387500 319.520006,460.387500 320.240005,460.387500 320.960005,460.387500 321.680004,460.387500 322.400003,460.387500 323.120003,460.387500 323.840002,460.387500 324.560001,460.387500 325.280001,460.387500 326.000000,460.387500 326.000000,528.204167 326.719999,528.204167 327.439999,528.204167 328.159998,528.204167 328.879997,528.204167 329.599997,528.204167 330.319996,528.204167 331.039995,528.204167 331.759995,528.204167 332.479994,528.204167 333.199993,528.204167 333.919992,528.204167 334.639992,528.204167 335.360008,528.204167 336.080008,528.204167 336.800007,528.204167 337.520006,528.204167 338.240005,528.204167 338.960005,528.204167 339.680004,528.204167 340.400003,528.204167 341.120003,528.204167 341.840002,528.204167 342.560001,528.204167 343.280001,528.204167 344.000000,528.204167 344.719999,528.204167 345.439999,528.204167 346.159998,528.204167 346.879997,528.204167 347.599997,528.204167 348.319996,528.204167 349.039995,528.204167 349.759995,528.204167 350.479994,528.204167 351.199993,528.204167 351.919992,528.204167 352.639992,528.204167 353.360008,528.204167 354.080008,528.204167 354.800007,528.204167 355.520006,528.204167 356.240005,528.204167 356.960005,528.204167 357.680004,528.204167 358.400003,528.204167 359.120003,528.204167 359.840002,528.204167 360.560001,528.204167 361.280001,528.204167 362.000000,528.204167 362.000000,460.387500 362.719999,460.387500 363.439999,460.387500 364.159998,460.387500 364.879997,460.387500 365.599997,460.387500 366.319996,460.387500 367.039995,460.387500 367.759995,460.387500 368.479994,460.387500 369.199993,460.387500 369.919992,460.387500 370.639992,460.387500 371.360008,460.387500 372.080008,460.387500 372.800007,460.387500 373.520006,460.387500 374.240005,460.387500 374.960005,460.387500 375.680004,460.387500 376.400003,460.387500 377.120003,460.387500 377.840002,460.387500 378.560001,460.387500 379.280001,460.387500 380.000000,460.387500 380.719999,460.387500 381.439999,460.387500 382.159998,460.387500 382.879997,460.387500 383.599997,460.387500 384.319996,460.387500 385.039995,460.387500 385.759995,460.387500 386.479994,460.387500 387.199993,460.387500 387.919992,460.387500 388.639992,460.387500 389.360008,460.387500 390.080008,460.387500 390.800007,460.387500 391.520006,460.387500 392.240005,460.387500 392.960005,460.387500 393.680004,460.387500 394.400003,460.387500 395.120003,460.387500 395.840002,460.387500 396.560001,460.387500 397.280001,460.387500 398.000000,460.387500 398.000000,528.204167 398.720016,528.204167 399.439999,528.204167 400.160015,528.204167 400.879997,528.204167 401.600014,528.204167 402.319996,528.204167 403.040012,528.204167 403.759995,528.204167 404.480011,528.204167 405.199993,528.204167 405.920010,528.204167 406.639992,528.204167 407.360008,528.204167 408.079990,528.204167 408.800007,528.204167 409.519989,528.204167 410.240005,528.204167 410.959988,528.204167 411.680004,528.204167 412.399986,528.204167 413.120003,528.204167 413.839985,528.204167 414.560001,528.204167 415.279984,528.204167 416.000000,528.204167 416.720016,528.204167 417.439999,528.204167 418.160015,528.204167 418.879997,528.204167 419.600014,528.204167 420.319996,528.204167 421.040012,528.204167 421.759995,528.204167 422.480011,528.204167 423.199993,528.204167 423.920010,528.204167 424.639992,528.204167 425.360008,528.204167 426.079990,528.204167 426.800007,528.204167 427.519989,528.204167 428.240005,528.204167 428.959988,528.204167 429.680004,528.204167 430.399986,528.204167 431.120003,528.204167 431.839985,528.204167 432.560001,528.204167 433.279984,528.204167 434.000000,528.204167 434.000000,460.387500 434.720016,460.387500 435.439999,460.387500 436.160015,460.387500 436.879997,460.387500 437.600014,460.387500 438.319996,460.387500 439.040012,460.387500 439.759995,460.387500 440.480011,460.387500 441.199993,460.387500 441.920010,460.387500 442.639992,460.387500 443.360008,460.387500 444.079990,460.387500 444.800007,460.387500 445.519989,460.387500 446.240005,460.387500 446.959988,460.387500 447.680004,460.387500 448.399986,460.387500 449.120003,460.387500 449.839985,460.387500 450.560001,460.387500 451.279984,460.387500 452.000000,460.387500 452.720016,460.387500 453.439999,460.387500 454.160015,460.387500 454.879997,460.387500 455.600014,460.387500 456.319996,460.387500 457.040012,460.387500 457.759995,460.387500 458.480011,460.387500 459.199993,460.387500 459.920010,460.387500 460.639992,460.387500 461.360008,460.387500 462.079990,460.387500 462.800007,460.387500 463.519989,460.387500 464.240005,460.387500 464.959988,460.387500 465.680004,460.387500 466.399986,460.387500 467.120003,460.387500 467.839985,460.387500 468.560001,460.387500 469.279984,460.387500 470.000000,460.387500 470.000000,528.204167"
+     id="polyline1747"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-5)"
+     points="110.000000,623.408333 110.720000,623.408333 111.440000,623.408333 112.160000,623.408333 112.880000,623.408333 113.600000,623.408333 114.320000,623.408333 115.040000,623.408333 115.760000,623.408333 116.480000,623.408333 117.200000,623.408333 117.920000,623.408333 118.640000,623.408333 119.360000,623.408333 120.080000,623.408333 120.800000,623.408333 121.520000,623.408333 122.240000,623.408333 122.960001,623.408333 123.680000,623.408333 124.400000,623.408333 125.120000,623.408333 125.840000,623.408333 126.560000,623.408333 127.280000,623.408333 128.000000,623.408333 128.719999,623.408333 129.440001,623.408333 130.160000,623.408333 130.879999,623.408333 131.600001,623.408333 132.320000,623.408333 133.039999,623.408333 133.760001,623.408333 134.480000,623.408333 135.200000,623.408333 135.920001,623.408333 136.640000,623.408333 137.360000,623.408333 138.079999,623.408333 138.800000,623.408333 139.520000,623.408333 140.239999,623.408333 140.960001,623.408333 141.680000,623.408333 142.399999,623.408333 143.120001,623.408333 143.840000,623.408333 144.559999,623.408333 145.280001,623.408333 146.000000,623.408333 146.000000,623.408333 146.000000,623.408333 146.719999,623.408333 147.439999,623.408333 148.159998,623.408333 148.880002,623.408333 149.600001,623.408333 150.320000,623.408333 151.039999,623.408333 151.759999,623.408333 152.479998,623.408333 153.200002,623.408333 153.920001,623.408333 154.640000,623.408333 155.360000,623.408333 156.079999,623.408333 156.799998,623.408333 157.520002,623.408333 158.240001,623.408333 158.960001,623.408333 159.680000,623.408333 160.399999,623.408333 161.119998,623.408333 161.840002,623.408333 162.560001,623.408333 163.280001,623.408333 164.000000,623.408333 164.719999,623.408333 165.439999,623.408333 166.159998,623.408333 166.880002,623.408333 167.600001,623.408333 168.320000,623.408333 169.039999,623.408333 169.759999,623.408333 170.479998,623.408333 171.200002,623.408333 171.920001,623.408333 172.640000,623.408333 173.360000,623.408333 174.079999,623.408333 174.799998,623.408333 175.520002,623.408333 176.240001,623.408333 176.960001,623.408333 177.680000,623.408333 178.399999,623.408333 179.119998,623.408333 179.840002,623.408333 180.560001,623.408333 181.280001,623.408333 182.000000,623.408333 182.000000,623.408333 182.000000,623.408333 182.719999,623.408333 183.439999,623.408333 184.159998,623.408333 184.879997,623.408333 185.599997,623.408333 186.319996,623.408333 187.040004,623.408333 187.760003,623.408333 188.480002,623.408333 189.200002,623.408333 189.920001,623.408333 190.640000,623.408333 191.360000,623.408333 192.079999,623.408333 192.799998,623.408333 193.519998,623.408333 194.239997,623.408333 194.959996,623.408333 195.680004,623.408333 196.400003,623.408333 197.120003,623.408333 197.840002,623.408333 198.560001,623.408333 199.280001,623.408333 200.000000,623.408333 200.719999,623.408333 201.439999,623.408333 202.159998,623.408333 202.879997,623.408333 203.599997,623.408333 204.319996,623.408333 205.040004,623.408333 205.760003,623.408333 206.480002,623.408333 207.200002,623.408333 207.920001,623.408333 208.640000,623.408333 209.360000,623.408333 210.079999,623.408333 210.799998,623.408333 211.519998,623.408333 212.239997,623.408333 212.959996,623.408333 213.680004,623.408333 214.400003,623.408333 215.120003,623.408333 215.840002,623.408333 216.560001,623.408333 217.280001,623.408333 218.000000,623.408333 218.000000,623.408333 218.000000,623.408333 218.719999,623.408333 219.439999,623.408333 220.159998,623.408333 220.879997,623.408333 221.599997,623.408333 222.319996,623.408333 223.040004,623.408333 223.760003,623.408333 224.480002,623.408333 225.200002,623.408333 225.920001,623.408333 226.640000,623.408333 227.360000,623.408333 228.079999,623.408333 228.799998,623.408333 229.519998,623.408333 230.239997,623.408333 230.959996,623.408333 231.680004,623.408333 232.400003,623.408333 233.120003,623.408333 233.840002,623.408333 234.560001,623.408333 235.280001,623.408333 236.000000,623.408333 236.719999,623.408333 237.439999,623.408333 238.159998,623.408333 238.879997,623.408333 239.599997,623.408333 240.319996,623.408333 241.040004,623.408333 241.760003,623.408333 242.480002,623.408333 243.200002,623.408333 243.920001,623.408333 244.640000,623.408333 245.360000,623.408333 246.079999,623.408333 246.799998,623.408333 247.519998,623.408333 248.239997,623.408333 248.959996,623.408333 249.680004,623.408333 250.400003,623.408333 251.120003,623.408333 251.840002,623.408333 252.560001,623.408333 253.280001,623.408333 254.000000,623.408333 254.000000,623.408333 254.000000,623.408333 254.719999,623.408333 255.439999,623.408333 256.159998,623.408333 256.879997,623.408333 257.599997,623.408333 258.319996,623.408333 259.039995,623.408333 259.759995,623.408333 260.479994,623.408333 261.199993,623.408333 261.919992,623.408333 262.639992,623.408333 263.360008,623.408333 264.080008,623.408333 264.800007,623.408333 265.520006,623.408333 266.240005,623.408333 266.960005,623.408333 267.680004,623.408333 268.400003,623.408333 269.120003,623.408333 269.840002,623.408333 270.560001,623.408333 271.280001,623.408333 272.000000,623.408333 272.719999,623.408333 273.439999,623.408333 274.159998,623.408333 274.879997,623.408333 275.599997,623.408333 276.319996,623.408333 277.039995,623.408333 277.759995,623.408333 278.479994,623.408333 279.199993,623.408333 279.919992,623.408333 280.639992,623.408333 281.360008,623.408333 282.080008,623.408333 282.800007,623.408333 283.520006,623.408333 284.240005,623.408333 284.960005,623.408333 285.680004,623.408333 286.400003,623.408333 287.120003,623.408333 287.840002,623.408333 288.560001,623.408333 289.280001,623.408333 290.000000,623.408333 290.000000,623.408333 290.719999,623.408333 291.439999,623.408333 292.159998,623.408333 292.879997,623.408333 293.599997,623.408333 294.319996,623.408333 295.039995,623.408333 295.759995,623.408333 296.479994,623.408333 297.199993,623.408333 297.919992,623.408333 298.639992,623.408333 299.360008,623.408333 300.080008,623.408333 300.800007,623.408333 301.520006,623.408333 302.240005,623.408333 302.960005,623.408333 303.680004,623.408333 304.400003,623.408333 305.120003,623.408333 305.840002,623.408333 306.560001,623.408333 307.280001,623.408333 308.000000,623.408333 308.719999,623.408333 309.439999,623.408333 310.159998,623.408333 310.879997,623.408333 311.599997,623.408333 312.319996,623.408333 313.039995,623.408333 313.759995,623.408333 314.479994,623.408333 315.199993,623.408333 315.919992,623.408333 316.639992,623.408333 317.360008,623.408333 318.080008,623.408333 318.800007,623.408333 319.520006,623.408333 320.240005,623.408333 320.960005,623.408333 321.680004,623.408333 322.400003,623.408333 323.120003,623.408333 323.840002,623.408333 324.560001,623.408333 325.280001,623.408333 326.000000,623.408333 326.000000,623.408333 326.719999,623.408333 327.439999,623.408333 328.159998,623.408333 328.879997,623.408333 329.599997,623.408333 330.319996,623.408333 331.039995,623.408333 331.759995,623.408333 332.479994,623.408333 333.199993,623.408333 333.919992,623.408333 334.639992,623.408333 335.360008,623.408333 336.080008,623.408333 336.800007,623.408333 337.520006,623.408333 338.240005,623.408333 338.960005,623.408333 339.680004,623.408333 340.400003,623.408333 341.120003,623.408333 341.840002,623.408333 342.560001,623.408333 343.280001,623.408333 344.000000,623.408333 344.719999,623.408333 345.439999,623.408333 346.159998,623.408333 346.879997,623.408333 347.599997,623.408333 348.319996,623.408333 349.039995,623.408333 349.759995,623.408333 350.479994,623.408333 351.199993,623.408333 351.919992,623.408333 352.639992,623.408333 353.360008,623.408333 354.080008,623.408333 354.800007,623.408333 355.520006,623.408333 356.240005,623.408333 356.960005,623.408333 357.680004,623.408333 358.400003,623.408333 359.120003,623.408333 359.840002,623.408333 360.560001,623.408333 361.280001,623.408333 362.000000,623.408333 362.000000,623.408333 362.719999,623.408333 363.439999,623.408333 364.159998,623.408333 364.879997,623.408333 365.599997,623.408333 366.319996,623.408333 367.039995,623.408333 367.759995,623.408333 368.479994,623.408333 369.199993,623.408333 369.919992,623.408333 370.639992,623.408333 371.360008,623.408333 372.080008,623.408333 372.800007,623.408333 373.520006,623.408333 374.240005,623.408333 374.960005,623.408333 375.680004,623.408333 376.400003,623.408333 377.120003,623.408333 377.840002,623.408333 378.560001,623.408333 379.280001,623.408333 380.000000,623.408333 380.719999,623.408333 381.439999,623.408333 382.159998,623.408333 382.879997,623.408333 383.599997,623.408333 384.319996,623.408333 385.039995,623.408333 385.759995,623.408333 386.479994,623.408333 387.199993,623.408333 387.919992,623.408333 388.639992,623.408333 389.360008,623.408333 390.080008,623.408333 390.800007,623.408333 391.520006,623.408333 392.240005,623.408333 392.960005,623.408333 393.680004,623.408333 394.400003,623.408333 395.120003,623.408333 395.840002,623.408333 396.560001,623.408333 397.280001,623.408333 398.000000,623.408333 398.000000,623.408333 398.720016,623.408333 399.439999,623.408333 400.160015,623.408333 400.879997,623.408333 401.600014,623.408333 402.319996,623.408333 403.040012,623.408333 403.759995,623.408333 404.480011,623.408333 405.199993,623.408333 405.920010,623.408333 406.639992,623.408333 407.360008,623.408333 408.079990,623.408333 408.800007,623.408333 409.519989,623.408333 410.240005,623.408333 410.959988,623.408333 411.680004,623.408333 412.399986,623.408333 413.120003,623.408333 413.839985,623.408333 414.560001,623.408333 415.279984,623.408333 416.000000,623.408333 416.720016,623.408333 417.439999,623.408333 418.160015,623.408333 418.879997,623.408333 419.600014,623.408333 420.319996,623.408333 421.040012,623.408333 421.759995,623.408333 422.480011,623.408333 423.199993,623.408333 423.920010,623.408333 424.639992,623.408333 425.360008,623.408333 426.079990,623.408333 426.800007,623.408333 427.519989,623.408333 428.240005,623.408333 428.959988,623.408333 429.680004,623.408333 430.399986,623.408333 431.120003,623.408333 431.839985,623.408333 432.560001,623.408333 433.279984,623.408333 434.000000,623.408333 434.000000,623.408333 434.720016,623.408333 435.439999,623.408333 436.160015,623.408333 436.879997,623.408333 437.600014,623.408333 438.319996,623.408333 439.040012,623.408333 439.759995,623.408333 440.480011,623.408333 441.199993,623.408333 441.920010,623.408333 442.639992,623.408333 443.360008,623.408333 444.079990,623.408333 444.800007,623.408333 445.519989,623.408333 446.240005,623.408333 446.959988,623.408333 447.680004,623.408333 448.399986,623.408333 449.120003,623.408333 449.839985,623.408333 450.560001,623.408333 451.279984,623.408333 452.000000,623.408333 452.720016,623.408333 453.439999,623.408333 454.160015,623.408333 454.879997,623.408333 455.600014,623.408333 456.319996,623.408333 457.040012,623.408333 457.759995,623.408333 458.480011,623.408333 459.199993,623.408333 459.920010,623.408333 460.639992,623.408333 461.360008,623.408333 462.079990,623.408333 462.800007,623.408333 463.519989,623.408333 464.240005,623.408333 464.959988,623.408333 465.680004,623.408333 466.399986,623.408333 467.120003,623.408333 467.839985,623.408333 468.560001,623.408333 469.279984,623.408333 470.000000,623.408333 470.000000,623.408333"
+     id="polyline1749"
+     transform="translate(-47.819396,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-5)"
+     points="110.000000,718.612500 110.720000,718.612500 111.440000,718.612500 112.160000,718.612500 112.880000,718.612500 113.600000,718.612500 114.320000,718.612500 115.040000,718.612500 115.760000,718.612500 116.480000,718.612500 117.200000,718.612500 117.920000,718.612500 118.640000,718.612500 119.360000,718.612500 120.080000,718.612500 120.800000,718.612500 121.520000,718.612500 122.240000,718.612500 122.960001,718.612500 123.680000,718.612500 124.400000,718.612500 125.120000,718.612500 125.840000,718.612500 126.560000,718.612500 127.280000,718.612500 128.000000,718.612500 128.719999,718.612500 129.440001,718.612500 130.160000,718.612500 130.879999,718.612500 131.600001,718.612500 132.320000,718.612500 133.039999,718.612500 133.760001,718.612500 134.480000,718.612500 135.200000,718.612500 135.920001,718.612500 136.640000,718.612500 137.360000,718.612500 138.079999,718.612500 138.800000,718.612500 139.520000,718.612500 140.239999,718.612500 140.960001,718.612500 141.680000,718.612500 142.399999,718.612500 143.120001,718.612500 143.840000,718.612500 144.559999,718.612500 145.280001,718.612500 146.000000,718.612500 146.000000,650.795833 146.000000,650.795833 146.719999,650.795833 147.439999,650.795833 148.159998,650.795833 148.880002,650.795833 149.600001,650.795833 150.320000,650.795833 151.039999,650.795833 151.759999,650.795833 152.479998,650.795833 153.200002,650.795833 153.920001,650.795833 154.640000,650.795833 155.360000,650.795833 156.079999,650.795833 156.799998,650.795833 157.520002,650.795833 158.240001,650.795833 158.960001,650.795833 159.680000,650.795833 160.399999,650.795833 161.119998,650.795833 161.840002,650.795833 162.560001,650.795833 163.280001,650.795833 164.000000,650.795833 164.719999,650.795833 165.439999,650.795833 166.159998,650.795833 166.880002,650.795833 167.600001,650.795833 168.320000,650.795833 169.039999,650.795833 169.759999,650.795833 170.479998,650.795833 171.200002,650.795833 171.920001,650.795833 172.640000,650.795833 173.360000,650.795833 174.079999,650.795833 174.799998,650.795833 175.520002,650.795833 176.240001,650.795833 176.960001,650.795833 177.680000,650.795833 178.399999,650.795833 179.119998,650.795833 179.840002,650.795833 180.560001,650.795833 181.280001,650.795833 182.000000,650.795833 182.000000,650.795833 182.000000,650.795833 182.719999,650.795833 183.439999,650.795833 184.159998,650.795833 184.879997,650.795833 185.599997,650.795833 186.319996,650.795833 187.040004,650.795833 187.760003,650.795833 188.480002,650.795833 189.200002,650.795833 189.920001,650.795833 190.640000,650.795833 191.360000,650.795833 192.079999,650.795833 192.799998,650.795833 193.519998,650.795833 194.239997,650.795833 194.959996,650.795833 195.680004,650.795833 196.400003,650.795833 197.120003,650.795833 197.840002,650.795833 198.560001,650.795833 199.280001,650.795833 200.000000,650.795833 200.719999,650.795833 201.439999,650.795833 202.159998,650.795833 202.879997,650.795833 203.599997,650.795833 204.319996,650.795833 205.040004,650.795833 205.760003,650.795833 206.480002,650.795833 207.200002,650.795833 207.920001,650.795833 208.640000,650.795833 209.360000,650.795833 210.079999,650.795833 210.799998,650.795833 211.519998,650.795833 212.239997,650.795833 212.959996,650.795833 213.680004,650.795833 214.400003,650.795833 215.120003,650.795833 215.840002,650.795833 216.560001,650.795833 217.280001,650.795833 218.000000,650.795833 218.000000,718.612500 218.000000,718.612500 218.719999,718.612500 219.439999,718.612500 220.159998,718.612500 220.879997,718.612500 221.599997,718.612500 222.319996,718.612500 223.040004,718.612500 223.760003,718.612500 224.480002,718.612500 225.200002,718.612500 225.920001,718.612500 226.640000,718.612500 227.360000,718.612500 228.079999,718.612500 228.799998,718.612500 229.519998,718.612500 230.239997,718.612500 230.959996,718.612500 231.680004,718.612500 232.400003,718.612500 233.120003,718.612500 233.840002,718.612500 234.560001,718.612500 235.280001,718.612500 236.000000,718.612500 236.719999,718.612500 237.439999,718.612500 238.159998,718.612500 238.879997,718.612500 239.599997,718.612500 240.319996,718.612500 241.040004,718.612500 241.760003,718.612500 242.480002,718.612500 243.200002,718.612500 243.920001,718.612500 244.640000,718.612500 245.360000,718.612500 246.079999,718.612500 246.799998,718.612500 247.519998,718.612500 248.239997,718.612500 248.959996,718.612500 249.680004,718.612500 250.400003,718.612500 251.120003,718.612500 251.840002,718.612500 252.560001,718.612500 253.280001,718.612500 254.000000,718.612500 254.000000,718.612500 254.000000,718.612500 254.719999,718.612500 255.439999,718.612500 256.159998,718.612500 256.879997,718.612500 257.599997,718.612500 258.319996,718.612500 259.039995,718.612500 259.759995,718.612500 260.479994,718.612500 261.199993,718.612500 261.919992,718.612500 262.639992,718.612500 263.360008,718.612500 264.080008,718.612500 264.800007,718.612500 265.520006,718.612500 266.240005,718.612500 266.960005,718.612500 267.680004,718.612500 268.400003,718.612500 269.120003,718.612500 269.840002,718.612500 270.560001,718.612500 271.280001,718.612500 272.000000,718.612500 272.719999,718.612500 273.439999,718.612500 274.159998,718.612500 274.879997,718.612500 275.599997,718.612500 276.319996,718.612500 277.039995,718.612500 277.759995,718.612500 278.479994,718.612500 279.199993,718.612500 279.919992,718.612500 280.639992,718.612500 281.360008,718.612500 282.080008,718.612500 282.800007,718.612500 283.520006,718.612500 284.240005,718.612500 284.960005,718.612500 285.680004,718.612500 286.400003,718.612500 287.120003,718.612500 287.840002,718.612500 288.560001,718.612500 289.280001,718.612500 290.000000,718.612500 290.000000,650.795833 290.719999,650.795833 291.439999,650.795833 292.159998,650.795833 292.879997,650.795833 293.599997,650.795833 294.319996,650.795833 295.039995,650.795833 295.759995,650.795833 296.479994,650.795833 297.199993,650.795833 297.919992,650.795833 298.639992,650.795833 299.360008,650.795833 300.080008,650.795833 300.800007,650.795833 301.520006,650.795833 302.240005,650.795833 302.960005,650.795833 303.680004,650.795833 304.400003,650.795833 305.120003,650.795833 305.840002,650.795833 306.560001,650.795833 307.280001,650.795833 308.000000,650.795833 308.719999,650.795833 309.439999,650.795833 310.159998,650.795833 310.879997,650.795833 311.599997,650.795833 312.319996,650.795833 313.039995,650.795833 313.759995,650.795833 314.479994,650.795833 315.199993,650.795833 315.919992,650.795833 316.639992,650.795833 317.360008,650.795833 318.080008,650.795833 318.800007,650.795833 319.520006,650.795833 320.240005,650.795833 320.960005,650.795833 321.680004,650.795833 322.400003,650.795833 323.120003,650.795833 323.840002,650.795833 324.560001,650.795833 325.280001,650.795833 326.000000,650.795833 326.000000,650.795833 326.719999,650.795833 327.439999,650.795833 328.159998,650.795833 328.879997,650.795833 329.599997,650.795833 330.319996,650.795833 331.039995,650.795833 331.759995,650.795833 332.479994,650.795833 333.199993,650.795833 333.919992,650.795833 334.639992,650.795833 335.360008,650.795833 336.080008,650.795833 336.800007,650.795833 337.520006,650.795833 338.240005,650.795833 338.960005,650.795833 339.680004,650.795833 340.400003,650.795833 341.120003,650.795833 341.840002,650.795833 342.560001,650.795833 343.280001,650.795833 344.000000,650.795833 344.719999,650.795833 345.439999,650.795833 346.159998,650.795833 346.879997,650.795833 347.599997,650.795833 348.319996,650.795833 349.039995,650.795833 349.759995,650.795833 350.479994,650.795833 351.199993,650.795833 351.919992,650.795833 352.639992,650.795833 353.360008,650.795833 354.080008,650.795833 354.800007,650.795833 355.520006,650.795833 356.240005,650.795833 356.960005,650.795833 357.680004,650.795833 358.400003,650.795833 359.120003,650.795833 359.840002,650.795833 360.560001,650.795833 361.280001,650.795833 362.000000,650.795833 362.000000,718.612500 362.719999,718.612500 363.439999,718.612500 364.159998,718.612500 364.879997,718.612500 365.599997,718.612500 366.319996,718.612500 367.039995,718.612500 367.759995,718.612500 368.479994,718.612500 369.199993,718.612500 369.919992,718.612500 370.639992,718.612500 371.360008,718.612500 372.080008,718.612500 372.800007,718.612500 373.520006,718.612500 374.240005,718.612500 374.960005,718.612500 375.680004,718.612500 376.400003,718.612500 377.120003,718.612500 377.840002,718.612500 378.560001,718.612500 379.280001,718.612500 380.000000,718.612500 380.719999,718.612500 381.439999,718.612500 382.159998,718.612500 382.879997,718.612500 383.599997,718.612500 384.319996,718.612500 385.039995,718.612500 385.759995,718.612500 386.479994,718.612500 387.199993,718.612500 387.919992,718.612500 388.639992,718.612500 389.360008,718.612500 390.080008,718.612500 390.800007,718.612500 391.520006,718.612500 392.240005,718.612500 392.960005,718.612500 393.680004,718.612500 394.400003,718.612500 395.120003,718.612500 395.840002,718.612500 396.560001,718.612500 397.280001,718.612500 398.000000,718.612500 398.000000,718.612500 398.720016,718.612500 399.439999,718.612500 400.160015,718.612500 400.879997,718.612500 401.600014,718.612500 402.319996,718.612500 403.040012,718.612500 403.759995,718.612500 404.480011,718.612500 405.199993,718.612500 405.920010,718.612500 406.639992,718.612500 407.360008,718.612500 408.079990,718.612500 408.800007,718.612500 409.519989,718.612500 410.240005,718.612500 410.959988,718.612500 411.680004,718.612500 412.399986,718.612500 413.120003,718.612500 413.839985,718.612500 414.560001,718.612500 415.279984,718.612500 416.000000,718.612500 416.720016,718.612500 417.439999,718.612500 418.160015,718.612500 418.879997,718.612500 419.600014,718.612500 420.319996,718.612500 421.040012,718.612500 421.759995,718.612500 422.480011,718.612500 423.199993,718.612500 423.920010,718.612500 424.639992,718.612500 425.360008,718.612500 426.079990,718.612500 426.800007,718.612500 427.519989,718.612500 428.240005,718.612500 428.959988,718.612500 429.680004,718.612500 430.399986,718.612500 431.120003,718.612500 431.839985,718.612500 432.560001,718.612500 433.279984,718.612500 434.000000,718.612500 434.000000,650.795833 434.720016,650.795833 435.439999,650.795833 436.160015,650.795833 436.879997,650.795833 437.600014,650.795833 438.319996,650.795833 439.040012,650.795833 439.759995,650.795833 440.480011,650.795833 441.199993,650.795833 441.920010,650.795833 442.639992,650.795833 443.360008,650.795833 444.079990,650.795833 444.800007,650.795833 445.519989,650.795833 446.240005,650.795833 446.959988,650.795833 447.680004,650.795833 448.399986,650.795833 449.120003,650.795833 449.839985,650.795833 450.560001,650.795833 451.279984,650.795833 452.000000,650.795833 452.720016,650.795833 453.439999,650.795833 454.160015,650.795833 454.879997,650.795833 455.600014,650.795833 456.319996,650.795833 457.040012,650.795833 457.759995,650.795833 458.480011,650.795833 459.199993,650.795833 459.920010,650.795833 460.639992,650.795833 461.360008,650.795833 462.079990,650.795833 462.800007,650.795833 463.519989,650.795833 464.240005,650.795833 464.959988,650.795833 465.680004,650.795833 466.399986,650.795833 467.120003,650.795833 467.839985,650.795833 468.560001,650.795833 469.279984,650.795833 470.000000,650.795833 470.000000,650.795833"
+     id="polyline1751"
+     transform="translate(-47.819396,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="531.84271"
+     id="text1753">falCleFalIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="626.84271"
+     id="text1755">falCleFalIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="65.180664"
+     y="721.84259"
+     id="text1757">falCleFalIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline2-8" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,34.000000 187.800000,347.000000"
-     id="polyline4-7" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,34.000000 265.600000,347.000000"
-     id="polyline6-1" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,34.000000 343.400000,347.000000"
-     id="polyline8-7" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,34.000000 421.200000,347.000000"
-     id="polyline10-2" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 499.000000,347.000000"
-     id="polyline12-7" />
+     id="polyline2660"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,34.000000 182.000000,347.000000"
+     id="polyline2662"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,34.000000 254.000000,347.000000"
+     id="polyline2664"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,34.000000 326.000000,347.000000"
+     id="polyline2666"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,34.000000 398.000000,347.000000"
+     id="polyline2668"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 470.000000,347.000000"
+     id="polyline2670"
+     transform="translate(490.1806,39.342803)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1157.8311"
-     y="89.931671"
-     width="389"
-     height="67.816704"
-     id="rect14-22" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="600.18048"
+     y="100.63861"
+     width="360"
+     height="68"
+     id="rect2672" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1157.8311"
-     y="185.13617"
-     width="389"
-     height="67.816704"
-     id="rect16-6" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="600.18048"
+     y="195.84277"
+     width="360"
+     height="68"
+     id="rect2674" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1157.8311"
-     y="280.34015"
-     width="389"
-     height="67.816704"
-     id="rect18-1" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,347.000000 499.000000,347.000000"
-     id="polyline20-0" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,34.000000"
-     id="polyline22-6" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,34.000000 110.000000,34.000000"
-     id="polyline24-1" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="600.18048"
+     y="291.04688"
+     width="360"
+     height="68"
+     id="rect2676" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 470.000000,347.000000"
+     id="polyline2678"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,34.000000"
+     id="polyline2680"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 110.000000,34.000000"
+     id="polyline2682"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,34.000000 110.000000,347.000000"
-     id="polyline26-5" />
+     id="polyline2684"
+     transform="translate(490.1806,39.342803)" />
   <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,355.000000"
-     id="polyline28-9" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,347.000000 187.800000,355.000000"
-     id="polyline30-4" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,355.000000"
-     id="polyline32-9" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,347.000000 343.400000,355.000000"
-     id="polyline34-0" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,355.000000"
-     id="polyline36-9" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,347.000000 499.000000,355.000000"
-     id="polyline38-1" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2686"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,347.000000 182.000000,355.000000"
+     id="polyline2688"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,355.000000"
+     id="polyline2690"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,347.000000 326.000000,355.000000"
+     id="polyline2692"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,355.000000"
+     id="polyline2694"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,355.000000"
+     id="polyline2696"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="110.000000,347.000000 110.000000,359.800000"
-     id="polyline40-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1157.8311"
-     y="407.04419"
-     id="text42-7">0</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,347.000000 265.600000,359.800000"
-     id="polyline44-1" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1313.431"
-     y="407.04419"
-     id="text46-1">4</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,347.000000 421.200000,359.800000"
-     id="polyline48-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1469.0311"
-     y="407.04419"
-     id="text50-9">8</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2698"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="600.18048"
+     y="417.84277"
+     id="text2700">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,359.800000"
+     id="polyline2702"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="744.18048"
+     y="417.84277"
+     id="text2704">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,359.800000"
+     id="polyline2706"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="888.18054"
+     y="417.84277"
+     id="text2708">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,129.204167 110.000000,129.204167"
-     id="polyline52-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="157.74817"
-     id="text54-7">false</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2710"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18048"
+     y="168.54688"
+     id="text2712">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,61.387500 110.000000,61.387500"
-     id="polyline56-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="89.931671"
-     id="text58-7">true</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2714"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18048"
+     y="100.73029"
+     id="text2716">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,224.408333 110.000000,224.408333"
-     id="polyline60-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="252.95218"
-     id="text62-6">false</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2718"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18048"
+     y="263.75085"
+     id="text2720">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,156.591667 110.000000,156.591667"
-     id="polyline64-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="185.13617"
-     id="text66-6">true</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2722"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18048"
+     y="195.93481"
+     id="text2724">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,319.612500 110.000000,319.612500"
-     id="polyline68-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="348.1572"
-     id="text70-9">false</text>
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
+     id="polyline2726"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18048"
+     y="358.95581"
+     id="text2728">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
      points="102.000000,251.795833 110.000000,251.795833"
-     id="polyline72-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="280.34015"
-     id="text74-8">true</text>
+     id="polyline2730"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18048"
+     y="291.13879"
+     id="text2732">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-8)"
+     points="110.000000,61.387500 110.720000,61.387500 111.440000,61.387500 112.160000,61.387500 112.880000,61.387500 113.600000,61.387500 114.320000,61.387500 115.040000,61.387500 115.760000,61.387500 116.480000,61.387500 117.200000,61.387500 117.920000,61.387500 118.640000,61.387500 119.360000,61.387500 120.080000,61.387500 120.800000,61.387500 121.520000,61.387500 122.240000,61.387500 122.960001,61.387500 123.680000,61.387500 124.400000,61.387500 125.120000,61.387500 125.840000,61.387500 126.560000,61.387500 127.280000,61.387500 128.000000,61.387500 128.719999,61.387500 129.440001,61.387500 130.160000,61.387500 130.879999,61.387500 131.600001,61.387500 132.320000,61.387500 133.039999,61.387500 133.760001,61.387500 134.480000,61.387500 135.200000,61.387500 135.920001,61.387500 136.640000,61.387500 137.360000,61.387500 138.079999,61.387500 138.800000,61.387500 139.520000,61.387500 140.239999,61.387500 140.960001,61.387500 141.680000,61.387500 142.399999,61.387500 143.120001,61.387500 143.840000,61.387500 144.559999,61.387500 145.280001,61.387500 146.000000,61.387500 146.000000,129.204167 146.000000,129.204167 146.719999,129.204167 147.439999,129.204167 148.159998,129.204167 148.880002,129.204167 149.600001,129.204167 150.320000,129.204167 151.039999,129.204167 151.759999,129.204167 152.479998,129.204167 153.200002,129.204167 153.920001,129.204167 154.640000,129.204167 155.360000,129.204167 156.079999,129.204167 156.799998,129.204167 157.520002,129.204167 158.240001,129.204167 158.960001,129.204167 159.680000,129.204167 160.399999,129.204167 161.119998,129.204167 161.840002,129.204167 162.560001,129.204167 163.280001,129.204167 164.000000,129.204167 164.719999,129.204167 165.439999,129.204167 166.159998,129.204167 166.880002,129.204167 167.600001,129.204167 168.320000,129.204167 169.039999,129.204167 169.759999,129.204167 170.479998,129.204167 171.200002,129.204167 171.920001,129.204167 172.640000,129.204167 173.360000,129.204167 174.079999,129.204167 174.799998,129.204167 175.520002,129.204167 176.240001,129.204167 176.960001,129.204167 177.680000,129.204167 178.399999,129.204167 179.119998,129.204167 179.840002,129.204167 180.560001,129.204167 181.280001,129.204167 182.000000,129.204167 182.000000,61.387500 182.000000,61.387500 182.719999,61.387500 183.439999,61.387500 184.159998,61.387500 184.879997,61.387500 185.599997,61.387500 186.319996,61.387500 187.040004,61.387500 187.760003,61.387500 188.480002,61.387500 189.200002,61.387500 189.920001,61.387500 190.640000,61.387500 191.360000,61.387500 192.079999,61.387500 192.799998,61.387500 193.519998,61.387500 194.239997,61.387500 194.959996,61.387500 195.680004,61.387500 196.400003,61.387500 197.120003,61.387500 197.840002,61.387500 198.560001,61.387500 199.280001,61.387500 200.000000,61.387500 200.719999,61.387500 201.439999,61.387500 202.159998,61.387500 202.879997,61.387500 203.599997,61.387500 204.319996,61.387500 205.040004,61.387500 205.760003,61.387500 206.480002,61.387500 207.200002,61.387500 207.920001,61.387500 208.640000,61.387500 209.360000,61.387500 210.079999,61.387500 210.799998,61.387500 211.519998,61.387500 212.239997,61.387500 212.959996,61.387500 213.680004,61.387500 214.400003,61.387500 215.120003,61.387500 215.840002,61.387500 216.560001,61.387500 217.280001,61.387500 218.000000,61.387500 218.000000,129.204167 218.000000,129.204167 218.719999,129.204167 219.439999,129.204167 220.159998,129.204167 220.879997,129.204167 221.599997,129.204167 222.319996,129.204167 223.040004,129.204167 223.760003,129.204167 224.480002,129.204167 225.200002,129.204167 225.920001,129.204167 226.640000,129.204167 227.360000,129.204167 228.079999,129.204167 228.799998,129.204167 229.519998,129.204167 230.239997,129.204167 230.959996,129.204167 231.680004,129.204167 232.400003,129.204167 233.120003,129.204167 233.840002,129.204167 234.560001,129.204167 235.280001,129.204167 236.000000,129.204167 236.719999,129.204167 237.439999,129.204167 238.159998,129.204167 238.879997,129.204167 239.599997,129.204167 240.319996,129.204167 241.040004,129.204167 241.760003,129.204167 242.480002,129.204167 243.200002,129.204167 243.920001,129.204167 244.640000,129.204167 245.360000,129.204167 246.079999,129.204167 246.799998,129.204167 247.519998,129.204167 248.239997,129.204167 248.959996,129.204167 249.680004,129.204167 250.400003,129.204167 251.120003,129.204167 251.840002,129.204167 252.560001,129.204167 253.280001,129.204167 254.000000,129.204167 254.000000,61.387500 254.000000,61.387500 254.719999,61.387500 255.439999,61.387500 256.159998,61.387500 256.879997,61.387500 257.599997,61.387500 258.319996,61.387500 259.039995,61.387500 259.759995,61.387500 260.479994,61.387500 261.199993,61.387500 261.919992,61.387500 262.639992,61.387500 263.360008,61.387500 264.080008,61.387500 264.800007,61.387500 265.520006,61.387500 266.240005,61.387500 266.960005,61.387500 267.680004,61.387500 268.400003,61.387500 269.120003,61.387500 269.840002,61.387500 270.560001,61.387500 271.280001,61.387500 272.000000,61.387500 272.719999,61.387500 273.439999,61.387500 274.159998,61.387500 274.879997,61.387500 275.599997,61.387500 276.319996,61.387500 277.039995,61.387500 277.759995,61.387500 278.479994,61.387500 279.199993,61.387500 279.919992,61.387500 280.639992,61.387500 281.360008,61.387500 282.080008,61.387500 282.800007,61.387500 283.520006,61.387500 284.240005,61.387500 284.960005,61.387500 285.680004,61.387500 286.400003,61.387500 287.120003,61.387500 287.840002,61.387500 288.560001,61.387500 289.280001,61.387500 290.000000,61.387500 290.000000,129.204167 290.719999,129.204167 291.439999,129.204167 292.159998,129.204167 292.879997,129.204167 293.599997,129.204167 294.319996,129.204167 295.039995,129.204167 295.759995,129.204167 296.479994,129.204167 297.199993,129.204167 297.919992,129.204167 298.639992,129.204167 299.360008,129.204167 300.080008,129.204167 300.800007,129.204167 301.520006,129.204167 302.240005,129.204167 302.960005,129.204167 303.680004,129.204167 304.400003,129.204167 305.120003,129.204167 305.840002,129.204167 306.560001,129.204167 307.280001,129.204167 308.000000,129.204167 308.719999,129.204167 309.439999,129.204167 310.159998,129.204167 310.879997,129.204167 311.599997,129.204167 312.319996,129.204167 313.039995,129.204167 313.759995,129.204167 314.479994,129.204167 315.199993,129.204167 315.919992,129.204167 316.639992,129.204167 317.360008,129.204167 318.080008,129.204167 318.800007,129.204167 319.520006,129.204167 320.240005,129.204167 320.960005,129.204167 321.680004,129.204167 322.400003,129.204167 323.120003,129.204167 323.840002,129.204167 324.560001,129.204167 325.280001,129.204167 326.000000,129.204167 326.000000,61.387500 326.719999,61.387500 327.439999,61.387500 328.159998,61.387500 328.879997,61.387500 329.599997,61.387500 330.319996,61.387500 331.039995,61.387500 331.759995,61.387500 332.479994,61.387500 333.199993,61.387500 333.919992,61.387500 334.639992,61.387500 335.360008,61.387500 336.080008,61.387500 336.800007,61.387500 337.520006,61.387500 338.240005,61.387500 338.960005,61.387500 339.680004,61.387500 340.400003,61.387500 341.120003,61.387500 341.840002,61.387500 342.560001,61.387500 343.280001,61.387500 344.000000,61.387500 344.719999,61.387500 345.439999,61.387500 346.159998,61.387500 346.879997,61.387500 347.599997,61.387500 348.319996,61.387500 349.039995,61.387500 349.759995,61.387500 350.479994,61.387500 351.199993,61.387500 351.919992,61.387500 352.639992,61.387500 353.360008,61.387500 354.080008,61.387500 354.800007,61.387500 355.520006,61.387500 356.240005,61.387500 356.960005,61.387500 357.680004,61.387500 358.400003,61.387500 359.120003,61.387500 359.840002,61.387500 360.560001,61.387500 361.280001,61.387500 362.000000,61.387500 362.000000,129.204167 362.719999,129.204167 363.439999,129.204167 364.159998,129.204167 364.879997,129.204167 365.599997,129.204167 366.319996,129.204167 367.039995,129.204167 367.759995,129.204167 368.479994,129.204167 369.199993,129.204167 369.919992,129.204167 370.639992,129.204167 371.360008,129.204167 372.080008,129.204167 372.800007,129.204167 373.520006,129.204167 374.240005,129.204167 374.960005,129.204167 375.680004,129.204167 376.400003,129.204167 377.120003,129.204167 377.840002,129.204167 378.560001,129.204167 379.280001,129.204167 380.000000,129.204167 380.719999,129.204167 381.439999,129.204167 382.159998,129.204167 382.879997,129.204167 383.599997,129.204167 384.319996,129.204167 385.039995,129.204167 385.759995,129.204167 386.479994,129.204167 387.199993,129.204167 387.919992,129.204167 388.639992,129.204167 389.360008,129.204167 390.080008,129.204167 390.800007,129.204167 391.520006,129.204167 392.240005,129.204167 392.960005,129.204167 393.680004,129.204167 394.400003,129.204167 395.120003,129.204167 395.840002,129.204167 396.560001,129.204167 397.280001,129.204167 398.000000,129.204167 398.000000,61.387500 398.720016,61.387500 399.439999,61.387500 400.160015,61.387500 400.879997,61.387500 401.600014,61.387500 402.319996,61.387500 403.040012,61.387500 403.759995,61.387500 404.480011,61.387500 405.199993,61.387500 405.920010,61.387500 406.639992,61.387500 407.360008,61.387500 408.079990,61.387500 408.800007,61.387500 409.519989,61.387500 410.240005,61.387500 410.959988,61.387500 411.680004,61.387500 412.399986,61.387500 413.120003,61.387500 413.839985,61.387500 414.560001,61.387500 415.279984,61.387500 416.000000,61.387500 416.720016,61.387500 417.439999,61.387500 418.160015,61.387500 418.879997,61.387500 419.600014,61.387500 420.319996,61.387500 421.040012,61.387500 421.759995,61.387500 422.480011,61.387500 423.199993,61.387500 423.920010,61.387500 424.639992,61.387500 425.360008,61.387500 426.079990,61.387500 426.800007,61.387500 427.519989,61.387500 428.240005,61.387500 428.959988,61.387500 429.680004,61.387500 430.399986,61.387500 431.120003,61.387500 431.839985,61.387500 432.560001,61.387500 433.279984,61.387500 434.000000,61.387500 434.000000,129.204167 434.720016,129.204167 435.439999,129.204167 436.160015,129.204167 436.879997,129.204167 437.600014,129.204167 438.319996,129.204167 439.040012,129.204167 439.759995,129.204167 440.480011,129.204167 441.199993,129.204167 441.920010,129.204167 442.639992,129.204167 443.360008,129.204167 444.079990,129.204167 444.800007,129.204167 445.519989,129.204167 446.240005,129.204167 446.959988,129.204167 447.680004,129.204167 448.399986,129.204167 449.120003,129.204167 449.839985,129.204167 450.560001,129.204167 451.279984,129.204167 452.000000,129.204167 452.720016,129.204167 453.439999,129.204167 454.160015,129.204167 454.879997,129.204167 455.600014,129.204167 456.319996,129.204167 457.040012,129.204167 457.759995,129.204167 458.480011,129.204167 459.199993,129.204167 459.920010,129.204167 460.639992,129.204167 461.360008,129.204167 462.079990,129.204167 462.800007,129.204167 463.519989,129.204167 464.240005,129.204167 464.959988,129.204167 465.680004,129.204167 466.399986,129.204167 467.120003,129.204167 467.839985,129.204167 468.560001,129.204167 469.279984,129.204167 470.000000,129.204167 470.000000,61.387500"
+     id="polyline2737"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-8)"
+     points="110.000000,156.591667 110.720000,156.591667 111.440000,156.591667 112.160000,156.591667 112.880000,156.591667 113.600000,156.591667 114.320000,156.591667 115.040000,156.591667 115.760000,156.591667 116.480000,156.591667 117.200000,156.591667 117.920000,156.591667 118.640000,156.591667 119.360000,156.591667 120.080000,156.591667 120.800000,156.591667 121.520000,156.591667 122.240000,156.591667 122.960001,156.591667 123.680000,156.591667 124.400000,156.591667 125.120000,156.591667 125.840000,156.591667 126.560000,156.591667 127.280000,156.591667 128.000000,156.591667 128.719999,156.591667 129.440001,156.591667 130.160000,156.591667 130.879999,156.591667 131.600001,156.591667 132.320000,156.591667 133.039999,156.591667 133.760001,156.591667 134.480000,156.591667 135.200000,156.591667 135.920001,156.591667 136.640000,156.591667 137.360000,156.591667 138.079999,156.591667 138.800000,156.591667 139.520000,156.591667 140.239999,156.591667 140.960001,156.591667 141.680000,156.591667 142.399999,156.591667 143.120001,156.591667 143.840000,156.591667 144.559999,156.591667 145.280001,156.591667 146.000000,156.591667 146.000000,156.591667 146.000000,156.591667 146.719999,156.591667 147.439999,156.591667 148.159998,156.591667 148.880002,156.591667 149.600001,156.591667 150.320000,156.591667 151.039999,156.591667 151.759999,156.591667 152.479998,156.591667 153.200002,156.591667 153.920001,156.591667 154.640000,156.591667 155.360000,156.591667 156.079999,156.591667 156.799998,156.591667 157.520002,156.591667 158.240001,156.591667 158.960001,156.591667 159.680000,156.591667 160.399999,156.591667 161.119998,156.591667 161.840002,156.591667 162.560001,156.591667 163.280001,156.591667 164.000000,156.591667 164.719999,156.591667 165.439999,156.591667 166.159998,156.591667 166.880002,156.591667 167.600001,156.591667 168.320000,156.591667 169.039999,156.591667 169.759999,156.591667 170.479998,156.591667 171.200002,156.591667 171.920001,156.591667 172.640000,156.591667 173.360000,156.591667 174.079999,156.591667 174.799998,156.591667 175.520002,156.591667 176.240001,156.591667 176.960001,156.591667 177.680000,156.591667 178.399999,156.591667 179.119998,156.591667 179.840002,156.591667 180.560001,156.591667 181.280001,156.591667 182.000000,156.591667 182.000000,156.591667 182.000000,156.591667 182.719999,156.591667 183.439999,156.591667 184.159998,156.591667 184.879997,156.591667 185.599997,156.591667 186.319996,156.591667 187.040004,156.591667 187.760003,156.591667 188.480002,156.591667 189.200002,156.591667 189.920001,156.591667 190.640000,156.591667 191.360000,156.591667 192.079999,156.591667 192.799998,156.591667 193.519998,156.591667 194.239997,156.591667 194.959996,156.591667 195.680004,156.591667 196.400003,156.591667 197.120003,156.591667 197.840002,156.591667 198.560001,156.591667 199.280001,156.591667 200.000000,156.591667 200.719999,156.591667 201.439999,156.591667 202.159998,156.591667 202.879997,156.591667 203.599997,156.591667 204.319996,156.591667 205.040004,156.591667 205.760003,156.591667 206.480002,156.591667 207.200002,156.591667 207.920001,156.591667 208.640000,156.591667 209.360000,156.591667 210.079999,156.591667 210.799998,156.591667 211.519998,156.591667 212.239997,156.591667 212.959996,156.591667 213.680004,156.591667 214.400003,156.591667 215.120003,156.591667 215.840002,156.591667 216.560001,156.591667 217.280001,156.591667 218.000000,156.591667 218.000000,156.591667 218.000000,156.591667 218.719999,156.591667 219.439999,156.591667 220.159998,156.591667 220.879997,156.591667 221.599997,156.591667 222.319996,156.591667 223.040004,156.591667 223.760003,156.591667 224.480002,156.591667 225.200002,156.591667 225.920001,156.591667 226.640000,156.591667 227.360000,156.591667 228.079999,156.591667 228.799998,156.591667 229.519998,156.591667 230.239997,156.591667 230.959996,156.591667 231.680004,156.591667 232.400003,156.591667 233.120003,156.591667 233.840002,156.591667 234.560001,156.591667 235.280001,156.591667 236.000000,156.591667 236.719999,156.591667 237.439999,156.591667 238.159998,156.591667 238.879997,156.591667 239.599997,156.591667 240.319996,156.591667 241.040004,156.591667 241.760003,156.591667 242.480002,156.591667 243.200002,156.591667 243.920001,156.591667 244.640000,156.591667 245.360000,156.591667 246.079999,156.591667 246.799998,156.591667 247.519998,156.591667 248.239997,156.591667 248.959996,156.591667 249.680004,156.591667 250.400003,156.591667 251.120003,156.591667 251.840002,156.591667 252.560001,156.591667 253.280001,156.591667 254.000000,156.591667 254.000000,156.591667 254.000000,156.591667 254.719999,156.591667 255.439999,156.591667 256.159998,156.591667 256.879997,156.591667 257.599997,156.591667 258.319996,156.591667 259.039995,156.591667 259.759995,156.591667 260.479994,156.591667 261.199993,156.591667 261.919992,156.591667 262.639992,156.591667 263.360008,156.591667 264.080008,156.591667 264.800007,156.591667 265.520006,156.591667 266.240005,156.591667 266.960005,156.591667 267.680004,156.591667 268.400003,156.591667 269.120003,156.591667 269.840002,156.591667 270.560001,156.591667 271.280001,156.591667 272.000000,156.591667 272.719999,156.591667 273.439999,156.591667 274.159998,156.591667 274.879997,156.591667 275.599997,156.591667 276.319996,156.591667 277.039995,156.591667 277.759995,156.591667 278.479994,156.591667 279.199993,156.591667 279.919992,156.591667 280.639992,156.591667 281.360008,156.591667 282.080008,156.591667 282.800007,156.591667 283.520006,156.591667 284.240005,156.591667 284.960005,156.591667 285.680004,156.591667 286.400003,156.591667 287.120003,156.591667 287.840002,156.591667 288.560001,156.591667 289.280001,156.591667 290.000000,156.591667 290.000000,156.591667 290.719999,156.591667 291.439999,156.591667 292.159998,156.591667 292.879997,156.591667 293.599997,156.591667 294.319996,156.591667 295.039995,156.591667 295.759995,156.591667 296.479994,156.591667 297.199993,156.591667 297.919992,156.591667 298.639992,156.591667 299.360008,156.591667 300.080008,156.591667 300.800007,156.591667 301.520006,156.591667 302.240005,156.591667 302.960005,156.591667 303.680004,156.591667 304.400003,156.591667 305.120003,156.591667 305.840002,156.591667 306.560001,156.591667 307.280001,156.591667 308.000000,156.591667 308.719999,156.591667 309.439999,156.591667 310.159998,156.591667 310.879997,156.591667 311.599997,156.591667 312.319996,156.591667 313.039995,156.591667 313.759995,156.591667 314.479994,156.591667 315.199993,156.591667 315.919992,156.591667 316.639992,156.591667 317.360008,156.591667 318.080008,156.591667 318.800007,156.591667 319.520006,156.591667 320.240005,156.591667 320.960005,156.591667 321.680004,156.591667 322.400003,156.591667 323.120003,156.591667 323.840002,156.591667 324.560001,156.591667 325.280001,156.591667 326.000000,156.591667 326.000000,156.591667 326.719999,156.591667 327.439999,156.591667 328.159998,156.591667 328.879997,156.591667 329.599997,156.591667 330.319996,156.591667 331.039995,156.591667 331.759995,156.591667 332.479994,156.591667 333.199993,156.591667 333.919992,156.591667 334.639992,156.591667 335.360008,156.591667 336.080008,156.591667 336.800007,156.591667 337.520006,156.591667 338.240005,156.591667 338.960005,156.591667 339.680004,156.591667 340.400003,156.591667 341.120003,156.591667 341.840002,156.591667 342.560001,156.591667 343.280001,156.591667 344.000000,156.591667 344.719999,156.591667 345.439999,156.591667 346.159998,156.591667 346.879997,156.591667 347.599997,156.591667 348.319996,156.591667 349.039995,156.591667 349.759995,156.591667 350.479994,156.591667 351.199993,156.591667 351.919992,156.591667 352.639992,156.591667 353.360008,156.591667 354.080008,156.591667 354.800007,156.591667 355.520006,156.591667 356.240005,156.591667 356.960005,156.591667 357.680004,156.591667 358.400003,156.591667 359.120003,156.591667 359.840002,156.591667 360.560001,156.591667 361.280001,156.591667 362.000000,156.591667 362.000000,156.591667 362.719999,156.591667 363.439999,156.591667 364.159998,156.591667 364.879997,156.591667 365.599997,156.591667 366.319996,156.591667 367.039995,156.591667 367.759995,156.591667 368.479994,156.591667 369.199993,156.591667 369.919992,156.591667 370.639992,156.591667 371.360008,156.591667 372.080008,156.591667 372.800007,156.591667 373.520006,156.591667 374.240005,156.591667 374.960005,156.591667 375.680004,156.591667 376.400003,156.591667 377.120003,156.591667 377.840002,156.591667 378.560001,156.591667 379.280001,156.591667 380.000000,156.591667 380.719999,156.591667 381.439999,156.591667 382.159998,156.591667 382.879997,156.591667 383.599997,156.591667 384.319996,156.591667 385.039995,156.591667 385.759995,156.591667 386.479994,156.591667 387.199993,156.591667 387.919992,156.591667 388.639992,156.591667 389.360008,156.591667 390.080008,156.591667 390.800007,156.591667 391.520006,156.591667 392.240005,156.591667 392.960005,156.591667 393.680004,156.591667 394.400003,156.591667 395.120003,156.591667 395.840002,156.591667 396.560001,156.591667 397.280001,156.591667 398.000000,156.591667 398.000000,156.591667 398.720016,156.591667 399.439999,156.591667 400.160015,156.591667 400.879997,156.591667 401.600014,156.591667 402.319996,156.591667 403.040012,156.591667 403.759995,156.591667 404.480011,156.591667 405.199993,156.591667 405.920010,156.591667 406.639992,156.591667 407.360008,156.591667 408.079990,156.591667 408.800007,156.591667 409.519989,156.591667 410.240005,156.591667 410.959988,156.591667 411.680004,156.591667 412.399986,156.591667 413.120003,156.591667 413.839985,156.591667 414.560001,156.591667 415.279984,156.591667 416.000000,156.591667 416.720016,156.591667 417.439999,156.591667 418.160015,156.591667 418.879997,156.591667 419.600014,156.591667 420.319996,156.591667 421.040012,156.591667 421.759995,156.591667 422.480011,156.591667 423.199993,156.591667 423.920010,156.591667 424.639992,156.591667 425.360008,156.591667 426.079990,156.591667 426.800007,156.591667 427.519989,156.591667 428.240005,156.591667 428.959988,156.591667 429.680004,156.591667 430.399986,156.591667 431.120003,156.591667 431.839985,156.591667 432.560001,156.591667 433.279984,156.591667 434.000000,156.591667 434.000000,156.591667 434.720016,156.591667 435.439999,156.591667 436.160015,156.591667 436.879997,156.591667 437.600014,156.591667 438.319996,156.591667 439.040012,156.591667 439.759995,156.591667 440.480011,156.591667 441.199993,156.591667 441.920010,156.591667 442.639992,156.591667 443.360008,156.591667 444.079990,156.591667 444.800007,156.591667 445.519989,156.591667 446.240005,156.591667 446.959988,156.591667 447.680004,156.591667 448.399986,156.591667 449.120003,156.591667 449.839985,156.591667 450.560001,156.591667 451.279984,156.591667 452.000000,156.591667 452.720016,156.591667 453.439999,156.591667 454.160015,156.591667 454.879997,156.591667 455.600014,156.591667 456.319996,156.591667 457.040012,156.591667 457.759995,156.591667 458.480011,156.591667 459.199993,156.591667 459.920010,156.591667 460.639992,156.591667 461.360008,156.591667 462.079990,156.591667 462.800007,156.591667 463.519989,156.591667 464.240005,156.591667 464.959988,156.591667 465.680004,156.591667 466.399986,156.591667 467.120003,156.591667 467.839985,156.591667 468.560001,156.591667 469.279984,156.591667 470.000000,156.591667 470.000000,156.591667"
+     id="polyline2739"
+     transform="translate(490.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1-8)"
+     points="110.000000,319.612500 110.720000,319.612500 111.440000,319.612500 112.160000,319.612500 112.880000,319.612500 113.600000,319.612500 114.320000,319.612500 115.040000,319.612500 115.760000,319.612500 116.480000,319.612500 117.200000,319.612500 117.920000,319.612500 118.640000,319.612500 119.360000,319.612500 120.080000,319.612500 120.800000,319.612500 121.520000,319.612500 122.240000,319.612500 122.960001,319.612500 123.680000,319.612500 124.400000,319.612500 125.120000,319.612500 125.840000,319.612500 126.560000,319.612500 127.280000,319.612500 128.000000,319.612500 128.719999,319.612500 129.440001,319.612500 130.160000,319.612500 130.879999,319.612500 131.600001,319.612500 132.320000,319.612500 133.039999,319.612500 133.760001,319.612500 134.480000,319.612500 135.200000,319.612500 135.920001,319.612500 136.640000,319.612500 137.360000,319.612500 138.079999,319.612500 138.800000,319.612500 139.520000,319.612500 140.239999,319.612500 140.960001,319.612500 141.680000,319.612500 142.399999,319.612500 143.120001,319.612500 143.840000,319.612500 144.559999,319.612500 145.280001,319.612500 146.000000,319.612500 146.000000,319.612500 146.000000,319.612500 146.719999,319.612500 147.439999,319.612500 148.159998,319.612500 148.880002,319.612500 149.600001,319.612500 150.320000,319.612500 151.039999,319.612500 151.759999,319.612500 152.479998,319.612500 153.200002,319.612500 153.920001,319.612500 154.640000,319.612500 155.360000,319.612500 156.079999,319.612500 156.799998,319.612500 157.520002,319.612500 158.240001,319.612500 158.960001,319.612500 159.680000,319.612500 160.399999,319.612500 161.119998,319.612500 161.840002,319.612500 162.560001,319.612500 163.280001,319.612500 164.000000,319.612500 164.719999,319.612500 165.439999,319.612500 166.159998,319.612500 166.880002,319.612500 167.600001,319.612500 168.320000,319.612500 169.039999,319.612500 169.759999,319.612500 170.479998,319.612500 171.200002,319.612500 171.920001,319.612500 172.640000,319.612500 173.360000,319.612500 174.079999,319.612500 174.799998,319.612500 175.520002,319.612500 176.240001,319.612500 176.960001,319.612500 177.680000,319.612500 178.399999,319.612500 179.119998,319.612500 179.840002,319.612500 180.560001,319.612500 181.280001,319.612500 182.000000,319.612500 182.000000,319.612500 182.000000,319.612500 182.719999,319.612500 183.439999,319.612500 184.159998,319.612500 184.879997,319.612500 185.599997,319.612500 186.319996,319.612500 187.040004,319.612500 187.760003,319.612500 188.480002,319.612500 189.200002,319.612500 189.920001,319.612500 190.640000,319.612500 191.360000,319.612500 192.079999,319.612500 192.799998,319.612500 193.519998,319.612500 194.239997,319.612500 194.959996,319.612500 195.680004,319.612500 196.400003,319.612500 197.120003,319.612500 197.840002,319.612500 198.560001,319.612500 199.280001,319.612500 200.000000,319.612500 200.719999,319.612500 201.439999,319.612500 202.159998,319.612500 202.879997,319.612500 203.599997,319.612500 204.319996,319.612500 205.040004,319.612500 205.760003,319.612500 206.480002,319.612500 207.200002,319.612500 207.920001,319.612500 208.640000,319.612500 209.360000,319.612500 210.079999,319.612500 210.799998,319.612500 211.519998,319.612500 212.239997,319.612500 212.959996,319.612500 213.680004,319.612500 214.400003,319.612500 215.120003,319.612500 215.840002,319.612500 216.560001,319.612500 217.280001,319.612500 218.000000,319.612500 218.000000,319.612500 218.000000,319.612500 218.719999,319.612500 219.439999,319.612500 220.159998,319.612500 220.879997,319.612500 221.599997,319.612500 222.319996,319.612500 223.040004,319.612500 223.760003,319.612500 224.480002,319.612500 225.200002,319.612500 225.920001,319.612500 226.640000,319.612500 227.360000,319.612500 228.079999,319.612500 228.799998,319.612500 229.519998,319.612500 230.239997,319.612500 230.959996,319.612500 231.680004,319.612500 232.400003,319.612500 233.120003,319.612500 233.840002,319.612500 234.560001,319.612500 235.280001,319.612500 236.000000,319.612500 236.719999,319.612500 237.439999,319.612500 238.159998,319.612500 238.879997,319.612500 239.599997,319.612500 240.319996,319.612500 241.040004,319.612500 241.760003,319.612500 242.480002,319.612500 243.200002,319.612500 243.920001,319.612500 244.640000,319.612500 245.360000,319.612500 246.079999,319.612500 246.799998,319.612500 247.519998,319.612500 248.239997,319.612500 248.959996,319.612500 249.680004,319.612500 250.400003,319.612500 251.120003,319.612500 251.840002,319.612500 252.560001,319.612500 253.280001,319.612500 254.000000,319.612500 254.000000,319.612500 254.000000,319.612500 254.719999,319.612500 255.439999,319.612500 256.159998,319.612500 256.879997,319.612500 257.599997,319.612500 258.319996,319.612500 259.039995,319.612500 259.759995,319.612500 260.479994,319.612500 261.199993,319.612500 261.919992,319.612500 262.639992,319.612500 263.360008,319.612500 264.080008,319.612500 264.800007,319.612500 265.520006,319.612500 266.240005,319.612500 266.960005,319.612500 267.680004,319.612500 268.400003,319.612500 269.120003,319.612500 269.840002,319.612500 270.560001,319.612500 271.280001,319.612500 272.000000,319.612500 272.719999,319.612500 273.439999,319.612500 274.159998,319.612500 274.879997,319.612500 275.599997,319.612500 276.319996,319.612500 277.039995,319.612500 277.759995,319.612500 278.479994,319.612500 279.199993,319.612500 279.919992,319.612500 280.639992,319.612500 281.360008,319.612500 282.080008,319.612500 282.800007,319.612500 283.520006,319.612500 284.240005,319.612500 284.960005,319.612500 285.680004,319.612500 286.400003,319.612500 287.120003,319.612500 287.840002,319.612500 288.560001,319.612500 289.280001,319.612500 290.000000,319.612500 290.000000,319.612500 290.719999,319.612500 291.439999,319.612500 292.159998,319.612500 292.879997,319.612500 293.599997,319.612500 294.319996,319.612500 295.039995,319.612500 295.759995,319.612500 296.479994,319.612500 297.199993,319.612500 297.919992,319.612500 298.639992,319.612500 299.360008,319.612500 300.080008,319.612500 300.800007,319.612500 301.520006,319.612500 302.240005,319.612500 302.960005,319.612500 303.680004,319.612500 304.400003,319.612500 305.120003,319.612500 305.840002,319.612500 306.560001,319.612500 307.280001,319.612500 308.000000,319.612500 308.719999,319.612500 309.439999,319.612500 310.159998,319.612500 310.879997,319.612500 311.599997,319.612500 312.319996,319.612500 313.039995,319.612500 313.759995,319.612500 314.479994,319.612500 315.199993,319.612500 315.919992,319.612500 316.639992,319.612500 317.360008,319.612500 318.080008,319.612500 318.800007,319.612500 319.520006,319.612500 320.240005,319.612500 320.960005,319.612500 321.680004,319.612500 322.400003,319.612500 323.120003,319.612500 323.840002,319.612500 324.560001,319.612500 325.280001,319.612500 326.000000,319.612500 326.000000,319.612500 326.719999,319.612500 327.439999,319.612500 328.159998,319.612500 328.879997,319.612500 329.599997,319.612500 330.319996,319.612500 331.039995,319.612500 331.759995,319.612500 332.479994,319.612500 333.199993,319.612500 333.919992,319.612500 334.639992,319.612500 335.360008,319.612500 336.080008,319.612500 336.800007,319.612500 337.520006,319.612500 338.240005,319.612500 338.960005,319.612500 339.680004,319.612500 340.400003,319.612500 341.120003,319.612500 341.840002,319.612500 342.560001,319.612500 343.280001,319.612500 344.000000,319.612500 344.719999,319.612500 345.439999,319.612500 346.159998,319.612500 346.879997,319.612500 347.599997,319.612500 348.319996,319.612500 349.039995,319.612500 349.759995,319.612500 350.479994,319.612500 351.199993,319.612500 351.919992,319.612500 352.639992,319.612500 353.360008,319.612500 354.080008,319.612500 354.800007,319.612500 355.520006,319.612500 356.240005,319.612500 356.960005,319.612500 357.680004,319.612500 358.400003,319.612500 359.120003,319.612500 359.840002,319.612500 360.560001,319.612500 361.280001,319.612500 362.000000,319.612500 362.000000,319.612500 362.719999,319.612500 363.439999,319.612500 364.159998,319.612500 364.879997,319.612500 365.599997,319.612500 366.319996,319.612500 367.039995,319.612500 367.759995,319.612500 368.479994,319.612500 369.199993,319.612500 369.919992,319.612500 370.639992,319.612500 371.360008,319.612500 372.080008,319.612500 372.800007,319.612500 373.520006,319.612500 374.240005,319.612500 374.960005,319.612500 375.680004,319.612500 376.400003,319.612500 377.120003,319.612500 377.840002,319.612500 378.560001,319.612500 379.280001,319.612500 380.000000,319.612500 380.719999,319.612500 381.439999,319.612500 382.159998,319.612500 382.879997,319.612500 383.599997,319.612500 384.319996,319.612500 385.039995,319.612500 385.759995,319.612500 386.479994,319.612500 387.199993,319.612500 387.919992,319.612500 388.639992,319.612500 389.360008,319.612500 390.080008,319.612500 390.800007,319.612500 391.520006,319.612500 392.240005,319.612500 392.960005,319.612500 393.680004,319.612500 394.400003,319.612500 395.120003,319.612500 395.840002,319.612500 396.560001,319.612500 397.280001,319.612500 398.000000,319.612500 398.000000,319.612500 398.720016,319.612500 399.439999,319.612500 400.160015,319.612500 400.879997,319.612500 401.600014,319.612500 402.319996,319.612500 403.040012,319.612500 403.759995,319.612500 404.480011,319.612500 405.199993,319.612500 405.920010,319.612500 406.639992,319.612500 407.360008,319.612500 408.079990,319.612500 408.800007,319.612500 409.519989,319.612500 410.240005,319.612500 410.959988,319.612500 411.680004,319.612500 412.399986,319.612500 413.120003,319.612500 413.839985,319.612500 414.560001,319.612500 415.279984,319.612500 416.000000,319.612500 416.720016,319.612500 417.439999,319.612500 418.160015,319.612500 418.879997,319.612500 419.600014,319.612500 420.319996,319.612500 421.040012,319.612500 421.759995,319.612500 422.480011,319.612500 423.199993,319.612500 423.920010,319.612500 424.639992,319.612500 425.360008,319.612500 426.079990,319.612500 426.800007,319.612500 427.519989,319.612500 428.240005,319.612500 428.959988,319.612500 429.680004,319.612500 430.399986,319.612500 431.120003,319.612500 431.839985,319.612500 432.560001,319.612500 433.279984,319.612500 434.000000,319.612500 434.000000,319.612500 434.720016,319.612500 435.439999,319.612500 436.160015,319.612500 436.879997,319.612500 437.600014,319.612500 438.319996,319.612500 439.040012,319.612500 439.759995,319.612500 440.480011,319.612500 441.199993,319.612500 441.920010,319.612500 442.639992,319.612500 443.360008,319.612500 444.079990,319.612500 444.800007,319.612500 445.519989,319.612500 446.240005,319.612500 446.959988,319.612500 447.680004,319.612500 448.399986,319.612500 449.120003,319.612500 449.839985,319.612500 450.560001,319.612500 451.279984,319.612500 452.000000,319.612500 452.720016,319.612500 453.439999,319.612500 454.160015,319.612500 454.879997,319.612500 455.600014,319.612500 456.319996,319.612500 457.040012,319.612500 457.759995,319.612500 458.480011,319.612500 459.199993,319.612500 459.920010,319.612500 460.639992,319.612500 461.360008,319.612500 462.079990,319.612500 462.800007,319.612500 463.519989,319.612500 464.240005,319.612500 464.959988,319.612500 465.680004,319.612500 466.399986,319.612500 467.120003,319.612500 467.839985,319.612500 468.560001,319.612500 469.279984,319.612500 470.000000,319.612500 470.000000,319.612500"
+     id="polyline2741"
+     transform="translate(490.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="603.18048"
+     y="83.842712"
+     id="text2743">truCleTruIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="603.18048"
+     y="178.84277"
+     id="text2745">truCleTruIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="603.18048"
+     y="273.84277"
+     id="text2747">truCleTruIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline2749"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,433.000000 182.000000,746.000000"
+     id="polyline2751"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,433.000000 254.000000,746.000000"
+     id="polyline2753"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,433.000000 326.000000,746.000000"
+     id="polyline2755"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,433.000000 398.000000,746.000000"
+     id="polyline2757"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 470.000000,746.000000"
+     id="polyline2759"
+     transform="translate(490.1806,88.342803)" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="600.18042"
+     y="548.63873"
+     width="360"
+     height="68"
+     id="rect2761" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="600.18042"
+     y="643.84277"
+     width="360"
+     height="68"
+     id="rect2763" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="600.18042"
+     y="739.04688"
+     width="360"
+     height="68"
+     id="rect2765" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 470.000000,746.000000"
+     id="polyline2767"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,433.000000"
+     id="polyline2769"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 110.000000,433.000000"
+     id="polyline2771"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline2773"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,754.000000"
+     id="polyline2775"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,746.000000 182.000000,754.000000"
+     id="polyline2777"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,754.000000"
+     id="polyline2779"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,746.000000 326.000000,754.000000"
+     id="polyline2781"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,754.000000"
+     id="polyline2783"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,754.000000"
+     id="polyline2785"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,758.800000"
+     id="polyline2787"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="600.18042"
+     y="865.84277"
+     id="text2789">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,758.800000"
+     id="polyline2791"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="744.18042"
+     y="865.84277"
+     id="text2793">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,758.800000"
+     id="polyline2795"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="888.18048"
+     y="865.84277"
+     id="text2797">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,528.204167 110.000000,528.204167"
+     id="polyline2799"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18042"
+     y="616.54675"
+     id="text2801">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,460.387500 110.000000,460.387500"
+     id="polyline2803"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18042"
+     y="548.7298"
+     id="text2805">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,623.408333 110.000000,623.408333"
+     id="polyline2807"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18042"
+     y="711.75073"
+     id="text2809">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,555.591667 110.000000,555.591667"
+     id="polyline2811"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18042"
+     y="643.93481"
+     id="text2813">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,718.612500 110.000000,718.612500"
+     id="polyline2815"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18042"
+     y="806.95483"
+     id="text2817">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,650.795833 110.000000,650.795833"
+     id="polyline2819"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="584.18042"
+     y="739.13892"
+     id="text2821">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-6)"
+     points="110.000000,528.204167 110.720000,528.204167 111.440000,528.204167 112.160000,528.204167 112.880000,528.204167 113.600000,528.204167 114.320000,528.204167 115.040000,528.204167 115.760000,528.204167 116.480000,528.204167 117.200000,528.204167 117.920000,528.204167 118.640000,528.204167 119.360000,528.204167 120.080000,528.204167 120.800000,528.204167 121.520000,528.204167 122.240000,528.204167 122.960001,528.204167 123.680000,528.204167 124.400000,528.204167 125.120000,528.204167 125.840000,528.204167 126.560000,528.204167 127.280000,528.204167 128.000000,528.204167 128.719999,528.204167 129.440001,528.204167 130.160000,528.204167 130.879999,528.204167 131.600001,528.204167 132.320000,528.204167 133.039999,528.204167 133.760001,528.204167 134.480000,528.204167 135.200000,528.204167 135.920001,528.204167 136.640000,528.204167 137.360000,528.204167 138.079999,528.204167 138.800000,528.204167 139.520000,528.204167 140.239999,528.204167 140.960001,528.204167 141.680000,528.204167 142.399999,528.204167 143.120001,528.204167 143.840000,528.204167 144.559999,528.204167 145.280001,528.204167 146.000000,528.204167 146.000000,460.387500 146.000000,460.387500 146.719999,460.387500 147.439999,460.387500 148.159998,460.387500 148.880002,460.387500 149.600001,460.387500 150.320000,460.387500 151.039999,460.387500 151.759999,460.387500 152.479998,460.387500 153.200002,460.387500 153.920001,460.387500 154.640000,460.387500 155.360000,460.387500 156.079999,460.387500 156.799998,460.387500 157.520002,460.387500 158.240001,460.387500 158.960001,460.387500 159.680000,460.387500 160.399999,460.387500 161.119998,460.387500 161.840002,460.387500 162.560001,460.387500 163.280001,460.387500 164.000000,460.387500 164.719999,460.387500 165.439999,460.387500 166.159998,460.387500 166.880002,460.387500 167.600001,460.387500 168.320000,460.387500 169.039999,460.387500 169.759999,460.387500 170.479998,460.387500 171.200002,460.387500 171.920001,460.387500 172.640000,460.387500 173.360000,460.387500 174.079999,460.387500 174.799998,460.387500 175.520002,460.387500 176.240001,460.387500 176.960001,460.387500 177.680000,460.387500 178.399999,460.387500 179.119998,460.387500 179.840002,460.387500 180.560001,460.387500 181.280001,460.387500 182.000000,460.387500 182.000000,528.204167 182.000000,528.204167 182.719999,528.204167 183.439999,528.204167 184.159998,528.204167 184.879997,528.204167 185.599997,528.204167 186.319996,528.204167 187.040004,528.204167 187.760003,528.204167 188.480002,528.204167 189.200002,528.204167 189.920001,528.204167 190.640000,528.204167 191.360000,528.204167 192.079999,528.204167 192.799998,528.204167 193.519998,528.204167 194.239997,528.204167 194.959996,528.204167 195.680004,528.204167 196.400003,528.204167 197.120003,528.204167 197.840002,528.204167 198.560001,528.204167 199.280001,528.204167 200.000000,528.204167 200.719999,528.204167 201.439999,528.204167 202.159998,528.204167 202.879997,528.204167 203.599997,528.204167 204.319996,528.204167 205.040004,528.204167 205.760003,528.204167 206.480002,528.204167 207.200002,528.204167 207.920001,528.204167 208.640000,528.204167 209.360000,528.204167 210.079999,528.204167 210.799998,528.204167 211.519998,528.204167 212.239997,528.204167 212.959996,528.204167 213.680004,528.204167 214.400003,528.204167 215.120003,528.204167 215.840002,528.204167 216.560001,528.204167 217.280001,528.204167 218.000000,528.204167 218.000000,460.387500 218.000000,460.387500 218.719999,460.387500 219.439999,460.387500 220.159998,460.387500 220.879997,460.387500 221.599997,460.387500 222.319996,460.387500 223.040004,460.387500 223.760003,460.387500 224.480002,460.387500 225.200002,460.387500 225.920001,460.387500 226.640000,460.387500 227.360000,460.387500 228.079999,460.387500 228.799998,460.387500 229.519998,460.387500 230.239997,460.387500 230.959996,460.387500 231.680004,460.387500 232.400003,460.387500 233.120003,460.387500 233.840002,460.387500 234.560001,460.387500 235.280001,460.387500 236.000000,460.387500 236.719999,460.387500 237.439999,460.387500 238.159998,460.387500 238.879997,460.387500 239.599997,460.387500 240.319996,460.387500 241.040004,460.387500 241.760003,460.387500 242.480002,460.387500 243.200002,460.387500 243.920001,460.387500 244.640000,460.387500 245.360000,460.387500 246.079999,460.387500 246.799998,460.387500 247.519998,460.387500 248.239997,460.387500 248.959996,460.387500 249.680004,460.387500 250.400003,460.387500 251.120003,460.387500 251.840002,460.387500 252.560001,460.387500 253.280001,460.387500 254.000000,460.387500 254.000000,528.204167 254.000000,528.204167 254.719999,528.204167 255.439999,528.204167 256.159998,528.204167 256.879997,528.204167 257.599997,528.204167 258.319996,528.204167 259.039995,528.204167 259.759995,528.204167 260.479994,528.204167 261.199993,528.204167 261.919992,528.204167 262.639992,528.204167 263.360008,528.204167 264.080008,528.204167 264.800007,528.204167 265.520006,528.204167 266.240005,528.204167 266.960005,528.204167 267.680004,528.204167 268.400003,528.204167 269.120003,528.204167 269.840002,528.204167 270.560001,528.204167 271.280001,528.204167 272.000000,528.204167 272.719999,528.204167 273.439999,528.204167 274.159998,528.204167 274.879997,528.204167 275.599997,528.204167 276.319996,528.204167 277.039995,528.204167 277.759995,528.204167 278.479994,528.204167 279.199993,528.204167 279.919992,528.204167 280.639992,528.204167 281.360008,528.204167 282.080008,528.204167 282.800007,528.204167 283.520006,528.204167 284.240005,528.204167 284.960005,528.204167 285.680004,528.204167 286.400003,528.204167 287.120003,528.204167 287.840002,528.204167 288.560001,528.204167 289.280001,528.204167 290.000000,528.204167 290.000000,460.387500 290.719999,460.387500 291.439999,460.387500 292.159998,460.387500 292.879997,460.387500 293.599997,460.387500 294.319996,460.387500 295.039995,460.387500 295.759995,460.387500 296.479994,460.387500 297.199993,460.387500 297.919992,460.387500 298.639992,460.387500 299.360008,460.387500 300.080008,460.387500 300.800007,460.387500 301.520006,460.387500 302.240005,460.387500 302.960005,460.387500 303.680004,460.387500 304.400003,460.387500 305.120003,460.387500 305.840002,460.387500 306.560001,460.387500 307.280001,460.387500 308.000000,460.387500 308.719999,460.387500 309.439999,460.387500 310.159998,460.387500 310.879997,460.387500 311.599997,460.387500 312.319996,460.387500 313.039995,460.387500 313.759995,460.387500 314.479994,460.387500 315.199993,460.387500 315.919992,460.387500 316.639992,460.387500 317.360008,460.387500 318.080008,460.387500 318.800007,460.387500 319.520006,460.387500 320.240005,460.387500 320.960005,460.387500 321.680004,460.387500 322.400003,460.387500 323.120003,460.387500 323.840002,460.387500 324.560001,460.387500 325.280001,460.387500 326.000000,460.387500 326.000000,528.204167 326.719999,528.204167 327.439999,528.204167 328.159998,528.204167 328.879997,528.204167 329.599997,528.204167 330.319996,528.204167 331.039995,528.204167 331.759995,528.204167 332.479994,528.204167 333.199993,528.204167 333.919992,528.204167 334.639992,528.204167 335.360008,528.204167 336.080008,528.204167 336.800007,528.204167 337.520006,528.204167 338.240005,528.204167 338.960005,528.204167 339.680004,528.204167 340.400003,528.204167 341.120003,528.204167 341.840002,528.204167 342.560001,528.204167 343.280001,528.204167 344.000000,528.204167 344.719999,528.204167 345.439999,528.204167 346.159998,528.204167 346.879997,528.204167 347.599997,528.204167 348.319996,528.204167 349.039995,528.204167 349.759995,528.204167 350.479994,528.204167 351.199993,528.204167 351.919992,528.204167 352.639992,528.204167 353.360008,528.204167 354.080008,528.204167 354.800007,528.204167 355.520006,528.204167 356.240005,528.204167 356.960005,528.204167 357.680004,528.204167 358.400003,528.204167 359.120003,528.204167 359.840002,528.204167 360.560001,528.204167 361.280001,528.204167 362.000000,528.204167 362.000000,460.387500 362.719999,460.387500 363.439999,460.387500 364.159998,460.387500 364.879997,460.387500 365.599997,460.387500 366.319996,460.387500 367.039995,460.387500 367.759995,460.387500 368.479994,460.387500 369.199993,460.387500 369.919992,460.387500 370.639992,460.387500 371.360008,460.387500 372.080008,460.387500 372.800007,460.387500 373.520006,460.387500 374.240005,460.387500 374.960005,460.387500 375.680004,460.387500 376.400003,460.387500 377.120003,460.387500 377.840002,460.387500 378.560001,460.387500 379.280001,460.387500 380.000000,460.387500 380.719999,460.387500 381.439999,460.387500 382.159998,460.387500 382.879997,460.387500 383.599997,460.387500 384.319996,460.387500 385.039995,460.387500 385.759995,460.387500 386.479994,460.387500 387.199993,460.387500 387.919992,460.387500 388.639992,460.387500 389.360008,460.387500 390.080008,460.387500 390.800007,460.387500 391.520006,460.387500 392.240005,460.387500 392.960005,460.387500 393.680004,460.387500 394.400003,460.387500 395.120003,460.387500 395.840002,460.387500 396.560001,460.387500 397.280001,460.387500 398.000000,460.387500 398.000000,528.204167 398.720016,528.204167 399.439999,528.204167 400.160015,528.204167 400.879997,528.204167 401.600014,528.204167 402.319996,528.204167 403.040012,528.204167 403.759995,528.204167 404.480011,528.204167 405.199993,528.204167 405.920010,528.204167 406.639992,528.204167 407.360008,528.204167 408.079990,528.204167 408.800007,528.204167 409.519989,528.204167 410.240005,528.204167 410.959988,528.204167 411.680004,528.204167 412.399986,528.204167 413.120003,528.204167 413.839985,528.204167 414.560001,528.204167 415.279984,528.204167 416.000000,528.204167 416.720016,528.204167 417.439999,528.204167 418.160015,528.204167 418.879997,528.204167 419.600014,528.204167 420.319996,528.204167 421.040012,528.204167 421.759995,528.204167 422.480011,528.204167 423.199993,528.204167 423.920010,528.204167 424.639992,528.204167 425.360008,528.204167 426.079990,528.204167 426.800007,528.204167 427.519989,528.204167 428.240005,528.204167 428.959988,528.204167 429.680004,528.204167 430.399986,528.204167 431.120003,528.204167 431.839985,528.204167 432.560001,528.204167 433.279984,528.204167 434.000000,528.204167 434.000000,460.387500 434.720016,460.387500 435.439999,460.387500 436.160015,460.387500 436.879997,460.387500 437.600014,460.387500 438.319996,460.387500 439.040012,460.387500 439.759995,460.387500 440.480011,460.387500 441.199993,460.387500 441.920010,460.387500 442.639992,460.387500 443.360008,460.387500 444.079990,460.387500 444.800007,460.387500 445.519989,460.387500 446.240005,460.387500 446.959988,460.387500 447.680004,460.387500 448.399986,460.387500 449.120003,460.387500 449.839985,460.387500 450.560001,460.387500 451.279984,460.387500 452.000000,460.387500 452.720016,460.387500 453.439999,460.387500 454.160015,460.387500 454.879997,460.387500 455.600014,460.387500 456.319996,460.387500 457.040012,460.387500 457.759995,460.387500 458.480011,460.387500 459.199993,460.387500 459.920010,460.387500 460.639992,460.387500 461.360008,460.387500 462.079990,460.387500 462.800007,460.387500 463.519989,460.387500 464.240005,460.387500 464.959988,460.387500 465.680004,460.387500 466.399986,460.387500 467.120003,460.387500 467.839985,460.387500 468.560001,460.387500 469.279984,460.387500 470.000000,460.387500 470.000000,528.204167"
+     id="polyline2826"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-6)"
+     points="110.000000,555.591667 110.720000,555.591667 111.440000,555.591667 112.160000,555.591667 112.880000,555.591667 113.600000,555.591667 114.320000,555.591667 115.040000,555.591667 115.760000,555.591667 116.480000,555.591667 117.200000,555.591667 117.920000,555.591667 118.640000,555.591667 119.360000,555.591667 120.080000,555.591667 120.800000,555.591667 121.520000,555.591667 122.240000,555.591667 122.960001,555.591667 123.680000,555.591667 124.400000,555.591667 125.120000,555.591667 125.840000,555.591667 126.560000,555.591667 127.280000,555.591667 128.000000,555.591667 128.719999,555.591667 129.440001,555.591667 130.160000,555.591667 130.879999,555.591667 131.600001,555.591667 132.320000,555.591667 133.039999,555.591667 133.760001,555.591667 134.480000,555.591667 135.200000,555.591667 135.920001,555.591667 136.640000,555.591667 137.360000,555.591667 138.079999,555.591667 138.800000,555.591667 139.520000,555.591667 140.239999,555.591667 140.960001,555.591667 141.680000,555.591667 142.399999,555.591667 143.120001,555.591667 143.840000,555.591667 144.559999,555.591667 145.280001,555.591667 146.000000,555.591667 146.000000,555.591667 146.000000,555.591667 146.719999,555.591667 147.439999,555.591667 148.159998,555.591667 148.880002,555.591667 149.600001,555.591667 150.320000,555.591667 151.039999,555.591667 151.759999,555.591667 152.479998,555.591667 153.200002,555.591667 153.920001,555.591667 154.640000,555.591667 155.360000,555.591667 156.079999,555.591667 156.799998,555.591667 157.520002,555.591667 158.240001,555.591667 158.960001,555.591667 159.680000,555.591667 160.399999,555.591667 161.119998,555.591667 161.840002,555.591667 162.560001,555.591667 163.280001,555.591667 164.000000,555.591667 164.719999,555.591667 165.439999,555.591667 166.159998,555.591667 166.880002,555.591667 167.600001,555.591667 168.320000,555.591667 169.039999,555.591667 169.759999,555.591667 170.479998,555.591667 171.200002,555.591667 171.920001,555.591667 172.640000,555.591667 173.360000,555.591667 174.079999,555.591667 174.799998,555.591667 175.520002,555.591667 176.240001,555.591667 176.960001,555.591667 177.680000,555.591667 178.399999,555.591667 179.119998,555.591667 179.840002,555.591667 180.560001,555.591667 181.280001,555.591667 182.000000,555.591667 182.000000,555.591667 182.000000,555.591667 182.719999,555.591667 183.439999,555.591667 184.159998,555.591667 184.879997,555.591667 185.599997,555.591667 186.319996,555.591667 187.040004,555.591667 187.760003,555.591667 188.480002,555.591667 189.200002,555.591667 189.920001,555.591667 190.640000,555.591667 191.360000,555.591667 192.079999,555.591667 192.799998,555.591667 193.519998,555.591667 194.239997,555.591667 194.959996,555.591667 195.680004,555.591667 196.400003,555.591667 197.120003,555.591667 197.840002,555.591667 198.560001,555.591667 199.280001,555.591667 200.000000,555.591667 200.719999,555.591667 201.439999,555.591667 202.159998,555.591667 202.879997,555.591667 203.599997,555.591667 204.319996,555.591667 205.040004,555.591667 205.760003,555.591667 206.480002,555.591667 207.200002,555.591667 207.920001,555.591667 208.640000,555.591667 209.360000,555.591667 210.079999,555.591667 210.799998,555.591667 211.519998,555.591667 212.239997,555.591667 212.959996,555.591667 213.680004,555.591667 214.400003,555.591667 215.120003,555.591667 215.840002,555.591667 216.560001,555.591667 217.280001,555.591667 218.000000,555.591667 218.000000,555.591667 218.000000,555.591667 218.719999,555.591667 219.439999,555.591667 220.159998,555.591667 220.879997,555.591667 221.599997,555.591667 222.319996,555.591667 223.040004,555.591667 223.760003,555.591667 224.480002,555.591667 225.200002,555.591667 225.920001,555.591667 226.640000,555.591667 227.360000,555.591667 228.079999,555.591667 228.799998,555.591667 229.519998,555.591667 230.239997,555.591667 230.959996,555.591667 231.680004,555.591667 232.400003,555.591667 233.120003,555.591667 233.840002,555.591667 234.560001,555.591667 235.280001,555.591667 236.000000,555.591667 236.719999,555.591667 237.439999,555.591667 238.159998,555.591667 238.879997,555.591667 239.599997,555.591667 240.319996,555.591667 241.040004,555.591667 241.760003,555.591667 242.480002,555.591667 243.200002,555.591667 243.920001,555.591667 244.640000,555.591667 245.360000,555.591667 246.079999,555.591667 246.799998,555.591667 247.519998,555.591667 248.239997,555.591667 248.959996,555.591667 249.680004,555.591667 250.400003,555.591667 251.120003,555.591667 251.840002,555.591667 252.560001,555.591667 253.280001,555.591667 254.000000,555.591667 254.000000,555.591667 254.000000,555.591667 254.719999,555.591667 255.439999,555.591667 256.159998,555.591667 256.879997,555.591667 257.599997,555.591667 258.319996,555.591667 259.039995,555.591667 259.759995,555.591667 260.479994,555.591667 261.199993,555.591667 261.919992,555.591667 262.639992,555.591667 263.360008,555.591667 264.080008,555.591667 264.800007,555.591667 265.520006,555.591667 266.240005,555.591667 266.960005,555.591667 267.680004,555.591667 268.400003,555.591667 269.120003,555.591667 269.840002,555.591667 270.560001,555.591667 271.280001,555.591667 272.000000,555.591667 272.719999,555.591667 273.439999,555.591667 274.159998,555.591667 274.879997,555.591667 275.599997,555.591667 276.319996,555.591667 277.039995,555.591667 277.759995,555.591667 278.479994,555.591667 279.199993,555.591667 279.919992,555.591667 280.639992,555.591667 281.360008,555.591667 282.080008,555.591667 282.800007,555.591667 283.520006,555.591667 284.240005,555.591667 284.960005,555.591667 285.680004,555.591667 286.400003,555.591667 287.120003,555.591667 287.840002,555.591667 288.560001,555.591667 289.280001,555.591667 290.000000,555.591667 290.000000,555.591667 290.719999,555.591667 291.439999,555.591667 292.159998,555.591667 292.879997,555.591667 293.599997,555.591667 294.319996,555.591667 295.039995,555.591667 295.759995,555.591667 296.479994,555.591667 297.199993,555.591667 297.919992,555.591667 298.639992,555.591667 299.360008,555.591667 300.080008,555.591667 300.800007,555.591667 301.520006,555.591667 302.240005,555.591667 302.960005,555.591667 303.680004,555.591667 304.400003,555.591667 305.120003,555.591667 305.840002,555.591667 306.560001,555.591667 307.280001,555.591667 308.000000,555.591667 308.719999,555.591667 309.439999,555.591667 310.159998,555.591667 310.879997,555.591667 311.599997,555.591667 312.319996,555.591667 313.039995,555.591667 313.759995,555.591667 314.479994,555.591667 315.199993,555.591667 315.919992,555.591667 316.639992,555.591667 317.360008,555.591667 318.080008,555.591667 318.800007,555.591667 319.520006,555.591667 320.240005,555.591667 320.960005,555.591667 321.680004,555.591667 322.400003,555.591667 323.120003,555.591667 323.840002,555.591667 324.560001,555.591667 325.280001,555.591667 326.000000,555.591667 326.000000,555.591667 326.719999,555.591667 327.439999,555.591667 328.159998,555.591667 328.879997,555.591667 329.599997,555.591667 330.319996,555.591667 331.039995,555.591667 331.759995,555.591667 332.479994,555.591667 333.199993,555.591667 333.919992,555.591667 334.639992,555.591667 335.360008,555.591667 336.080008,555.591667 336.800007,555.591667 337.520006,555.591667 338.240005,555.591667 338.960005,555.591667 339.680004,555.591667 340.400003,555.591667 341.120003,555.591667 341.840002,555.591667 342.560001,555.591667 343.280001,555.591667 344.000000,555.591667 344.719999,555.591667 345.439999,555.591667 346.159998,555.591667 346.879997,555.591667 347.599997,555.591667 348.319996,555.591667 349.039995,555.591667 349.759995,555.591667 350.479994,555.591667 351.199993,555.591667 351.919992,555.591667 352.639992,555.591667 353.360008,555.591667 354.080008,555.591667 354.800007,555.591667 355.520006,555.591667 356.240005,555.591667 356.960005,555.591667 357.680004,555.591667 358.400003,555.591667 359.120003,555.591667 359.840002,555.591667 360.560001,555.591667 361.280001,555.591667 362.000000,555.591667 362.000000,555.591667 362.719999,555.591667 363.439999,555.591667 364.159998,555.591667 364.879997,555.591667 365.599997,555.591667 366.319996,555.591667 367.039995,555.591667 367.759995,555.591667 368.479994,555.591667 369.199993,555.591667 369.919992,555.591667 370.639992,555.591667 371.360008,555.591667 372.080008,555.591667 372.800007,555.591667 373.520006,555.591667 374.240005,555.591667 374.960005,555.591667 375.680004,555.591667 376.400003,555.591667 377.120003,555.591667 377.840002,555.591667 378.560001,555.591667 379.280001,555.591667 380.000000,555.591667 380.719999,555.591667 381.439999,555.591667 382.159998,555.591667 382.879997,555.591667 383.599997,555.591667 384.319996,555.591667 385.039995,555.591667 385.759995,555.591667 386.479994,555.591667 387.199993,555.591667 387.919992,555.591667 388.639992,555.591667 389.360008,555.591667 390.080008,555.591667 390.800007,555.591667 391.520006,555.591667 392.240005,555.591667 392.960005,555.591667 393.680004,555.591667 394.400003,555.591667 395.120003,555.591667 395.840002,555.591667 396.560001,555.591667 397.280001,555.591667 398.000000,555.591667 398.000000,555.591667 398.720016,555.591667 399.439999,555.591667 400.160015,555.591667 400.879997,555.591667 401.600014,555.591667 402.319996,555.591667 403.040012,555.591667 403.759995,555.591667 404.480011,555.591667 405.199993,555.591667 405.920010,555.591667 406.639992,555.591667 407.360008,555.591667 408.079990,555.591667 408.800007,555.591667 409.519989,555.591667 410.240005,555.591667 410.959988,555.591667 411.680004,555.591667 412.399986,555.591667 413.120003,555.591667 413.839985,555.591667 414.560001,555.591667 415.279984,555.591667 416.000000,555.591667 416.720016,555.591667 417.439999,555.591667 418.160015,555.591667 418.879997,555.591667 419.600014,555.591667 420.319996,555.591667 421.040012,555.591667 421.759995,555.591667 422.480011,555.591667 423.199993,555.591667 423.920010,555.591667 424.639992,555.591667 425.360008,555.591667 426.079990,555.591667 426.800007,555.591667 427.519989,555.591667 428.240005,555.591667 428.959988,555.591667 429.680004,555.591667 430.399986,555.591667 431.120003,555.591667 431.839985,555.591667 432.560001,555.591667 433.279984,555.591667 434.000000,555.591667 434.000000,555.591667 434.720016,555.591667 435.439999,555.591667 436.160015,555.591667 436.879997,555.591667 437.600014,555.591667 438.319996,555.591667 439.040012,555.591667 439.759995,555.591667 440.480011,555.591667 441.199993,555.591667 441.920010,555.591667 442.639992,555.591667 443.360008,555.591667 444.079990,555.591667 444.800007,555.591667 445.519989,555.591667 446.240005,555.591667 446.959988,555.591667 447.680004,555.591667 448.399986,555.591667 449.120003,555.591667 449.839985,555.591667 450.560001,555.591667 451.279984,555.591667 452.000000,555.591667 452.720016,555.591667 453.439999,555.591667 454.160015,555.591667 454.879997,555.591667 455.600014,555.591667 456.319996,555.591667 457.040012,555.591667 457.759995,555.591667 458.480011,555.591667 459.199993,555.591667 459.920010,555.591667 460.639992,555.591667 461.360008,555.591667 462.079990,555.591667 462.800007,555.591667 463.519989,555.591667 464.240005,555.591667 464.959988,555.591667 465.680004,555.591667 466.399986,555.591667 467.120003,555.591667 467.839985,555.591667 468.560001,555.591667 469.279984,555.591667 470.000000,555.591667 470.000000,555.591667"
+     id="polyline2828"
+     transform="translate(490.1806,88.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-6)"
+     points="110.000000,718.612500 110.720000,718.612500 111.440000,718.612500 112.160000,718.612500 112.880000,718.612500 113.600000,718.612500 114.320000,718.612500 115.040000,718.612500 115.760000,718.612500 116.480000,718.612500 117.200000,718.612500 117.920000,718.612500 118.640000,718.612500 119.360000,718.612500 120.080000,718.612500 120.800000,718.612500 121.520000,718.612500 122.240000,718.612500 122.960001,718.612500 123.680000,718.612500 124.400000,718.612500 125.120000,718.612500 125.840000,718.612500 126.560000,718.612500 127.280000,718.612500 128.000000,718.612500 128.719999,718.612500 129.440001,718.612500 130.160000,718.612500 130.879999,718.612500 131.600001,718.612500 132.320000,718.612500 133.039999,718.612500 133.760001,718.612500 134.480000,718.612500 135.200000,718.612500 135.920001,718.612500 136.640000,718.612500 137.360000,718.612500 138.079999,718.612500 138.800000,718.612500 139.520000,718.612500 140.239999,718.612500 140.960001,718.612500 141.680000,718.612500 142.399999,718.612500 143.120001,718.612500 143.840000,718.612500 144.559999,718.612500 145.280001,718.612500 146.000000,718.612500 146.000000,718.612500 146.000000,718.612500 146.719999,718.612500 147.439999,718.612500 148.159998,718.612500 148.880002,718.612500 149.600001,718.612500 150.320000,718.612500 151.039999,718.612500 151.759999,718.612500 152.479998,718.612500 153.200002,718.612500 153.920001,718.612500 154.640000,718.612500 155.360000,718.612500 156.079999,718.612500 156.799998,718.612500 157.520002,718.612500 158.240001,718.612500 158.960001,718.612500 159.680000,718.612500 160.399999,718.612500 161.119998,718.612500 161.840002,718.612500 162.560001,718.612500 163.280001,718.612500 164.000000,718.612500 164.719999,718.612500 165.439999,718.612500 166.159998,718.612500 166.880002,718.612500 167.600001,718.612500 168.320000,718.612500 169.039999,718.612500 169.759999,718.612500 170.479998,718.612500 171.200002,718.612500 171.920001,718.612500 172.640000,718.612500 173.360000,718.612500 174.079999,718.612500 174.799998,718.612500 175.520002,718.612500 176.240001,718.612500 176.960001,718.612500 177.680000,718.612500 178.399999,718.612500 179.119998,718.612500 179.840002,718.612500 180.560001,718.612500 181.280001,718.612500 182.000000,718.612500 182.000000,718.612500 182.000000,718.612500 182.719999,718.612500 183.439999,718.612500 184.159998,718.612500 184.879997,718.612500 185.599997,718.612500 186.319996,718.612500 187.040004,718.612500 187.760003,718.612500 188.480002,718.612500 189.200002,718.612500 189.920001,718.612500 190.640000,718.612500 191.360000,718.612500 192.079999,718.612500 192.799998,718.612500 193.519998,718.612500 194.239997,718.612500 194.959996,718.612500 195.680004,718.612500 196.400003,718.612500 197.120003,718.612500 197.840002,718.612500 198.560001,718.612500 199.280001,718.612500 200.000000,718.612500 200.719999,718.612500 201.439999,718.612500 202.159998,718.612500 202.879997,718.612500 203.599997,718.612500 204.319996,718.612500 205.040004,718.612500 205.760003,718.612500 206.480002,718.612500 207.200002,718.612500 207.920001,718.612500 208.640000,718.612500 209.360000,718.612500 210.079999,718.612500 210.799998,718.612500 211.519998,718.612500 212.239997,718.612500 212.959996,718.612500 213.680004,718.612500 214.400003,718.612500 215.120003,718.612500 215.840002,718.612500 216.560001,718.612500 217.280001,718.612500 218.000000,718.612500 218.000000,718.612500 218.000000,718.612500 218.719999,718.612500 219.439999,718.612500 220.159998,718.612500 220.879997,718.612500 221.599997,718.612500 222.319996,718.612500 223.040004,718.612500 223.760003,718.612500 224.480002,718.612500 225.200002,718.612500 225.920001,718.612500 226.640000,718.612500 227.360000,718.612500 228.079999,718.612500 228.799998,718.612500 229.519998,718.612500 230.239997,718.612500 230.959996,718.612500 231.680004,718.612500 232.400003,718.612500 233.120003,718.612500 233.840002,718.612500 234.560001,718.612500 235.280001,718.612500 236.000000,718.612500 236.719999,718.612500 237.439999,718.612500 238.159998,718.612500 238.879997,718.612500 239.599997,718.612500 240.319996,718.612500 241.040004,718.612500 241.760003,718.612500 242.480002,718.612500 243.200002,718.612500 243.920001,718.612500 244.640000,718.612500 245.360000,718.612500 246.079999,718.612500 246.799998,718.612500 247.519998,718.612500 248.239997,718.612500 248.959996,718.612500 249.680004,718.612500 250.400003,718.612500 251.120003,718.612500 251.840002,718.612500 252.560001,718.612500 253.280001,718.612500 254.000000,718.612500 254.000000,718.612500 254.000000,718.612500 254.719999,718.612500 255.439999,718.612500 256.159998,718.612500 256.879997,718.612500 257.599997,718.612500 258.319996,718.612500 259.039995,718.612500 259.759995,718.612500 260.479994,718.612500 261.199993,718.612500 261.919992,718.612500 262.639992,718.612500 263.360008,718.612500 264.080008,718.612500 264.800007,718.612500 265.520006,718.612500 266.240005,718.612500 266.960005,718.612500 267.680004,718.612500 268.400003,718.612500 269.120003,718.612500 269.840002,718.612500 270.560001,718.612500 271.280001,718.612500 272.000000,718.612500 272.719999,718.612500 273.439999,718.612500 274.159998,718.612500 274.879997,718.612500 275.599997,718.612500 276.319996,718.612500 277.039995,718.612500 277.759995,718.612500 278.479994,718.612500 279.199993,718.612500 279.919992,718.612500 280.639992,718.612500 281.360008,718.612500 282.080008,718.612500 282.800007,718.612500 283.520006,718.612500 284.240005,718.612500 284.960005,718.612500 285.680004,718.612500 286.400003,718.612500 287.120003,718.612500 287.840002,718.612500 288.560001,718.612500 289.280001,718.612500 290.000000,718.612500 290.000000,718.612500 290.719999,718.612500 291.439999,718.612500 292.159998,718.612500 292.879997,718.612500 293.599997,718.612500 294.319996,718.612500 295.039995,718.612500 295.759995,718.612500 296.479994,718.612500 297.199993,718.612500 297.919992,718.612500 298.639992,718.612500 299.360008,718.612500 300.080008,718.612500 300.800007,718.612500 301.520006,718.612500 302.240005,718.612500 302.960005,718.612500 303.680004,718.612500 304.400003,718.612500 305.120003,718.612500 305.840002,718.612500 306.560001,718.612500 307.280001,718.612500 308.000000,718.612500 308.719999,718.612500 309.439999,718.612500 310.159998,718.612500 310.879997,718.612500 311.599997,718.612500 312.319996,718.612500 313.039995,718.612500 313.759995,718.612500 314.479994,718.612500 315.199993,718.612500 315.919992,718.612500 316.639992,718.612500 317.360008,718.612500 318.080008,718.612500 318.800007,718.612500 319.520006,718.612500 320.240005,718.612500 320.960005,718.612500 321.680004,718.612500 322.400003,718.612500 323.120003,718.612500 323.840002,718.612500 324.560001,718.612500 325.280001,718.612500 326.000000,718.612500 326.000000,718.612500 326.719999,718.612500 327.439999,718.612500 328.159998,718.612500 328.879997,718.612500 329.599997,718.612500 330.319996,718.612500 331.039995,718.612500 331.759995,718.612500 332.479994,718.612500 333.199993,718.612500 333.919992,718.612500 334.639992,718.612500 335.360008,718.612500 336.080008,718.612500 336.800007,718.612500 337.520006,718.612500 338.240005,718.612500 338.960005,718.612500 339.680004,718.612500 340.400003,718.612500 341.120003,718.612500 341.840002,718.612500 342.560001,718.612500 343.280001,718.612500 344.000000,718.612500 344.719999,718.612500 345.439999,718.612500 346.159998,718.612500 346.879997,718.612500 347.599997,718.612500 348.319996,718.612500 349.039995,718.612500 349.759995,718.612500 350.479994,718.612500 351.199993,718.612500 351.919992,718.612500 352.639992,718.612500 353.360008,718.612500 354.080008,718.612500 354.800007,718.612500 355.520006,718.612500 356.240005,718.612500 356.960005,718.612500 357.680004,718.612500 358.400003,718.612500 359.120003,718.612500 359.840002,718.612500 360.560001,718.612500 361.280001,718.612500 362.000000,718.612500 362.000000,718.612500 362.719999,718.612500 363.439999,718.612500 364.159998,718.612500 364.879997,718.612500 365.599997,718.612500 366.319996,718.612500 367.039995,718.612500 367.759995,718.612500 368.479994,718.612500 369.199993,718.612500 369.919992,718.612500 370.639992,718.612500 371.360008,718.612500 372.080008,718.612500 372.800007,718.612500 373.520006,718.612500 374.240005,718.612500 374.960005,718.612500 375.680004,718.612500 376.400003,718.612500 377.120003,718.612500 377.840002,718.612500 378.560001,718.612500 379.280001,718.612500 380.000000,718.612500 380.719999,718.612500 381.439999,718.612500 382.159998,718.612500 382.879997,718.612500 383.599997,718.612500 384.319996,718.612500 385.039995,718.612500 385.759995,718.612500 386.479994,718.612500 387.199993,718.612500 387.919992,718.612500 388.639992,718.612500 389.360008,718.612500 390.080008,718.612500 390.800007,718.612500 391.520006,718.612500 392.240005,718.612500 392.960005,718.612500 393.680004,718.612500 394.400003,718.612500 395.120003,718.612500 395.840002,718.612500 396.560001,718.612500 397.280001,718.612500 398.000000,718.612500 398.000000,718.612500 398.720016,718.612500 399.439999,718.612500 400.160015,718.612500 400.879997,718.612500 401.600014,718.612500 402.319996,718.612500 403.040012,718.612500 403.759995,718.612500 404.480011,718.612500 405.199993,718.612500 405.920010,718.612500 406.639992,718.612500 407.360008,718.612500 408.079990,718.612500 408.800007,718.612500 409.519989,718.612500 410.240005,718.612500 410.959988,718.612500 411.680004,718.612500 412.399986,718.612500 413.120003,718.612500 413.839985,718.612500 414.560001,718.612500 415.279984,718.612500 416.000000,718.612500 416.720016,718.612500 417.439999,718.612500 418.160015,718.612500 418.879997,718.612500 419.600014,718.612500 420.319996,718.612500 421.040012,718.612500 421.759995,718.612500 422.480011,718.612500 423.199993,718.612500 423.920010,718.612500 424.639992,718.612500 425.360008,718.612500 426.079990,718.612500 426.800007,718.612500 427.519989,718.612500 428.240005,718.612500 428.959988,718.612500 429.680004,718.612500 430.399986,718.612500 431.120003,718.612500 431.839985,718.612500 432.560001,718.612500 433.279984,718.612500 434.000000,718.612500 434.000000,718.612500 434.720016,718.612500 435.439999,718.612500 436.160015,718.612500 436.879997,718.612500 437.600014,718.612500 438.319996,718.612500 439.040012,718.612500 439.759995,718.612500 440.480011,718.612500 441.199993,718.612500 441.920010,718.612500 442.639992,718.612500 443.360008,718.612500 444.079990,718.612500 444.800007,718.612500 445.519989,718.612500 446.240005,718.612500 446.959988,718.612500 447.680004,718.612500 448.399986,718.612500 449.120003,718.612500 449.839985,718.612500 450.560001,718.612500 451.279984,718.612500 452.000000,718.612500 452.720016,718.612500 453.439999,718.612500 454.160015,718.612500 454.879997,718.612500 455.600014,718.612500 456.319996,718.612500 457.040012,718.612500 457.759995,718.612500 458.480011,718.612500 459.199993,718.612500 459.920010,718.612500 460.639992,718.612500 461.360008,718.612500 462.079990,718.612500 462.800007,718.612500 463.519989,718.612500 464.240005,718.612500 464.959988,718.612500 465.680004,718.612500 466.399986,718.612500 467.120003,718.612500 467.839985,718.612500 468.560001,718.612500 469.279984,718.612500 470.000000,718.612500 470.000000,718.612500"
+     id="polyline2830"
+     transform="translate(490.1806,88.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="603.18042"
+     y="531.84271"
+     id="text2832">truCleFalIni.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="603.18042"
+     y="626.84277"
+     id="text2834">truCleFalIni.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="603.18042"
+     y="721.84277"
+     id="text2836">truCleFalIni.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,34.000000 110.000000,347.000000"
+     id="polyline3739"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,34.000000 182.000000,347.000000"
+     id="polyline3741"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,34.000000 254.000000,347.000000"
+     id="polyline3743"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,34.000000 326.000000,347.000000"
+     id="polyline3745"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,34.000000 398.000000,347.000000"
+     id="polyline3747"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 470.000000,347.000000"
+     id="polyline3749"
+     transform="translate(1040.1806,39.342803)" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1150.1804"
+     y="100.63866"
+     width="360"
+     height="68"
+     id="rect3751" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1150.1804"
+     y="195.84276"
+     width="360"
+     height="68"
+     id="rect3753" />
+  <rect
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1150.1804"
+     y="291.04684"
+     width="360"
+     height="68"
+     id="rect3755" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 470.000000,347.000000"
+     id="polyline3757"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,34.000000"
+     id="polyline3759"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,34.000000 110.000000,34.000000"
+     id="polyline3761"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,34.000000 110.000000,347.000000"
+     id="polyline3763"
+     transform="translate(1040.1806,39.342803)" />
   <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 110.000000,355.000000"
+     id="polyline3765"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,347.000000 182.000000,355.000000"
+     id="polyline3767"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,355.000000"
+     id="polyline3769"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,347.000000 326.000000,355.000000"
+     id="polyline3771"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,355.000000"
+     id="polyline3773"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,347.000000 470.000000,355.000000"
+     id="polyline3775"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,347.000000 110.000000,359.800000"
+     id="polyline3777"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1150.1804"
+     y="417.84274"
+     id="text3779">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,347.000000 254.000000,359.800000"
+     id="polyline3781"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1294.1804"
+     y="417.84274"
+     id="text3783">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,347.000000 398.000000,359.800000"
+     id="polyline3785"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1438.1804"
+     y="417.84274"
+     id="text3787">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,129.204167 110.000000,129.204167"
+     id="polyline3789"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="168.54686"
+     id="text3791">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,61.387500 110.000000,61.387500"
+     id="polyline3793"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="100.73045"
+     id="text3795">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,224.408333 110.000000,224.408333"
+     id="polyline3797"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="263.75095"
+     id="text3799">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,156.591667 110.000000,156.591667"
+     id="polyline3801"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="195.9348"
+     id="text3803">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,319.612500 110.000000,319.612500"
+     id="polyline3805"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="358.95578"
+     id="text3807">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,251.795833 110.000000,251.795833"
+     id="polyline3809"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="291.13889"
+     id="text3811">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
      clip-path="url(#clipArea1-2)"
-     points="110.000000,61.387500 110.778000,61.387500 111.556000,61.387500 112.334000,61.387500 113.112000,61.387500 113.890000,61.387500 114.668000,61.387500 115.446000,61.387500 116.224000,61.387500 117.002000,61.387500 117.780000,61.387500 118.558000,61.387500 119.336000,61.387500 120.114000,61.387500 120.892000,61.387500 121.670000,61.387500 122.448000,61.387500 123.226000,61.387500 124.004001,61.387500 124.782000,61.387500 125.560000,61.387500 126.337999,61.387500 127.116000,61.387500 127.894000,61.387500 128.672000,61.387500 129.450000,61.387500 130.227999,61.387500 131.006001,61.387500 131.784000,61.387500 132.561999,61.387500 133.340001,61.387500 134.118000,61.387500 134.895999,61.387500 135.674001,61.387500 136.452000,61.387500 137.230000,61.387500 138.008001,61.387500 138.786000,61.387500 139.564000,61.387500 140.341999,61.387500 141.120000,61.387500 141.898000,61.387500 142.675999,61.387500 143.454001,61.387500 144.232000,61.387500 145.009999,61.387500 145.788001,61.387500 146.566000,61.387500 147.343999,61.387500 148.122001,61.387500 148.900000,61.387500 148.900000,129.204167 148.900000,129.204167 148.900000,129.204167 149.677999,129.204167 150.455999,129.204167 151.233998,129.204167 152.012002,129.204167 152.790001,129.204167 153.568000,129.204167 154.345999,129.204167 155.123999,129.204167 155.901998,129.204167 156.680002,129.204167 157.458001,129.204167 158.236000,129.204167 159.014000,129.204167 159.791999,129.204167 160.569998,129.204167 161.348002,129.204167 162.126001,129.204167 162.904001,129.204167 163.682000,129.204167 164.459999,129.204167 165.237998,129.204167 166.016002,129.204167 166.794001,129.204167 167.572001,129.204167 168.350000,129.204167 169.127999,129.204167 169.905999,129.204167 170.683998,129.204167 171.462002,129.204167 172.240001,129.204167 173.018000,129.204167 173.795999,129.204167 174.573999,129.204167 175.351998,129.204167 176.130002,129.204167 176.908001,129.204167 177.686000,129.204167 178.464000,129.204167 179.241999,129.204167 180.019998,129.204167 180.798002,129.204167 181.576001,129.204167 182.354001,129.204167 183.132000,129.204167 183.909999,129.204167 184.687998,129.204167 185.466002,129.204167 186.244001,129.204167 187.022001,129.204167 187.800000,129.204167 187.800000,61.387500 187.800000,61.387500 188.577999,61.387500 189.355999,61.387500 190.133998,61.387500 190.911997,61.387500 191.689996,61.387500 192.467996,61.387500 193.246004,61.387500 194.024003,61.387500 194.802003,61.387500 195.580002,61.387500 196.358001,61.387500 197.136000,61.387500 197.914000,61.387500 198.691999,61.387500 199.469998,61.387500 200.247997,61.387500 201.025997,61.387500 201.803996,61.387500 202.582004,61.387500 203.360004,61.387500 204.138003,61.387500 204.916002,61.387500 205.694001,61.387500 206.472001,61.387500 207.250000,61.387500 208.027999,61.387500 208.805999,61.387500 209.583998,61.387500 210.361997,61.387500 211.139996,61.387500 211.917996,61.387500 212.696004,61.387500 213.474003,61.387500 214.252003,61.387500 215.030002,61.387500 215.808001,61.387500 216.586000,61.387500 217.364000,61.387500 218.141999,61.387500 218.919998,61.387500 219.697997,61.387500 220.475997,61.387500 221.253996,61.387500 222.032004,61.387500 222.810004,61.387500 223.588003,61.387500 224.366002,61.387500 225.144001,61.387500 225.922001,61.387500 226.700000,61.387500 226.700000,129.204167 226.700000,129.204167 227.477999,129.204167 228.255999,129.204167 229.033998,129.204167 229.811997,129.204167 230.589996,129.204167 231.367996,129.204167 232.146004,129.204167 232.924003,129.204167 233.702003,129.204167 234.480002,129.204167 235.258001,129.204167 236.036000,129.204167 236.814000,129.204167 237.591999,129.204167 238.369998,129.204167 239.147997,129.204167 239.925997,129.204167 240.703996,129.204167 241.482004,129.204167 242.260004,129.204167 243.038003,129.204167 243.816002,129.204167 244.594001,129.204167 245.372001,129.204167 246.150000,129.204167 246.927999,129.204167 247.705999,129.204167 248.483998,129.204167 249.261997,129.204167 250.039996,129.204167 250.817996,129.204167 251.596004,129.204167 252.374003,129.204167 253.152003,129.204167 253.930002,129.204167 254.708001,129.204167 255.486000,129.204167 256.264000,129.204167 257.041999,129.204167 257.819998,129.204167 258.597997,129.204167 259.375997,129.204167 260.153996,129.204167 260.932004,129.204167 261.710004,129.204167 262.488003,129.204167 263.266002,129.204167 264.044001,129.204167 264.822001,129.204167 265.600000,129.204167 265.600000,61.387500 265.600000,61.387500 266.377999,61.387500 267.155999,61.387500 267.933998,61.387500 268.711997,61.387500 269.489996,61.387500 270.267996,61.387500 271.045995,61.387500 271.823994,61.387500 272.601993,61.387500 273.379993,61.387500 274.157992,61.387500 274.935991,61.387500 275.714009,61.387500 276.492008,61.387500 277.270007,61.387500 278.048007,61.387500 278.826006,61.387500 279.604005,61.387500 280.382004,61.387500 281.160004,61.387500 281.938003,61.387500 282.716002,61.387500 283.494001,61.387500 284.272001,61.387500 285.050000,61.387500 285.827999,61.387500 286.605999,61.387500 287.383998,61.387500 288.161997,61.387500 288.939996,61.387500 289.717996,61.387500 290.495995,61.387500 291.273994,61.387500 292.051993,61.387500 292.829993,61.387500 293.607992,61.387500 294.385991,61.387500 295.164009,61.387500 295.942008,61.387500 296.720007,61.387500 297.498007,61.387500 298.276006,61.387500 299.054005,61.387500 299.832004,61.387500 300.610004,61.387500 301.388003,61.387500 302.166002,61.387500 302.944001,61.387500 303.722001,61.387500 304.500000,61.387500 304.500000,129.204167 305.277999,129.204167 306.055999,129.204167 306.833998,129.204167 307.611997,129.204167 308.389996,129.204167 309.167996,129.204167 309.945995,129.204167 310.723994,129.204167 311.501993,129.204167 312.279993,129.204167 313.057992,129.204167 313.835991,129.204167 314.614009,129.204167 315.392008,129.204167 316.170007,129.204167 316.948007,129.204167 317.726006,129.204167 318.504005,129.204167 319.282004,129.204167 320.060004,129.204167 320.838003,129.204167 321.616002,129.204167 322.394001,129.204167 323.172001,129.204167 323.950000,129.204167 324.727999,129.204167 325.505999,129.204167 326.283998,129.204167 327.061997,129.204167 327.839996,129.204167 328.617996,129.204167 329.395995,129.204167 330.173994,129.204167 330.951993,129.204167 331.729993,129.204167 332.507992,129.204167 333.285991,129.204167 334.064009,129.204167 334.842008,129.204167 335.620007,129.204167 336.398007,129.204167 337.176006,129.204167 337.954005,129.204167 338.732004,129.204167 339.510004,129.204167 340.288003,129.204167 341.066002,129.204167 341.844001,129.204167 342.622001,129.204167 343.400000,129.204167 343.400000,61.387500 344.177999,61.387500 344.955999,61.387500 345.733998,61.387500 346.511997,61.387500 347.289996,61.387500 348.067996,61.387500 348.845995,61.387500 349.623994,61.387500 350.401993,61.387500 351.179993,61.387500 351.957992,61.387500 352.735991,61.387500 353.514009,61.387500 354.292008,61.387500 355.070007,61.387500 355.848007,61.387500 356.626006,61.387500 357.404005,61.387500 358.182004,61.387500 358.960004,61.387500 359.738003,61.387500 360.516002,61.387500 361.294001,61.387500 362.072001,61.387500 362.850000,61.387500 363.627999,61.387500 364.405999,61.387500 365.183998,61.387500 365.961997,61.387500 366.739996,61.387500 367.517996,61.387500 368.295995,61.387500 369.073994,61.387500 369.851993,61.387500 370.629993,61.387500 371.407992,61.387500 372.185991,61.387500 372.964009,61.387500 373.742008,61.387500 374.520007,61.387500 375.298007,61.387500 376.076006,61.387500 376.854005,61.387500 377.632004,61.387500 378.410004,61.387500 379.188003,61.387500 379.966002,61.387500 380.744001,61.387500 381.522001,61.387500 382.300000,61.387500 382.300000,129.204167 383.077999,129.204167 383.855999,129.204167 384.633998,129.204167 385.411997,129.204167 386.189996,129.204167 386.967996,129.204167 387.745995,129.204167 388.523994,129.204167 389.301993,129.204167 390.079993,129.204167 390.857992,129.204167 391.635991,129.204167 392.414009,129.204167 393.192008,129.204167 393.970007,129.204167 394.748007,129.204167 395.526006,129.204167 396.304005,129.204167 397.082004,129.204167 397.860004,129.204167 398.638003,129.204167 399.416002,129.204167 400.194001,129.204167 400.972001,129.204167 401.750000,129.204167 402.527999,129.204167 403.305999,129.204167 404.083998,129.204167 404.861997,129.204167 405.639996,129.204167 406.417996,129.204167 407.195995,129.204167 407.973994,129.204167 408.751993,129.204167 409.529993,129.204167 410.307992,129.204167 411.085991,129.204167 411.864009,129.204167 412.642008,129.204167 413.420007,129.204167 414.198007,129.204167 414.976006,129.204167 415.754005,129.204167 416.532004,129.204167 417.310004,129.204167 418.088003,129.204167 418.866002,129.204167 419.644001,129.204167 420.422001,129.204167 421.200000,129.204167 421.200000,61.387500 421.978018,61.387500 422.755999,61.387500 423.534016,61.387500 424.311997,61.387500 425.090015,61.387500 425.867996,61.387500 426.646013,61.387500 427.423994,61.387500 428.202012,61.387500 428.979993,61.387500 429.758010,61.387500 430.535991,61.387500 431.314009,61.387500 432.091990,61.387500 432.870007,61.387500 433.647988,61.387500 434.426006,61.387500 435.203987,61.387500 435.982004,61.387500 436.759985,61.387500 437.538003,61.387500 438.315984,61.387500 439.094001,61.387500 439.871982,61.387500 440.650000,61.387500 441.428018,61.387500 442.205999,61.387500 442.984016,61.387500 443.761997,61.387500 444.540015,61.387500 445.317996,61.387500 446.096013,61.387500 446.873994,61.387500 447.652012,61.387500 448.429993,61.387500 449.208010,61.387500 449.985991,61.387500 450.764009,61.387500 451.541990,61.387500 452.320007,61.387500 453.097988,61.387500 453.876006,61.387500 454.653987,61.387500 455.432004,61.387500 456.209985,61.387500 456.988003,61.387500 457.765984,61.387500 458.544001,61.387500 459.321982,61.387500 460.100000,61.387500 460.100000,129.204167 460.878018,129.204167 461.655999,129.204167 462.434016,129.204167 463.211997,129.204167 463.990015,129.204167 464.767996,129.204167 465.546013,129.204167 466.323994,129.204167 467.102012,129.204167 467.879993,129.204167 468.658010,129.204167 469.435991,129.204167 470.214009,129.204167 470.991990,129.204167 471.770007,129.204167 472.547988,129.204167 473.326006,129.204167 474.103987,129.204167 474.882004,129.204167 475.659985,129.204167 476.438003,129.204167 477.215984,129.204167 477.994001,129.204167 478.771982,129.204167 479.550000,129.204167 480.328018,129.204167 481.105999,129.204167 481.884016,129.204167 482.661997,129.204167 483.440015,129.204167 484.217996,129.204167 484.996013,129.204167 485.773994,129.204167 486.552012,129.204167 487.329993,129.204167 488.108010,129.204167 488.885991,129.204167 489.664009,129.204167 490.441990,129.204167 491.220007,129.204167 491.997988,129.204167 492.776006,129.204167 493.553987,129.204167 494.332004,129.204167 495.109985,129.204167 495.888003,129.204167 496.665984,129.204167 497.444001,129.204167 498.221982,129.204167 499.000000,129.204167 499.000000,61.387500"
-     id="polyline79-1" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
+     points="110.000000,61.387500 110.720000,61.387500 111.440000,61.387500 112.160000,61.387500 112.880000,61.387500 113.600000,61.387500 114.320000,61.387500 115.040000,61.387500 115.760000,61.387500 116.480000,61.387500 117.200000,61.387500 117.920000,61.387500 118.640000,61.387500 119.360000,61.387500 120.080000,61.387500 120.800000,61.387500 121.520000,61.387500 122.240000,61.387500 122.960001,61.387500 123.680000,61.387500 124.400000,61.387500 125.120000,61.387500 125.840000,61.387500 126.560000,61.387500 127.280000,61.387500 128.000000,61.387500 128.719999,61.387500 129.440001,61.387500 130.160000,61.387500 130.879999,61.387500 131.600001,61.387500 132.320000,61.387500 133.039999,61.387500 133.760001,61.387500 134.480000,61.387500 135.200000,61.387500 135.920001,61.387500 136.640000,61.387500 137.360000,61.387500 138.079999,61.387500 138.800000,61.387500 139.520000,61.387500 140.239999,61.387500 140.960001,61.387500 141.680000,61.387500 142.399999,61.387500 143.120001,61.387500 143.840000,61.387500 144.559999,61.387500 145.280001,61.387500 146.000000,61.387500 146.000000,129.204167 146.000000,129.204167 146.719999,129.204167 147.439999,129.204167 148.159998,129.204167 148.880002,129.204167 149.600001,129.204167 150.320000,129.204167 151.039999,129.204167 151.759999,129.204167 152.479998,129.204167 153.200002,129.204167 153.920001,129.204167 154.640000,129.204167 155.360000,129.204167 156.079999,129.204167 156.799998,129.204167 157.520002,129.204167 158.240001,129.204167 158.960001,129.204167 159.680000,129.204167 160.399999,129.204167 161.119998,129.204167 161.840002,129.204167 162.560001,129.204167 163.280001,129.204167 164.000000,129.204167 164.719999,129.204167 165.439999,129.204167 166.159998,129.204167 166.880002,129.204167 167.600001,129.204167 168.320000,129.204167 169.039999,129.204167 169.759999,129.204167 170.479998,129.204167 171.200002,129.204167 171.920001,129.204167 172.640000,129.204167 173.360000,129.204167 174.079999,129.204167 174.799998,129.204167 175.520002,129.204167 176.240001,129.204167 176.960001,129.204167 177.680000,129.204167 178.399999,129.204167 179.119998,129.204167 179.840002,129.204167 180.560001,129.204167 181.280001,129.204167 182.000000,129.204167 182.000000,61.387500 182.000000,61.387500 182.719999,61.387500 183.439999,61.387500 184.159998,61.387500 184.879997,61.387500 185.599997,61.387500 186.319996,61.387500 187.040004,61.387500 187.760003,61.387500 188.480002,61.387500 189.200002,61.387500 189.920001,61.387500 190.640000,61.387500 191.360000,61.387500 192.079999,61.387500 192.799998,61.387500 193.519998,61.387500 194.239997,61.387500 194.959996,61.387500 195.680004,61.387500 196.400003,61.387500 197.120003,61.387500 197.840002,61.387500 198.560001,61.387500 199.280001,61.387500 200.000000,61.387500 200.719999,61.387500 201.439999,61.387500 202.159998,61.387500 202.879997,61.387500 203.599997,61.387500 204.319996,61.387500 205.040004,61.387500 205.760003,61.387500 206.480002,61.387500 207.200002,61.387500 207.920001,61.387500 208.640000,61.387500 209.360000,61.387500 210.079999,61.387500 210.799998,61.387500 211.519998,61.387500 212.239997,61.387500 212.959996,61.387500 213.680004,61.387500 214.400003,61.387500 215.120003,61.387500 215.840002,61.387500 216.560001,61.387500 217.280001,61.387500 218.000000,61.387500 218.000000,129.204167 218.000000,129.204167 218.719999,129.204167 219.439999,129.204167 220.159998,129.204167 220.879997,129.204167 221.599997,129.204167 222.319996,129.204167 223.040004,129.204167 223.760003,129.204167 224.480002,129.204167 225.200002,129.204167 225.920001,129.204167 226.640000,129.204167 227.360000,129.204167 228.079999,129.204167 228.799998,129.204167 229.519998,129.204167 230.239997,129.204167 230.959996,129.204167 231.680004,129.204167 232.400003,129.204167 233.120003,129.204167 233.840002,129.204167 234.560001,129.204167 235.280001,129.204167 236.000000,129.204167 236.719999,129.204167 237.439999,129.204167 238.159998,129.204167 238.879997,129.204167 239.599997,129.204167 240.319996,129.204167 241.040004,129.204167 241.760003,129.204167 242.480002,129.204167 243.200002,129.204167 243.920001,129.204167 244.640000,129.204167 245.360000,129.204167 246.079999,129.204167 246.799998,129.204167 247.519998,129.204167 248.239997,129.204167 248.959996,129.204167 249.680004,129.204167 250.400003,129.204167 251.120003,129.204167 251.840002,129.204167 252.560001,129.204167 253.280001,129.204167 254.000000,129.204167 254.000000,61.387500 254.000000,61.387500 254.719999,61.387500 255.439999,61.387500 256.159998,61.387500 256.879997,61.387500 257.599997,61.387500 258.319996,61.387500 259.039995,61.387500 259.759995,61.387500 260.479994,61.387500 261.199993,61.387500 261.919992,61.387500 262.639992,61.387500 263.360008,61.387500 264.080008,61.387500 264.800007,61.387500 265.520006,61.387500 266.240005,61.387500 266.960005,61.387500 267.680004,61.387500 268.400003,61.387500 269.120003,61.387500 269.840002,61.387500 270.560001,61.387500 271.280001,61.387500 272.000000,61.387500 272.719999,61.387500 273.439999,61.387500 274.159998,61.387500 274.879997,61.387500 275.599997,61.387500 276.319996,61.387500 277.039995,61.387500 277.759995,61.387500 278.479994,61.387500 279.199993,61.387500 279.919992,61.387500 280.639992,61.387500 281.360008,61.387500 282.080008,61.387500 282.800007,61.387500 283.520006,61.387500 284.240005,61.387500 284.960005,61.387500 285.680004,61.387500 286.400003,61.387500 287.120003,61.387500 287.840002,61.387500 288.560001,61.387500 289.280001,61.387500 290.000000,61.387500 290.000000,129.204167 290.719999,129.204167 291.439999,129.204167 292.159998,129.204167 292.879997,129.204167 293.599997,129.204167 294.319996,129.204167 295.039995,129.204167 295.759995,129.204167 296.479994,129.204167 297.199993,129.204167 297.919992,129.204167 298.639992,129.204167 299.360008,129.204167 300.080008,129.204167 300.800007,129.204167 301.520006,129.204167 302.240005,129.204167 302.960005,129.204167 303.680004,129.204167 304.400003,129.204167 305.120003,129.204167 305.840002,129.204167 306.560001,129.204167 307.280001,129.204167 308.000000,129.204167 308.719999,129.204167 309.439999,129.204167 310.159998,129.204167 310.879997,129.204167 311.599997,129.204167 312.319996,129.204167 313.039995,129.204167 313.759995,129.204167 314.479994,129.204167 315.199993,129.204167 315.919992,129.204167 316.639992,129.204167 317.360008,129.204167 318.080008,129.204167 318.800007,129.204167 319.520006,129.204167 320.240005,129.204167 320.960005,129.204167 321.680004,129.204167 322.400003,129.204167 323.120003,129.204167 323.840002,129.204167 324.560001,129.204167 325.280001,129.204167 326.000000,129.204167 326.000000,61.387500 326.719999,61.387500 327.439999,61.387500 328.159998,61.387500 328.879997,61.387500 329.599997,61.387500 330.319996,61.387500 331.039995,61.387500 331.759995,61.387500 332.479994,61.387500 333.199993,61.387500 333.919992,61.387500 334.639992,61.387500 335.360008,61.387500 336.080008,61.387500 336.800007,61.387500 337.520006,61.387500 338.240005,61.387500 338.960005,61.387500 339.680004,61.387500 340.400003,61.387500 341.120003,61.387500 341.840002,61.387500 342.560001,61.387500 343.280001,61.387500 344.000000,61.387500 344.719999,61.387500 345.439999,61.387500 346.159998,61.387500 346.879997,61.387500 347.599997,61.387500 348.319996,61.387500 349.039995,61.387500 349.759995,61.387500 350.479994,61.387500 351.199993,61.387500 351.919992,61.387500 352.639992,61.387500 353.360008,61.387500 354.080008,61.387500 354.800007,61.387500 355.520006,61.387500 356.240005,61.387500 356.960005,61.387500 357.680004,61.387500 358.400003,61.387500 359.120003,61.387500 359.840002,61.387500 360.560001,61.387500 361.280001,61.387500 362.000000,61.387500 362.000000,129.204167 362.719999,129.204167 363.439999,129.204167 364.159998,129.204167 364.879997,129.204167 365.599997,129.204167 366.319996,129.204167 367.039995,129.204167 367.759995,129.204167 368.479994,129.204167 369.199993,129.204167 369.919992,129.204167 370.639992,129.204167 371.360008,129.204167 372.080008,129.204167 372.800007,129.204167 373.520006,129.204167 374.240005,129.204167 374.960005,129.204167 375.680004,129.204167 376.400003,129.204167 377.120003,129.204167 377.840002,129.204167 378.560001,129.204167 379.280001,129.204167 380.000000,129.204167 380.719999,129.204167 381.439999,129.204167 382.159998,129.204167 382.879997,129.204167 383.599997,129.204167 384.319996,129.204167 385.039995,129.204167 385.759995,129.204167 386.479994,129.204167 387.199993,129.204167 387.919992,129.204167 388.639992,129.204167 389.360008,129.204167 390.080008,129.204167 390.800007,129.204167 391.520006,129.204167 392.240005,129.204167 392.960005,129.204167 393.680004,129.204167 394.400003,129.204167 395.120003,129.204167 395.840002,129.204167 396.560001,129.204167 397.280001,129.204167 398.000000,129.204167 398.000000,61.387500 398.720016,61.387500 399.439999,61.387500 400.160015,61.387500 400.879997,61.387500 401.600014,61.387500 402.319996,61.387500 403.040012,61.387500 403.759995,61.387500 404.480011,61.387500 405.199993,61.387500 405.920010,61.387500 406.639992,61.387500 407.360008,61.387500 408.079990,61.387500 408.800007,61.387500 409.519989,61.387500 410.240005,61.387500 410.959988,61.387500 411.680004,61.387500 412.399986,61.387500 413.120003,61.387500 413.839985,61.387500 414.560001,61.387500 415.279984,61.387500 416.000000,61.387500 416.720016,61.387500 417.439999,61.387500 418.160015,61.387500 418.879997,61.387500 419.600014,61.387500 420.319996,61.387500 421.040012,61.387500 421.759995,61.387500 422.480011,61.387500 423.199993,61.387500 423.920010,61.387500 424.639992,61.387500 425.360008,61.387500 426.079990,61.387500 426.800007,61.387500 427.519989,61.387500 428.240005,61.387500 428.959988,61.387500 429.680004,61.387500 430.399986,61.387500 431.120003,61.387500 431.839985,61.387500 432.560001,61.387500 433.279984,61.387500 434.000000,61.387500 434.000000,129.204167 434.720016,129.204167 435.439999,129.204167 436.160015,129.204167 436.879997,129.204167 437.600014,129.204167 438.319996,129.204167 439.040012,129.204167 439.759995,129.204167 440.480011,129.204167 441.199993,129.204167 441.920010,129.204167 442.639992,129.204167 443.360008,129.204167 444.079990,129.204167 444.800007,129.204167 445.519989,129.204167 446.240005,129.204167 446.959988,129.204167 447.680004,129.204167 448.399986,129.204167 449.120003,129.204167 449.839985,129.204167 450.560001,129.204167 451.279984,129.204167 452.000000,129.204167 452.720016,129.204167 453.439999,129.204167 454.160015,129.204167 454.879997,129.204167 455.600014,129.204167 456.319996,129.204167 457.040012,129.204167 457.759995,129.204167 458.480011,129.204167 459.199993,129.204167 459.920010,129.204167 460.639992,129.204167 461.360008,129.204167 462.079990,129.204167 462.800007,129.204167 463.519989,129.204167 464.240005,129.204167 464.959988,129.204167 465.680004,129.204167 466.399986,129.204167 467.120003,129.204167 467.839985,129.204167 468.560001,129.204167 469.279984,129.204167 470.000000,129.204167 470.000000,61.387500"
+     id="polyline3816"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
      clip-path="url(#clipArea1-2)"
-     points="110.000000,156.591667 110.778000,156.591667 111.556000,156.591667 112.334000,156.591667 113.112000,156.591667 113.890000,156.591667 114.668000,156.591667 115.446000,156.591667 116.224000,156.591667 117.002000,156.591667 117.780000,156.591667 118.558000,156.591667 119.336000,156.591667 120.114000,156.591667 120.892000,156.591667 121.670000,156.591667 122.448000,156.591667 123.226000,156.591667 124.004001,156.591667 124.782000,156.591667 125.560000,156.591667 126.337999,156.591667 127.116000,156.591667 127.894000,156.591667 128.672000,156.591667 129.450000,156.591667 130.227999,156.591667 131.006001,156.591667 131.784000,156.591667 132.561999,156.591667 133.340001,156.591667 134.118000,156.591667 134.895999,156.591667 135.674001,156.591667 136.452000,156.591667 137.230000,156.591667 138.008001,156.591667 138.786000,156.591667 139.564000,156.591667 140.341999,156.591667 141.120000,156.591667 141.898000,156.591667 142.675999,156.591667 143.454001,156.591667 144.232000,156.591667 145.009999,156.591667 145.788001,156.591667 146.566000,156.591667 147.343999,156.591667 148.122001,156.591667 148.900000,156.591667 148.900000,156.591667 148.900000,156.591667 148.900000,156.591667 149.677999,156.591667 150.455999,156.591667 151.233998,156.591667 152.012002,156.591667 152.790001,156.591667 153.568000,156.591667 154.345999,156.591667 155.123999,156.591667 155.901998,156.591667 156.680002,156.591667 157.458001,156.591667 158.236000,156.591667 159.014000,156.591667 159.791999,156.591667 160.569998,156.591667 161.348002,156.591667 162.126001,156.591667 162.904001,156.591667 163.682000,156.591667 164.459999,156.591667 165.237998,156.591667 166.016002,156.591667 166.794001,156.591667 167.572001,156.591667 168.350000,156.591667 169.127999,156.591667 169.905999,156.591667 170.683998,156.591667 171.462002,156.591667 172.240001,156.591667 173.018000,156.591667 173.795999,156.591667 174.573999,156.591667 175.351998,156.591667 176.130002,156.591667 176.908001,156.591667 177.686000,156.591667 178.464000,156.591667 179.241999,156.591667 180.019998,156.591667 180.798002,156.591667 181.576001,156.591667 182.354001,156.591667 183.132000,156.591667 183.909999,156.591667 184.687998,156.591667 185.466002,156.591667 186.244001,156.591667 187.022001,156.591667 187.800000,156.591667 187.800000,156.591667 187.800000,156.591667 188.577999,156.591667 189.355999,156.591667 190.133998,156.591667 190.911997,156.591667 191.689996,156.591667 192.467996,156.591667 193.246004,156.591667 194.024003,156.591667 194.802003,156.591667 195.580002,156.591667 196.358001,156.591667 197.136000,156.591667 197.914000,156.591667 198.691999,156.591667 199.469998,156.591667 200.247997,156.591667 201.025997,156.591667 201.803996,156.591667 202.582004,156.591667 203.360004,156.591667 204.138003,156.591667 204.916002,156.591667 205.694001,156.591667 206.472001,156.591667 207.250000,156.591667 208.027999,156.591667 208.805999,156.591667 209.583998,156.591667 210.361997,156.591667 211.139996,156.591667 211.917996,156.591667 212.696004,156.591667 213.474003,156.591667 214.252003,156.591667 215.030002,156.591667 215.808001,156.591667 216.586000,156.591667 217.364000,156.591667 218.141999,156.591667 218.919998,156.591667 219.697997,156.591667 220.475997,156.591667 221.253996,156.591667 222.032004,156.591667 222.810004,156.591667 223.588003,156.591667 224.366002,156.591667 225.144001,156.591667 225.922001,156.591667 226.700000,156.591667 226.700000,224.408333 226.700000,224.408333 227.477999,224.408333 228.255999,224.408333 229.033998,224.408333 229.811997,224.408333 230.589996,224.408333 231.367996,224.408333 232.146004,224.408333 232.924003,224.408333 233.702003,224.408333 234.480002,224.408333 235.258001,224.408333 236.036000,224.408333 236.814000,224.408333 237.591999,224.408333 238.369998,224.408333 239.147997,224.408333 239.925997,224.408333 240.703996,224.408333 241.482004,224.408333 242.260004,224.408333 243.038003,224.408333 243.816002,224.408333 244.594001,224.408333 245.372001,224.408333 246.150000,224.408333 246.927999,224.408333 247.705999,224.408333 248.483998,224.408333 249.261997,224.408333 250.039996,224.408333 250.817996,224.408333 251.596004,224.408333 252.374003,224.408333 253.152003,224.408333 253.930002,224.408333 254.708001,224.408333 255.486000,224.408333 256.264000,224.408333 257.041999,224.408333 257.819998,224.408333 258.597997,224.408333 259.375997,224.408333 260.153996,224.408333 260.932004,224.408333 261.710004,224.408333 262.488003,224.408333 263.266002,224.408333 264.044001,224.408333 264.822001,224.408333 265.600000,224.408333 265.600000,224.408333 265.600000,224.408333 266.377999,224.408333 267.155999,224.408333 267.933998,224.408333 268.711997,224.408333 269.489996,224.408333 270.267996,224.408333 271.045995,224.408333 271.823994,224.408333 272.601993,224.408333 273.379993,224.408333 274.157992,224.408333 274.935991,224.408333 275.714009,224.408333 276.492008,224.408333 277.270007,224.408333 278.048007,224.408333 278.826006,224.408333 279.604005,224.408333 280.382004,224.408333 281.160004,224.408333 281.938003,224.408333 282.716002,224.408333 283.494001,224.408333 284.272001,224.408333 285.050000,224.408333 285.827999,224.408333 286.605999,224.408333 287.383998,224.408333 288.161997,224.408333 288.939996,224.408333 289.717996,224.408333 290.495995,224.408333 291.273994,224.408333 292.051993,224.408333 292.829993,224.408333 293.607992,224.408333 294.385991,224.408333 295.164009,224.408333 295.942008,224.408333 296.720007,224.408333 297.498007,224.408333 298.276006,224.408333 299.054005,224.408333 299.832004,224.408333 300.610004,224.408333 301.388003,224.408333 302.166002,224.408333 302.944001,224.408333 303.722001,224.408333 304.500000,224.408333 304.500000,224.408333 305.277999,224.408333 306.055999,224.408333 306.833998,224.408333 307.611997,224.408333 308.389996,224.408333 309.167996,224.408333 309.945995,224.408333 310.723994,224.408333 311.501993,224.408333 312.279993,224.408333 313.057992,224.408333 313.835991,224.408333 314.614009,224.408333 315.392008,224.408333 316.170007,224.408333 316.948007,224.408333 317.726006,224.408333 318.504005,224.408333 319.282004,224.408333 320.060004,224.408333 320.838003,224.408333 321.616002,224.408333 322.394001,224.408333 323.172001,224.408333 323.950000,224.408333 324.727999,224.408333 325.505999,224.408333 326.283998,224.408333 327.061997,224.408333 327.839996,224.408333 328.617996,224.408333 329.395995,224.408333 330.173994,224.408333 330.951993,224.408333 331.729993,224.408333 332.507992,224.408333 333.285991,224.408333 334.064009,224.408333 334.842008,224.408333 335.620007,224.408333 336.398007,224.408333 337.176006,224.408333 337.954005,224.408333 338.732004,224.408333 339.510004,224.408333 340.288003,224.408333 341.066002,224.408333 341.844001,224.408333 342.622001,224.408333 343.400000,224.408333 343.400000,156.591667 344.177999,156.591667 344.955999,156.591667 345.733998,156.591667 346.511997,156.591667 347.289996,156.591667 348.067996,156.591667 348.845995,156.591667 349.623994,156.591667 350.401993,156.591667 351.179993,156.591667 351.957992,156.591667 352.735991,156.591667 353.514009,156.591667 354.292008,156.591667 355.070007,156.591667 355.848007,156.591667 356.626006,156.591667 357.404005,156.591667 358.182004,156.591667 358.960004,156.591667 359.738003,156.591667 360.516002,156.591667 361.294001,156.591667 362.072001,156.591667 362.850000,156.591667 363.627999,156.591667 364.405999,156.591667 365.183998,156.591667 365.961997,156.591667 366.739996,156.591667 367.517996,156.591667 368.295995,156.591667 369.073994,156.591667 369.851993,156.591667 370.629993,156.591667 371.407992,156.591667 372.185991,156.591667 372.964009,156.591667 373.742008,156.591667 374.520007,156.591667 375.298007,156.591667 376.076006,156.591667 376.854005,156.591667 377.632004,156.591667 378.410004,156.591667 379.188003,156.591667 379.966002,156.591667 380.744001,156.591667 381.522001,156.591667 382.300000,156.591667 382.300000,156.591667 383.077999,156.591667 383.855999,156.591667 384.633998,156.591667 385.411997,156.591667 386.189996,156.591667 386.967996,156.591667 387.745995,156.591667 388.523994,156.591667 389.301993,156.591667 390.079993,156.591667 390.857992,156.591667 391.635991,156.591667 392.414009,156.591667 393.192008,156.591667 393.970007,156.591667 394.748007,156.591667 395.526006,156.591667 396.304005,156.591667 397.082004,156.591667 397.860004,156.591667 398.638003,156.591667 399.416002,156.591667 400.194001,156.591667 400.972001,156.591667 401.750000,156.591667 402.527999,156.591667 403.305999,156.591667 404.083998,156.591667 404.861997,156.591667 405.639996,156.591667 406.417996,156.591667 407.195995,156.591667 407.973994,156.591667 408.751993,156.591667 409.529993,156.591667 410.307992,156.591667 411.085991,156.591667 411.864009,156.591667 412.642008,156.591667 413.420007,156.591667 414.198007,156.591667 414.976006,156.591667 415.754005,156.591667 416.532004,156.591667 417.310004,156.591667 418.088003,156.591667 418.866002,156.591667 419.644001,156.591667 420.422001,156.591667 421.200000,156.591667 421.200000,156.591667 421.978018,156.591667 422.755999,156.591667 423.534016,156.591667 424.311997,156.591667 425.090015,156.591667 425.867996,156.591667 426.646013,156.591667 427.423994,156.591667 428.202012,156.591667 428.979993,156.591667 429.758010,156.591667 430.535991,156.591667 431.314009,156.591667 432.091990,156.591667 432.870007,156.591667 433.647988,156.591667 434.426006,156.591667 435.203987,156.591667 435.982004,156.591667 436.759985,156.591667 437.538003,156.591667 438.315984,156.591667 439.094001,156.591667 439.871982,156.591667 440.650000,156.591667 441.428018,156.591667 442.205999,156.591667 442.984016,156.591667 443.761997,156.591667 444.540015,156.591667 445.317996,156.591667 446.096013,156.591667 446.873994,156.591667 447.652012,156.591667 448.429993,156.591667 449.208010,156.591667 449.985991,156.591667 450.764009,156.591667 451.541990,156.591667 452.320007,156.591667 453.097988,156.591667 453.876006,156.591667 454.653987,156.591667 455.432004,156.591667 456.209985,156.591667 456.988003,156.591667 457.765984,156.591667 458.544001,156.591667 459.321982,156.591667 460.100000,156.591667 460.100000,224.408333 460.878018,224.408333 461.655999,224.408333 462.434016,224.408333 463.211997,224.408333 463.990015,224.408333 464.767996,224.408333 465.546013,224.408333 466.323994,224.408333 467.102012,224.408333 467.879993,224.408333 468.658010,224.408333 469.435991,224.408333 470.214009,224.408333 470.991990,224.408333 471.770007,224.408333 472.547988,224.408333 473.326006,224.408333 474.103987,224.408333 474.882004,224.408333 475.659985,224.408333 476.438003,224.408333 477.215984,224.408333 477.994001,224.408333 478.771982,224.408333 479.550000,224.408333 480.328018,224.408333 481.105999,224.408333 481.884016,224.408333 482.661997,224.408333 483.440015,224.408333 484.217996,224.408333 484.996013,224.408333 485.773994,224.408333 486.552012,224.408333 487.329993,224.408333 488.108010,224.408333 488.885991,224.408333 489.664009,224.408333 490.441990,224.408333 491.220007,224.408333 491.997988,224.408333 492.776006,224.408333 493.553987,224.408333 494.332004,224.408333 495.109985,224.408333 495.888003,224.408333 496.665984,224.408333 497.444001,224.408333 498.221982,224.408333 499.000000,224.408333 499.000000,224.408333"
-     id="polyline81-2" />
-  <polyline
-     transform="translate(1047.831,28.544171)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
+     points="110.000000,156.591667 110.720000,156.591667 111.440000,156.591667 112.160000,156.591667 112.880000,156.591667 113.600000,156.591667 114.320000,156.591667 115.040000,156.591667 115.760000,156.591667 116.480000,156.591667 117.200000,156.591667 117.920000,156.591667 118.640000,156.591667 119.360000,156.591667 120.080000,156.591667 120.800000,156.591667 121.520000,156.591667 122.240000,156.591667 122.960001,156.591667 123.680000,156.591667 124.400000,156.591667 125.120000,156.591667 125.840000,156.591667 126.560000,156.591667 127.280000,156.591667 128.000000,156.591667 128.719999,156.591667 129.440001,156.591667 130.160000,156.591667 130.879999,156.591667 131.600001,156.591667 132.320000,156.591667 133.039999,156.591667 133.760001,156.591667 134.480000,156.591667 135.200000,156.591667 135.920001,156.591667 136.640000,156.591667 137.360000,156.591667 138.079999,156.591667 138.800000,156.591667 139.520000,156.591667 140.239999,156.591667 140.960001,156.591667 141.680000,156.591667 142.399999,156.591667 143.120001,156.591667 143.840000,156.591667 144.559999,156.591667 145.280001,156.591667 146.000000,156.591667 146.000000,156.591667 146.000000,156.591667 146.719999,156.591667 147.439999,156.591667 148.159998,156.591667 148.880002,156.591667 149.600001,156.591667 150.320000,156.591667 151.039999,156.591667 151.759999,156.591667 152.479998,156.591667 153.200002,156.591667 153.920001,156.591667 154.640000,156.591667 155.360000,156.591667 156.079999,156.591667 156.799998,156.591667 157.520002,156.591667 158.240001,156.591667 158.960001,156.591667 159.680000,156.591667 160.399999,156.591667 161.119998,156.591667 161.840002,156.591667 162.560001,156.591667 163.280001,156.591667 164.000000,156.591667 164.719999,156.591667 165.439999,156.591667 166.159998,156.591667 166.880002,156.591667 167.600001,156.591667 168.320000,156.591667 169.039999,156.591667 169.759999,156.591667 170.479998,156.591667 171.200002,156.591667 171.920001,156.591667 172.640000,156.591667 173.360000,156.591667 174.079999,156.591667 174.799998,156.591667 175.520002,156.591667 176.240001,156.591667 176.960001,156.591667 177.680000,156.591667 178.399999,156.591667 179.119998,156.591667 179.840002,156.591667 180.560001,156.591667 181.280001,156.591667 182.000000,156.591667 182.000000,156.591667 182.000000,156.591667 182.719999,156.591667 183.439999,156.591667 184.159998,156.591667 184.879997,156.591667 185.599997,156.591667 186.319996,156.591667 187.040004,156.591667 187.760003,156.591667 188.480002,156.591667 189.200002,156.591667 189.920001,156.591667 190.640000,156.591667 191.360000,156.591667 192.079999,156.591667 192.799998,156.591667 193.519998,156.591667 194.239997,156.591667 194.959996,156.591667 195.680004,156.591667 196.400003,156.591667 197.120003,156.591667 197.840002,156.591667 198.560001,156.591667 199.280001,156.591667 200.000000,156.591667 200.719999,156.591667 201.439999,156.591667 202.159998,156.591667 202.879997,156.591667 203.599997,156.591667 204.319996,156.591667 205.040004,156.591667 205.760003,156.591667 206.480002,156.591667 207.200002,156.591667 207.920001,156.591667 208.640000,156.591667 209.360000,156.591667 210.079999,156.591667 210.799998,156.591667 211.519998,156.591667 212.239997,156.591667 212.959996,156.591667 213.680004,156.591667 214.400003,156.591667 215.120003,156.591667 215.840002,156.591667 216.560001,156.591667 217.280001,156.591667 218.000000,156.591667 218.000000,224.408333 218.000000,224.408333 218.719999,224.408333 219.439999,224.408333 220.159998,224.408333 220.879997,224.408333 221.599997,224.408333 222.319996,224.408333 223.040004,224.408333 223.760003,224.408333 224.480002,224.408333 225.200002,224.408333 225.920001,224.408333 226.640000,224.408333 227.360000,224.408333 228.079999,224.408333 228.799998,224.408333 229.519998,224.408333 230.239997,224.408333 230.959996,224.408333 231.680004,224.408333 232.400003,224.408333 233.120003,224.408333 233.840002,224.408333 234.560001,224.408333 235.280001,224.408333 236.000000,224.408333 236.719999,224.408333 237.439999,224.408333 238.159998,224.408333 238.879997,224.408333 239.599997,224.408333 240.319996,224.408333 241.040004,224.408333 241.760003,224.408333 242.480002,224.408333 243.200002,224.408333 243.920001,224.408333 244.640000,224.408333 245.360000,224.408333 246.079999,224.408333 246.799998,224.408333 247.519998,224.408333 248.239997,224.408333 248.959996,224.408333 249.680004,224.408333 250.400003,224.408333 251.120003,224.408333 251.840002,224.408333 252.560001,224.408333 253.280001,224.408333 254.000000,224.408333 254.000000,224.408333 254.000000,224.408333 254.719999,224.408333 255.439999,224.408333 256.159998,224.408333 256.879997,224.408333 257.599997,224.408333 258.319996,224.408333 259.039995,224.408333 259.759995,224.408333 260.479994,224.408333 261.199993,224.408333 261.919992,224.408333 262.639992,224.408333 263.360008,224.408333 264.080008,224.408333 264.800007,224.408333 265.520006,224.408333 266.240005,224.408333 266.960005,224.408333 267.680004,224.408333 268.400003,224.408333 269.120003,224.408333 269.840002,224.408333 270.560001,224.408333 271.280001,224.408333 272.000000,224.408333 272.719999,224.408333 273.439999,224.408333 274.159998,224.408333 274.879997,224.408333 275.599997,224.408333 276.319996,224.408333 277.039995,224.408333 277.759995,224.408333 278.479994,224.408333 279.199993,224.408333 279.919992,224.408333 280.639992,224.408333 281.360008,224.408333 282.080008,224.408333 282.800007,224.408333 283.520006,224.408333 284.240005,224.408333 284.960005,224.408333 285.680004,224.408333 286.400003,224.408333 287.120003,224.408333 287.840002,224.408333 288.560001,224.408333 289.280001,224.408333 290.000000,224.408333 290.000000,224.408333 290.719999,224.408333 291.439999,224.408333 292.159998,224.408333 292.879997,224.408333 293.599997,224.408333 294.319996,224.408333 295.039995,224.408333 295.759995,224.408333 296.479994,224.408333 297.199993,224.408333 297.919992,224.408333 298.639992,224.408333 299.360008,224.408333 300.080008,224.408333 300.800007,224.408333 301.520006,224.408333 302.240005,224.408333 302.960005,224.408333 303.680004,224.408333 304.400003,224.408333 305.120003,224.408333 305.840002,224.408333 306.560001,224.408333 307.280001,224.408333 308.000000,224.408333 308.719999,224.408333 309.439999,224.408333 310.159998,224.408333 310.879997,224.408333 311.599997,224.408333 312.319996,224.408333 313.039995,224.408333 313.759995,224.408333 314.479994,224.408333 315.199993,224.408333 315.919992,224.408333 316.639992,224.408333 317.360008,224.408333 318.080008,224.408333 318.800007,224.408333 319.520006,224.408333 320.240005,224.408333 320.960005,224.408333 321.680004,224.408333 322.400003,224.408333 323.120003,224.408333 323.840002,224.408333 324.560001,224.408333 325.280001,224.408333 326.000000,224.408333 326.000000,156.591667 326.719999,156.591667 327.439999,156.591667 328.159998,156.591667 328.879997,156.591667 329.599997,156.591667 330.319996,156.591667 331.039995,156.591667 331.759995,156.591667 332.479994,156.591667 333.199993,156.591667 333.919992,156.591667 334.639992,156.591667 335.360008,156.591667 336.080008,156.591667 336.800007,156.591667 337.520006,156.591667 338.240005,156.591667 338.960005,156.591667 339.680004,156.591667 340.400003,156.591667 341.120003,156.591667 341.840002,156.591667 342.560001,156.591667 343.280001,156.591667 344.000000,156.591667 344.719999,156.591667 345.439999,156.591667 346.159998,156.591667 346.879997,156.591667 347.599997,156.591667 348.319996,156.591667 349.039995,156.591667 349.759995,156.591667 350.479994,156.591667 351.199993,156.591667 351.919992,156.591667 352.639992,156.591667 353.360008,156.591667 354.080008,156.591667 354.800007,156.591667 355.520006,156.591667 356.240005,156.591667 356.960005,156.591667 357.680004,156.591667 358.400003,156.591667 359.120003,156.591667 359.840002,156.591667 360.560001,156.591667 361.280001,156.591667 362.000000,156.591667 362.000000,156.591667 362.719999,156.591667 363.439999,156.591667 364.159998,156.591667 364.879997,156.591667 365.599997,156.591667 366.319996,156.591667 367.039995,156.591667 367.759995,156.591667 368.479994,156.591667 369.199993,156.591667 369.919992,156.591667 370.639992,156.591667 371.360008,156.591667 372.080008,156.591667 372.800007,156.591667 373.520006,156.591667 374.240005,156.591667 374.960005,156.591667 375.680004,156.591667 376.400003,156.591667 377.120003,156.591667 377.840002,156.591667 378.560001,156.591667 379.280001,156.591667 380.000000,156.591667 380.719999,156.591667 381.439999,156.591667 382.159998,156.591667 382.879997,156.591667 383.599997,156.591667 384.319996,156.591667 385.039995,156.591667 385.759995,156.591667 386.479994,156.591667 387.199993,156.591667 387.919992,156.591667 388.639992,156.591667 389.360008,156.591667 390.080008,156.591667 390.800007,156.591667 391.520006,156.591667 392.240005,156.591667 392.960005,156.591667 393.680004,156.591667 394.400003,156.591667 395.120003,156.591667 395.840002,156.591667 396.560001,156.591667 397.280001,156.591667 398.000000,156.591667 398.000000,156.591667 398.720016,156.591667 399.439999,156.591667 400.160015,156.591667 400.879997,156.591667 401.600014,156.591667 402.319996,156.591667 403.040012,156.591667 403.759995,156.591667 404.480011,156.591667 405.199993,156.591667 405.920010,156.591667 406.639992,156.591667 407.360008,156.591667 408.079990,156.591667 408.800007,156.591667 409.519989,156.591667 410.240005,156.591667 410.959988,156.591667 411.680004,156.591667 412.399986,156.591667 413.120003,156.591667 413.839985,156.591667 414.560001,156.591667 415.279984,156.591667 416.000000,156.591667 416.720016,156.591667 417.439999,156.591667 418.160015,156.591667 418.879997,156.591667 419.600014,156.591667 420.319996,156.591667 421.040012,156.591667 421.759995,156.591667 422.480011,156.591667 423.199993,156.591667 423.920010,156.591667 424.639992,156.591667 425.360008,156.591667 426.079990,156.591667 426.800007,156.591667 427.519989,156.591667 428.240005,156.591667 428.959988,156.591667 429.680004,156.591667 430.399986,156.591667 431.120003,156.591667 431.839985,156.591667 432.560001,156.591667 433.279984,156.591667 434.000000,156.591667 434.000000,224.408333 434.720016,224.408333 435.439999,224.408333 436.160015,224.408333 436.879997,224.408333 437.600014,224.408333 438.319996,224.408333 439.040012,224.408333 439.759995,224.408333 440.480011,224.408333 441.199993,224.408333 441.920010,224.408333 442.639992,224.408333 443.360008,224.408333 444.079990,224.408333 444.800007,224.408333 445.519989,224.408333 446.240005,224.408333 446.959988,224.408333 447.680004,224.408333 448.399986,224.408333 449.120003,224.408333 449.839985,224.408333 450.560001,224.408333 451.279984,224.408333 452.000000,224.408333 452.720016,224.408333 453.439999,224.408333 454.160015,224.408333 454.879997,224.408333 455.600014,224.408333 456.319996,224.408333 457.040012,224.408333 457.759995,224.408333 458.480011,224.408333 459.199993,224.408333 459.920010,224.408333 460.639992,224.408333 461.360008,224.408333 462.079990,224.408333 462.800007,224.408333 463.519989,224.408333 464.240005,224.408333 464.959988,224.408333 465.680004,224.408333 466.399986,224.408333 467.120003,224.408333 467.839985,224.408333 468.560001,224.408333 469.279984,224.408333 470.000000,224.408333 470.000000,224.408333"
+     id="polyline3818"
+     transform="translate(1040.1806,39.342803)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
      clip-path="url(#clipArea1-2)"
-     points="110.000000,319.612500 110.778000,319.612500 111.556000,319.612500 112.334000,319.612500 113.112000,319.612500 113.890000,319.612500 114.668000,319.612500 115.446000,319.612500 116.224000,319.612500 117.002000,319.612500 117.780000,319.612500 118.558000,319.612500 119.336000,319.612500 120.114000,319.612500 120.892000,319.612500 121.670000,319.612500 122.448000,319.612500 123.226000,319.612500 124.004001,319.612500 124.782000,319.612500 125.560000,319.612500 126.337999,319.612500 127.116000,319.612500 127.894000,319.612500 128.672000,319.612500 129.450000,319.612500 130.227999,319.612500 131.006001,319.612500 131.784000,319.612500 132.561999,319.612500 133.340001,319.612500 134.118000,319.612500 134.895999,319.612500 135.674001,319.612500 136.452000,319.612500 137.230000,319.612500 138.008001,319.612500 138.786000,319.612500 139.564000,319.612500 140.341999,319.612500 141.120000,319.612500 141.898000,319.612500 142.675999,319.612500 143.454001,319.612500 144.232000,319.612500 145.009999,319.612500 145.788001,319.612500 146.566000,319.612500 147.343999,319.612500 148.122001,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 148.900000,319.612500 149.677999,319.612500 150.455999,319.612500 151.233998,319.612500 152.012002,319.612500 152.790001,319.612500 153.568000,319.612500 154.345999,319.612500 155.123999,319.612500 155.901998,319.612500 156.680002,319.612500 157.458001,319.612500 158.236000,319.612500 159.014000,319.612500 159.791999,319.612500 160.569998,319.612500 161.348002,319.612500 162.126001,319.612500 162.904001,319.612500 163.682000,319.612500 164.459999,319.612500 165.237998,319.612500 166.016002,319.612500 166.794001,319.612500 167.572001,319.612500 168.350000,319.612500 169.127999,319.612500 169.905999,319.612500 170.683998,319.612500 171.462002,319.612500 172.240001,319.612500 173.018000,319.612500 173.795999,319.612500 174.573999,319.612500 175.351998,319.612500 176.130002,319.612500 176.908001,319.612500 177.686000,319.612500 178.464000,319.612500 179.241999,319.612500 180.019998,319.612500 180.798002,319.612500 181.576001,319.612500 182.354001,319.612500 183.132000,319.612500 183.909999,319.612500 184.687998,319.612500 185.466002,319.612500 186.244001,319.612500 187.022001,319.612500 187.800000,319.612500 187.800000,319.612500 187.800000,319.612500 188.577999,319.612500 189.355999,319.612500 190.133998,319.612500 190.911997,319.612500 191.689996,319.612500 192.467996,319.612500 193.246004,319.612500 194.024003,319.612500 194.802003,319.612500 195.580002,319.612500 196.358001,319.612500 197.136000,319.612500 197.914000,319.612500 198.691999,319.612500 199.469998,319.612500 200.247997,319.612500 201.025997,319.612500 201.803996,319.612500 202.582004,319.612500 203.360004,319.612500 204.138003,319.612500 204.916002,319.612500 205.694001,319.612500 206.472001,319.612500 207.250000,319.612500 208.027999,319.612500 208.805999,319.612500 209.583998,319.612500 210.361997,319.612500 211.139996,319.612500 211.917996,319.612500 212.696004,319.612500 213.474003,319.612500 214.252003,319.612500 215.030002,319.612500 215.808001,319.612500 216.586000,319.612500 217.364000,319.612500 218.141999,319.612500 218.919998,319.612500 219.697997,319.612500 220.475997,319.612500 221.253996,319.612500 222.032004,319.612500 222.810004,319.612500 223.588003,319.612500 224.366002,319.612500 225.144001,319.612500 225.922001,319.612500 226.700000,319.612500 226.700000,319.612500 226.700000,319.612500 227.477999,319.612500 228.255999,319.612500 229.033998,319.612500 229.811997,319.612500 230.589996,319.612500 231.367996,319.612500 232.146004,319.612500 232.924003,319.612500 233.702003,319.612500 234.480002,319.612500 235.258001,319.612500 236.036000,319.612500 236.814000,319.612500 237.591999,319.612500 238.369998,319.612500 239.147997,319.612500 239.925997,319.612500 240.703996,319.612500 241.482004,319.612500 242.260004,319.612500 243.038003,319.612500 243.816002,319.612500 244.594001,319.612500 245.372001,319.612500 246.150000,319.612500 246.927999,319.612500 247.705999,319.612500 248.483998,319.612500 249.261997,319.612500 250.039996,319.612500 250.817996,319.612500 251.596004,319.612500 252.374003,319.612500 253.152003,319.612500 253.930002,319.612500 254.708001,319.612500 255.486000,319.612500 256.264000,319.612500 257.041999,319.612500 257.819998,319.612500 258.597997,319.612500 259.375997,319.612500 260.153996,319.612500 260.932004,319.612500 261.710004,319.612500 262.488003,319.612500 263.266002,319.612500 264.044001,319.612500 264.822001,319.612500 265.600000,319.612500 265.600000,251.795833 265.600000,251.795833 266.377999,251.795833 267.155999,251.795833 267.933998,251.795833 268.711997,251.795833 269.489996,251.795833 270.267996,251.795833 271.045995,251.795833 271.823994,251.795833 272.601993,251.795833 273.379993,251.795833 274.157992,251.795833 274.935991,251.795833 275.714009,251.795833 276.492008,251.795833 277.270007,251.795833 278.048007,251.795833 278.826006,251.795833 279.604005,251.795833 280.382004,251.795833 281.160004,251.795833 281.938003,251.795833 282.716002,251.795833 283.494001,251.795833 284.272001,251.795833 285.050000,251.795833 285.827999,251.795833 286.605999,251.795833 287.383998,251.795833 288.161997,251.795833 288.939996,251.795833 289.717996,251.795833 290.495995,251.795833 291.273994,251.795833 292.051993,251.795833 292.829993,251.795833 293.607992,251.795833 294.385991,251.795833 295.164009,251.795833 295.942008,251.795833 296.720007,251.795833 297.498007,251.795833 298.276006,251.795833 299.054005,251.795833 299.832004,251.795833 300.610004,251.795833 301.388003,251.795833 302.166002,251.795833 302.944001,251.795833 303.722001,251.795833 304.500000,251.795833 304.500000,251.795833 305.277999,251.795833 306.055999,251.795833 306.833998,251.795833 307.611997,251.795833 308.389996,251.795833 309.167996,251.795833 309.945995,251.795833 310.723994,251.795833 311.501993,251.795833 312.279993,251.795833 313.057992,251.795833 313.835991,251.795833 314.614009,251.795833 315.392008,251.795833 316.170007,251.795833 316.948007,251.795833 317.726006,251.795833 318.504005,251.795833 319.282004,251.795833 320.060004,251.795833 320.838003,251.795833 321.616002,251.795833 322.394001,251.795833 323.172001,251.795833 323.950000,251.795833 324.727999,251.795833 325.505999,251.795833 326.283998,251.795833 327.061997,251.795833 327.839996,251.795833 328.617996,251.795833 329.395995,251.795833 330.173994,251.795833 330.951993,251.795833 331.729993,251.795833 332.507992,251.795833 333.285991,251.795833 334.064009,251.795833 334.842008,251.795833 335.620007,251.795833 336.398007,251.795833 337.176006,251.795833 337.954005,251.795833 338.732004,251.795833 339.510004,251.795833 340.288003,251.795833 341.066002,251.795833 341.844001,251.795833 342.622001,251.795833 343.400000,251.795833 343.400000,319.612500 344.177999,319.612500 344.955999,319.612500 345.733998,319.612500 346.511997,319.612500 347.289996,319.612500 348.067996,319.612500 348.845995,319.612500 349.623994,319.612500 350.401993,319.612500 351.179993,319.612500 351.957992,319.612500 352.735991,319.612500 353.514009,319.612500 354.292008,319.612500 355.070007,319.612500 355.848007,319.612500 356.626006,319.612500 357.404005,319.612500 358.182004,319.612500 358.960004,319.612500 359.738003,319.612500 360.516002,319.612500 361.294001,319.612500 362.072001,319.612500 362.850000,319.612500 363.627999,319.612500 364.405999,319.612500 365.183998,319.612500 365.961997,319.612500 366.739996,319.612500 367.517996,319.612500 368.295995,319.612500 369.073994,319.612500 369.851993,319.612500 370.629993,319.612500 371.407992,319.612500 372.185991,319.612500 372.964009,319.612500 373.742008,319.612500 374.520007,319.612500 375.298007,319.612500 376.076006,319.612500 376.854005,319.612500 377.632004,319.612500 378.410004,319.612500 379.188003,319.612500 379.966002,319.612500 380.744001,319.612500 381.522001,319.612500 382.300000,319.612500 382.300000,319.612500 383.077999,319.612500 383.855999,319.612500 384.633998,319.612500 385.411997,319.612500 386.189996,319.612500 386.967996,319.612500 387.745995,319.612500 388.523994,319.612500 389.301993,319.612500 390.079993,319.612500 390.857992,319.612500 391.635991,319.612500 392.414009,319.612500 393.192008,319.612500 393.970007,319.612500 394.748007,319.612500 395.526006,319.612500 396.304005,319.612500 397.082004,319.612500 397.860004,319.612500 398.638003,319.612500 399.416002,319.612500 400.194001,319.612500 400.972001,319.612500 401.750000,319.612500 402.527999,319.612500 403.305999,319.612500 404.083998,319.612500 404.861997,319.612500 405.639996,319.612500 406.417996,319.612500 407.195995,319.612500 407.973994,319.612500 408.751993,319.612500 409.529993,319.612500 410.307992,319.612500 411.085991,319.612500 411.864009,319.612500 412.642008,319.612500 413.420007,319.612500 414.198007,319.612500 414.976006,319.612500 415.754005,319.612500 416.532004,319.612500 417.310004,319.612500 418.088003,319.612500 418.866002,319.612500 419.644001,319.612500 420.422001,319.612500 421.200000,319.612500 421.200000,319.612500 421.978018,319.612500 422.755999,319.612500 423.534016,319.612500 424.311997,319.612500 425.090015,319.612500 425.867996,319.612500 426.646013,319.612500 427.423994,319.612500 428.202012,319.612500 428.979993,319.612500 429.758010,319.612500 430.535991,319.612500 431.314009,319.612500 432.091990,319.612500 432.870007,319.612500 433.647988,319.612500 434.426006,319.612500 435.203987,319.612500 435.982004,319.612500 436.759985,319.612500 437.538003,319.612500 438.315984,319.612500 439.094001,319.612500 439.871982,319.612500 440.650000,319.612500 441.428018,319.612500 442.205999,319.612500 442.984016,319.612500 443.761997,319.612500 444.540015,319.612500 445.317996,319.612500 446.096013,319.612500 446.873994,319.612500 447.652012,319.612500 448.429993,319.612500 449.208010,319.612500 449.985991,319.612500 450.764009,319.612500 451.541990,319.612500 452.320007,319.612500 453.097988,319.612500 453.876006,319.612500 454.653987,319.612500 455.432004,319.612500 456.209985,319.612500 456.988003,319.612500 457.765984,319.612500 458.544001,319.612500 459.321982,319.612500 460.100000,319.612500 460.100000,319.612500 460.878018,319.612500 461.655999,319.612500 462.434016,319.612500 463.211997,319.612500 463.990015,319.612500 464.767996,319.612500 465.546013,319.612500 466.323994,319.612500 467.102012,319.612500 467.879993,319.612500 468.658010,319.612500 469.435991,319.612500 470.214009,319.612500 470.991990,319.612500 471.770007,319.612500 472.547988,319.612500 473.326006,319.612500 474.103987,319.612500 474.882004,319.612500 475.659985,319.612500 476.438003,319.612500 477.215984,319.612500 477.994001,319.612500 478.771982,319.612500 479.550000,319.612500 480.328018,319.612500 481.105999,319.612500 481.884016,319.612500 482.661997,319.612500 483.440015,319.612500 484.217996,319.612500 484.996013,319.612500 485.773994,319.612500 486.552012,319.612500 487.329993,319.612500 488.108010,319.612500 488.885991,319.612500 489.664009,319.612500 490.441990,319.612500 491.220007,319.612500 491.997988,319.612500 492.776006,319.612500 493.553987,319.612500 494.332004,319.612500 495.109985,319.612500 495.888003,319.612500 496.665984,319.612500 497.444001,319.612500 498.221982,319.612500 499.000000,319.612500 499.000000,251.795833"
-     id="polyline83-93" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1160.8311"
-     y="73.044174"
-     id="text85-9">swiCleInp.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1160.8311"
-     y="168.04416"
-     id="text87-0">swiCleInp.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1160.8311"
-     y="263.04416"
-     id="text89-88">swiCleInp.y</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline91-5" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="187.800000,434.000000 187.800000,747.000000"
-     id="polyline93-0" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="265.600000,434.000000 265.600000,747.000000"
-     id="polyline95-9" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="343.400000,434.000000 343.400000,747.000000"
-     id="polyline97-6" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="421.200000,434.000000 421.200000,747.000000"
-     id="polyline99-3" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 499.000000,747.000000"
-     id="polyline101-8" />
+     points="110.000000,319.612500 110.720000,319.612500 111.440000,319.612500 112.160000,319.612500 112.880000,319.612500 113.600000,319.612500 114.320000,319.612500 115.040000,319.612500 115.760000,319.612500 116.480000,319.612500 117.200000,319.612500 117.920000,319.612500 118.640000,319.612500 119.360000,319.612500 120.080000,319.612500 120.800000,319.612500 121.520000,319.612500 122.240000,319.612500 122.960001,319.612500 123.680000,319.612500 124.400000,319.612500 125.120000,319.612500 125.840000,319.612500 126.560000,319.612500 127.280000,319.612500 128.000000,319.612500 128.719999,319.612500 129.440001,319.612500 130.160000,319.612500 130.879999,319.612500 131.600001,319.612500 132.320000,319.612500 133.039999,319.612500 133.760001,319.612500 134.480000,319.612500 135.200000,319.612500 135.920001,319.612500 136.640000,319.612500 137.360000,319.612500 138.079999,319.612500 138.800000,319.612500 139.520000,319.612500 140.239999,319.612500 140.960001,319.612500 141.680000,319.612500 142.399999,319.612500 143.120001,319.612500 143.840000,319.612500 144.559999,319.612500 145.280001,319.612500 146.000000,319.612500 146.000000,319.612500 146.000000,319.612500 146.719999,319.612500 147.439999,319.612500 148.159998,319.612500 148.880002,319.612500 149.600001,319.612500 150.320000,319.612500 151.039999,319.612500 151.759999,319.612500 152.479998,319.612500 153.200002,319.612500 153.920001,319.612500 154.640000,319.612500 155.360000,319.612500 156.079999,319.612500 156.799998,319.612500 157.520002,319.612500 158.240001,319.612500 158.960001,319.612500 159.680000,319.612500 160.399999,319.612500 161.119998,319.612500 161.840002,319.612500 162.560001,319.612500 163.280001,319.612500 164.000000,319.612500 164.719999,319.612500 165.439999,319.612500 166.159998,319.612500 166.880002,319.612500 167.600001,319.612500 168.320000,319.612500 169.039999,319.612500 169.759999,319.612500 170.479998,319.612500 171.200002,319.612500 171.920001,319.612500 172.640000,319.612500 173.360000,319.612500 174.079999,319.612500 174.799998,319.612500 175.520002,319.612500 176.240001,319.612500 176.960001,319.612500 177.680000,319.612500 178.399999,319.612500 179.119998,319.612500 179.840002,319.612500 180.560001,319.612500 181.280001,319.612500 182.000000,319.612500 182.000000,319.612500 182.000000,319.612500 182.719999,319.612500 183.439999,319.612500 184.159998,319.612500 184.879997,319.612500 185.599997,319.612500 186.319996,319.612500 187.040004,319.612500 187.760003,319.612500 188.480002,319.612500 189.200002,319.612500 189.920001,319.612500 190.640000,319.612500 191.360000,319.612500 192.079999,319.612500 192.799998,319.612500 193.519998,319.612500 194.239997,319.612500 194.959996,319.612500 195.680004,319.612500 196.400003,319.612500 197.120003,319.612500 197.840002,319.612500 198.560001,319.612500 199.280001,319.612500 200.000000,319.612500 200.719999,319.612500 201.439999,319.612500 202.159998,319.612500 202.879997,319.612500 203.599997,319.612500 204.319996,319.612500 205.040004,319.612500 205.760003,319.612500 206.480002,319.612500 207.200002,319.612500 207.920001,319.612500 208.640000,319.612500 209.360000,319.612500 210.079999,319.612500 210.799998,319.612500 211.519998,319.612500 212.239997,319.612500 212.959996,319.612500 213.680004,319.612500 214.400003,319.612500 215.120003,319.612500 215.840002,319.612500 216.560001,319.612500 217.280001,319.612500 218.000000,319.612500 218.000000,319.612500 218.000000,319.612500 218.719999,319.612500 219.439999,319.612500 220.159998,319.612500 220.879997,319.612500 221.599997,319.612500 222.319996,319.612500 223.040004,319.612500 223.760003,319.612500 224.480002,319.612500 225.200002,319.612500 225.920001,319.612500 226.640000,319.612500 227.360000,319.612500 228.079999,319.612500 228.799998,319.612500 229.519998,319.612500 230.239997,319.612500 230.959996,319.612500 231.680004,319.612500 232.400003,319.612500 233.120003,319.612500 233.840002,319.612500 234.560001,319.612500 235.280001,319.612500 236.000000,319.612500 236.719999,319.612500 237.439999,319.612500 238.159998,319.612500 238.879997,319.612500 239.599997,319.612500 240.319996,319.612500 241.040004,319.612500 241.760003,319.612500 242.480002,319.612500 243.200002,319.612500 243.920001,319.612500 244.640000,319.612500 245.360000,319.612500 246.079999,319.612500 246.799998,319.612500 247.519998,319.612500 248.239997,319.612500 248.959996,319.612500 249.680004,319.612500 250.400003,319.612500 251.120003,319.612500 251.840002,319.612500 252.560001,319.612500 253.280001,319.612500 254.000000,319.612500 254.000000,251.795833 254.000000,251.795833 254.719999,251.795833 255.439999,251.795833 256.159998,251.795833 256.879997,251.795833 257.599997,251.795833 258.319996,251.795833 259.039995,251.795833 259.759995,251.795833 260.479994,251.795833 261.199993,251.795833 261.919992,251.795833 262.639992,251.795833 263.360008,251.795833 264.080008,251.795833 264.800007,251.795833 265.520006,251.795833 266.240005,251.795833 266.960005,251.795833 267.680004,251.795833 268.400003,251.795833 269.120003,251.795833 269.840002,251.795833 270.560001,251.795833 271.280001,251.795833 272.000000,251.795833 272.719999,251.795833 273.439999,251.795833 274.159998,251.795833 274.879997,251.795833 275.599997,251.795833 276.319996,251.795833 277.039995,251.795833 277.759995,251.795833 278.479994,251.795833 279.199993,251.795833 279.919992,251.795833 280.639992,251.795833 281.360008,251.795833 282.080008,251.795833 282.800007,251.795833 283.520006,251.795833 284.240005,251.795833 284.960005,251.795833 285.680004,251.795833 286.400003,251.795833 287.120003,251.795833 287.840002,251.795833 288.560001,251.795833 289.280001,251.795833 290.000000,251.795833 290.000000,251.795833 290.719999,251.795833 291.439999,251.795833 292.159998,251.795833 292.879997,251.795833 293.599997,251.795833 294.319996,251.795833 295.039995,251.795833 295.759995,251.795833 296.479994,251.795833 297.199993,251.795833 297.919992,251.795833 298.639992,251.795833 299.360008,251.795833 300.080008,251.795833 300.800007,251.795833 301.520006,251.795833 302.240005,251.795833 302.960005,251.795833 303.680004,251.795833 304.400003,251.795833 305.120003,251.795833 305.840002,251.795833 306.560001,251.795833 307.280001,251.795833 308.000000,251.795833 308.719999,251.795833 309.439999,251.795833 310.159998,251.795833 310.879997,251.795833 311.599997,251.795833 312.319996,251.795833 313.039995,251.795833 313.759995,251.795833 314.479994,251.795833 315.199993,251.795833 315.919992,251.795833 316.639992,251.795833 317.360008,251.795833 318.080008,251.795833 318.800007,251.795833 319.520006,251.795833 320.240005,251.795833 320.960005,251.795833 321.680004,251.795833 322.400003,251.795833 323.120003,251.795833 323.840002,251.795833 324.560001,251.795833 325.280001,251.795833 326.000000,251.795833 326.000000,319.612500 326.719999,319.612500 327.439999,319.612500 328.159998,319.612500 328.879997,319.612500 329.599997,319.612500 330.319996,319.612500 331.039995,319.612500 331.759995,319.612500 332.479994,319.612500 333.199993,319.612500 333.919992,319.612500 334.639992,319.612500 335.360008,319.612500 336.080008,319.612500 336.800007,319.612500 337.520006,319.612500 338.240005,319.612500 338.960005,319.612500 339.680004,319.612500 340.400003,319.612500 341.120003,319.612500 341.840002,319.612500 342.560001,319.612500 343.280001,319.612500 344.000000,319.612500 344.719999,319.612500 345.439999,319.612500 346.159998,319.612500 346.879997,319.612500 347.599997,319.612500 348.319996,319.612500 349.039995,319.612500 349.759995,319.612500 350.479994,319.612500 351.199993,319.612500 351.919992,319.612500 352.639992,319.612500 353.360008,319.612500 354.080008,319.612500 354.800007,319.612500 355.520006,319.612500 356.240005,319.612500 356.960005,319.612500 357.680004,319.612500 358.400003,319.612500 359.120003,319.612500 359.840002,319.612500 360.560001,319.612500 361.280001,319.612500 362.000000,319.612500 362.000000,319.612500 362.719999,319.612500 363.439999,319.612500 364.159998,319.612500 364.879997,319.612500 365.599997,319.612500 366.319996,319.612500 367.039995,319.612500 367.759995,319.612500 368.479994,319.612500 369.199993,319.612500 369.919992,319.612500 370.639992,319.612500 371.360008,319.612500 372.080008,319.612500 372.800007,319.612500 373.520006,319.612500 374.240005,319.612500 374.960005,319.612500 375.680004,319.612500 376.400003,319.612500 377.120003,319.612500 377.840002,319.612500 378.560001,319.612500 379.280001,319.612500 380.000000,319.612500 380.719999,319.612500 381.439999,319.612500 382.159998,319.612500 382.879997,319.612500 383.599997,319.612500 384.319996,319.612500 385.039995,319.612500 385.759995,319.612500 386.479994,319.612500 387.199993,319.612500 387.919992,319.612500 388.639992,319.612500 389.360008,319.612500 390.080008,319.612500 390.800007,319.612500 391.520006,319.612500 392.240005,319.612500 392.960005,319.612500 393.680004,319.612500 394.400003,319.612500 395.120003,319.612500 395.840002,319.612500 396.560001,319.612500 397.280001,319.612500 398.000000,319.612500 398.000000,319.612500 398.720016,319.612500 399.439999,319.612500 400.160015,319.612500 400.879997,319.612500 401.600014,319.612500 402.319996,319.612500 403.040012,319.612500 403.759995,319.612500 404.480011,319.612500 405.199993,319.612500 405.920010,319.612500 406.639992,319.612500 407.360008,319.612500 408.079990,319.612500 408.800007,319.612500 409.519989,319.612500 410.240005,319.612500 410.959988,319.612500 411.680004,319.612500 412.399986,319.612500 413.120003,319.612500 413.839985,319.612500 414.560001,319.612500 415.279984,319.612500 416.000000,319.612500 416.720016,319.612500 417.439999,319.612500 418.160015,319.612500 418.879997,319.612500 419.600014,319.612500 420.319996,319.612500 421.040012,319.612500 421.759995,319.612500 422.480011,319.612500 423.199993,319.612500 423.920010,319.612500 424.639992,319.612500 425.360008,319.612500 426.079990,319.612500 426.800007,319.612500 427.519989,319.612500 428.240005,319.612500 428.959988,319.612500 429.680004,319.612500 430.399986,319.612500 431.120003,319.612500 431.839985,319.612500 432.560001,319.612500 433.279984,319.612500 434.000000,319.612500 434.000000,319.612500 434.720016,319.612500 435.439999,319.612500 436.160015,319.612500 436.879997,319.612500 437.600014,319.612500 438.319996,319.612500 439.040012,319.612500 439.759995,319.612500 440.480011,319.612500 441.199993,319.612500 441.920010,319.612500 442.639992,319.612500 443.360008,319.612500 444.079990,319.612500 444.800007,319.612500 445.519989,319.612500 446.240005,319.612500 446.959988,319.612500 447.680004,319.612500 448.399986,319.612500 449.120003,319.612500 449.839985,319.612500 450.560001,319.612500 451.279984,319.612500 452.000000,319.612500 452.720016,319.612500 453.439999,319.612500 454.160015,319.612500 454.879997,319.612500 455.600014,319.612500 456.319996,319.612500 457.040012,319.612500 457.759995,319.612500 458.480011,319.612500 459.199993,319.612500 459.920010,319.612500 460.639992,319.612500 461.360008,319.612500 462.079990,319.612500 462.800007,319.612500 463.519989,319.612500 464.240005,319.612500 464.959988,319.612500 465.680004,319.612500 466.399986,319.612500 467.120003,319.612500 467.839985,319.612500 468.560001,319.612500 469.279984,319.612500 470.000000,319.612500 470.000000,251.795833"
+     id="polyline3820"
+     transform="translate(1040.1806,39.342803)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1153.1804"
+     y="83.842758"
+     id="text3822">swiCleInp.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1153.1804"
+     y="178.84276"
+     id="text3824">swiCleInp.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1153.1804"
+     y="273.84274"
+     id="text3826">swiCleInp.y</text>
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline3828"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,433.000000 182.000000,746.000000"
+     id="polyline3830"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,433.000000 254.000000,746.000000"
+     id="polyline3832"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,433.000000 326.000000,746.000000"
+     id="polyline3834"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,433.000000 398.000000,746.000000"
+     id="polyline3836"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 470.000000,746.000000"
+     id="polyline3838"
+     transform="translate(1040.1806,88.526136)" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1157.8311"
-     y="531.93115"
-     width="389"
-     height="67.816704"
-     id="rect103-5" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1150.1804"
+     y="548.8222"
+     width="360"
+     height="68"
+     id="rect3840" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1157.8311"
-     y="627.13617"
-     width="389"
-     height="67.816704"
-     id="rect105-61" />
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1150.1804"
+     y="644.02606"
+     width="360"
+     height="68"
+     id="rect3842" />
   <rect
-     style="fill:#f0f0f0;stroke:#f0f0f0;stroke-width:1;stroke-opacity:1"
-     x="1157.8311"
-     y="722.34021"
-     width="389"
-     height="67.816704"
-     id="rect107-1" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 499.000000,747.000000"
-     id="polyline109-5" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,434.000000"
-     id="polyline111-9" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,434.000000 110.000000,434.000000"
-     id="polyline113-8" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,434.000000 110.000000,747.000000"
-     id="polyline115-4" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,755.000000"
-     id="polyline117-8" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="187.800000,747.000000 187.800000,755.000000"
-     id="polyline119-1" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,755.000000"
-     id="polyline121-0" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="343.400000,747.000000 343.400000,755.000000"
-     id="polyline123-3" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,755.000000"
-     id="polyline125-0" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="499.000000,747.000000 499.000000,755.000000"
-     id="polyline127-4" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="110.000000,747.000000 110.000000,759.800000"
-     id="polyline129-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1157.8311"
-     y="849.04419"
-     id="text131-4">0</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="265.600000,747.000000 265.600000,759.800000"
-     id="polyline133-4" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1313.431"
-     y="849.04419"
-     id="text135-76">4</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="421.200000,747.000000 421.200000,759.800000"
-     id="polyline137-3" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:middle;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1469.0311"
-     y="849.04419"
-     id="text139-1">8</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,529.204167 110.000000,529.204167"
-     id="polyline141-7" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="599.74817"
-     id="text143-59">false</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,461.387500 110.000000,461.387500"
-     id="polyline145-6" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="531.93115"
-     id="text147-2">true</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,624.408333 110.000000,624.408333"
-     id="polyline149-1" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="694.95221"
-     id="text151-7">false</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,556.591667 110.000000,556.591667"
-     id="polyline153-8" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="627.13617"
-     id="text155-5">true</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,719.612500 110.000000,719.612500"
-     id="polyline157-74" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="790.15619"
-     id="text159-1">false</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1"
-     points="102.000000,651.795833 110.000000,651.795833"
-     id="polyline161-8" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:end;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1141.8311"
-     y="722.34021"
-     id="text163-5">true</text>
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-6)"
-     points="110.000000,461.387500 110.778000,461.387500 111.556000,461.387500 112.334000,461.387500 113.112000,461.387500 113.890000,461.387500 114.668000,461.387500 115.446000,461.387500 116.224000,461.387500 117.002000,461.387500 117.780000,461.387500 118.558000,461.387500 119.336000,461.387500 120.114000,461.387500 120.892000,461.387500 121.670000,461.387500 122.448000,461.387500 123.226000,461.387500 124.004001,461.387500 124.782000,461.387500 125.560000,461.387500 126.337999,461.387500 127.116000,461.387500 127.894000,461.387500 128.672000,461.387500 129.450000,461.387500 130.227999,461.387500 131.006001,461.387500 131.784000,461.387500 132.561999,461.387500 133.340001,461.387500 134.118000,461.387500 134.895999,461.387500 135.674001,461.387500 136.452000,461.387500 137.230000,461.387500 138.008001,461.387500 138.786000,461.387500 139.564000,461.387500 140.341999,461.387500 141.120000,461.387500 141.898000,461.387500 142.675999,461.387500 143.454001,461.387500 144.232000,461.387500 145.009999,461.387500 145.788001,461.387500 146.566000,461.387500 147.343999,461.387500 148.122001,461.387500 148.900000,461.387500 148.900000,529.204167 148.900000,529.204167 148.900000,529.204167 149.677999,529.204167 150.455999,529.204167 151.233998,529.204167 152.012002,529.204167 152.790001,529.204167 153.568000,529.204167 154.345999,529.204167 155.123999,529.204167 155.901998,529.204167 156.680002,529.204167 157.458001,529.204167 158.236000,529.204167 159.014000,529.204167 159.791999,529.204167 160.569998,529.204167 161.348002,529.204167 162.126001,529.204167 162.904001,529.204167 163.682000,529.204167 164.459999,529.204167 165.237998,529.204167 166.016002,529.204167 166.794001,529.204167 167.572001,529.204167 168.350000,529.204167 169.127999,529.204167 169.905999,529.204167 170.683998,529.204167 171.462002,529.204167 172.240001,529.204167 173.018000,529.204167 173.795999,529.204167 174.573999,529.204167 175.351998,529.204167 176.130002,529.204167 176.908001,529.204167 177.686000,529.204167 178.464000,529.204167 179.241999,529.204167 180.019998,529.204167 180.798002,529.204167 181.576001,529.204167 182.354001,529.204167 183.132000,529.204167 183.909999,529.204167 184.687998,529.204167 185.466002,529.204167 186.244001,529.204167 187.022001,529.204167 187.800000,529.204167 187.800000,461.387500 187.800000,461.387500 188.577999,461.387500 189.355999,461.387500 190.133998,461.387500 190.911997,461.387500 191.689996,461.387500 192.467996,461.387500 193.246004,461.387500 194.024003,461.387500 194.802003,461.387500 195.580002,461.387500 196.358001,461.387500 197.136000,461.387500 197.914000,461.387500 198.691999,461.387500 199.469998,461.387500 200.247997,461.387500 201.025997,461.387500 201.803996,461.387500 202.582004,461.387500 203.360004,461.387500 204.138003,461.387500 204.916002,461.387500 205.694001,461.387500 206.472001,461.387500 207.250000,461.387500 208.027999,461.387500 208.805999,461.387500 209.583998,461.387500 210.361997,461.387500 211.139996,461.387500 211.917996,461.387500 212.696004,461.387500 213.474003,461.387500 214.252003,461.387500 215.030002,461.387500 215.808001,461.387500 216.586000,461.387500 217.364000,461.387500 218.141999,461.387500 218.919998,461.387500 219.697997,461.387500 220.475997,461.387500 221.253996,461.387500 222.032004,461.387500 222.810004,461.387500 223.588003,461.387500 224.366002,461.387500 225.144001,461.387500 225.922001,461.387500 226.700000,461.387500 226.700000,529.204167 226.700000,529.204167 227.477999,529.204167 228.255999,529.204167 229.033998,529.204167 229.811997,529.204167 230.589996,529.204167 231.367996,529.204167 232.146004,529.204167 232.924003,529.204167 233.702003,529.204167 234.480002,529.204167 235.258001,529.204167 236.036000,529.204167 236.814000,529.204167 237.591999,529.204167 238.369998,529.204167 239.147997,529.204167 239.925997,529.204167 240.703996,529.204167 241.482004,529.204167 242.260004,529.204167 243.038003,529.204167 243.816002,529.204167 244.594001,529.204167 245.372001,529.204167 246.150000,529.204167 246.927999,529.204167 247.705999,529.204167 248.483998,529.204167 249.261997,529.204167 250.039996,529.204167 250.817996,529.204167 251.596004,529.204167 252.374003,529.204167 253.152003,529.204167 253.930002,529.204167 254.708001,529.204167 255.486000,529.204167 256.264000,529.204167 257.041999,529.204167 257.819998,529.204167 258.597997,529.204167 259.375997,529.204167 260.153996,529.204167 260.932004,529.204167 261.710004,529.204167 262.488003,529.204167 263.266002,529.204167 264.044001,529.204167 264.822001,529.204167 265.600000,529.204167 265.600000,461.387500 265.600000,461.387500 266.377999,461.387500 267.155999,461.387500 267.933998,461.387500 268.711997,461.387500 269.489996,461.387500 270.267996,461.387500 271.045995,461.387500 271.823994,461.387500 272.601993,461.387500 273.379993,461.387500 274.157992,461.387500 274.935991,461.387500 275.714009,461.387500 276.492008,461.387500 277.270007,461.387500 278.048007,461.387500 278.826006,461.387500 279.604005,461.387500 280.382004,461.387500 281.160004,461.387500 281.938003,461.387500 282.716002,461.387500 283.494001,461.387500 284.272001,461.387500 285.050000,461.387500 285.827999,461.387500 286.605999,461.387500 287.383998,461.387500 288.161997,461.387500 288.939996,461.387500 289.717996,461.387500 290.495995,461.387500 291.273994,461.387500 292.051993,461.387500 292.829993,461.387500 293.607992,461.387500 294.385991,461.387500 295.164009,461.387500 295.942008,461.387500 296.720007,461.387500 297.498007,461.387500 298.276006,461.387500 299.054005,461.387500 299.832004,461.387500 300.610004,461.387500 301.388003,461.387500 302.166002,461.387500 302.944001,461.387500 303.722001,461.387500 304.500000,461.387500 304.500000,529.204167 305.277999,529.204167 306.055999,529.204167 306.833998,529.204167 307.611997,529.204167 308.389996,529.204167 309.167996,529.204167 309.945995,529.204167 310.723994,529.204167 311.501993,529.204167 312.279993,529.204167 313.057992,529.204167 313.835991,529.204167 314.614009,529.204167 315.392008,529.204167 316.170007,529.204167 316.948007,529.204167 317.726006,529.204167 318.504005,529.204167 319.282004,529.204167 320.060004,529.204167 320.838003,529.204167 321.616002,529.204167 322.394001,529.204167 323.172001,529.204167 323.950000,529.204167 324.727999,529.204167 325.505999,529.204167 326.283998,529.204167 327.061997,529.204167 327.839996,529.204167 328.617996,529.204167 329.395995,529.204167 330.173994,529.204167 330.951993,529.204167 331.729993,529.204167 332.507992,529.204167 333.285991,529.204167 334.064009,529.204167 334.842008,529.204167 335.620007,529.204167 336.398007,529.204167 337.176006,529.204167 337.954005,529.204167 338.732004,529.204167 339.510004,529.204167 340.288003,529.204167 341.066002,529.204167 341.844001,529.204167 342.622001,529.204167 343.400000,529.204167 343.400000,461.387500 344.177999,461.387500 344.955999,461.387500 345.733998,461.387500 346.511997,461.387500 347.289996,461.387500 348.067996,461.387500 348.845995,461.387500 349.623994,461.387500 350.401993,461.387500 351.179993,461.387500 351.957992,461.387500 352.735991,461.387500 353.514009,461.387500 354.292008,461.387500 355.070007,461.387500 355.848007,461.387500 356.626006,461.387500 357.404005,461.387500 358.182004,461.387500 358.960004,461.387500 359.738003,461.387500 360.516002,461.387500 361.294001,461.387500 362.072001,461.387500 362.850000,461.387500 363.627999,461.387500 364.405999,461.387500 365.183998,461.387500 365.961997,461.387500 366.739996,461.387500 367.517996,461.387500 368.295995,461.387500 369.073994,461.387500 369.851993,461.387500 370.629993,461.387500 371.407992,461.387500 372.185991,461.387500 372.964009,461.387500 373.742008,461.387500 374.520007,461.387500 375.298007,461.387500 376.076006,461.387500 376.854005,461.387500 377.632004,461.387500 378.410004,461.387500 379.188003,461.387500 379.966002,461.387500 380.744001,461.387500 381.522001,461.387500 382.300000,461.387500 382.300000,529.204167 383.077999,529.204167 383.855999,529.204167 384.633998,529.204167 385.411997,529.204167 386.189996,529.204167 386.967996,529.204167 387.745995,529.204167 388.523994,529.204167 389.301993,529.204167 390.079993,529.204167 390.857992,529.204167 391.635991,529.204167 392.414009,529.204167 393.192008,529.204167 393.970007,529.204167 394.748007,529.204167 395.526006,529.204167 396.304005,529.204167 397.082004,529.204167 397.860004,529.204167 398.638003,529.204167 399.416002,529.204167 400.194001,529.204167 400.972001,529.204167 401.750000,529.204167 402.527999,529.204167 403.305999,529.204167 404.083998,529.204167 404.861997,529.204167 405.639996,529.204167 406.417996,529.204167 407.195995,529.204167 407.973994,529.204167 408.751993,529.204167 409.529993,529.204167 410.307992,529.204167 411.085991,529.204167 411.864009,529.204167 412.642008,529.204167 413.420007,529.204167 414.198007,529.204167 414.976006,529.204167 415.754005,529.204167 416.532004,529.204167 417.310004,529.204167 418.088003,529.204167 418.866002,529.204167 419.644001,529.204167 420.422001,529.204167 421.200000,529.204167 421.200000,461.387500 421.978018,461.387500 422.755999,461.387500 423.534016,461.387500 424.311997,461.387500 425.090015,461.387500 425.867996,461.387500 426.646013,461.387500 427.423994,461.387500 428.202012,461.387500 428.979993,461.387500 429.758010,461.387500 430.535991,461.387500 431.314009,461.387500 432.091990,461.387500 432.870007,461.387500 433.647988,461.387500 434.426006,461.387500 435.203987,461.387500 435.982004,461.387500 436.759985,461.387500 437.538003,461.387500 438.315984,461.387500 439.094001,461.387500 439.871982,461.387500 440.650000,461.387500 441.428018,461.387500 442.205999,461.387500 442.984016,461.387500 443.761997,461.387500 444.540015,461.387500 445.317996,461.387500 446.096013,461.387500 446.873994,461.387500 447.652012,461.387500 448.429993,461.387500 449.208010,461.387500 449.985991,461.387500 450.764009,461.387500 451.541990,461.387500 452.320007,461.387500 453.097988,461.387500 453.876006,461.387500 454.653987,461.387500 455.432004,461.387500 456.209985,461.387500 456.988003,461.387500 457.765984,461.387500 458.544001,461.387500 459.321982,461.387500 460.100000,461.387500 460.100000,529.204167 460.878018,529.204167 461.655999,529.204167 462.434016,529.204167 463.211997,529.204167 463.990015,529.204167 464.767996,529.204167 465.546013,529.204167 466.323994,529.204167 467.102012,529.204167 467.879993,529.204167 468.658010,529.204167 469.435991,529.204167 470.214009,529.204167 470.991990,529.204167 471.770007,529.204167 472.547988,529.204167 473.326006,529.204167 474.103987,529.204167 474.882004,529.204167 475.659985,529.204167 476.438003,529.204167 477.215984,529.204167 477.994001,529.204167 478.771982,529.204167 479.550000,529.204167 480.328018,529.204167 481.105999,529.204167 481.884016,529.204167 482.661997,529.204167 483.440015,529.204167 484.217996,529.204167 484.996013,529.204167 485.773994,529.204167 486.552012,529.204167 487.329993,529.204167 488.108010,529.204167 488.885991,529.204167 489.664009,529.204167 490.441990,529.204167 491.220007,529.204167 491.997988,529.204167 492.776006,529.204167 493.553987,529.204167 494.332004,529.204167 495.109985,529.204167 495.888003,529.204167 496.665984,529.204167 497.444001,529.204167 498.221982,529.204167 499.000000,529.204167 499.000000,461.387500"
-     id="polyline168-9" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-6)"
-     points="110.000000,624.408333 110.778000,624.408333 111.556000,624.408333 112.334000,624.408333 113.112000,624.408333 113.890000,624.408333 114.668000,624.408333 115.446000,624.408333 116.224000,624.408333 117.002000,624.408333 117.780000,624.408333 118.558000,624.408333 119.336000,624.408333 120.114000,624.408333 120.892000,624.408333 121.670000,624.408333 122.448000,624.408333 123.226000,624.408333 124.004001,624.408333 124.782000,624.408333 125.560000,624.408333 126.337999,624.408333 127.116000,624.408333 127.894000,624.408333 128.672000,624.408333 129.450000,624.408333 130.227999,624.408333 131.006001,624.408333 131.784000,624.408333 132.561999,624.408333 133.340001,624.408333 134.118000,624.408333 134.895999,624.408333 135.674001,624.408333 136.452000,624.408333 137.230000,624.408333 138.008001,624.408333 138.786000,624.408333 139.564000,624.408333 140.341999,624.408333 141.120000,624.408333 141.898000,624.408333 142.675999,624.408333 143.454001,624.408333 144.232000,624.408333 145.009999,624.408333 145.788001,624.408333 146.566000,624.408333 147.343999,624.408333 148.122001,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 148.900000,624.408333 149.677999,624.408333 150.455999,624.408333 151.233998,624.408333 152.012002,624.408333 152.790001,624.408333 153.568000,624.408333 154.345999,624.408333 155.123999,624.408333 155.901998,624.408333 156.680002,624.408333 157.458001,624.408333 158.236000,624.408333 159.014000,624.408333 159.791999,624.408333 160.569998,624.408333 161.348002,624.408333 162.126001,624.408333 162.904001,624.408333 163.682000,624.408333 164.459999,624.408333 165.237998,624.408333 166.016002,624.408333 166.794001,624.408333 167.572001,624.408333 168.350000,624.408333 169.127999,624.408333 169.905999,624.408333 170.683998,624.408333 171.462002,624.408333 172.240001,624.408333 173.018000,624.408333 173.795999,624.408333 174.573999,624.408333 175.351998,624.408333 176.130002,624.408333 176.908001,624.408333 177.686000,624.408333 178.464000,624.408333 179.241999,624.408333 180.019998,624.408333 180.798002,624.408333 181.576001,624.408333 182.354001,624.408333 183.132000,624.408333 183.909999,624.408333 184.687998,624.408333 185.466002,624.408333 186.244001,624.408333 187.022001,624.408333 187.800000,624.408333 187.800000,624.408333 187.800000,624.408333 188.577999,624.408333 189.355999,624.408333 190.133998,624.408333 190.911997,624.408333 191.689996,624.408333 192.467996,624.408333 193.246004,624.408333 194.024003,624.408333 194.802003,624.408333 195.580002,624.408333 196.358001,624.408333 197.136000,624.408333 197.914000,624.408333 198.691999,624.408333 199.469998,624.408333 200.247997,624.408333 201.025997,624.408333 201.803996,624.408333 202.582004,624.408333 203.360004,624.408333 204.138003,624.408333 204.916002,624.408333 205.694001,624.408333 206.472001,624.408333 207.250000,624.408333 208.027999,624.408333 208.805999,624.408333 209.583998,624.408333 210.361997,624.408333 211.139996,624.408333 211.917996,624.408333 212.696004,624.408333 213.474003,624.408333 214.252003,624.408333 215.030002,624.408333 215.808001,624.408333 216.586000,624.408333 217.364000,624.408333 218.141999,624.408333 218.919998,624.408333 219.697997,624.408333 220.475997,624.408333 221.253996,624.408333 222.032004,624.408333 222.810004,624.408333 223.588003,624.408333 224.366002,624.408333 225.144001,624.408333 225.922001,624.408333 226.700000,624.408333 226.700000,556.591667 226.700000,556.591667 227.477999,556.591667 228.255999,556.591667 229.033998,556.591667 229.811997,556.591667 230.589996,556.591667 231.367996,556.591667 232.146004,556.591667 232.924003,556.591667 233.702003,556.591667 234.480002,556.591667 235.258001,556.591667 236.036000,556.591667 236.814000,556.591667 237.591999,556.591667 238.369998,556.591667 239.147997,556.591667 239.925997,556.591667 240.703996,556.591667 241.482004,556.591667 242.260004,556.591667 243.038003,556.591667 243.816002,556.591667 244.594001,556.591667 245.372001,556.591667 246.150000,556.591667 246.927999,556.591667 247.705999,556.591667 248.483998,556.591667 249.261997,556.591667 250.039996,556.591667 250.817996,556.591667 251.596004,556.591667 252.374003,556.591667 253.152003,556.591667 253.930002,556.591667 254.708001,556.591667 255.486000,556.591667 256.264000,556.591667 257.041999,556.591667 257.819998,556.591667 258.597997,556.591667 259.375997,556.591667 260.153996,556.591667 260.932004,556.591667 261.710004,556.591667 262.488003,556.591667 263.266002,556.591667 264.044001,556.591667 264.822001,556.591667 265.600000,556.591667 265.600000,556.591667 265.600000,556.591667 266.377999,556.591667 267.155999,556.591667 267.933998,556.591667 268.711997,556.591667 269.489996,556.591667 270.267996,556.591667 271.045995,556.591667 271.823994,556.591667 272.601993,556.591667 273.379993,556.591667 274.157992,556.591667 274.935991,556.591667 275.714009,556.591667 276.492008,556.591667 277.270007,556.591667 278.048007,556.591667 278.826006,556.591667 279.604005,556.591667 280.382004,556.591667 281.160004,556.591667 281.938003,556.591667 282.716002,556.591667 283.494001,556.591667 284.272001,556.591667 285.050000,556.591667 285.827999,556.591667 286.605999,556.591667 287.383998,556.591667 288.161997,556.591667 288.939996,556.591667 289.717996,556.591667 290.495995,556.591667 291.273994,556.591667 292.051993,556.591667 292.829993,556.591667 293.607992,556.591667 294.385991,556.591667 295.164009,556.591667 295.942008,556.591667 296.720007,556.591667 297.498007,556.591667 298.276006,556.591667 299.054005,556.591667 299.832004,556.591667 300.610004,556.591667 301.388003,556.591667 302.166002,556.591667 302.944001,556.591667 303.722001,556.591667 304.500000,556.591667 304.500000,556.591667 305.277999,556.591667 306.055999,556.591667 306.833998,556.591667 307.611997,556.591667 308.389996,556.591667 309.167996,556.591667 309.945995,556.591667 310.723994,556.591667 311.501993,556.591667 312.279993,556.591667 313.057992,556.591667 313.835991,556.591667 314.614009,556.591667 315.392008,556.591667 316.170007,556.591667 316.948007,556.591667 317.726006,556.591667 318.504005,556.591667 319.282004,556.591667 320.060004,556.591667 320.838003,556.591667 321.616002,556.591667 322.394001,556.591667 323.172001,556.591667 323.950000,556.591667 324.727999,556.591667 325.505999,556.591667 326.283998,556.591667 327.061997,556.591667 327.839996,556.591667 328.617996,556.591667 329.395995,556.591667 330.173994,556.591667 330.951993,556.591667 331.729993,556.591667 332.507992,556.591667 333.285991,556.591667 334.064009,556.591667 334.842008,556.591667 335.620007,556.591667 336.398007,556.591667 337.176006,556.591667 337.954005,556.591667 338.732004,556.591667 339.510004,556.591667 340.288003,556.591667 341.066002,556.591667 341.844001,556.591667 342.622001,556.591667 343.400000,556.591667 343.400000,624.408333 344.177999,624.408333 344.955999,624.408333 345.733998,624.408333 346.511997,624.408333 347.289996,624.408333 348.067996,624.408333 348.845995,624.408333 349.623994,624.408333 350.401993,624.408333 351.179993,624.408333 351.957992,624.408333 352.735991,624.408333 353.514009,624.408333 354.292008,624.408333 355.070007,624.408333 355.848007,624.408333 356.626006,624.408333 357.404005,624.408333 358.182004,624.408333 358.960004,624.408333 359.738003,624.408333 360.516002,624.408333 361.294001,624.408333 362.072001,624.408333 362.850000,624.408333 363.627999,624.408333 364.405999,624.408333 365.183998,624.408333 365.961997,624.408333 366.739996,624.408333 367.517996,624.408333 368.295995,624.408333 369.073994,624.408333 369.851993,624.408333 370.629993,624.408333 371.407992,624.408333 372.185991,624.408333 372.964009,624.408333 373.742008,624.408333 374.520007,624.408333 375.298007,624.408333 376.076006,624.408333 376.854005,624.408333 377.632004,624.408333 378.410004,624.408333 379.188003,624.408333 379.966002,624.408333 380.744001,624.408333 381.522001,624.408333 382.300000,624.408333 382.300000,624.408333 383.077999,624.408333 383.855999,624.408333 384.633998,624.408333 385.411997,624.408333 386.189996,624.408333 386.967996,624.408333 387.745995,624.408333 388.523994,624.408333 389.301993,624.408333 390.079993,624.408333 390.857992,624.408333 391.635991,624.408333 392.414009,624.408333 393.192008,624.408333 393.970007,624.408333 394.748007,624.408333 395.526006,624.408333 396.304005,624.408333 397.082004,624.408333 397.860004,624.408333 398.638003,624.408333 399.416002,624.408333 400.194001,624.408333 400.972001,624.408333 401.750000,624.408333 402.527999,624.408333 403.305999,624.408333 404.083998,624.408333 404.861997,624.408333 405.639996,624.408333 406.417996,624.408333 407.195995,624.408333 407.973994,624.408333 408.751993,624.408333 409.529993,624.408333 410.307992,624.408333 411.085991,624.408333 411.864009,624.408333 412.642008,624.408333 413.420007,624.408333 414.198007,624.408333 414.976006,624.408333 415.754005,624.408333 416.532004,624.408333 417.310004,624.408333 418.088003,624.408333 418.866002,624.408333 419.644001,624.408333 420.422001,624.408333 421.200000,624.408333 421.200000,624.408333 421.978018,624.408333 422.755999,624.408333 423.534016,624.408333 424.311997,624.408333 425.090015,624.408333 425.867996,624.408333 426.646013,624.408333 427.423994,624.408333 428.202012,624.408333 428.979993,624.408333 429.758010,624.408333 430.535991,624.408333 431.314009,624.408333 432.091990,624.408333 432.870007,624.408333 433.647988,624.408333 434.426006,624.408333 435.203987,624.408333 435.982004,624.408333 436.759985,624.408333 437.538003,624.408333 438.315984,624.408333 439.094001,624.408333 439.871982,624.408333 440.650000,624.408333 441.428018,624.408333 442.205999,624.408333 442.984016,624.408333 443.761997,624.408333 444.540015,624.408333 445.317996,624.408333 446.096013,624.408333 446.873994,624.408333 447.652012,624.408333 448.429993,624.408333 449.208010,624.408333 449.985991,624.408333 450.764009,624.408333 451.541990,624.408333 452.320007,624.408333 453.097988,624.408333 453.876006,624.408333 454.653987,624.408333 455.432004,624.408333 456.209985,624.408333 456.988003,624.408333 457.765984,624.408333 458.544001,624.408333 459.321982,624.408333 460.100000,624.408333 460.100000,556.591667 460.878018,556.591667 461.655999,556.591667 462.434016,556.591667 463.211997,556.591667 463.990015,556.591667 464.767996,556.591667 465.546013,556.591667 466.323994,556.591667 467.102012,556.591667 467.879993,556.591667 468.658010,556.591667 469.435991,556.591667 470.214009,556.591667 470.991990,556.591667 471.770007,556.591667 472.547988,556.591667 473.326006,556.591667 474.103987,556.591667 474.882004,556.591667 475.659985,556.591667 476.438003,556.591667 477.215984,556.591667 477.994001,556.591667 478.771982,556.591667 479.550000,556.591667 480.328018,556.591667 481.105999,556.591667 481.884016,556.591667 482.661997,556.591667 483.440015,556.591667 484.217996,556.591667 484.996013,556.591667 485.773994,556.591667 486.552012,556.591667 487.329993,556.591667 488.108010,556.591667 488.885991,556.591667 489.664009,556.591667 490.441990,556.591667 491.220007,556.591667 491.997988,556.591667 492.776006,556.591667 493.553987,556.591667 494.332004,556.591667 495.109985,556.591667 495.888003,556.591667 496.665984,556.591667 497.444001,556.591667 498.221982,556.591667 499.000000,556.591667 499.000000,556.591667"
-     id="polyline170-7" />
-  <polyline
-     transform="translate(1047.831,70.544171)"
-     style="fill:none;stroke:#1c6cc8;stroke-width:1;stroke-opacity:1"
-     clip-path="url(#clipArea2-6)"
-     points="110.000000,719.612500 110.778000,719.612500 111.556000,719.612500 112.334000,719.612500 113.112000,719.612500 113.890000,719.612500 114.668000,719.612500 115.446000,719.612500 116.224000,719.612500 117.002000,719.612500 117.780000,719.612500 118.558000,719.612500 119.336000,719.612500 120.114000,719.612500 120.892000,719.612500 121.670000,719.612500 122.448000,719.612500 123.226000,719.612500 124.004001,719.612500 124.782000,719.612500 125.560000,719.612500 126.337999,719.612500 127.116000,719.612500 127.894000,719.612500 128.672000,719.612500 129.450000,719.612500 130.227999,719.612500 131.006001,719.612500 131.784000,719.612500 132.561999,719.612500 133.340001,719.612500 134.118000,719.612500 134.895999,719.612500 135.674001,719.612500 136.452000,719.612500 137.230000,719.612500 138.008001,719.612500 138.786000,719.612500 139.564000,719.612500 140.341999,719.612500 141.120000,719.612500 141.898000,719.612500 142.675999,719.612500 143.454001,719.612500 144.232000,719.612500 145.009999,719.612500 145.788001,719.612500 146.566000,719.612500 147.343999,719.612500 148.122001,719.612500 148.900000,719.612500 148.900000,719.612500 148.900000,719.612500 148.900000,719.612500 149.677999,719.612500 150.455999,719.612500 151.233998,719.612500 152.012002,719.612500 152.790001,719.612500 153.568000,719.612500 154.345999,719.612500 155.123999,719.612500 155.901998,719.612500 156.680002,719.612500 157.458001,719.612500 158.236000,719.612500 159.014000,719.612500 159.791999,719.612500 160.569998,719.612500 161.348002,719.612500 162.126001,719.612500 162.904001,719.612500 163.682000,719.612500 164.459999,719.612500 165.237998,719.612500 166.016002,719.612500 166.794001,719.612500 167.572001,719.612500 168.350000,719.612500 169.127999,719.612500 169.905999,719.612500 170.683998,719.612500 171.462002,719.612500 172.240001,719.612500 173.018000,719.612500 173.795999,719.612500 174.573999,719.612500 175.351998,719.612500 176.130002,719.612500 176.908001,719.612500 177.686000,719.612500 178.464000,719.612500 179.241999,719.612500 180.019998,719.612500 180.798002,719.612500 181.576001,719.612500 182.354001,719.612500 183.132000,719.612500 183.909999,719.612500 184.687998,719.612500 185.466002,719.612500 186.244001,719.612500 187.022001,719.612500 187.800000,719.612500 187.800000,651.795833 187.800000,651.795833 188.577999,651.795833 189.355999,651.795833 190.133998,651.795833 190.911997,651.795833 191.689996,651.795833 192.467996,651.795833 193.246004,651.795833 194.024003,651.795833 194.802003,651.795833 195.580002,651.795833 196.358001,651.795833 197.136000,651.795833 197.914000,651.795833 198.691999,651.795833 199.469998,651.795833 200.247997,651.795833 201.025997,651.795833 201.803996,651.795833 202.582004,651.795833 203.360004,651.795833 204.138003,651.795833 204.916002,651.795833 205.694001,651.795833 206.472001,651.795833 207.250000,651.795833 208.027999,651.795833 208.805999,651.795833 209.583998,651.795833 210.361997,651.795833 211.139996,651.795833 211.917996,651.795833 212.696004,651.795833 213.474003,651.795833 214.252003,651.795833 215.030002,651.795833 215.808001,651.795833 216.586000,651.795833 217.364000,651.795833 218.141999,651.795833 218.919998,651.795833 219.697997,651.795833 220.475997,651.795833 221.253996,651.795833 222.032004,651.795833 222.810004,651.795833 223.588003,651.795833 224.366002,651.795833 225.144001,651.795833 225.922001,651.795833 226.700000,651.795833 226.700000,719.612500 226.700000,719.612500 227.477999,719.612500 228.255999,719.612500 229.033998,719.612500 229.811997,719.612500 230.589996,719.612500 231.367996,719.612500 232.146004,719.612500 232.924003,719.612500 233.702003,719.612500 234.480002,719.612500 235.258001,719.612500 236.036000,719.612500 236.814000,719.612500 237.591999,719.612500 238.369998,719.612500 239.147997,719.612500 239.925997,719.612500 240.703996,719.612500 241.482004,719.612500 242.260004,719.612500 243.038003,719.612500 243.816002,719.612500 244.594001,719.612500 245.372001,719.612500 246.150000,719.612500 246.927999,719.612500 247.705999,719.612500 248.483998,719.612500 249.261997,719.612500 250.039996,719.612500 250.817996,719.612500 251.596004,719.612500 252.374003,719.612500 253.152003,719.612500 253.930002,719.612500 254.708001,719.612500 255.486000,719.612500 256.264000,719.612500 257.041999,719.612500 257.819998,719.612500 258.597997,719.612500 259.375997,719.612500 260.153996,719.612500 260.932004,719.612500 261.710004,719.612500 262.488003,719.612500 263.266002,719.612500 264.044001,719.612500 264.822001,719.612500 265.600000,719.612500 265.600000,719.612500 265.600000,719.612500 266.377999,719.612500 267.155999,719.612500 267.933998,719.612500 268.711997,719.612500 269.489996,719.612500 270.267996,719.612500 271.045995,719.612500 271.823994,719.612500 272.601993,719.612500 273.379993,719.612500 274.157992,719.612500 274.935991,719.612500 275.714009,719.612500 276.492008,719.612500 277.270007,719.612500 278.048007,719.612500 278.826006,719.612500 279.604005,719.612500 280.382004,719.612500 281.160004,719.612500 281.938003,719.612500 282.716002,719.612500 283.494001,719.612500 284.272001,719.612500 285.050000,719.612500 285.827999,719.612500 286.605999,719.612500 287.383998,719.612500 288.161997,719.612500 288.939996,719.612500 289.717996,719.612500 290.495995,719.612500 291.273994,719.612500 292.051993,719.612500 292.829993,719.612500 293.607992,719.612500 294.385991,719.612500 295.164009,719.612500 295.942008,719.612500 296.720007,719.612500 297.498007,719.612500 298.276006,719.612500 299.054005,719.612500 299.832004,719.612500 300.610004,719.612500 301.388003,719.612500 302.166002,719.612500 302.944001,719.612500 303.722001,719.612500 304.500000,719.612500 304.500000,719.612500 305.277999,719.612500 306.055999,719.612500 306.833998,719.612500 307.611997,719.612500 308.389996,719.612500 309.167996,719.612500 309.945995,719.612500 310.723994,719.612500 311.501993,719.612500 312.279993,719.612500 313.057992,719.612500 313.835991,719.612500 314.614009,719.612500 315.392008,719.612500 316.170007,719.612500 316.948007,719.612500 317.726006,719.612500 318.504005,719.612500 319.282004,719.612500 320.060004,719.612500 320.838003,719.612500 321.616002,719.612500 322.394001,719.612500 323.172001,719.612500 323.950000,719.612500 324.727999,719.612500 325.505999,719.612500 326.283998,719.612500 327.061997,719.612500 327.839996,719.612500 328.617996,719.612500 329.395995,719.612500 330.173994,719.612500 330.951993,719.612500 331.729993,719.612500 332.507992,719.612500 333.285991,719.612500 334.064009,719.612500 334.842008,719.612500 335.620007,719.612500 336.398007,719.612500 337.176006,719.612500 337.954005,719.612500 338.732004,719.612500 339.510004,719.612500 340.288003,719.612500 341.066002,719.612500 341.844001,719.612500 342.622001,719.612500 343.400000,719.612500 343.400000,651.795833 344.177999,651.795833 344.955999,651.795833 345.733998,651.795833 346.511997,651.795833 347.289996,651.795833 348.067996,651.795833 348.845995,651.795833 349.623994,651.795833 350.401993,651.795833 351.179993,651.795833 351.957992,651.795833 352.735991,651.795833 353.514009,651.795833 354.292008,651.795833 355.070007,651.795833 355.848007,651.795833 356.626006,651.795833 357.404005,651.795833 358.182004,651.795833 358.960004,651.795833 359.738003,651.795833 360.516002,651.795833 361.294001,651.795833 362.072001,651.795833 362.850000,651.795833 363.627999,651.795833 364.405999,651.795833 365.183998,651.795833 365.961997,651.795833 366.739996,651.795833 367.517996,651.795833 368.295995,651.795833 369.073994,651.795833 369.851993,651.795833 370.629993,651.795833 371.407992,651.795833 372.185991,651.795833 372.964009,651.795833 373.742008,651.795833 374.520007,651.795833 375.298007,651.795833 376.076006,651.795833 376.854005,651.795833 377.632004,651.795833 378.410004,651.795833 379.188003,651.795833 379.966002,651.795833 380.744001,651.795833 381.522001,651.795833 382.300000,651.795833 382.300000,651.795833 383.077999,651.795833 383.855999,651.795833 384.633998,651.795833 385.411997,651.795833 386.189996,651.795833 386.967996,651.795833 387.745995,651.795833 388.523994,651.795833 389.301993,651.795833 390.079993,651.795833 390.857992,651.795833 391.635991,651.795833 392.414009,651.795833 393.192008,651.795833 393.970007,651.795833 394.748007,651.795833 395.526006,651.795833 396.304005,651.795833 397.082004,651.795833 397.860004,651.795833 398.638003,651.795833 399.416002,651.795833 400.194001,651.795833 400.972001,651.795833 401.750000,651.795833 402.527999,651.795833 403.305999,651.795833 404.083998,651.795833 404.861997,651.795833 405.639996,651.795833 406.417996,651.795833 407.195995,651.795833 407.973994,651.795833 408.751993,651.795833 409.529993,651.795833 410.307992,651.795833 411.085991,651.795833 411.864009,651.795833 412.642008,651.795833 413.420007,651.795833 414.198007,651.795833 414.976006,651.795833 415.754005,651.795833 416.532004,651.795833 417.310004,651.795833 418.088003,651.795833 418.866002,651.795833 419.644001,651.795833 420.422001,651.795833 421.200000,651.795833 421.200000,719.612500 421.978018,719.612500 422.755999,719.612500 423.534016,719.612500 424.311997,719.612500 425.090015,719.612500 425.867996,719.612500 426.646013,719.612500 427.423994,719.612500 428.202012,719.612500 428.979993,719.612500 429.758010,719.612500 430.535991,719.612500 431.314009,719.612500 432.091990,719.612500 432.870007,719.612500 433.647988,719.612500 434.426006,719.612500 435.203987,719.612500 435.982004,719.612500 436.759985,719.612500 437.538003,719.612500 438.315984,719.612500 439.094001,719.612500 439.871982,719.612500 440.650000,719.612500 441.428018,719.612500 442.205999,719.612500 442.984016,719.612500 443.761997,719.612500 444.540015,719.612500 445.317996,719.612500 446.096013,719.612500 446.873994,719.612500 447.652012,719.612500 448.429993,719.612500 449.208010,719.612500 449.985991,719.612500 450.764009,719.612500 451.541990,719.612500 452.320007,719.612500 453.097988,719.612500 453.876006,719.612500 454.653987,719.612500 455.432004,719.612500 456.209985,719.612500 456.988003,719.612500 457.765984,719.612500 458.544001,719.612500 459.321982,719.612500 460.100000,719.612500 460.100000,719.612500 460.878018,719.612500 461.655999,719.612500 462.434016,719.612500 463.211997,719.612500 463.990015,719.612500 464.767996,719.612500 465.546013,719.612500 466.323994,719.612500 467.102012,719.612500 467.879993,719.612500 468.658010,719.612500 469.435991,719.612500 470.214009,719.612500 470.991990,719.612500 471.770007,719.612500 472.547988,719.612500 473.326006,719.612500 474.103987,719.612500 474.882004,719.612500 475.659985,719.612500 476.438003,719.612500 477.215984,719.612500 477.994001,719.612500 478.771982,719.612500 479.550000,719.612500 480.328018,719.612500 481.105999,719.612500 481.884016,719.612500 482.661997,719.612500 483.440015,719.612500 484.217996,719.612500 484.996013,719.612500 485.773994,719.612500 486.552012,719.612500 487.329993,719.612500 488.108010,719.612500 488.885991,719.612500 489.664009,719.612500 490.441990,719.612500 491.220007,719.612500 491.997988,719.612500 492.776006,719.612500 493.553987,719.612500 494.332004,719.612500 495.109985,719.612500 495.888003,719.612500 496.665984,719.612500 497.444001,719.612500 498.221982,719.612500 499.000000,719.612500 499.000000,719.612500"
-     id="polyline172-5" />
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1160.8311"
-     y="515.04419"
-     id="text174-3">swiCleInp1.u</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1160.8311"
-     y="610.04419"
-     id="text176-8">swiCleInp1.clr</text>
-  <text
-     style="font-size:22px;font-family:helvetica;dominant-baseline:central;text-anchor:start;fill:#000000"
-     font-size="22"
-     dominant-baseline="central"
-     x="1160.8311"
-     y="705.04419"
-     id="text178-8">swiCleInp1.y</text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="69.230164"
-     y="46.469147"
-     id="text995"><tspan
-       sodipodi:role="line"
-       id="tspan1118"
-       x="69.230164"
-       y="46.469147">clear input: false</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026417px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="68.61377"
-     y="490.34314"
-     id="text995-4"><tspan
-       sodipodi:role="line"
-       id="tspan1120"
-       x="68.61377"
-       y="490.34314">clear input: true</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026411px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="611.24707"
-     y="485.66162"
-     id="text995-4-2"><tspan
-       sodipodi:role="line"
-       id="tspan1124"
-       x="611.24707"
-       y="485.66162">initial output value: true</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81066704px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62026417px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="611.85925"
-     y="47.553757"
-     id="text995-4-2-9"><tspan
-       sodipodi:role="line"
-       id="tspan1122"
-       x="611.85925"
-       y="47.553757">initial output value: false</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.11199951px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.6027832px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="1152.5398"
-     y="17.577742"
-     id="text995-4-2-9-5"><tspan
-       sodipodi:role="line"
-       id="tspan1480"
-       x="1152.5398"
-       y="17.577742">At same moments, </tspan><tspan
-       sodipodi:role="line"
-       id="tspan1482"
-       x="1152.5398"
-       y="47.717743">toggle input rises (falls), clear input rises (falls)</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1484"
-       x="1152.5398"
-       y="77.857742" /></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.11199951px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.6027832px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="1151.3545"
-     y="459.30414"
-     id="text995-4-2-9-5-8"><tspan
-       sodipodi:role="line"
-       id="tspan1486"
-       x="1151.3545"
-       y="459.30414">At same moments, </tspan><tspan
-       sodipodi:role="line"
-       id="tspan1488"
-       x="1151.3545"
-       y="489.44415">toggle input falls (rises), clear input rises (falls)</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1490"
-       x="1151.3545"
-       y="519.58411" /></text>
+     fill="#f0f0f0"
+     stroke="#f0f0f0"
+     stroke-width="1"
+     stroke-opacity="1"
+     x="1150.1804"
+     y="739.23004"
+     width="360"
+     height="68"
+     id="rect3844" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 470.000000,746.000000"
+     id="polyline3846"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,433.000000"
+     id="polyline3848"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,433.000000 110.000000,433.000000"
+     id="polyline3850"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,433.000000 110.000000,746.000000"
+     id="polyline3852"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,754.000000"
+     id="polyline3854"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="182.000000,746.000000 182.000000,754.000000"
+     id="polyline3856"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,754.000000"
+     id="polyline3858"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="326.000000,746.000000 326.000000,754.000000"
+     id="polyline3860"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,754.000000"
+     id="polyline3862"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="470.000000,746.000000 470.000000,754.000000"
+     id="polyline3864"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="110.000000,746.000000 110.000000,758.800000"
+     id="polyline3866"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1150.1804"
+     y="866.02594"
+     id="text3868">0</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="254.000000,746.000000 254.000000,758.800000"
+     id="polyline3870"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1294.1804"
+     y="866.02594"
+     id="text3872">4</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="398.000000,746.000000 398.000000,758.800000"
+     id="polyline3874"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1438.1804"
+     y="866.02594"
+     id="text3876">8</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,528.204167 110.000000,528.204167"
+     id="polyline3878"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="616.73016"
+     id="text3880">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,460.387500 110.000000,460.387500"
+     id="polyline3882"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="548.91302"
+     id="text3884">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,623.408333 110.000000,623.408333"
+     id="polyline3886"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="711.93414"
+     id="text3888">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,555.591667 110.000000,555.591667"
+     id="polyline3890"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="644.1181"
+     id="text3892">true</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,718.612500 110.000000,718.612500"
+     id="polyline3894"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="807.138"
+     id="text3896">false</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-width="1"
+     stroke-opacity="1"
+     points="102.000000,650.795833 110.000000,650.795833"
+     id="polyline3898"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="1134.1804"
+     y="739.32208"
+     id="text3900">true</text>
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-66)"
+     points="110.000000,460.387500 110.720000,460.387500 111.440000,460.387500 112.160000,460.387500 112.880000,460.387500 113.600000,460.387500 114.320000,460.387500 115.040000,460.387500 115.760000,460.387500 116.480000,460.387500 117.200000,460.387500 117.920000,460.387500 118.640000,460.387500 119.360000,460.387500 120.080000,460.387500 120.800000,460.387500 121.520000,460.387500 122.240000,460.387500 122.960001,460.387500 123.680000,460.387500 124.400000,460.387500 125.120000,460.387500 125.840000,460.387500 126.560000,460.387500 127.280000,460.387500 128.000000,460.387500 128.719999,460.387500 129.440001,460.387500 130.160000,460.387500 130.879999,460.387500 131.600001,460.387500 132.320000,460.387500 133.039999,460.387500 133.760001,460.387500 134.480000,460.387500 135.200000,460.387500 135.920001,460.387500 136.640000,460.387500 137.360000,460.387500 138.079999,460.387500 138.800000,460.387500 139.520000,460.387500 140.239999,460.387500 140.960001,460.387500 141.680000,460.387500 142.399999,460.387500 143.120001,460.387500 143.840000,460.387500 144.559999,460.387500 145.280001,460.387500 146.000000,460.387500 146.000000,528.204167 146.000000,528.204167 146.719999,528.204167 147.439999,528.204167 148.159998,528.204167 148.880002,528.204167 149.600001,528.204167 150.320000,528.204167 151.039999,528.204167 151.759999,528.204167 152.479998,528.204167 153.200002,528.204167 153.920001,528.204167 154.640000,528.204167 155.360000,528.204167 156.079999,528.204167 156.799998,528.204167 157.520002,528.204167 158.240001,528.204167 158.960001,528.204167 159.680000,528.204167 160.399999,528.204167 161.119998,528.204167 161.840002,528.204167 162.560001,528.204167 163.280001,528.204167 164.000000,528.204167 164.719999,528.204167 165.439999,528.204167 166.159998,528.204167 166.880002,528.204167 167.600001,528.204167 168.320000,528.204167 169.039999,528.204167 169.759999,528.204167 170.479998,528.204167 171.200002,528.204167 171.920001,528.204167 172.640000,528.204167 173.360000,528.204167 174.079999,528.204167 174.799998,528.204167 175.520002,528.204167 176.240001,528.204167 176.960001,528.204167 177.680000,528.204167 178.399999,528.204167 179.119998,528.204167 179.840002,528.204167 180.560001,528.204167 181.280001,528.204167 182.000000,528.204167 182.000000,460.387500 182.000000,460.387500 182.719999,460.387500 183.439999,460.387500 184.159998,460.387500 184.879997,460.387500 185.599997,460.387500 186.319996,460.387500 187.040004,460.387500 187.760003,460.387500 188.480002,460.387500 189.200002,460.387500 189.920001,460.387500 190.640000,460.387500 191.360000,460.387500 192.079999,460.387500 192.799998,460.387500 193.519998,460.387500 194.239997,460.387500 194.959996,460.387500 195.680004,460.387500 196.400003,460.387500 197.120003,460.387500 197.840002,460.387500 198.560001,460.387500 199.280001,460.387500 200.000000,460.387500 200.719999,460.387500 201.439999,460.387500 202.159998,460.387500 202.879997,460.387500 203.599997,460.387500 204.319996,460.387500 205.040004,460.387500 205.760003,460.387500 206.480002,460.387500 207.200002,460.387500 207.920001,460.387500 208.640000,460.387500 209.360000,460.387500 210.079999,460.387500 210.799998,460.387500 211.519998,460.387500 212.239997,460.387500 212.959996,460.387500 213.680004,460.387500 214.400003,460.387500 215.120003,460.387500 215.840002,460.387500 216.560001,460.387500 217.280001,460.387500 218.000000,460.387500 218.000000,528.204167 218.000000,528.204167 218.719999,528.204167 219.439999,528.204167 220.159998,528.204167 220.879997,528.204167 221.599997,528.204167 222.319996,528.204167 223.040004,528.204167 223.760003,528.204167 224.480002,528.204167 225.200002,528.204167 225.920001,528.204167 226.640000,528.204167 227.360000,528.204167 228.079999,528.204167 228.799998,528.204167 229.519998,528.204167 230.239997,528.204167 230.959996,528.204167 231.680004,528.204167 232.400003,528.204167 233.120003,528.204167 233.840002,528.204167 234.560001,528.204167 235.280001,528.204167 236.000000,528.204167 236.719999,528.204167 237.439999,528.204167 238.159998,528.204167 238.879997,528.204167 239.599997,528.204167 240.319996,528.204167 241.040004,528.204167 241.760003,528.204167 242.480002,528.204167 243.200002,528.204167 243.920001,528.204167 244.640000,528.204167 245.360000,528.204167 246.079999,528.204167 246.799998,528.204167 247.519998,528.204167 248.239997,528.204167 248.959996,528.204167 249.680004,528.204167 250.400003,528.204167 251.120003,528.204167 251.840002,528.204167 252.560001,528.204167 253.280001,528.204167 254.000000,528.204167 254.000000,460.387500 254.000000,460.387500 254.719999,460.387500 255.439999,460.387500 256.159998,460.387500 256.879997,460.387500 257.599997,460.387500 258.319996,460.387500 259.039995,460.387500 259.759995,460.387500 260.479994,460.387500 261.199993,460.387500 261.919992,460.387500 262.639992,460.387500 263.360008,460.387500 264.080008,460.387500 264.800007,460.387500 265.520006,460.387500 266.240005,460.387500 266.960005,460.387500 267.680004,460.387500 268.400003,460.387500 269.120003,460.387500 269.840002,460.387500 270.560001,460.387500 271.280001,460.387500 272.000000,460.387500 272.719999,460.387500 273.439999,460.387500 274.159998,460.387500 274.879997,460.387500 275.599997,460.387500 276.319996,460.387500 277.039995,460.387500 277.759995,460.387500 278.479994,460.387500 279.199993,460.387500 279.919992,460.387500 280.639992,460.387500 281.360008,460.387500 282.080008,460.387500 282.800007,460.387500 283.520006,460.387500 284.240005,460.387500 284.960005,460.387500 285.680004,460.387500 286.400003,460.387500 287.120003,460.387500 287.840002,460.387500 288.560001,460.387500 289.280001,460.387500 290.000000,460.387500 290.000000,528.204167 290.719999,528.204167 291.439999,528.204167 292.159998,528.204167 292.879997,528.204167 293.599997,528.204167 294.319996,528.204167 295.039995,528.204167 295.759995,528.204167 296.479994,528.204167 297.199993,528.204167 297.919992,528.204167 298.639992,528.204167 299.360008,528.204167 300.080008,528.204167 300.800007,528.204167 301.520006,528.204167 302.240005,528.204167 302.960005,528.204167 303.680004,528.204167 304.400003,528.204167 305.120003,528.204167 305.840002,528.204167 306.560001,528.204167 307.280001,528.204167 308.000000,528.204167 308.719999,528.204167 309.439999,528.204167 310.159998,528.204167 310.879997,528.204167 311.599997,528.204167 312.319996,528.204167 313.039995,528.204167 313.759995,528.204167 314.479994,528.204167 315.199993,528.204167 315.919992,528.204167 316.639992,528.204167 317.360008,528.204167 318.080008,528.204167 318.800007,528.204167 319.520006,528.204167 320.240005,528.204167 320.960005,528.204167 321.680004,528.204167 322.400003,528.204167 323.120003,528.204167 323.840002,528.204167 324.560001,528.204167 325.280001,528.204167 326.000000,528.204167 326.000000,460.387500 326.719999,460.387500 327.439999,460.387500 328.159998,460.387500 328.879997,460.387500 329.599997,460.387500 330.319996,460.387500 331.039995,460.387500 331.759995,460.387500 332.479994,460.387500 333.199993,460.387500 333.919992,460.387500 334.639992,460.387500 335.360008,460.387500 336.080008,460.387500 336.800007,460.387500 337.520006,460.387500 338.240005,460.387500 338.960005,460.387500 339.680004,460.387500 340.400003,460.387500 341.120003,460.387500 341.840002,460.387500 342.560001,460.387500 343.280001,460.387500 344.000000,460.387500 344.719999,460.387500 345.439999,460.387500 346.159998,460.387500 346.879997,460.387500 347.599997,460.387500 348.319996,460.387500 349.039995,460.387500 349.759995,460.387500 350.479994,460.387500 351.199993,460.387500 351.919992,460.387500 352.639992,460.387500 353.360008,460.387500 354.080008,460.387500 354.800007,460.387500 355.520006,460.387500 356.240005,460.387500 356.960005,460.387500 357.680004,460.387500 358.400003,460.387500 359.120003,460.387500 359.840002,460.387500 360.560001,460.387500 361.280001,460.387500 362.000000,460.387500 362.000000,528.204167 362.719999,528.204167 363.439999,528.204167 364.159998,528.204167 364.879997,528.204167 365.599997,528.204167 366.319996,528.204167 367.039995,528.204167 367.759995,528.204167 368.479994,528.204167 369.199993,528.204167 369.919992,528.204167 370.639992,528.204167 371.360008,528.204167 372.080008,528.204167 372.800007,528.204167 373.520006,528.204167 374.240005,528.204167 374.960005,528.204167 375.680004,528.204167 376.400003,528.204167 377.120003,528.204167 377.840002,528.204167 378.560001,528.204167 379.280001,528.204167 380.000000,528.204167 380.719999,528.204167 381.439999,528.204167 382.159998,528.204167 382.879997,528.204167 383.599997,528.204167 384.319996,528.204167 385.039995,528.204167 385.759995,528.204167 386.479994,528.204167 387.199993,528.204167 387.919992,528.204167 388.639992,528.204167 389.360008,528.204167 390.080008,528.204167 390.800007,528.204167 391.520006,528.204167 392.240005,528.204167 392.960005,528.204167 393.680004,528.204167 394.400003,528.204167 395.120003,528.204167 395.840002,528.204167 396.560001,528.204167 397.280001,528.204167 398.000000,528.204167 398.000000,460.387500 398.720016,460.387500 399.439999,460.387500 400.160015,460.387500 400.879997,460.387500 401.600014,460.387500 402.319996,460.387500 403.040012,460.387500 403.759995,460.387500 404.480011,460.387500 405.199993,460.387500 405.920010,460.387500 406.639992,460.387500 407.360008,460.387500 408.079990,460.387500 408.800007,460.387500 409.519989,460.387500 410.240005,460.387500 410.959988,460.387500 411.680004,460.387500 412.399986,460.387500 413.120003,460.387500 413.839985,460.387500 414.560001,460.387500 415.279984,460.387500 416.000000,460.387500 416.720016,460.387500 417.439999,460.387500 418.160015,460.387500 418.879997,460.387500 419.600014,460.387500 420.319996,460.387500 421.040012,460.387500 421.759995,460.387500 422.480011,460.387500 423.199993,460.387500 423.920010,460.387500 424.639992,460.387500 425.360008,460.387500 426.079990,460.387500 426.800007,460.387500 427.519989,460.387500 428.240005,460.387500 428.959988,460.387500 429.680004,460.387500 430.399986,460.387500 431.120003,460.387500 431.839985,460.387500 432.560001,460.387500 433.279984,460.387500 434.000000,460.387500 434.000000,528.204167 434.720016,528.204167 435.439999,528.204167 436.160015,528.204167 436.879997,528.204167 437.600014,528.204167 438.319996,528.204167 439.040012,528.204167 439.759995,528.204167 440.480011,528.204167 441.199993,528.204167 441.920010,528.204167 442.639992,528.204167 443.360008,528.204167 444.079990,528.204167 444.800007,528.204167 445.519989,528.204167 446.240005,528.204167 446.959988,528.204167 447.680004,528.204167 448.399986,528.204167 449.120003,528.204167 449.839985,528.204167 450.560001,528.204167 451.279984,528.204167 452.000000,528.204167 452.720016,528.204167 453.439999,528.204167 454.160015,528.204167 454.879997,528.204167 455.600014,528.204167 456.319996,528.204167 457.040012,528.204167 457.759995,528.204167 458.480011,528.204167 459.199993,528.204167 459.920010,528.204167 460.639992,528.204167 461.360008,528.204167 462.079990,528.204167 462.800007,528.204167 463.519989,528.204167 464.240005,528.204167 464.959988,528.204167 465.680004,528.204167 466.399986,528.204167 467.120003,528.204167 467.839985,528.204167 468.560001,528.204167 469.279984,528.204167 470.000000,528.204167 470.000000,460.387500"
+     id="polyline3905"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-66)"
+     points="110.000000,623.408333 110.720000,623.408333 111.440000,623.408333 112.160000,623.408333 112.880000,623.408333 113.600000,623.408333 114.320000,623.408333 115.040000,623.408333 115.760000,623.408333 116.480000,623.408333 117.200000,623.408333 117.920000,623.408333 118.640000,623.408333 119.360000,623.408333 120.080000,623.408333 120.800000,623.408333 121.520000,623.408333 122.240000,623.408333 122.960001,623.408333 123.680000,623.408333 124.400000,623.408333 125.120000,623.408333 125.840000,623.408333 126.560000,623.408333 127.280000,623.408333 128.000000,623.408333 128.719999,623.408333 129.440001,623.408333 130.160000,623.408333 130.879999,623.408333 131.600001,623.408333 132.320000,623.408333 133.039999,623.408333 133.760001,623.408333 134.480000,623.408333 135.200000,623.408333 135.920001,623.408333 136.640000,623.408333 137.360000,623.408333 138.079999,623.408333 138.800000,623.408333 139.520000,623.408333 140.239999,623.408333 140.960001,623.408333 141.680000,623.408333 142.399999,623.408333 143.120001,623.408333 143.840000,623.408333 144.559999,623.408333 145.280001,623.408333 146.000000,623.408333 146.000000,623.408333 146.000000,623.408333 146.719999,623.408333 147.439999,623.408333 148.159998,623.408333 148.880002,623.408333 149.600001,623.408333 150.320000,623.408333 151.039999,623.408333 151.759999,623.408333 152.479998,623.408333 153.200002,623.408333 153.920001,623.408333 154.640000,623.408333 155.360000,623.408333 156.079999,623.408333 156.799998,623.408333 157.520002,623.408333 158.240001,623.408333 158.960001,623.408333 159.680000,623.408333 160.399999,623.408333 161.119998,623.408333 161.840002,623.408333 162.560001,623.408333 163.280001,623.408333 164.000000,623.408333 164.719999,623.408333 165.439999,623.408333 166.159998,623.408333 166.880002,623.408333 167.600001,623.408333 168.320000,623.408333 169.039999,623.408333 169.759999,623.408333 170.479998,623.408333 171.200002,623.408333 171.920001,623.408333 172.640000,623.408333 173.360000,623.408333 174.079999,623.408333 174.799998,623.408333 175.520002,623.408333 176.240001,623.408333 176.960001,623.408333 177.680000,623.408333 178.399999,623.408333 179.119998,623.408333 179.840002,623.408333 180.560001,623.408333 181.280001,623.408333 182.000000,623.408333 182.000000,623.408333 182.000000,623.408333 182.719999,623.408333 183.439999,623.408333 184.159998,623.408333 184.879997,623.408333 185.599997,623.408333 186.319996,623.408333 187.040004,623.408333 187.760003,623.408333 188.480002,623.408333 189.200002,623.408333 189.920001,623.408333 190.640000,623.408333 191.360000,623.408333 192.079999,623.408333 192.799998,623.408333 193.519998,623.408333 194.239997,623.408333 194.959996,623.408333 195.680004,623.408333 196.400003,623.408333 197.120003,623.408333 197.840002,623.408333 198.560001,623.408333 199.280001,623.408333 200.000000,623.408333 200.719999,623.408333 201.439999,623.408333 202.159998,623.408333 202.879997,623.408333 203.599997,623.408333 204.319996,623.408333 205.040004,623.408333 205.760003,623.408333 206.480002,623.408333 207.200002,623.408333 207.920001,623.408333 208.640000,623.408333 209.360000,623.408333 210.079999,623.408333 210.799998,623.408333 211.519998,623.408333 212.239997,623.408333 212.959996,623.408333 213.680004,623.408333 214.400003,623.408333 215.120003,623.408333 215.840002,623.408333 216.560001,623.408333 217.280001,623.408333 218.000000,623.408333 218.000000,555.591667 218.000000,555.591667 218.719999,555.591667 219.439999,555.591667 220.159998,555.591667 220.879997,555.591667 221.599997,555.591667 222.319996,555.591667 223.040004,555.591667 223.760003,555.591667 224.480002,555.591667 225.200002,555.591667 225.920001,555.591667 226.640000,555.591667 227.360000,555.591667 228.079999,555.591667 228.799998,555.591667 229.519998,555.591667 230.239997,555.591667 230.959996,555.591667 231.680004,555.591667 232.400003,555.591667 233.120003,555.591667 233.840002,555.591667 234.560001,555.591667 235.280001,555.591667 236.000000,555.591667 236.719999,555.591667 237.439999,555.591667 238.159998,555.591667 238.879997,555.591667 239.599997,555.591667 240.319996,555.591667 241.040004,555.591667 241.760003,555.591667 242.480002,555.591667 243.200002,555.591667 243.920001,555.591667 244.640000,555.591667 245.360000,555.591667 246.079999,555.591667 246.799998,555.591667 247.519998,555.591667 248.239997,555.591667 248.959996,555.591667 249.680004,555.591667 250.400003,555.591667 251.120003,555.591667 251.840002,555.591667 252.560001,555.591667 253.280001,555.591667 254.000000,555.591667 254.000000,555.591667 254.000000,555.591667 254.719999,555.591667 255.439999,555.591667 256.159998,555.591667 256.879997,555.591667 257.599997,555.591667 258.319996,555.591667 259.039995,555.591667 259.759995,555.591667 260.479994,555.591667 261.199993,555.591667 261.919992,555.591667 262.639992,555.591667 263.360008,555.591667 264.080008,555.591667 264.800007,555.591667 265.520006,555.591667 266.240005,555.591667 266.960005,555.591667 267.680004,555.591667 268.400003,555.591667 269.120003,555.591667 269.840002,555.591667 270.560001,555.591667 271.280001,555.591667 272.000000,555.591667 272.719999,555.591667 273.439999,555.591667 274.159998,555.591667 274.879997,555.591667 275.599997,555.591667 276.319996,555.591667 277.039995,555.591667 277.759995,555.591667 278.479994,555.591667 279.199993,555.591667 279.919992,555.591667 280.639992,555.591667 281.360008,555.591667 282.080008,555.591667 282.800007,555.591667 283.520006,555.591667 284.240005,555.591667 284.960005,555.591667 285.680004,555.591667 286.400003,555.591667 287.120003,555.591667 287.840002,555.591667 288.560001,555.591667 289.280001,555.591667 290.000000,555.591667 290.000000,555.591667 290.719999,555.591667 291.439999,555.591667 292.159998,555.591667 292.879997,555.591667 293.599997,555.591667 294.319996,555.591667 295.039995,555.591667 295.759995,555.591667 296.479994,555.591667 297.199993,555.591667 297.919992,555.591667 298.639992,555.591667 299.360008,555.591667 300.080008,555.591667 300.800007,555.591667 301.520006,555.591667 302.240005,555.591667 302.960005,555.591667 303.680004,555.591667 304.400003,555.591667 305.120003,555.591667 305.840002,555.591667 306.560001,555.591667 307.280001,555.591667 308.000000,555.591667 308.719999,555.591667 309.439999,555.591667 310.159998,555.591667 310.879997,555.591667 311.599997,555.591667 312.319996,555.591667 313.039995,555.591667 313.759995,555.591667 314.479994,555.591667 315.199993,555.591667 315.919992,555.591667 316.639992,555.591667 317.360008,555.591667 318.080008,555.591667 318.800007,555.591667 319.520006,555.591667 320.240005,555.591667 320.960005,555.591667 321.680004,555.591667 322.400003,555.591667 323.120003,555.591667 323.840002,555.591667 324.560001,555.591667 325.280001,555.591667 326.000000,555.591667 326.000000,623.408333 326.719999,623.408333 327.439999,623.408333 328.159998,623.408333 328.879997,623.408333 329.599997,623.408333 330.319996,623.408333 331.039995,623.408333 331.759995,623.408333 332.479994,623.408333 333.199993,623.408333 333.919992,623.408333 334.639992,623.408333 335.360008,623.408333 336.080008,623.408333 336.800007,623.408333 337.520006,623.408333 338.240005,623.408333 338.960005,623.408333 339.680004,623.408333 340.400003,623.408333 341.120003,623.408333 341.840002,623.408333 342.560001,623.408333 343.280001,623.408333 344.000000,623.408333 344.719999,623.408333 345.439999,623.408333 346.159998,623.408333 346.879997,623.408333 347.599997,623.408333 348.319996,623.408333 349.039995,623.408333 349.759995,623.408333 350.479994,623.408333 351.199993,623.408333 351.919992,623.408333 352.639992,623.408333 353.360008,623.408333 354.080008,623.408333 354.800007,623.408333 355.520006,623.408333 356.240005,623.408333 356.960005,623.408333 357.680004,623.408333 358.400003,623.408333 359.120003,623.408333 359.840002,623.408333 360.560001,623.408333 361.280001,623.408333 362.000000,623.408333 362.000000,623.408333 362.719999,623.408333 363.439999,623.408333 364.159998,623.408333 364.879997,623.408333 365.599997,623.408333 366.319996,623.408333 367.039995,623.408333 367.759995,623.408333 368.479994,623.408333 369.199993,623.408333 369.919992,623.408333 370.639992,623.408333 371.360008,623.408333 372.080008,623.408333 372.800007,623.408333 373.520006,623.408333 374.240005,623.408333 374.960005,623.408333 375.680004,623.408333 376.400003,623.408333 377.120003,623.408333 377.840002,623.408333 378.560001,623.408333 379.280001,623.408333 380.000000,623.408333 380.719999,623.408333 381.439999,623.408333 382.159998,623.408333 382.879997,623.408333 383.599997,623.408333 384.319996,623.408333 385.039995,623.408333 385.759995,623.408333 386.479994,623.408333 387.199993,623.408333 387.919992,623.408333 388.639992,623.408333 389.360008,623.408333 390.080008,623.408333 390.800007,623.408333 391.520006,623.408333 392.240005,623.408333 392.960005,623.408333 393.680004,623.408333 394.400003,623.408333 395.120003,623.408333 395.840002,623.408333 396.560001,623.408333 397.280001,623.408333 398.000000,623.408333 398.000000,623.408333 398.720016,623.408333 399.439999,623.408333 400.160015,623.408333 400.879997,623.408333 401.600014,623.408333 402.319996,623.408333 403.040012,623.408333 403.759995,623.408333 404.480011,623.408333 405.199993,623.408333 405.920010,623.408333 406.639992,623.408333 407.360008,623.408333 408.079990,623.408333 408.800007,623.408333 409.519989,623.408333 410.240005,623.408333 410.959988,623.408333 411.680004,623.408333 412.399986,623.408333 413.120003,623.408333 413.839985,623.408333 414.560001,623.408333 415.279984,623.408333 416.000000,623.408333 416.720016,623.408333 417.439999,623.408333 418.160015,623.408333 418.879997,623.408333 419.600014,623.408333 420.319996,623.408333 421.040012,623.408333 421.759995,623.408333 422.480011,623.408333 423.199993,623.408333 423.920010,623.408333 424.639992,623.408333 425.360008,623.408333 426.079990,623.408333 426.800007,623.408333 427.519989,623.408333 428.240005,623.408333 428.959988,623.408333 429.680004,623.408333 430.399986,623.408333 431.120003,623.408333 431.839985,623.408333 432.560001,623.408333 433.279984,623.408333 434.000000,623.408333 434.000000,555.591667 434.720016,555.591667 435.439999,555.591667 436.160015,555.591667 436.879997,555.591667 437.600014,555.591667 438.319996,555.591667 439.040012,555.591667 439.759995,555.591667 440.480011,555.591667 441.199993,555.591667 441.920010,555.591667 442.639992,555.591667 443.360008,555.591667 444.079990,555.591667 444.800007,555.591667 445.519989,555.591667 446.240005,555.591667 446.959988,555.591667 447.680004,555.591667 448.399986,555.591667 449.120003,555.591667 449.839985,555.591667 450.560001,555.591667 451.279984,555.591667 452.000000,555.591667 452.720016,555.591667 453.439999,555.591667 454.160015,555.591667 454.879997,555.591667 455.600014,555.591667 456.319996,555.591667 457.040012,555.591667 457.759995,555.591667 458.480011,555.591667 459.199993,555.591667 459.920010,555.591667 460.639992,555.591667 461.360008,555.591667 462.079990,555.591667 462.800007,555.591667 463.519989,555.591667 464.240005,555.591667 464.959988,555.591667 465.680004,555.591667 466.399986,555.591667 467.120003,555.591667 467.839985,555.591667 468.560001,555.591667 469.279984,555.591667 470.000000,555.591667 470.000000,555.591667"
+     id="polyline3907"
+     transform="translate(1040.1806,88.526136)" />
+  <polyline
+     fill="none"
+     stroke="#1c6cc8"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea2-66)"
+     points="110.000000,650.795833 110.720000,650.795833 111.440000,650.795833 112.160000,650.795833 112.880000,650.795833 113.600000,650.795833 114.320000,650.795833 115.040000,650.795833 115.760000,650.795833 116.480000,650.795833 117.200000,650.795833 117.920000,650.795833 118.640000,650.795833 119.360000,650.795833 120.080000,650.795833 120.800000,650.795833 121.520000,650.795833 122.240000,650.795833 122.960001,650.795833 123.680000,650.795833 124.400000,650.795833 125.120000,650.795833 125.840000,650.795833 126.560000,650.795833 127.280000,650.795833 128.000000,650.795833 128.719999,650.795833 129.440001,650.795833 130.160000,650.795833 130.879999,650.795833 131.600001,650.795833 132.320000,650.795833 133.039999,650.795833 133.760001,650.795833 134.480000,650.795833 135.200000,650.795833 135.920001,650.795833 136.640000,650.795833 137.360000,650.795833 138.079999,650.795833 138.800000,650.795833 139.520000,650.795833 140.239999,650.795833 140.960001,650.795833 141.680000,650.795833 142.399999,650.795833 143.120001,650.795833 143.840000,650.795833 144.559999,650.795833 145.280001,650.795833 146.000000,650.795833 146.000000,650.795833 146.000000,650.795833 146.719999,650.795833 147.439999,650.795833 148.159998,650.795833 148.880002,650.795833 149.600001,650.795833 150.320000,650.795833 151.039999,650.795833 151.759999,650.795833 152.479998,650.795833 153.200002,650.795833 153.920001,650.795833 154.640000,650.795833 155.360000,650.795833 156.079999,650.795833 156.799998,650.795833 157.520002,650.795833 158.240001,650.795833 158.960001,650.795833 159.680000,650.795833 160.399999,650.795833 161.119998,650.795833 161.840002,650.795833 162.560001,650.795833 163.280001,650.795833 164.000000,650.795833 164.719999,650.795833 165.439999,650.795833 166.159998,650.795833 166.880002,650.795833 167.600001,650.795833 168.320000,650.795833 169.039999,650.795833 169.759999,650.795833 170.479998,650.795833 171.200002,650.795833 171.920001,650.795833 172.640000,650.795833 173.360000,650.795833 174.079999,650.795833 174.799998,650.795833 175.520002,650.795833 176.240001,650.795833 176.960001,650.795833 177.680000,650.795833 178.399999,650.795833 179.119998,650.795833 179.840002,650.795833 180.560001,650.795833 181.280001,650.795833 182.000000,650.795833 182.000000,718.612500 182.000000,718.612500 182.719999,718.612500 183.439999,718.612500 184.159998,718.612500 184.879997,718.612500 185.599997,718.612500 186.319996,718.612500 187.040004,718.612500 187.760003,718.612500 188.480002,718.612500 189.200002,718.612500 189.920001,718.612500 190.640000,718.612500 191.360000,718.612500 192.079999,718.612500 192.799998,718.612500 193.519998,718.612500 194.239997,718.612500 194.959996,718.612500 195.680004,718.612500 196.400003,718.612500 197.120003,718.612500 197.840002,718.612500 198.560001,718.612500 199.280001,718.612500 200.000000,718.612500 200.719999,718.612500 201.439999,718.612500 202.159998,718.612500 202.879997,718.612500 203.599997,718.612500 204.319996,718.612500 205.040004,718.612500 205.760003,718.612500 206.480002,718.612500 207.200002,718.612500 207.920001,718.612500 208.640000,718.612500 209.360000,718.612500 210.079999,718.612500 210.799998,718.612500 211.519998,718.612500 212.239997,718.612500 212.959996,718.612500 213.680004,718.612500 214.400003,718.612500 215.120003,718.612500 215.840002,718.612500 216.560001,718.612500 217.280001,718.612500 218.000000,718.612500 218.000000,718.612500 218.000000,718.612500 218.719999,718.612500 219.439999,718.612500 220.159998,718.612500 220.879997,718.612500 221.599997,718.612500 222.319996,718.612500 223.040004,718.612500 223.760003,718.612500 224.480002,718.612500 225.200002,718.612500 225.920001,718.612500 226.640000,718.612500 227.360000,718.612500 228.079999,718.612500 228.799998,718.612500 229.519998,718.612500 230.239997,718.612500 230.959996,718.612500 231.680004,718.612500 232.400003,718.612500 233.120003,718.612500 233.840002,718.612500 234.560001,718.612500 235.280001,718.612500 236.000000,718.612500 236.719999,718.612500 237.439999,718.612500 238.159998,718.612500 238.879997,718.612500 239.599997,718.612500 240.319996,718.612500 241.040004,718.612500 241.760003,718.612500 242.480002,718.612500 243.200002,718.612500 243.920001,718.612500 244.640000,718.612500 245.360000,718.612500 246.079999,718.612500 246.799998,718.612500 247.519998,718.612500 248.239997,718.612500 248.959996,718.612500 249.680004,718.612500 250.400003,718.612500 251.120003,718.612500 251.840002,718.612500 252.560001,718.612500 253.280001,718.612500 254.000000,718.612500 254.000000,718.612500 254.000000,718.612500 254.719999,718.612500 255.439999,718.612500 256.159998,718.612500 256.879997,718.612500 257.599997,718.612500 258.319996,718.612500 259.039995,718.612500 259.759995,718.612500 260.479994,718.612500 261.199993,718.612500 261.919992,718.612500 262.639992,718.612500 263.360008,718.612500 264.080008,718.612500 264.800007,718.612500 265.520006,718.612500 266.240005,718.612500 266.960005,718.612500 267.680004,718.612500 268.400003,718.612500 269.120003,718.612500 269.840002,718.612500 270.560001,718.612500 271.280001,718.612500 272.000000,718.612500 272.719999,718.612500 273.439999,718.612500 274.159998,718.612500 274.879997,718.612500 275.599997,718.612500 276.319996,718.612500 277.039995,718.612500 277.759995,718.612500 278.479994,718.612500 279.199993,718.612500 279.919992,718.612500 280.639992,718.612500 281.360008,718.612500 282.080008,718.612500 282.800007,718.612500 283.520006,718.612500 284.240005,718.612500 284.960005,718.612500 285.680004,718.612500 286.400003,718.612500 287.120003,718.612500 287.840002,718.612500 288.560001,718.612500 289.280001,718.612500 290.000000,718.612500 290.000000,718.612500 290.719999,718.612500 291.439999,718.612500 292.159998,718.612500 292.879997,718.612500 293.599997,718.612500 294.319996,718.612500 295.039995,718.612500 295.759995,718.612500 296.479994,718.612500 297.199993,718.612500 297.919992,718.612500 298.639992,718.612500 299.360008,718.612500 300.080008,718.612500 300.800007,718.612500 301.520006,718.612500 302.240005,718.612500 302.960005,718.612500 303.680004,718.612500 304.400003,718.612500 305.120003,718.612500 305.840002,718.612500 306.560001,718.612500 307.280001,718.612500 308.000000,718.612500 308.719999,718.612500 309.439999,718.612500 310.159998,718.612500 310.879997,718.612500 311.599997,718.612500 312.319996,718.612500 313.039995,718.612500 313.759995,718.612500 314.479994,718.612500 315.199993,718.612500 315.919992,718.612500 316.639992,718.612500 317.360008,718.612500 318.080008,718.612500 318.800007,718.612500 319.520006,718.612500 320.240005,718.612500 320.960005,718.612500 321.680004,718.612500 322.400003,718.612500 323.120003,718.612500 323.840002,718.612500 324.560001,718.612500 325.280001,718.612500 326.000000,718.612500 326.000000,650.795833 326.719999,650.795833 327.439999,650.795833 328.159998,650.795833 328.879997,650.795833 329.599997,650.795833 330.319996,650.795833 331.039995,650.795833 331.759995,650.795833 332.479994,650.795833 333.199993,650.795833 333.919992,650.795833 334.639992,650.795833 335.360008,650.795833 336.080008,650.795833 336.800007,650.795833 337.520006,650.795833 338.240005,650.795833 338.960005,650.795833 339.680004,650.795833 340.400003,650.795833 341.120003,650.795833 341.840002,650.795833 342.560001,650.795833 343.280001,650.795833 344.000000,650.795833 344.719999,650.795833 345.439999,650.795833 346.159998,650.795833 346.879997,650.795833 347.599997,650.795833 348.319996,650.795833 349.039995,650.795833 349.759995,650.795833 350.479994,650.795833 351.199993,650.795833 351.919992,650.795833 352.639992,650.795833 353.360008,650.795833 354.080008,650.795833 354.800007,650.795833 355.520006,650.795833 356.240005,650.795833 356.960005,650.795833 357.680004,650.795833 358.400003,650.795833 359.120003,650.795833 359.840002,650.795833 360.560001,650.795833 361.280001,650.795833 362.000000,650.795833 362.000000,650.795833 362.719999,650.795833 363.439999,650.795833 364.159998,650.795833 364.879997,650.795833 365.599997,650.795833 366.319996,650.795833 367.039995,650.795833 367.759995,650.795833 368.479994,650.795833 369.199993,650.795833 369.919992,650.795833 370.639992,650.795833 371.360008,650.795833 372.080008,650.795833 372.800007,650.795833 373.520006,650.795833 374.240005,650.795833 374.960005,650.795833 375.680004,650.795833 376.400003,650.795833 377.120003,650.795833 377.840002,650.795833 378.560001,650.795833 379.280001,650.795833 380.000000,650.795833 380.719999,650.795833 381.439999,650.795833 382.159998,650.795833 382.879997,650.795833 383.599997,650.795833 384.319996,650.795833 385.039995,650.795833 385.759995,650.795833 386.479994,650.795833 387.199993,650.795833 387.919992,650.795833 388.639992,650.795833 389.360008,650.795833 390.080008,650.795833 390.800007,650.795833 391.520006,650.795833 392.240005,650.795833 392.960005,650.795833 393.680004,650.795833 394.400003,650.795833 395.120003,650.795833 395.840002,650.795833 396.560001,650.795833 397.280001,650.795833 398.000000,650.795833 398.000000,718.612500 398.720016,718.612500 399.439999,718.612500 400.160015,718.612500 400.879997,718.612500 401.600014,718.612500 402.319996,718.612500 403.040012,718.612500 403.759995,718.612500 404.480011,718.612500 405.199993,718.612500 405.920010,718.612500 406.639992,718.612500 407.360008,718.612500 408.079990,718.612500 408.800007,718.612500 409.519989,718.612500 410.240005,718.612500 410.959988,718.612500 411.680004,718.612500 412.399986,718.612500 413.120003,718.612500 413.839985,718.612500 414.560001,718.612500 415.279984,718.612500 416.000000,718.612500 416.720016,718.612500 417.439999,718.612500 418.160015,718.612500 418.879997,718.612500 419.600014,718.612500 420.319996,718.612500 421.040012,718.612500 421.759995,718.612500 422.480011,718.612500 423.199993,718.612500 423.920010,718.612500 424.639992,718.612500 425.360008,718.612500 426.079990,718.612500 426.800007,718.612500 427.519989,718.612500 428.240005,718.612500 428.959988,718.612500 429.680004,718.612500 430.399986,718.612500 431.120003,718.612500 431.839985,718.612500 432.560001,718.612500 433.279984,718.612500 434.000000,718.612500 434.000000,718.612500 434.720016,718.612500 435.439999,718.612500 436.160015,718.612500 436.879997,718.612500 437.600014,718.612500 438.319996,718.612500 439.040012,718.612500 439.759995,718.612500 440.480011,718.612500 441.199993,718.612500 441.920010,718.612500 442.639992,718.612500 443.360008,718.612500 444.079990,718.612500 444.800007,718.612500 445.519989,718.612500 446.240005,718.612500 446.959988,718.612500 447.680004,718.612500 448.399986,718.612500 449.120003,718.612500 449.839985,718.612500 450.560001,718.612500 451.279984,718.612500 452.000000,718.612500 452.720016,718.612500 453.439999,718.612500 454.160015,718.612500 454.879997,718.612500 455.600014,718.612500 456.319996,718.612500 457.040012,718.612500 457.759995,718.612500 458.480011,718.612500 459.199993,718.612500 459.920010,718.612500 460.639992,718.612500 461.360008,718.612500 462.079990,718.612500 462.800007,718.612500 463.519989,718.612500 464.240005,718.612500 464.959988,718.612500 465.680004,718.612500 466.399986,718.612500 467.120003,718.612500 467.839985,718.612500 468.560001,718.612500 469.279984,718.612500 470.000000,718.612500 470.000000,718.612500"
+     id="polyline3909"
+     transform="translate(1040.1806,88.526136)" />
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1153.1804"
+     y="532.02606"
+     id="text3911">swiCleInp1.u</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1153.1804"
+     y="627.02606"
+     id="text3913">swiCleInp1.clr</text>
+  <text
+     fill="#000000"
+     font-size="22px"
+     font-family="helvetica"
+     text-anchor="start"
+     dominant-baseline="central"
+     x="1153.1804"
+     y="722.02594"
+     id="text3915">swiCleInp1.y</text>
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 1274.831,60.748353 V 380.74835"
-     id="path1558"
+     d="M 1258.3619,70.812973 V 390.81297"
+     id="path1558-5-3"
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 1391.831,60.748353 V 380.74835"
-     id="path1558-3"
+     d="M 1367.3619,70.812973 V 390.81297"
+     id="path1558-3-82-6"
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 1274.831,505.74835 v 320"
-     id="path1558-7"
+     d="m 1256.5678,520.22501 v 320"
+     id="path1558-5-3-1"
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 1391.831,505.74835 v 320"
-     id="path1558-3-8"
+     d="m 1365.5678,520.22501 v 320"
+     id="path1558-3-82-6-0"
      inkscape:connector-curvature="0" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-     x="1687.8311"
-     y="41.74836"
-     id="text4018"><tspan
-       sodipodi:role="line"
-       id="tspan4016"
-       x="1687.8311"
-       y="77.138985"></tspan></text>
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png
index b43ade35d7b..f3f6f6e36ac 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png and b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.svg
index 2081e8d323b..343695ff13d 100644
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.svg
+++ b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation.svg
@@ -1,266 +1,1711 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg viewBox="0 0 8863.000000 1334.000000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<rect fill="rgb(210,210,210)" stroke="rgb(0,0,0)" stroke-opacity="1" x="3686.46" y="948.385" width="128.923" height="128.923"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3684.19" y="946.11" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3684.19" y="1077.31" width="131.198" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3815.38" y="948.385" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3686.46" y="946.11" width="131.198" height="2.27467"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="3686.46" y="948.385" width="3.412" height="128.923"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="3686.46" y="948.385" width="128.923" height="3.412"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="3813.11" y="948.385" width="2.27467" height="128.923"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="3686.46" y="1075.03" width="128.923" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3810.84" y="950.659" width="2.27467" height="124.374"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3688.74" y="1072.76" width="124.374" height="2.27467"/>
-	<polyline fill="none" stroke="rgb(192,192,192)" stroke-opacity="1" points="3692.907692,1057.969231 3803.781538,1057.969231"/>
-	<polyline fill="none" stroke="rgb(192,192,192)" stroke-opacity="1" points="3699.353846,969.012308 3699.353846,1064.415385"/>
-	<polygon fill="rgb(192,192,192)" stroke="rgb(192,192,192)" stroke-opacity="1" points="3808.938462,1057.969231 3794.756923,1052.812308 3794.756923,1063.126154 3808.938462,1057.969231"/>
-	<polygon fill="rgb(192,192,192)" stroke="rgb(192,192,192)" stroke-opacity="1" points="3699.353846,954.830769 3694.196923,969.012308 3704.510769,969.012308 3699.353846,954.830769"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="3699.353846,1057.969231 3712.246154,1057.969231 3712.246154,1029.606154 3775.418462,1029.606154 3775.418462,1057.969231 3793.467692,1057.969231"/>
-	<polyline fill="none" stroke="rgb(0,0,127)" stroke-opacity="1" points="3699.353846,1012.846154 3710.956923,1012.846154 3776.707692,954.830769 3776.707692,1012.846154 3794.756923,1012.846154"/>
-	<text x="3750.92" y="929.046" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">timer1</text>
-	<rect fill="rgb(210,210,210)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4653.38" y="1141.77" width="128.923" height="128.923"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4651.11" y="1139.49" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4651.11" y="1270.69" width="131.198" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4782.31" y="1141.77" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4653.38" y="1139.49" width="131.198" height="2.27467"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="4653.38" y="1141.77" width="3.412" height="128.923"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="4653.38" y="1141.77" width="128.923" height="3.412"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="4780.03" y="1141.77" width="2.27467" height="128.923"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="4653.38" y="1268.42" width="128.923" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4777.76" y="1144.04" width="2.27467" height="124.374"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4655.66" y="1266.14" width="124.374" height="2.27467"/>
-	<polyline fill="none" stroke="rgb(192,192,192)" stroke-opacity="1" points="4659.830769,1251.353846 4770.704615,1251.353846"/>
-	<polyline fill="none" stroke="rgb(192,192,192)" stroke-opacity="1" points="4666.276923,1162.396923 4666.276923,1257.800000"/>
-	<polygon fill="rgb(192,192,192)" stroke="rgb(192,192,192)" stroke-opacity="1" points="4775.861538,1251.353846 4761.680000,1246.196923 4761.680000,1256.510769 4775.861538,1251.353846"/>
-	<polygon fill="rgb(192,192,192)" stroke="rgb(192,192,192)" stroke-opacity="1" points="4666.276923,1148.215385 4661.120000,1162.396923 4671.433846,1162.396923 4666.276923,1148.215385"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="4666.276923,1251.353846 4679.169231,1251.353846 4679.169231,1222.990769 4742.341538,1222.990769 4742.341538,1251.353846 4760.390769,1251.353846"/>
-	<polyline fill="none" stroke="rgb(0,0,127)" stroke-opacity="1" points="4666.276923,1206.230769 4677.880000,1206.230769 4743.630769,1148.215385 4743.630769,1206.230769 4761.680000,1206.230769"/>
-	<text x="4717.85" y="1122.43" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">timer2</text>
-	<text x="3557.54" y="26.5846" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">stateGraphRoot</text>
-	<rect fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" x="3493.08" y="45.9231" width="128.923" height="128.923"/>
-	<text x="3558.83" y="74.2862" fill="rgb(0,0,0)" dominant-baseline="central" font-size="28" font-family="helvetica" text-anchor="middle">root</text>
-	<rect fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" x="3504.68" y="114.252" width="24.4954" height="21.9169"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="3557.538462,103.938462 3557.538462,149.061538"/>
-	<rect fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" x="3588.48" y="114.252" width="24.4954" height="21.9169"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="3549.803077,120.698462 3557.538462,124.566154 3549.803077,128.433846 3549.803077,120.698462"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="3529.175385,124.566154 3549.803077,124.566154"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="3580.744615,120.698462 3588.480000,124.566154 3580.744615,128.433846 3580.744615,120.698462"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="3557.538462,124.566154 3580.744615,124.566154"/>
-	<text x="4202.15" y="606.738" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">outputFalse</text>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4137.69" y="626.077" width="128.923" height="128.923"/>
-	<text x="4202.8" y="744.042" fill="rgb(0,0,0)" dominant-baseline="central" font-size="12" font-family="helvetica" text-anchor="middle">active</text>
-	<text x="4466.45" y="669.588" fill="rgb(255,255,255)" dominant-baseline="central" font-size="16" font-family="helvetica" text-anchor="middle">0</text>
-	<rect fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4389.09" y="626.077" width="12.8923" height="128.923"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4376.200000,690.538462 4389.092308,690.538462"/>
-	<text x="4395.54" y="606.738" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">toTrue</text>
-	<ellipse fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" cx="4395.54" cy="747.265" rx="4.51231" ry="4.51231"/>
-	<rect fill="rgb(215,215,215)" stroke="rgb(0,0,0)" stroke-opacity="1" x="3622" y="303.769" width="128.923" height="128.923"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3619.73" y="301.495" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3619.73" y="432.692" width="131.198" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3750.92" y="303.769" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3622" y="301.495" width="131.198" height="2.27467"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="3622" y="303.769" width="3.412" height="128.923"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="3622" y="303.769" width="128.923" height="3.412"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="3748.65" y="303.769" width="2.27467" height="128.923"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="3622" y="430.418" width="128.923" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3746.37" y="306.044" width="2.27467" height="124.374"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3624.27" y="428.143" width="124.374" height="2.27467"/>
-	<text x="3691.62" y="366.942" fill="rgb(0,0,0)" dominant-baseline="central" font-size="34" font-family="helvetica" text-anchor="middle">not</text>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="3736.74" cy="368.231" rx="4.51231" ry="4.51231"/>
-	<text x="3686.46" y="284.431" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">notU</text>
-	<text x="4588.92" y="606.738" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">outputTrue</text>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4524.46" y="626.077" width="128.923" height="128.923"/>
-	<text x="4589.57" y="744.042" fill="rgb(0,0,0)" dominant-baseline="central" font-size="12" font-family="helvetica" text-anchor="middle">active</text>
-	<text x="4853.22" y="669.588" fill="rgb(255,255,255)" dominant-baseline="central" font-size="16" font-family="helvetica" text-anchor="middle">0</text>
-	<rect fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4775.86" y="626.077" width="12.8923" height="128.923"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4762.969231,690.538462 4775.861538,690.538462"/>
-	<text x="4782.31" y="606.738" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">toFalse</text>
-	<ellipse fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" cx="4782.31" cy="747.265" rx="4.51231" ry="4.51231"/>
-	<text x="4975.69" y="1286.81" fill="rgb(0,0,0)" dominant-baseline="central" font-size="19" font-family="helvetica" text-anchor="middle">duration</text>
-	<rect fill="rgb(210,210,210)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4911.23" y="1141.77" width="128.923" height="128.923"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4908.96" y="1139.49" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4908.96" y="1270.69" width="131.198" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5040.15" y="1141.77" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4911.23" y="1139.49" width="131.198" height="2.27467"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="4911.23" y="1141.77" width="3.412" height="128.923"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="4911.23" y="1141.77" width="128.923" height="3.412"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="5037.88" y="1141.77" width="2.27467" height="128.923"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="4911.23" y="1268.42" width="128.923" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5035.6" y="1144.04" width="2.27467" height="124.374"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4913.51" y="1266.14" width="124.374" height="2.27467"/>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="5025.97" cy="1206.23" rx="4.51231" ry="4.51231"/>
-	<text x="4966.02" y="1206.23" fill="rgb(0,0,0)" dominant-baseline="central" font-size="52" font-family="helvetica" text-anchor="middle">>=</text>
-	<text x="4975.69" y="1122.43" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">greEquThr2</text>
-	<rect fill="rgb(210,210,210)" stroke="rgb(0,0,0)" stroke-opacity="1" x="5169.08" y="1141.77" width="128.923" height="128.923"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5166.8" y="1139.49" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5166.8" y="1270.69" width="131.198" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5298" y="1141.77" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5169.08" y="1139.49" width="131.198" height="2.27467"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="5169.08" y="1141.77" width="3.412" height="128.923"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="5169.08" y="1141.77" width="128.923" height="3.412"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="5295.73" y="1141.77" width="2.27467" height="128.923"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="5169.08" y="1268.42" width="128.923" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5293.45" y="1144.04" width="2.27467" height="124.374"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="5171.35" y="1266.14" width="124.374" height="2.27467"/>
-	<text x="5233.54" y="1206.23" fill="rgb(0,0,0)" dominant-baseline="central" font-size="52" font-family="helvetica" text-anchor="middle">and</text>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="5283.82" cy="1206.23" rx="4.51231" ry="4.51231"/>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="5180.68" cy="1205.59" rx="4.51231" ry="4.51231"/>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="5180.68" cy="1257.8" rx="4.51231" ry="4.51231"/>
-	<text x="5233.54" y="1122.43" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">and2</text>
-	<text x="4008.77" y="1093.42" fill="rgb(0,0,0)" dominant-baseline="central" font-size="19" font-family="helvetica" text-anchor="middle">duration</text>
-	<rect fill="rgb(210,210,210)" stroke="rgb(0,0,0)" stroke-opacity="1" x="3944.31" y="948.385" width="128.923" height="128.923"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3942.03" y="946.11" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3942.03" y="1077.31" width="131.198" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4073.23" y="948.385" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3944.31" y="946.11" width="131.198" height="2.27467"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="3944.31" y="948.385" width="3.412" height="128.923"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="3944.31" y="948.385" width="128.923" height="3.412"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="4070.96" y="948.385" width="2.27467" height="128.923"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="3944.31" y="1075.03" width="128.923" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4068.68" y="950.659" width="2.27467" height="124.374"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="3946.58" y="1072.76" width="124.374" height="2.27467"/>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="4059.05" cy="1012.85" rx="4.51231" ry="4.51231"/>
-	<text x="3999.1" y="1012.85" fill="rgb(0,0,0)" dominant-baseline="central" font-size="52" font-family="helvetica" text-anchor="middle">>=</text>
-	<text x="4008.77" y="929.046" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">greEquThr1</text>
-	<rect fill="rgb(210,210,210)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4202.15" y="948.385" width="128.923" height="128.923"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4199.88" y="946.11" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4199.88" y="1077.31" width="131.198" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4331.08" y="948.385" width="2.27467" height="131.198"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4202.15" y="946.11" width="131.198" height="2.27467"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="4202.15" y="948.385" width="3.412" height="128.923"/>
-	<rect fill="rgb(255,255,255)" stroke="none" x="4202.15" y="948.385" width="128.923" height="3.412"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="4328.8" y="948.385" width="2.27467" height="128.923"/>
-	<rect fill="rgb(113,111,100)" stroke="none" x="4202.15" y="1075.03" width="128.923" height="2.27467"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4326.53" y="950.659" width="2.27467" height="124.374"/>
-	<rect fill="rgb(172,168,153)" stroke="none" x="4204.43" y="1072.76" width="124.374" height="2.27467"/>
-	<text x="4266.62" y="1012.85" fill="rgb(0,0,0)" dominant-baseline="central" font-size="52" font-family="helvetica" text-anchor="middle">and</text>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="4316.9" cy="1012.85" rx="4.51231" ry="4.51231"/>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="4213.76" cy="1012.2" rx="4.51231" ry="4.51231"/>
-	<ellipse fill="rgb(235,235,235)" stroke="rgb(235,235,235)" stroke-opacity="1" cx="4213.76" cy="1064.42" rx="4.51231" ry="4.51231"/>
-	<text x="4266.62" y="929.046" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">and1</text>
-	<text x="3815.38" y="26.5846" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">initialStep</text>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="3750.92" y="45.9231" width="128.923" height="128.923"/>
-	<rect fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" x="3763.82" y="58.8154" width="103.138" height="103.138"/>
-	<text x="4208.6" y="76.5423" fill="rgb(255,255,255)" dominant-baseline="central" font-size="16" font-family="helvetica" text-anchor="middle">0</text>
-	<rect fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4131.25" y="33.0308" width="12.8923" height="128.923"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4118.353846,97.492308 4131.246154,97.492308"/>
-	<text x="4137.69" y="13.6923" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">toTrue1</text>
-	<ellipse fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" cx="4137.69" cy="154.218" rx="4.51231" ry="4.51231"/>
-	<text x="4079.68" y="218.358" fill="rgb(255,255,255)" dominant-baseline="central" font-size="16" font-family="helvetica" text-anchor="middle">0</text>
-	<rect fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4002.32" y="174.846" width="12.8923" height="128.923"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="3989.430769,239.307692 4002.323077,239.307692"/>
-	<text x="4008.77" y="155.508" fill="rgb(0,0,255)" dominant-baseline="central" font-size="26" font-family="helvetica" text-anchor="middle">toFalse1</text>
-	<ellipse fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" cx="4008.77" cy="296.034" rx="4.51231" ry="4.51231"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4656.607692,690.538462 4704.953846,690.538462 4756.523077,690.538462"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4656.607692,690.538462 4704.953846,690.538462 4756.523077,690.538462"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4588.923077,761.446154 4588.923077,819.461538 5620.307692,819.461538"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="4588.923077,761.446154 4588.923077,819.461538 5620.307692,819.461538"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4269.838462,690.538462 4318.184615,690.538462 4369.753846,690.538462"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4269.838462,690.538462 4318.184615,690.538462 4369.753846,690.538462"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4791.976923,690.538462 4911.230769,690.538462 4911.230769,561.615385 4073.230769,561.615385 4073.230769,687.315385 4131.246154,687.315385"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4791.976923,690.538462 4911.230769,690.538462 4911.230769,561.615385 4073.230769,561.615385 4073.230769,687.315385 4131.246154,687.315385"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4588.923077,761.446154 4588.923077,819.461538 4588.923077,1206.230769 4640.492308,1206.230769"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="4588.923077,761.446154 4588.923077,819.461538 4588.923077,1206.230769 4640.492308,1206.230769"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4788.753846,1206.230769 4898.338462,1206.230769"/>
-	<polyline fill="none" stroke="rgb(0,0,127)" stroke-opacity="1" points="4788.753846,1206.230769 4898.338462,1206.230769"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="5046.600000,1206.230769 5046.600000,1206.230769 5156.184615,1206.230769"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="5046.600000,1206.230769 5046.600000,1206.230769 5156.184615,1206.230769"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3757.369231,368.230769 5426.923077,368.230769 5426.923077,1335.153846 5104.615385,1335.153846 5104.615385,1257.800000 5156.184615,1257.800000"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="3757.369231,368.230769 5426.923077,368.230769 5426.923077,1335.153846 5104.615385,1335.153846 5104.615385,1257.800000 5156.184615,1257.800000"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="5304.446154,1206.230769 5375.353846,1206.230769 5375.353846,948.384615 4782.307692,948.384615 4782.307692,767.892308"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="5304.446154,1206.230769 5375.353846,1206.230769 5375.353846,948.384615 4782.307692,948.384615 4782.307692,767.892308"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3821.830769,1012.846154 3931.415385,1012.846154"/>
-	<polyline fill="none" stroke="rgb(0,0,127)" stroke-opacity="1" points="3821.830769,1012.846154 3931.415385,1012.846154"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4202.153846,761.446154 4202.153846,819.461538 3622.000000,819.461538 3622.000000,1012.846154 3673.569231,1012.846154"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="4202.153846,761.446154 4202.153846,819.461538 3622.000000,819.461538 3622.000000,1012.846154 3673.569231,1012.846154"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3235.230769,819.461538 3493.076923,819.461538 3493.076923,1141.769231 4137.692308,1141.769231 4137.692308,1064.415385 4189.261538,1064.415385 4189.261538,1064.415385"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="3235.230769,819.461538 3493.076923,819.461538 3493.076923,1141.769231 4137.692308,1141.769231 4137.692308,1064.415385 4189.261538,1064.415385 4189.261538,1064.415385"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4079.676923,1012.846154 4189.261538,1012.846154"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="4079.676923,1012.846154 4189.261538,1012.846154"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4337.523077,1012.846154 4395.538462,1012.846154 4395.538462,767.892308"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="4337.523077,1012.846154 4395.538462,1012.846154 4395.538462,767.892308"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3235.230769,819.461538 3493.076923,819.461538 3493.076923,484.261538 4137.692308,484.261538 4137.692308,174.846154"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="3235.230769,819.461538 3493.076923,819.461538 3493.076923,484.261538 4137.692308,484.261538 4137.692308,174.846154"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4147.361538,97.492308 4460.000000,97.492308 4460.000000,687.315385 4518.015385,687.315385"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4147.361538,97.492308 4460.000000,97.492308 4460.000000,687.315385 4518.015385,687.315385"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4405.207692,690.538462 4518.015385,690.538462 4518.015385,693.761538"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4405.207692,690.538462 4518.015385,690.538462 4518.015385,693.761538"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="4018.438462,239.307692 4060.338462,239.307692 4060.338462,535.830769 4060.338462,690.538462 4131.246154,690.538462 4131.246154,693.761538"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="4018.438462,239.307692 4060.338462,239.307692 4060.338462,535.830769 4060.338462,690.538462 4131.246154,690.538462 4131.246154,693.761538"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3883.069231,108.773077 3944.307692,108.773077 3944.307692,110.384615 3944.307692,97.492308 4111.907692,97.492308"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="3883.069231,108.773077 3944.307692,108.773077 3944.307692,110.384615 3944.307692,97.492308 4111.907692,97.492308"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3883.069231,111.996154 3918.523077,111.996154 3918.523077,110.384615 3944.307692,110.384615 3944.307692,239.307692 3982.984615,239.307692"/>
-	<polyline fill="none" stroke="rgb(0,0,0)" stroke-opacity="1" points="3883.069231,111.996154 3918.523077,111.996154 3918.523077,110.384615 3944.307692,110.384615 3944.307692,239.307692 3982.984615,239.307692"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3609.107692,368.230769 3493.076923,368.230769 3493.076923,819.461538 3235.230769,819.461538"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="3609.107692,368.230769 3493.076923,368.230769 3493.076923,819.461538 3235.230769,819.461538"/>
-	<polyline fill="none" stroke="rgb(255,255,255)" stroke-width="5" stroke-opacity="1" points="3757.369231,368.230769 4008.769231,368.230769 4008.769231,316.661538"/>
-	<polyline fill="none" stroke="rgb(255,0,255)" stroke-opacity="1" points="3757.369231,368.230769 4008.769231,368.230769 4008.769231,316.661538"/>
-	<ellipse fill="rgb(255,0,255)" stroke="rgb(255,0,255)" cx="3493.08" cy="819.462" rx="3.5" ry="3.5"/>
-	<ellipse fill="rgb(255,0,255)" stroke="rgb(255,0,255)" cx="3493.08" cy="819.462" rx="3.5" ry="3.5"/>
-	<ellipse fill="rgb(255,0,255)" stroke="rgb(255,0,255)" cx="3493.08" cy="484.262" rx="3.5" ry="3.5"/>
-	<ellipse fill="rgb(255,0,255)" stroke="rgb(255,0,255)" cx="4008.77" cy="368.231" rx="3.5" ry="3.5"/>
-	<ellipse fill="rgb(255,0,255)" stroke="rgb(255,0,255)" cx="4588.92" cy="819.462" rx="3.5" ry="3.5"/>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="3235.230769,755.000000 3364.153846,819.461538 3235.230769,883.923077 3235.230769,755.000000"/>
-	<text x="3222.34" y="725.992" fill="rgb(255,0,255)" dominant-baseline="central" font-size="32" font-family="helvetica" text-anchor="middle">u</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="5555.846154,787.230769 5620.307692,819.461538 5555.846154,851.692308 5555.846154,787.230769"/>
-	<text x="5639.65" y="764.669" fill="rgb(255,0,255)" dominant-baseline="central" font-size="32" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="3660.676923,999.953846 3686.461538,1012.846154 3660.676923,1025.738462 3660.676923,999.953846"/>
-	<text x="3660.68" y="997.375" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(0,0,127)" stroke-opacity="1" points="3815.384615,1006.400000 3828.276923,1012.846154 3815.384615,1019.292308 3815.384615,1006.400000"/>
-	<text x="3824.41" y="1005.11" fill="rgb(0,0,127)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4627.600000,1193.338462 4653.384615,1206.230769 4627.600000,1219.123077 4627.600000,1193.338462"/>
-	<text x="4627.6" y="1190.76" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(0,0,127)" stroke-opacity="1" points="4782.307692,1199.784615 4795.200000,1206.230769 4782.307692,1212.676923 4782.307692,1199.784615"/>
-	<text x="4791.33" y="1198.5" fill="rgb(0,0,127)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="4124.800000,696.984615 4137.692308,690.538462 4124.800000,684.092308 4124.800000,696.984615"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="4124.800000,696.984615 4137.692308,690.538462 4124.800000,684.092308 4124.800000,696.984615"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4266.62" y="687.315" width="6.44615" height="6.44615"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4266.62" y="687.315" width="6.44615" height="6.44615"/>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4208.600000,755.000000 4202.153846,767.892308 4195.707692,755.000000 4208.600000,755.000000"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="4363.307692,684.092308 4376.200000,690.538462 4363.307692,696.984615 4363.307692,684.092308"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4401.98" y="687.315" width="6.44615" height="6.44615"/>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4382.646154,780.784615 4395.538462,755.000000 4408.430769,780.784615 4382.646154,780.784615"/>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="3596.215385,355.338462 3622.000000,368.230769 3596.215385,381.123077 3596.215385,355.338462"/>
-	<text x="3596.22" y="352.76" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="3750.923077,361.784615 3763.815385,368.230769 3750.923077,374.676923 3750.923077,361.784615"/>
-	<text x="3759.95" y="360.495" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="4511.569231,696.984615 4524.461538,690.538462 4511.569231,684.092308 4511.569231,696.984615"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="4511.569231,696.984615 4524.461538,690.538462 4511.569231,684.092308 4511.569231,696.984615"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4653.38" y="687.315" width="6.44615" height="6.44615"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4653.38" y="687.315" width="6.44615" height="6.44615"/>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4595.369231,755.000000 4588.923077,767.892308 4582.476923,755.000000 4595.369231,755.000000"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="4750.076923,684.092308 4762.969231,690.538462 4750.076923,696.984615 4750.076923,684.092308"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4788.75" y="687.315" width="6.44615" height="6.44615"/>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4769.415385,780.784615 4782.307692,755.000000 4795.200000,780.784615 4769.415385,780.784615"/>
-	<polygon fill="rgb(0,0,127)" stroke="rgb(0,0,127)" stroke-opacity="1" points="4885.446154,1193.338462 4911.230769,1206.230769 4885.446154,1219.123077 4885.446154,1193.338462"/>
-	<text x="4885.45" y="1190.76" fill="rgb(0,0,127)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="5040.153846,1199.784615 5053.046154,1206.230769 5040.153846,1212.676923 5040.153846,1199.784615"/>
-	<text x="5049.18" y="1198.5" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="5143.292308,1193.338462 5169.076923,1206.230769 5143.292308,1219.123077 5143.292308,1193.338462"/>
-	<text x="5143.29" y="1190.76" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u1</text>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="5143.292308,1244.907692 5169.076923,1257.800000 5143.292308,1270.692308 5143.292308,1244.907692"/>
-	<text x="5143.29" y="1242.33" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u2</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="5298.000000,1199.784615 5310.892308,1206.230769 5298.000000,1212.676923 5298.000000,1199.784615"/>
-	<text x="5307.02" y="1198.5" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(0,0,127)" stroke="rgb(0,0,127)" stroke-opacity="1" points="3918.523077,999.953846 3944.307692,1012.846154 3918.523077,1025.738462 3918.523077,999.953846"/>
-	<text x="3918.52" y="997.375" fill="rgb(0,0,127)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4073.230769,1006.400000 4086.123077,1012.846154 4073.230769,1019.292308 4073.230769,1006.400000"/>
-	<text x="4082.26" y="1005.11" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4176.369231,999.953846 4202.153846,1012.846154 4176.369231,1025.738462 4176.369231,999.953846"/>
-	<text x="4176.37" y="997.375" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u1</text>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4176.369231,1051.523077 4202.153846,1064.415385 4176.369231,1077.307692 4176.369231,1051.523077"/>
-	<text x="4176.37" y="1048.94" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">u2</text>
-	<polygon fill="rgb(255,255,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4331.076923,1006.400000 4343.969231,1012.846154 4331.076923,1019.292308 4331.076923,1006.400000"/>
-	<text x="4340.1" y="1005.11" fill="rgb(255,0,255)" dominant-baseline="central" font-size="10" font-family="helvetica" text-anchor="middle">y</text>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="3738.030769,116.830769 3750.923077,110.384615 3738.030769,103.938462 3738.030769,116.830769"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="3738.030769,116.830769 3750.923077,110.384615 3738.030769,103.938462 3738.030769,116.830769"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="3879.85" y="107.162" width="6.44615" height="6.44615"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="3879.85" y="107.162" width="6.44615" height="6.44615"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="4105.461538,91.046154 4118.353846,97.492308 4105.461538,103.938462 4105.461538,91.046154"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4144.14" y="94.2692" width="6.44615" height="6.44615"/>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="4124.800000,187.738462 4137.692308,161.953846 4150.584615,187.738462 4124.800000,187.738462"/>
-	<polygon fill="rgb(0,0,0)" stroke="rgb(0,0,0)" stroke-opacity="1" points="3976.538462,232.861538 3989.430769,239.307692 3976.538462,245.753846 3976.538462,232.861538"/>
-	<rect fill="rgb(255,255,255)" stroke="rgb(0,0,0)" stroke-opacity="1" x="4015.22" y="236.085" width="6.44615" height="6.44615"/>
-	<polygon fill="rgb(255,0,255)" stroke="rgb(255,0,255)" stroke-opacity="1" points="3995.876923,329.553846 4008.769231,303.769231 4021.661538,329.553846 3995.876923,329.553846"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1774.0076 938.72797"
+   version="1.1"
+   id="svg1263"
+   sodipodi:docname="TrueFalseHoldImplementation-1.svg"
+   width="1774.0076"
+   height="938.72797"
+   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueFalseHoldImplementation-1.png"
+   inkscape:export-xdpi="84.554703"
+   inkscape:export-ydpi="84.554703"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata1269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs1267" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3381"
+     inkscape:window-height="1897"
+     id="namedview1265"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.410596"
+     inkscape:cx="874.81541"
+     inkscape:cy="528.45871"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1263" />
+  <rect
+     fill="#d2d2d2"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="466.85342"
+     y="-755.1897"
+     width="91"
+     height="91"
+     id="rect851" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="465.43542"
+     y="662.77069"
+     width="1.61067"
+     height="92.226097"
+     id="rect853" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="465.43542"
+     y="754.9967"
+     width="92.226097"
+     height="1.61067"
+     id="rect855" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="557.66144"
+     y="664.38165"
+     width="1.61067"
+     height="92.226097"
+     id="rect857" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="467.04645"
+     y="662.77069"
+     width="92.226097"
+     height="1.61067"
+     id="rect859" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="467.04645"
+     y="664.38165"
+     width="2.4159999"
+     height="90.615402"
+     id="rect861" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="467.04645"
+     y="664.38165"
+     width="90.615402"
+     height="2.4159999"
+     id="rect863" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="556.05042"
+     y="664.38165"
+     width="1.61067"
+     height="90.615402"
+     id="rect865" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="467.04645"
+     y="753.38666"
+     width="90.615402"
+     height="1.61067"
+     id="rect867" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="554.44043"
+     y="665.99268"
+     width="1.61067"
+     height="87.394096"
+     id="rect869" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="468.65643"
+     y="751.7757"
+     width="87.394096"
+     height="1.61067"
+     id="rect871" />
+  <text
+     fill="#000000"
+     font-size="14px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="512.35345"
+     y="770.85468"
+     id="text873">falseHoldDuration</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="535.292308,815.133846 544.353846,815.133846 544.353846,795.198462 588.755385,795.198462 588.755385,815.133846 601.441538,815.133846"
+     id="polyline875"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="535.292308,770.732308 569.726154,770.732308 569.726154,750.796923 588.755385,750.796923 588.755385,770.732308 601.441538,770.732308"
+     id="polyline877"
+     transform="translate(-59.184586,-75.541293)" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="477.01343"
+     cy="709.6897"
+     id="ellipse879"
+     r="3.17154" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="547.69342"
+     cy="709.6897"
+     id="ellipse881"
+     r="3.17154" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="512.35345"
+     y="650.78967"
+     id="text883">onDel1</text>
+  <rect
+     fill="#d2d2d2"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="1010.5454"
+     y="-891.11273"
+     width="91"
+     height="91"
+     id="rect885" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1009.1255"
+     y="798.69366"
+     width="1.61067"
+     height="92.226097"
+     id="rect887" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1009.1255"
+     y="890.92065"
+     width="92.226097"
+     height="1.61067"
+     id="rect889" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1101.3555"
+     y="800.30469"
+     width="1.61067"
+     height="92.226097"
+     id="rect891" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1010.7355"
+     y="798.69366"
+     width="92.226097"
+     height="1.61067"
+     id="rect893" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="1010.7355"
+     y="800.30469"
+     width="2.4159999"
+     height="90.615402"
+     id="rect895" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="1010.7355"
+     y="800.30469"
+     width="90.615402"
+     height="2.4159999"
+     id="rect897" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="1099.7455"
+     y="800.30469"
+     width="1.61067"
+     height="90.615402"
+     id="rect899" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="1010.7355"
+     y="889.30969"
+     width="90.615402"
+     height="1.61067"
+     id="rect901" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1098.1354"
+     y="801.91565"
+     width="1.61067"
+     height="87.394096"
+     id="rect903" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1012.3455"
+     y="887.69867"
+     width="87.394096"
+     height="1.61067"
+     id="rect905" />
+  <text
+     fill="#000000"
+     font-size="14px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1056.0454"
+     y="906.77765"
+     id="text907">trueHoldDuration</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1078.984615,951.056923 1088.046154,951.056923 1088.046154,931.121538 1132.447692,931.121538 1132.447692,951.056923 1145.133846,951.056923"
+     id="polyline909"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1078.984615,906.655385 1113.418462,906.655385 1113.418462,886.720000 1132.447692,886.720000 1132.447692,906.655385 1145.133846,906.655385"
+     id="polyline911"
+     transform="translate(-59.184586,-75.541293)" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="1020.7054"
+     cy="845.61267"
+     id="ellipse913"
+     r="3.17154" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="1091.3854"
+     cy="845.61267"
+     id="ellipse915"
+     r="3.17154" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1056.0454"
+     y="786.71271"
+     id="text917">onDel2</text>
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="240.5074"
+     y="16.48181"
+     id="text919">stateGraphRoot</text>
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="195.00742"
+     y="-120.88171"
+     width="91"
+     height="91"
+     id="rect921" />
+  <text
+     fill="#000000"
+     font-size="20px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="241.41341"
+     y="50.009708"
+     id="text923">root</text>
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="203.46341"
+     y="-93.302704"
+     width="17"
+     height="15"
+     id="rect925" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="299.692308,146.392308 299.692308,178.107692"
+     id="polyline927"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="262.3634"
+     y="-93.302704"
+     width="17"
+     height="15"
+     id="rect929" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="294.25538,163.60923 294.25538,158.17231 299.69231,160.89077 "
+     id="polygon931"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="279.756923,160.890769 294.255385,160.890769"
+     id="polyline933"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="316.00308,163.60923 316.00308,158.17231 321.44,160.89077 "
+     id="polygon935"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="299.692308,160.890769 316.003077,160.890769"
+     id="polyline937"
+     transform="translate(-59.184586,-75.541293)" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="693.58441"
+     y="424.2507"
+     id="text939">outputFalse</text>
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="648.08441"
+     y="-528.6507"
+     width="91"
+     height="91"
+     id="rect941" />
+  <text
+     fill="#000000"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="694.03741"
+     y="520.75665"
+     id="text943">active</text>
+  <text
+     fill="#ffffff"
+     font-size="11px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="879.34644"
+     y="468.42569"
+     id="text945">0 s</text>
+  <rect
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="825.00739"
+     y="-528.6507"
+     width="9"
+     height="91"
+     id="rect947" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="875.100000,558.692308 884.161538,558.692308"
+     id="polyline949"
+     transform="translate(-59.184586,-75.541293)" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="829.50745"
+     y="424.2507"
+     id="text951">toTrue</text>
+  <circle
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="829.50745"
+     cy="523.02167"
+     id="ellipse953"
+     r="3.17154" />
+  <rect
+     fill="#d7d7d7"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="285.62341"
+     y="-302.1127"
+     width="91"
+     height="91"
+     id="rect955" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="284.20441"
+     y="209.6937"
+     width="1.61067"
+     height="92.226097"
+     id="rect957" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="284.20441"
+     y="301.92072"
+     width="92.226097"
+     height="1.61067"
+     id="rect959" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="376.43042"
+     y="211.30472"
+     width="1.61067"
+     height="92.226097"
+     id="rect961" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="285.81543"
+     y="209.6937"
+     width="92.226097"
+     height="1.61067"
+     id="rect963" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="285.81543"
+     y="211.30472"
+     width="2.4159999"
+     height="90.615402"
+     id="rect965" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="285.81543"
+     y="211.30472"
+     width="90.615402"
+     height="2.4159999"
+     id="rect967" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="374.82043"
+     y="211.30472"
+     width="1.61067"
+     height="90.615402"
+     id="rect969" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="285.81543"
+     y="300.30972"
+     width="90.615402"
+     height="1.61067"
+     id="rect971" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="373.20941"
+     y="212.91571"
+     width="1.61067"
+     height="87.394096"
+     id="rect973" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="287.42639"
+     y="298.6987"
+     width="87.394096"
+     height="1.61067"
+     id="rect975" />
+  <text
+     fill="#000000"
+     font-size="24px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="334.74744"
+     y="255.7067"
+     id="text977">not</text>
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="366.46344"
+     cy="256.6127"
+     id="ellipse979"
+     r="3.17154" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="331.12341"
+     y="197.71271"
+     id="text981">notU</text>
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="965.43542"
+     y="424.2507"
+     id="text983">outputTrue</text>
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="919.93542"
+     y="-528.6507"
+     width="91"
+     height="91"
+     id="rect985" />
+  <text
+     fill="#000000"
+     font-size="10px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="965.88538"
+     y="520.75665"
+     id="text987">active</text>
+  <text
+     fill="#ffffff"
+     font-size="11px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1151.1954"
+     y="468.42569"
+     id="text989">0 s</text>
+  <rect
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="1096.8555"
+     y="-528.6507"
+     width="9"
+     height="91"
+     id="rect991" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1146.946154,558.692308 1156.007692,558.692308"
+     id="polyline993"
+     transform="translate(-59.184586,-75.541293)" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1101.3555"
+     y="424.2507"
+     id="text995">toFalse</text>
+  <circle
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="1101.3555"
+     cy="523.02167"
+     id="ellipse997"
+     r="3.17154" />
+  <rect
+     fill="#d2d2d2"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="1191.7754"
+     y="-891.11273"
+     width="91"
+     height="91"
+     id="rect999" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1190.3555"
+     y="798.69366"
+     width="1.61067"
+     height="92.226097"
+     id="rect1001" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1190.3555"
+     y="890.92065"
+     width="92.226097"
+     height="1.61067"
+     id="rect1003" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1282.5854"
+     y="800.30469"
+     width="1.61067"
+     height="92.226097"
+     id="rect1005" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1191.9655"
+     y="798.69366"
+     width="92.226097"
+     height="1.61067"
+     id="rect1007" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="1191.9655"
+     y="800.30469"
+     width="2.4159999"
+     height="90.615402"
+     id="rect1009" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="1191.9655"
+     y="800.30469"
+     width="90.615402"
+     height="2.4159999"
+     id="rect1011" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="1280.9755"
+     y="800.30469"
+     width="1.61067"
+     height="90.615402"
+     id="rect1013" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="1191.9655"
+     y="889.30969"
+     width="90.615402"
+     height="1.61067"
+     id="rect1015" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1279.3655"
+     y="801.91565"
+     width="1.61067"
+     height="87.394096"
+     id="rect1017" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="1193.5754"
+     y="887.69867"
+     width="87.394096"
+     height="1.61067"
+     id="rect1019" />
+  <text
+     fill="#000000"
+     font-size="36px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1237.2754"
+     y="845.61267"
+     id="text1021">and</text>
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="1272.6155"
+     cy="845.61267"
+     id="ellipse1023"
+     r="3.17154" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="1200.1255"
+     cy="845.15967"
+     id="ellipse1025"
+     r="3.17154" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="1200.1255"
+     cy="881.8587"
+     id="ellipse1027"
+     r="3.17154" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1237.2754"
+     y="786.71271"
+     id="text1029">and2</text>
+  <rect
+     fill="#d2d2d2"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="693.3924"
+     y="-755.1897"
+     width="91"
+     height="91"
+     id="rect1031" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="691.97443"
+     y="662.77069"
+     width="1.61067"
+     height="92.226097"
+     id="rect1033" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="691.97443"
+     y="754.9967"
+     width="92.226097"
+     height="1.61067"
+     id="rect1035" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="784.20044"
+     y="664.38165"
+     width="1.61067"
+     height="92.226097"
+     id="rect1037" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="693.58441"
+     y="662.77069"
+     width="92.226097"
+     height="1.61067"
+     id="rect1039" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="693.58441"
+     y="664.38165"
+     width="2.4159999"
+     height="90.615402"
+     id="rect1041" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="693.58441"
+     y="664.38165"
+     width="90.615402"
+     height="2.4159999"
+     id="rect1043" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="782.58942"
+     y="664.38165"
+     width="1.61067"
+     height="90.615402"
+     id="rect1045" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="693.58441"
+     y="753.38666"
+     width="90.615402"
+     height="1.61067"
+     id="rect1047" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="780.97845"
+     y="665.99268"
+     width="1.61067"
+     height="87.394096"
+     id="rect1049" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="695.19543"
+     y="751.7757"
+     width="87.394096"
+     height="1.61067"
+     id="rect1051" />
+  <text
+     fill="#000000"
+     font-size="36px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="738.89246"
+     y="709.6897"
+     id="text1053">and</text>
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="774.23242"
+     cy="709.6897"
+     id="ellipse1055"
+     r="3.17154" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="701.74042"
+     cy="709.23669"
+     id="ellipse1057"
+     r="3.17154" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="701.74042"
+     cy="745.93567"
+     id="ellipse1059"
+     r="3.17154" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="738.89246"
+     y="650.78967"
+     id="text1061">and1</text>
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="421.7384"
+     y="16.48181"
+     id="text1063">initialStep</text>
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="376.2384"
+     y="-120.88171"
+     width="91"
+     height="91"
+     id="rect1065" />
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="385.7384"
+     y="-111.38171"
+     width="72"
+     height="72"
+     id="rect1067" />
+  <text
+     fill="#ffffff"
+     font-size="11px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="698.11542"
+     y="51.595707"
+     id="text1069">0 s</text>
+  <rect
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="643.7774"
+     y="-111.82071"
+     width="9"
+     height="91"
+     id="rect1071" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="693.869231,141.861538 702.930769,141.861538"
+     id="polyline1073"
+     transform="translate(-59.184586,-75.541293)" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="648.2774"
+     y="7.4202094"
+     id="text1075">toTrue1</text>
+  <circle
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="648.2774"
+     cy="106.1907"
+     id="ellipse1077"
+     r="3.17154" />
+  <text
+     fill="#ffffff"
+     font-size="11px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="607.50043"
+     y="151.27171"
+     id="text1079">0 s</text>
+  <rect
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="553.16144"
+     y="-211.4967"
+     width="9"
+     height="91"
+     id="rect1081" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="603.253846,241.538462 612.315385,241.538462"
+     id="polyline1083"
+     transform="translate(-59.184586,-75.541293)" />
+  <text
+     fill="#0000ff"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="557.66144"
+     y="107.09671"
+     id="text1085">toFalse1</text>
+  <circle
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="557.66144"
+     cy="205.86771"
+     id="ellipse1087"
+     r="3.17154" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1072.188462,558.692308 1106.169231,558.692308 1142.415385,558.692308"
+     id="polyline1089"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1072.188462,558.692308 1106.169231,558.692308 1142.415385,558.692308"
+     id="polyline1091"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1024.615385,608.530769 1024.615385,649.307692 1794.846154,649.307692"
+     id="polyline1093"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1024.615385,608.530769 1024.615385,649.307692 1794.846154,649.307692"
+     id="polyline1095"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="800.342308,558.692308 834.323077,558.692308 870.569231,558.692308"
+     id="polyline1097"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="800.342308,558.692308 834.323077,558.692308 870.569231,558.692308"
+     id="polyline1099"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1167.334615,558.692308 1251.153846,558.692308 1251.153846,468.076923 662.153846,468.076923 662.153846,556.426923 702.930769,556.426923"
+     id="polyline1101"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1167.334615,558.692308 1251.153846,558.692308 1251.153846,468.076923 662.153846,468.076923 662.153846,556.426923 702.930769,556.426923"
+     id="polyline1103"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1024.615385,608.530769 1024.615385,649.307692 1024.615385,921.153846 1060.861538,921.153846"
+     id="polyline1105"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1024.615385,608.530769 1024.615385,649.307692 1024.615385,921.153846 1060.861538,921.153846"
+     id="polyline1107"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="444.676923,332.153846 1613.615385,332.153846 1613.615385,1011.769231 1196.784615,1011.769231 1196.784615,957.400000 1242.092308,957.400000"
+     id="polyline1109"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="444.676923,332.153846 1613.615385,332.153846 1613.615385,1011.769231 1196.784615,1011.769231 1196.784615,957.400000 1242.092308,957.400000"
+     id="polyline1111"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1350.830769,921.153846 1432.384615,921.153846 1432.384615,739.923077 1160.538462,739.923077 1160.538462,613.061538"
+     id="polyline1113"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1350.830769,921.153846 1432.384615,921.153846 1432.384615,739.923077 1160.538462,739.923077 1160.538462,613.061538"
+     id="polyline1115"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="752.769231,608.530769 752.769231,649.307692 345.000000,649.307692 345.000000,785.230769 517.169231,785.230769"
+     id="polyline1117"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="752.769231,608.530769 752.769231,649.307692 345.000000,649.307692 345.000000,785.230769 517.169231,785.230769"
+     id="polyline1119"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="73.153846,649.307692 254.384615,649.307692 254.384615,875.846154 707.461538,875.846154 707.461538,821.476923 743.707692,821.476923 743.707692,821.476923"
+     id="polyline1121"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="73.153846,649.307692 254.384615,649.307692 254.384615,875.846154 707.461538,875.846154 707.461538,821.476923 743.707692,821.476923 743.707692,821.476923"
+     id="polyline1123"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="852.446154,785.230769 888.692308,785.230769 888.692308,613.061538"
+     id="polyline1125"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="852.446154,785.230769 888.692308,785.230769 888.692308,613.061538"
+     id="polyline1127"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="73.153846,649.307692 254.384615,649.307692 254.384615,413.707692 707.461538,413.707692 707.461538,196.230769"
+     id="polyline1129"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="73.153846,649.307692 254.384615,649.307692 254.384615,413.707692 707.461538,413.707692 707.461538,196.230769"
+     id="polyline1131"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="714.257692,141.861538 934.000000,141.861538 934.000000,556.426923 974.776923,556.426923"
+     id="polyline1133"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="714.257692,141.861538 934.000000,141.861538 934.000000,556.426923 974.776923,556.426923"
+     id="polyline1135"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="895.488462,558.692308 974.776923,558.692308 974.776923,560.957692"
+     id="polyline1137"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="895.488462,558.692308 974.776923,558.692308 974.776923,560.957692"
+     id="polyline1139"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="623.642308,241.538462 653.092308,241.538462 653.092308,449.953846 653.092308,558.692308 702.930769,558.692308 702.930769,560.957692"
+     id="polyline1141"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="623.642308,241.538462 653.092308,241.538462 653.092308,449.953846 653.092308,558.692308 702.930769,558.692308 702.930769,560.957692"
+     id="polyline1143"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="528.496154,149.790385 571.538462,149.790385 571.538462,150.923077 571.538462,141.861538 689.338462,141.861538"
+     id="polyline1145"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="528.496154,149.790385 571.538462,149.790385 571.538462,150.923077 571.538462,141.861538 689.338462,141.861538"
+     id="polyline1147"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="528.496154,152.055769 553.415385,152.055769 553.415385,150.923077 571.538462,150.923077 571.538462,241.538462 598.723077,241.538462"
+     id="polyline1149"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="528.496154,152.055769 553.415385,152.055769 553.415385,150.923077 571.538462,150.923077 571.538462,241.538462 598.723077,241.538462"
+     id="polyline1151"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="335.938462,332.153846 254.384615,332.153846 254.384615,649.307692 73.153846,649.307692"
+     id="polyline1153"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="335.938462,332.153846 254.384615,332.153846 254.384615,649.307692 73.153846,649.307692"
+     id="polyline1155"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="444.676923,332.153846 616.846154,332.153846 616.846154,295.907692"
+     id="polyline1157"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="444.676923,332.153846 616.846154,332.153846 616.846154,295.907692"
+     id="polyline1159"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="625.907692,785.230769 743.707692,785.230769"
+     id="polyline1161"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="625.907692,785.230769 743.707692,785.230769"
+     id="polyline1163"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1169.600000,921.153846 1169.600000,921.153846 1242.092308,921.153846"
+     id="polyline1165"
+     transform="translate(-59.184586,-75.541293)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1169.600000,921.153846 1169.600000,921.153846 1242.092308,921.153846"
+     id="polyline1167"
+     transform="translate(-59.184586,-75.541293)" />
+  <circle
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     cx="195.20041"
+     cy="573.76666"
+     id="ellipse1169"
+     r="3" />
+  <circle
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     cx="195.20041"
+     cy="573.76666"
+     id="ellipse1171"
+     r="3" />
+  <circle
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     cx="195.20041"
+     cy="338.16672"
+     id="ellipse1173"
+     r="3" />
+  <circle
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     cx="557.66144"
+     cy="256.6127"
+     id="ellipse1175"
+     r="3" />
+  <circle
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     cx="965.43542"
+     cy="573.76666"
+     id="ellipse1177"
+     r="3" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="73.153846,694.61538 73.153846,604 163.76923,649.30769 "
+     id="polygon1179"
+     transform="translate(-59.184586,-75.541293)" />
+  <text
+     fill="#ff00ff"
+     font-size="23px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="4.9077148"
+     y="508.07071"
+     id="text1181">u</text>
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1704.2308,694.61538 1704.2308,604 1794.8462,649.30769 "
+     id="polygon1183"
+     transform="translate(-59.184586,-75.541293)" />
+  <text
+     fill="#ff00ff"
+     font-size="45px"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="1762.8455"
+     y="496.74368"
+     id="text1185">y</text>
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="517.16923,789.76154 517.16923,780.7 526.23077,785.23077 "
+     id="polygon1187"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="616.84615,789.76154 616.84615,780.7 625.90769,785.23077 "
+     id="polygon1189"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1060.8615,925.68462 1060.8615,916.62308 1069.9231,921.15385 "
+     id="polygon1191"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1160.5385,925.68462 1160.5385,916.62308 1169.6,921.15385 "
+     id="polygon1193"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="698.4,554.16154 698.4,563.22308 707.46154,558.69231 "
+     id="polygon1195"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="698.4,554.16154 698.4,563.22308 707.46154,558.69231 "
+     id="polygon1197"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="738.65741"
+     y="480.65073"
+     width="5"
+     height="5"
+     id="rect1199" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="738.65741"
+     y="480.65073"
+     width="5"
+     height="5"
+     id="rect1201" />
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="748.23846,604 757.3,604 752.76923,613.06154 "
+     id="polygon1203"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="866.03846,563.22308 866.03846,554.16154 875.1,558.69231 "
+     id="polygon1205"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="833.80341"
+     y="-485.6507"
+     width="5"
+     height="5"
+     id="rect1207" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="897.75385,622.12308 879.63077,622.12308 888.69231,604 "
+     id="polygon1209"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="335.93846,336.68462 335.93846,327.62308 345,332.15385 "
+     id="polygon1211"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="435.61539,336.68462 435.61539,327.62308 444.67692,332.15385 "
+     id="polygon1213"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="970.24615,554.16154 970.24615,563.22308 979.30769,558.69231 "
+     id="polygon1215"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="970.24615,554.16154 970.24615,563.22308 979.30769,558.69231 "
+     id="polygon1217"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="1010.5054"
+     y="480.65073"
+     width="5"
+     height="5"
+     id="rect1219" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="1010.5054"
+     y="480.65073"
+     width="5"
+     height="5"
+     id="rect1221" />
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1020.0846,604 1029.1462,604 1024.6154,613.06154 "
+     id="polygon1223"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1137.8846,563.22308 1137.8846,554.16154 1146.9462,558.69231 "
+     id="polygon1225"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="1105.6454"
+     y="-485.6507"
+     width="5"
+     height="5"
+     id="rect1227" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1169.6,622.12308 1151.4769,622.12308 1160.5385,604 "
+     id="polygon1229"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1242.0923,925.68462 1242.0923,916.62308 1251.1538,921.15385 "
+     id="polygon1231"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1242.0923,961.93077 1242.0923,952.86923 1251.1538,957.4 "
+     id="polygon1233"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1341.7692,925.68462 1341.7692,916.62308 1350.8308,921.15385 "
+     id="polygon1235"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="743.70769,789.76154 743.70769,780.7 752.76923,785.23077 "
+     id="polygon1237"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="743.70769,826.00769 743.70769,816.94615 752.76923,821.47692 "
+     id="polygon1239"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="843.38462,789.76154 843.38462,780.7 852.44615,785.23077 "
+     id="polygon1241"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="426.55385,146.39231 426.55385,155.45385 435.61539,150.92308 "
+     id="polygon1243"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="426.55385,146.39231 426.55385,155.45385 435.61539,150.92308 "
+     id="polygon1245"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="466.8114"
+     y="72.881714"
+     width="5"
+     height="5"
+     id="rect1247" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="466.8114"
+     y="72.881714"
+     width="5"
+     height="5"
+     id="rect1249" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="684.80769,146.39231 684.80769,137.33077 693.86923,141.86154 "
+     id="polygon1251"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="652.57343"
+     y="-68.820709"
+     width="5"
+     height="5"
+     id="rect1253" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="716.52308,205.29231 698.4,205.29231 707.46154,187.16923 "
+     id="polygon1255"
+     transform="translate(-59.184586,-75.541293)" />
+  <polygon
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="594.19231,246.06923 594.19231,237.00769 603.25385,241.53846 "
+     id="polygon1257"
+     transform="translate(-59.184586,-75.541293)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="561.9574"
+     y="-168.4967"
+     width="5"
+     height="5"
+     id="rect1259" />
+  <polygon
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="625.90769,304.96923 607.78462,304.96923 616.84615,286.84615 "
+     id="polygon1261"
+     transform="translate(-59.184586,-75.541293)" />
 </svg>
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.png
index ea6f5c86085..c093a9471c9 100644
Binary files a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.png and b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.png differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.svg
index 7a30505b891..94fa5e52e06 100644
--- a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.svg
+++ b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.svg
@@ -7,15 +7,18 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 2062.2966 905.14905"
+   viewBox="0 0 1481.5427 606.47156"
    version="1.1"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="TrueHoldWithReset.svg"
-   width="2062.2966"
-   height="905.14905">
+   id="svg1013"
+   sodipodi:docname="TrueHoldWithResetImplementation-1.svg"
+   width="1481.5427"
+   height="606.47156"
+   inkscape:export-filename="/home/jianjun/GitFolder/modelica-buildings/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation-1.png"
+   inkscape:export-xdpi="84.554703"
+   inkscape:export-ydpi="84.554703"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
   <metadata
-     id="metadata218">
+     id="metadata1019">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -27,7 +30,7 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs216" />
+     id="defs1017" />
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -37,658 +40,675 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1855"
-     inkscape:window-height="1379"
-     id="namedview214"
+     inkscape:window-width="3381"
+     inkscape:window-height="1897"
+     id="namedview1015"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:zoom="0.43211026"
-     inkscape:cx="1082.6194"
-     inkscape:cy="446.58051"
-     inkscape:window-x="0"
-     inkscape:window-y="45"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <rect
-     x="1243.8627"
-     y="556.54004"
-     width="173.89999"
-     height="173.89999"
-     id="rect4"
-     style="fill:#d2d2d2;stroke:#000000;stroke-opacity:1" />
-  <rect
-     x="1241.5028"
-     y="554.18103"
-     width="2.35867"
-     height="176.259"
-     id="rect6"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1241.5028"
-     y="730.44"
-     width="176.259"
-     height="2.35867"
-     id="rect8"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1417.7626"
-     y="556.54004"
-     width="2.35867"
-     height="176.259"
-     id="rect10"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1243.8627"
-     y="554.18103"
-     width="176.259"
-     height="2.35867"
-     id="rect12"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1243.8627"
-     y="556.54004"
-     width="3.5380001"
-     height="173.89999"
-     id="rect14"
-     style="fill:#ffffff;stroke:none" />
-  <rect
-     x="1243.8627"
-     y="556.54004"
-     width="173.89999"
-     height="3.5380001"
-     id="rect16"
-     style="fill:#ffffff;stroke:none" />
-  <rect
-     x="1415.4027"
-     y="556.54004"
-     width="2.35867"
-     height="173.89999"
-     id="rect18"
-     style="fill:#716f64;stroke:none" />
-  <rect
-     x="1243.8627"
-     y="728.08099"
-     width="173.89999"
-     height="2.35867"
-     id="rect20"
-     style="fill:#716f64;stroke:none" />
-  <rect
-     x="1413.0428"
-     y="558.89899"
-     width="2.35867"
-     height="169.183"
-     id="rect22"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1246.2225"
-     y="725.72302"
-     width="169.183"
-     height="2.35867"
-     id="rect24"
-     style="fill:#aca899;stroke:none" />
-  <polyline
-     points="5590.595000,696.465000 5740.149000,696.465000"
-     id="polyline26"
-     style="fill:none;stroke:#c0c0c0;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <polyline
-     points="5599.290000,576.474000 5599.290000,705.160000"
-     id="polyline28"
-     style="fill:none;stroke:#c0c0c0;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <polygon
-     points="5747.105,696.465 5747.105,696.465 5727.976,689.509 5727.976,703.421 "
-     id="polygon30"
-     style="fill:#c0c0c0;stroke:#c0c0c0;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <polygon
-     points="5599.29,557.345 5599.29,557.345 5592.334,576.474 5606.246,576.474 "
-     id="polygon32"
-     style="fill:#c0c0c0;stroke:#c0c0c0;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <polyline
-     points="5599.290000,696.465000 5616.680000,696.465000 5616.680000,658.207000 5701.891000,658.207000 5701.891000,696.465000 5726.237000,696.465000"
-     id="polyline34"
-     style="fill:none;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <polyline
-     points="5599.290000,635.600000 5614.941000,635.600000 5703.630000,557.345000 5703.630000,635.600000 5727.976000,635.600000"
-     id="polyline36"
-     style="fill:none;stroke:#00007f;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     inkscape:zoom="1.410596"
+     inkscape:cx="724.76799"
+     inkscape:cy="546.76252"
+     inkscape:window-x="51"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1013" />
   <text
-     x="1330.8129"
-     y="530.45502"
+     fill="#0000ff"
+     font-size="24px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="35"
-     id="text38"
-     style="font-size:35px;font-family:helvetica;text-anchor:middle;fill:#0000ff">timer</text>
+     x="1195.9679"
+     y="10.772518"
+     id="text851">stateGraphRoot</text>
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="1136.968"
+     y="-146.34251"
+     width="118"
+     height="118"
+     id="rect853" />
   <text
-     x="1765.5629"
-     y="26.145"
+     fill="#000000"
+     font-size="26px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="35"
-     id="text40"
-     style="font-size:35px;font-family:helvetica;text-anchor:middle;fill:#0000ff">stateGraphRoot</text>
-  <rect
-     x="1678.6127"
-     y="52.23"
-     width="173.89999"
-     height="173.89999"
-     id="rect42"
-     style="fill:none;stroke:#000000;stroke-opacity:1" />
-  <text
-     x="1767.3026"
-     y="90.487999"
-     dominant-baseline="central"
-     font-size="38"
-     id="text44"
-     style="font-size:38px;font-family:helvetica;text-anchor:middle;fill:#000000">root</text>
-  <rect
-     x="1694.2626"
-     y="144.397"
-     width="33.041"
-     height="29.563"
-     id="rect46"
-     style="fill:none;stroke:#000000;stroke-opacity:1" />
+     x="1197.1479"
+     y="54.358517"
+     id="text855">root</text>
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="1147.858"
+     y="-110.88952"
+     width="22"
+     height="20"
+     id="rect857" />
   <polyline
-     points="6103.600000,122.595000 6103.600000,183.460000"
-     id="polyline48"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <rect
-     x="1807.3026"
-     y="144.397"
-     width="33.041"
-     height="29.563"
-     id="rect50"
-     style="fill:none;stroke:#000000;stroke-opacity:1" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1405.200000,138.690000 1405.200000,179.920000"
+     id="polyline859"
+     transform="translate(-209.23201,-57.237484)" />
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="1224.428"
+     y="-110.88952"
+     width="22"
+     height="20"
+     id="rect861" />
   <polygon
-     points="6093.166,145.202 6093.166,145.202 6103.6,150.419 6093.166,155.636 "
-     id="polygon52"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1398.132,161.072 1398.132,154.004 1405.2,157.538 "
+     id="polygon863"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="6065.342000,150.419000 6093.166000,150.419000"
-     id="polyline54"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1379.284000,157.538000 1398.132000,157.538000"
+     id="polyline865"
+     transform="translate(-209.23201,-57.237484)" />
   <polygon
-     points="6134.902,145.202 6134.902,145.202 6145.336,150.419 6134.902,155.636 "
-     id="polygon56"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1426.404,161.072 1426.404,154.004 1433.472,157.538 "
+     id="polygon867"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="6103.600000,150.419000 6134.902000,150.419000"
-     id="polyline58"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1405.200000,157.538000 1426.404000,157.538000"
+     id="polyline869"
+     transform="translate(-209.23201,-57.237484)" />
+  <rect
+     fill="#d2d2d2"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="783.56799"
+     y="-487.96252"
+     width="118"
+     height="118"
+     id="rect871" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="782.05701"
+     y="368.45151"
+     width="1.61067"
+     height="119.411"
+     id="rect873" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="782.05701"
+     y="487.86249"
+     width="119.411"
+     height="1.61067"
+     id="rect875" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="901.46796"
+     y="370.0625"
+     width="1.61067"
+     height="119.411"
+     id="rect877" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="783.66803"
+     y="368.45151"
+     width="119.411"
+     height="1.61067"
+     id="rect879" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="783.66803"
+     y="370.0625"
+     width="2.4159999"
+     height="117.8"
+     id="rect881" />
+  <rect
+     fill="#ffffff"
+     stroke="none"
+     x="783.66803"
+     y="370.0625"
+     width="117.8"
+     height="2.4159999"
+     id="rect883" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="899.85797"
+     y="370.0625"
+     width="1.61067"
+     height="117.8"
+     id="rect885" />
+  <rect
+     fill="#716f64"
+     stroke="none"
+     x="783.66803"
+     y="486.25153"
+     width="117.8"
+     height="1.61067"
+     id="rect887" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="898.24799"
+     y="371.67352"
+     width="1.61067"
+     height="114.579"
+     id="rect889" />
+  <rect
+     fill="#aca899"
+     stroke="none"
+     x="785.27899"
+     y="484.64154"
+     width="114.579"
+     height="1.61067"
+     id="rect891" />
   <text
-     x="461.3129"
-     y="182.655"
+     fill="#000000"
+     font-size="18px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="35"
-     id="text60"
-     style="font-size:35px;font-family:helvetica;text-anchor:middle;fill:#0000ff">initialStep</text>
-  <rect
-     x="374.3627"
-     y="208.74001"
-     width="173.89999"
-     height="173.89999"
-     id="rect62"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
-  <rect
-     x="391.75284"
-     y="226.13"
-     width="139.12"
-     height="139.12"
-     id="rect64"
-     style="fill:none;stroke:#000000;stroke-opacity:1" />
+     x="842.56805"
+     y="508.47754"
+     id="text893">duration</text>
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1004.680000,525.074000 1016.460000,525.074000 1016.460000,499.158000 1074.182000,499.158000 1074.182000,525.074000 1090.674000,525.074000"
+     id="polyline895"
+     transform="translate(-209.23201,-57.237484)" />
+  <polyline
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1004.680000,467.352000 1049.444000,467.352000 1049.444000,441.436000 1074.182000,441.436000 1074.182000,467.352000 1090.674000,467.352000"
+     id="polyline897"
+     transform="translate(-209.23201,-57.237484)" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="796.62799"
+     cy="428.96252"
+     id="ellipse899"
+     r="4.1230001" />
+  <circle
+     fill="#ebebeb"
+     stroke="#ebebeb"
+     stroke-opacity="1"
+     cx="888.508"
+     cy="428.96252"
+     id="ellipse901"
+     r="4.1230001" />
   <text
-     x="1069.9628"
-     y="182.655"
+     fill="#0000ff"
+     font-size="24px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="35"
-     id="text66"
-     style="font-size:35px;font-family:helvetica;text-anchor:middle;fill:#0000ff">outputTrue</text>
-  <rect
-     x="983.01263"
-     y="208.74001"
-     width="173.89999"
-     height="173.89999"
-     id="rect68"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+     x="842.56805"
+     y="352.39252"
+     id="text903">onDelay</text>
   <text
-     x="1070.8329"
-     y="367.85901"
+     fill="#0000ff"
+     font-size="24px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="16"
-     id="text70"
-     style="font-size:16px;font-family:helvetica;text-anchor:middle;fill:#000000">active</text>
+     x="312.46802"
+     y="116.79252"
+     id="text905">initialStep</text>
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="253.46799"
+     y="-252.36252"
+     width="118"
+     height="118"
+     id="rect907" />
+  <rect
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="265.46799"
+     y="-240.36252"
+     width="94"
+     height="94"
+     id="rect909" />
   <text
-     x="817.81293"
-     y="267.431"
+     fill="#0000ff"
+     font-size="24px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="22"
-     id="text72"
-     style="font-size:22px;font-family:helvetica;text-anchor:middle;fill:#ffffff">0</text>
-  <rect
-     x="713.4726"
-     y="208.74001"
-     width="17.389999"
-     height="173.89999"
-     id="rect74"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
-  <polyline
-     points="5034.115000,287.800000 5051.505000,287.800000"
-     id="polyline76"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     x="724.76801"
+     y="116.79252"
+     id="text911">outputTrue</text>
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="665.76801"
+     y="-252.36252"
+     width="118"
+     height="118"
+     id="rect913" />
   <text
-     x="722.16302"
-     y="182.655"
+     fill="#000000"
+     font-size="11px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="35"
-     id="text78"
-     style="font-size:35px;font-family:helvetica;text-anchor:middle;fill:#0000ff">toOutputTrue</text>
-  <circle
-     cx="722.16302"
-     cy="372.20602"
-     id="ellipse80"
-     r="6.0865002"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+     x="725.35699"
+     y="242.24951"
+     id="text915">active</text>
   <text
-     x="1513.4027"
-     y="267.431"
+     fill="#ffffff"
+     font-size="15px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="22"
-     id="text82"
-     style="font-size:22px;font-family:helvetica;text-anchor:middle;fill:#ffffff">0</text>
-  <rect
-     x="1409.0629"
-     y="208.74001"
-     width="17.389999"
-     height="173.89999"
-     id="rect84"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+     x="553.95801"
+     y="174.21951"
+     id="text917">0 s</text>
+  <rect
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="483.168"
+     y="-252.36252"
+     width="12"
+     height="118"
+     id="rect919" />
   <polyline
-     points="5729.715000,287.800000 5747.105000,287.800000"
-     id="polyline86"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="680.730000,250.600000 692.510000,250.600000"
+     id="polyline921"
+     transform="translate(-209.23201,-57.237484)" />
   <text
-     x="1417.7626"
-     y="182.655"
+     fill="#0000ff"
+     font-size="24px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="35"
-     id="text88"
-     style="font-size:35px;font-family:helvetica;text-anchor:middle;fill:#0000ff">toInitial</text>
+     x="489.16803"
+     y="116.79252"
+     id="text923">toOutputTrue</text>
   <circle
-     cx="1417.7626"
-     cy="372.20602"
-     id="ellipse90"
-     r="6.0865002"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="489.16803"
+     cy="245.19452"
+     id="ellipse925"
+     r="4.1230001" />
   <text
-     x="1678.6127"
-     y="752.177"
+     fill="#ffffff"
+     font-size="15px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="26"
-     id="text92"
-     style="font-size:26px;font-family:helvetica;text-anchor:middle;fill:#000000">duration</text>
-  <rect
-     x="1591.663"
-     y="556.54004"
-     width="173.89999"
-     height="173.89999"
-     id="rect94"
-     style="fill:#d2d2d2;stroke:#000000;stroke-opacity:1" />
-  <rect
-     x="1589.3026"
-     y="554.18103"
-     width="2.35867"
-     height="176.259"
-     id="rect96"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1589.3026"
-     y="730.44"
-     width="176.259"
-     height="2.35867"
-     id="rect98"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1765.5629"
-     y="556.54004"
-     width="2.35867"
-     height="176.259"
-     id="rect100"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1591.663"
-     y="554.18103"
-     width="176.259"
-     height="2.35867"
-     id="rect102"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1591.663"
-     y="556.54004"
-     width="3.5380001"
-     height="173.89999"
-     id="rect104"
-     style="fill:#ffffff;stroke:none" />
-  <rect
-     x="1591.663"
-     y="556.54004"
-     width="173.89999"
-     height="3.5380001"
-     id="rect106"
-     style="fill:#ffffff;stroke:none" />
-  <rect
-     x="1763.203"
-     y="556.54004"
-     width="2.35867"
-     height="173.89999"
-     id="rect108"
-     style="fill:#716f64;stroke:none" />
-  <rect
-     x="1591.663"
-     y="728.08099"
-     width="173.89999"
-     height="2.35867"
-     id="rect110"
-     style="fill:#716f64;stroke:none" />
-  <rect
-     x="1760.8427"
-     y="558.89899"
-     width="2.35867"
-     height="169.183"
-     id="rect112"
-     style="fill:#aca899;stroke:none" />
-  <rect
-     x="1594.0228"
-     y="725.72302"
-     width="169.183"
-     height="2.35867"
-     id="rect114"
-     style="fill:#aca899;stroke:none" />
-  <circle
-     cx="1746.433"
-     cy="643.48999"
-     id="ellipse116"
-     r="6.0865002"
-     style="fill:#ebebeb;stroke:#ebebeb;stroke-opacity:1" />
-  <text
-     x="1665.5726"
-     y="643.48999"
-     dominant-baseline="central"
-     font-size="70"
-     id="text118"
-     style="font-size:70px;font-family:helvetica;text-anchor:middle;fill:#000000">&gt;=</text>
+     x="1025.158"
+     y="174.21951"
+     id="text927">0 s</text>
+  <rect
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="954.36798"
+     y="-252.36252"
+     width="12"
+     height="118"
+     id="rect929" />
+  <polyline
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1151.930000,250.600000 1163.710000,250.600000"
+     id="polyline931"
+     transform="translate(-209.23201,-57.237484)" />
   <text
-     x="1678.6127"
-     y="530.45502"
+     fill="#0000ff"
+     font-size="24px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="35"
-     id="text120"
-     style="font-size:35px;font-family:helvetica;text-anchor:middle;fill:#0000ff">greEquThr</text>
-  <polyline
-     points="4890.647500,287.800000 5025.420000,287.800000"
-     id="polyline122"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <polyline
-     points="4890.647500,287.800000 5025.420000,287.800000"
-     id="polyline124"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     x="960.36798"
+     y="116.79252"
+     id="text933">toInitial</text>
+  <circle
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     cx="960.36798"
+     cy="245.19452"
+     id="ellipse935"
+     r="4.1230001" />
   <polyline
-     points="5408.000000,383.445000 5408.000000,809.500000 6364.450000,809.500000"
-     id="polyline126"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="583.545000,250.600000 674.840000,250.600000"
+     id="polyline937"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5408.000000,383.445000 5408.000000,809.500000 6364.450000,809.500000"
-     id="polyline128"
-     style="fill:none;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="583.545000,250.600000 674.840000,250.600000"
+     id="polyline939"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5060.200000,392.140000 5060.200000,809.500000 4364.600000,809.500000"
-     id="polyline130"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="934.000000,315.390000 934.000000,604.000000 1640.800000,604.000000"
+     id="polyline941"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5060.200000,392.140000 5060.200000,809.500000 4364.600000,809.500000"
-     id="polyline132"
-     style="fill:none;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="934.000000,315.390000 934.000000,604.000000 1640.800000,604.000000"
+     id="polyline943"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5768.842500,287.800000 5860.140000,287.800000 5860.140000,61.730000 4625.450000,61.730000 4625.450000,287.800000 4703.705000,287.800000"
-     id="polyline134"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="698.400000,321.280000 698.400000,604.000000 227.200000,604.000000"
+     id="polyline945"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5768.842500,287.800000 5860.140000,287.800000 5860.140000,61.730000 4625.450000,61.730000 4625.450000,287.800000 4703.705000,287.800000"
-     id="polyline136"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="698.400000,321.280000 698.400000,604.000000 227.200000,604.000000"
+     id="polyline947"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5408.000000,383.445000 5408.000000,635.600000 5564.510000,635.600000"
-     id="polyline138"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1178.435000,250.600000 1240.280000,250.600000 1240.280000,97.460000 403.900000,97.460000 403.900000,250.600000 456.910000,250.600000"
+     id="polyline949"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5408.000000,383.445000 5408.000000,635.600000 5564.510000,635.600000"
-     id="polyline140"
-     style="fill:none;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1178.435000,250.600000 1240.280000,250.600000 1240.280000,97.460000 403.900000,97.460000 403.900000,250.600000 456.910000,250.600000"
+     id="polyline951"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5764.495000,635.600000 5912.310000,635.600000"
-     id="polyline142"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="934.000000,315.390000 934.000000,486.200000 981.120000,486.200000"
+     id="polyline953"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5764.495000,635.600000 5912.310000,635.600000"
-     id="polyline144"
-     style="fill:none;stroke:#00007f;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="934.000000,315.390000 934.000000,486.200000 981.120000,486.200000"
+     id="polyline955"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="6112.295000,635.600000 6173.160000,635.600000 6173.160000,461.700000 5755.800000,461.700000 5755.800000,392.140000"
-     id="polyline146"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="707.235000,250.600000 869.210000,250.600000"
+     id="polyline957"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="6112.295000,635.600000 6173.160000,635.600000 6173.160000,461.700000 5755.800000,461.700000 5755.800000,392.140000"
-     id="polyline148"
-     style="fill:none;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="707.235000,250.600000 869.210000,250.600000"
+     id="polyline959"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5073.242500,287.800000 5312.355000,287.800000"
-     id="polyline150"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="995.845000,250.600000 1146.040000,250.600000"
+     id="polyline961"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5073.242500,287.800000 5312.355000,287.800000"
-     id="polyline152"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="995.845000,250.600000 1146.040000,250.600000"
+     id="polyline963"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5499.297500,287.800000 5721.020000,287.800000"
-     id="polyline154"
-     style="fill:none;stroke:#ffffff;stroke-width:5;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="5"
+     stroke-opacity="1"
+     points="1122.480000,486.200000 1169.600000,486.200000 1169.600000,321.280000"
+     id="polyline965"
+     transform="translate(-209.23201,-57.237484)" />
   <polyline
-     points="5499.297500,287.800000 5721.020000,287.800000"
-     id="polyline156"
-     style="fill:none;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="none"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1122.480000,486.200000 1169.600000,486.200000 1169.600000,321.280000"
+     id="polyline967"
+     transform="translate(-209.23201,-57.237484)" />
   <circle
-     cx="1069.9628"
-     cy="643.48999"
-     id="ellipse158"
-     r="3.5"
-     style="fill:#ff00ff;stroke:#ff00ff" />
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     cx="724.76801"
+     cy="428.96252"
+     id="ellipse969"
+     r="3" />
   <polygon
-     points="4364.6,722.55 4364.6,722.55 4538.5,809.5 4364.6,896.45 "
-     id="polygon160"
-     style="fill:#ff00ff;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="227.2,662.9 227.2,545.1 345,604 "
+     id="polygon971"
+     transform="translate(-209.23201,-57.237484)" />
   <text
-     x="9.1727734"
-     y="691.31299"
+     fill="#ff00ff"
+     font-size="29px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="43"
-     id="text162"
-     style="font-size:43px;font-family:helvetica;text-anchor:middle;fill:#ff00ff">u</text>
+     x="6.1879883"
+     y="461.35748"
+     id="text973">u</text>
   <polygon
-     points="6277.5,766.025 6277.5,766.025 6364.45,809.5 6277.5,852.975 "
-     id="polygon164"
-     style="fill:#ffffff;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1523,662.9 1523,545.1 1640.8,604 "
+     id="polygon975"
+     transform="translate(-209.23201,-57.237484)" />
   <text
-     x="2052.4927"
-     y="743.48199"
+     fill="#ff00ff"
+     font-size="59px"
+     font-family="helvetica"
+     text-anchor="middle"
      dominant-baseline="central"
-     font-size="43"
-     id="text166"
-     style="font-size:43px;font-family:helvetica;text-anchor:middle;fill:#ff00ff">y</text>
+     x="1466.908"
+     y="446.63251"
+     id="text977">y</text>
   <polygon
-     points="5547.12,618.21 5547.12,618.21 5581.9,635.6 5547.12,652.99 "
-     id="polygon168"
-     style="fill:#ff00ff;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <text
-     x="1209.0829"
-     y="622.62201"
-     dominant-baseline="central"
-     font-size="10"
-     id="text170"
-     style="font-size:10px;font-family:helvetica;text-anchor:middle;fill:#ff00ff">u</text>
-  <polygon
-     points="5755.8,626.905 5755.8,626.905 5773.19,635.6 5755.8,644.295 "
-     id="polygon172"
-     style="fill:#ffffff;stroke:#00007f;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <text
-     x="1429.933"
-     y="633.05603"
-     dominant-baseline="central"
-     font-size="10"
-     id="text174"
-     style="font-size:10px;font-family:helvetica;text-anchor:middle;fill:#00007f">y</text>
-  <polygon
-     points="4695.01,296.495 4695.01,296.495 4712.4,287.8 4695.01,279.105 "
-     id="polygon176"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="981.12,492.09 981.12,480.31 992.9,486.2 "
+     id="polygon979"
+     transform="translate(-209.23201,-57.237484)" />
   <polygon
-     points="4695.01,296.495 4695.01,296.495 4712.4,287.8 4695.01,279.105 "
-     id="polygon178"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <rect
-     x="548.26263"
-     y="291.34201"
-     width="8.6949997"
-     height="8.6949997"
-     id="rect180"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
-  <rect
-     x="548.26263"
-     y="291.34201"
-     width="8.6949997"
-     height="8.6949997"
-     id="rect182"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1110.7,492.09 1110.7,480.31 1122.48,486.2 "
+     id="polygon981"
+     transform="translate(-209.23201,-57.237484)" />
   <polygon
-     points="5303.66,296.495 5303.66,296.495 5321.05,287.8 5303.66,279.105 "
-     id="polygon184"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="451.02,244.71 451.02,256.49 462.8,250.6 "
+     id="polygon983"
+     transform="translate(-209.23201,-57.237484)" />
   <polygon
-     points="5303.66,296.495 5303.66,296.495 5321.05,287.8 5303.66,279.105 "
-     id="polygon186"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <rect
-     x="1156.913"
-     y="291.34201"
-     width="8.6949997"
-     height="8.6949997"
-     id="rect188"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
-  <rect
-     x="1156.913"
-     y="291.34201"
-     width="8.6949997"
-     height="8.6949997"
-     id="rect190"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="451.02,244.71 451.02,256.49 462.8,250.6 "
+     id="polygon985"
+     transform="translate(-209.23201,-57.237484)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="371.31299"
+     y="190.36252"
+     width="6"
+     height="6"
+     id="rect987" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="371.31299"
+     y="190.36252"
+     width="6"
+     height="6"
+     id="rect989" />
   <polygon
-     points="5416.695,374.75 5416.695,374.75 5408,392.14 5399.305,374.75 "
-     id="polygon192"
-     style="fill:#ffffff;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="863.32,244.71 863.32,256.49 875.1,250.6 "
+     id="polygon991"
+     transform="translate(-209.23201,-57.237484)" />
   <polygon
-     points="5016.725,279.105 5016.725,279.105 5034.115,287.8 5016.725,296.495 "
-     id="polygon194"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <rect
-     x="730.86273"
-     y="291.34201"
-     width="8.6949997"
-     height="8.6949997"
-     id="rect196"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="863.32,244.71 863.32,256.49 875.1,250.6 "
+     id="polygon993"
+     transform="translate(-209.23201,-57.237484)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="783.61298"
+     y="190.36252"
+     width="6"
+     height="6"
+     id="rect995" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     x="783.61298"
+     y="190.36252"
+     width="6"
+     height="6"
+     id="rect997" />
   <polygon
-     points="5042.81,409.53 5042.81,409.53 5060.2,374.75 5077.59,409.53 "
-     id="polygon198"
-     style="fill:#ff00ff;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#ffffff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="928.11,309.5 939.89,309.5 934,321.28 "
+     id="polygon999"
+     transform="translate(-209.23201,-57.237484)" />
   <polygon
-     points="5712.325,279.105 5712.325,279.105 5729.715,287.8 5712.325,296.495 "
-     id="polygon200"
-     style="fill:#000000;stroke:#000000;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <rect
-     x="1426.453"
-     y="291.34201"
-     width="8.6949997"
-     height="8.6949997"
-     id="rect202"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="668.95,256.49 668.95,244.71 680.73,250.6 "
+     id="polygon1001"
+     transform="translate(-209.23201,-57.237484)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="495.00299"
+     y="-196.36252"
+     width="6"
+     height="6"
+     id="rect1003" />
   <polygon
-     points="5738.41,409.53 5738.41,409.53 5755.8,374.75 5773.19,409.53 "
-     id="polygon204"
-     style="fill:#ff00ff;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="710.18,333.06 686.62,333.06 698.4,309.5 "
+     id="polygon1005"
+     transform="translate(-209.23201,-57.237484)" />
   <polygon
-     points="5894.92,618.21 5894.92,618.21 5929.7,635.6 5894.92,652.99 "
-     id="polygon206"
-     style="fill:#00007f;stroke:#00007f;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <text
-     x="1556.8827"
-     y="622.62201"
-     dominant-baseline="central"
-     font-size="10"
-     id="text208"
-     style="font-size:10px;font-family:helvetica;text-anchor:middle;fill:#00007f">u</text>
+     fill="#000000"
+     stroke="#000000"
+     stroke-opacity="1"
+     points="1140.15,256.49 1140.15,244.71 1151.93,250.6 "
+     id="polygon1007"
+     transform="translate(-209.23201,-57.237484)" />
+  <rect
+     fill="#ffffff"
+     stroke="#000000"
+     stroke-opacity="1"
+     transform="scale(1,-1)"
+     x="966.20801"
+     y="-196.36252"
+     width="6"
+     height="6"
+     id="rect1009" />
   <polygon
-     points="6103.6,626.905 6103.6,626.905 6120.99,635.6 6103.6,644.295 "
-     id="polygon210"
-     style="fill:#ffffff;stroke:#ff00ff;stroke-opacity:1"
-     transform="translate(-4338.0372,7.8900008)" />
-  <text
-     x="1777.7328"
-     y="633.05603"
-     dominant-baseline="central"
-     font-size="10"
-     id="text212"
-     style="font-size:10px;font-family:helvetica;text-anchor:middle;fill:#ff00ff">y</text>
+     fill="#ff00ff"
+     stroke="#ff00ff"
+     stroke-opacity="1"
+     points="1181.38,333.06 1157.82,333.06 1169.6,309.5 "
+     id="polygon1011"
+     transform="translate(-209.23201,-57.237484)" />
 </svg>
diff --git a/Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.png b/Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.png
new file mode 100644
index 00000000000..51f74812bfb
Binary files /dev/null and b/Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.png differ
diff --git a/Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.svg b/Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.svg
new file mode 100644
index 00000000000..3577bd82d0b
--- /dev/null
+++ b/Buildings/Resources/Images/Examples/VAVReheat/vavBoxDualMax.svg
@@ -0,0 +1,657 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="vavBoxSingleMax.svg"
+   inkscape:version="1.0 (4035a4f, 2020-05-01)"
+   inkscape:export-ydpi="80.029999"
+   inkscape:export-xdpi="80.029999"
+   inkscape:export-filename="/Users/agautier/Desktop/vav.png"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 245.80307 129.49258"
+   height="129.49258mm"
+   width="245.80307mm">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       lpeversion="0"
+       effect="spiro"
+       id="path-effect1077"
+       is_visible="true" />
+    <inkscape:path-effect
+       lpeversion="0"
+       effect="spiro"
+       id="path-effect1048"
+       is_visible="true" />
+    <inkscape:path-effect
+       lpeversion="0"
+       effect="spiro"
+       id="path-effect1025"
+       is_visible="true" />
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5590"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path5588"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect5580"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect5564"
+       effect="spiro" />
+    <linearGradient
+       id="linearGradient1691"
+       inkscape:collect="always">
+      <stop
+         id="stop1687"
+         offset="0"
+         style="stop-color:#ffff00;stop-opacity:1;" />
+      <stop
+         id="stop1689"
+         offset="1"
+         style="stop-color:#ffff00;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient1473">
+      <stop
+         id="stop1471"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect1307"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect1303"
+       effect="spiro" />
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1257"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1255" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1223"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lstart">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1221" />
+    </marker>
+    <marker
+       inkscape:collect="always"
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow2Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path928" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow2Lstart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lstart">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path925" />
+    </marker>
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect905"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect901"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect897"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect875"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect853"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect849"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect827"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect823"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect819"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect823-3"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect827-7"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect819-3"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect1307-4"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect1303-1"
+       effect="spiro" />
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow2Lstart-2"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lstart">
+      <path
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path925-8"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow2Lend-8"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path928-9"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect905-2"
+       effect="spiro" />
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1223-8"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lstart">
+      <path
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1221-8"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1257-8"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1255-6"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect901-8"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect897-3"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect819-3-8"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect875-3"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect827-7-3"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect853-3"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect823-3-8"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect827-0"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect823-4"
+       effect="spiro" />
+    <inkscape:path-effect
+       lpeversion="0"
+       is_visible="true"
+       id="path-effect819-7"
+       effect="spiro" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="791.87427"
+       x2="-154.75813"
+       y1="791.87427"
+       x1="-447.86331"
+       id="linearGradient1693"
+       xlink:href="#linearGradient1691"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="23"
+     inkscape:window-x="43"
+     inkscape:window-height="1035"
+     inkscape:window-width="1877"
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="291.35983"
+     inkscape:cx="567.70891"
+     inkscape:zoom="0.9899495"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <inkscape:grid
+       originy="36.888415"
+       originx="139.54217"
+       id="grid815"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(139.54217,-204.39583)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <rect
+       y="278.47916"
+       x="-97.895836"
+       height="42.333321"
+       width="76.729179"
+       id="rect1441"
+       style="opacity:1;fill:#dcdee0;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <flowRoot
+       transform="matrix(0.13024743,0,0,0.13024743,-38.001149,208.84425)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.9994px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#ffff00;stroke-opacity:0"
+       id="flowRoot1321-4"
+       xml:space="preserve"><flowRegion
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.9994px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke:#ffff00;stroke-opacity:0"
+         id="flowRegion1323-2"><rect
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.9994px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke:#ffff00;stroke-opacity:0"
+           y="742.51971"
+           x="-450"
+           height="64.54837"
+           width="522.86353"
+           id="rect1325-2" /></flowRegion><flowPara
+         style="stroke:#ffff00;stroke-opacity:0"
+         id="flowPara1487">(Shaded area = Reheat)</flowPara></flowRoot>
+    <path
+       inkscape:original-d="M -95.249999,53.583334 V 170"
+       inkscape:path-effect="#path-effect819-7"
+       inkscape:connector-curvature="0"
+       id="path817-6"
+       d="M -95.249999,53.583334 V 170"
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(-2.6458343,150.8125)" />
+    <path
+       inkscape:original-d="M -97.895839,320.8125 H 79.374998"
+       inkscape:path-effect="#path-effect823-3-8"
+       inkscape:connector-curvature="0"
+       id="path821-6-0"
+       d="M -97.895839,320.8125 H 79.374998"
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:original-d="M -18.520833,170 -95.249999,58.875001"
+       inkscape:path-effect="#path-effect853-3"
+       inkscape:connector-curvature="0"
+       id="path851-6"
+       d="M -18.520833,170 -95.249999,58.875001"
+       style="fill:none;stroke:#000000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+       transform="translate(-2.6458343,150.8125)" />
+    <path
+       inkscape:original-d="M -21.898997,300.92981 H 2.6458323"
+       inkscape:path-effect="#path-effect827-7-3"
+       inkscape:connector-curvature="0"
+       id="path825-5-8"
+       d="M -21.898997,300.92981 H 2.6458323"
+       style="fill:none;stroke:#000000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:original-d="M 2.6458323,300.92981 79.374998,209.6875"
+       inkscape:path-effect="#path-effect897-3"
+       inkscape:connector-curvature="0"
+       id="path895-0"
+       d="M 2.6458323,300.92981 79.374998,209.6875"
+       style="fill:none;stroke:#000000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       transform="translate(-2.6458343,149.225)"
+       inkscape:original-d="m -95.249999,183.22917 h 76.729166"
+       inkscape:path-effect="#path-effect901-8"
+       inkscape:connector-curvature="0"
+       id="path899-3"
+       d="m -95.249999,183.22917 h 76.729166"
+       style="fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1223-8);marker-end:url(#marker1257-8)" />
+    <path
+       transform="translate(-2.6458343,149.225)"
+       inkscape:original-d="M 5.2916666,183.22917 H 82.020832"
+       inkscape:path-effect="#path-effect905-2"
+       inkscape:connector-curvature="0"
+       id="path903-3"
+       d="M 5.2916666,183.22917 H 82.020832"
+       style="fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2);marker-end:url(#Arrow2Lend-8)" />
+    <path
+       inkscape:original-d="M -18.520833,127.66667 H -95.249999"
+       inkscape:path-effect="#path-effect1303-1"
+       inkscape:connector-curvature="0"
+       id="path1301-3"
+       d="M -18.520833,127.66667 H -95.249999"
+       style="fill:none;stroke:#000000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(-2.6458343,150.8125)" />
+    <flowRoot
+       transform="matrix(0.12508093,0,0,0.12508093,-27.30341,230.10423)"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1321-3"
+       xml:space="preserve"><flowRegion
+         id="flowRegion1323-26"><rect
+           y="742.51971"
+           x="-450"
+           height="140"
+           width="430"
+           id="rect1325-5" /></flowRegion><flowPara
+         id="flowPara1327-2">Heating loop signal</flowPara></flowRoot>
+    <flowRoot
+       transform="matrix(0.12055217,0,0,0.12055217,32.66453,234.24551)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0007px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1321-1-6"
+       xml:space="preserve"><flowRegion
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0007px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+         id="flowRegion1323-7-5"><rect
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.00067139px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           y="742.51971"
+           x="-450"
+           height="140"
+           width="430"
+           id="rect1325-4-8" /></flowRegion><flowPara
+         id="flowPara1379-7">Deadband</flowPara></flowRoot>
+    <flowRoot
+       transform="matrix(0.12507883,0,0,0.12507883,71.468246,230.78625)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0007px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1321-1-1-9"
+       xml:space="preserve"><flowRegion
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0007px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+         id="flowRegion1323-7-4-6"><rect
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.00067139px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           y="742.51971"
+           x="-450"
+           height="140"
+           width="430"
+           id="rect1325-4-6-0" /></flowRegion><flowPara
+         id="flowPara1353-9-4">Cooling loop signal</flowPara></flowRoot>
+    <flowRoot
+       transform="matrix(0.1295965,0,0,0.1295965,105.84723,172.1191)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0016px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1321-1-6-1"
+       xml:space="preserve"><flowRegion
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0016px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+         id="flowRegion1323-7-5-0"><rect
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.00157928px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           y="742.51971"
+           x="-450"
+           height="140"
+           width="430"
+           id="rect1325-4-8-4" /></flowRegion><flowPara
+         id="flowPara1719">Airflow</flowPara><flowPara
+         id="flowPara1002">set point</flowPara></flowRoot>
+    <flowRoot
+       transform="matrix(0.13476279,0,0,0.13476279,141.00603,107.63548)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0016px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1321-1-6-1-7"
+       xml:space="preserve"><flowRegion
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0016px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+         id="flowRegion1323-7-5-0-0"><rect
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40.0016px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           y="742.51971"
+           x="-450"
+           height="157.84935"
+           width="215.80801"
+           id="rect1325-4-8-4-8" /></flowRegion><flowPara
+         id="flowPara1745">Maximum</flowPara><flowPara
+         id="flowPara1004">airflow</flowPara><flowPara
+         id="flowPara1006">set point</flowPara></flowRoot>
+    <flowRoot
+       transform="matrix(0.12235422,0,0,0.12235422,-90.762567,204.42934)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.9994px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1321-3-3"
+       xml:space="preserve"><flowRegion
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.9994px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+         id="flowRegion1323-26-0"><rect
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.99942398px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           y="742.51971"
+           x="-450"
+           height="140"
+           width="430"
+           id="rect1325-5-1" /></flowRegion><flowPara
+         style="text-align:center;text-anchor:middle"
+         id="flowPara1855">Minimum </flowPara><flowPara
+         style="text-align:center;text-anchor:middle"
+         id="flowPara1857">airflow set point</flowPara></flowRoot>
+    <flowRoot
+       transform="scale(0.26458333)"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1823"
+       xml:space="preserve"><flowRegion
+         id="flowRegion1825"><rect
+           y="1017.5197"
+           x="-490"
+           height="65"
+           width="145"
+           id="rect1827" /></flowRegion><flowPara
+         id="flowPara1829">Minimum ai</flowPara></flowRoot>
+    <flowRoot
+       transform="matrix(0.13541393,0,0,0.13541393,-10.784002,136.72042)"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1839"
+       xml:space="preserve"><flowRegion
+         id="flowRegion1841"><rect
+           y="677.51971"
+           x="-445"
+           height="80"
+           width="540"
+           id="rect1843" /></flowRegion><flowPara
+         id="flowPara1845">Reheat valve position</flowPara></flowRoot>
+    <flowRoot
+       transform="scale(0.26458333)"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot1847"
+       xml:space="preserve"><flowRegion
+         id="flowRegion1849"><rect
+           y="982.51971"
+           x="-535"
+           height="100"
+           width="175"
+           id="rect1851" /></flowRegion><flowPara
+         id="flowPara1853">Minimumaiairflow</flowPara></flowRoot>
+    <path
+       inkscape:original-d="m 46.721893,267.20466 -7.216277,-7.48354"
+       inkscape:path-effect="#path-effect5564"
+       inkscape:connector-curvature="0"
+       id="path5562"
+       d="m 46.721893,267.20466 -7.216277,-7.48354"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
+    <path
+       transform="translate(-1.5875,1.0583333)"
+       inkscape:original-d="m -59.918648,235.13232 -9.087162,8.01809"
+       inkscape:path-effect="#path-effect5580"
+       inkscape:connector-curvature="0"
+       id="path5578"
+       d="m -59.918648,235.13232 -9.087162,8.01809"
+       style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5590)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.750001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -21.544643,301.3078 V 278.80991"
+       id="path825-5-8-9"
+       inkscape:connector-curvature="0"
+       inkscape:path-effect="#path-effect1025"
+       inkscape:original-d="M -21.544643,301.3078 V 278.80991" />
+    <rect
+       y="307.20535"
+       x="-63.564892"
+       height="5.2916665"
+       width="2.2678571"
+       id="rect1029"
+       style="fill:none;stroke-width:0.264999;stroke-dasharray:0.794999, 0.794999;stop-color:#000000" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.265, 1.06;stroke-dashoffset:0;stroke-opacity:1"
+       d="m -97.517856,301.3078 h 75.973213"
+       id="path821-6-0-7"
+       inkscape:connector-curvature="0"
+       inkscape:path-effect="#path-effect1077"
+       inkscape:original-d="m -97.517856,301.3078 h 75.973213" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1321-3-3-1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.9994px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
+       transform="matrix(0.12235422,0,0,0.12235422,-91.202987,181.5927)"><flowRegion
+         id="flowRegion1323-26-0-8"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.9994px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"><rect
+           id="rect1325-5-1-7"
+           width="430"
+           height="140"
+           x="-450"
+           y="742.51971"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.99942398px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start" /></flowRegion><flowPara
+         id="flowPara1855-8"
+         style="text-align:center;text-anchor:middle">Heating</flowPara><flowPara
+         id="flowPara1857-7"
+         style="text-align:center;text-anchor:middle">airflow set point</flowPara></flowRoot>
+  </g>
+</svg>
diff --git a/Buildings/Resources/Images/Fluid/CHPs/control_volumes.png b/Buildings/Resources/Images/Fluid/CHPs/control_volumes.png
new file mode 100644
index 00000000000..a0315512606
Binary files /dev/null and b/Buildings/Resources/Images/Fluid/CHPs/control_volumes.png differ
diff --git a/Buildings/Resources/Images/Fluid/CHPs/control_volumes.svg b/Buildings/Resources/Images/Fluid/CHPs/control_volumes.svg
new file mode 100644
index 00000000000..c8e003ca591
--- /dev/null
+++ b/Buildings/Resources/Images/Fluid/CHPs/control_volumes.svg
@@ -0,0 +1,505 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
+   sodipodi:docname="control_volumes.svg"
+   width="249.98103mm"
+   height="170.92867mm"
+   viewBox="0 0 249.98103 170.92867"
+   version="1.1"
+   id="svg8">
+  <sodipodi:namedview
+     inkscape:snap-grids="true"
+     inkscape:current-layer="g287"
+     inkscape:window-maximized="0"
+     inkscape:window-y="82"
+     inkscape:window-x="143"
+     inkscape:cy="325.57377"
+     inkscape:cx="352.75184"
+     inkscape:zoom="0.73553248"
+     showgrid="true"
+     id="namedview119"
+     inkscape:window-height="1037"
+     inkscape:window-width="1649"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     inkscape:document-rotation="0"
+     bordercolor="#666666"
+     pagecolor="#ffffff">
+    <inkscape:grid
+       id="grid562"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2">
+    <rect
+       id="rect422"
+       height="110.1243"
+       width="338.53027"
+       y="38.980091"
+       x="261.03539" />
+    <rect
+       id="rect363"
+       height="69.217459"
+       width="107.6716"
+       y="339.3089"
+       x="19.227072" />
+    <rect
+       x="-467.59491"
+       y="-230.35851"
+       width="1482.8572"
+       height="1011.4286"
+       id="rect301" />
+    <rect
+       x="1055.2622"
+       y="798.21295"
+       width="1205.7144"
+       height="985.71429"
+       id="rect295" />
+    <marker
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1487"
+       style="overflow:visible">
+      <path
+         id="path1485"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1479"
+       style="overflow:visible">
+      <path
+         id="path1477"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1475"
+       style="overflow:visible">
+      <path
+         id="path1473"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1467"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1465" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1463"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1461" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow2Lend"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1218" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1483-6"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1481-8" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1487-2"
+       style="overflow:visible">
+      <path
+         id="path1485-1"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1479-9"
+       style="overflow:visible">
+      <path
+         id="path1477-6"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1471-6"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1469-4" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker1475-9"
+       style="overflow:visible">
+      <path
+         id="path1473-0"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow2Lend-8"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1218-9" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1467-7"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1465-7" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="marker1463-2"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path1461-2" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-76.848773,-89.160671)">
+    <g
+       id="g287"
+       transform="matrix(0.26458333,0,0,0.26458333,76.848773,88.919257)">
+      <rect
+         y="20.912436"
+         x="240.00003"
+         height="140"
+         width="400"
+         id="rect1755-3"
+         style="opacity:1;fill:#dcdee0;fill-opacity:1;stroke:#000000;stroke-width:0.944882;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="260.91245"
+         x="240.00003"
+         height="140"
+         width="400"
+         id="rect1755-1-38"
+         style="opacity:1;fill:#dcdee0;fill-opacity:1;stroke:#000000;stroke-width:0.944882;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="500.91245"
+         x="240.00003"
+         height="140"
+         width="400"
+         id="rect1755-1-3-5"
+         style="opacity:1;fill:#dcdee0;fill-opacity:1;stroke:#000000;stroke-width:0.944882;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path917-3"
+         d="m 640.00002,96.469525 h 53.72053"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path921-7"
+         d="M 680,139.33331 V 79.333313"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(13.720543,-42.863785)" />
+      <path
+         id="path925-4"
+         d="m 680,79.333313 h 50"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1463-2)"
+         transform="translate(13.720543,-42.863785)" />
+      <path
+         id="path921-2-1"
+         d="M 680,139.33331 V 79.333313"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(13.720543,17.136215)" />
+      <path
+         id="path925-7-1"
+         d="m 680,79.333313 h 50"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1467-7)"
+         transform="translate(13.720543,77.136215)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path917-8-3"
+         d="m 173.72055,96.469535 h 66.27946"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend-8)" />
+      <path
+         id="path921-8-0"
+         d="M 680,139.33331 V 79.333313"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(-506.27946,-42.863785)" />
+      <path
+         id="path921-2-2-3"
+         d="M 680,139.33331 V 79.333313"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(-506.27946,17.136215)" />
+      <path
+         id="path925-6-2"
+         d="m 680,79.333313 h 50"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(-556.27946,-42.863785)" />
+      <path
+         id="path925-7-0-1"
+         d="m 680,79.333313 h 50"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(-556.27946,77.136215)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1049-7"
+         d="M 433.72054,160.91244 V 260.91245"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.66928, 5.66928;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1475-9)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1049-1-2"
+         d="m 433.72054,400.91245 v 100"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.66929, 5.66929;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1471-6)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path917-0-1"
+         d="m 640.00002,336.46953 h 53.72053"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.66929, 5.66929;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1479-9)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path917-0-8-6"
+         d="m 640.00002,576.46953 h 53.72053"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1487-2)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path917-0-8-4-5"
+         d="m 173.72055,576.46953 h 66.27946"
+         style="fill:none;stroke:#000000;stroke-width:1.88976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1483-6)" />
+      <text
+         xml:space="preserve"
+         id="text293"
+         style="font-size:21.33330000000000126px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';white-space:pre;shape-inside:url(#rect295);" />
+      <text
+         xml:space="preserve"
+         id="text299"
+         style="font-size:21.33330000000000126px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';white-space:pre;shape-inside:url(#rect301);" />
+      <text
+         transform="translate(43.505897,-318.13688)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect363);"
+         id="text361"
+         xml:space="preserve"><tspan
+           sodipodi:role="line"
+           x="19.226562"
+           y="363.63743"><tspan>Fuel</tspan></tspan></text>
+      <text
+         transform="translate(60.398641,-200.52596)"
+         y="20.260443"
+         x="-2.6041698"
+         xml:space="preserve"
+         id="text361-6"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect363);"><tspan
+           sodipodi:role="line"
+           x="19.226562"
+           y="363.63743"><tspan>Air</tspan></tspan></text>
+      <text
+         transform="translate(5.4382372,23.112508)"
+         y="0"
+         x="98.327972"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:center;white-space:pre;shape-inside:url(#rect422)"
+         id="text420"
+         xml:space="preserve"><tspan
+           sodipodi:role="line"
+           x="302.01937"
+           y="63.309308"><tspan>Energy conversion </tspan><tspan
+             dx="9.3750305" /></tspan><tspan
+           sodipodi:role="line"
+           x="330.37878"
+           y="96.642682"><tspan>control volume</tspan></tspan></text>
+      <text
+         transform="translate(501.66364,-30.07904)"
+         xml:space="preserve"
+         id="text420-0"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:start;white-space:pre;shape-inside:url(#rect422)"
+         x="145.69781"
+         y="19.518253"><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="63.309308"><tspan>Exhaust to</tspan><tspan
+             dx="16.197945" /></tspan><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="96.642682"><tspan>atmosphere</tspan></tspan></text>
+      <text
+         transform="translate(498.15138,99.688834)"
+         y="39.778694"
+         x="144.34364"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:start;white-space:pre;shape-inside:url(#rect422);"
+         id="text420-0-6"
+         xml:space="preserve"><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="63.309308"><tspan>Electricity</tspan></tspan></text>
+      <text
+         transform="translate(197.43304,136.74891)"
+         xml:space="preserve"
+         id="text420-0-6-6"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:start;white-space:pre;shape-inside:url(#rect422);"
+         x="141.73947"
+         y="60.039135"><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="63.309308"><tspan>Recoverable</tspan><tspan
+             dx="15.885437" /></tspan><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="96.642682"><tspan>heat</tspan></tspan></text>
+      <text
+         transform="translate(1.3458278,266.30488)"
+         xml:space="preserve"
+         id="text420-3"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:center;white-space:pre;shape-inside:url(#rect422);"
+         x="224.00522"
+         y="19.518253"><tspan
+           sodipodi:role="line"
+           x="335.74337"
+           y="63.309308"><tspan>Thermal mass</tspan><tspan
+             dx="13.906265" /></tspan><tspan
+           sodipodi:role="line"
+           x="330.37878"
+           y="96.642682"><tspan>control volume</tspan></tspan></text>
+      <text
+         transform="translate(6.4252859,503.01299)"
+         y="39.778694"
+         x="224.00522"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:center;white-space:pre;shape-inside:url(#rect422);"
+         id="text420-3-4"
+         xml:space="preserve"><tspan
+           sodipodi:role="line"
+           x="338.16525"
+           y="63.309308"><tspan>Cooling water</tspan><tspan
+             dx="11.406265" /></tspan><tspan
+           sodipodi:role="line"
+           x="330.37878"
+           y="96.642682"><tspan>control volume</tspan></tspan></text>
+      <text
+         transform="translate(445.52196,278.32928)"
+         xml:space="preserve"
+         id="text420-0-6-67"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:start;white-space:pre;shape-inside:url(#rect422);"
+         x="141.73947"
+         y="60.039135"><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="63.309308"><tspan>Heat loss</tspan></tspan></text>
+      <text
+         transform="translate(448.63447,518.32929)"
+         y="80.299576"
+         x="139.1353"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:start;white-space:pre;shape-inside:url(#rect422);"
+         id="text420-0-6-67-1"
+         xml:space="preserve"><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="63.309308"><tspan>Hot water</tspan></tspan></text>
+      <text
+         transform="translate(-232.33173,518.32929)"
+         xml:space="preserve"
+         id="text420-0-6-67-1-4"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:start;white-space:pre;shape-inside:url(#rect422);"
+         x="136.53113"
+         y="100.56002"><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="63.309308"><tspan>Cold water</tspan></tspan></text>
+      <text
+         transform="translate(199.11753,379.29545)"
+         y="120.82047"
+         x="135.03374"
+         style="font-size:26.66669999999999874px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Normal';text-align:start;white-space:pre;shape-inside:url(#rect422);"
+         id="text420-0-6-67-1-4-7"
+         xml:space="preserve"><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="63.309308"><tspan>Heat</tspan><tspan
+             dx="10.520847" /></tspan><tspan
+           sodipodi:role="line"
+           x="261.03516"
+           y="96.642682"><tspan>recovery</tspan><tspan
+             dx="15.781265" /></tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/Buildings/Resources/Images/Fluid/Sensors/warningIcon.png b/Buildings/Resources/Images/Fluid/Sensors/warningIcon.png
new file mode 100644
index 00000000000..31aa2a359a5
Binary files /dev/null and b/Buildings/Resources/Images/Fluid/Sensors/warningIcon.png differ
diff --git a/Buildings/Resources/Images/Fluid/Sensors/warningIcon.svg b/Buildings/Resources/Images/Fluid/Sensors/warningIcon.svg
new file mode 100644
index 00000000000..e0059b98b85
--- /dev/null
+++ b/Buildings/Resources/Images/Fluid/Sensors/warningIcon.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="17.316858mm"
+   height="14.99684mm"
+   viewBox="0 0 17.316858 14.99684"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="warningIcon.svg"
+   inkscape:export-filename="/home/mwetter/proj/warningIcon.png"
+   inkscape:export-xdpi="300"
+   inkscape:export-ydpi="300">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="102.59862"
+     inkscape:cy="24.428324"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="2234"
+     inkscape:window-height="1658"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-65.792079,-91.21277)">
+    <path
+       sodipodi:type="star"
+       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.818663;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path835"
+       sodipodi:sides="3"
+       sodipodi:cx="74.450508"
+       sodipodi:cy="101.21066"
+       sodipodi:r1="9.1792297"
+       sodipodi:r2="4.5896149"
+       sodipodi:arg1="0.52359878"
+       sodipodi:arg2="1.5707963"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 82.399954,105.80028 -15.898892,0 7.949446,-13.768847 z"
+       inkscape:transform-center-x="-4.7584637e-06"
+       inkscape:transform-center-y="-2.2948031" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="72.341301"
+       y="104.02283"
+       id="text839"><tspan
+         sodipodi:role="line"
+         id="tspan837"
+         x="72.341301"
+         y="104.02283"
+         style="stroke-width:0.264583">!</tspan></text>
+  </g>
+</svg>
diff --git a/Buildings/Resources/Images/Media/Steam/numericalError.pdf b/Buildings/Resources/Images/Media/Steam/numericalError.pdf
deleted file mode 100644
index f375861cb6c..00000000000
Binary files a/Buildings/Resources/Images/Media/Steam/numericalError.pdf and /dev/null differ
diff --git a/Buildings/Resources/Images/Media/Steam/numericalError.png b/Buildings/Resources/Images/Media/Steam/numericalError.png
deleted file mode 100644
index 783917b923c..00000000000
Binary files a/Buildings/Resources/Images/Media/Steam/numericalError.png and /dev/null differ
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Continuous/HysteresisWithHold.png b/Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Continuous/HysteresisWithHold.png
rename to Buildings/Resources/Images/Obsolete/Controls/OBC/CDL/Continuous/HysteresisWithHold.png
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.pdf
index 0c013e8e15b..dce92666137 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_600FF_Jan4.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.pdf
index faa0de4df9d..c02291133ca 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.png b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.png
index 0799d3d0376..8158d65bb0f 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.png and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_650FF_Jul27.png differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.pdf
index fb91f01aa19..20e15e99b4d 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_900FF_Jan4.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.pdf
index 7aadc3a69cd..5c4b8769b0c 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/FF_temperature_950FF_Jul27.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.pdf
index cd295737c12..86ebc2dad08 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_cooling.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.pdf
index cbabdfa1b3a..912f0bcfe67 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/annual_heating.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.pdf
index 532888b7ff1..44329e86843 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/ave_temperature.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.pdf
index 9d101b03bc4..fdc825aef99 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.png b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.png
index 001f4e3beec..1c0a76bd94f 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.png and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/bin_temperature_900FF.png differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.pdf
index 7c0f54638bb..0d5fd44ecfe 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_600_Jan4.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.pdf
index db9291d3ab7..a050d2f475c 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/hourly_load_900_Jan4.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.pdf
index 5803a8eb7f1..50014c75f4a 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/max_temperature.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.pdf
index 9c94569b535..81b32788765 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/min_temperature.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.pdf
index 1e29e8f5c24..db63d94c038 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_cooling.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.pdf b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.pdf
index 1631663576c..b2ec4fb6b17 100644
Binary files a/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.pdf and b/Buildings/Resources/Images/ThermalZones/Detailed/Validation/BESTEST/peak_heating.pdf differ
diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png b/Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png
new file mode 100644
index 00000000000..e2c3ef68ae9
Binary files /dev/null and b/Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png differ
diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_alonelowres.png b/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_alonelowres.png
new file mode 100755
index 00000000000..14c78c05ed7
Binary files /dev/null and b/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_alonelowres.png differ
diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxlowres.png b/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxlowres.png
new file mode 100755
index 00000000000..31d0bf94844
Binary files /dev/null and b/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxlowres.png differ
diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxmedres.png b/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxmedres.png
new file mode 100644
index 00000000000..e43d6ec7ca4
Binary files /dev/null and b/Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxmedres.png differ
diff --git a/Buildings/Resources/Images/Utilities/IO/Python27/Examples/KalmanFilter.png b/Buildings/Resources/Images/Utilities/IO/Python36/Examples/KalmanFilter.png
similarity index 100%
rename from Buildings/Resources/Images/Utilities/IO/Python27/Examples/KalmanFilter.png
rename to Buildings/Resources/Images/Utilities/IO/Python36/Examples/KalmanFilter.png
diff --git a/Buildings/Resources/Images/Utilities/IO/Python27/python.png b/Buildings/Resources/Images/Utilities/IO/Python36/python.png
similarity index 100%
rename from Buildings/Resources/Images/Utilities/IO/Python27/python.png
rename to Buildings/Resources/Images/Utilities/IO/Python36/python.png
diff --git a/Buildings/Resources/Library/linux32/libModelicaBuildingsPython2.7.so b/Buildings/Resources/Library/linux32/libModelicaBuildingsPython2.7.so
deleted file mode 100755
index 8aa6b3d631d..00000000000
Binary files a/Buildings/Resources/Library/linux32/libModelicaBuildingsPython2.7.so and /dev/null differ
diff --git a/Buildings/Resources/Library/linux64/libModelicaBuildingsPython2.7.so b/Buildings/Resources/Library/linux64/libModelicaBuildingsPython2.7.so
deleted file mode 100755
index 65ea490b054..00000000000
Binary files a/Buildings/Resources/Library/linux64/libModelicaBuildingsPython2.7.so and /dev/null differ
diff --git a/Buildings/Resources/Library/linux64/libModelicaBuildingsPython3.6.so b/Buildings/Resources/Library/linux64/libModelicaBuildingsPython3.6.so
new file mode 100755
index 00000000000..7a8d5a63004
Binary files /dev/null and b/Buildings/Resources/Library/linux64/libModelicaBuildingsPython3.6.so differ
diff --git a/Buildings/Resources/Library/linux64/libfmilib_shared.so b/Buildings/Resources/Library/linux64/libfmilib_shared.so
new file mode 100644
index 00000000000..26866f66792
--- /dev/null
+++ b/Buildings/Resources/Library/linux64/libfmilib_shared.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c18e8e3d733eed838740f8a5f57a39d04425e8410821101900067ead7ff0b4b9
+size 680888
diff --git a/Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.dll b/Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.dll
new file mode 100644
index 00000000000..5f13d50a2ed
Binary files /dev/null and b/Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.dll differ
diff --git a/Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.lib b/Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.lib
new file mode 100644
index 00000000000..aae5e887d98
Binary files /dev/null and b/Buildings/Resources/Library/win64/ModelicaBuildingsPython3.6.lib differ
diff --git a/Buildings/Resources/Library/win64/fmilib_shared.lib b/Buildings/Resources/Library/win64/fmilib_shared.lib
new file mode 100644
index 00000000000..043f3b58d48
--- /dev/null
+++ b/Buildings/Resources/Library/win64/fmilib_shared.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b972d511d9c7d25454c09cf67ff10a5a0e8d19ba0d6a5e00c0e38b9a72dc8133
+size 123492
diff --git a/Buildings/Resources/Library/win64/python3.6.dll b/Buildings/Resources/Library/win64/python3.6.dll
new file mode 100644
index 00000000000..c5ec6aecafc
Binary files /dev/null and b/Buildings/Resources/Library/win64/python3.6.dll differ
diff --git a/Buildings/Resources/Python-Sources/KalmanFilter.py b/Buildings/Resources/Python-Sources/KalmanFilter.py
index 5fdf6215ab3..a79f1979895 100644
--- a/Buildings/Resources/Python-Sources/KalmanFilter.py
+++ b/Buildings/Resources/Python-Sources/KalmanFilter.py
@@ -1,5 +1,5 @@
 ''' Python module that is used for the example
-    Buildings.Utilities.IO.Python27.Examples.Kalman
+    Buildings.Utilities.IO.Python36.Examples.Kalman
 '''
 def random(seed):
     ''' Return a random floating point number in the range [0.0, 1.0)
diff --git a/Buildings/Resources/Python-Sources/SimpleRoom.py b/Buildings/Resources/Python-Sources/SimpleRoom.py
index 7118ac8ad8c..27375d3d0b2 100644
--- a/Buildings/Resources/Python-Sources/SimpleRoom.py
+++ b/Buildings/Resources/Python-Sources/SimpleRoom.py
@@ -1,5 +1,5 @@
 ''' Python module that is used for the example
-    Buildings.Utilities.IO.Python27.Examples.SimpleRoom
+    Buildings.Utilities.IO.Python36.Examples.SimpleRoom
 '''
 def doStep(dblInp, state):
     # Function with a state, that computes a response
diff --git a/Buildings/Resources/Python-Sources/testFunctions.py b/Buildings/Resources/Python-Sources/testFunctions.py
index f238d36b7ee..3f6db979dff 100644
--- a/Buildings/Resources/Python-Sources/testFunctions.py
+++ b/Buildings/Resources/Python-Sources/testFunctions.py
@@ -36,8 +36,8 @@ def s2_r1(xS):
     return y
 
 def r1i1_r2i1(xR, xI):
-    # Cast the return value to a long
-    return [[2.*xR, 2.*float(xI)], long(3)]
+    # Cast the return value to a int
+    return [[2.*xR, 2.*float(xI)], int(3)]
 
 # Functions with memory
 def r1_r1PassPythonObject(xR, obj):
diff --git a/Buildings/Resources/Python-Sources/testFunctions27.py b/Buildings/Resources/Python-Sources/testFunctions27.py
new file mode 100644
index 00000000000..f238d36b7ee
--- /dev/null
+++ b/Buildings/Resources/Python-Sources/testFunctions27.py
@@ -0,0 +1,56 @@
+# Python module with test functions.
+# These functions are used to test the Modelica Python interface.
+# They are not meaningful, but rather kept simple to test whether
+# the interface is correct.
+#
+# Make sure that the python path is set, such as by running
+# export PYTHONPATH=`pwd`
+
+def r1_r1(xR):
+    return 2.*xR
+
+def r2_r1(xR):
+    y = xR[0] * xR[1]
+    return y
+
+def r1_r2(xR):
+    return [xR, 2.*xR]
+
+def i1_i1(xI):
+    return 2*xI
+
+def i1_i2(xI):
+    return [xI, 2*xI]
+
+def r1i1_r2(xR, xI):
+    return [2.*xR, 2.*float(xI)]
+
+def s2_r1(xS):
+    import os
+    filNam = xS[0] + "." + xS[1]
+    f = open(filNam, 'r')
+    l = f.readline()
+    f.close()
+    os.remove(filNam)
+    y = float(l)
+    return y
+
+def r1i1_r2i1(xR, xI):
+    # Cast the return value to a long
+    return [[2.*xR, 2.*float(xI)], long(3)]
+
+# Functions with memory
+def r1_r1PassPythonObject(xR, obj):
+    if obj == None:
+        # Initialize the Python object
+        obj = {'a': xR, 'b': 1}
+    else:
+        # Use the python object
+        obj['a'] = obj['a'] + xR
+        obj['b'] = obj['b'] + 10
+    # Return the sum of the dictionary,
+    # and also return the dictionary so that it can be used again at the next
+    # invocation.
+    res = obj['a'] + obj['b']
+    #raise Exception("Result is {}".format(res))
+    return [res, obj]
diff --git a/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mos b/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mos
index 810075deb0f..5975bb2aa2b 100644
--- a/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mos
+++ b/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerEconomizer.mos
@@ -1,4 +1,4 @@
 simulateModel("Buildings.Air.Systems.SingleZone.VAV.BaseClasses.Validation.ControllerEconomizer", stopTime=604800, tolerance=1e-06, resultFile="ControllerEconomizer");
 createPlot(id=1, position={10, 20, 1300, 800}, subPlot=1,y={"conEco.yOutAirFra"}, range={0.0, 1800.0, 14.0, 32.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={10, 20, 1300, 800}, subPlot=2,y={"conEco.TMixSet","conEco.TMix","conEco.TOut","conEco.TRet"}, range={0.0, 1800.0, 14.0, 32.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72},{0,140,72}});
-createPlot(id=1, position={10, 20, 1300, 800}, subPlot=3,y={"conEco.minOAFra","conEco.yHea"}, range={0.0, 1800.0, 14.0, 32.0}, grid=true, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={10, 20, 1300, 800}, subPlot=3,y={"conEco.minOAFra"}, range={0.0, 1800.0, 14.0, 32.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/Examples/Guideline36.mos b/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/Examples/Guideline36.mos
index a533f69411d..1166e2b10c2 100644
--- a/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/Examples/Guideline36.mos
+++ b/Buildings/Resources/Scripts/Dymola/Air/Systems/SingleZone/VAV/Examples/Guideline36.mos
@@ -1,5 +1,5 @@
 simulateModel("Buildings.Air.Systems.SingleZone.VAV.Examples.Guideline36", startTime=0, stopTime=864000, numberOfIntervals=0, outputInterval=3600, method="Radau", tolerance=1e-06, resultFile="Guideline36_SingleZone_VAV");
 // Plot commands
 removePlots(false);
-createPlot(id=1, position={0, 0, 1532, 791}, y={"controller.TZonCooSet", "controller.TZonHeaSet", "controller.TZon"}, range={103680000.0, 104560000.0, 284.0, 304.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
-createPlot(id=1, position={0, 0, 1532, 393}, y={"controller.yFan", "controller.yHeaCoi", "controller.yCooCoi"}, range={103680000.0, 104560000.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=1, position={0, 0, 1532, 791}, y={"con.TZonCooSet", "con.TZonHeaSet", "con.TZon"}, range={103680000.0, 104560000.0, 284.0, 304.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=1, position={0, 0, 1532, 393}, y={"con.yFan", "con.yHeaCoi", "con.yCooCoi"}, range={103680000.0, 104560000.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos
index 34d4699b8d9..00a784d1ba4 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.BaseClasses.Examples.PowerLaw", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PowerLaw");
+simulateModel("Buildings.Airflow.Multizone.BaseClasses.Examples.PowerLaw", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PowerLaw");
 createPlot(id = 1,
  position = {15, 10, 628, 421},
  x = "dp",
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos
index 70e2fa5f0d7..3ffaf9e8a30 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.BaseClasses.Examples.PowerLawFixedM", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PowerLawFixedM");
+simulateModel("Buildings.Airflow.Multizone.BaseClasses.Examples.PowerLawFixedM", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PowerLawFixedM");
 createPlot(id = 1,
  position = {15, 10, 628, 421},
  x = "dp",
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos
index 4ef44b02466..2fdfa87c041 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.BaseClasses.Examples.WindPressureLowRise", startTime=-2, tolerance=1e-6, stopTime=2, method="dassl", resultFile="WindPressureLowRise");
+simulateModel("Buildings.Airflow.Multizone.BaseClasses.Examples.WindPressureLowRise", startTime=-2, tolerance=1e-6, stopTime=2, method="CVode", resultFile="WindPressureLowRise");
 createPlot(id = 1,
  position = {15, 10, 694, 477},
  x = "incAng",
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/CO2TransportStep.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/CO2TransportStep.mos
index e0538fca6f7..e6438c030dd 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/CO2TransportStep.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/CO2TransportStep.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.Examples.CO2TransportStep", stopTime=86400, method="radau", tolerance=1e-6, resultFile="CO2TransportStep");
+simulateModel("Buildings.Airflow.Multizone.Examples.CO2TransportStep", stopTime=86400, method="CVode", tolerance=1e-6, resultFile="CO2TransportStep");
 createPlot(id = 1,
  position = {15, 10, 701, 192},
  y = {"CO2SenWes.C", "CO2SenEas.C", "CO2SenTop.C"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftNoVolume.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftNoVolume.mos
index 7eff754c50a..3faf41c1658 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftNoVolume.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftNoVolume.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.Examples.ChimneyShaftNoVolume", stopTime=3600, method="radau", tolerance=1e-06, resultFile="ChimneyShaftNoVolume");
+simulateModel("Buildings.Airflow.Multizone.Examples.ChimneyShaftNoVolume", stopTime=3600, method="CVode", tolerance=1e-06, resultFile="ChimneyShaftNoVolume");
 createPlot(id = 1,
  position = {25, 15, 470, 484},
  y = {"roo.T", "bou0.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mos
index 10f871ff4c3..4f3b1c08913 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ChimneyShaftWithVolume.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.Examples.ChimneyShaftWithVolume", stopTime=3600, method="radau", tolerance=1e-06, resultFile="ChimneyShaftWithVolume");
+simulateModel("Buildings.Airflow.Multizone.Examples.ChimneyShaftWithVolume", stopTime=3600, method="CVode", tolerance=1e-06, resultFile="ChimneyShaftWithVolume");
 createPlot(id = 1,
  position = {25, 15, 470, 484},
  y = {"roo.T", "bou0.T", "sha.vol.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/NaturalVentilation.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/NaturalVentilation.mos
index 5647c77eb3d..813751d35d7 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/NaturalVentilation.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/NaturalVentilation.mos
@@ -1,5 +1,5 @@
 simulateModel("Buildings.Airflow.Multizone.Examples.NaturalVentilation", stopTime=7200,
-  method="radau", tolerance=1e-06, resultFile="NaturalVentilation");
+  method="CVode", tolerance=1e-06, resultFile="NaturalVentilation");
 createPlot(id = 1,
  position = {75, 70, 400, 433},
  y = {"volA.T", "volOut.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mos
index 0dfe42ba157..6e8be63aa20 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mos
@@ -1,5 +1,5 @@
 simulateModel("Buildings.Airflow.Multizone.Examples.OneEffectiveAirLeakageArea", stopTime=7200,
-    method="radau", tolerance=1e-08, resultFile="OneEffectiveAirLeakageArea");
+    method="CVode", tolerance=1e-08, resultFile="OneEffectiveAirLeakageArea");
 createPlot(id = 1,
  position = {73, 34, 537, 565},
  y = {"cra.v"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneOpenDoor.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneOpenDoor.mos
index 6e5817600de..bde7e611edc 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneOpenDoor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneOpenDoor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.Examples.OneOpenDoor", stopTime=7200, method="Radau", tolerance=1e-06, resultFile="OneOpenDoor");
+simulateModel("Buildings.Airflow.Multizone.Examples.OneOpenDoor", stopTime=7200, method="CVode", tolerance=1e-06, resultFile="OneOpenDoor");
 removePlots();
 createPlot(id = 4,
  position = {73, 34, 537, 565},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneRoom.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneRoom.mos
index f0a0bc4fc91..57c9b8ab6b2 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneRoom.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/OneRoom.mos
@@ -1,6 +1,6 @@
 translateModel("Buildings.Airflow.Multizone.Examples.OneRoom");
 simulateModel("Buildings.Airflow.Multizone.Examples.OneRoom", stopTime=1,
- method="radau", tolerance=1e-06, resultFile="OneRoom");
+ method="CVode", tolerance=1e-06, resultFile="OneRoom");
 createPlot(id = 2,
  position = {35, 30, 825, 625},
  y = {"oriOutTop.port_a.m_flow", "oriOutBot.port_a.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/Orifice.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/Orifice.mos
index ceea264775b..177e5568be0 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/Orifice.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/Orifice.mos
@@ -1,5 +1,5 @@
 simulateModel("Buildings.Airflow.Multizone.Examples.Orifice", stopTime=1,
-   method="radau", tolerance=1e-06, resultFile="Orifice");
+   method="CVode", tolerance=1e-06, resultFile="Orifice");
 createPlot(id = 9,
  position = {75, 27, 537, 493},
  y = {"ori.V_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy.mos
index 2c585709204..4c80fd97cd9 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.Examples.ReverseBuoyancy", stopTime=3600, method="radau", tolerance=1e-06, resultFile="ReverseBuoyancy");
+simulateModel("Buildings.Airflow.Multizone.Examples.ReverseBuoyancy", stopTime=3600, method="CVode", tolerance=1e-06, resultFile="ReverseBuoyancy");
 createPlot(id = 1,
  position = {35, 30, 825, 625},
  y = {"oriWesTop.port_a.m_flow", "oriEasTop.port_a.m_flow", "oriOutTop.port_a.m_flow","oriOutBot.port_a.m_flow", "dooOpeClo.port_a1.m_flow", "dooOpeClo.port_a2.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy3Zones.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy3Zones.mos
index 9f61acee37f..8857f8a9437 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy3Zones.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ReverseBuoyancy3Zones.mos
@@ -1,5 +1,5 @@
 simulateModel("Buildings.Airflow.Multizone.Examples.ReverseBuoyancy3Zones", stopTime=3600,
- method="radau", tolerance=1e-06, resultFile="ReverseBuoyancy3Zones");
+ method="CVode", tolerance=1e-06, resultFile="ReverseBuoyancy3Zones");
 createPlot(id = 1,
  position = {35, 30, 825, 625},
  y = {"oriWesTop.port_a.m_flow", "oriEasTop.port_a.m_flow", "oriOutTop.port_a.m_flow","oriOutBot.port_a.m_flow", "dooOpeClo.port_a1.m_flow", "dooOpeClo.port_a2.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ZonalFlow.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ZonalFlow.mos
index 4ae5e298bf2..fb7708603d5 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ZonalFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Examples/ZonalFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Airflow.Multizone.Examples.ZonalFlow", method="radau", tolerance=1e-06, stopTime=3600, resultFile="ZonalFlow");
+simulateModel("Buildings.Airflow.Multizone.Examples.ZonalFlow", method="CVode", tolerance=1e-06, stopTime=3600, resultFile="ZonalFlow");
 createPlot(id=4, position={55, 50, 981, 799}, y={"rooA.T", "rooB.T"}, range={0.0, 4000.0, 15.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}}, displayUnits={"degC", "degC"});
 createPlot(id=4, position={55, 50, 981, 263}, y={"rooA.Xi[1]", "rooB.Xi[1]"}, range={0.0, 4000.0, -0.01, 0.019999999999999997}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=4, position={55, 50, 981, 263}, y={"zonFlo.port_a1.m_flow", "zonFlo.port_a2.m_flow", "floExc.port_a1.m_flow", "floExc.port_a2.m_flow"}, range={0.0, 4000.0, -0.02, 0.039999999999999994}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Validation/ThreeRoomsContam.mos b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Validation/ThreeRoomsContam.mos
index ea353da3d17..66bb3ad11c8 100644
--- a/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Validation/ThreeRoomsContam.mos
+++ b/Buildings/Resources/Scripts/Dymola/Airflow/Multizone/Validation/ThreeRoomsContam.mos
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-translateModel("Buildings.Airflow.Multizone.Validation.ThreeRoomsContam");
-simulateModel("Buildings.Airflow.Multizone.Validation.ThreeRoomsContam", stopTime=3600,
- method="radau", tolerance=1e-06, resultFile="ThreeRoomsContam");
-=======
 simulateModel("Buildings.Airflow.Multizone.Validation.ThreeRoomsContam", stopTime=3600, method="CVode", tolerance=1e-06, resultFile="ThreeRoomsContam");
->>>>>>> master
 createPlot(id = 1,
  position = {35, 30, 825, 625},
  y = {"oriWesTop.port_a.m_flow", "oriEasTop.port_a.m_flow", "oriOutTop.port_a.m_flow","oriOutBot.port_a.m_flow", "dooOpeClo.port_a1.m_flow", "dooOpeClo.port_a2.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SkyTemperature/Examples/BlackBody.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SkyTemperature/Examples/BlackBody.mos
old mode 100755
new mode 100644
index ef55869d2b7..197780560e6
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SkyTemperature/Examples/BlackBody.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SkyTemperature/Examples/BlackBody.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SkyTemperature.Examples.BlackBody", startTime=0, tolerance=1e-6, stopTime=86400, method="dassl", resultFile="BlackBody");
+simulateModel("Buildings.BoundaryConditions.SkyTemperature.Examples.BlackBody", startTime=0, tolerance=1e-6, stopTime=86400, method="CVode", resultFile="BlackBody");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"TBlaSky.TBlaSky", "TBlaSkyIrr.TBlaSky"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/AltitudeAngle.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/AltitudeAngle.mos
index 1b4d0143a35..6e3483f4a9b 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/AltitudeAngle.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/AltitudeAngle.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.AltitudeAngle", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="AltitudeAngle");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.AltitudeAngle", tolerance=1e-6, stopTime=86400, method="CVode", resultFile="AltitudeAngle");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"altAng.alt"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/Declination.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/Declination.mos
index d4e23806623..75680678231 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/Declination.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/Declination.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.Declination", tolerance=1e-6, stopTime=3.1536e+007, method="dassl", resultFile="Declination");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.Declination", tolerance=1e-6, stopTime=3.1536e+007, method="CVode", resultFile="Declination");
 createPlot(id=1, position={7, 7, 1232, 730}, y={"decAng.decAng", "solDecNOAA.y"}, range={0.0, 370.0, -26.0, 26.0}, grid=true, filename="Declination.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/IncidenceAngle.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/IncidenceAngle.mos
index 9b9e8225cb9..c6c802b32b7 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/IncidenceAngle.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/IncidenceAngle.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.IncidenceAngle", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="BaseClassesIncidenceAngle");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.IncidenceAngle", tolerance=1e-6, stopTime=86400, method="CVode", resultFile="BaseClassesIncidenceAngle");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"incAng.incAng"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mos
index 8cbf0e8ec86..ed56dcbe29d 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.SolarAzimuth", tolerance=1e-6, stopTime=864000, method="dassl", resultFile="SolarAzimuth");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.SolarAzimuth", tolerance=1e-6, stopTime=864000, method="CVode", resultFile="SolarAzimuth");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"solAzi.solAzi"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mos
index 098980b6fd9..12f6dcc10fb 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarHourAngle.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.SolarHourAngle", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="SolarHourAngle");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.SolarHourAngle", tolerance=1e-6, stopTime=86400, method="CVode", resultFile="SolarHourAngle");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"solHouAng.solHouAng"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mos
index 3a028ecda82..97623d76795 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.WallSolarAzimuth", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="WallSolarAzimuth");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.WallSolarAzimuth", tolerance=1e-6, stopTime=86400, method="CVode", resultFile="WallSolarAzimuth");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"walSolAzi.verAzi"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mos
index 35e0311a10d..d550ebfabae 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/BaseClasses/Examples/ZenithAngle.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.ZenithAngle", startTime=100000, tolerance=1e-6, stopTime=300000, method="dassl", resultFile="ZenithAngleBasCla");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.BaseClasses.Examples.ZenithAngle", startTime=100000, tolerance=1e-6, stopTime=300000, method="CVode", resultFile="ZenithAngleBasCla");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"zen.zen"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mos
index 49e3c7933a1..ce84a6f9a9d 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/IncidenceAngle.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.Examples.IncidenceAngle", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="IncidenceAngle");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.Examples.IncidenceAngle", tolerance=1e-6, stopTime=86400, method="CVode", resultFile="IncidenceAngle");
 createPlot(id=1, position={7, 7, 746, 517},
 y={"incAngHor.y", "incAngNor.y", "incAngWes.y", "incAngSou.y", "incAngEas.y"},
 range={0.0, 90000.0, 20.0, 180.0}, grid=true,
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mos
index 7cf646040df..ee5b7090ff3 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarGeometry/Examples/ZenithAngle.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarGeometry.Examples.ZenithAngle", startTime=100000, tolerance=1e-6, stopTime=300000, method="dassl", resultFile="ZenithAngle");
+simulateModel("Buildings.BoundaryConditions.SolarGeometry.Examples.ZenithAngle", startTime=100000, tolerance=1e-6, stopTime=300000, method="CVode", resultFile="ZenithAngle");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"zen.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mos
index fb377b5d95c..509084cb655 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/BrighteningCoefficient.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.BrighteningCoefficient", tolerance=1e-6, stopTime=8640000, method="dassl", resultFile="BrighteningCoefficient");
+simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.BrighteningCoefficient", tolerance=1e-6, stopTime=8640000, method="CVode", resultFile="BrighteningCoefficient");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"briCoe.F1"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mos
index 368c9cb8cb0..5ad2dc4ee7c 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/DiffuseIsotropic.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.DiffuseIsotropic", startTime=0, tolerance=1e-6, stopTime=8640000, method="dassl", resultFile="DiffuseIsotropicBasCla");
+simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.DiffuseIsotropic", startTime=0, tolerance=1e-6, stopTime=8640000, method="CVode", resultFile="DiffuseIsotropicBasCla");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"HDifTilIso.HSkyDifTil", "HDifTilIso.HGroDifTil"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mos
index f294c89689b..9c4ca75a903 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/RelativeAirMass.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.RelativeAirMass", tolerance=1e-6, stopTime=864000, method="dassl", resultFile="RelativeAirMass");
+simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.RelativeAirMass", tolerance=1e-6, stopTime=864000, method="CVode", resultFile="RelativeAirMass");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"relAirMas.relAirMas"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mos
index 813b5baadbd..07fe5c4fc3f 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.SkyBrightness", tolerance=1e-6, stopTime=8640000, method="dassl", resultFile="SkyBrightness");
+simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.SkyBrightness", tolerance=1e-6, stopTime=8640000, method="CVode", resultFile="SkyBrightness");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"skyBri.skyBri"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mos
index d0be727a47e..00633f2997f 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyClearness.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.SkyClearness", startTime=100000, tolerance=1e-6, stopTime=3000000, method="dassl", resultFile="SkyClearness");
+simulateModel("Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.SkyClearness", startTime=100000, tolerance=1e-6, stopTime=3000000, method="CVode", resultFile="SkyClearness");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"skyCle.skyCle"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mos
index 2bda5bfb197..55b8ef95140 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffuseIsotropic.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarIrradiation.Examples.DiffuseIsotropic", startTime=1.82304e+07, tolerance=1e-6, stopTime=1.83168e+07, method="dassl", resultFile="DiffuseIsotropic");
+simulateModel("Buildings.BoundaryConditions.SolarIrradiation.Examples.DiffuseIsotropic", startTime=1.82304e+07, tolerance=1e-6, stopTime=1.83168e+07, method="CVode", resultFile="DiffuseIsotropic");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"HDifRoo.H", "HDifWal.H", "HDifFlo.H"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mos
index f962275481a..145361a542e 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.SolarIrradiation.Examples.DiffusePerez", startTime=1.82304e+07, tolerance=1e-6, stopTime=1.83168e+07, method="dassl", resultFile="DiffusePerez");
+simulateModel("Buildings.BoundaryConditions.SolarIrradiation.Examples.DiffusePerez", startTime=1.82304e+07, tolerance=1e-6, stopTime=1.83168e+07, method="CVode", resultFile="DiffusePerez");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"HDifRoo.H", "HDifWal.H", "HDifFlo.H"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mos
index 7401c1ec07f..34b53da2707 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.CheckBlackBodySkyTemperature", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="CheckBlackBodySkyTemperature");
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.CheckBlackBodySkyTemperature", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="CheckBlackBodySkyTemperature");
 createPlot(id=3, position={95, 90, 592, 421}, y={"cheSkyBlaBodTem.TBlaSky"}, range={0.0, 1.0, -80.0, 80.0}, grid=true, filename="CheckBlackBodySkyTemperature.mat", colors={{238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mos
old mode 100755
new mode 100644
index 9e61e40460a..23507396df3
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.CheckPressure", startTime=0, tolerance=1e-6, stopTime=8640000, method="dassl", resultFile="CheckPressure");
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.CheckPressure", startTime=0, tolerance=1e-6, stopTime=8640000, method="CVode", resultFile="CheckPressure");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"chePre.PIn","chePre.pAtm"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mos
index 4710b79094c..93d6ca61161 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.CheckTemperature", startTime=0, tolerance=1e-6, stopTime=8640000, method="dassl", resultFile="CheckTemperature");
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.CheckTemperature", startTime=0, tolerance=1e-6, stopTime=8640000, method="CVode", resultFile="CheckTemperature");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {" cheTemDryBul.TDryBul", "cheTemDewPoi.TDewPoi"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mos
index 20afdaa2ace..b80744dba05 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/EquationOfTime.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.EquationOfTime", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="EquationOfTime");
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.EquationOfTime", tolerance=1e-6, stopTime=86400, method="CVode", resultFile="EquationOfTime");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"eqnTim.nDay"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mos
index b914ea099a7..0d0ed294f2a 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mos
@@ -1,10 +1,10 @@
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.GetTimeSpanTMY3", method="dassl", tolerance=1e-006, resultFile="GetTimeSpanTMY3");
-createPlot(id=1, 
-position={0, 0, 1376, 701}, 
-y={"timeSpan[1]", "timeSpan[2]"}, 
-range={0.0, 1.0, -2000000.0, 34000000.0}, 
-autoerase=false, 
-grid=true, 
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.GetTimeSpanTMY3", method="CVode", tolerance=1e-006, resultFile="GetTimeSpanTMY3");
+createPlot(id=1,
+position={0, 0, 1376, 701},
+y={"timeSpan[1]", "timeSpan[2]"},
+range={0.0, 1.0, -2000000.0, 34000000.0},
+autoerase=false,
+grid=true,
 filename = "GetTimeSpanTMY3.mat",
 colors={{28,108,200}, {238,46,47}});
 
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3_NonzeroStart.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3_NonzeroStart.mos
index 0b2e1ac6fd8..e6c3ecc4bff 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3_NonzeroStart.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3_NonzeroStart.mos
@@ -1,10 +1,10 @@
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.GetTimeSpanTMY3_NonzeroStart", method="dassl", tolerance=1e-006, resultFile="GetTimeSpanTMY3_NonzeroStart");
-createPlot(id=1, 
-position={0, 0, 1376, 701}, 
-y={"timeSpan[1]", "timeSpan[2]"}, 
-range={0.0, 1.0, -2000000.0, 34000000.0}, 
-autoerase=false, 
-grid=true, 
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.GetTimeSpanTMY3_NonzeroStart", method="CVode", tolerance=1e-006, resultFile="GetTimeSpanTMY3_NonzeroStart");
+createPlot(id=1,
+position={0, 0, 1376, 701},
+y={"timeSpan[1]", "timeSpan[2]"},
+range={0.0, 1.0, -2000000.0, 34000000.0},
+autoerase=false,
+grid=true,
 filename = "GetTimeSpanTMY3_NonzeroStart.mat",
 colors={{28,108,200}, {238,46,47}});
 
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mos
new file mode 100644
index 00000000000..bcbcbaa2d01
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.LimitMin", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="LimitMin");
+createPlot(id=1, position={15, 15, 1538, 612}, y={"limCeiHei.u", "limCeiHei.ceiHei"}, range={0.0, 120.0, -2000.0, 10000.0}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="h", displayUnits={"", "m"});
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos
old mode 100755
new mode 100644
index f52b5083274..4061839230d
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.LocalCivilTime", startTime=0, tolerance=1e-6, stopTime=172800, method="dassl", resultFile="LocalCivilTime");
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.LocalCivilTime", startTime=0, tolerance=1e-6, stopTime=172800, method="CVode", resultFile="LocalCivilTime");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"locTim.locTim","locTim.cloTim"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mos
index 6dd08209025..17b94ea3d01 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.SolarTime", tolerance=1e-6, stopTime=864000, numberOfIntervals=5000, method="dassl", resultFile="SolarTime");
+simulateModel("Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.SolarTime", tolerance=1e-6, stopTime=864000, numberOfIntervals=5000, method="CVode", resultFile="SolarTime");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"solTim.solTim"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos
old mode 100755
new mode 100644
index b6ae0ab4e30..f5deae04db9
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Examples/ReaderTMY3.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.WeatherData.Examples.ReaderTMY3", startTime=0, tolerance=1e-6, stopTime=8640000, method="dassl", resultFile="ReaderTMY3");
+simulateModel("Buildings.BoundaryConditions.WeatherData.Examples.ReaderTMY3", startTime=0, tolerance=1e-6, stopTime=8640000, method="CVode", resultFile="ReaderTMY3");
 createPlot(id = 1,
  position = {7, 7, 746, 517},
  y = {"weaDat.weaBus.TDryBul", "weaDat.weaBus.TDewPoi"},
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/DecemberToJanuary.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/DecemberToJanuary.mos
index c233244a4e7..1e4111e5907 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/DecemberToJanuary.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/DecemberToJanuary.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.BoundaryConditions.WeatherData.Validation.DecemberToJanuary", startTime=30992400, stopTime=31860000, method="dassl", tolerance=1e-06, resultFile="DecemberToJanuary");
+simulateModel("Buildings.BoundaryConditions.WeatherData.Validation.DecemberToJanuary", startTime=30992400, stopTime=31860000, method="CVode", tolerance=1e-06, resultFile="DecemberToJanuary");
 createPlot(id=3, position={55, 50, 588, 413}, y={"weaDat.weaBus.TDryBul", "weaDat.weaBus.HDirNor", "weaDat.weaBus.HDifHor"}, range={358.0, 370.0, -6000.0, 2000.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"degC", "", ""});
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/OverAYear_usingOneYearData.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/OverAYear_usingOneYearData.mos
index 8d20b49f7ab..be4ded03fc3 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/OverAYear_usingOneYearData.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/OverAYear_usingOneYearData.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.BoundaryConditions.WeatherData.Validation.OverAYear_usingOneYearData", stopTime=36633600, numberOfIntervals=0, outputInterval=3600, method="dassl", tolerance=1e-006, resultFile="OverAYear_usingOneYearData");
+simulateModel("Buildings.BoundaryConditions.WeatherData.Validation.OverAYear_usingOneYearData", stopTime=36633600, numberOfIntervals=0, outputInterval=3600, method="CVode", tolerance=1e-006, resultFile="OverAYear_usingOneYearData");
 createPlot(id=3, position={0, 0, 1124, 701}, y={"weaDat.weaBus.TDryBul"}, range={0.0, 10.0, 0.0, 35.0}, grid=true, colors={{28,108,200}}, timeUnit="d", displayUnits={"degC"});
 createPlot(id=3, position={0, 0, 1124, 348}, y={"weaDat.weaBus.TDryBul"}, range={365.0, 375.0, 0.0, 35.0}, grid=true, subPlot=2, colors={{28,108,200}}, timeUnit="d", displayUnits={"degC"});
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mos b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mos
index be38c055d84..6133be3a6dd 100644
--- a/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mos
+++ b/Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.BoundaryConditions.WeatherData.Validation.ReaderTMY3HDirNor", stopTime=86400, method="dassl", tolerance=1e-06, resultFile="ReaderTMY3HDirNor");
+simulateModel("Buildings.BoundaryConditions.WeatherData.Validation.ReaderTMY3HDirNor", stopTime=86400, method="CVode", tolerance=1e-06, resultFile="ReaderTMY3HDirNor");
 createPlot(id=1,
   position={0, 0, 744, 490},
   y={"weaDatInpCon.HGloHor_in", "weaDatInpCon.weaBus.HDifHor"},
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mos
similarity index 63%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mos
rename to Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mos
index be40cd90efb..19001676023 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/ModeAndSetPoints.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mos
@@ -1,7 +1,7 @@
-simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.ModeAndSetPoints", method="Cvode", stopTime=86400, tolerance=1e-06, resultFile="ZoneModSetPoints");
+simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Validation.ModeAndSetPoints", method="Cvode", stopTime=86400, tolerance=1e-06, resultFile="ZoneModSetPoints");
 createPlot(id=1, position={10, 15, 390, 750}, subPlot=1, y={"setPoi.setAdj","setPoi.heaSetAdj"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
-createPlot(id=1, position={10, 15, 390, 750}, subPlot=2, y={"TZon1.y","TZon2.y","setPoi.TZonHeaOn","setPoi.TZonCooOn"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72},{238,46,47},{238,46,47}});
+createPlot(id=1, position={10, 15, 390, 750}, subPlot=2, y={"TZon1.y","TZon2.y","setPoi.THeaSetOcc","setPoi.TCooSetOcc"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72},{238,46,47},{238,46,47}});
 createPlot(id=2, position={410, 15, 390, 750}, subPlot=1, y={"setPoi.TZonCooSet","setPoi.TZonHeaSet"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
 createPlot(id=2, position={410, 15, 390, 750}, subPlot=2, y={"setPoi.yOpeMod"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200}});
-createPlot(id=3, position={810, 15, 390, 750}, subPlot=1, y={"setPoi1.uOccSen","setPoi1.uWinSta"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
+createPlot(id=3, position={810, 15, 390, 750}, subPlot=1, y={"setPoi1.uOccSen","setPoi1.uWin"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
 createPlot(id=3, position={810, 15, 390, 750}, subPlot=2, y={"setPoi1.TZonCooSet","setPoi1.TZonHeaSet"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mos
new file mode 100644
index 00000000000..48521e37154
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/GroupStatus.mos
@@ -0,0 +1,13 @@
+simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.GroupStatus", method="Cvode", stopTime=3600, tolerance=1e-06, resultFile="GroupStatus");
+createPlot(id=1, position={10, 10, 1000, 1300}, y={"zonGroSta.zonOcc[1]", "zonGroSta.zonOcc[2]", "zonGroSta.uOcc[1]","zonGroSta.uOcc[2]"}, range={0.0, 4000.0, -1.0, 2.0}, grid=true, subPlot=1, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={10, 10, 1000, 1300}, y={"zonGroSta.tNexOcc[1]", "zonGroSta.tNexOcc[2]"}, range={0.0, 4000.0, -2000.0, 4000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=1, position={10, 10, 1000, 1300}, y={"zonGroSta.uCooTim[1]", "zonGroSta.uCooTim[2]", "zonGroSta.uWarTim[1]", "zonGroSta.uWarTim[2]"}, range={0.0, 4000.0, -2000.0, 2000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, displayUnits={"s", "s", "s", "s"});
+createPlot(id=1, position={10, 10, 1000, 1300}, y={"zonGroSta.uOccHeaHig[1]", "zonGroSta.uOccHeaHig[2]", "zonGroSta.uUnoHeaHig[1]", "zonGroSta.uUnoHeaHig[2]"}, range={0.0, 4000.0, -1.0, 2.0}, grid=true, subPlot=4, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={10, 10, 1000, 1300}, y={"zonGroSta.uEndSetBac[1]", "zonGroSta.uEndSetBac[2]", "zonGroSta.uWin[1]", "zonGroSta.uWin[2]"}, range={0.0, 4000.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={10, 10, 1000, 1300}, y={"zonGroSta.TZon[1]", "zonGroSta.TZon[2]"}, range={0.0, 4000.0, 10.0, 30.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}}, displayUnits={"degC", "degC"});
+createPlot(id=2, position={1020, 10, 1000, 1300}, y={"zonGroSta.uGroOcc"}, range={0.0, 4000.0, -1.0, 2.0}, grid=true, subPlot=1,  colors={{28,108,200}});
+createPlot(id=2, position={1020, 10, 1000, 1300}, y={"zonGroSta.nexOcc", "zonGroSta.yCooTim", "zonGroSta.yWarTim"}, range={0.0, 4000.0, -1000.0, 2000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}}, displayUnits={"s", "s", "s"});
+createPlot(id=2, position={1020, 10, 1000, 1300}, y={"zonGroSta.yOccHeaHig"}, range={0.0, 4000.0, -1.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}});
+createPlot(id=2, position={1020, 10, 1000, 1300}, y={"zonGroSta.yColZon", "zonGroSta.yOpeWin"}, range={0.0, 4000.0, -2.0, 4.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={1020, 10, 1000, 1300}, y={"zonGroSta.ySetBac", "zonGroSta.yEndSetBac"}, range={0.0, 4000.0, -1.0, 2.0}, grid=true, subPlot=5, colors={{28,108,200}, {28,108,200}});
+createPlot(id=2, position={1020, 10, 1000, 1300}, y={"zonGroSta.TZonMax", "zonGroSta.TZonMin"}, range={0.0, 4000.0, 10.0, 30.0}, grid=true, subPlot=6, colors={{28,108,200}, {238,46,47}}, displayUnits={"degC", "degC"});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos
index 8f28d66e744..598357ce02e 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/OperationMode.mos
@@ -1,5 +1,7 @@
-simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode", method="Cvode", stopTime=86400, tolerance=1e-06, resultFile="OperationModeSelector");
-createPlot(id=1, position={20, 10, 992, 920}, y={"opeModSel.yOpeMod"}, range={0.0, 24.0, 0.0, 10.0}, grid=true, colors={{28,108,200}}, timeUnit="h");
-createPlot(id=1, position={20, 10, 992, 304}, y={"opeModSel.uOcc"}, range={0.0, 24.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}}, timeUnit="h");
-createPlot(id=1, position={20, 10, 992, 304}, y={"opeModSel.tNexOcc"}, range={0.0, 24.0, -50000.0, 100000.0}, grid=true, subPlot=3, colors={{28,108,200}}, timeUnit="h");
-createPlot(id=2, position={1021, 11, 1116, 917}, y={"opeModSel.occHeaHigMin", "opeModSel.maxHigOccCoo", "opeModSel.unoHeaHigMin", "opeModSel.maxHigUnoCoo"}, range={0.0, 24.0, -0.1, 1.1}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="h");
+simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode", method="Cvode", stopTime=172800, tolerance=1e-06, resultFile="OperationMode");
+createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.yOpeMod"}, range={0.0, 48.0, 0.0, 10.0}, grid=true, subPlot=1, colors={{28,108,200}}, timeUnit="h");
+createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.uOcc", "opeModSel.uHigOccCoo", "opeModSel.uOccHeaHig"}, range={0.0, 48.0, -1.0, 2.0}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="h");
+createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.tNexOcc"}, range={0.0, 48.0, -50000.0, 100000.0}, grid=true, subPlot=3, colors={{28,108,200}}, timeUnit="h", displayUnits={"s"});
+createPlot(id=1, position={10, 10, 1450, 1400}, y={"opeModSel.maxCooDowTim", "opeModSel.maxWarUpTim"}, range={0.0, 48.0, 1600.0, 2000.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, timeUnit="h", displayUnits={"s", "s"});
+createPlot(id=1, position={10, 10, 1450, 1400}, y={"TZonHeaSetUno.y", "TZonCooSetUno.y", "TZonHeaSetOcc.y", "TZonCooSetOcc.y", "opeModSel.TZonMax"}, range={0.0, 48.0, 280.0, 320.0}, grid=true, subPlot=5, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="h", displayUnits={"", "", "", "", "K"});
+
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mos
index 2573370ec04..0950a2f3aa2 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/Generic/SetPoints/Validation/ZoneStatus.mos
@@ -1,6 +1,4 @@
 simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.ZoneStatus", method="Cvode", stopTime=86400, tolerance=1e-06, resultFile="ZoneStatus");
-createPlot(id=1, position={15, 15, 1090, 981}, y={"noWinZonSta.TZonHeaSetOcc", "noWinZonSta.TZonCooSetOcc", "noWinZonSta.TZonMax","noWinZonSta.TZon", "noWinZonSta.TZonMin", "noWinZonSta.TZonHeaSetUno", "noWinZonSta.TZonCooSetUno"}, range={0.0, 90000.0, 5.0, 40.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33},{244,125,35}}, displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"});
-createPlot(id=1, position={15, 15, 1090, 488}, y={"noWinZonSta.yOccHeaHigMin", "noWinZonSta.yMaxHigOccCoo", "noWinZonSta.yLowUnoHea","noWinZonSta.yUnoHeaHigMin", "noWinZonSta.yMaxHigUnoCoo", "noWinZonSta.yHigUnoCoo"}, range={0.0, 90000.0, -0.2, 1.2}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
-createPlot(id=2, position={1117, 19, 1176, 973}, y={"witWinZonSta.cooDowTim", "witWinZonSta.warUpTim"}, range={0.0, 90000.0, 1600.0, 2000.0}, grid=true, colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={1117, 19, 1176, 321}, y={"witWinZonSta.uWinSta"}, range={0.0, 90000.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}});
-createPlot(id=2, position={1117, 19, 1176, 322}, y={"witWinZonSta.yCooTim", "witWinZonSta.yWarTim"}, range={0.0, 90000.0, -1000.0, 2000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={10, 20, 950, 1200}, y={"noWinZonSta.TZon", "noWinZonSta.THeaSetOcc", "noWinZonSta.TCooSetOcc", "noWinZonSta.THeaSetUno", "noWinZonSta.TCooSetUno"}, range={0.0, 90000.0, 0.0, 40.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, displayUnits={"degC", "degC", "degC", "degC", "degC"});
+createPlot(id=1, position={10, 20, 950, 1200}, y={"noWinZonSta.yOccHeaHig", "noWinZonSta.yHigOccCoo", "noWinZonSta.yUnoHeaHig", "noWinZonSta.yEndSetBac"}, range={0.0, 90000.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={10, 20, 950, 1200}, y={"witWinZonSta.uWin", "witWinZonSta.yOccHeaHig", "witWinZonSta.yHigOccCoo", "witWinZonSta.yUnoHeaHig", "witWinZonSta.yEndSetBac"}, range={0.0, 90000.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/DamperValves.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/DamperValves.mos
index 002d65cd9e4..3e23cf68e93 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/DamperValves.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/DamperValves.mos
@@ -1,6 +1,6 @@
 simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.DamperValves", method="Cvode", stopTime=86400, tolerance=1e-06, resultFile="DamperValves_Reheat");
 createPlot(id=1, position={20, 10, 600, 700}, subPlot=1, y={"damVal.uHea","damVal.uCoo"}, range={0.0, 1200.0, 0.0, 0.8}, grid=true, colors={{238,46,47},{28,108,200}});
-createPlot(id=1, position={20, 10, 600, 700}, subPlot=2, y={"damVal.VDisSet_flow","damVal.VDis_flow"}, range={0.0, 1200.0, 0.0, 0.8}, grid=true, colors={{238,46,47},{28,108,200}});
+createPlot(id=1, position={20, 10, 600, 700}, subPlot=2, y={"damVal.VDisSet_flow"}, range={0.0, 1200.0, 0.0, 0.8}, grid=true, colors={{238,46,47}});
 createPlot(id=1, position={20, 10, 600, 700}, subPlot=3, y={"damVal.yDam"}, range={0.0, 1200.0, 0.0, 0.8}, grid=true, colors={{238,46,47}});
 createPlot(id=2, position={630, 10, 600, 700}, subPlot=1, y={"damVal.uHea","damVal.uCoo"}, range={0.0, 1200.0, 0.0, 0.8}, grid=true, colors={{238,46,47},{28,108,200}});
 createPlot(id=2, position={630, 10, 600, 700}, subPlot=2, y={"damVal.TDisHeaSet"}, range={0.0, 1200.0, 0.0, 0.8}, grid=true, colors={{238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mos
index 00ca7abd3ae..854bccbaf29 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/Validation/SystemRequests.mos
@@ -3,7 +3,7 @@ createPlot(id=1, position={10, 10, 400, 700}, subPlot=1, y={"sysReq_RehBox.TZonC
 createPlot(id=1, position={10, 10, 400, 700}, subPlot=2, y={"sysReq_RehBox.uCoo"}, grid=true, colors={{238,46,47}});
 createPlot(id=1, position={10, 10, 400, 700}, subPlot=3, y={"sysReq_RehBox.yZonTemResReq"}, grid=true, colors={{238,46,47}});
 createPlot(id=2, position={420, 10, 400, 700}, subPlot=1, y={"sysReq_RehBox.VDisSet_flow","sysReq_RehBox.VDis_flow"}, grid=true, colors={{238,46,47},{28,108,200}});
-createPlot(id=2, position={420, 10, 400, 700}, subPlot=2, y={"sysReq_RehBox.uDam"}, grid=true, colors={{238,46,47}});
+createPlot(id=2, position={420, 10, 400, 700}, subPlot=2, y={"sysReq_RehBox.yDam_actual"}, grid=true, colors={{238,46,47}});
 createPlot(id=2, position={420, 10, 400, 700}, subPlot=3, y={"sysReq_RehBox.yZonPreResReq"}, grid=true, colors={{238,46,47}});
 createPlot(id=3, position={830, 10, 400, 700}, subPlot=1, y={"sysReq_RehBox.TDisHeaSet","sysReq_RehBox.TDis"}, grid=true, colors={{238,46,47},{28,108,200}});
 createPlot(id=3, position={830, 10, 400, 700}, subPlot=2, y={"sysReq_RehBox.uHeaVal"}, grid=true, colors={{238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mos
index 669e70f3e62..1fc22709db5 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Validation/Controller.mos
@@ -1,14 +1,14 @@
 simulateModel("Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.Controller", method="Cvode", stopTime=3600, tolerance=1e-06, resultFile="Controller");
 createPlot(id=1, position={10, 15, 390, 650}, subPlot=1, y={"con.TZonHeaSet","con.TZonCooSet","con.TZon"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72},{238,46,47}});
 createPlot(id=1, position={10, 15, 390, 650}, subPlot=2, y={"con.conHeaLoo.y","con.conCooLoo.y"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
-createPlot(id=2, position={410, 15, 390, 650}, subPlot=1, y={"con.damVal.VDisSet_flow","con.damVal.VDis_flow"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
+createPlot(id=2, position={410, 15, 390, 650}, subPlot=1, y={"con.damVal.VDisSet_flow"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200}});
 createPlot(id=2, position={410, 15, 390, 650}, subPlot=2, y={"con.damVal.yDam"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200}});
 createPlot(id=3, position={810, 15, 390, 650}, subPlot=1, y={"con.damVal.TDisHeaSet","con.damVal.TDis"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
 createPlot(id=3, position={810, 15, 390, 650}, subPlot=2, y={"con.damVal.yHeaVal"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200}});
 createPlot(id=4, position={1210, 15, 390, 650}, subPlot=1, y={"con.yZonTemResReq","con.yZonPreResReq"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
 createPlot(id=5, position={20, 35, 390, 650}, subPlot=1, y={"con1.TZonHeaSet","con1.TZonCooSet","con1.TZon"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72},{238,46,47}});
 createPlot(id=5, position={20, 35, 390, 650}, subPlot=2, y={"con1.conHeaLoo.y","con1.conCooLoo.y"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
-createPlot(id=6, position={420, 35, 390, 650}, subPlot=1, y={"con1.damVal.VDisSet_flow","con1.damVal.VDis_flow"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
+createPlot(id=6, position={420, 35, 390, 650}, subPlot=1, y={"con1.damVal.VDisSet_flow"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200}});
 createPlot(id=6, position={420, 35, 390, 650}, subPlot=2, y={"con1.damVal.yDam"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200}});
 createPlot(id=7, position={820, 35, 390, 650}, subPlot=1, y={"con1.damVal.TDisHeaSet","con1.damVal.TDis"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200},{0,140,72}});
 createPlot(id=7, position={820, 35, 390, 650}, subPlot=2, y={"con1.damVal.yHeaVal"}, range={0.0, 0.05, -0.2, 0.6}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mos
index 1c7301834f8..b304373c9b6 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Sources.Validation.TimeTableNegativeStartTime", startTime=-129600, tolerance=1e-6, stopTime=172800, method="Cvode", resultFile="NegativeStartTime");
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Sources.Validation.TimeTableNegativeStartTime", startTime=-129600, tolerance=1e-6, stopTime=172800, method="Cvode", resultFile="NegativeStartTime1");
 createPlot(id=1, position={15, 10, 1936, 1264}, y={"timTabLin.y[1]", "timTabLinCon.y[1]", "timTabCon.y[1]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, colors={{0,0,255}, {0,140,72}, {238,46,47}}, patterns={LinePattern.Solid, LinePattern.DashDot, LinePattern.Solid}, timeUnit="d");
 createPlot(id=1, position={15, 10, 1936, 418}, y={"timTabLinHol.y[1]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{0,0,255}}, timeUnit="d");
 createPlot(id=1, position={15, 10, 1936, 418}, y={"timTabLinDer.y[1]"}, range={-1.6, 2.0, -4.0, 2.0}, grid=true, subPlot=3, colors={{0,0,255}}, timeUnit="d");
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos
deleted file mode 100644
index 6427b28be5a..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos
+++ /dev/null
@@ -1,2 +0,0 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.ChangeSign", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="ChangeSign1");
-createPlot(id=1, position={15, 10, 590, 420}, y={"changSign.u", "changSign.y"}, range={0.0, 1.0, -2, 2}, grid=true, colors={{238,46,47}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Greater.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Greater.mos
index 555fe61ad5b..31a31df705a 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Greater.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Greater.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.Greater", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="Greater1");
-createPlot(id=1, position={15, 10, 900, 420}, y={"greater1.u1","greater1.u2","greater1.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{0,140,72},{28,108,200}});
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.Greater", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="Greater1");
+createPlot(id=1, position={15, 15, 742, 472}, y={"gre.u1", "gre.u2", "gre.y", "greHys.y"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos
deleted file mode 100644
index f1faf1be86d..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos
+++ /dev/null
@@ -1,2 +0,0 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="GreaterEqualThreshold1");
-createPlot(id=1, position={15, 10, 900, 420}, y={"greEquThr.u", "greEquThr.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mos
index 6c0c15befbd..3656e5f0635 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterThreshold.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="GreaterThreshold1");
-createPlot(id=1, position={15, 10, 900, 420}, y={"greThr.u", "greThr.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{28,108,200}});
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterThreshold", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="GreaterThreshold1");
+createPlot(id=1, position={15, 15, 742, 472}, y={"gre.u", "gre.t", "gre.y", "greHys.y"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mos
index 3a53cbd1a28..1eeb0d926f3 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/IntegratorWithReset.mos
@@ -1,7 +1,6 @@
 simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.IntegratorWithReset", method="Cvode", tolerance=1e-6, stopTime=1.0, resultFile="IntegratorWithReset1");
-createPlot(id=1, position={35, 30, 586, 834}, y={"cons.y"}, range={0.0, 1.0, 8.8, 11.2}, grid=true, colors={{28,108,200}});
-createPlot(id=1, position={35, 30, 586, 415}, y={"booleanPulse.y"}, range={0.0, 1.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
-createPlot(id=2, position={645, 30, 725, 822}, y={"intWitRes1.y_start", "intWitRes1.y_reset", "intWitRes1.y"}, range={0.0, 1.0, 1.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
-createPlot(id=2, position={645, 30, 725, 202}, y={"intWitRes2.y_start", "intWitRes2.y", "intWitRes2.y_reset_in"}, range={0.0, 1.0, -6.0, -1.0}, grid=true, subPlot=2, colors={{28,108,200}, {0,140,72}, {238,46,47}});
-createPlot(id=2, position={645, 30, 725, 203}, y={"intNoReset.y_start", "intNoReset.y"}, range={0.0, 1.0, 0.0, 8.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={645, 30, 725, 202}, y={"intDef.y_start", "intDef.y"}, range={0.0, 1.0, -5.0, 15.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={35, 30, 586, 850}, y={"cons.y"}, range={0.0, 1.0, 8.8, 11.2}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={35, 30, 586, 850}, y={"booleanPulse.y"}, range={0.0, 1.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
+createPlot(id=2, position={645, 30, 725, 850}, y={"intDef.y_start", "intDef.y", "intDef.y_reset_in"}, range={0.0, 1.0, -5.0, 15.0}, grid=true, colors={{28,108,200}, {0,140,72},{238,46,47}});
+createPlot(id=2, position={645, 30, 725, 850}, y={"intWitRes1.y_start", "intWitRes1.y", "intWitRes1.y_reset_in"}, range={0.0, 1.0, 1.0, 6.0}, grid=true,  subPlot=2, colors={{28,108,200}, {0,140,72}, {238,46,47}});
+createPlot(id=2, position={645, 30, 725, 850}, y={"intWitRes2.y_start", "intWitRes2.y", "intWitRes2.y_reset_in"}, range={0.0, 1.0, -6.0, -1.0}, grid=true, subPlot=3, colors={{28,108,200}, {0,140,72}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Less.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Less.mos
index f7d8cecbcf2..5901d5e0714 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Less.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Less.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.Less", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="Less1");
-createPlot(id=1, position={15, 10, 900, 420}, y={"less1.u1","less1.u2","less1.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{0,140,72},{28,108,200}});
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.Less", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="Less1");
+createPlot(id=1, position={15, 15, 742, 472}, y={"les.u1", "les.u2", "les.y", "lesHys.y"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos
deleted file mode 100644
index 2d28f0470ed..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos
+++ /dev/null
@@ -1,2 +0,0 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="LessEqualThreshold1");
-createPlot(id=1, position={15, 10, 900, 420}, y={"lesEquThr.u", "lesEquThr.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mos
index 5b3e2d4cdd5..b66fef1798f 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessThreshold.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LessThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="LessThreshold1");
-createPlot(id=1, position={15, 10, 900, 420}, y={"lesThr.u", "lesThr.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{28,108,200}});
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LessThreshold", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="LessThreshold1");
+createPlot(id=1, position={15, 15, 742, 472}, y={"les.u", "les.t", "les.y", "lesHys.y"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PID.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PID.mos
new file mode 100644
index 00000000000..7c2a594f643
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PID.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.PID", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="PID1");
+createPlot(id=1, position={15, 10, 900, 700}, y={"limPID.u_s", "limPID.u_m"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, colors={{238,46,47}, {0,140,72}});
+createPlot(id=1, position={15, 10, 900, 700}, y={"limPID.u_s", "limPID.y", "noLimPID.y"}, range={0.0, 1.0, -20.0, 10.0}, grid=true, subPlot=102, colors={{238,46,47}, {0,140,72}, {217,67,180}});
+createPlot(id=1, position={15, 10, 900, 700}, y={"limP.y", "limPI.y", "limPD.y"}, range={0.0, 1.0, -2.0, 2.0}, grid=true, subPlot=103, colors={{238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDInitialDerivativeOutput.mos
similarity index 70%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos
rename to Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDInitialDerivativeOutput.mos
index a83efd7436c..7325a63a94a 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDInitialDerivativeOutput.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput", tolerance=1e-06, stopTime=0.2, resultFile="LimPIDInitialDerivativeOutput");
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialDerivativeOutput", tolerance=1e-06, stopTime=0.2, resultFile="PIDInitialDerivativeOutput");
 createPlot(id=1, position={31, 124, 592, 372}, y={"limPID.y", "limPD.y", "limPID.D.y", "limPD.D.y"}, range={0.0, 1.0, -0.2, 0.6}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {0,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mos
similarity index 79%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos
rename to Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mos
index d0d762c7899..a5e8e7a5b82 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDInitialState.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState", tolerance=1e-06, resultFile="LimPIDInitialState");
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialState", tolerance=1e-06, resultFile="PIDInitialState");
 createPlot(id=1, position={35, 35, 926, 623}, y={"limPID.I.y", "limPID.D.y", "limPI.I.y", "limPID.D.u"}, range={0.0, 1.0, -0.6, 0.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDScale.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDScale.mos
new file mode 100644
index 00000000000..54c31366324
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDScale.mos
@@ -0,0 +1,3 @@
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.PIDScale", method="CVode", stopTime=100, tolerance=1e-06, resultFile="PIDScale");
+createPlot(id=2, position={577, 61, 1112, 827}, y={"pidSca.y", "pidNoSca.y"}, range={0.0, 100.0, -1.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={577, 61, 1112, 827}, y={"pla1.y", "pla2.y", "pidSca.u_s"}, range={0.0, 100.0, -500.0, 1500.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mos
new file mode 100644
index 00000000000..cd6d549af77
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithReset.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithReset", stopTime=10, method="Cvode", tolerance=1e-06, resultFile="CDL_PIDWithReset");
+createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIDPar.u_s", "limPIDPar.u_m", "limPIDPar.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIDInp.u_s", "limPIDInp.u_m", "limPIDInp.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIPar.u_s", "limPIPar.u_m", "limPIPar.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIInp.u_s", "limPIInp.u_m", "limPIInp.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithResetScale.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithResetScale.mos
new file mode 100644
index 00000000000..c9f6ecfeb0b
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/PIDWithResetScale.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithResetScale", method="CVode", stopTime=100, tolerance=1e-06, resultFile="PIDWithResetScale");
+createPlot(id=2, position={577, 61, 1454, 979}, y={"pidSca.y", "pidNoSca.y"}, range={0.0, 100.0, -2.0, 2.0}, grid=true, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={577, 61, 1454, 979}, y={"pla1.y", "pla2.y", "pidSca.u_s"}, range={0.0, 100.0, -500.0, 1500.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=2, position={577, 61, 1454, 979}, y={"pidSca.trigger"}, range={0.0, 100.0, -0.5, 1.5}, grid=true, subPlot=103, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/Pulse.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/Pulse.mos
new file mode 100644
index 00000000000..a4938ec4a28
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/Pulse.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Controls.OBC.CDL.Integers.Sources.Validation.Pulse", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="IntegerPulse1");
+createPlot(id=1, subPlot=1, position={15, 10, 590, 750}, y={"pul.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+createPlot(id=1, subPlot=2, position={15, 10, 590, 750}, y={"pul1.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+createPlot(id=1, subPlot=3, position={15, 10, 590, 750}, y={"pul2.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+createPlot(id=1, subPlot=4, position={15, 10, 590, 750}, y={"pul3.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTable.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTable.mos
new file mode 100644
index 00000000000..ff3b4a7ae06
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTable.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTable", startTime=0, tolerance=1e-6, stopTime=15, method="Cvode", resultFile="IntegerTimeTable");
+createPlot(id=1, position={15, 6, 1488, 1268}, y={"intTimTab.y[1]", "intTimTab.y[2]"}, range={0.0, 15.0, -2.0, 8.0}, grid=true, colors={{28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 6, 1488, 1268}, y={"intTimTab1.y[1]", "intTimTab1.y[2]"}, range={0.0, 15.0, -4.0, 8.0}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 6, 1488, 1268}, y={"tabOneRow.y[1]"}, range={0.0, 15.0, -1.2000000000000002, 0.3999999999999999}, grid=true, subPlot=103, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTableNegativeStartTime.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTableNegativeStartTime.mos
new file mode 100644
index 00000000000..35e26cc84e8
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Sources/Validation/TimeTableNegativeStartTime.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTableNegativeStartTime", startTime=-5, tolerance=1e-6, stopTime=10, method="Cvode", resultFile="TimeTableNegativeStartTime3");
+createPlot(id=1, position={15, 6, 1488, 1268}, y={"intTimTab.y[1]", "intTimTab.y[2]"}, grid=true, colors={{28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 6, 1488, 1268}, y={"intTimTab1.y[1]", "intTimTab1.y[2]"}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 6, 1488, 1268}, y={"tabOneRow.y[1]"}, grid=true, subPlot=103, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mos
index 2049514d60b..4d6b7eec9be 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mos
@@ -1,3 +1,3 @@
 simulateModel("Buildings.Controls.OBC.CDL.Integers.Validation.GreaterEqualThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="GreaterEqualThreshold2");
-createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intGreEquThr.threshold", "intGreEquThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
+createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intGreEquThr.t", "intGreEquThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
 createPlot(id=1, position={15, 10, 590, 450}, subPlot=2, y={"intGreEquThr.y"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mos
index 2e7f336593c..25d6ae36204 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mos
@@ -1,3 +1,3 @@
 simulateModel("Buildings.Controls.OBC.CDL.Integers.Validation.GreaterThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="GreaterThreshold2");
-createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intGreThr.threshold", "intGreThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
+createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intGreThr.t", "intGreThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
 createPlot(id=1, position={15, 10, 590, 450}, subPlot=2, y={"intGreThr.y"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mos
index d51a7e5a071..007cbd649f2 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mos
@@ -1,3 +1,3 @@
 simulateModel("Buildings.Controls.OBC.CDL.Integers.Validation.LessEqualThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="LessEqualThreshold2");
-createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intLesEquThr.threshold", "intLesEquThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
+createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intLesEquThr.t", "intLesEquThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
 createPlot(id=1, position={15, 10, 590, 450}, subPlot=2, y={"intLesEquThr.y"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessThreshold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessThreshold.mos
index 7605a5e525b..88daab0d144 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessThreshold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Integers/Validation/LessThreshold.mos
@@ -1,3 +1,3 @@
 simulateModel("Buildings.Controls.OBC.CDL.Integers.Validation.LessThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="LessThreshold2");
-createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intLesThr.threshold", "intLesThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
+createPlot(id=1, position={15, 10, 590, 450}, subPlot=1, y={"intLesThr.t", "intLesThr.u"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}, {238,46,47}});
 createPlot(id=1, position={15, 10, 590, 450}, subPlot=2, y={"intLesThr.y"}, range={0.0, 1.0, -3.5, 3.5}, grid=true, colors={{0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mos
index 286a19af6f2..3ca8c303e2c 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/Pulse.mos
@@ -1,2 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Logical.Sources.Validation.Pulse", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="BooleanPulse1");
-createPlot(id=1, position={15, 10, 590, 420}, y={"booPul.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Sources.Validation.Pulse", stopTime=10, tolerance=1e-06, method="Cvode", resultFile="Pulse");
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_a1.y", "booPul_a2.y", "booPul_a3.y", "booPul_a4.y", "booPul_a5.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_b1.y", "booPul_b2.y", "booPul_b3.y", "booPul_b4.y", "booPul_b5.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_c1.y", "booPul_c2.y", "booPul_c3.y", "booPul_c4.y", "booPul_c5.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=103, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulseNegativeStartTime.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulseNegativeStartTime.mos
new file mode 100644
index 00000000000..90c3846a1fc
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulseNegativeStartTime.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulseNegativeStartTime", startTime=-10, stopTime=1, tolerance=1e-06, method="Cvode", resultFile="PulseNegativeStartTime");
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_a1.y", "booPul_a2.y", "booPul_a3.y", "booPul_a4.y", "booPul_a5.y"}, range={-10, 1, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_b1.y", "booPul_b2.y", "booPul_b3.y", "booPul_b4.y", "booPul_b5.y"}, range={-10, 1, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_c1.y", "booPul_c2.y", "booPul_c3.y", "booPul_c4.y", "booPul_c5.y"}, range={-10, 1, 1.5}, grid=true, subPlot=103, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulsePositiveStartTime.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulsePositiveStartTime.mos
new file mode 100644
index 00000000000..71de17983fa
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/PulsePositiveStartTime.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulsePositiveStartTime", startTime=9, stopTime=20, tolerance=1e-06, method="Cvode", resultFile="PulsePositiveStartTime");
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_a1.y", "booPul_a2.y", "booPul_a3.y", "booPul_a4.y", "booPul_a5.y"}, range={9, 20, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_b1.y", "booPul_b2.y", "booPul_b3.y", "booPul_b4.y", "booPul_b5.y"}, range={9, 20, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 1385, 860}, y={"booPul_c1.y", "booPul_c2.y", "booPul_c3.y", "booPul_c4.y", "booPul_c5.y"}, range={9, 20, -0.5, 1.5}, grid=true, subPlot=103, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTable.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTable.mos
new file mode 100644
index 00000000000..6f46321316b
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTable.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTable", startTime=0, tolerance=1e-6, stopTime=15, method="Cvode", resultFile="TimeTable2");
+createPlot(id=1, subPlot=1, position={15, 10, 1936, 1264}, y={"booTimTab.y[1]", "booTimTab.y[2]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, colors={{0,0,255}, {0,140,72}});
+createPlot(id=1, subPlot=2, position={15, 10, 1936, 1264}, y={"booTimTabTwi.y[1]", "booTimTabTwi.y[2]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, colors={{0,0,255}, {0,140,72}});
+createPlot(id=1, subPlot=3, position={15, 10, 1936, 1264}, y={"booTimTabOneRow.y[1]", "booTimTabOneRow.y[2]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, colors={{0,0,255}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTableNegativeStartTime.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTableNegativeStartTime.mos
new file mode 100644
index 00000000000..824eccef11b
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Sources/Validation/TimeTableNegativeStartTime.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTableNegativeStartTime", startTime=-5, tolerance=1e-6, stopTime=10, method="Cvode", resultFile="TimeTableNegativeStartTime2");
+createPlot(id=1, subPlot=1, position={15, 10, 1936, 1264}, y={"booTimTab.y[1]", "booTimTab.y[2]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, colors={{0,0,255}, {0,140,72}});
+createPlot(id=1, subPlot=2, position={15, 10, 1936, 1264}, y={"booTimTabTwi.y[1]", "booTimTabTwi.y[2]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, colors={{0,0,255}, {0,140,72}});
+createPlot(id=1, subPlot=3, position={15, 10, 1936, 1264}, y={"booTimTabOneRow.y[1]", "booTimTabOneRow.y[2]"}, range={-1.6, 2.0, -0.5, 1.5}, grid=true, colors={{0,0,255}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Latch.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Latch.mos
index 7c6705d569e..40f74e7dc03 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Latch.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Latch.mos
@@ -1,8 +1,8 @@
 simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.Latch", stopTime=10.0, method="Cvode", tolerance=1e-06, resultFile="Latch1");
-createPlot(id=1, position={10, 10, 550, 800}, y={"falCle.u","falCle.clr","falCle.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
-createPlot(id=1, position={10, 10, 550, 800}, y={"truCle.u","truCle.clr","truCle.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
-createPlot(id=2, position={570, 10, 550, 800}, y={"iniFalOut.u","iniFalOut.clr","iniFalOut.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
-createPlot(id=2, position={570, 10, 550, 800}, y={"iniTruOut.u","iniTruOut.clr","iniTruOut.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=1, position={10, 10, 550, 800}, y={"falCleTruIni.u","falCleTruIni.clr","falCleTruIni.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=1, position={10, 10, 550, 800}, y={"falCleFalIni.u","falCleFalIni.clr","falCleFalIni.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=2, position={570, 10, 550, 800}, y={"truCleTruIni.u","truCleTruIni.clr","truCleTruIni.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=2, position={570, 10, 550, 800}, y={"truCleFalIni.u","truCleFalIni.clr","truCleFalIni.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
 createPlot(id=3, position={1130, 10, 550, 800}, y={"swiCleInp.u","swiCleInp.clr","swiCleInp.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
 createPlot(id=3, position={1130, 10, 550, 800}, y={"swiCleInp1.u","swiCleInp1.clr","swiCleInp1.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
 
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Timer.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Timer.mos
index 01ccf33f5dd..bbf563c541f 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Timer.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Timer.mos
@@ -1,15 +1,10 @@
 simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.Timer", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="Timer1");
-createPlot(id=1, position={15, 10, 450, 600}, subPlot=1, y={"resetTimer.u"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}});
-createPlot(id=1, position={15, 10, 450, 600}, subPlot=2, y={"resetTimer.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
-
-createPlot(id=2, position={480, 10, 450, 600}, subPlot=1, y={"accuTimer.u", "accuTimer.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
-createPlot(id=2, position={480, 10, 450, 600}, subPlot=2, y={"accuTimer.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
-
-createPlot(id=3, position={950, 10, 450, 600}, subPlot=1, y={"accuTimer1.u", "accuTimer1.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
-createPlot(id=3, position={950, 10, 450, 600}, subPlot=2, y={"accuTimer1.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
-
-createPlot(id=4, position={1415, 10, 450, 600}, subPlot=1, y={"accuTimer2.u", "accuTimer2.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
-createPlot(id=4, position={1415, 10, 450, 600}, subPlot=2, y={"accuTimer2.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
-
-createPlot(id=5, position={1880, 10, 450, 600}, subPlot=1, y={"accuTimer3.u", "accuTimer3.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
-createPlot(id=5, position={1880, 10, 450, 600}, subPlot=2, y={"accuTimer3.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={15, 15, 750, 1200}, y={"noThr.u"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={15, 15, 750, 1200}, y={"noThr.y", "noThr.t"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=1, position={15, 15, 750, 1200}, y={"noThr.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}});
+createPlot(id=2, position={775, 15, 750, 1200}, y={"thrTim.u"}, range={0.0, 5.0, -0.2, 1.2}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=2, position={775, 15, 750, 1200}, y={"thrTim.y", "thrTim.t"}, range={0.0, 5.0, -0.5, 2.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=2, position={775, 15, 750, 1200}, y={"thrTim.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}});
+createPlot(id=3, position={1535, 15, 750, 1200}, y={"thrTim1.u"}, range={0.0, 5.0, -0.2, 1.2}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=3, position={1535, 15, 750, 1200}, y={"thrTim1.y", "thrTim1.t"}, range={0.0, 5.0, -0.5, 2.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=3, position={1535, 15, 750, 1200}, y={"thrTim1.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulating.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulating.mos
new file mode 100644
index 00000000000..9cccda738e2
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulating.mos
@@ -0,0 +1,11 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulating", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="AccTim");
+createPlot(id=1, position={15, 15, 800, 1200}, y={"noThr.u"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={15, 15, 800, 1200}, y={"noThr.y"}, range={0.0, 5.0, -2.0, 4.0}, grid=true, subPlot=2, colors={{28,108,200}}, displayUnits={"s"});
+createPlot(id=1, position={15, 15, 800, 1200}, y={"thrTim.u", "thrTim.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 800, 1200}, y={"thrTim.y", "thrTim.t"}, range={0.0, 5.0, -2.0, 4.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"noThrWitRes.u", "noThrWitRes.reset"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}, {28,108,200}});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"noThrWitRes.y"}, range={0.0, 5.0, -1.0, 3.0}, grid=true, subPlot=2, colors={{28,108,200}}, displayUnits={"s"});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"thrTimWitRes.u", "thrTimWitRes.reset", "thrTimWitRes.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"thrTimWitRes.y", "thrTimWitRes.t"}, range={0.0, 5.0, -1.0, 3.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+
+
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulatingNegativeStartTime.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulatingNegativeStartTime.mos
new file mode 100644
index 00000000000..798fa9a5567
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerAccumulatingNegativeStartTime.mos
@@ -0,0 +1,13 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulatingNegativeStartTime", startTime=-10, stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="AccTimNegSta");
+createPlot(id=1, position={15, 15, 800, 1200}, y={"noThr.u"}, range={-10.0, 5.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={15, 15, 800, 1200}, y={"noThr.y", "noThr.t"}, range={-10.0, 5.0, -2.0, 6.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=1, position={15, 15, 800, 1200}, y={"thrTim.u", "thrTim.passed"}, range={-10.0, 5.0, -1.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}});
+createPlot(id=1, position={15, 15, 800, 1200}, y={"thrTim.y", "thrTim.t"}, range={-10.0, 5.0, -5.0, 10.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"noThrWitRes.u", "noThrWitRes.reset"}, range={-10.0, 5.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}, {28,108,200}});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"noThrWitRes.y", "noThrWitRes.t"}, range={-10.0, 5.0, -1.0, 3.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"thrTimWitRes.u", "thrTimWitRes.reset", "thrTimWitRes.passed"}, range={-10.0, 5.0, -1.0, 2.0}, grid=true, subPlot=3, colors={{28,108,200}, {28,108,200}, {28,108,200}});
+createPlot(id=2, position={825, 15, 800, 1200}, y={"thrTimWitRes.y", "thrTimWitRes.t"}, range={-10.0, 5.0, -2.0, 4.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+
+
+
+
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerNegativeStartTime.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerNegativeStartTime.mos
new file mode 100644
index 00000000000..fedcdec9198
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TimerNegativeStartTime.mos
@@ -0,0 +1,8 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.TimerNegativeStartTime", startTime=-10, stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="NegStaTim");
+
+createPlot(id=1, position={15, 15, 1000, 1200}, y={"noThr.u"}, range={-10.0, 5.0, -0.5, 1.5}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={15, 15, 1000, 1200}, y={"noThr.y", "noThr.t"}, range={-10.0, 5.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=1, position={15, 15, 1000, 1200}, y={"noThr.passed"}, range={-10.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}});
+createPlot(id=2, position={1025, 15, 1000, 1200}, y={"thrTim.u"}, range={-10.0, 5.0, -0.2, 1.2}, grid=true, subPlot=1, colors={{28,108,200}});
+createPlot(id=2, position={1025, 15, 1000, 1200}, y={"thrTim.y", "thrTim.t"}, range={-10.0, 5.0, -0.5, 2.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"s", "s"});
+createPlot(id=2, position={1025, 15, 1000, 1200}, y={"thrTim.passed"}, range={-10.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Toggle.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Toggle.mos
index 64d5bcbebd5..0c221702330 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Toggle.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/Toggle.mos
@@ -1,8 +1,7 @@
 simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.Toggle", stopTime=10.0, method="Cvode", tolerance=1e-06, resultFile="Toggle1");
-createPlot(id=1, position={10, 10, 550, 800}, y={"falCle.u","falCle.clr","falCle.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
-createPlot(id=1, position={10, 10, 550, 800}, y={"truCle.u","truCle.clr","truCle.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
-createPlot(id=2, position={570, 10, 550, 800}, y={"iniFalOut.u","iniFalOut.clr","iniFalOut.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
-createPlot(id=2, position={570, 10, 550, 800}, y={"iniTruOut.u","iniTruOut.clr","iniTruOut.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=1, position={10, 10, 550, 800}, y={"falCleTruIni.u","falCleTruIni.clr","falCleTruIni.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=1, position={10, 10, 550, 800}, y={"falCleFalIni.u","falCleFalIni.clr","falCleFalIni.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=2, position={570, 10, 550, 800}, y={"truCleTruIni.u","truCleTruIni.clr","truCleTruIni.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
+createPlot(id=2, position={570, 10, 550, 800}, y={"truCleFalIni.u","truCleFalIni.clr","truCleFalIni.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
 createPlot(id=3, position={1130, 10, 550, 800}, y={"swiCleInp.u","swiCleInp.clr","swiCleInp.y"}, subPlot=1, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
 createPlot(id=3, position={1130, 10, 550, 800}, y={"swiCleInp1.u","swiCleInp1.clr","swiCleInp1.y"}, subPlot=2, range={0.0, 10.0, -3.5, 3.5}, grid=true, autoscale=false, colors={{238,46,47},{238,46,47},{238,46,47}});
-
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mos
new file mode 100644
index 00000000000..6b82f0684a3
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Controls.OBC.CDL.Psychrometrics.Validation.DewPoint_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="DewPoint_TDryBulPhi1");
+createPlot(id=1, position={15, 10, 590, 700}, subPlot=1, y={"dewBulPhi.TDewPoi","TDewPoi.T"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{28,108,200}});
+createPlot(id=1, position={15, 10, 590, 700}, subPlot=2, y={"dewBulPhi1.TDewPoi","TDewPoi1.T"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{28,108,200}});
+createPlot(id=2, position={620, 10, 590, 700}, subPlot=1, y={"add.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+createPlot(id=2, position={620, 10, 590, 700}, subPlot=2, y={"add1.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/SpecificEnthalpy_TDryBulPhi.mos
similarity index 73%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos
rename to Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/SpecificEnthalpy_TDryBulPhi.mos
index 8ddc6185b0a..073078de817 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/SpecificEnthalpy_TDryBulPhi.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="h_TDryBulPhi1");
+simulateModel("Buildings.Controls.OBC.CDL.Psychrometrics.Validation.SpecificEnthalpy_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="SpecificEnthalpy_TDryBulPhi1");
 createPlot(id=1, position={15, 10, 1000, 700}, subPlot=1, y={"hBulPhi.h"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 1000, 700}, subPlot=2, y={"phi.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mos
new file mode 100644
index 00000000000..c83e1094e62
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Controls.OBC.CDL.Psychrometrics.Validation.WetBulb_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="WetBulb_TDryBulPhi1");
+createPlot(id=1, position={15, 10, 650, 600}, subPlot=1, y={"wetBulPhi.TWetBul","wetBulPhi_BuiLib.TWetBul"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{217,67,180}});
+createPlot(id=1, position={15, 10, 650, 600}, subPlot=2, y={"add.y","phi.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{217,67,180}});
+createPlot(id=2, position={680, 10, 650, 600}, subPlot=1, y={"wetBulPhi.TWetBul","wetBulXi.TWetBul"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{217,67,180}});
+createPlot(id=2, position={680, 10, 650, 600}, subPlot=2, y={"add1.y","phi.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/SetPoints/Examples/Table.mos b/Buildings/Resources/Scripts/Dymola/Controls/SetPoints/Examples/Table.mos
index 1240c730a56..2b57cd04950 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/SetPoints/Examples/Table.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/SetPoints/Examples/Table.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.SetPoints.Examples.Table", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="Table");
+simulateModel("Buildings.Controls.SetPoints.Examples.Table", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Table");
 createPlot(id = 1,
  position = {35, 30, 400, 280},
  x = "TRoo.y",
diff --git a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_6_to_7.0.0.mos b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_6_to_7.0.0.mos
index 4abd0908ba6..7c3291aad0f 100644
--- a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_6_to_7.0.0.mos
+++ b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_6_to_7.0.0.mos
@@ -4,6 +4,14 @@
 clear
 
 convertClear();
+convertModifiers("Buildings.Airflow.Multizone.BaseClasses.PowerLawResistance", {"m_flow_small"}, fill("",0), true);
+convertModifiers("Buildings.Airflow.Multizone.BaseClasses.TwoWayFlowElement", {"m1_flow_small", "m2_flow_small"}, fill("",0), true);
+convertModifiers("Buildings.Airflow.Multizone.EffectiveAirLeakageArea", {"m_flow_small"}, fill("",0), true);
+convertModifiers("Buildings.Airflow.Multizone.Orifice", {"m_flow_small"}, fill("",0), true);
+convertModifiers("Buildings.Airflow.Multizone.DoorDiscretizedOpen", {"m1_flow_small", "m2_flow_small"}, fill("",0), true);
+convertModifiers("Buildings.Airflow.Multizone.DoorDiscretizedOperable", {"m1_flow_small", "m2_flow_small"}, fill("",0), true);
+convertModifiers("Buildings.Airflow.Multizone.ZonalFlow_ACS", {"m1_flow_small", "m2_flow_small"}, fill("",0), true);
+convertModifiers("Buildings.Airflow.Multizone.ZonalFlow_m_flow", {"m1_flow_small", "m2_flow_small"}, fill("",0), true);
 
 convertModifiers("Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset", {"initType"}, fill("",0), true);
 convertModifiers("Buildings.Controls.OBC.CDL.Continuous.Derivative", {"initType"}, fill("",0), true);
@@ -15,6 +23,10 @@ convertClass("Buildings.Controls.OBC.CDL.SetPoints.HotWaterTemperatureReset",
              "Buildings.Controls.OBC.CDL.SetPoints.SupplyReturnTemperatureReset");
 convertClass("Buildings.Controls.SetPoints.HotWaterTemperatureReset",
              "Buildings.Controls.SetPoints.SupplyReturnTemperatureReset");
+convertClass("Buildings.Utilities.IO.Python27",
+             "Buildings.Obsolete.Utilities.IO.Python27");
+
+convertModifiers("Buildings.Controls.OBC.CDL.Continuous.LimPID", {"yMin=fill(\"\",0)", "yMax=yMax"}, {"yMin=-%yMax%", "yMax=%yMax%"}, true);
 
 convertModifiers("Buildings.Controls.OBC.CDL.Continuous.LimPID", {"strict"}, fill("",0), true);
 convertModifiers("Buildings.Controls.OBC.CDL.Continuous.LimPID", {"initType"}, fill("",0), true);
@@ -78,43 +90,31 @@ convertElement(
     "Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007WithWindow",
     "alphaWinOut",
     "hConWinOut");
+convertElement(
+    "Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.SystemRequests",
+    "uDam",
+    "yDam_actual");
 
 // Refactoring damper models.
 convertElement(
-    {"Buildings.Fluid.Actuators.Dampers.PressureIndependent",
-    "Fluid.Actuators.Dampers.PressureIndependent",
-    "Actuators.Dampers.PressureIndependent",
-    "Dampers.PressureIndependent",
-    "PressureIndependent"},
+    "Buildings.Fluid.Actuators.Dampers.PressureIndependent",
     "dp_nominal",
     "dpDamper_nominal");
 convertModifiers(
-    {"Buildings.Fluid.Actuators.Dampers.Exponential",
-    "Fluid.Actuators.Dampers.Exponential",
-    "Actuators.Dampers.Exponential",
-    "Dampers.Exponential",
-    "Exponential"},
+    "Buildings.Fluid.Actuators.Dampers.Exponential",
     {"k1=0.45", "v_nominal=1"},
     {"k1=%k1%",
     "dpDamper_nominal=%k1% * 1.2 * %v_nominal%^2 / 2"},
     true);
 convertModifiers(
-    {"Buildings.Fluid.Actuators.Dampers.VAVBoxExponential",
-    "Fluid.Actuators.Dampers.VAVBoxExponential",
-    "Actuators.Dampers.VAVBoxExponential",
-    "Dampers.VAVBoxExponential",
-    "VAVBoxExponential"},
+    "Buildings.Fluid.Actuators.Dampers.VAVBoxExponential",
     {"dp_nominal", "k1=0.45", "v_nominal=1", "dp_nominalIncludesDamper=true"},
     {"k1=%k1%",
     "dpDamper_nominal=%k1% * 1.2 * %v_nominal%^2 / 2",
     "dpFixed_nominal=if %dp_nominalIncludesDamper% then %dp_nominal% - %k1% * 1.2 * %v_nominal%^2 / 2 else %dp_nominal%"},
     true);
 convertModifiers(
-    {"Buildings.Fluid.Actuators.Dampers.MixingBox",
-    "Fluid.Actuators.Dampers.MixingBox",
-    "Actuators.Dampers.MixingBox",
-    "Dampers.MixingBox",
-    "MixingBox"},
+    "Buildings.Fluid.Actuators.Dampers.MixingBox",
     {"dpOut_nominal", "dpRec_nominal", "dpExh_nominal", "k1=0.45", "v_nominal=1", "dp_nominalIncludesDamper=false"},
     {"k1=%k1%",
     "dpDamOut_nominal=%k1% * 1.2 * %v_nominal%^2 / 2",
@@ -125,11 +125,7 @@ convertModifiers(
     "dpFixExh_nominal=if %dp_nominalIncludesDamper% then %dpExh_nominal% - %k1% * 1.2 * %v_nominal%^2 / 2 else %dpExh_nominal%"},
     true);
 convertModifiers(
-    {"Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow",
-    "Fluid.Actuators.Dampers.MixingBoxMinimumFlow",
-    "Actuators.Dampers.MixingBoxMinimumFlow",
-    "Dampers.MixingBoxMinimumFlow",
-    "MixingBoxMinimumFlow"},
+    "Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow",
     {"dpOut_nominal", "dpRec_nominal", "dpExh_nominal", "dpOutMin_nominal", "k1=0.45", "v_nominal=1", "dp_nominalIncludesDamper=false"},
     {"k1=%k1%",
     "dpDamOut_nominal=%k1% * 1.2 * %v_nominal%^2 / 2",
@@ -137,14 +133,10 @@ convertModifiers(
     "dpDamRec_nominal=%k1% * 1.2 * %v_nominal%^2 / 2",
     "dpFixRec_nominal=if %dp_nominalIncludesDamper% then %dpRec_nominal% - %k1% * 1.2 * %v_nominal%^2 / 2 else %dpRec_nominal%",
     "dpDamExh_nominal=%k1% * 1.2 * %v_nominal%^2 / 2",
-    "dpFixExh_nominal=if %dp_nominalIncludesDamper% then %dpExh_nominal% - %k1% * 1.2 * %v_nominal%^2 / 2 else %dpExh_nominal%"},
+    "dpFixExh_nominal=if %dp_nominalIncludesDamper% then %dpExh_nominal% - %k1% * 1.2 * %v_nominal%^2 / 2 else %dpExh_nominal%",
     "dpDamOutMin_nominal=%k1% * 1.2 * %v_nominal%^2 / 2",
     "dpFixOutMin_nominal=if %dp_nominalIncludesDamper% then %dpOutMin_nominal% - %k1% * 1.2 * %v_nominal%^2 / 2 else %dpOutMin_nominal%"},
     true);
 convertClass(
-    {"Buildings.Fluid.Actuators.Dampers.VAVBoxExponential",
-    "Fluid.Actuators.Dampers.VAVBoxExponential",
-    "Actuators.Dampers.VAVBoxExponential",
-    "Dampers.VAVBoxExponential",
-    "VAVBoxExponential"},
-    "Buildings.Fluid.Actuators.Dampers.Exponential");
\ No newline at end of file
+    "Buildings.Fluid.Actuators.Dampers.VAVBoxExponential",
+    "Buildings.Fluid.Actuators.Dampers.Exponential");
diff --git a/Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_low.mos b/Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_low.mos
new file mode 100644
index 00000000000..cabd494b354
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_low.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Electrical.Transmission.Functions.Validation.SelectCable_low", stopTime=1, method="Cvode", tolerance=1e-6, resultFile="SelectCable_low");
+createPlot(id=2, position={55, 55, 1034, 602}, y={"cab[1].Amp", "cab[2].Amp", "cab[3].Amp", "cab[4].Amp", "cab[5].Amp", "cab[6].Amp", "cab[7].Amp"}, range={0.0, 1.0, 40.0, 260.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, displayUnits={"A", "A", "A", "A", "A", "A", "A"});
diff --git a/Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_med.mos b/Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_med.mos
new file mode 100644
index 00000000000..138fb314f86
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Electrical/Transmission/Functions/Validation/SelectCable_med.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Electrical.Transmission.Functions.Validation.SelectCable_med", stopTime=1, method="Cvode", tolerance=1e-6, resultFile="SelectCable_med");
+createPlot(id=2, position={55, 55, 1034, 602}, y={"cab[1].Amp", "cab[2].Amp", "cab[3].Amp", "cab[4].Amp", "cab[5].Amp", "cab[6].Amp", "cab[7].Amp"}, range={0.0, 1.0, 40.0, 260.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, displayUnits={"A", "A", "A", "A", "A", "A", "A"});
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSwitch.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/KMinusU.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/LinearPiecewiseTwo.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/RequestCounter.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/TrimAndRespond.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/WSEControl.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/BaseClasses/Controls/Examples/WSEControl.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/DataCenterDiscreteTimeControl.mos b/Buildings/Resources/Scripts/Dymola/Examples/ChillerPlant/DataCenterDiscreteTimeControl.mos
old mode 100755
new mode 100644
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Controls/Examples/RoomVAV.mos b/Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Controls/Examples/RoomVAV.mos
new file mode 100644
index 00000000000..d8aa6a267b7
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Controls/Examples/RoomVAV.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Examples.VAVReheat.Controls.Examples.RoomVAV", stopTime=3600, method="CVode", tolerance=1e-6, resultFile="roomVAVCon");
+createPlot(id=1, position={10, 10, 1500, 1000}, y={"vavBoxCon.TRooHeaSet", "vavBoxCon.TRooCooSet", "vavBoxCon.TRoo"}, range={0.0, 3600.0, 18.0, 24.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, displayUnits={"degC", "degC", "degC"});
+createPlot(id=1, position={10, 10, 1500, 1000}, y={"vavBoxCon.conHea.y", "vavBoxCon.conCoo.y"}, range={0.0, 3600.0, -0.2, 0.6}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={10, 10, 1500, 1000}, y={"vavBoxCon.yDam", "vavBoxCon.yVal"}, range={0.0, 3600.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
+
diff --git a/Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Guideline36.mos b/Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Guideline36.mos
index 57598d03cc3..cc7d27de4e5 100644
--- a/Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Guideline36.mos
+++ b/Buildings/Resources/Scripts/Dymola/Examples/VAVReheat/Guideline36.mos
@@ -1,5 +1,5 @@
 simulateModel("Buildings.Examples.VAVReheat.Guideline36", stopTime=172800, method="cvode", tolerance=1e-06, resultFile="Guideline36");
-createPlot(id = 3,
+createPlot(id = 1,
  position = {26, 33, 808, 649},
  y = {"flo.sou.air.vol.T", "flo.eas.air.vol.T", "flo.nor.air.vol.T", "flo.wes.air.vol.T", "flo.cor.air.vol.T"},
  range = {0.0, 180000.0, 21.0, 17.0},
@@ -8,42 +8,34 @@ createPlot(id = 3,
  autoreplot = true,
  grid = true,
  color = true,
+ subPlot = 1,
  filename = "Guideline36.mat",
  leftTitleType = 1,
  bottomTitleType = 1);
-<<<<<<< HEAD
-createPlot(id = 3,
- position = {26, 33, 808, 212},
- y = {"sou.vav.m_flow", "eas.vav.m_flow", "nor.vav.m_flow", "wes.vav.m_flow", "cor.vav.m_flow_turbulent"},
- range = {0.0, 180000.0, 1.5, -0.5},
-=======
 createPlot(id = 1,
  position = {26, 33, 808, 213},
  y = {"sou.TSup", "eas.TSup", "nor.TSup", "wes.TSup", "cor.TSup"},
  range = {0.0, 180000.0, 35.0, 10.0},
->>>>>>> master
  autoscale = true,
  autoerase = true,
  autoreplot = true,
  grid = true,
  color = true,
- subPlot = 3,
+ subPlot = 2,
  leftTitleType = 1,
  bottomTitleType = 1);
-createPlot(id = 3,
- position = {26, 33, 808, 213},
- y = {"TSupSou.T", "TSupEas.T", "TSupNor.T", "TSupWes.T", "TSupCor.T"},
- range = {0.0, 180000.0, 35.0, 10.0},
+createPlot(id = 1,
+ position = {26, 33, 808, 212},
+ y = {"sou.vav.m_flow", "eas.vav.m_flow", "nor.vav.m_flow", "wes.vav.m_flow", "cor.vav.m_flow_turbulent"},
+ range = {0.0, 180000.0, 1.5, -0.5},
  autoscale = true,
  autoerase = true,
  autoreplot = true,
  grid = true,
  color = true,
- subPlot = 2,
+ subPlot = 3,
  leftTitleType = 1,
  bottomTitleType = 1);
-<<<<<<< HEAD
-=======
 createPlot(
     id=2,
     position={851, 35, 588, 648},
@@ -62,4 +54,3 @@ createPlot(
     grid=true,
     color=true,
     subPlot=2);
->>>>>>> master
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/BaseClasses/Examples/EqualPercentageDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/BaseClasses/Examples/EqualPercentageDerivativeCheck.mos
index fbf4ff4f21f..27c1a11d1d1 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/BaseClasses/Examples/EqualPercentageDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/BaseClasses/Examples/EqualPercentageDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.BaseClasses.Examples.EqualPercentageDerivativeCheck", startTime=0, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="EqualPercentageDerivativeCheck");
+simulateModel("Buildings.Fluid.Actuators.BaseClasses.Examples.EqualPercentageDerivativeCheck", startTime=0, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="EqualPercentageDerivativeCheck");
 removePlots();
 createPlot(id = 5,
  position = {45, 33, 639, 463},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/Damper.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/Damper.mos
index 66a5c3351b7..58b47ca565c 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/Damper.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/Damper.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Dampers.Examples.Damper", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="Damper");
+simulateModel("Buildings.Fluid.Actuators.Dampers.Examples.Damper", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Damper");
 createPlot(id = 4,
  position = {73, 9, 598, 390},
  x = "res.y",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/MixingBox.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/MixingBox.mos
index 624563828a9..8d7404475b5 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/MixingBox.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/MixingBox.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Dampers.Examples.MixingBox", tolerance=1e-6, stopTime=240, method="dassl", resultFile="MixingBox");
+simulateModel("Buildings.Fluid.Actuators.Dampers.Examples.MixingBox", tolerance=1e-6, stopTime=240, method="CVode", resultFile="MixingBox");
 createPlot(id = 5,
  position = {15, 10, 879, 525},
  y = {"mixBox.damOA.m_flow", "mixBox.damExh.m_flow", "mixBox.damRec.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/VAVBoxExponential.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/VAVBoxExponential.mos
index 3835f8b15a9..13e5923e6a5 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/VAVBoxExponential.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Examples/VAVBoxExponential.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Dampers.Examples.VAVBoxExponential", method="dassl", tolerance=1e-6, stopTime=240, resultFile="VAVBoxExponential");
+simulateModel("Buildings.Fluid.Actuators.Dampers.Examples.VAVBoxExponential", method="CVode", tolerance=1e-6, stopTime=240, resultFile="VAVBoxExponential");
 createPlot(id = 11,
  position = {15, 10, 924, 583},
  y = {"dam.m_flow", "vav.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Validation/PressureIndependent.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Validation/PressureIndependent.mos
new file mode 100644
index 00000000000..8c9b7564682
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Dampers/Validation/PressureIndependent.mos
@@ -0,0 +1,22 @@
+simulateModel("Buildings.Fluid.Actuators.Dampers.Validation.PressureIndependent",
+    method="cvode", tolerance=1e-6, stopTime=1.0, resultFile="PressureIndependent");
+createPlot(id = 1,
+ position = {73, 9, 598, 390},
+ y = {"damPreInd.m_flow", "damExp.m_flow", "damExpPI.m_flow"},
+ range = {0.15, 0.6, 11.0, 7.0},
+ autoscale = true,
+ autoerase = true,
+ autoreplot = true,
+ grid = true,
+ color = true);
+createPlot(id=1, y={"damPreInd.y", "damPreInd.y_actual"},
+ position={73, 9, 598, 390},
+ autoscale = true,
+ autoerase = true,
+ autoreplot = true,
+ grid = true,
+ color = true,
+ subPlot=2);
+plotExpression(apply(PressureIndependent.senRelPre.p_rel/PressureIndependent.dp_nominal),
+    false, "senRelPre.p_rel / dp_nominal", 1);
+
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Motors/Examples/IdealMotor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Motors/Examples/IdealMotor.mos
index b83af554190..731bbb3f4ef 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Motors/Examples/IdealMotor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Motors/Examples/IdealMotor.mos
@@ -1,6 +1,6 @@
 temStoPro := Advanced.StoreProtectedVariables;
 Advanced.StoreProtectedVariables:=true;
-simulateModel("Buildings.Fluid.Actuators.Motors.Examples.IdealMotor", tolerance=1e-6, stopTime=600, method="dassl", resultFile="IdealMotor");
+simulateModel("Buildings.Fluid.Actuators.Motors.Examples.IdealMotor", tolerance=1e-6, stopTime=600, method="CVode", resultFile="IdealMotor");
 createPlot(id = 1,
  position = {2, 3, 1025, 654},
  y = {"mot.y", "mot.uppHys.y", "mot.delta", "ySet.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos
index 9fb559f99d8..ac1a08121fd 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValvePressureIndependent", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValvePressureIndependent");
+simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValvePressureIndependent", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValvePressureIndependent");
 removePlots();
 createPlot(id=1,
 y={"valInd.m_flow", "valIndDpFix.m_flow", "valIndFromMflow.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mos
index 5099c1f8d25..94f241a8058 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValveTable", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValveTable");
+simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValveTable", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValveTable");
 createPlot(
 id=1,
 position={35, 30, 407, 281},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValves.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValves.mos
index b31b1367215..2f57b2569ae 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValves.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValves.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValves", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValves");
+simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValves", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValves");
 removePlots();
 createPlot(id = 3,
  position = {55, 50, 697, 502},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mos
index 9626110fd03..ee97f111541 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValvesMotor", startTime=0, tolerance=1e-6, stopTime=600, method="dassl", resultFile="TwoWayValvesMotor");
+simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValvesMotor", startTime=0, tolerance=1e-6, stopTime=600, method="CVode", resultFile="TwoWayValvesMotor");
 createPlot(id = 3,
  position = {55, 50, 697, 502},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mos
index 445f945ab04..14a6a2935eb 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValvesTable", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValvesTable");
+simulateModel("Buildings.Fluid.Actuators.Valves.Examples.TwoWayValvesTable", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValvesTable");
 createPlot(id=1,
 position={35, 30, 407, 281},
 x="y.y",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
index cbefbd67867..24458068d55 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization", method="dassl", tolerance=1e-06, resultFile="ThreeWayValveParameterization");
+simulateModel("Buildings.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization", method="CVode", tolerance=1e-06, resultFile="ThreeWayValveParameterization");
 createPlot(id=1, position={37, 30, 958, 513}, y={"senM_flowOpPoi.m_flow", "senM_flowKv.m_flow", "senM_flowCv.m_flow", "senM_flowAv.m_flow"}, range={0.0, 1.0, 0.18, 0.44}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
index 5ff5eab536d..b8251a347a6 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValveParameterization");
+simulateModel("Buildings.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValveParameterization");
 createPlot(id=1, position={15, 10, 873, 609}, y={"valOPPoi.m_flow", "valKv.m_flow", "valCv.m_flow", "valAv.m_flow"}, range={0.0, 1.0, -0.05, 0.45}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mos
index cc12d793783..1a726c97621 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_dp_DerivativeCheck", method="dassl", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_dp_DerivativeCheck");
+simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_dp_DerivativeCheck", method="CVode", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_dp_DerivativeCheck");
 createPlot(id=1, position={35, 30, 592, 300},
 y={"m_flow", "m_flow_comp"},
 range={-2.0, 2.0, -0.001, 0.001}, grid=true, filename="BasicFlowFunction_dp_DerivativeCheck.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mos
index 8e561cae643..322f1920fbc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_dp_DerivativeCheck2", method="dassl", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_dp_DerivativeCheck2");
+simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_dp_DerivativeCheck2", method="CVode", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_dp_DerivativeCheck2");
 createPlot(id=1, position={35, 30, 592, 421},
 y={"m_flow", "m_flow_comp", "m_flow_turbulent"},
 range={-2.0, 2.0, -1.0, 1.0}, grid=true, filename="BasicFlowFunction_dp_DerivativeCheck2.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mos
index 84abd996d24..01525d61f01 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_m_flow_DerivativeCheck", method="dassl", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_m_flow_DerivativeCheck");
+simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_m_flow_DerivativeCheck", method="CVode", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_m_flow_DerivativeCheck");
 createPlot(id=1, position={35, 30, 592, 300},
 y={"dp", "dp_comp"},
 range={-2.0, 2.0, -0.001, 0.001}, grid=true, filename="BasicFlowFunction_m_flow_DerivativeCheck.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mos
index 8f004f20c6d..c8d27c5b548 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_m_flow_DerivativeCheck2", method="dassl", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_m_flow_DerivativeCheck2");
+simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.BasicFlowFunction_m_flow_DerivativeCheck2", method="CVode", startTime=-2, stopTime=2, tolerance=1e-8, resultFile="BasicFlowFunction_m_flow_DerivativeCheck2");
 createPlot(id=1, position={35, 30, 592, 421},
 y={"dp", "dp_comp"},
 range={-2.0, 2.0, -1.0, 1.0}, grid=true, filename="BasicFlowFunction_m_flow_DerivativeCheck2.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mos
index 535f85faa11..4964ea0b80f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.InverseFlowFunctions", stopTime=1, method="dassl", resultFile="InverseFlowFunctions", tolerance=1e-06);
+simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.InverseFlowFunctions", stopTime=1, method="CVode", resultFile="InverseFlowFunctions", tolerance=1e-06);
 removePlots();
 createPlot(id = 1,
  position = {55, 50, 573, 663},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mos
index 0a2dfda2289..95c62329e87 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.InvertingBasicFlowFunction_dp", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="InvertingBasicFlowFunction_dp");
+simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.InvertingBasicFlowFunction_dp", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InvertingBasicFlowFunction_dp");
 createPlot(id=1, position={55, 50, 592, 616},
 y={"m_flow", "m_flow_nominal"},
 range={0.0, 1.0, -0.8, 0.8}, grid=true, filename="InvertingBasicFlowFunction_dp.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mos
index 9b723fd83d9..2ce9e3f2bc3 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.InvertingBasicFlowFunction_m_flow", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="InvertingBasicFlowFunction_m_flow");
+simulateModel("Buildings.Fluid.BaseClasses.FlowModels.Validation.InvertingBasicFlowFunction_m_flow", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InvertingBasicFlowFunction_m_flow");
 createPlot(id=1, position={55, 50, 592, 616},
 y={"m_flow", "m_flow_nominal"},
 range={0.0, 1.0, -0.8, 0.8}, grid=true, filename="InvertingBasicFlowFunction_m_flow.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos
index 031ad6f5f4e..77e4d152948 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.BaseClasses.Validation.MassFlowRateMultiplier", startTime=0, stopTime=10.0, tolerance=1E-6, method="dassl", resultFile="MassFlowRateMultiplier");
+simulateModel("Buildings.Fluid.BaseClasses.Validation.MassFlowRateMultiplier", startTime=0, stopTime=10.0, tolerance=1E-6, method="CVode", resultFile="MassFlowRateMultiplier");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "time",
-  y    = {"ram_m_flow.y", "massFlowRateMultiplier.port_a.m_flow", "massFlowRateMultiplier.port_b.m_flow"}, 
+  y    = {"ram_m_flow.y", "massFlowRateMultiplier.port_a.m_flow", "massFlowRateMultiplier.port_b.m_flow"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="MassFlowRateMultiplier.mat", 
+  filename="MassFlowRateMultiplier.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mos
new file mode 100644
index 00000000000..06fe8d40abd
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertFuelFlow.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.AssertFuelFlow",
+    method="cvode", stopTime=1200, tolerance=1e-06, resultFile="AssertFuelFlow");
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=1, y={"assFue.assMes.u"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=2, y={"assFue.mFue_flow"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertPower.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertPower.mos
new file mode 100644
index 00000000000..396c39022f1
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertPower.mos
@@ -0,0 +1,6 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.AssertPower",
+    method="cvode", stopTime=1800, tolerance=1e-06, resultFile="AssertPower");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"per.PEleMax","per.PEleMin","assPow.PEleDem"}, grid=true, colors={{28,108,200},{238,46,47},{0,140,72}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"assPow.assMesP.u"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"assPow.assMesDP.u"}, grid=true, colors={{28,108,200}});
+
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mos
new file mode 100644
index 00000000000..92da1732b5a
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterFlow.mos
@@ -0,0 +1,6 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterFlow",
+    method="cvode", stopTime=900, tolerance=1e-06, resultFile="AssertWaterFlow");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"assWatMas.mWat_flow", "per.mWatMin_flow"},
+    grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"runSig.y"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"assWatMas.assMes.u"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mos
new file mode 100644
index 00000000000..4be8be6581e
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/AssertWaterTemperature.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterTemperature",
+    method="cvode", stopTime=900, tolerance=1e-06, resultFile="AssertWaterTemperature");
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=1, y={"TWat.y[1]", "per.TWatMax"}, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=2, y={"assWatTem.assMes.u"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/Controller.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/Controller.mos
new file mode 100644
index 00000000000..b13fd879620
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/Controller.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.Controller", method="cvode", stopTime=3000, tolerance=1e-06, resultFile="chpCon");
+createPlot(id=1, position={20, 20, 1500, 1200}, subPlot=1, y={"con.runSig","con.avaSig"}, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 1500, 1200}, subPlot=2, y={"con.mWat_flow"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 1500, 1200}, subPlot=3, y={"con.opeMod"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/CoolDown.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/CoolDown.mos
new file mode 100644
index 00000000000..12e1b1cd201
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/CoolDown.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.CoolDown", method="cvode", stopTime=900, tolerance=1e-06, resultFile="cooDow");
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=1, y={"actMod"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=2, y={"runSig.y"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=3, y={"cooDowOpt.y"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mos
new file mode 100644
index 00000000000..b631874d45e
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversion.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversion", method="cvode", stopTime=3000, tolerance=1e-06, resultFile="EnergyConversion");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"con.opeMod"}, grid=true);
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"eneConEngTem.mFue_flow", "eneConTimDel.mFue_flow"}, grid=true);
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"eneConEngTem.QGen_flow", "eneConTimDel.QGen_flow"}, grid=true);
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=4, y={"eneConEngTem.PEleNet", "eneConTimDel.PEleNet", "PEle.y"}, grid=true);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mos
new file mode 100644
index 00000000000..1c0cbe17866
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionNormal.mos
@@ -0,0 +1,7 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionNormal",
+    method="cvode", stopTime=1500, tolerance=1e-06, resultFile="EnergyConversionNormal");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"opeModBas.PEle","opeModBas.QGen_flow"}, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"opeModBas.mWat_flow"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"opeModBas.TWatIn"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=4, y={"opeModBas.mAir_flow","opeModBas.mFue_flow"}, grid=true, colors={{28,108,200},{238,46,47}});
+
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mos
new file mode 100644
index 00000000000..9f5031390ee
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EnergyConversionWarmUp.mos
@@ -0,0 +1,7 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionWarmUp",
+    method="cvode", stopTime=1500, tolerance=1e-06, resultFile="EnergyConversionWarmUp");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"opeModWarUpEngTem.PEleNet"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"opeModWarUpEngTem.TWatIn", "opeModWarUpEngTem.TRoo","opeModWarUpEngTem.TEng"}, grid=true, colors={{28,108,200},{238,46,47},{0,140,72}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"opeModWarUpEngTem.PEleNet", "opeModWarUpEngTem.QGen_flow"}, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=4, y={"opeModWarUpEngTem.mFue_flow", "opeModWarUpEngTem.mAir_flow"}, grid=true, colors={{28,108,200},{238,46,47}});
+
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mos
new file mode 100644
index 00000000000..451d4c41b95
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/EngineTemperature.mos
@@ -0,0 +1,6 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.EngineTemperature",
+    method="cvode", stopTime=1500, tolerance=1e-06, resultFile="EngineTemperature");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"eng.TRoo.T", "eng.TWat.T"}, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"eng.QGen_flow"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"per.capEng"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=4, y={"eng.TEng"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/FilterPower.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/FilterPower.mos
new file mode 100644
index 00000000000..db8388b67f4
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/FilterPower.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.FilterPower", method="cvode", stopTime=1800, tolerance=1e-06, resultFile="filPow");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"filPow.PEleDem","filPow.PEle"}, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"filPow.assPow.assMesP.u"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"filPow.assPow.assMesDP.u"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mos
new file mode 100644
index 00000000000..640ad3b29d9
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/PowerConsumption.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.PowerConsumption", method="cvode", stopTime=3000, tolerance=1e-06, resultFile="powCon");
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=1, y={"con.opeMod"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 800}, subPlot=2, y={"powCon.PCon"}, grid=true, colors={{28,108,200}});
+
+ 
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/StandBy.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/StandBy.mos
new file mode 100644
index 00000000000..b79d716de9e
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/StandBy.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.StandBy", method="cvode", stopTime=1500, tolerance=1e-06, resultFile="staBy");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"transition1.condition"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"transition2.condition"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"actMod"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mos
new file mode 100644
index 00000000000..fb1fa206f7a
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTemperature.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTemperature",
+    method="cvode", stopTime=900, tolerance=1e-06, resultFile="WarmUpTemperature");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"transition1.condition","transition2.condition","transition3.condition"}, grid=true, colors={{28,108,200},{238,46,47},{0,142,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"TEng.y","per.TEngNom"}, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"actMod"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mos
new file mode 100644
index 00000000000..3325b0b0b4a
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WarmUpTimeDelay.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTimeDelay",
+    method="cvode", stopTime=900, tolerance=1e-06, resultFile="WarmUpTimeDelay");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"transition1.condition","transition2.condition","transition3.condition"}, grid=true, colors={{28,108,200},{238,46,47},{0,142,47}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"per.timeDelayStart"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"actMod"}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mos
new file mode 100644
index 00000000000..b0205606f8a
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/BaseClasses/Validation/WaterFlowControl.mos
@@ -0,0 +1,8 @@
+simulateModel("Buildings.Fluid.CHPs.BaseClasses.Validation.WaterFlowControl",
+    method="cvode", stopTime=3000, tolerance=1e-06, resultFile="WaterFlowControl");
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=1, y={"conWat.opeMod"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=2, y={"conWat.PEle"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=3, y={"conWat.TWatIn"}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={20, 20, 900, 1200}, subPlot=4, y={"conWat.mWatSet_flow"}, grid=true, colors={{28,108,200}});
+
+
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ElectricalFollowing.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ElectricalFollowing.mos
new file mode 100644
index 00000000000..53212a2f3b6
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ElectricalFollowing.mos
@@ -0,0 +1,18 @@
+simulateModel("Buildings.Fluid.CHPs.Validation.ElectricalFollowing",
+    method="dassl", stopTime=10000, tolerance=1e-06, resultFile="ElectricalFollowing");
+createPlot(id=1, position={20, 20, 600, 1000}, y={"EEle.y", "EEleVal.y", "EThe.y", "ETheVal.y"},
+    subPlot=1, grid=true);
+createPlot(id=1, position={20, 20, 600, 1000}, y={"eleFol.PEleNet", "PEleNetVal.y"},
+    subPlot=2, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=1, position={20, 20, 600, 1000}, y={"eleFol.eneCon.QGen_flow", "QGenVal_flow.y"},
+    subPlot=3, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=2, position={640, 20, 600, 1000}, y={"eleFol.QWat_flow", "QWatVal_flow.y"},
+    subPlot=1, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=2, position={640, 20, 600, 1000}, y={"eleFol.QLos.Q_flow", "QLosVal_flow.y"},
+    subPlot=2, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=2, position={640, 20, 600, 1000}, y={"eleFol.opeMod.opeMod"},
+    subPlot=3, grid=true, colors={{28,108,200}});
+createPlot(id=3, position={1260, 20, 600, 1000}, y={"eleFol.TWatOut.T", "TWatOutVal.y"},
+    subPlot=1, grid=true, colors={{28,108,200},{238,46,47}});
+createPlot(id=3, position={1260, 20, 600, 1000}, y={"eleFol.eng.TEng", "TEngVal.y"},
+    subPlot=2, grid=true, colors={{28,108,200},{238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ThermalFollowing.mos b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ThermalFollowing.mos
new file mode 100644
index 00000000000..0a15eed52a0
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/CHPs/Validation/ThermalFollowing.mos
@@ -0,0 +1,18 @@
+simulateModel("Buildings.Fluid.CHPs.Validation.ThermalFollowing",
+    method="dassl", stopTime=10000, tolerance=1e-06, resultFile="ThermalFollowing");
+createPlot(id=1, position={20, 20, 600, 1000}, y={"EEle.y", "EEleVal.y", "EThe.y", "ETheVal.y"},
+    subPlot=1, grid=true);
+createPlot(id=1, position={20, 20, 600, 1000}, y={"theFol.PEleNet", "theFolNeg.PEleNet", "PEleNetVal.y"},
+    subPlot=2, grid=true);
+createPlot(id=1, position={20, 20, 600, 1000}, y={"theFol.eneCon.QGen_flow", "theFolNeg.eneCon.QGen_flow", "QGenVal_flow.y"},
+    subPlot=3, grid=true);
+createPlot(id=2, position={640, 20, 600, 1000}, y={"theFol.QWat_flow", "theFolNeg.QWat_flow", "QWatVal_flow.y"},
+    subPlot=1, grid=true);
+createPlot(id=2, position={640, 20, 600, 1000}, y={"theFol.QLos.Q_flow", "theFolNeg.QLos.Q_flow", "QLosVal_flow.y"},
+    subPlot=2, grid=true);
+createPlot(id=2, position={640, 20, 600, 1000}, y={"theFol.opeMod.opeMod", "theFolNeg.opeMod.opeMod"},
+    subPlot=3, grid=true);
+createPlot(id=3, position={1260, 20, 600, 1000}, y={"theFol.TWatOut.T", "theFolNeg.TWatOut.T", "TWatOutVal.y", "TWatOutSet.y"},
+    subPlot=1, grid=true);
+createPlot(id=3, position={1260, 20, 600, 1000}, y={"theFol.eng.TEng", "theFolNeg.eng.TEng", "TEngVal.y"},
+    subPlot=2, grid=true);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos
index 03f44e670b9..cb4ea3ce4a6 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Examples.Carnot_TEva", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TEva");
+simulateModel("Buildings.Fluid.Chillers.Examples.Carnot_TEva", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TEva");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T", "chi.TSet"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_TEva.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos
index db1139a9c46..d4f4b379ece 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Examples.Carnot_y", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Chiller_Carnot_y");
+simulateModel("Buildings.Fluid.Chillers.Examples.Carnot_y", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Chiller_Carnot_y");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Chiller_Carnot_y.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyCOP.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyCOP.mos
index 2edaf133786..ed4992d2fe8 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyCOP.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyCOP.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.CarnotVerifyCOP", stopTime=3600, method="dassl", tolerance=1e-06, resultFile="CarnotVerifyCOP");
+simulateModel("Buildings.Fluid.Chillers.Validation.CarnotVerifyCOP", stopTime=3600, method="CVode", tolerance=1e-06, resultFile="CarnotVerifyCOP");
 createPlot(id=1, position={15, 10, 632, 773}, y={"chi_TEva.COP_nominal", "chi_TEva.COP"}, range={0.0, 3600.0, 2.6, 3.4000000000000004}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 632, 255}, y={"chi_TEva.m1_flow", "chi_TEva.m2_flow", "chi_TEva.m1_flow_nominal","chi_TEva.m2_flow_nominal"}, range={0.0, 3600.0, 0.22, 0.33999999999999997}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=1, position={15, 10, 632, 255}, y={"chi_TEva.TCon_nominal", "chi_TEva.TEva_nominal", "chi_TEva.sta_b1.T","chi_TEva.sta_b2.T", "chi_TEva.sta_a1.T", "chi_TEva.sta_a2.T"}, range={0.0, 3600.0, 0.0, 35.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mos
index c8b42c1ae67..819903f6ce8 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.CarnotVerifyEtaCarnot", stopTime=3600, method="dassl", tolerance=1e-06, resultFile="CarnotVerifyEtaCarnot");
+simulateModel("Buildings.Fluid.Chillers.Validation.CarnotVerifyEtaCarnot", stopTime=3600, method="CVode", tolerance=1e-06, resultFile="CarnotVerifyEtaCarnot");
 createPlot(id=1, position={15, 10, 632, 773}, y={"chi_TEva.COP_nominal", "chi_TEva.COP"}, range={0.0, 3600.0, 2.6, 3.4000000000000004}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 632, 255}, y={"chi_TEva.m1_flow", "chi_TEva.m2_flow", "chi_TEva.m1_flow_nominal","chi_TEva.m2_flow_nominal"}, range={0.0, 3600.0, 0.22, 0.33999999999999997}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=1, position={15, 10, 632, 255}, y={"chi_TEva.TCon_nominal", "chi_TEva.TEva_nominal", "chi_TEva.sta_b1.T","chi_TEva.sta_b2.T", "chi_TEva.sta_a1.T", "chi_TEva.sta_a2.T"}, range={0.0, 3600.0, 0.0, 35.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mos
index 29ad11f9404..75c139b4eab 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_2ndLaw", method="Euler", tolerance=1e-06, stopTime=1.0, resultFile="Carnot_TEva_2ndLaw");
+simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_2ndLaw", method="CVode", tolerance=1e-06, stopTime=1.0, resultFile="Carnot_TEva_2ndLaw");
 createPlot(id=1, position={55, 50, 899, 949}, y={"chi_b.SGen_flow"}, range={0.0, 1.0, -10.0, 90.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={55, 50, 899, 313}, y={"chi_b.chi.sta_a1.T", "chi_b.chi.sta_a2.T", "chi_b.chi.sta_b1.T", "chi_b.chi.sta_b2.T"}, range={0.0, 1.0, 15.0, 50.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_HighTemperature.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_HighTemperature.mos
index d37319ad86f..f0fad94adbc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_HighTemperature.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_HighTemperature.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_HighTemperature", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TEva_HighTemperature");
+simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_HighTemperature", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TEva_HighTemperature");
 createPlot(id=2, position={7, -33, 1210, 980}, y={"chi.sta_a2.T", "chi.sta_b2.T", "chi.TSet"}, range={0.0, 3600.0, 260.0, 340.0}, grid=true, filename="Carnot_TEva_HighTemperature.mat", colors={{0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={7, -33, 1210, 193}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -300000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={7, -33, 1210, 192}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, -5000.0, 20000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_LimitedCapacity.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_LimitedCapacity.mos
index 6954ebcd171..085cf255c82 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_LimitedCapacity.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_LimitedCapacity.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_LimitedCapacity", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TEva_LimitedCapacity");
+simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_LimitedCapacity", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TEva_LimitedCapacity");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T", "chi.TSet"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_TEva_LimitedCapacity.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_etaPL.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_etaPL.mos
index 9ed6503f52d..08294abf2a7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_etaPL.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_etaPL.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_etaPL", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TEva_etaPL");
+simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_etaPL", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TEva_etaPL");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T", "chi.TSet"}, range={0.0, 3600.0, 0.0, 40.0}, grid=true, filename="Carnot_TEva_etaPL.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 191}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -150000.0, 150000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 192}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 1000.0, 7000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mos
index b2717b11f4d..7f8362eeb82 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_reverseFlow", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TEva_reverseFlow");
+simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_TEva_reverseFlow", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TEva_reverseFlow");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T", "chi.TSet"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_TEva_reverseFlow.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_y_etaPL.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_y_etaPL.mos
index 750bc1e36a0..e6bd7e94169 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_y_etaPL.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Validation/Carnot_y_etaPL.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_y_etaPL", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Chiller_Carnot_y_etaPL");
+simulateModel("Buildings.Fluid.Chillers.Validation.Carnot_y_etaPL", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Chiller_Carnot_y_etaPL");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"chi.sta_a1.T", "chi.sta_b1.T", "chi.sta_a2.T", "chi.sta_b2.T"}, range={0.0, 3600.0, 0.0, 40.0}, grid=true, filename="Carnot_TEva_etaPL.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={75, 70, 1210, 191}, y={"chi.QEva_flow", "chi.QCon_flow", "chi.P"}, range={0.0, 3600.0, -150000.0, 150000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 192}, y={"chi.dp1", "chi.dp2"}, range={0.0, 3600.0, 1000.0, 7000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/FlowSystem/Simplified2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/FlowSystem/Simplified2.mos
index 44ba3f59fe8..fe918d31ba7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/FlowSystem/Simplified2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/FlowSystem/Simplified2.mos
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-simulateModel("Buildings.Fluid.Examples.FlowSystem.Simplified2", tolerance=1e-6, stopTime=1000, method="Dassl", resultFile="Simplified2");
-=======
 simulateModel("Buildings.Fluid.Examples.FlowSystem.Simplified2", tolerance=1e-6, stopTime=1000, method="Radau", resultFile="Simplified2");
->>>>>>> master
 createPlot(id=1, position={15, 10, 592, 427}, y={"pmpNorth.m_flow", "pmpSouth.m_flow"}, range={0.0, 10000.0, -1.0, 8.0}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v1.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v1.mos
index f85a1be48a5..b6fa93c69dc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example1v1", tolerance=1e-6, stopTime=20, method="dassl", resultFile="Example1v1");
+simulateModel("Buildings.Fluid.Examples.Performance.Example1v1", tolerance=1e-6, stopTime=20, method="CVode", resultFile="Example1v1");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"pump.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v2.mos
index 1e531ae2704..e9939a850d8 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example1v2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example1v2", tolerance=1e-6, stopTime=20, method="dassl", resultFile="Example1v2");
+simulateModel("Buildings.Fluid.Examples.Performance.Example1v2", tolerance=1e-6, stopTime=20, method="CVode", resultFile="Example1v2");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"pump.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example2.mos
index fc728c0bff3..81dbdce64f7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example2", tolerance=1e-6, stopTime=20, method="dassl", resultFile="Example2");
+simulateModel("Buildings.Fluid.Examples.Performance.Example2", tolerance=1e-6, stopTime=20, method="CVode", resultFile="Example2");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"pump_dp.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example3.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example3.mos
index 84d736df73d..2ff958cd43f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example3.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example3.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example3", tolerance=1e-6, stopTime=20, method="dassl", resultFile="Example3");
+simulateModel("Buildings.Fluid.Examples.Performance.Example3", tolerance=1e-6, stopTime=20, method="CVode", resultFile="Example3");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"pump.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example4.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example4.mos
index 3c16e19f130..485de4b6ad0 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example4.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example4.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example4", tolerance=1e-6, stopTime=20, method="dassl", resultFile="Example4");
+simulateModel("Buildings.Fluid.Examples.Performance.Example4", tolerance=1e-6, stopTime=20, method="CVode", resultFile="Example4");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"res.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example5.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example5.mos
index 53b695fda32..9030b295ffb 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example5.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example5.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example5", tolerance=1e-6, stopTime=20, method="dassl", resultFile="Example5");
+simulateModel("Buildings.Fluid.Examples.Performance.Example5", tolerance=1e-6, stopTime=20, method="CVode", resultFile="Example5");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"c"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example6.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example6.mos
index 11da5d15792..9c3cb7c2802 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example6.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example6.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example6", tolerance=1e-6, stopTime=100, method="dassl", resultFile="Example6");
+simulateModel("Buildings.Fluid.Examples.Performance.Example6", tolerance=1e-6, stopTime=100, method="CVode", resultFile="Example6");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"T[2]"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example7.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example7.mos
index d981d193411..3c355c8c82b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example7.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example7.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example7", tolerance=1e-6, stopTime=100, method="dassl", resultFile="Example7");
+simulateModel("Buildings.Fluid.Examples.Performance.Example7", tolerance=1e-6, stopTime=100, method="CVode", resultFile="Example7");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"T[2]"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example8.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example8.mos
index e161f074a81..33df70a255a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example8.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/Example8.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.Performance.Example8", tolerance=1e-6, stopTime=50, method="dassl", resultFile="Example8");
+simulateModel("Buildings.Fluid.Examples.Performance.Example8", tolerance=1e-6, stopTime=50, method="CVode", resultFile="Example8");
 createPlot(id=1,
 position={15, 10, 592, 421},
 y={"a", "b"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDp.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDp.mos
index 9e74a67b22b..55161f9f73c 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDp.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDp.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelDp", stopTime=1, method="dassl", tolerance=1e-06, resultFile="ParallelDp");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelDp", stopTime=1, method="CVode", tolerance=1e-06, resultFile="ParallelDp");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDpOptimised.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDpOptimised.mos
index 77a2d234d28..6e01d21458f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDpOptimised.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelDpOptimised.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelDpOptimised", stopTime=1, method="dassl", tolerance=1e-06, resultFile="ParallelDpOptimised");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelDpOptimised", stopTime=1, method="CVode", tolerance=1e-06, resultFile="ParallelDpOptimised");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mos
index e315281fab3..dde6ed9807a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelFlow", stopTime=1, method="dassl", tolerance=1e-06, resultFile="ParallelFlow");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelFlow", stopTime=1, method="CVode", tolerance=1e-06, resultFile="ParallelFlow");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlowOptimised.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlowOptimised.mos
index 72b999728a1..c43b7846814 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlowOptimised.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/ParallelFlowOptimised.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelFlowOptimised", stopTime=1, method="dassl", tolerance=1e-06, resultFile="ParallelFlowOptimised");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.ParallelFlowOptimised", stopTime=1, method="CVode", tolerance=1e-06, resultFile="ParallelFlowOptimised");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDp.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDp.mos
index 5516188bf48..f54664c2b83 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDp.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDp.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesDp", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesDp");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesDp", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesDp");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDpOptimised.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDpOptimised.mos
index f00d469103a..6c002647c25 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDpOptimised.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesDpOptimised.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesDpOptimised", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesDpOptimised");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesDpOptimised", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesDpOptimised");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mos
index 25f48164a61..05923591fe5 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesFlow", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesFlow");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesFlow", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesFlow");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlowOptimised.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlowOptimised.mos
index e7e7aca5c54..fd9f9866c2a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlowOptimised.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesFlowOptimised.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesFlowOptimised", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesFlowOptimised");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesFlowOptimised", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesFlowOptimised");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mos
index 5d46a1a2808..13fe5639fad 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelDp", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesParallelDp");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelDp", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesParallelDp");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDpOptimised.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDpOptimised.mos
index 905ff35cc90..f32b3f64589 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDpOptimised.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelDpOptimised.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelDpOptimised", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesParallelDpOptimised");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelDpOptimised", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesParallelDpOptimised");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mos
index c0541a54b08..834b1fcea5e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelFlow", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesParallelFlow");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelFlow", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesParallelFlow");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlowOptimised.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlowOptimised.mos
index 9dda56050a0..030bc6d1998 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlowOptimised.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlowOptimised.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelFlowOptimised", stopTime=1, method="dassl", tolerance=1e-06, resultFile="SeriesParallelFlowOptimised");
+simulateModel("Buildings.Fluid.Examples.Performance.PressureDrop.SeriesParallelFlowOptimised", stopTime=1, method="CVode", tolerance=1e-06, resultFile="SeriesParallelFlowOptimised");
 createPlot(id=1, position={0, 0, 1241, 774}, y={"sin.ports[1].m_flow"}, range={0.0, 1.0, -1.0, 8.0}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/ResistanceVolumeFlowReversal.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/ResistanceVolumeFlowReversal.mos
index 1fa731e565f..0e5a950c4e2 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Examples/ResistanceVolumeFlowReversal.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Examples/ResistanceVolumeFlowReversal.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Examples.ResistanceVolumeFlowReversal", tolerance=1e-6, stopTime=10000, method="dassl", resultFile="ResistanceVolumeFlowReversal");
+simulateModel("Buildings.Fluid.Examples.ResistanceVolumeFlowReversal", tolerance=1e-6, stopTime=10000, method="CVode", resultFile="ResistanceVolumeFlowReversal");
 createPlot(id=1, position={15, 10, 592, 421},
 y={"res[1].m_flow", "res[2].m_flow"},
 range={0.0, 10000.0, -0.005, 0.015}, grid=true, filename="ResistanceVolumeFlowReversal.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mos
index 57c55b389dc..9e0181544d7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Adaptors.Examples.ThermalZoneHVACNoExhaust", tolerance=1e-6, stopTime=172800, method="dassl", resultFile="ThermalZoneHVACNoExhaust");
+simulateModel("Buildings.Fluid.FMI.Adaptors.Examples.ThermalZoneHVACNoExhaust", tolerance=1e-6, stopTime=172800, method="CVode", resultFile="ThermalZoneHVACNoExhaust");
 createPlot(id=2, position={15, 10, 1111, 893}, y={"vol.T", "TSet.y"}, range={0.0, 175000.0, 15.0, 21.0}, grid=true, colors={{28,108,200}, {0,140,72}});
 createPlot(id=2, position={15, 10, 1111, 293}, y={"conPI.y"}, range={0.0, 175000.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=2, position={15, 10, 1111, 294}, y={"hea.Q_flow", "hex.Q1_flow"}, range={0.0, 175000.0, -200.0, 1200.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mos
index 48ee1124ccc..4c677acd0c9 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Adaptors.Examples.ThermalZoneHVACWithExhaust", tolerance=1e-6, stopTime=172800, method="dassl", resultFile="ThermalZoneHVACWithExhaust");
+simulateModel("Buildings.Fluid.FMI.Adaptors.Examples.ThermalZoneHVACWithExhaust", tolerance=1e-6, stopTime=172800, method="CVode", resultFile="ThermalZoneHVACWithExhaust");
 createPlot(id=2, position={15, 10, 1111, 893}, y={"vol.T", "TSet.y"}, range={0.0, 175000.0, 15.0, 21.0}, grid=true, colors={{28,108,200}, {0,140,72}});
 createPlot(id=2, position={15, 10, 1111, 293}, y={"conPI.y"}, range={0.0, 175000.0, -0.2, 1.2000000000000002}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=2, position={15, 10, 1111, 294}, y={"hea.Q_flow", "hex.Q1_flow"}, range={0.0, 175000.0, -200.0, 1200.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutlet.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutlet.mos
index b2260dd57ce..2aae7e8d19d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutlet.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutlet.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Conversion.Validation.AirToOutlet", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="AirToOutlet");
+simulateModel("Buildings.Fluid.FMI.Conversion.Validation.AirToOutlet", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="AirToOutlet");
 createPlot(id=2, position={31, 24, 930, 825}, y={"conAirNoC.outlet.m_flow", "conAirWithC.outlet.m_flow", "conDryAirNoC.outlet.m_flow", "conDryAirWithC.outlet.m_flow"}, range={0.0, 1.0, 0.17, 0.23}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=2, position={31, 24, 930, 202}, y={"conAirNoC.outlet.forward.T", "conAirWithC.outlet.forward.T", "conDryAirNoC.outlet.forward.T", "conDryAirWithC.outlet.forward.T"}, range={0.0, 1.0, 260.0, 340.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=2, position={31, 24, 930, 201}, y={"conAirNoC.outlet.forward.X_w", "conAirWithC.outlet.forward.X_w"}, range={0.0, 1.0, 0.008, 0.012}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutletFlowReversal.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutletFlowReversal.mos
index 2633e1ea9e5..b899bf85533 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutletFlowReversal.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/AirToOutletFlowReversal.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Conversion.Validation.AirToOutletFlowReversal", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="AirToOutletFlowReversal");
+simulateModel("Buildings.Fluid.FMI.Conversion.Validation.AirToOutletFlowReversal", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="AirToOutletFlowReversal");
 createPlot(id=2, position={31, 24, 510, 825}, y={"conAirNoC.outlet.m_flow", "conAirWithC.outlet.m_flow", "conDryAirNoC.outlet.m_flow",  "conDryAirWithC.outlet.m_flow"}, range={0.0, 1.0, 0.16, 0.24}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=2, position={31, 24, 510, 202}, y={"conAirNoC.outlet.forward.T", "conAirWithC.outlet.forward.T", "conDryAirNoC.outlet.forward.T", "conDryAirWithC.outlet.forward.T"}, range={0.0, 1.0, 260.0, 340.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=2, position={31, 24, 510, 201}, y={"conAirNoC.outlet.forward.X_w", "conAirWithC.outlet.forward.X_w"}, range={0.0, 1.0, 0.008, 0.012}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAir.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAir.mos
index 8388b2725c1..06e72a38097 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAir.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAir.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirDryAir", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirDryAir");
+simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirDryAir", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirDryAir");
 createPlot(id=1, position={15, 10, 592, 427}, y={"conAir.m_flow"}, range={0.0, 1.0, 0.16, 0.24}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 592, 139}, y={"conAir.T"}, range={0.0, 1.0, 18.0, 26.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=2, position={13, 500, 588, 413}, y={"souRev.outlet.backward.T"}, range={0.0, 1.0, 8.5, 11.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mos
index cb328843c8e..db1561ce52d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirDryAirCO2", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirDryAirCO2");
+simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirDryAirCO2", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirDryAirCO2");
 createPlot(id=1, position={15, 10, 592, 504}, y={"conAir.m_flow"}, range={0.0, 1.0, 0.15000000000000002, 0.25}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 592, 121}, y={"conAir.T"}, range={0.0, 1.0, 15.0, 25.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 592, 121}, y={"conAir.C[1]"}, range={0.0, 1.0, 0.008, 0.012}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAir.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAir.mos
index bb3bb1e4429..16a2886a032 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAir.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAir.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirMoistAir", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirMoistAir");
+simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirMoistAir", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirMoistAir");
 createPlot(id=1, position={15, 10, 592, 427}, y={"conAir.m_flow"}, range={0.0, 1.0, 0.16, 0.24}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 592, 139}, y={"conAir.T"}, range={0.0, 1.0, 18.0, 26.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 592, 138}, y={"conAir.X_w"}, range={0.0, 1.0, 0.008, 0.012}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mos
index 074e916f0df..7b6120e0a4d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirMoistAirCO2", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirMoistAirCO2");
+simulateModel("Buildings.Fluid.FMI.Conversion.Validation.InletToAirMoistAirCO2", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InletToAirMoistAirCO2");
 createPlot(id=1, position={15, 10, 592, 504}, y={"conAir.m_flow"}, range={0.0, 1.0, 0.15000000000000002, 0.25}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 592, 121}, y={"conAir.T"}, range={0.0, 1.0, 15.0, 25.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 592, 122}, y={"conAir.X_w"}, range={0.0, 1.0, 0.008, 0.012}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos
index f5ccc353bd5..903814ef875 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Validation.FlowSplitter_u", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="FlowSplitter_u");
+simulateModel("Buildings.Fluid.FMI.Validation.FlowSplitter_u", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="FlowSplitter_u");
 createPlot(id = 1,
  position = {55, 50, 482, 336},
  y = {"floSpl.outlet[1].m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos
index 15d999322b1..ad8869ad987 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Validation.HeaterFan", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="HeaterFan");
+simulateModel("Buildings.Fluid.FMI.Validation.HeaterFan", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="HeaterFan");
 createPlot(id=1, position={15, 10, 702, 652},
  y={"hea.com.vol.T", "sou.T_in", "sin.T_in"},
 range={0.0, 1.0, 18.0, 32.0}, grid=true, filename="HeaterFan.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos
index 206a260fc89..5bb575d8087 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Validation.HeaterFanPressureDriven", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="HeaterFanPressureDriven");
+simulateModel("Buildings.Fluid.FMI.Validation.HeaterFanPressureDriven", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="HeaterFanPressureDriven");
 createPlot(id=1, position={15, 10, 702, 652},
  y={"hea.com.vol.T", "sou.T_in", "sin.T_in"},
 range={0.0, 1.0, 18.0, 32.0}, grid=true, filename="HeaterFanPressureDriven.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos
index ddea0f97728..8b985a8fa2b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FMI.Validation.HeaterFan_noReverseFlow", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="HeaterFan_noReverseFlow");
+simulateModel("Buildings.Fluid.FMI.Validation.HeaterFan_noReverseFlow", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="HeaterFan_noReverseFlow");
 createPlot(id=1, position={15, 10, 702, 652},
  y={"hea.com.vol.T", "sou.T_in"},
 range={0.0, 1.0, 18.0, 32.0}, grid=true, filename="HeaterFan_noReverseFlow.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos
index 00548ba1976..d67d428f522 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos
@@ -1,5 +1,5 @@
 translateModel("Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore");
-simulateModel("Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore", stopTime=1000, method="dassl", tolerance=1e-006, resultFile="PlugFlowCore");
+simulateModel("Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore", stopTime=1000, method="CVode", tolerance=1e-006, resultFile="PlugFlowCore");
 createPlot(id=1, position={15, 10, 584, 397},
 	y={"senTemIn.T", "senTemOut.T"}, range={0.0, 1000.0, 48.0, 72.0},
 	grid=true, filename="PlugFlowCore.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos
index c7168e285c3..4538b903de5 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos
@@ -1,6 +1,6 @@
 // Script generated by Dymola Thu Jul 19 12:54:22 2007
 // Plot commands
-simulateModel("Buildings.Fluid.FixedResistances.Examples.FlowJunction", tolerance=1e-6, stopTime=100, method="dassl", resultFile="FlowJunction");
+simulateModel("Buildings.Fluid.FixedResistances.Examples.FlowJunction", tolerance=1e-6, stopTime=100, method="CVode", resultFile="FlowJunction");
 createPlot(id=1, position={55, 50, 1848, 1168}, y={"spl.port_1.m_flow", "spl.port_2.m_flow", "spl.port_3.m_flow"}, range={0.0, 100.0, -2.0, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 1848, 289}, y={"spl.port_1.p", "spl.port_2.p", "spl.port_3.p"}, range={0.0, 100.0, 1.0131800000000002, 1.0133200000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 1848, 289}, y={"spl.res1.dp", "spl.res2.dp", "spl.res3.dp"}, range={0.0, 100.0, -6.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos
index f126aeb5443..f82aaed43ed 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos
@@ -1,3 +1,3 @@
 translateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe");
-simulateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe", stopTime=1000, method="dassl", tolerance=1e-006, resultFile="PlugFlowPipe");
+simulateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe", stopTime=1000, method="CVode", tolerance=1e-006, resultFile="PlugFlowPipe");
 createPlot(id=1, position={15, 10, 584, 397}, y={"senTemIn.T", "senTemOut.T"}, range={0.0, 1000.0, 48.0, 72.0}, grid=true, filename="PlugFlowPipe.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PressureDrop.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PressureDrop.mos
index 1080360ca1b..14a9260fe26 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PressureDrop.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PressureDrop.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.FixedResistances.Examples.PressureDrop", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PressureDrop");
+simulateModel("Buildings.Fluid.FixedResistances.Examples.PressureDrop", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PressureDrop");
 createPlot(id=1, position={35, 30, 995, 962}, y={"res.m_flow_nominal", "res.m_flow"}, range={0.0, 1.0, -1.0, 1.0}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mos
index 3942eee666e..69e5b4c4e04 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyState.mos
@@ -1,6 +1,6 @@
 // Script generated by Dymola Thu Jul 19 12:54:22 2007
 // Plot commands
-simulateModel("Buildings.Fluid.FixedResistances.Validation.FlowJunctionSteadyState", tolerance=1e-6, stopTime=100, method="dassl", resultFile="FlowJunctionSteadyState");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.FlowJunctionSteadyState", tolerance=1e-6, stopTime=100, method="CVode", resultFile="FlowJunctionSteadyState");
 createPlot(id=1, position={55, 50, 1848, 1168}, y={"spl.port_1.m_flow", "spl.port_2.m_flow", "spl.port_3.m_flow"}, range={0.0, 100.0, -2.0, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 1848, 289}, y={"spl.port_1.p", "spl.port_2.p", "spl.port_3.p"}, range={0.0, 100.0, 1.0131800000000002, 1.0133200000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 1848, 289}, y={"spl.res1.dp", "spl.res2.dp", "spl.res3.dp"}, range={0.0, 100.0, -6.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mos
index c71769b1c35..14ab8621c2e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/FlowJunctionSteadyStateNoPressureDrop.mos
@@ -1,6 +1,6 @@
 // Script generated by Dymola Thu Jul 19 12:54:22 2007
 // Plot commands
-simulateModel("Buildings.Fluid.FixedResistances.Validation.FlowJunctionSteadyStateNoPressureDrop", tolerance=1e-6, stopTime=100, method="dassl", resultFile="FlowJunctionSteadyStateNoPressureDrop");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.FlowJunctionSteadyStateNoPressureDrop", tolerance=1e-6, stopTime=100, method="CVode", resultFile="FlowJunctionSteadyStateNoPressureDrop");
 createPlot(id=1, position={55, 50, 1848, 1168}, y={"spl.port_1.m_flow", "spl.port_2.m_flow", "spl.port_3.m_flow"}, range={0.0, 100.0, -2.0, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 1848, 289}, y={"spl.port_1.p", "spl.port_2.p", "spl.port_3.p"}, range={0.0, 100.0, 1.0131800000000002, 1.0133200000000002}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 1848, 289}, y={"spl.res1.dp", "spl.res2.dp", "spl.res3.dp"}, range={0.0, 100.0, -6.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/LosslessPipe.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/LosslessPipe.mos
index ce8145b650f..d39f0ae7737 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/LosslessPipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/LosslessPipe.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.LosslessPipe", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="LosslessPipe");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.LosslessPipe", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="LosslessPipe");
 createPlot(id=1, position={35, 30, 995, 962}, y={"res.dp"}, range={0.0, 1.0, -1.0, 1.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 995, 318}, y={"res.sta_a.T"}, range={0.0, 1.0, -5.0, 5.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 995, 318}, y={"res.sta_b.T"}, range={0.0, 1.0, 0.4, 0.52}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/TestData.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/TestData.mos
index 54fa6a1364b..7bcdbd5cda3 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/TestData.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/TestData.mos
@@ -1,5 +1,5 @@
 translateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.TestData");
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.TestData", stopTime=603900, tolerance=1e-6, method="dassl", resultFile="TestData");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.TestData", stopTime=603900, tolerance=1e-6, method="CVode", resultFile="TestData");
 createPlot(id = 1,
  position = {55, 50, 697, 502},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos
index 9695e683239..9b4db5595d8 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.FlowReversal", stopTime=150, method="dassl", tolerance=1e-06, resultFile="FlowReversal");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.FlowReversal", stopTime=150, method="CVode", tolerance=1e-06, resultFile="FlowReversal");
 createPlot(id=2, position={35, 30, 1072, 772}, y={"m_flow.y"}, range={0.0, 150.0, -4.0, 4.0}, grid=true, colors={{28,108,200}});
 createPlot(id=2, position={35, 30, 1072, 254}, y={"senTemIn.T", "senTemOut.T"}, range={0.0, 150.0, 10.0, 50.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"degC", "degC"});
 createPlot(id=2, position={35, 30, 1072, 255}, y={"pip.cor.v_nominal", "pip.cor.del.v", "pip.cor.res.v_nominal"}, range={0.0, 150.0, -4.0, 4.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mos
index 4801e400ae6..3df39e10b9a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.MSLAIT", stopTime=603900, tolerance=1e-6, method="dassl", resultFile="MSLAIT");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.MSLAIT", stopTime=603900, tolerance=1e-6, method="CVode", resultFile="MSLAIT");
 createPlot(id = 5,
  position = {50, 50, 500, 500},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mos
index 81caa104c9e..e76b5099d54 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.MSLAIT2Nodes", stopTime=603900, tolerance=1e-6, method="dassl", resultFile="MSLAIT2Nodes");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.MSLAIT2Nodes", stopTime=603900, tolerance=1e-6, method="CVode", resultFile="MSLAIT2Nodes");
 createPlot(id = 5,
  position = {50, 50, 500, 500},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mos
index a6d5b12e6c3..4c7e5046708 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mos
@@ -1,6 +1,6 @@
 removePlots();
 translateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT");
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT", stopTime=603900, numberOfIntervals=0, outputInterval=900, tolerance=1e-6, method="dassl", resultFile="PlugFlowAIT");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT", stopTime=603900, numberOfIntervals=0, outputInterval=900, tolerance=1e-6, method="CVode", resultFile="PlugFlowAIT");
 createPlot(id = 5,
  position = {50, 50, 500, 500},
  x = "time",
@@ -41,7 +41,7 @@ createPlot(id = 5,
  subPlot=1,
  leftTitleType = 1,
  bottomTitleType = 1);
-plotExpression(apply(PlugFlowAIT[end].DataReader.y[2]-273.15), false, "Measured data: Temperature at point 2 in degrees", 6); 
+plotExpression(apply(PlugFlowAIT[end].DataReader.y[2]-273.15), false, "Measured data: Temperature at point 2 in degrees", 6);
 createPlot(id = 6,
  position = {600, 50, 500, 500},
  x = "time",
@@ -55,7 +55,7 @@ createPlot(id = 6,
  subPlot=2,
  leftTitleType = 1,
  bottomTitleType = 1);
- 
+
 createPlot(id = 7,
  position = {55, 600, 500, 500},
  x = "time",
@@ -69,7 +69,7 @@ createPlot(id = 7,
  subPlot=1,
  leftTitleType = 1,
  bottomTitleType = 1);
-plotExpression(apply(PlugFlowAIT[end].DataReader.y[3]-273.15), false, "Measured data: Temperature at point 3 in degrees", 7); 
+plotExpression(apply(PlugFlowAIT[end].DataReader.y[3]-273.15), false, "Measured data: Temperature at point 3 in degrees", 7);
 createPlot(id = 7,
  position = {55, 600, 500, 500},
  x = "time",
@@ -96,7 +96,7 @@ createPlot(id = 8,
  subPlot=1,
  leftTitleType = 1,
  bottomTitleType = 1);
-plotExpression(apply(PlugFlowAIT[end].DataReader.y[4]-273.15), false, "Measured data: Temperature at point 4 in degrees", 8); 
+plotExpression(apply(PlugFlowAIT[end].DataReader.y[4]-273.15), false, "Measured data: Temperature at point 4 in degrees", 8);
 createPlot(id = 8,
  position = {600, 600, 500, 500},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mos
index 1d5162b258e..471c598c9da 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mos
@@ -1,5 +1,5 @@
 translateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowULg");
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowULg", stopTime=875, tolerance=1e-6, method="dassl", resultFile="PlugFlowULg");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowULg", stopTime=875, tolerance=1e-6, method="CVode", resultFile="PlugFlowULg");
 createPlot(id = 1,
  position = {55, 50, 697, 502},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos
index 90b4cab2d3c..3b32102aeb9 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir", stopTime=1000, method="dassl", tolerance=1e-06, resultFile="TransportWaterAir");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir", stopTime=1000, method="CVode", tolerance=1e-06, resultFile="TransportWaterAir");
 createPlot(id=1, position={15, 10, 802, 881}, y={"Tin.y", "senTemOutW.T", "senTemOutA.T"}, range={0.0, 1000.0, 15.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, displayUnits={"degC", "degC", "degC"});
 createPlot(id=1, position={15, 10, 802, 291}, y={"duc.ports_b[1].Xi_outflow[1]", "XiIn[1].y"}, range={0.0, 1000.0, 0.005, 0.025}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 802, 291}, y={"duc.ports_b[1].C_outflow[1]", "CIn[1].y"}, range={0.0, 1000.0, -0.005, 0.015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicit.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicit.mos
index a0f91c79c37..e4f51aee246 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicit.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicit.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PressureDropsExplicit", startTime=-1, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PressureDropsExplicit");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PressureDropsExplicit", startTime=-1, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PressureDropsExplicit");
 createPlot(id = 1,
  position = {15, 10, 401, 180},
  y = {"res11.m_flow", "res21.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mos
index ee73e7680ea..629c3c892a9 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PressureDropsExplicitLinearized", startTime=-1, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PressureDropsExplicitLinearized");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PressureDropsExplicitLinearized", startTime=-1, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PressureDropsExplicitLinearized");
 createPlot(id = 1,
  position = {15, 10, 401, 180},
  y = {"res11.m_flow", "res21.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsParallel.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsParallel.mos
index a6c5ddf7d3a..93b1b9bf213 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsParallel.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsParallel.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.FixedResistances.Validation.PressureDropsParallel", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PressureDropsParallel");
+simulateModel("Buildings.Fluid.FixedResistances.Validation.PressureDropsParallel", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PressureDropsParallel");
 createPlot(id = 2,
  position = {5, 4, 832, 537},
  y = {"res1.m_flow", "res2.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mos
index 12f96a0be1e..f2b97abe01b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalHEXOneUTube", stopTime=100000, method="dassl", tolerance=1E-6, resultFile="InternalHEXOneUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalHEXOneUTube", stopTime=100000, method="CVode", tolerance=1E-6, resultFile="InternalHEXOneUTube");
 removePlots();
 createPlot(
   id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mos
index ed7cb86f938..9284980d170 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalHEXTwoUTube", stopTime=100000, method="dassl", tolerance=1E-6, resultFile="InternalHEXTwoUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalHEXTwoUTube", stopTime=100000, method="CVode", tolerance=1E-6, resultFile="InternalHEXTwoUTube");
 removePlots();
 createPlot(
   id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mos
index 9e2111b59bf..d22f5108179 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalResistancesOneUTube", stopTime=3600, method="dassl", tolerance=1E-6, resultFile="InternalResistancesOneUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalResistancesOneUTube", stopTime=3600, method="CVode", tolerance=1E-6, resultFile="InternalResistancesOneUTube");
 removePlots();
 createPlot(
   id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mos
index 198d649cd0c..8d45e9ba0a1 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalResistancesTwoUTube", stopTime=3600, method="dassl", tolerance=1E-6, resultFile="InternalResistancesTwoUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Examples.InternalResistancesTwoUTube", stopTime=3600, method="CVode", tolerance=1E-6, resultFile="InternalResistancesTwoUTube");
 removePlots();
 createPlot(
   id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mos
index 1ae7f98c25d..3da45721d0a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mos
@@ -1,16 +1,16 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.ConvectionResistanceCircularPipe", stopTime=10000.0, method="dassl", tolerance=1E-6, resultFile="FunctionConvectionResistanceCircularPipe");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.ConvectionResistanceCircularPipe", stopTime=10000.0, method="CVode", tolerance=1E-6, resultFile="FunctionConvectionResistanceCircularPipe");
 
 createPlot(
   id = 1,
   position = {35, 30, 631, 456},
   x = "Re",
-  y = {"RConv"}, 
+  y = {"RConv"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionConvectionResistanceCircularPipe.mat", 
+  filename="FunctionConvectionResistanceCircularPipe.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
 
@@ -18,12 +18,12 @@ createPlot(
   id = 2,
   position = {35, 30, 631, 456},
   x = "Re",
-  y = {"Nu"}, 
+  y = {"Nu"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionConvectionResistanceCircularPipe.mat", 
+  filename="FunctionConvectionResistanceCircularPipe.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mos
index 46ad72dd4fa..6b1ac14ab62 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mos
@@ -1,16 +1,16 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesOneUTube", stopTime=1.0, method="dassl", tolerance=1E-6, resultFile="FunctionInternalResistancesOneUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesOneUTube", stopTime=1.0, method="CVode", tolerance=1E-6, resultFile="FunctionInternalResistancesOneUTube");
 
 createPlot(
   id = 1,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"Rgb", "Rgg", "RCondGro"}, 
+  y = {"Rgb", "Rgg", "RCondGro"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesOneUTube.mat", 
+  filename="FunctionInternalResistancesOneUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
 
@@ -18,12 +18,12 @@ createPlot(
   id = 2,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"x"}, 
+  y = {"x"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesOneUTube.mat", 
+  filename="FunctionInternalResistancesOneUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mos
index af0b0727fe4..6dc1899a8b0 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mos
@@ -1,16 +1,16 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesOneUTubeNegative", stopTime=1.0, method="dassl", tolerance=1E-6, resultFile="FunctionInternalResistancesOneUTubeNegative");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesOneUTubeNegative", stopTime=1.0, method="CVode", tolerance=1E-6, resultFile="FunctionInternalResistancesOneUTubeNegative");
 
 createPlot(
   id = 1,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"Rgb", "Rgg", "RCondGro"}, 
+  y = {"Rgb", "Rgg", "RCondGro"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesOneUTubeNegative.mat", 
+  filename="FunctionInternalResistancesOneUTubeNegative.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
 
@@ -18,12 +18,12 @@ createPlot(
   id = 2,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"x"}, 
+  y = {"x"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesOneUTubeNegative.mat", 
+  filename="FunctionInternalResistancesOneUTubeNegative.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mos
index 5ea75ad33ff..e3d422b289f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mos
@@ -1,16 +1,16 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesTwoUTube", stopTime=1.0, method="dassl", tolerance=1E-6, resultFile="FunctionInternalResistancesTwoUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesTwoUTube", stopTime=1.0, method="CVode", tolerance=1E-6, resultFile="FunctionInternalResistancesTwoUTube");
 
 createPlot(
   id = 1,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"Rgb", "Rgg1", "Rgg2", "RCondGro"}, 
+  y = {"Rgb", "Rgg1", "Rgg2", "RCondGro"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesTwoUTube.mat", 
+  filename="FunctionInternalResistancesTwoUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
 
@@ -18,12 +18,12 @@ createPlot(
   id = 2,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"x"}, 
+  y = {"x"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesTwoUTube.mat", 
+  filename="FunctionInternalResistancesTwoUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mos
index ba3b4aa5e72..aa5627eccce 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mos
@@ -1,16 +1,16 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesTwoUTubeNegative", stopTime=1.0, method="dassl", tolerance=1E-6, resultFile="FunctionInternalResistancesTwoUTubeNegative");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.InternalResistancesTwoUTubeNegative", stopTime=1.0, method="CVode", tolerance=1E-6, resultFile="FunctionInternalResistancesTwoUTubeNegative");
 
 createPlot(
   id = 1,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"Rgb", "Rgg1", "Rgg2", "RCondGro"}, 
+  y = {"Rgb", "Rgg1", "Rgg2", "RCondGro"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesTwoUTubeNegative.mat", 
+  filename="FunctionInternalResistancesTwoUTubeNegative.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
 
@@ -18,12 +18,12 @@ createPlot(
   id = 2,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"x"}, 
+  y = {"x"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionInternalResistancesTwoUTubeNegative.mat", 
+  filename="FunctionInternalResistancesTwoUTubeNegative.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mos
index 96a25737456..051d1935b54 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mos
@@ -1,16 +1,16 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.MultipoleThermalResistances_OneUTube", stopTime=1.0, method="dassl", tolerance=1E-6, resultFile="FunctionMultipoleThermalResistances_OneUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.MultipoleThermalResistances_OneUTube", stopTime=1.0, method="CVode", tolerance=1E-6, resultFile="FunctionMultipoleThermalResistances_OneUTube");
 
 createPlot(
   id = 1,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"RDelta[1, 1]", "RDelta[2, 2]", "RDelta[1, 2]", "RDelta[2, 1]", "RDelta_Ref[1, 1]", "RDelta_Ref[2, 2]", "RDelta_Ref[1, 2]", "RDelta_Ref[2, 1]"}, 
+  y = {"RDelta[1, 1]", "RDelta[2, 2]", "RDelta[1, 2]", "RDelta[2, 1]", "RDelta_Ref[1, 1]", "RDelta_Ref[2, 2]", "RDelta_Ref[1, 2]", "RDelta_Ref[2, 1]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionMultipoleThermalResistances_OneUTube.mat", 
+  filename="FunctionMultipoleThermalResistances_OneUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
 
@@ -18,12 +18,12 @@ createPlot(
   id = 2,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"R[1, 1]", "R[2, 2]", "R[1, 2]", "R[2, 1]", "R_Ref[1, 1]", "R_Ref[2, 2]", "R_Ref[1, 2]", "R_Ref[2, 1]"}, 
+  y = {"R[1, 1]", "R[2, 2]", "R[1, 2]", "R[2, 1]", "R_Ref[1, 1]", "R_Ref[2, 2]", "R_Ref[1, 2]", "R_Ref[2, 1]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionMultipoleThermalResistances_OneUTube.mat", 
+  filename="FunctionMultipoleThermalResistances_OneUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mos
index 0813ae535a6..5dc29649b6e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mos
@@ -1,16 +1,16 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.MultipoleThermalResistances_TwoUTube", stopTime=1.0, method="dassl", tolerance=1E-6, resultFile="FunctionMultipoleThermalResistances_TwoUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.Validation.MultipoleThermalResistances_TwoUTube", stopTime=1.0, method="CVode", tolerance=1E-6, resultFile="FunctionMultipoleThermalResistances_TwoUTube");
 
 createPlot(
   id = 1,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"RDelta[1, 1]", "RDelta[1, 2]", "RDelta[1, 3]", "RDelta[1, 4]", "RDelta_Ref[1, 1]", "RDelta_Ref[1, 2]", "RDelta_Ref[1, 3]", "RDelta_Ref[1, 4]"}, 
+  y = {"RDelta[1, 1]", "RDelta[1, 2]", "RDelta[1, 3]", "RDelta[1, 4]", "RDelta_Ref[1, 1]", "RDelta_Ref[1, 2]", "RDelta_Ref[1, 3]", "RDelta_Ref[1, 4]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionMultipoleThermalResistances_TwoUTube.mat", 
+  filename="FunctionMultipoleThermalResistances_TwoUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
 
@@ -18,12 +18,12 @@ createPlot(
   id = 2,
   position = {35, 30, 631, 456},
   x = "time",
-  y = {"R[1, 1]", "R[1, 2]", "R[1, 3]", "R[1, 4]", "R_Ref[1, 1]", "R_Ref[1, 2]", "R_Ref[1, 3]", "R_Ref[1, 4]"}, 
+  y = {"R[1, 1]", "R[1, 2]", "R[1, 3]", "R[1, 4]", "R_Ref[1, 1]", "R_Ref[1, 2]", "R_Ref[1, 3]", "R_Ref[1, 4]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="FunctionMultipoleThermalResistances_TwoUTube.mat", 
+  filename="FunctionMultipoleThermalResistances_TwoUTube.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mos
index 1c16e6ba38a..cedf9bdc31b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.Examples.BoreholeDynamics", stopTime=15000, method="dassl", tolerance=1E-6, resultFile="BoreholeDynamics");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.Examples.BoreholeDynamics", stopTime=15000, method="CVode", tolerance=1E-6, resultFile="BoreholeDynamics");
 removePlots();
 createPlot(
   id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeOneUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeOneUTube.mos
index c8752ccc5ae..c5f71b8eb06 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeOneUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeOneUTube.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.Examples.BoreholeOneUTube", stopTime=360000, method="dassl", tolerance=1E-6, resultFile="BoreholeOneUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.Examples.BoreholeOneUTube", stopTime=360000, method="CVode", tolerance=1E-6, resultFile="BoreholeOneUTube");
 removePlots();
 createPlot(
   id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeTwoUTube.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeTwoUTube.mos
index 7d0d0d623b1..ba57abf091b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeTwoUTube.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeTwoUTube.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.Examples.BoreholeTwoUTube", stopTime=360000, method="dassl", tolerance=1E-6, resultFile="BoreholeTwoUTube");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.Examples.BoreholeTwoUTube", stopTime=360000, method="CVode", tolerance=1E-6, resultFile="BoreholeTwoUTube");
 removePlots();
 createPlot(
   id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mos
index bc1d23dc7b0..1568e0e7428 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.CylindricalHeatSource", startTime=0, stopTime=15.0, tolerance=1E-6, method="dassl", resultFile="CylindricalHeatSource");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.CylindricalHeatSource", startTime=0, stopTime=15.0, tolerance=1E-6, method="CVode", resultFile="CylindricalHeatSource");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "t",
-  y    = {"G[1]", "G[2]", "G[3]", "G[4]", "G[5]"}, 
+  y    = {"G[1]", "G[2]", "G[3]", "G[4]", "G[5]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="CylindricalHeatSource.mat", 
+  filename="CylindricalHeatSource.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource_Integrand.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource_Integrand.mos
index 96c574b623c..a8354d79958 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource_Integrand.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/CylindricalHeatSource_Integrand.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.CylindricalHeatSource_Integrand", startTime=0.01, stopTime=15.0, tolerance=1E-6, method="dassl", resultFile="CylindricalHeatSource_Integrand");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.CylindricalHeatSource_Integrand", startTime=0.01, stopTime=15.0, tolerance=1E-6, method="CVode", resultFile="CylindricalHeatSource_Integrand");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "time",
-  y    = {"y[1]", "y[2]", "y[3]", "y[4]"}, 
+  y    = {"y[1]", "y[2]", "y[3]", "y[4]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="CylindricalHeatSource_Integrand.mat", 
+  filename="CylindricalHeatSource_Integrand.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mos
index 5944adf6fd6..f8554880a3d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource", startTime=0, stopTime=20.0, tolerance=1E-6, method="dassl", resultFile="FiniteLineSource");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource", startTime=0, stopTime=20.0, tolerance=1E-6, method="CVode", resultFile="FiniteLineSource");
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Erfint.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Erfint.mos
index d04e41d0d61..25f1ea9a7ab 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Erfint.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Erfint.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource_Erfint", startTime=0.0, stopTime=15.0, tolerance=1E-6, method="dassl", resultFile="FiniteLineSource_Erfint");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource_Erfint", startTime=0.0, stopTime=15.0, tolerance=1E-6, method="CVode", resultFile="FiniteLineSource_Erfint");
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mos
index e8145e3d424..4090bb88736 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource_Integrand", startTime=0.01, stopTime=15.0, tolerance=1E-6, method="dassl", resultFile="FiniteLineSource_Integrand");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource_Integrand", startTime=0.01, stopTime=15.0, tolerance=1E-6, method="CVode", resultFile="FiniteLineSource_Integrand");
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mos
index fe96228762b..36090254792 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/FiniteLineSource_Integrand_Length.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource_Integrand_Length", startTime=0.01, stopTime=500.0, tolerance=1E-6, method="dassl", resultFile="FiniteLineSource_Integrand_Length");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.FiniteLineSource_Integrand_Length", startTime=0.01, stopTime=500.0, tolerance=1E-6, method="CVode", resultFile="FiniteLineSource_Integrand_Length");
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mos
index 015d85db92f..c4d761614c0 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_100boreholes.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_100boreholes", startTime=0, stopTime=3.7e+11, tolerance=1E-6, method="dassl", resultFile="GFunction_100boreholes");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_100boreholes", startTime=0, stopTime=3.7e+11, tolerance=1E-6, method="CVode", resultFile="GFunction_100boreholes");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "lntts_int",
-  y    = {"gFun_int"}, 
+  y    = {"gFun_int"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="GFunction_100boreholes.mat", 
+  filename="GFunction_100boreholes.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mos
index be6464017fa..b0940737222 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_1borehole_5meters.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_1borehole_5meters", startTime=0, stopTime=412000000, tolerance=1E-6, method="dassl", resultFile="GFunction_1borehole_5meters");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_1borehole_5meters", startTime=0, stopTime=412000000, tolerance=1E-6, method="CVode", resultFile="GFunction_1borehole_5meters");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "lntts_int",
-  y    = {"gFun_int"}, 
+  y    = {"gFun_int"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="GFunction_1borehole_5meters.mat", 
+  filename="GFunction_1borehole_5meters.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mos
index 7c1d7adb1d9..ac31945ea05 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/GFunction_SmallScaleValidation.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_SmallScaleValidation", startTime=0, stopTime=1.8e+12, tolerance=1E-6, method="dassl", resultFile="GFunction_SmallScaleValidation");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.GFunction_SmallScaleValidation", startTime=0, stopTime=1.8e+12, tolerance=1E-6, method="CVode", resultFile="GFunction_SmallScaleValidation");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "lntts_int",
-  y    = {"gFun_int"}, 
+  y    = {"gFun_int"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="GFunction_SmallScaleValidation.mat", 
+  filename="GFunction_SmallScaleValidation.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mos
index 9121c704651..73089cc663a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/InfiniteLineSource.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.InfiniteLineSource", startTime=0, stopTime=15.0, tolerance=1E-6, method="dassl", resultFile="InfiniteLineSource");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.InfiniteLineSource", startTime=0, stopTime=15.0, tolerance=1E-6, method="CVode", resultFile="InfiniteLineSource");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "t",
-  y    = {"E[1]", "E[2]", "E[3]", "E[4]", "E[5]"}, 
+  y    = {"E[1]", "E[2]", "E[3]", "E[4]", "E[5]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="InfiniteLineSource.mat", 
+  filename="InfiniteLineSource.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mos
index acf3157f842..bc16ba5251b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Validation/TimeGeometric.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.TimeGeometric", startTime=0.0, stopTime=1.0, tolerance=1E-6, method="dassl", resultFile="TimeGeometric");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.Validation.TimeGeometric", startTime=0.0, stopTime=1.0, tolerance=1E-6, method="CVode", resultFile="TimeGeometric");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "time",
-  y    = {"t[1]", "t[2]", "t[3]", "t[4]", "t[5]"}, 
+  y    = {"t[1]", "t[2]", "t[3]", "t[4]", "t[5]"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="TimeGeometric.mat", 
+  filename="TimeGeometric.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mos
index 16ac1613b7a..f628e1738e4 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mos
@@ -1,15 +1,15 @@
-simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.Cylindrical", startTime=0, stopTime=360000.0, tolerance=1E-6, method="dassl", resultFile="Cylindrical");
+simulateModel("Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.Cylindrical", startTime=0, stopTime=360000.0, tolerance=1E-6, method="CVode", resultFile="Cylindrical");
 
 createPlot(
   id   = 1,
   position = {35, 30, 631, 456},
   x    = "time",
-  y    = {"soi.port_a.T", "soi.port_b.T"}, 
+  y    = {"soi.port_a.T", "soi.port_b.T"},
   autoscale = true,
   autoerase = true,
-  autoreplot = true, 
+  autoreplot = true,
   grid=true,
   color=true,
-  filename="Cylindrical.mat", 
+  filename="Cylindrical.mat",
   leftTitleType = 1,
   bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mos
index 337b6fe8e94..b94d4c6ad1f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/Convector.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.BaseClasses.Examples.Convector", tolerance=1e-6, stopTime=10, method="dassl", resultFile="Convector");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.BaseClasses.Examples.Convector", tolerance=1e-6, stopTime=10, method="CVode", resultFile="Convector");
 createPlot(id=1, position={15, 10, 962, 768}, y={"con.TRoo"}, range={0.0, 10.0, 22.0, 28.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 962, 254}, y={"con.port_a.m_flow", "con.mAir_flow"}, range={0.0, 10.0, -0.02, 0.1}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 962, 253}, y={"con.Q_flow"}, range={0.0, 10.0, -200.0, 1200.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mos
index 458be3d583e..bbe80e53dde 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.BaseClasses.Examples.DerivateCubicSpline", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="DerivateCubicSpline");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.BaseClasses.Examples.DerivateCubicSpline", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="DerivateCubicSpline");
 removePlots();
 Advanced.FilenameInLegend = false;
 Advanced.SequenceInLegend = true;
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mos
index d68b3d1e9ff..79e99260860 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/ModificationFactor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.BaseClasses.Examples.ModificationFactor", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="ModificationFactor");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.BaseClasses.Examples.ModificationFactor", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="ModificationFactor");
 createPlot(id=1, position={15, 10, 592, 700}, y={"mod.TWat", "mod.TRoo"}, range={0.0, 1.0, 15.0, 50.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 592, 230}, y={"mod.mWat_flow", "mod.mAir_flow"}, range={0.0, 1.0, -0.02, 0.1}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 592, 231}, y={"mod.y"}, range={0.0, 1.0, -0.2, 1.2}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mos
index c842538dc32..f2e1969bdf6 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Examples.CoolingAndHeating", tolerance=1e-6, stopTime=172800, method="dassl", resultFile="CoolingAndHeating");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Examples.CoolingAndHeating", tolerance=1e-6, stopTime=172800, method="CVode", resultFile="CoolingAndHeating");
 createPlot(id=1, position={0, 0, 1676, 837}, y={"vol.T"}, range={0.0, 175000.0, 21.5, 25.5}, grid=true, filename="CoolingAndHeating.mat", colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 1676, 416}, y={"beaCooHea.heaToRoo.Q_flow"}, range={0.0, 175000.0, -1000.0, 800.0}, grid=true, subPlot=2, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mos
index 213d6ea299f..44ff732f4d7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Examples.CoolingOnly", tolerance=1e-6, stopTime=172800, method="dassl", resultFile="CoolingOnly");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Examples.CoolingOnly", tolerance=1e-6, stopTime=172800, method="CVode", resultFile="CoolingOnly");
 removePlots();
 Advanced.FilenameInLegend = false;
 Advanced.SequenceInLegend = true;
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mos
index 6b583de7d43..70c4f07bfc5 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Examples.HeatingOnly", tolerance=1e-6, stopTime=172800, method="dassl", resultFile="HeatingOnly");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Examples.HeatingOnly", tolerance=1e-6, stopTime=172800, method="CVode", resultFile="HeatingOnly");
 removePlots();
 Advanced.FilenameInLegend = false;
 Advanced.SequenceInLegend = true;
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mos
index 474a9044719..0bb98622e95 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Validation.NumberOfBeams", tolerance=1e-6, stopTime=5000, method="dassl", resultFile="NumberOfBeams");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Validation.NumberOfBeams", tolerance=1e-6, stopTime=5000, method="CVode", resultFile="NumberOfBeams");
 removePlots();
 Advanced.FilenameInLegend = false;
 Advanced.SequenceInLegend = true;
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mos
index d084dc00843..e6a4e753499 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeamsDynamics.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Validation.NumberOfBeamsDynamics", tolerance=1e-6, stopTime=500, method="dassl", resultFile="NumberOfBeamsDynamics");
+simulateModel("Buildings.Fluid.HeatExchangers.ActiveBeams.Validation.NumberOfBeamsDynamics", tolerance=1e-6, stopTime=500, method="CVode", resultFile="NumberOfBeamsDynamics");
 createPlot(id=1, position={55, 50, 1084, 757}, y={"beaCooHea.watCoo_a.m_flow", "beaCooHea.watHea_a.m_flow", "beaCooHea.air_a.m_flow"}, range={0.0, 500.0, -0.05, 0.10000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 1084, 185}, y={"beaCooHea.staWatCoo_b.T", "beaCooHea.staAir_b.T", "beaCooHea.staHea_b.T","beaCooHea10.staWatCoo_b.T", "beaCooHea10.staAir_b.T", "beaCooHea10.staHea_b.T"}, range={0.0, 500.0, 0.0, 50.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}});
 createPlot(id=1, position={55, 50, 1084, 184}, y={"beaCooHea10.heaPor.T"}, range={0.0, 500.0, 22.0, 28.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mos
index 86c889171c7..96499891495 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.BaseClasses.Examples.HACoilInside", stopTime=15, method="dassl", tolerance=1e-6, resultFile="HACoilInside");
+simulateModel("Buildings.Fluid.HeatExchangers.BaseClasses.Examples.HACoilInside", stopTime=15, method="CVode", tolerance=1e-6, resultFile="HACoilInside");
 createPlot(id = 1,
  position = {0, 0, 1609, 781},
  y = {"hASin.hA"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos
index e9fae257d22..491fe0d2bcc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.BaseClasses.Examples.HADryCoil", stopTime=80, tolerance=1E-6, method="dassl", resultFile="HADryCoil");
+simulateModel("Buildings.Fluid.HeatExchangers.BaseClasses.Examples.HADryCoil", stopTime=80, tolerance=1E-6, method="CVode", resultFile="HADryCoil");
 createPlot(id=1, position={15, 10, 430, 786}, y={"TWat.y", "TAir.y"}, range={0.0, 0.001, 270.0, 340.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 430, 260}, y={"mWat_flow.y"}, range={0.0, 0.001, -0.02, 0.12000000000000001}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 430, 259}, y={"mAir_flow.y"}, range={0.0, 0.001, -0.5, 3.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HANaturalCylinder.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HANaturalCylinder.mos
index 229f65460ff..671c02ec09c 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HANaturalCylinder.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HANaturalCylinder.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Fluid.HeatExchangers.BaseClasses.Examples.HANaturalCylinder", tolerance=1e-6, stopTime=250, method="dassl", resultFile="HANaturalCylinder");
+simulateModel("Buildings.Fluid.HeatExchangers.BaseClasses.Examples.HANaturalCylinder", tolerance=1e-6, stopTime=250, method="CVode", resultFile="HANaturalCylinder");
 createPlot(id = 8,
  position = {0, 0, 800, 600},
  y = {"hANatCyl.hA"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_T.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_T.mos
index a08388a34f8..b9096b4ff14 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_T.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_T.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Examples.AirHeater_T", stopTime=172800, method="Radau", tolerance=1e-08, numberOfIntervals=1000, resultFile="AirHeater_T");
+simulateModel("Buildings.Fluid.HeatExchangers.Examples.AirHeater_T", stopTime=172800, method="CVode", tolerance=1e-08, numberOfIntervals=1000, resultFile="AirHeater_T");
 createPlot(id=1, position={17, 9, 946, 677},
  y={"TSet.y", "TOut.y", "TVol.T", "THeaOut.T", "hea.TSet"},
 range={0.0, 50.0, 5.0, 35.0}, grid=true, filename="AirHeater_T.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}, {0,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_u.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_u.mos
index fcc65f82c49..be6179c14de 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_u.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/AirHeater_u.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Examples.AirHeater_u", stopTime=172800, method="Radau", tolerance=1e-6, resultFile="AirHeater_u");
+simulateModel("Buildings.Fluid.HeatExchangers.Examples.AirHeater_u", stopTime=172800, method="CVode", tolerance=1e-6, resultFile="AirHeater_u");
 createPlot(id=1, position={10, 14, 946, 629},
  y={"TSet.y", "TOut.y", "TVol.T", "THeaOut.T"}, range={0.0, 180000.0, 10.0, 26.0},
 grid=true, filename="AirHeater_u.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos
index e61bec7581e..db61846d992 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Examples.DryCoilEffectivenessNTUMassFlow", method="dassl", tolerance=1e-6, stopTime=3600, resultFile="DryCoilEffectivenessNTUMassFlow");
+simulateModel("Buildings.Fluid.HeatExchangers.Examples.DryCoilEffectivenessNTUMassFlow", method="CVode", tolerance=1e-6, stopTime=3600, resultFile="DryCoilEffectivenessNTUMassFlow");
 createPlot(id = 1,
  position = {15, 10, 400, 237},
  y = {"hex.m1_flow", "hex.m2_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos
index 236fd544d38..752d7b114e6 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Examples.DryCoilEffectivenessNTUPControl", stopTime=3600, method="dassl", tolerance=1e-6, resultFile="DryCoilEffectivenessNTUPControl");
+simulateModel("Buildings.Fluid.HeatExchangers.Examples.DryCoilEffectivenessNTUPControl", stopTime=3600, method="CVode", tolerance=1e-6, resultFile="DryCoilEffectivenessNTUPControl");
 createPlot(id = 4,
  position = {550, 0, 400, 342},
  y = {"P.u_s", "P.u_m"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterCooler_T.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterCooler_T.mos
index 2942348e93e..b683a7b1b4a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterCooler_T.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterCooler_T.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Examples.WaterCooler_T", stopTime=172800, method="Radau", tolerance=1e-8, resultFile="WaterCooler_T");
+simulateModel("Buildings.Fluid.HeatExchangers.Examples.WaterCooler_T", stopTime=172800, method="CVode", tolerance=1e-8, resultFile="WaterCooler_T");
 createPlot(id=1, position={17, 9, 946, 677},
  y={"TSet.y", "TOut.y", "TVol.T", "THeaOut.T", "coo.TSet"},
 range={0.0, 50.0, 5.0, 35.0}, grid=true, filename="WaterCooler_T.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}, {0,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_T.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_T.mos
index d3591d0b2ac..3ee2fc0d65f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_T.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_T.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Examples.WaterHeater_T", stopTime=172800, method="Radau", tolerance=1e-6, resultFile="WaterHeater_T");
+simulateModel("Buildings.Fluid.HeatExchangers.Examples.WaterHeater_T", stopTime=172800, method="CVode", tolerance=1e-6, resultFile="WaterHeater_T");
 createPlot(id=1, position={17, 9, 946, 677},
  y={"TSet.y", "TOut.y", "TVol.T", "THeaOut.T", "hea.TSet"},
 range={0.0, 50.0, 5.0, 35.0}, grid=true, filename="WaterHeater_T.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}, {0,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_u.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_u.mos
index b746cbc339b..1ee6f3975f3 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_u.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/WaterHeater_u.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Examples.WaterHeater_u", stopTime=172800, method="Radau", tolerance=1e-6, resultFile="WaterHeater_u");
+simulateModel("Buildings.Fluid.HeatExchangers.Examples.WaterHeater_u", stopTime=172800, method="CVode", tolerance=1e-6, resultFile="WaterHeater_u");
 createPlot(id=1, position={10, 14, 946, 629},
  y={"TSet.y", "TOut.y", "TVol.T", "THeaOut.T"}, range={0.0, 180000.0, 10.0, 26.0},
 grid=true, filename="WaterHeater_u.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mos
index 9a906573276..4dd6e2cb8dd 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Radiators.Examples.RadiatorEN442_2", tolerance=1e-6, stopTime=10800, method="dassl", resultFile="RadiatorEN442_2");
+simulateModel("Buildings.Fluid.HeatExchangers.Radiators.Examples.RadiatorEN442_2", tolerance=1e-6, stopTime=10800, method="CVode", resultFile="RadiatorEN442_2");
 createPlot(id = 2,
  position = {19, 4, 391, 376},
  y = {"rad1.sta_a.T", "rad1.sta_b.T", "rad1.vol[3].T", "rad2.sta_a.T", "rad2.sta_b.T", "rad2.vol[3].T", "sou.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/ConstantEffectiveness.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/ConstantEffectiveness.mos
index 85429e0e07e..771ff30b03a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/ConstantEffectiveness.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/ConstantEffectiveness.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Validation.ConstantEffectiveness", stopTime=360, method="dassl", tolerance=1e-6, resultFile="ConstantEffectivenessHex");
+simulateModel("Buildings.Fluid.HeatExchangers.Validation.ConstantEffectiveness", stopTime=360, method="CVode", tolerance=1e-6, resultFile="ConstantEffectivenessHex");
 createPlot(id = 5,
  position = {39, -2, 802, 524},
  y = {"hex.sta_a1.T", "hex.sta_b1.T", "hex.sta_a2.T", "hex.sta_b2.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mos
index a7bed3da75c..11322a22f34 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Validation.EvaporatorCondenser", method="dassl", tolerance=1e-6, stopTime=100, resultFile="EvaporatorCondenser");
+simulateModel("Buildings.Fluid.HeatExchangers.Validation.EvaporatorCondenser", method="CVode", tolerance=1e-6, stopTime=100, resultFile="EvaporatorCondenser");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"sou.T", "senTem.T", "ref.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/HeaterCooler_u.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/HeaterCooler_u.mos
index 44594af3ab3..dba10857c4b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/HeaterCooler_u.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/HeaterCooler_u.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Validation.HeaterCooler_u", method="dassl", tolerance=1e-6, stopTime=1200, resultFile="HeaterCooler_u");
+simulateModel("Buildings.Fluid.HeatExchangers.Validation.HeaterCooler_u", method="CVode", tolerance=1e-6, stopTime=1200, resultFile="HeaterCooler_u");
 createPlot(id = 1,
  position = {78, 39, 400, 444},
  y = {"con1.u_s", "con1.u_m", "con2.u_m"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet.mos
index 1dcc2bc3917..3fc64210abc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Validation.PrescribedOutlet", method="dassl", tolerance=1e-6, stopTime=1200, resultFile="Validation_PrescribedOutlet");
+simulateModel("Buildings.Fluid.HeatExchangers.Validation.PrescribedOutlet", method="CVode", tolerance=1e-6, stopTime=1200, resultFile="Validation_PrescribedOutlet");
 createPlot(id=1, position={23, 17, 932, 551},
 y={"m_flow.y"},
 range={0.0, 1200.0, -0.2, 0.2}, grid=true, filename="Validation_PrescribedOutlet.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet_dynamic.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet_dynamic.mos
index 492a2bf79ba..369cf5fc200 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet_dynamic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/PrescribedOutlet_dynamic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatExchangers.Validation.PrescribedOutlet_dynamic", method="dassl", tolerance=1e-6, stopTime=1200, resultFile="PrescribedOutlet_dynamic");
+simulateModel("Buildings.Fluid.HeatExchangers.Validation.PrescribedOutlet_dynamic", method="CVode", tolerance=1e-6, stopTime=1200, resultFile="PrescribedOutlet_dynamic");
 createPlot(id=1, position={23, 17, 932, 551},
 y={"m_flow.y"},
 range={0.0, 1200.0, -0.2, 0.2}, grid=true, filename="PrescribedOutlet_dynamic.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mos
index e3af0ea9052..1272e3ed2bf 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Calibration.ScrollWaterToWater", method="dassl", tolerance=1e-6, stopTime=142, resultFile="ScrollWaterToWater");
+simulateModel("Buildings.Fluid.HeatPumps.Calibration.ScrollWaterToWater", method="CVode", tolerance=1e-6, stopTime=142, resultFile="ScrollWaterToWater");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.m1_flow", "heaPum.m2_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mos
index 92b9a585797..96996b7097f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Compressors.BaseClasses.Validation.TemperatureProtection", stopTime=5, tolerance=1E-6, method="dassl", resultFile="TemperatureProtection");
+simulateModel("Buildings.Fluid.HeatPumps.Compressors.BaseClasses.Validation.TemperatureProtection", stopTime=5, tolerance=1E-6, method="CVode", resultFile="TemperatureProtection");
 createPlot(id=1, position={18, 22, 473, 425}, y={"temPro.TEva", "temPro.TEvaMin", "temPro.errLowPre"}, range={0.0, 2.0, -2.0, 22.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={512, 23, 439, 425}, y={"temPro.TCon", "temPro.TConMax", "temPro.errHigPre"}, range={0.0, 2.0, -5.0, 55.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=3, position={969, 16, 547, 433}, y={"temPro.TEva", "temPro.TCon", "temPro.errNegTemDif"}, range={0.0, 2.0, -5.0, 55.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor.mos
index 1c963885193..322ac41c795 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ReciprocatingCompressor", method="dassl", tolerance=1e-6, stopTime=100, resultFile="ReciprocatingCompressor");
+simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ReciprocatingCompressor", method="CVode", tolerance=1e-6, stopTime=100, resultFile="ReciprocatingCompressor");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"com.pDis", "com.pSuc"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor_ZeroInput.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor_ZeroInput.mos
index a8dc8afee41..7540d1a8111 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor_ZeroInput.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ReciprocatingCompressor_ZeroInput.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ReciprocatingCompressor_ZeroInput", method="dassl", tolerance=1e-6, stopTime=100, resultFile="ReciprocatingCompressor_ZeroInput");
+simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ReciprocatingCompressor_ZeroInput", method="CVode", tolerance=1e-6, stopTime=100, resultFile="ReciprocatingCompressor_ZeroInput");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"com.pDis", "com.pSuc"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor.mos
index a54ca0c6f9a..1fc70c0d0f3 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ScrollCompressor", method="dassl", tolerance=1e-6, stopTime=100, resultFile="ScrollCompressor");
+simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ScrollCompressor", method="CVode", tolerance=1e-6, stopTime=100, resultFile="ScrollCompressor");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"com.pDis", "com.pSuc"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor_ZeroInput.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor_ZeroInput.mos
index 03145d3035d..00d3b60ce9a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor_ZeroInput.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Compressors/Validation/ScrollCompressor_ZeroInput.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ScrollCompressor_ZeroInput", method="dassl", tolerance=1e-6, stopTime=100, resultFile="ScrollCompressor_ZeroInput");
+simulateModel("Buildings.Fluid.HeatPumps.Compressors.Validation.ScrollCompressor_ZeroInput", method="CVode", tolerance=1e-6, stopTime=100, resultFile="ScrollCompressor_ZeroInput");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"com.pDis", "com.pSuc"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_TCon.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_TCon.mos
index caaaed9ee35..86b4444e084 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_TCon.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_TCon.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Examples.Carnot_TCon", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TCon");
+simulateModel("Buildings.Fluid.HeatPumps.Examples.Carnot_TCon", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TCon");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.TSet"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_TCon.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_y.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_y.mos
index 69f9d061c11..caf7813bfa0 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_y.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/Carnot_y.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Examples.Carnot_y", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_y");
+simulateModel("Buildings.Fluid.HeatPumps.Examples.Carnot_y", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_y");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_y.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mos
index 3439f81bdea..1a83cdece67 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/EquationFitReversible_CoolingClosedLoop.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Examples.EquationFitReversible_CoolingClosedLoop", method="CVode", tolerance=1e-6, stopTime=1200, resultFile="EquationFitReversible_CoolingClosedLoop");
+simulateModel("Buildings.Fluid.HeatPumps.Examples.EquationFitReversible_CoolingClosedLoop", method="CVode", tolerance=1e-6, stopTime=2500, resultFile="EquationFitReversible_CoolingClosedLoop");
 createPlot(id = 1,
    position = {60, 10, 600, 450},
    y = {"heaPum.QSou_flow", "heaPum.QLoa_flow"},
@@ -9,6 +9,17 @@ createPlot(id = 1,
    color = true,
    leftTitleType = 1,
    bottomTitleType = 1);
+createPlot(id = 1,
+   position = {60, 10, 600, 450},
+   y = {"uMod.y"},
+   subPlot=2,
+   autoscale = true,
+   autoerase = true,
+   autoreplot = true,
+   grid = true,
+   color = true,
+   leftTitleType = 1,
+   bottomTitleType = 1);
 createPlot(id = 2,
    position = {670, 10, 600, 450},
    y = {"heaPum.sta_a1.T","heaPum.sta_b1.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mos
index eea1df62e8c..b1ffb56014b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Examples.ScrollWaterToWater_OneRoomRadiator", stopTime=172800, method="radau", tolerance=1e-08, resultFile="ScrollWaterToWater_OneRoomRadiator");
+simulateModel("Buildings.Fluid.HeatPumps.Examples.ScrollWaterToWater_OneRoomRadiator", stopTime=172800, method="CVode", tolerance=1e-08, resultFile="ScrollWaterToWater_OneRoomRadiator");
 createPlot(id = 1,
  position = {19, 32, 798, 500},
  y = {"vol.T_start", "vol.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LimitedCapacity.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LimitedCapacity.mos
index dda82639803..26814fd16b2 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LimitedCapacity.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LimitedCapacity.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_LimitedCapacity", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TCon_LimitedCapacity");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_LimitedCapacity", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TCon_LimitedCapacity");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.TSet"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_TCon_LimitedCapacity.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LowTemperature.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LowTemperature.mos
index cbe1a6e58a0..44bd4651d6e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LowTemperature.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_LowTemperature.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_LowTemperature", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TCon_LowTemperature");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_LowTemperature", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TCon_LowTemperature");
 createPlot(id=2, position={0, 0, 1616, 921}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.TSet"}, range={0.0, 3600.0, 270.0, 310.0}, erase=false, grid=true, filename="Carnot_TCon_LowTemperature.mat", colors={{28,108,200}, {238,46,47}, {0,0,0}});
 createPlot(id=2, position={0, 0, 1616, 181}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 200000.0}, erase=false, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={0, 0, 1616, 181}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, -5000.0, 15000.0}, erase=false, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_etaPL.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_etaPL.mos
index ba67137da26..d82e6b46d4c 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_etaPL.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_etaPL.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_etaPL", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="HeatPump_Carnot_TCon_etaPL");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_etaPL", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="HeatPump_Carnot_TCon_etaPL");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.TSet"}, range={0.0, 3600.0, 0.0, 40.0}, grid=true, filename="HeatPump_Carnot_TCon_etaPL.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 191}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -150000.0, 150000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 192}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 1000.0, 7000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mos
index ad432cfc1b4..19f777b5df2 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_reverseFlow", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_TCon_reverseFlow");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_TCon_reverseFlow", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_TCon_reverseFlow");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.TSet"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_TCon_reverseFlow.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.QCon_flow", "heaPum.QEva_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mos
index dad4a98206d..c32b20138a4 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaCar.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_y_etaCar", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="Carnot_y_etaCar");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_y_etaCar", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Carnot_y_etaCar");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Carnot_y_etaCar.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={75, 70, 1210, 240}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 241}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 0.0, 14000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mos
index 192293f2fff..1d50ae43147 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/Carnot_y_etaPL.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_y_etaPL", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="HeatPump_Carnot_y_etaPL");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.Carnot_y_etaPL", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="HeatPump_Carnot_y_etaPL");
 createPlot(id=2, position={75, 70, 1210, 980}, y={"heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.sta_a2.T", "heaPum.sta_b2.T"}, range={0.0, 3600.0, 0.0, 40.0}, grid=true, filename="HeatPump_Carnot_y_etaPL.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={75, 70, 1210, 191}, y={"heaPum.QEva_flow", "heaPum.QCon_flow", "heaPum.P"}, range={0.0, 3600.0, -150000.0, 150000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={75, 70, 1210, 192}, y={"heaPum.dp1", "heaPum.dp2"}, range={0.0, 3600.0, 1000.0, 7000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mos
index 926af447e92..70fa6bf2aff 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_Dynamic", method="dassl", tolerance=1e-6, stopTime=1000, resultFile="ReciprocatingWaterToWater_Dynamic");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_Dynamic", method="CVode", tolerance=1e-6, stopTime=1000, resultFile="ReciprocatingWaterToWater_Dynamic");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.QCon_flow", "heaPum1.QCon_flow", "appCap.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mos
index 3b0184f6984..9edaae5b83b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_ScalingFactor", method="dassl", tolerance=1e-6, stopTime=1000, resultFile="ReciprocatingWaterToWater_ScalingFactor");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_ScalingFactor", method="CVode", tolerance=1e-6, stopTime=1000, resultFile="ReciprocatingWaterToWater_ScalingFactor");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.QCon_flow", "heaPum1.QCon_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mos
index 21fe9d35227..90b7c92c70d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_Static", method="dassl", tolerance=1e-6, stopTime=1000, resultFile="ReciprocatingWaterToWater_Static");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_Static", method="CVode", tolerance=1e-6, stopTime=1000, resultFile="ReciprocatingWaterToWater_Static");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.com.port_a.T", "heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.com.port_b.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mos
index cda8f16084c..6721dad764a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_VariableSpeed", method="dassl", tolerance=1e-6, stopTime=2000, resultFile="ReciprocatingWaterToWater_VariableSpeed");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ReciprocatingWaterToWater_VariableSpeed", method="CVode", tolerance=1e-6, stopTime=2000, resultFile="ReciprocatingWaterToWater_VariableSpeed");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.com.port_a.T", "heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.com.port_b.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mos
index fbdba87da60..807773b842e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_Dynamic", method="dassl", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_Dynamic");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_Dynamic", method="CVode", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_Dynamic");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.QCon_flow", "heaPum1.QCon_flow", "appCap.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mos
index 0b3688a6807..93854b470d5 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_ScalingFactor", method="dassl", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_ScalingFactor");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_ScalingFactor", method="CVode", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_ScalingFactor");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.QCon_flow", "heaPum1.QCon_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mos
index 81ca0cae862..b724ef17d4b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_Static", method="dassl", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_Static");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_Static", method="CVode", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_Static");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.com.port_a.T", "heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.com.port_b.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mos
index 5f1d916e94d..c72afd16fcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_TemperatureProtection", stopTime=1000, method="dassl", tolerance=1e-06, resultFile="ScrollWaterToWater_TemperatureProtection");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_TemperatureProtection", stopTime=1000, method="CVode", tolerance=1e-06, resultFile="ScrollWaterToWater_TemperatureProtection");
 createPlot(id=1, position={0, 0, 1481, 924}, y={"heaPum.errNegTemDif", "heaPum.errHigPre", "heaPum.errLowPre", "heaPum.com.isOn"}, range={0.0, 1000.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}});
 createPlot(id=1, position={0, 0, 1481, 306}, y={"heaPum.TEvaMin", "heaPum.eva.vol.T", "heaPum.con.T", "heaPum.TConMax"}, range={0.0, 1000.0, 270.0, 350.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=1, position={0, 0, 1481, 305}, y={"heaPum.QCon_flow"}, range={0.0, 1000.0, -5000.0, 35000.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mos b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mos
index 03e652216cc..a70c4670f44 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_VariableSpeed", method="dassl", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_VariableSpeed");
+simulateModel("Buildings.Fluid.HeatPumps.Validation.ScrollWaterToWater_VariableSpeed", method="CVode", tolerance=1e-6, stopTime=1000, resultFile="ScrollWaterToWater_VariableSpeed");
 createPlot(id = 1,
    position = {60, 10, 640, 480},
    y = {"heaPum.sta_a2.T", "heaPum.sta_b2.T", "heaPum.com.port_a.T", "heaPum.sta_a1.T", "heaPum.sta_b1.T", "heaPum.com.port_b.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Examples/Humidifier_u.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Examples/Humidifier_u.mos
index bc230d84272..ecd12d467cc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Examples/Humidifier_u.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Examples/Humidifier_u.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Humidifiers.Examples.Humidifier_u", method="radau", tolerance=1e-06, stopTime=1200, resultFile="Humidifier_u");
+simulateModel("Buildings.Fluid.Humidifiers.Examples.Humidifier_u", method="CVode", tolerance=1e-06, stopTime=1200, resultFile="Humidifier_u");
 createPlot(id = 1,
  position = {78, 39, 400, 444},
  y = {"con1.u_s", "con1.u_m", "con2.u_m"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X.mos
index c22adb6d440..3b27c764989 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Humidifiers.Validation.SprayAirWasher_X", method="dassl", tolerance=1e-6, stopTime=1080, resultFile="SprayAirWasher_X");
+simulateModel("Buildings.Fluid.Humidifiers.Validation.SprayAirWasher_X", method="CVode", tolerance=1e-6, stopTime=1080, resultFile="SprayAirWasher_X");
 createPlot(id=1, position={55, 50, 582, 845}, y={"XSet.y[1]", "senHum.X"}, range={0.0, 1100.0, 0.003, 0.016}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={55, 50, 582, 420}, y={"hum.sta_a.T", "hum.sta_b.T"}, range={0.0, 1100.0, 8.0, 22.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=2, position={669, 51, 592, 840}, y={"hum.mWat_flow"}, range={0.0, 1100.0, -2E-05, 0.00042}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mos
index bfd68a9e633..adca0d87741 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SprayAirWasher_X_dynamic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Humidifiers.Validation.SprayAirWasher_X_dynamic", method="dassl", tolerance=1e-6, stopTime=1080, resultFile="SprayAirWasher_X_dynamic");
+simulateModel("Buildings.Fluid.Humidifiers.Validation.SprayAirWasher_X_dynamic", method="CVode", tolerance=1e-6, stopTime=1080, resultFile="SprayAirWasher_X_dynamic");
 createPlot(id=1, position={55, 50, 582, 845}, y={"XSet.y[1]", "senHum.X"}, range={0.0, 1100.0, 0.003, 0.016}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={55, 50, 582, 420}, y={"hum.sta_a.T", "hum.sta_b.T"}, range={0.0, 1100.0, 8.0, 22.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=2, position={669, 51, 592, 840}, y={"hum.mWat_flow"}, range={0.0, 1100.0, -2E-05, 0.00042}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X.mos
index 7a446b54e91..bf93c86178b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Humidifiers.Validation.SteamHumidifier_X", method="dassl", tolerance=1e-6, stopTime=1080, resultFile="SteamHumidifier_X");
+simulateModel("Buildings.Fluid.Humidifiers.Validation.SteamHumidifier_X", method="CVode", tolerance=1e-6, stopTime=1080, resultFile="SteamHumidifier_X");
 createPlot(id=1, position={55, 50, 582, 845}, y={"XSet.y[1]", "senHum.X"}, range={0.0, 1100.0, 0.003, 0.016}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={55, 50, 582, 420}, y={"hum.sta_a.T", "hum.sta_b.T"}, range={0.0, 1100.0, 8.0, 22.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=2, position={669, 51, 592, 840}, y={"hum.mWat_flow"}, range={0.0, 1100.0, -2E-05, 0.00042}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mos
index 799aa90a7fd..843d8f96e24 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Humidifiers/Validation/SteamHumidifier_X_dynamic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Humidifiers.Validation.SteamHumidifier_X_dynamic", method="dassl", tolerance=1e-6, stopTime=1080, resultFile="SteamHumidifier_X_dynamic");
+simulateModel("Buildings.Fluid.Humidifiers.Validation.SteamHumidifier_X_dynamic", method="CVode", tolerance=1e-6, stopTime=1080, resultFile="SteamHumidifier_X_dynamic");
 createPlot(id=1, position={55, 50, 582, 845}, y={"XSet.y[1]", "senHum.X"}, range={0.0, 1100.0, 0.003, 0.016}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={55, 50, 582, 420}, y={"hum.sta_a.T", "hum.sta_b.T"}, range={0.0, 1100.0, 8.0, 22.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=2, position={669, 51, 592, 840}, y={"hum.mWat_flow"}, range={0.0, 1100.0, -2E-05, 0.00042}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ConservationEquation.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ConservationEquation.mos
index da0e03cf5ce..b3f8bbdae80 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ConservationEquation.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ConservationEquation.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.ConservationEquation", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="ConservationEquation");
+simulateModel("Buildings.Fluid.Interfaces.Examples.ConservationEquation", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="ConservationEquation");
 createPlot(id = 1,
  position = {15, 10, 709, 467},
  y = {"dyn.Q_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mos
index 368d0bb0a9f..270b110bfb0 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.EightPortHeatMassExchanger", tolerance=1e-6, stopTime=5, method="dassl", resultFile="EightPortHeatMassExchanger");
+simulateModel("Buildings.Fluid.Interfaces.Examples.EightPortHeatMassExchanger", tolerance=1e-6, stopTime=5, method="CVode", resultFile="EightPortHeatMassExchanger");
 createPlot(
   id=1,
   position={0, 0, 1314, 667},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mos
index 2d628e79c25..2149312530b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.FourPortHeatMassExchanger", tolerance=1e-6, stopTime=5, method="dassl", resultFile="FourPortHeatMassExchanger");
+simulateModel("Buildings.Fluid.Interfaces.Examples.FourPortHeatMassExchanger", tolerance=1e-6, stopTime=5, method="CVode", resultFile="FourPortHeatMassExchanger");
 createPlot(id=1, position={0, 0, 1314, 667}, y={"fouPor.Q1_flow", "fouPor.Q2_flow"}, range={0.0, 5.0, -1.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={0, 0, 1314, 331}, y={"fouPor.vol1.T", "fouPor.vol2.T", "sou2.T", "sou1.T_in", "sin.T"}, range={0.0, 5.0, 270.0, 295.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/HeaterCooler_u.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/HeaterCooler_u.mos
index e4210230168..4e6a6c43813 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/HeaterCooler_u.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/HeaterCooler_u.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.HeaterCooler_u", method="dassl", tolerance=1e-6, stopTime=3600, resultFile="InterfacesHeaterCooler_u");
+simulateModel("Buildings.Fluid.Interfaces.Examples.HeaterCooler_u", method="CVode", tolerance=1e-6, stopTime=3600, resultFile="InterfacesHeaterCooler_u");
 createPlot(id=1, position={15, 10, 413, 444}, y={"senTem1a.T", "senTem1b.T", "senTem2a.T", "senTem2b.T"}, range={0.0, 4000.0, 17.0, 23.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=1, position={15, 10, 413, 220}, y={"senTem3a.T", "senTem3b.T", "senTem4a.T", "senTem4b.T", "mix1.T"}, range={0.0, 4000.0, 17.0, 23.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
 createPlot(id=3, position={435, 8, 400, 447}, y={"hea1.m_flow", "hea2.m_flow"}, range={0.0, 4000.0, -0.6000000000000001, 0.6000000000000001}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/Humidifier_u.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/Humidifier_u.mos
index b83f266ae69..f70d21797cc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/Humidifier_u.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/Humidifier_u.mos
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-simulateModel("Buildings.Fluid.Interfaces.Examples.Humidifier_u", method="dassl", stopTime=3600, tolerance=1e-6, resultFile="InterfacesHumidifier_u");
-=======
 simulateModel("Buildings.Fluid.Interfaces.Examples.Humidifier_u", method="CVode", stopTime=3600, tolerance=1e-7, resultFile="InterfacesHumidifier_u");
->>>>>>> master
 createPlot(id=1, position={15, 10, 413, 444}, y={"hea1.sta_a.T", "hea1.sta_b.T", "hea2.sta_a.T", "hea2.sta_b.T"}, range={0.0, 4000.0, 15.0, 21.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
 createPlot(id=1, position={15, 10, 413, 220}, y={"hea3.sta_a.T", "hea3.sta_b.T", "hea4.sta_a.T", "hea4.sta_b.T", "mix1.T"}, range={0.0, 4000.0, 15.0, 21.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
 createPlot(id=3, position={435, 8, 400, 447}, y={"hea1.m_flow", "hea2.m_flow"}, range={0.0, 4000.0, -0.6000000000000001, 0.8}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet.mos
index a28bb886a3d..f69ba8625d4 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet", tolerance=1e-6, stopTime=1200, method="dassl", resultFile="PrescribedOutlet");
+simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet", tolerance=1e-6, stopTime=1200, method="CVode", resultFile="PrescribedOutlet");
 
 createPlot(id=1, position={9, 13, 499, 1007}, y={"heaHigPow.sta_a.T", "heaHigPow.sta_b.T"}, range={0.0, 1500.0, 0.0, 100.0}, grid=true, colors={{238,46,47}, {0,140,72}});
 createPlot(id=1, position={9, 13, 499, 248}, y={"cooLimPow.sta_a.T", "cooLimPow.sta_b.T"}, range={0.0, 1500.0, 0.0, 100.0}, grid=true, subPlot=2, colors={{238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mos
index 661a67187a8..715bcc1cf3d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_TSetOnly.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet_TSetOnly", tolerance=1e-6, stopTime=1200, method="dassl", resultFile="PrescribedOutlet_TSetOnly");
+simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet_TSetOnly", tolerance=1e-6, stopTime=1200, method="CVode", resultFile="PrescribedOutlet_TSetOnly");
 createPlot(id=1, position={9, 13, 416, 1007}, y={"heaHigPow.sta_a.T", "heaHigPow.sta_b.T"}, range={0.0, 1200.0, -10.0, 25.0}, grid=true, colors={{238,46,47}, {0,140,72}});
 createPlot(id=1, position={9, 13, 416, 249}, y={"cooLimPow.sta_a.T", "cooLimPow.sta_b.T"}, range={0.0, 1200.0, 15.0, 45.0}, grid=true, subPlot=2, colors={{238,46,47}, {0,140,72}});
 createPlot(id=1, position={9, 13, 416, 248}, y={"heaCooUnl.sta_a.T", "heaCooUnl.sta_b.T"}, range={0.0, 1200.0, 5.0, 30.0}, grid=true, subPlot=3, colors={{238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mos
index 73968e9c2ce..980262d8bb8 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_Water.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet_Water", tolerance=1e-6, stopTime=1200, method="dassl", resultFile="PrescribedOutlet_Water");
+simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet_Water", tolerance=1e-6, stopTime=1200, method="CVode", resultFile="PrescribedOutlet_Water");
 createPlot(id=1, position={9, 13, 416, 1007}, y={"heaHigPow.sta_a.T", "heaHigPow.sta_b.T"}, range={0.0, 1200.0, -10.0, 25.0}, grid=true, colors={{238,46,47}, {0,140,72}});
 createPlot(id=1, position={9, 13, 416, 249}, y={"cooLimPow.sta_a.T", "cooLimPow.sta_b.T"}, range={0.0, 1200.0, 15.0, 45.0}, grid=true, subPlot=2, colors={{238,46,47}, {0,140,72}});
 createPlot(id=1, position={9, 13, 416, 248}, y={"heaCooUnl.sta_a.T", "heaCooUnl.sta_b.T"}, range={0.0, 1200.0, 5.0, 30.0}, grid=true, subPlot=3, colors={{238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mos
index a2c374eff2b..0970ca6b91d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/PrescribedOutlet_X_wSetOnly.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet_X_wSetOnly", tolerance=1e-6, stopTime=1200, method="dassl", resultFile="PrescribedOutletState_XiSetOnly");
+simulateModel("Buildings.Fluid.Interfaces.Examples.PrescribedOutlet_X_wSetOnly", tolerance=1e-6, stopTime=1200, method="CVode", resultFile="PrescribedOutletState_XiSetOnly");
 createPlot(id=1, position={9, 13, 416, 1007}, y={"heaHigPow.sta_a.T", "heaHigPow.sta_b.T"}, range={0.0, 1200.0, -10.0, 25.0}, grid=true, colors={{238,46,47}, {0,140,72}});
 createPlot(id=1, position={9, 13, 416, 249}, y={"cooLimPow.sta_a.T", "cooLimPow.sta_b.T"}, range={0.0, 1200.0, 15.0, 45.0}, grid=true, subPlot=2, colors={{238,46,47}, {0,140,72}});
 createPlot(id=1, position={9, 13, 416, 248}, y={"heaCooUnl.sta_a.T", "heaCooUnl.sta_b.T"}, range={0.0, 1200.0, 5.0, 30.0}, grid=true, subPlot=3, colors={{238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mos
index d5f578321d9..23093bfcfe3 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowHumidifier.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.ReverseFlowHumidifier", tolerance=1e-6, stopTime=1, method="dassl", resultFile="ReverseFlowHumidifier");
+simulateModel("Buildings.Fluid.Interfaces.Examples.ReverseFlowHumidifier", tolerance=1e-6, stopTime=1, method="CVode", resultFile="ReverseFlowHumidifier");
 createPlot(id=1, position={241, 38, 1069, 1051}, y={"senEnt1.h_out", "senEnt2.h_out"}, range={0.0, 1.0, 45200.0, 46100.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={241, 38, 1069, 260}, y={"senTem1.T", "senTem2.T"}, range={0.0, 1.0, 19.8, 20.8}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={241, 38, 1069, 259}, y={"senMas1.X", "senMas2.X"}, range={0.0, 1.0, 0.009990000000000002, 0.010040000000000002}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mos
index a517c533415..ea04f7d6049 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Interfaces/Examples/ReverseFlowMassExchanger.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Interfaces.Examples.ReverseFlowMassExchanger", tolerance=1e-6, stopTime=1, method="dassl", resultFile="ReverseFlowMassExchanger");
+simulateModel("Buildings.Fluid.Interfaces.Examples.ReverseFlowMassExchanger", tolerance=1e-6, stopTime=1, method="CVode", resultFile="ReverseFlowMassExchanger");
 createPlot(id=1, position={299, 95, 979, 925}, y={"senEnt1.h_out", "senEnt2.h_out"}, range={0.0, 1.0, 46000.0, 60000.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={299, 95, 979, 229}, y={"senTem1.T", "senTem2.T"}, range={0.0, 1.0, 24.0, 32.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={299, 95, 979, 228}, y={"senMas1.X", "senMas2.X"}, range={0.0, 1.0, 0.0085, 0.0115}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Examples/ConstantEffectiveness.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Examples/ConstantEffectiveness.mos
index e68f95ff54d..3073ce8f4ce 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Examples/ConstantEffectiveness.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Examples/ConstantEffectiveness.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MassExchangers.Examples.ConstantEffectiveness", stopTime=360, method="dassl", tolerance=1e-6, resultFile="ConstantEffectiveness");
+simulateModel("Buildings.Fluid.MassExchangers.Examples.ConstantEffectiveness", stopTime=360, method="CVode", tolerance=1e-6, resultFile="ConstantEffectiveness");
 createPlot(id = 7,
  position = {17, 16, 889, 668},
  y = {"hex.m1_flow", "hex.m2_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlow.mos
index 76fc30515f3..233e1282746 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlow.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.MassExchangers.Validation.ConstantEffectivenessZeroFlow", stopTime=1, method="dassl", tolerance=1e-6, resultFile="ConstantEffectivenessZeroFlow");
+simulateModel("Buildings.Fluid.MassExchangers.Validation.ConstantEffectivenessZeroFlow", stopTime=1, method="CVode", tolerance=1e-6, resultFile="ConstantEffectivenessZeroFlow");
 createPlot(id=1, position={15, 10, 1045, 783}, y={"hex.QLat_flow", "hex.mWat1_flow", "hex.mWat2_flow", "hex.Q1_flow", "hex.Q2_flow", "hex.mWat_flow"}, range={0.0, 0.00028000000000000003, -1.2000000000000002, 1.4}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlowBothStreams.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlowBothStreams.mos
index 97740304b34..fff31aa02b9 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlowBothStreams.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MassExchangers/Validation/ConstantEffectivenessZeroFlowBothStreams.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.MassExchangers.Validation.ConstantEffectivenessZeroFlowBothStreams", stopTime=1, method="dassl", tolerance=1e-6, resultFile="ConstantEffectivenessZeroFlowBothStreams");
+simulateModel("Buildings.Fluid.MassExchangers.Validation.ConstantEffectivenessZeroFlowBothStreams", stopTime=1, method="CVode", tolerance=1e-6, resultFile="ConstantEffectivenessZeroFlowBothStreams");
 createPlot(id=1, position={15, 10, 1045, 783}, y={"hex.QLat_flow", "hex.mWat1_flow", "hex.mWat2_flow", "hex.Q1_flow", "hex.Q2_flow", "hex.mWat_flow"}, range={0.0, 0.00028000000000000003, -1.2000000000000002, 1.4}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatMoisturePort.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatMoisturePort.mos
index 156f55da859..f652b5742d9 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatMoisturePort.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatMoisturePort.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.MixingVolumes.BaseClasses.Validation.MixingVolumeHeatMoisturePort", method="dassl", tolerance=1E-6, resultFile="MixingVolumeHeatMoisturePort");
+simulateModel("Buildings.Fluid.MixingVolumes.BaseClasses.Validation.MixingVolumeHeatMoisturePort", method="CVode", tolerance=1E-6, resultFile="MixingVolumeHeatMoisturePort");
 createPlot(id=1, position={15, 10, 784, 694}, y={"vol[1].p", "vol[2].p", "vol[3].p"}, range={0.0, 1.0, 0.9, 1.15}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={15, 10, 784, 345}, y={"vol[1].T", "vol[2].T", "vol[3].T"}, range={0.0, 1.0, 17.0, 23.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortAir.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortAir.mos
index 4dc6a53c972..cc89dd6eb00 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortAir.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortAir.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.MixingVolumes.BaseClasses.Validation.MixingVolumeHeatPortAir", method="dassl", tolerance=1E-6, resultFile="MixingVolumeHeatPortAir");
+simulateModel("Buildings.Fluid.MixingVolumes.BaseClasses.Validation.MixingVolumeHeatPortAir", method="CVode", tolerance=1E-6, resultFile="MixingVolumeHeatPortAir");
 createPlot(id=1, position={15, 10, 784, 694}, y={"vol[1].p", "vol[2].p", "vol[3].p"}, range={0.0, 1.0, 0.9, 1.15}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={15, 10, 784, 345}, y={"vol[1].T", "vol[2].T", "vol[3].T"}, range={0.0, 1.0, 17.0, 23.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortWater.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortWater.mos
index c516fa53943..28a42e7dd8a 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortWater.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/BaseClasses/Validation/MixingVolumeHeatPortWater.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.MixingVolumes.BaseClasses.Validation.MixingVolumeHeatPortWater", method="dassl", tolerance=1E-6, resultFile="MixingVolumeHeatPortWater");
+simulateModel("Buildings.Fluid.MixingVolumes.BaseClasses.Validation.MixingVolumeHeatPortWater", method="CVode", tolerance=1E-6, resultFile="MixingVolumeHeatPortWater");
 createPlot(id=1, position={15, 10, 784, 694}, y={"vol[1].p", "vol[2].p", "vol[3].p"}, range={0.0, 1.0, 0.9, 1.15}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={15, 10, 784, 345}, y={"vol[1].T", "vol[2].T", "vol[3].T"}, range={0.0, 1.0, 17.0, 23.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeHeatConduction.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeHeatConduction.mos
index 20abdf9550b..0d8151b69ee 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeHeatConduction.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeHeatConduction.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Examples.MixingVolumeHeatConduction", tolerance=1E-6, method="dassl", stopTime=1.0, resultFile="MixingVolumeHeatConduction");
+simulateModel("Buildings.Fluid.MixingVolumes.Examples.MixingVolumeHeatConduction", tolerance=1E-6, method="CVode", stopTime=1.0, resultFile="MixingVolumeHeatConduction");
 removePlots();
 createPlot(id = 5,
  position = {27, 22, 400, 440},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumePrescribedHeatFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumePrescribedHeatFlowRate.mos
index 0471b901326..5ced1fa414e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumePrescribedHeatFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumePrescribedHeatFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Examples.MixingVolumePrescribedHeatFlowRate", tolerance=1E-6, method="dassl", stopTime=1.0, resultFile="MixingVolumePrescribedHeatFlowRate");
+simulateModel("Buildings.Fluid.MixingVolumes.Examples.MixingVolumePrescribedHeatFlowRate", tolerance=1E-6, method="CVode", stopTime=1.0, resultFile="MixingVolumePrescribedHeatFlowRate");
 removePlots();
 createPlot(id = 5,
  position = {27, 22, 400, 440},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeAdiabaticCooling.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeAdiabaticCooling.mos
index 21b003bcbd9..a3d602622f1 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeAdiabaticCooling.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeAdiabaticCooling.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeAdiabaticCooling", tolerance=1e-6, stopTime=10, method="dassl", resultFile="MixingVolumeAdiabaticCooling");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeAdiabaticCooling", tolerance=1e-6, stopTime=10, method="CVode", resultFile="MixingVolumeAdiabaticCooling");
 createPlot(id=1, position={95, 90, 1172, 947}, y={"volSim.T", "volExa.T"}, range={0.0, 10.0, -2.0, 22.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={95, 90, 1172, 471}, y={"relErr.y"}, range={0.0, 10.0, 0.99995, 1.00035}, grid=true, subPlot=2, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlow.mos
index 055e46580c0..c6bb1051f24 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeHeatReverseFlow", stopTime=10, tolerance=1e-08, method="dassl", resultFile="MixingVolumeHeatReverseFlow");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeHeatReverseFlow", stopTime=10, tolerance=1e-08, method="CVode", resultFile="MixingVolumeHeatReverseFlow");
 createPlot(id=1, position={75, 70, 833, 749}, y={"volDyn.ports[1].m_flow"}, range={0.0, 10.0, -3.0, 3.0}, grid=true, filename="MixingVolumeHeatReverseFlow.mat", colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 246}, y={"gain.y"}, range={0.0, 10.0, -0.003, 0.003}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 245}, y={"volDyn.T", "volSte.T"}, range={0.0, 10.0, -0.0015, 0.0015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.mos
index f61c3d22875..70d66aaeb18 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeHeatReverseFlowPrescribedHeatFlowRate", tolerance=1e-6, stopTime=10, method="dassl", resultFile="MixingVolumeHeatReverseFlowPrescribedHeatFlowRate");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeHeatReverseFlowPrescribedHeatFlowRate", tolerance=1e-6, stopTime=10, method="CVode", resultFile="MixingVolumeHeatReverseFlowPrescribedHeatFlowRate");
 createPlot(id=1, position={75, 70, 833, 749}, y={"volDyn.ports[1].m_flow"}, range={0.0, 10.0, -3.0, 3.0}, grid=true, filename="MixingVolumeHeatReverseFlowPrescribedHeatFlowRate.mat", colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 246}, y={"gain.y"}, range={0.0, 10.0, -0.003, 0.003}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 245}, y={"volDyn.T", "volSte.T"}, range={0.0, 10.0, -0.0015, 0.0015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeInitialization.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeInitialization.mos
index 7288e87695d..768ee5014d9 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeInitialization.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeInitialization.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeInitialization", stopTime=0.001, method="dassl", tolerance=1e-06, resultFile="MixingVolumeInitialization");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeInitialization", stopTime=0.001, method="CVode", tolerance=1e-06, resultFile="MixingVolumeInitialization");
 createPlot(id = 1,
  position = {251, 8, 608, 579},
  y = {"vol1.T_start", "vol1.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMFactor.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMFactor.mos
index 8bdf85ea16b..d49d223d808 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMFactor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMFactor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMFactor", tolerance=1E-6, method="dassl", stopTime=100, resultFile="MixingVolumeMFactor");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMFactor", tolerance=1E-6, method="CVode", stopTime=100, resultFile="MixingVolumeMFactor");
 removePlots();
 createPlot(id=1,
 position={15, 10, 482, 336},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mos
index f0285461738..b6e43eaad48 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMassFlow", tolerance=1E-6, stopTime=10, method="dassl", resultFile="MixingVolumeMassFlow");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMassFlow", tolerance=1E-6, stopTime=10, method="CVode", resultFile="MixingVolumeMassFlow");
 removePlots();
 createPlot(id = 1,
  position = {15, 10, 400, 280},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlow.mos
index aded70aedd2..86448e975cd 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMoistureReverseFlow", tolerance=1e-6, stopTime=10, method="dassl", resultFile="MixingVolumeMoistureReverseFlow");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMoistureReverseFlow", tolerance=1e-6, stopTime=10, method="CVode", resultFile="MixingVolumeMoistureReverseFlow");
 createPlot(id=1, position={75, 70, 833, 749}, y={"volDyn.ports[1].m_flow"}, range={0.0, 10.0, -3.0, 3.0}, grid=true, filename="MixingVolumeMoistureReverseFlow.mat", colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 246}, y={"gain.y"}, range={0.0, 10.0, -0.003, 0.003}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 245}, y={"volDyn.Xi[1]", "volSte.Xi[1]"}, range={0.0, 10.0, -0.0015, 0.0015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.mos
index f714696cafb..ef60855fdbb 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate", tolerance=1e-6, stopTime=10, method="dassl", resultFile="MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate", tolerance=1e-6, stopTime=10, method="CVode", resultFile="MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate");
 createPlot(id=1, position={75, 70, 833, 749}, y={"volDyn.ports[1].m_flow"}, range={0.0, 10.0, -3.0, 3.0}, grid=true, filename="MixingVolumeMoistureReverseFlowPrescribedHeatFlowRate.mat", colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 246}, y={"gain.y"}, range={0.0, 10.0, -0.003, 0.003}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 245}, y={"volDyn.Xi[1]", "volSte.Xi[1]"}, range={0.0, 10.0, -0.0015, 0.0015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeSteadyStateMass.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeSteadyStateMass.mos
index e07a34a2062..946a9779809 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeSteadyStateMass.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeSteadyStateMass.mos
@@ -1,6 +1,6 @@
 oldStoreProtVar=Advanced.StoreProtectedVariables;
 Advanced.StoreProtectedVariables:=true;
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeSteadyStateMass", tolerance=1E-6, method="dassl", stopTime=1.0, resultFile="MixingVolumeSteadyStateMass");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeSteadyStateMass", tolerance=1E-6, method="CVode", stopTime=1.0, resultFile="MixingVolumeSteadyStateMass");
 createPlot(id=1,
 position={0, 0, 804, 518},
 y={"vol.dynBal.m"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mos
index 483ea7aafef..3fa49928950 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeTraceSubstance", tolerance=1e-6, stopTime=10, method="dassl", resultFile="MixingVolumeTraceSubstance");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeTraceSubstance", tolerance=1e-6, stopTime=10, method="CVode", resultFile="MixingVolumeTraceSubstance");
 createPlot(id=1, position={75, 70, 833, 749}, y={"volDyn.ports[1].m_flow"}, range={0.0, 10.0, -3.0, 3.0}, grid=true, filename="MixingVolumeTraceSubstance.mat", colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 246}, y={"C_flow.y"}, range={0.0, 10.0, -0.003, 0.003}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 245}, y={"volDyn.C[1]", "volSte.C[1]"}, range={0.0, 10.0, -0.0015, 0.0015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlow.mos
index 2e67ca1a4d4..2746d5964fd 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeTraceSubstanceReverseFlow", stopTime=10, tolerance=1e-08, method="dassl", resultFile="MixingVolumeTraceSubstanceReverseFlow");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeTraceSubstanceReverseFlow", stopTime=10, tolerance=1e-08, method="CVode", resultFile="MixingVolumeTraceSubstanceReverseFlow");
 createPlot(id=1, position={75, 70, 833, 749}, y={"volDyn.ports[1].m_flow"}, range={0.0, 10.0, -3.0, 3.0}, grid=true, filename="MixingVolumeTraceSubstanceReverseFlow.mat", colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 246}, y={"gain.y"}, range={0.0, 10.0, -0.003, 0.003}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 245}, y={"volDyn.C[1]", "volSte.C[1]"}, range={0.0, 10.0, -0.0015, 0.0015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.mos
index 4df7ff1b2b2..e661db97e4c 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate", tolerance=1e-6, stopTime=10, method="dassl", resultFile="MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate", tolerance=1e-6, stopTime=10, method="CVode", resultFile="MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate");
 createPlot(id=1, position={75, 70, 833, 749}, y={"volDyn.ports[1].m_flow"}, range={0.0, 10.0, -3.0, 3.0}, grid=true, filename="MixingVolumeTraceSubstanceReverseFlowPrescribedHeatFlowRate.mat", colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 246}, y={"gain.y"}, range={0.0, 10.0, -0.003, 0.003}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={75, 70, 833, 245}, y={"volDyn.C[1]", "volSte.C[1]"}, range={0.0, 10.0, -0.0015, 0.0015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mos
index e7ca0b94e1b..d08de7170ee 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mos
@@ -1,5 +1,5 @@
 Advanced.Define.AimForHighAccuracy = false;
-simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeZeroFlow", tolerance=1E-6, stopTime=2, method="dassl", resultFile="MixingVolumeZeroFlow");
+simulateModel("Buildings.Fluid.MixingVolumes.Validation.MixingVolumeZeroFlow", tolerance=1E-6, stopTime=2, method="CVode", resultFile="MixingVolumeZeroFlow");
 createPlot(id=1,
 position={0, 0, 1138, 891},
 y={"volLinSys.heatPort.Q_flow", "volNonLinSys.heatPort.Q_flow", "volQflow.heatPort.Q_flow", "volT.heatPort.Q_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/FlowMachineInterface.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/FlowMachineInterface.mos
index a237ff883b7..8185cda4c03 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/FlowMachineInterface.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/FlowMachineInterface.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.BaseClasses.Validation.FlowMachineInterface", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="FlowMachineInterface");
+simulateModel("Buildings.Fluid.Movers.BaseClasses.Validation.FlowMachineInterface", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="FlowMachineInterface");
 createPlot(id=1, position={15, 10, 990, 887}, y={"eff.m_flow", "eff.V_flow"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, filename="FlowMachineInterface.mat", colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 990, 172}, y={"eff.dp"}, range={0.0, 1.0, -500.0, 1500.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 990, 173}, y={"eff.y_in"}, range={0.0, 1.0, 0.8, 1.2000000000000002}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/PowerInterface.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/PowerInterface.mos
index 3a6a42d8b9a..3b92bbabdba 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/PowerInterface.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/BaseClasses/Validation/PowerInterface.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Fluid.Movers.BaseClasses.Validation.PowerInterface", tolerance=1e-6, stopTime=1, method="dassl", resultFile="PowerInterface");
+simulateModel("Buildings.Fluid.Movers.BaseClasses.Validation.PowerInterface", tolerance=1e-6, stopTime=1, method="CVode", resultFile="PowerInterface");
 createPlot(id=1, position={55, 50, 592, 421}, y={"powCoo.Q_flow", "powCoo.WHyd", "powNonCoo.Q_flow", "powNonCoo.WHyd"}, range={0.0, 1.0, -500.0, 3500.0}, grid=true, filename="PowerInterface.mat", colors={{238,46,47}, {0,140,72}, {0,0,0}, {162,29,33}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/ClosedLoop_y.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/ClosedLoop_y.mos
index 5b0af18e403..a7a3ce1f6dc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/ClosedLoop_y.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/ClosedLoop_y.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Examples.ClosedLoop_y", stopTime=3600, method="Radau", tolerance=1e-06, resultFile="ClosedLoop_y");
+simulateModel("Buildings.Fluid.Movers.Examples.ClosedLoop_y", stopTime=3600, method="CVode", tolerance=1e-06, resultFile="ClosedLoop_y");
 createPlot(id = 1,
  position = {75, 70, 654, 387},
  y = {"conPID.u_s", "conPID.u_m", "conPID.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverContinuous.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverContinuous.mos
index a9674e32e9a..9b3a36c3459 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverContinuous.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverContinuous.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Examples.MoverContinuous", stopTime=1, method="Dassl", tolerance=1e-06, resultFile="MoverContinuous");
+simulateModel("Buildings.Fluid.Movers.Examples.MoverContinuous", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverContinuous");
 createPlot(id=1,
 position={15, 10, 586, 422},
 y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverParameter.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverParameter.mos
index cd0dd171b85..183054db706 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverParameter.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverParameter.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Examples.MoverParameter", stopTime=1, method="Dassl", tolerance=1e-06, resultFile="MoverParameter");
+simulateModel("Buildings.Fluid.Movers.Examples.MoverParameter", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverParameter");
 createPlot(id=1,
 position={15, 10, 586, 422},
 y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverStages.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverStages.mos
index d75bf64f8bf..f6ac154f11d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverStages.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/MoverStages.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Examples.MoverStages", stopTime=1, method="Dassl", tolerance=1e-06, resultFile="MoverStages");
+simulateModel("Buildings.Fluid.Movers.Examples.MoverStages", stopTime=1, method="CVode", tolerance=1e-06, resultFile="MoverStages");
 createPlot(id=1,
 position={15, 10, 586, 422},
 y={"pump_Nrpm.m_flow", "pump_dp.m_flow", "pump_m_flow.m_flow", "pump_y.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsParallel.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsParallel.mos
index d63c7958240..7853042dc1c 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsParallel.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsParallel.mos
@@ -1,6 +1,6 @@
 // Script generated by Dymola Tue Jul 19 16:10:17 2011
 // Plot commands
-simulateModel("Buildings.Fluid.Movers.Examples.PumpsParallel", stopTime=300, method="Radau", tolerance=1e-06, resultFile="PumpsParallel");
+simulateModel("Buildings.Fluid.Movers.Examples.PumpsParallel", stopTime=300, method="CVode", tolerance=1e-06, resultFile="PumpsParallel");
 removePlots();
 createPlot(id = 1,
  position = {15, 10, 466, 503},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsSeries.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsSeries.mos
index cb3ff70a2ba..853e0cb0141 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsSeries.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/PumpsSeries.mos
@@ -1,6 +1,6 @@
 // Script generated by Dymola Tue Jul 19 16:10:17 2011
 // Plot commands
-simulateModel("Buildings.Fluid.Movers.Examples.PumpsSeries", stopTime=300, method="Radau", tolerance=1e-06, resultFile="PumpsSeries");
+simulateModel("Buildings.Fluid.Movers.Examples.PumpsSeries", stopTime=300, method="CVode", tolerance=1e-06, resultFile="PumpsSeries");
 removePlots();
 createPlot(id = 1,
  position = {15, 10, 466, 503},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mos
index a97b1761e1d..679b6acfd0b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Examples.SpeedControlled_y_pumpCurves", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SpeedControlled_y_pumpCurves");
+simulateModel("Buildings.Fluid.Movers.Examples.SpeedControlled_y_pumpCurves", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SpeedControlled_y_pumpCurves");
 removePlots();
 createPlot(id = 5,
  filename = "SpeedControlled_y_pumpCurves.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachine.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachine.mos
old mode 100755
new mode 100644
index 6813894fca0..199cd132e2e
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachine.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachine.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.ControlledFlowMachine", method="dassl", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachine");
+simulateModel("Buildings.Fluid.Movers.Validation.ControlledFlowMachine", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachine");
 createPlot(id = 3,
  position = {55, 50, 750, 480},
  y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos
index b288403aeda..418fb742844 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/ControlledFlowMachineDynamic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.ControlledFlowMachineDynamic", method="dassl", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachineDynamic");
+simulateModel("Buildings.Fluid.Movers.Validation.ControlledFlowMachineDynamic", method="CVode", tolerance=1e-6, stopTime=600, resultFile="ControlledFlowMachineDynamic");
 createPlot(id = 3,
  position = {55, 50, 750, 480},
  y = {"fan1.m_flow", "fan2.m_flow", "fan3.m_flow", "fan4.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dp.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dp.mos
index f13cce5fa8c..54d9b7e9e14 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dp.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dp.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.FlowControlled_dp", method="dassl", tolerance=1e-06, stopTime=1.0, resultFile="FlowControlled_dp");
+simulateModel("Buildings.Fluid.Movers.Validation.FlowControlled_dp", method="CVode", tolerance=1e-06, stopTime=1.0, resultFile="FlowControlled_dp");
 removePlots();
 createPlot(id=4, position={441, 13, 281, 255},
 y={"gain.u"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dpSystem.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dpSystem.mos
index 57942bbd105..16ab041f610 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dpSystem.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_dpSystem.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.Movers.Validation.FlowControlled_dpSystem", stopTime=1, method="dassl", tolerance=1e-06, resultFile="FlowControlled_dpSystem");
+simulateModel("Buildings.Fluid.Movers.Validation.FlowControlled_dpSystem", stopTime=1, method="CVode", tolerance=1e-06, resultFile="FlowControlled_dpSystem");
 createPlot(id=1, position={0, 0, 965, 756}, y={"floConDp.dp_actual", "floConDpSystem.dp_actual"}, range={0.0, 1.0, -20.0, 200.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={0, 0, 965, 376}, y={"floConDp.m_flow", "floConDpSystem.m_flow"}, range={0.0, 1.0, -0.02, 0.14}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_m_flow.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_m_flow.mos
index 3ffb62b3a91..a8d29d67772 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_m_flow.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/FlowControlled_m_flow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.FlowControlled_m_flow", method="dassl", tolerance=1e-06, stopTime=1.0, resultFile="FlowControlled_m_flow");
+simulateModel("Buildings.Fluid.Movers.Validation.FlowControlled_m_flow", method="CVode", tolerance=1e-06, stopTime=1.0, resultFile="FlowControlled_m_flow");
 removePlots();
 createPlot(id = 4,
  filename = "FlowControlled_m_flow.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerExact.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerExact.mos
index ccfba524a2c..3ff9a73fd7b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerExact.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerExact.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.Movers.Validation.PowerExact", tolerance=1e-6, stopTime=200, method="dassl", resultFile="PowerExact");
+simulateModel("Buildings.Fluid.Movers.Validation.PowerExact", tolerance=1e-6, stopTime=200, method="CVode", resultFile="PowerExact");
 createPlot(id=1, position={137, 58, 814, 653}, y={"pump_Nrpm.P", "pump_dp.P", "pump_m_flow.P"}, range={0.0, 200.0, 60.0, 200.0}, grid=true, filename="PowerExact.mat", colors={{0,0,255}, {255,0,0}, {0,128,0}}, patterns={LinePattern.Solid, LinePattern.Dash, LinePattern.DashDot});
 createPlot(id=1, position={137, 58, 814, 323}, y={"pump_Nrpm.per.speed_rpm_nominal", "pump_Nrpm.Nrpm"}, range={0.0, 200.0, 2200.0, 3600.0}, grid=true, subPlot=2, colors={{0,0,255}, {255,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerSimplified.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerSimplified.mos
index e04f41ae324..3860168bca7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerSimplified.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerSimplified.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Fluid.Movers.Validation.PowerSimplified", tolerance=1e-6, stopTime=200, method="dassl", resultFile="PowerSimplified");
+simulateModel("Buildings.Fluid.Movers.Validation.PowerSimplified", tolerance=1e-6, stopTime=200, method="CVode", resultFile="PowerSimplified");
 createPlot(id=1, position={137, 58, 814, 653}, y={"pump_Nrpm.P", "pump_dp.P", "pump_m_flow.P"}, range={0.0, 200.0, 60.0, 200.0}, grid=true, filename="PowerSimplified.mat", colors={{0,0,255}, {255,0,0}, {0,128,0}}, patterns={LinePattern.Solid, LinePattern.Dash, LinePattern.DashDot});
 createPlot(id=1, position={137, 58, 814, 323}, y={"pump_Nrpm.per.speed_rpm_nominal", "pump_Nrpm.Nrpm"}, range={0.0, 200.0, 2200.0, 3600.0}, grid=true, subPlot=2, colors={{0,0,255}, {255,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveConstruction.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveConstruction.mos
index 5a8d821887e..859f4bf62b7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveConstruction.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveConstruction.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.PumpCurveConstruction", method="Euler", tolerance=1e-6, stopTime=1.0, resultFile="PumpCurveConstruction");
+simulateModel("Buildings.Fluid.Movers.Validation.PumpCurveConstruction", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PumpCurveConstruction");
 createPlot(id=1, position={103, 107, 482, 336},
 x="pum.m_flow",
 y={"pum.dpMachine", "pum_dp.dpMachine", "pum_m_flow.dpMachine", "pum_no.dpMachine"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveDerivatives.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveDerivatives.mos
index e9213951e4c..2b3b8d49955 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveDerivatives.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/PumpCurveDerivatives.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.PumpCurveDerivatives", numberOfIntervals=500, method="Dassl", tolerance=1e-6, stopTime=1.0, resultFile="PumpCurveDerivatives");
+simulateModel("Buildings.Fluid.Movers.Validation.PumpCurveDerivatives", numberOfIntervals=500, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PumpCurveDerivatives");
 createPlot(id=1,
 position={0, 0, 1532, 801},
 y={"ddp_dNrpm.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_Nrpm_stratos.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_Nrpm_stratos.mos
index 3890672a302..ce49b8b0b1f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_Nrpm_stratos.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_Nrpm_stratos.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.Pump_Nrpm_stratos", stopTime=1000, method="Radau", tolerance=1e-08, resultFile="Pump_Nrpm_stratos");
+simulateModel("Buildings.Fluid.Movers.Validation.Pump_Nrpm_stratos", stopTime=1000, method="CVode", tolerance=1e-08, resultFile="Pump_Nrpm_stratos");
 removePlots();
 createPlot(id=1,
 filename = "Pump_Nrpm_stratos.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_stratos.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_stratos.mos
index e69b7717907..896099d0c9b 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_stratos.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/Pump_stratos.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.Pump_stratos", method="dassl", tolerance=1e-06, stopTime=1.0, resultFile="Pump_stratos");
+simulateModel("Buildings.Fluid.Movers.Validation.Pump_stratos", method="CVode", tolerance=1e-06, stopTime=1.0, resultFile="Pump_stratos");
 removePlots();
 createPlot(id = 4,
  filename = "Pump_stratos.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos
index 311dc252ed6..7e9deabeaee 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_Nrpm.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.SpeedControlled_Nrpm", method="dassl", tolerance=1e-08, stopTime=1.0, resultFile="SpeedControlled_Nrpm");
+simulateModel("Buildings.Fluid.Movers.Validation.SpeedControlled_Nrpm", method="CVode", tolerance=1e-08, stopTime=1.0, resultFile="SpeedControlled_Nrpm");
 removePlots();
 createPlot(id = 4,
  filename = "SpeedControlled_Nrpm.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y.mos
index cf450c3cecc..f0197a41633 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.SpeedControlled_y", method="dassl", tolerance=1e-08, stopTime=1.0, resultFile="SpeedControlled_y");
+simulateModel("Buildings.Fluid.Movers.Validation.SpeedControlled_y", method="CVode", tolerance=1e-08, stopTime=1.0, resultFile="SpeedControlled_y");
 removePlots();
 createPlot(id = 4,
  filename = "SpeedControlled_y.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y_linear.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y_linear.mos
index f996c350ab5..276f0cbdbe1 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y_linear.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Movers/Validation/SpeedControlled_y_linear.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Movers.Validation.SpeedControlled_y_linear", method="dassl", tolerance=1e-06, stopTime=1.0, resultFile="SpeedControlled_y_linear");
+simulateModel("Buildings.Fluid.Movers.Validation.SpeedControlled_y_linear", method="CVode", tolerance=1e-06, stopTime=1.0, resultFile="SpeedControlled_y_linear");
 createPlot(id = 2,
  position = {35, 30, 412, 360},
  x = "y.y",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mos
index 6231e7a46b4..4ab28fea83e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Conversions.Examples.To_VolumeFraction", tolerance=1e-8, stopTime=36000, method="dassl", resultFile="To_VolumeFraction");
+simulateModel("Buildings.Fluid.Sensors.Conversions.Examples.To_VolumeFraction", tolerance=1e-8, stopTime=36000, method="CVode", resultFile="To_VolumeFraction");
 createPlot(id = 1,
  position = {12, 12, 400, 434},
  y = {"limPID.u_s", "limPID.u_m"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Density.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Density.mos
index 53398a71e57..e15084544ac 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Density.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Density.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.Density", tolerance=1e-6, stopTime=60, method="dassl", resultFile="Density");
+simulateModel("Buildings.Fluid.Sensors.Examples.Density", tolerance=1e-6, stopTime=60, method="CVode", resultFile="Density");
 createPlot(id = 1,
  position = {15, 10, 558, 455},
  y = {"masFloRat.ports[1].m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
index f9094e91171..edd5fe1ac33 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.EnthalpyFlowRate", method="dassl", tolerance=1e-6, stopTime=60, resultFile="EnthalpyFlowRate");
+simulateModel("Buildings.Fluid.Sensors.Examples.EnthalpyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="EnthalpyFlowRate");
 createPlot(id=5, position={15, 13, 1032, 1035}, y={"senM_flow.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1032, 256}, y={"senH.h_out"}, range={0.0, 62.0, 40000.0, 70000.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1032, 255}, y={"senH_flow.H_flow"}, range={0.0, 62.0, -80000.0, 60000.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
index b28ddcdf112..1cbdf2b1da0 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.EntropyFlowRate", method="dassl", tolerance=1e-6, stopTime=60, resultFile="EntropyFlowRate");
+simulateModel("Buildings.Fluid.Sensors.Examples.EntropyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="EntropyFlowRate");
 createPlot(id = 5,
  position = {15, 13, 645, 498},
  y = {"senM_flow.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MassFraction.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MassFraction.mos
index f85067d8ce5..bb1f2ab744d 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MassFraction.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MassFraction.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.MassFraction", method="dassl", tolerance=1e-6, stopTime=10, resultFile="MassFraction");
+simulateModel("Buildings.Fluid.Sensors.Examples.MassFraction", method="CVode", tolerance=1e-6, stopTime=10, resultFile="MassFraction");
 removePlots();
 createPlot(id = 9,
  position = {86, 95, 400, 269},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
index e9a0c8e68c4..018ed3256cc 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate", method="dassl", tolerance=1e-6, stopTime=60, resultFile="MoistAirEnthalpyFlowRate");
+simulateModel("Buildings.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="MoistAirEnthalpyFlowRate");
 createPlot(id=5, position={15, 13, 1175, 1116}, y={"senM_flow.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1175, 276}, y={"senH.h_out"}, range={0.0, 62.0, 40000.0, 100000.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1175, 276}, y={"senH_flow.H_flow", "senHSen_flow.H_flow", "senHLat_flow.H_flow"}, range={0.0, 62.0, -100000.0, 60000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/PPM.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/PPM.mos
index a90b14b0516..cca795aecd4 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/PPM.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/PPM.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.PPM", tolerance=1e-6, stopTime=3, method="dassl", resultFile="PPM");
+simulateModel("Buildings.Fluid.Sensors.Examples.PPM", tolerance=1e-6, stopTime=3, method="CVode", resultFile="PPM");
 createPlot(id=1,
 position={0, 0, 1005, 610},
 y={"senPPMTwoPort.ppm", "senPPMNoRev.ppm", "senPPMVol.ppm", "senPPMRev.ppm", "senPPMSta.ppm", "senPPMIn.ppm", "senPPMVol2.ppm"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Pressure.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Pressure.mos
index 440692cebc2..48f15a488aa 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Pressure.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Pressure.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.Pressure", tolerance=1e-6, stopTime=1, method="dassl", resultFile="Pressure");
+simulateModel("Buildings.Fluid.Sensors.Examples.Pressure", tolerance=1e-6, stopTime=1, method="CVode", resultFile="Pressure");
 createPlot(id = 2,
  position = {20, 21, 498, 471},
  y = {"dp.port_a.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/RelativeHumidity.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/RelativeHumidity.mos
index fa5fe1f240c..545dad99d47 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/RelativeHumidity.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/RelativeHumidity.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.RelativeHumidity", method="dassl", tolerance=1e-6, stopTime=600, resultFile="RelativeHumidity");
+simulateModel("Buildings.Fluid.Sensors.Examples.RelativeHumidity", method="CVode", tolerance=1e-6, stopTime=600, resultFile="RelativeHumidity");
 createPlot(id = 1,
  position = {35, 6, 651, 481},
  y = {"relHum.port_a.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEnthalpy.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEnthalpy.mos
index 9a56c3588ee..cec79f1a0f7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEnthalpy.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEnthalpy.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.SpecificEnthalpy", tolerance=1e-6, stopTime=60, method="dassl", resultFile="SpecificEnthalpy");
+simulateModel("Buildings.Fluid.Sensors.Examples.SpecificEnthalpy", tolerance=1e-6, stopTime=60, method="CVode", resultFile="SpecificEnthalpy");
 createPlot(id = 1,
  position = {15, 10, 407, 393},
  y = {"senStr.port_a.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEntropy.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEntropy.mos
index 699fab93b3e..83575c2fd90 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEntropy.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/SpecificEntropy.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.SpecificEntropy", tolerance=1e-6, stopTime=60, method="dassl", resultFile="SpecificEntropy");
+simulateModel("Buildings.Fluid.Sensors.Examples.SpecificEntropy", tolerance=1e-6, stopTime=60, method="CVode", resultFile="SpecificEntropy");
 createPlot(id = 1,
  position = {15, 10, 407, 393},
  y = {"senStr.port_a.m_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureDryBulb.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureDryBulb.mos
index 1ef19e61091..56c3b19d469 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureDryBulb.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureDryBulb.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.TemperatureDryBulb", tolerance=1e-6, stopTime=60, method="dassl", resultFile="TemperatureDryBulb");
+simulateModel("Buildings.Fluid.Sensors.Examples.TemperatureDryBulb", tolerance=1e-6, stopTime=60, method="CVode", resultFile="TemperatureDryBulb");
 createPlot(id = 5,
  position = {23, 1, 677, 498},
  y = {"masFloRat.T", "temSteSta.T", "temDyn.T", "temDynLoss.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureWetBulb.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureWetBulb.mos
index 1f21bac9bc8..211ed26e359 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureWetBulb.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TemperatureWetBulb.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.TemperatureWetBulb", method="dassl", tolerance=1e-6, stopTime=120, resultFile="TemperatureWetBulb");
+simulateModel("Buildings.Fluid.Sensors.Examples.TemperatureWetBulb", method="CVode", tolerance=1e-6, stopTime=120, resultFile="TemperatureWetBulb");
 createPlot(id = 5,
  position = {84, 37, 677, 498},
  y = {"senWetBul.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TraceSubstances.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TraceSubstances.mos
index 8721b50ed14..d32420d724c 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TraceSubstances.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/TraceSubstances.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.TraceSubstances", tolerance=1e-6, stopTime=7200, method="dassl", resultFile="TraceSubstances");
+simulateModel("Buildings.Fluid.Sensors.Examples.TraceSubstances", tolerance=1e-6, stopTime=7200, method="CVode", resultFile="TraceSubstances");
 createPlot(id=2, position={15, 29, 894, 322}, y={"masFraSou.V"}, range={0.0, 7500.0, 0.58, 0.74}, grid=true, filename="TraceSubstances.mat", colors={{0,0,255}});
 createPlot(id=4, position={83, 394, 1031, 567}, y={"vol.C[1]", "senTraSub.C", "senTraSubNoFlorRev.C"}, range={0.0, 7500.0, -0.0005, 0.0015}, grid=true, filename="TraceSubstances.mat", colors={{0,0,255}, {255,0,0}, {0,155,0}});
 createPlot(id=5, position={1127, 67, 660, 725}, y={"senPPM.ppm"}, range={0.0, 7500.0, -100.0, 900.0}, grid=true, filename="TraceSubstances.mat", colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Velocity.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Velocity.mos
index 655f2314a38..cd796febc67 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Velocity.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Velocity.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.Velocity", tolerance=1e-6, stopTime=60, method="dassl", resultFile="Velocity");
+simulateModel("Buildings.Fluid.Sensors.Examples.Velocity", tolerance=1e-6, stopTime=60, method="CVode", resultFile="Velocity");
 createPlot(id = 1,
  position = {15, 10, 414, 292},
  y = {"senDyn.port_a.m_flow", "senDyn.v", "senSteSta.v"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/VolumeFlowRate.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/VolumeFlowRate.mos
index 4ef9eee6287..1d7673c5a52 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/VolumeFlowRate.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/VolumeFlowRate.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sensors.Examples.VolumeFlowRate", tolerance=1e-6, stopTime=60, method="dassl", resultFile="VolumeFlowRate");
+simulateModel("Buildings.Fluid.Sensors.Examples.VolumeFlowRate", tolerance=1e-6, stopTime=60, method="CVode", resultFile="VolumeFlowRate");
 createPlot(id = 1,
  position = {15, 10, 414, 292},
  y = {"senDyn.port_a.m_flow", "senDyn.V_flow", "senSteSta.V_flow"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/MassFlowSource_WeatherData.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/MassFlowSource_WeatherData.mos
index 73ef889265e..be79fd68cc8 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/MassFlowSource_WeatherData.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/MassFlowSource_WeatherData.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sources.Examples.MassFlowSource_WeatherData", tolerance=1e-6, stopTime=3.1536e+07, method="dassl", resultFile="MassFlowSource_WeatherData");
+simulateModel("Buildings.Fluid.Sources.Examples.MassFlowSource_WeatherData", tolerance=1e-6, stopTime=3.1536e+07, method="CVode", resultFile="MassFlowSource_WeatherData");
 createPlot(id = 1, position = {15, 10, 700, 650}, y = {"senTem.T"}, range = {0, 32000000.0, 40.0, -40.0}, autoscale = true, autoerase = true, autoreplot = true, grid = true, color = true, subPlot = 1, leftTitleType = 1, bottomTitleType = 1);
 createPlot(id = 1, position = {15, 10, 700, 650}, y = {"senRelHum.phi"}, range = {0, 32000000.0, 1.5, 0}, autoscale = true, autoerase = true, autoreplot = true, grid = true, color = true, subPlot = 2, leftTitleType = 1, bottomTitleType = 1);
 createPlot(id = 1, position = {15, 10, 700, 650}, y = {"senMasFra.X"}, range = {0, 32000000.0, 0.02, -0.01}, autoscale = true, autoerase = true, autoreplot = true, grid = true, color = true, subPlot = 3, leftTitleType = 1, bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside.mos
index 26c8939baf5..35d32fcdf92 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sources.Examples.Outside", tolerance=1e-6, stopTime=3.1536e+07, method="dassl", resultFile="Outside");
+simulateModel("Buildings.Fluid.Sources.Examples.Outside", tolerance=1e-6, stopTime=3.1536e+07, method="CVode", resultFile="Outside");
 createPlot(id = 1,
  position = {15, 10, 512, 498},
  y = {"senTem.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpLowRise.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpLowRise.mos
index a563fb87fb1..8372cc20f15 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpLowRise.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpLowRise.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sources.Examples.Outside_CpLowRise", startTime=1.728e+07, stopTime=1.78848e+07, method="dassl", tolerance=1e-6, resultFile="Outside_CpLowRise");
+simulateModel("Buildings.Fluid.Sources.Examples.Outside_CpLowRise", startTime=1.728e+07, stopTime=1.78848e+07, method="CVode", tolerance=1e-6, resultFile="Outside_CpLowRise");
 createPlot(id = 3,
  position = {55, 24, 679, 513},
  y = {"weaDat.weaBus.winDir"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/TraceSubstancesFlowSource.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/TraceSubstancesFlowSource.mos
index 54c511bedb3..48d9cf9ffc9 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/TraceSubstancesFlowSource.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sources/Examples/TraceSubstancesFlowSource.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Sources.Examples.TraceSubstancesFlowSource", method="dassl", tolerance=1e-6, stopTime=600, resultFile="TraceSubstancesFlowSource");
+simulateModel("Buildings.Fluid.Sources.Examples.TraceSubstancesFlowSource", method="CVode", tolerance=1e-6, stopTime=600, resultFile="TraceSubstancesFlowSource");
 removePlots();
 createPlot(id = 2,
  y = {"C.C", "C1.C", "vol4.C[1]", "C2.C", "C3.C"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/BaseClasses/Examples/IndirectTankHeatExchanger.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/BaseClasses/Examples/IndirectTankHeatExchanger.mos
index 5edadb79081..539d1ee25ff 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/BaseClasses/Examples/IndirectTankHeatExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/BaseClasses/Examples/IndirectTankHeatExchanger.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Fluid.Storage.BaseClasses.Examples.IndirectTankHeatExchanger", stopTime=15, method="dassl", tolerance=1e-6, resultFile="IndirectTankHeatExchanger");
+simulateModel("Buildings.Fluid.Storage.BaseClasses.Examples.IndirectTankHeatExchanger", stopTime=15, method="CVode", tolerance=1e-6, resultFile="IndirectTankHeatExchanger");
 createPlot(id = 1,
  position = {0, 0, 800, 400},
  y = {"indTanHex.vol[1].T", "indTanHex.vol[2].T", "indTanHex.vol[3].T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/ExpansionVessel.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/ExpansionVessel.mos
index 51b8d838c6f..fc991e59d02 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/ExpansionVessel.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/ExpansionVessel.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Storage.Examples.ExpansionVessel", tolerance=1e-6, stopTime=7200, method="dassl", resultFile="ExpansionVessel");
+simulateModel("Buildings.Fluid.Storage.Examples.ExpansionVessel", tolerance=1e-6, stopTime=7200, method="CVode", resultFile="ExpansionVessel");
 createPlot(id = 1,
  position = {35, 30, 400, 280},
  y = {"vol.T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/Stratified.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/Stratified.mos
index ac97b11424b..a298b56686f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/Stratified.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/Stratified.mos
@@ -1,7 +1,7 @@
-simulateModel("Buildings.Fluid.Storage.Examples.Stratified", stopTime=10800, tolerance=1e-08, method="dassl", resultFile="Stratified");
+simulateModel("Buildings.Fluid.Storage.Examples.Stratified", stopTime=10800, tolerance=1e-08, method="CVode", resultFile="Stratified");
 removePlots();
-createPlot(id = 4,
- position = {259, 11, 572, 195},
+createPlot(id = 1,
+ position = {10, 10, 560, 250},
  y = {"dH.y"},
  range = {0, 11000.0, 80000000.0, (-20000000.0)},
  autoscale = true,
@@ -12,8 +12,8 @@ createPlot(id = 4,
  filename = "Stratified.mat",
  leftTitleType = 1,
  bottomTitleType = 1);
-createPlot(id = 3,
- position = {29, 28, 768, 679},
+createPlot(id = 2,
+ position = {580, 10, 560, 750},
  y = {"tanSim.m_flow"},
  range = {0, 11000.0, 60.0, (-20.0)},
  autoscale = true,
@@ -23,27 +23,27 @@ createPlot(id = 3,
  color = true,
  leftTitleType = 1,
  bottomTitleType = 1);
-createPlot(id = 3,
- position = {29, 28, 768, 218},
- y = {"tanEnh.vol[1].T", "tanEnh.vol[2].T", "tanEnh.vol[3].T", "tanEnh.vol[4].T", "tanEnh.vol[5].T", "tanEnh.vol[6].T", "tanEnh.vol[7].T", "tanEnh.vol[8].T", "tanEnh.vol[9].T", "tanEnh.vol[10].T"},
+createPlot(id = 2,
+ position = {580, 10, 560, 750},
+ y = {"tanSim.vol[1].T", "tanSim.vol[2].T", "tanSim.vol[3].T", "tanSim.vol[4].T", "tanSim.vol[5].T", "tanSim.vol[6].T", "tanSim.vol[7].T", "tanSim.vol[8].T", "tanSim.vol[9].T", "tanSim.vol[10].T"},
  range = {0, 11000.0, 45.0, 15.0},
  autoscale = true,
  autoerase = true,
  autoreplot = true,
  grid = true,
  color = true,
- subPlot = 3,
+ subPlot = 2,
  leftTitleType = 1,
  bottomTitleType = 1);
-createPlot(id = 3,
- position = {29, 28, 768, 220},
- y = {"tanSim.vol[1].T", "tanSim.vol[2].T", "tanSim.vol[3].T", "tanSim.vol[4].T", "tanSim.vol[5].T", "tanSim.vol[6].T", "tanSim.vol[7].T", "tanSim.vol[8].T", "tanSim.vol[9].T", "tanSim.vol[10].T"},
+createPlot(id = 2,
+ position = {580, 10, 560, 750},
+ y = {"tanEnh.vol[1].T", "tanEnh.vol[2].T", "tanEnh.vol[3].T", "tanEnh.vol[4].T", "tanEnh.vol[5].T", "tanEnh.vol[6].T", "tanEnh.vol[7].T", "tanEnh.vol[8].T", "tanEnh.vol[9].T", "tanEnh.vol[10].T"},
  range = {0, 11000.0, 45.0, 15.0},
  autoscale = true,
  autoerase = true,
  autoreplot = true,
  grid = true,
  color = true,
- subPlot = 2,
+ subPlot = 3,
  leftTitleType = 1,
  bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mos
index cfc05bc3bc9..44a09876624 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Storage.Examples.StratifiedEnhancedInternalHex", tolerance=1e-6, stopTime=1200, method="dassl", resultFile="StratifiedEnhancedInternalHex");
+simulateModel("Buildings.Fluid.Storage.Examples.StratifiedEnhancedInternalHex", tolerance=1e-6, stopTime=1200, method="CVode", resultFile="StratifiedEnhancedInternalHex");
 createPlot(id=4, position={0, 0, 1248, 810},
 y={"tanSte.vol[1].T", "tanSte.vol[2].T", "tanSte.vol[3].T", "tanSte.vol[4].T", "tanDyn.vol[1].T", "tanDyn.vol[2].T", "tanDyn.vol[3].T", "tanDyn.vol[4].T", "tanDynSol.vol[1].T", "tanDynSol.vol[2].T", "tanDynSol.vol[3].T", "tanDynSol.vol[4].T"},
 range={0.0, 1200.0, 15.0, 80.0}, grid=true, filename="StratifiedEnhancedInternalHex.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}, {0,0,0}, {162,29,33},
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerDynamics.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerDynamics.mos
index c5364cbcafb..2111badcf60 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerDynamics.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerDynamics.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Storage.Validation.HeatExchangerDynamics", tolerance=1e-6, stopTime=14400, method="dassl", resultFile="HeatExchangerDynamics");
+simulateModel("Buildings.Fluid.Storage.Validation.HeatExchangerDynamics", tolerance=1e-6, stopTime=14400, method="CVode", resultFile="HeatExchangerDynamics");
 createPlot(id=1, position={15, 10, 763, 942}, y={"senTanDyn.port_a.m_flow"}, range={0.0, 15000.0, -0.02, 0.14}, grid=true, filename="HeatExchangerDynamics.mat", colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 763, 310}, y={"senTanDyn.T", "senTanSte.T"}, range={0.0, 15000.0, 15.0, 60.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
 createPlot(id=1, position={15, 10, 763, 310}, y={"tanDyn.QHex_flow", "tanSte.QHex_flow"}, range={0.0, 15000.0, -500.0, 4500.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerLocation.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerLocation.mos
index 5883a422f64..b15839b2936 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerLocation.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerLocation.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Storage.Validation.HeatExchangerLocation", tolerance=1e-6, stopTime=600000, method="dassl", resultFile="HeatExchangerLocation");
+simulateModel("Buildings.Fluid.Storage.Validation.HeatExchangerLocation", tolerance=1e-6, stopTime=600000, method="CVode", resultFile="HeatExchangerLocation");
 createPlot(id=6, position={95, 90, 979, 543}, y={"tan_aTop.vol[1].T", "tan_bTop.vol[1].T"}, range={0.0, 600000.0, 10.0, 60.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 createPlot(id=6, position={95, 90, 979, 269}, y={"tan_aTop.vol[9].T", "tan_aTop.vol[10].T", "tan_aTop.vol[11].T","tan_aTop.vol[12].T", "tan_bTop.vol[9].T", "tan_bTop.vol[10].T","tan_bTop.vol[11].T", "tan_bTop.vol[12].T"}, range={0.0, 600000.0, 10.0, 60.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33},
 {244,125,35}, {102,44,145}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedLoadingUnloading.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedLoadingUnloading.mos
index c10fe458aa4..8217c0ad245 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedLoadingUnloading.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedLoadingUnloading.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Storage.Validation.StratifiedLoadingUnloading", tolerance=1e-6, stopTime=14400, method="dassl", resultFile="StratifiedLoadingUnloading");
+simulateModel("Buildings.Fluid.Storage.Validation.StratifiedLoadingUnloading", tolerance=1e-6, stopTime=14400, method="CVode", resultFile="StratifiedLoadingUnloading");
 createPlot(id = 1,
  position = {10, 30, 719, 600},
  filename = "StratifiedLoadingUnloading.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos
index b7c3fcf9406..8d0949d2c3f 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Storage/Validation/StratifiedNonUniformInitial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Fluid.Storage.Validation.StratifiedNonUniformInitial", tolerance=1e-6, stopTime=3600, method="dassl", resultFile="StratifiedNonUniformInitial");
+simulateModel("Buildings.Fluid.Storage.Validation.StratifiedNonUniformInitial", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="StratifiedNonUniformInitial");
 createPlot(id = 1,
  position = {10, 30, 719, 600},
  filename = "StratifiedNonUniformInitial.mat",
diff --git a/Buildings/Resources/Scripts/Dymola/HeatTransfer/Convection/Validation/ZeroWindSpeed.mos b/Buildings/Resources/Scripts/Dymola/HeatTransfer/Convection/Validation/ZeroWindSpeed.mos
new file mode 100644
index 00000000000..c6a3c684c34
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/HeatTransfer/Convection/Validation/ZeroWindSpeed.mos
@@ -0,0 +1,3 @@
+simulateModel("Buildings.HeatTransfer.Convection.Validation.ZeroWindSpeed", stopTime=3600, method="Cvode", tolerance=1e-06, resultFile="ZeroWindSpeed");
+createPlot(id=1, position={15, 15, 952, 854}, y={"nor.q_flow", "wes.q_flow", "sou.q_flow", "eas.q_flow"}, range={0.0, 4000.0, -16.0, -12.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, displayUnits={"W/m2", "W/m2", "W/m2", "W/m2"});
+createPlot(id=1, position={15, 15, 952, 854}, y={"nor.dir"}, range={0.0, 4000.0, -500.0, 500.0}, grid=true, colors={{28,108,200}}, displayUnits={"deg"});
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Antifreeze/Validation/PropyleneGlycolWater.mos b/Buildings/Resources/Scripts/Dymola/Media/Antifreeze/Validation/PropyleneGlycolWater.mos
index d6bbeec0f77..062c248822f 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Antifreeze/Validation/PropyleneGlycolWater.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Antifreeze/Validation/PropyleneGlycolWater.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Antifreeze.Validation.PropyleneGlycolWater", startTime=0, stopTime=1, tolerance=1E-6, method="dassl", resultFile="MediaAntifreezeValidationPropyleneGlycolWater");
+simulateModel("Buildings.Media.Antifreeze.Validation.PropyleneGlycolWater", startTime=0, stopTime=1, tolerance=1E-6, method="CVode", resultFile="MediaAntifreezeValidationPropyleneGlycolWater");
 createPlot(
   id   = 1,
   x    = "T_degC",
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/AirDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/AirDerivativeCheck.mos
index f330a02cbe8..f82b3071464 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/AirDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/AirDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.AirDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="dassl", resultFile="AirDerivativeCheck");
+simulateModel("Buildings.Media.Examples.AirDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="CVode", resultFile="AirDerivativeCheck");
 createPlot(id = 1,
  y = {"der(hLiqSym)", "der(hLiqCod)", "der(hSteSym)", "der(hSteCod)", "der(cpSym)", "der(cpCod)", "der(cvSym)", "der(cvCod)"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/AirProperties.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/AirProperties.mos
index 58c3370d951..a6ae778e4d0 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/AirProperties.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/AirProperties.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.AirProperties", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="AirProperties");
+simulateModel("Buildings.Media.Examples.AirProperties", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="AirProperties");
 createPlot(
   id   = 1,
   x    = "T_degC",
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/AirTemperatureEnthalpyInversion.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/AirTemperatureEnthalpyInversion.mos
index 001d41aae2a..86a007125f8 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/AirTemperatureEnthalpyInversion.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/AirTemperatureEnthalpyInversion.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.AirTemperatureEnthalpyInversion", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="AirTemperatureEnthalpyInversion");
+simulateModel("Buildings.Media.Examples.AirTemperatureEnthalpyInversion", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="AirTemperatureEnthalpyInversion");
 createPlot(id = 1,
  position = {31, 30, 400, 280},
  y = {"T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mos
index dcc97555cd9..f496eef308e 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.PropyleneGlycolWaterDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="dassl", resultFile="MediaExamplesPropyleneGlycolWaterDerivativeCheck");
+simulateModel("Buildings.Media.Examples.PropyleneGlycolWaterDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="CVode", resultFile="MediaExamplesPropyleneGlycolWaterDerivativeCheck");
 createPlot(id = 1,
  y = {"der(hLiqSym)", "der(hLiqCod)", "der(cpSym)", "der(cpCod)", "der(cvSym)", "der(cvCod)"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterProperties.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterProperties.mos
index 1c0e2544083..a4edebf1191 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterProperties.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterProperties.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.PropyleneGlycolWaterProperties", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesPropyleneGlycolWaterProperties");
+simulateModel("Buildings.Media.Examples.PropyleneGlycolWaterProperties", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesPropyleneGlycolWaterProperties");
 
 createPlot(
   id   = 1,
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mos
index 580e104b04d..8fb39aaa039 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/PropyleneGlycolWaterTemperatureEnthalpyInversion.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.PropyleneGlycolWaterTemperatureEnthalpyInversion", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesPropyleneGlycolWaterTemperatureEnthalpyInversion");
+simulateModel("Buildings.Media.Examples.PropyleneGlycolWaterTemperatureEnthalpyInversion", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesPropyleneGlycolWaterTemperatureEnthalpyInversion");
 createPlot(id = 1,
  position = {31, 30, 400, 280},
  y = {"T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/SteamProperties.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/SteamProperties.mos
index ff000ef278f..514d3c50aa4 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/SteamProperties.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/SteamProperties.mos
@@ -30,97 +30,48 @@ createPlot(
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 7,
-=======
   id   = 6,
->>>>>>> master
   x    = "T_degC",
   y    = {"u"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 8,
-=======
   id   = 7,
->>>>>>> master
   x    = "T_degC",
   y    = {"s"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 9,
-=======
   id   = 8,
->>>>>>> master
   x    = "T_degC",
   y    = {"g"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 10,
-=======
   id   = 9,
->>>>>>> master
   x    = "T_degC",
   y    = {"f"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 11,
-=======
   id   = 10,
->>>>>>> master
   x    = "T_degC",
   y    = {"hIse"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 12,
-=======
   id   = 11,
->>>>>>> master
   x    = "T_degC",
   y    = {"beta"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 13,
-=======
   id   = 12,
->>>>>>> master
   x    = "T_degC",
   y    = {"kappa"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 14,
-  x    = "T_degC",
-  y    = {"ddpT"},
-  grid = true
-)
-createPlot(
-  id   = 15,
-  x    = "T_degC",
-  y    = {"ddTp"},
-  grid = true
-  )
-createPlot(
-  id   = 16,
-  x    = "T_degC",
-  y    = {"dddX[1]"},
-  grid = true
-)  
-createPlot(
-  id   = 17,
-=======
   id   = 13,
   x    = "T_degC",
   y    = {"ddhp"},
@@ -134,57 +85,36 @@ createPlot(
   ) 
 createPlot(
   id   = 15,
->>>>>>> master
   x    = "T_degC",
   y    = {"cp"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 18,
-=======
   id   = 16,
->>>>>>> master
   x    = "T_degC",
   y    = {"cv"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 19,
-=======
   id   = 17,
->>>>>>> master
   x    = "T_degC",
   y    = {"lambda"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 20,
-=======
   id   = 18,
->>>>>>> master
   x    = "T_degC",
   y    = {"pMed"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 21,
-=======
   id   = 19,
->>>>>>> master
   x    = "T_degC",
   y    = {"TMed"},
   grid = true
 )
 createPlot(
-<<<<<<< HEAD
-  id   = 22,
-=======
   id   = 20,
->>>>>>> master
   x    = "T_degC",
   y    = {"MM"},
   grid = true
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturatedProperties.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturatedProperties.mos
deleted file mode 100644
index 172d5c82e0e..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/SteamSaturatedProperties.mos
+++ /dev/null
@@ -1,55 +0,0 @@
-simulateModel("Buildings.Media.Examples.SteamSaturatedProperties", method="dassl", startTime=0, stopTime=1.0, tolerance=1e-06, resultFile="SteamSaturatedProperties");
-createPlot(
-  id   = 1,
-  x    = "pSat",
-  y    = {"TSat_degC"},
-  grid = true
-)
-createPlot(
-  id   = 2,
-  x    = "pSat",
-  y    = {"dl"},
-  grid = true
-  )
-createPlot(
-  id   = 3,
-  x    = "pSat",
-  y    = {"dv"},
-  grid = true
-  )
-createPlot(
-  id   = 4,
-  x    = "pSat",
-  y    = {"hl"},
-  grid = true
-  )
-createPlot(
-  id   = 5,
-  x    = "pSat",
-  y    = {"hv"},
-  grid = true
-  )
-createPlot(
-  id   = 6,
-  x    = "pSat",
-  y    = {"hlv"},
-  grid = true
-  )
-createPlot(
-  id   = 7,
-  x    = "pSat",
-  y    = {"sl"},
-  grid = true
-)
-createPlot(
-  id   = 8,
-  x    = "pSat",
-  y    = {"sv"},
-  grid = true
-)
-createPlot(
-  id   = 9,
-  x    = "pSat",
-  y    = {"slv"},
-  grid = true
-)
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterDerivativeCheck.mos
index 29f02106e5c..d77619e158e 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.WaterDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="dassl", resultFile="MediaExamplesWaterDerivativeCheck");
+simulateModel("Buildings.Media.Examples.WaterDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="CVode", resultFile="MediaExamplesWaterDerivativeCheck");
 createPlot(id = 1,
  y = {"der(hLiqSym)", "der(hLiqCod)", "der(cpSym)", "der(cpCod)", "der(cvSym)", "der(cvCod)"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterProperties.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterProperties.mos
index a1265a6c3f4..a106ff4696b 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterProperties.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterProperties.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.WaterProperties", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterProperties");
+simulateModel("Buildings.Media.Examples.WaterProperties", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterProperties");
 createPlot(
   id   = 1,
   x    = "T_degC",
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterTemperatureEnthalpyInversion.mos b/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterTemperatureEnthalpyInversion.mos
index 96cd9e7958d..bf50855e7cc 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterTemperatureEnthalpyInversion.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Examples/WaterTemperatureEnthalpyInversion.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Examples.WaterTemperatureEnthalpyInversion", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterTemperatureEnthalpyInversion");
+simulateModel("Buildings.Media.Examples.WaterTemperatureEnthalpyInversion", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterTemperatureEnthalpyInversion");
 createPlot(id = 1,
  position = {31, 30, 400, 280},
  y = {"T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mos b/Buildings/Resources/Scripts/Dymola/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mos
index 7d4586b3ef7..a1653f57386 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Refrigerants.Validation.R410A_dSpecificVolumeVap_pT", method="dassl", tolerance=1e-6, stopTime=100, resultFile="dSpecificVolumeVap_pT");
+simulateModel("Buildings.Media.Refrigerants.Validation.R410A_dSpecificVolumeVap_pT", method="CVode", tolerance=1e-6, stopTime=100, resultFile="dSpecificVolumeVap_pT");
 
 createPlot(id = 1,
    position = {60, 10, 640, 480},
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mos
index 5be70bda31e..2a421a4efef 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Specialized.Air.Examples.PerfectGasDerivativeCheck", startTime=0, stopTime=1, tolerance=1e-8, method="dassl", resultFile="PerfectGasDerivativeCheck");
+simulateModel("Buildings.Media.Specialized.Air.Examples.PerfectGasDerivativeCheck", startTime=0, stopTime=1, tolerance=1e-8, method="CVode", resultFile="PerfectGasDerivativeCheck");
 createPlot(id = 1,
  y = {"der(hLiqSym)", "der(hLiqCod)", "der(hSteSym)", "der(hSteCod)", "der(hAirSym)", "der(hAirCod)"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasTemperatureEnthalpyInversion.mos b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasTemperatureEnthalpyInversion.mos
index 3bcd49f0649..5d337c80fa6 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasTemperatureEnthalpyInversion.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Air/Examples/PerfectGasTemperatureEnthalpyInversion.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Specialized.Air.Examples.PerfectGasTemperatureEnthalpyInversion", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PerfectGasesPerfectGasTemperatureEnthalpyInversion");
+simulateModel("Buildings.Media.Specialized.Air.Examples.PerfectGasTemperatureEnthalpyInversion", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PerfectGasesPerfectGasTemperatureEnthalpyInversion");
 createPlot(id = 1,
  position = {31, 30, 400, 280},
  y = {"T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mos
index 614bf9352a4..2d2ebd43baa 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Specialized.Water.Examples.TemperatureDependentDensityDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="dassl", resultFile="MediaExamplesWaterTemperatureDependentDensityDerivativeCheck");
+simulateModel("Buildings.Media.Specialized.Water.Examples.TemperatureDependentDensityDerivativeCheck", startTime=0, stopTime=1, tolerance=1E-8, method="CVode", resultFile="MediaExamplesWaterTemperatureDependentDensityDerivativeCheck");
 createPlot(id = 1,
  y = {"der(hLiqSym)", "der(hLiqCod)", "der(cpSym)", "der(cpCod)", "der(cvSym)", "der(cvCod)"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mos b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mos
index 37d44d65556..316ed2afebb 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Specialized.Water.Examples.TemperatureDependentDensityProperties", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterTemperatureDependentDensityProperties");
+simulateModel("Buildings.Media.Specialized.Water.Examples.TemperatureDependentDensityProperties", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterTemperatureDependentDensityProperties");
 createPlot(
   id   = 1,
   x    = "T_degC",
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityTemperatureEnthalpyInversion.mos b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityTemperatureEnthalpyInversion.mos
index bdf5e0c31be..c7e78cb3fc6 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityTemperatureEnthalpyInversion.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityTemperatureEnthalpyInversion.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Specialized.Water.Examples.TemperatureDependentDensityTemperatureEnthalpyInversion", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterTemperatureDependentDensityTemperatureEnthalpyInversion");
+simulateModel("Buildings.Media.Specialized.Water.Examples.TemperatureDependentDensityTemperatureEnthalpyInversion", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="MediaExamplesWaterTemperatureDependentDensityTemperatureEnthalpyInversion");
 createPlot(id = 1,
  position = {31, 30, 400, 280},
  y = {"T"},
diff --git a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/WaterProperties_pT.mos b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/WaterProperties_pT.mos
index 16d96f78b8c..c3e8cf14e01 100644
--- a/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/WaterProperties_pT.mos
+++ b/Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/WaterProperties_pT.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Media.Specialized.Water.Examples.WaterProperties_pT", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="WaterProperties_pT");
+simulateModel("Buildings.Media.Specialized.Water.Examples.WaterProperties_pT", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="WaterProperties_pT");
 createPlot(
   id   = 1,
   x    = "T_degC",
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos
new file mode 100644
index 00000000000..b24364c3575
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/ChangeSign.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.ChangeSign", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="ChangeSign1");
+createPlot(id=1, position={15, 10, 590, 420}, y={"changSign.u", "changSign.y"}, range={0.0, 1.0, -2, 2}, grid=true, colors={{238,46,47}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Derivative.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/Derivative.mos
similarity index 62%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Derivative.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/Derivative.mos
index 0751f400fff..1f2577b5af9 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Derivative.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/Derivative.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.Derivative", stopTime=2.0, method="Cvode", tolerance=1e-06, resultFile="Derivative1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.Derivative", stopTime=2.0, method="Cvode", tolerance=1e-06, resultFile="Derivative2");
 createPlot(id=1, position={15, 10, 800, 550}, subPlot=1, y={"cos1.y"}, range={0.0, 2.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={15, 10, 800, 550}, subPlot=2, y={"der1.y"}, range={0.0, 2.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos
similarity index 51%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos
index 3d39dfe107c..e7b73fcfec1 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqual.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqual", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="GreaterEqual1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqual", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="GreaterEqual1");
 createPlot(id=1, position={15, 10, 900, 420}, y={"greEqu.u1","greEqu.u2","greEqu.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{0,140,72},{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos
new file mode 100644
index 00000000000..0692f7124e7
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/GreaterEqualThreshold.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="GreaterEqualThreshold1");
+createPlot(id=1, position={15, 10, 900, 420}, y={"greEquThr.u", "greEquThr.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos
index 8c582d91ecf..2dec1f37775 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/HysteresisWithHold.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold", stopTime=1800, tolerance=1e-06, resultFile="HysteresisWithHold1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold", stopTime=1800, tolerance=1e-06, resultFile="HysteresisWithHold1");
 createPlot(id=1, position={10, 20, 730, 800}, subPlot=1,y={"noHold.u","noHold.y","noHold.uLow","noHold.uHigh"}, range={0.0, 1800.0, 14.0, 32.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72},{0,140,72}});
 createPlot(id=1, position={10, 20, 730, 800}, subPlot=2,y={"onHold_30s.u","onHold_30s.y","onHold_30s.uLow","onHold_30s.uHigh"}, range={0.0, 1800.0, 14.0, 32.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72},{0,140,72}});
 createPlot(id=2, position={750, 20, 730, 800}, subPlot=1,y={"offHold_300s.u","offHold_300s.y","offHold_300s.uLow","offHold_300s.uHigh"}, range={0.0, 1800.0, 14.0, 32.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72},{0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos
similarity index 52%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos
index 05abd6acb33..5d3590b7702 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqual.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqual", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="LessEqual1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqual", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="LessEqual1");
 createPlot(id=1, position={15, 10, 900, 420}, y={"lesEqu.u1","lesEqu.u2","lesEqu.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{0,140,72},{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos
new file mode 100644
index 00000000000..d377f9e7e7c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LessEqualThreshold.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="LessEqualThreshold1");
+createPlot(id=1, position={15, 10, 900, 420}, y={"lesEquThr.u", "lesEquThr.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47},{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPID.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPID.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPID.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPID.mos
index 896c31b7115..715a79ff471 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPID.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPID.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LimPID", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="LimPID1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPID", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="LimPID2");
 createPlot(id=1, position={15, 10, 900, 700}, subPlot=1, y={"limPID.u_s","limPID.u_m","limPIDOri.y"}, range={0.0, 1.0, -2.0, 2.0}, grid=true, colors={{238,46,47},{0,140,72},{217,67,180}});
 createPlot(id=1, position={15, 10, 900, 700}, subPlot=2, y={"limPID.u_s","limPID.y","noLimPID.y"}, range={0.0, 1.0, -2.0, 2.0}, grid=true, colors={{238,46,47},{0,140,72},{217,67,180}});
 createPlot(id=1, position={15, 10, 900, 700}, subPlot=3, y={"limP.y","limPI.y","limPD.y"}, range={0.0, 1.0, -2.0, 2.0}, grid=true, colors={{238,46,47},{0,140,72},{217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos
new file mode 100644
index 00000000000..f2467110b82
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialDerivativeOutput.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput", tolerance=1e-06, stopTime=0.2, resultFile="LimPIDInitialDerivativeOutput1");
+createPlot(id=1, position={31, 124, 592, 372}, y={"limPID.y", "limPD.y", "limPID.D.y", "limPD.D.y"}, range={0.0, 1.0, -0.2, 0.6}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {0,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos
new file mode 100644
index 00000000000..3514c01401b
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDInitialState.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState", tolerance=1e-06, resultFile="LimPIDInitialState1");
+createPlot(id=1, position={35, 35, 926, 623}, y={"limPID.I.y", "limPID.D.y", "limPI.I.y", "limPID.D.u"}, range={0.0, 1.0, -0.6, 0.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos
similarity index 81%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos
index 31bc5187a88..25003452c04 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/LimPIDWithReset.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset", stopTime=10, method="Cvode", tolerance=1e-06, resultFile="CDL_LimPIDWithReset");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset", stopTime=10, method="Cvode", tolerance=1e-06, resultFile="CDL_LimPIDWithReset1");
 createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIDPar.u_s", "limPIDPar.u_m", "limPIDPar.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIDInp.u_s", "limPIDInp.u_m", "limPIDInp.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={35, 35, 800, 1027}, y={"limPIPar.u_s", "limPIPar.u_m", "limPIPar.y"}, range={0.0, 10.0, -0.5, 1.5}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos
similarity index 60%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos
index 224e12409db..1fb90afa3f9 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Continuous/Validation/NumberOfRequests.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="NumberOfRequests1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="NumberOfRequests1");
 createPlot(id=1, position={15, 10, 590, 420}, y={"numReq1.u[1]","numReq1.u[2]","numReq1.u[3]","numReq1.u[4]","numReq1.u[5]", "numReq1.y"}, range={0.0, 1.0, -2.0, 5.0}, grid=true, colors={{238,46,47},{0,140,72},{217,67,180},{0,0,0},{162,29,33},{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/Timer.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/Timer.mos
new file mode 100644
index 00000000000..63aa70defbc
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Logical/Validation/Timer.mos
@@ -0,0 +1,15 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.Timer", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="Timer2");
+createPlot(id=1, position={15, 10, 450, 600}, subPlot=1, y={"resetTimer.u"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}});
+createPlot(id=1, position={15, 10, 450, 600}, subPlot=2, y={"resetTimer.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+
+createPlot(id=2, position={480, 10, 450, 600}, subPlot=1, y={"accuTimer.u", "accuTimer.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
+createPlot(id=2, position={480, 10, 450, 600}, subPlot=2, y={"accuTimer.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+
+createPlot(id=3, position={950, 10, 450, 600}, subPlot=1, y={"accuTimer1.u", "accuTimer1.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
+createPlot(id=3, position={950, 10, 450, 600}, subPlot=2, y={"accuTimer1.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+
+createPlot(id=4, position={1415, 10, 450, 600}, subPlot=1, y={"accuTimer2.u", "accuTimer2.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
+createPlot(id=4, position={1415, 10, 450, 600}, subPlot=2, y={"accuTimer2.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+
+createPlot(id=5, position={1880, 10, 450, 600}, subPlot=1, y={"accuTimer3.u", "accuTimer3.reset"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{238,46,47}, {238,46,47}});
+createPlot(id=5, position={1880, 10, 450, 600}, subPlot=2, y={"accuTimer3.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos
similarity index 77%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos
index 6360f4612b6..3f49a93ef1f 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TDewPoi_TDryBulPhi.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="TDewPoi_TDryBulPhi1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="TDewPoi_TDryBulPhi1");
 createPlot(id=1, position={15, 10, 590, 700}, subPlot=1, y={"dewBulPhi.TDewPoi","TDewPoi.T"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{28,108,200}});
 createPlot(id=1, position={15, 10, 590, 700}, subPlot=2, y={"dewBulPhi1.TDewPoi","TDewPoi1.T"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{28,108,200}});
 createPlot(id=2, position={620, 10, 590, 700}, subPlot=1, y={"add.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos
rename to Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos
index 7d15ba0b9f9..d0588468215 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/TWetBul_TDryBulPhi.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="TWetBul_TDryBulPhi1");
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="TWetBul_TDryBulPhi1");
 createPlot(id=1, position={15, 10, 650, 600}, subPlot=1, y={"wetBulPhi.TWetBul","wetBulPhi_BuiLib.TWetBul"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{217,67,180}});
 createPlot(id=1, position={15, 10, 650, 600}, subPlot=2, y={"add.y","phi.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{217,67,180}});
 createPlot(id=2, position={680, 10, 650, 600}, subPlot=1, y={"wetBulPhi.TWetBul","wetBulXi.TWetBul"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{0,140,72},{217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos
new file mode 100644
index 00000000000..75e170a4127
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Obsolete/Controls/OBC/CDL/Psychrometrics/Validation/h_TDryBulPhi.mos
@@ -0,0 +1,3 @@
+simulateModel("Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi", stopTime=1.0, method="Cvode", tolerance=1e-06, resultFile="h_TDryBulPhi1");
+createPlot(id=1, position={15, 10, 1000, 700}, subPlot=1, y={"hBulPhi.h"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
+createPlot(id=1, position={15, 10, 1000, 700}, subPlot=2, y={"phi.y"}, range={0.0, 5.0, -3.5, 3.5}, grid=true, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Comfort/Validation/FangerCBE.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Comfort/Validation/FangerCBE.mos
new file mode 100644
index 00000000000..a54ccbf66d1
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Comfort/Validation/FangerCBE.mos
@@ -0,0 +1,3 @@
+ // Script for comparing the PMV model with the CBE thermal comfort tool
+simulateModel("Buildings.Utilities.Comfort.Validation.FangerCBE", stopTime=2300, method="CVode", tolerance=1e-06, resultFile="FangerCBE");
+createPlot(id=1, position={15, 15, 592, 372}, y={"PMVRef.y[1]", "com.PMV"}, range={0.0, 2500.0, -2.0, 2.0}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Cryptographics/Validation/SHA1.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Cryptographics/Validation/SHA1.mos
index e301866cbed..f8ca28475c7 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Cryptographics/Validation/SHA1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Cryptographics/Validation/SHA1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Cryptographics.Validation.SHA1", tolerance=1e-6, stopTime=1, method="dassl", resultFile="SHA1");
+simulateModel("Buildings.Utilities.Cryptographics.Validation.SHA1", tolerance=1e-6, stopTime=1, method="CVode", resultFile="SHA1");
 createPlot(id = 1,
  position = {50, 50, 700, 500},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Diagnostics/Validation/CheckEquality.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Diagnostics/Validation/CheckEquality.mos
index 5b8a2f160d9..0978c293513 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Diagnostics/Validation/CheckEquality.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Diagnostics/Validation/CheckEquality.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Utilities.Diagnostics.Validation.CheckEquality", stopTime=1, tolerance=1e-6, method="dassl", resultFile="CheckEquality");
+simulateModel("Buildings.Utilities.Diagnostics.Validation.CheckEquality", stopTime=1, tolerance=1e-6, method="CVode", resultFile="CheckEquality");
 createPlot(id=1, position={0, 0, 1616, 824}, y={"cheEqu.y"}, range={0.0, 1.0, -0.035, 0.039999999999999994}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 1616, 409}, y={"cheEqu.u1", "cheEqu.u2"}, range={0.0, 1.0, 0.065, 0.135}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVReader.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVReader.mos
index f3b371e9885..f97aff807dd 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVReader.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVReader.mos
@@ -1,2 +1,2 @@
-simulateModel("Buildings.Utilities.IO.Files.Examples.CSVReader", startTime=-1.21, stopTime=10, tolerance=1e-6, method="dassl", resultFile="CSVReader");
+simulateModel("Buildings.Utilities.IO.Files.Examples.CSVReader", startTime=-1.21, stopTime=10, tolerance=1e-6, method="CVode", resultFile="CSVReader");
 createPlot(id=1, position={0, 0, 1301, 757}, y={"combiTimeTable.y[1]", "combiTimeTable.y[2]", "cos.y", "step.y"}, range={-1.5, 10.0, -1.1, 1.1}, erase=false, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVWriter.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVWriter.mos
index 57b84485e47..184fd1b176c 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVWriter.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVWriter.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Utilities.IO.Files.Examples.CSVWriter", startTime=-1.21, stopTime=10, tolerance=1e-6, method="dassl", resultFile="CSVWriter");
+simulateModel("Buildings.Utilities.IO.Files.Examples.CSVWriter", startTime=-1.21, stopTime=10, tolerance=1e-6, method="CVode", resultFile="CSVWriter");
 
 createPlot(id=1, position={0, 0, 1301, 757}, y={"cos.y", "step.y"}, range={-1.5, 10.0, -1.1, 1.1}, erase=false, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/KalmanFilter.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/KalmanFilter.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/KalmanFilter.mos
rename to Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/KalmanFilter.mos
index 235a83e1740..a470ef9b77a 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/KalmanFilter.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/KalmanFilter.mos
@@ -2,7 +2,7 @@
 // https://github.com/lbl-srg/modelica-buildings/issues/559
 Advanced_CompileWith64_ori=Advanced.CompileWith64;
 Advanced.CompileWith64 = 2;
-simulateModel("Buildings.Utilities.IO.Python27.Examples.KalmanFilter", method="dassl", resultFile="KalmanFilter", tolerance=1e-6, stopTime=1);
+simulateModel("Buildings.Utilities.IO.Python36.Examples.KalmanFilter", method="dassl", resultFile="KalmanFilter", tolerance=1e-6, stopTime=1);
 createPlot(id = 1,
  position = {15, 10, 592, 414},
  y = {"kalFil.uR[1]", "kalFil.yR[1]", "sine.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/SimpleRoom.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/SimpleRoom.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/SimpleRoom.mos
rename to Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/SimpleRoom.mos
index 7090b1148f5..ca0d2965134 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/SimpleRoom.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/SimpleRoom.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Utilities.IO.Python27.Examples.SimpleRoom", stopTime=86400, method="dassl", tolerance=1e-06, resultFile="SimpleRoom");
+simulateModel("Buildings.Utilities.IO.Python36.Examples.SimpleRoom", stopTime=86400, method="dassl", tolerance=1e-06, resultFile="SimpleRoom");
 createPlot(id=1, position={136, 30, 2125, 957}, y={"TAmb.y", "onOffCon.u"}, range={0.0, 1.0, 0.0, 25.0}, grid=true, colors={{238,46,47}, {28,108,200}});
 createPlot(id=1, position={136, 30, 2125, 476}, y={"pyt.yR[2]"}, range={0.0, 1.0, -2000.0, 10000.0}, grid=true, subPlot=2, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/Exchange.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/Exchange.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/Exchange.mos
rename to Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/Exchange.mos
index 190526e63a2..a8f9b84611b 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/Exchange.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/Exchange.mos
@@ -2,7 +2,7 @@
 // https://github.com/lbl-srg/modelica-buildings/issues/559
 Advanced_CompileWith64_ori=Advanced.CompileWith64;
 Advanced.CompileWith64 = 2;
-simulateModel("Buildings.Utilities.IO.Python27.Functions.Examples.Exchange", method="Euler", fixedstepsize=1, tolerance=1e-6, stopTime=1.0, resultFile="Exchange");
+simulateModel("Buildings.Utilities.IO.Python36.Functions.Examples.Exchange", method="Euler", fixedstepsize=1, tolerance=1e-6, stopTime=1.0, resultFile="Exchange");
 createPlot(id = 1,
  position = {15, 10, 407, 281},
  y = {"yR1[1]", "yI1[1]", "yR2[1]", "yR2[2]", "yI2[1]", "yI2[2]"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/ExchangeWithPassPythonObject.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/ExchangeWithPassPythonObject.mos
rename to Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos
index 0d7de6eefc7..1611f104d8c 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/ExchangeWithPassPythonObject.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos
@@ -2,6 +2,6 @@
 // https://github.com/lbl-srg/modelica-buildings/issues/559
 Advanced_CompileWith64_ori=Advanced.CompileWith64;
 Advanced.CompileWith64 = 2;
-simulateModel("Buildings.Utilities.IO.Python27.Functions.Examples.ExchangeWithPassPythonObject", method="Euler", fixedstepsize=1, tolerance=1e-6, stopTime=1.0, resultFile="ExchangeWithPassPythonObject");
+simulateModel("Buildings.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject", method="Euler", fixedstepsize=1, tolerance=1e-6, stopTime=1.0, resultFile="ExchangeWithPassPythonObject");
 createPlot(id=3, position={0, 0, 2411, 1036}, y={"yR1[1]", "yR2[1]"}, range={0.0, 1.2000000000000002E-05, 2.0, 17.0}, grid=true, colors={{28,108,200}, {238,46,47}});
 Advanced.CompileWith64 = Advanced_CompileWith64_ori;
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/SignalExchange/Examples/FirstOrder.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/SignalExchange/Examples/FirstOrder.mos
index 05974735a19..6abb6c4d9ae 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/IO/SignalExchange/Examples/FirstOrder.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/SignalExchange/Examples/FirstOrder.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Utilities.IO.SignalExchange.Examples.FirstOrder", stopTime=150, tolerance=1e-6, method="dassl", resultFile="FirstOrder");
+simulateModel("Buildings.Utilities.IO.SignalExchange.Examples.FirstOrder", stopTime=150, tolerance=1e-6, method="CVode", resultFile="FirstOrder");
 createPlot(id=1, position={55, 50, 592, 427}, y={"expMod.oveWriSet_u", "expMod.oveWriAct_u", "expMod.rea"}, range={0.0, 150.0, -2.0, 4.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=1, position={55, 50, 592, 211}, y={"expMod.oveWriSet_activate", "expMod.oveWriAct_activate"}, range={0.0, 150.0, -0.5, 1.5}, grid=true, subPlot=2, colors={{28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Average.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Average.mos
index 1e13ac1d886..5e31a8745b4 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Average.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Average.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.Average", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="Average");
+simulateModel("Buildings.Utilities.Math.Examples.Average", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Average");
 createPlot(id = 1,
  y = {"average.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ0.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ0.mos
index 67be0360a46..1be108850a0 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ0.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ0.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.BesselJ0", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="dassl", resultFile="BesselJ0Block");
+simulateModel("Buildings.Utilities.Math.Examples.BesselJ0", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="CVode", resultFile="BesselJ0Block");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ1.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ1.mos
index 5ffab6149ac..ef5ba1e7af6 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselJ1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.BesselJ1", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="dassl", resultFile="BesselJ1Block");
+simulateModel("Buildings.Utilities.Math.Examples.BesselJ1", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="CVode", resultFile="BesselJ1Block");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY0.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY0.mos
index 07d3074f617..6a83923fe53 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY0.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY0.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.BesselY0", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="dassl", resultFile="BesselY0Block");
+simulateModel("Buildings.Utilities.Math.Examples.BesselY0", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="CVode", resultFile="BesselY0Block");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY1.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY1.mos
index d0066fe7c01..2a736efaae0 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BesselY1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.BesselY1", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="dassl", resultFile="BesselY1Block");
+simulateModel("Buildings.Utilities.Math.Examples.BesselY1", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="CVode", resultFile="BesselY1Block");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Bicubic.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Bicubic.mos
index 3b2a9514e2f..3245c22300a 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Bicubic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Bicubic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.Bicubic", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="Bicubic");
+simulateModel("Buildings.Utilities.Math.Examples.Bicubic", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Bicubic");
 createPlot(id = 1,
  y = {"bicubic.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Binomial.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Binomial.mos
index 3abc66675e0..c4edde73554 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Binomial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Binomial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.Binomial", tolerance=1e-6, startTime=0.0, stopTime=11.0, method="dassl", resultFile="BinomialBlock");
+simulateModel("Buildings.Utilities.Math.Examples.Binomial", tolerance=1e-6, startTime=0.0, stopTime=11.0, method="CVode", resultFile="BinomialBlock");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Biquadratic.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Biquadratic.mos
index aa319397044..6cd86d48d0f 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Biquadratic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Biquadratic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.Biquadratic", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="Biquadratic");
+simulateModel("Buildings.Utilities.Math.Examples.Biquadratic", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Biquadratic");
 createPlot(id = 1,
  y = {"biquadratic.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BooleanReplicator.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BooleanReplicator.mos
index 67902d0ad89..ceebe50fc63 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BooleanReplicator.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/BooleanReplicator.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.BooleanReplicator",tolerance=1e-6, stopTime=600, method="dassl", resultFile="BooleanReplicator");
+simulateModel("Buildings.Utilities.Math.Examples.BooleanReplicator",tolerance=1e-6, stopTime=600, method="CVode", resultFile="BooleanReplicator");
 removePlots();
 createPlot(id = 1,
  position = {11, 3, 438, 440},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/ExponentialIntegralE1.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/ExponentialIntegralE1.mos
index 7cff07fcba5..a55120afb30 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/ExponentialIntegralE1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/ExponentialIntegralE1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.ExponentialIntegralE1", tolerance=1e-6, startTime=0.01, stopTime=3.0, method="dassl", resultFile="ExponentialIntegralE1Block");
+simulateModel("Buildings.Utilities.Math.Examples.ExponentialIntegralE1", tolerance=1e-6, startTime=0.01, stopTime=3.0, method="CVode", resultFile="ExponentialIntegralE1Block");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Factorial.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Factorial.mos
index 3e2e80b46ef..5b35367665e 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Factorial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Factorial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.Factorial", tolerance=1e-6, startTime=0.0, stopTime=13.0, method="dassl", resultFile="FactorialBlock");
+simulateModel("Buildings.Utilities.Math.Examples.Factorial", tolerance=1e-6, startTime=0.0, stopTime=13.0, method="CVode", resultFile="FactorialBlock");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/FallingFactorial.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/FallingFactorial.mos
index de089524087..21e1c1cd85d 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/FallingFactorial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/FallingFactorial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.FallingFactorial", tolerance=1e-6, startTime=0.0, stopTime=11.0, method="dassl", resultFile="FallingFactorialBlock");
+simulateModel("Buildings.Utilities.Math.Examples.FallingFactorial", tolerance=1e-6, startTime=0.0, stopTime=11.0, method="CVode", resultFile="FallingFactorialBlock");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegerReplicator.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegerReplicator.mos
index 781dd6b2d2e..8301a5beebf 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegerReplicator.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegerReplicator.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.IntegerReplicator",tolerance=1e-6, stopTime=2, method="dassl", resultFile="IntegerReplicator");
+simulateModel("Buildings.Utilities.Math.Examples.IntegerReplicator",tolerance=1e-6, stopTime=2, method="CVode", resultFile="IntegerReplicator");
 removePlots();
 createPlot(id = 1,
  position = {11, 3, 438, 673},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegratorWithReset.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegratorWithReset.mos
index 7e035670d81..970303daf12 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegratorWithReset.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/IntegratorWithReset.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.IntegratorWithReset", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="IntegratorWithReset");
+simulateModel("Buildings.Utilities.Math.Examples.IntegratorWithReset", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="IntegratorWithReset");
 createPlot(id=1, position={35, 30, 586, 834}, y={"cons.y"}, range={0.0, 1.0, 8.8, 11.2}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 586, 415}, y={"booleanPulse.y"}, range={0.0, 1.0, -0.1, 1.1}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=2, position={645, 30, 725, 822}, y={"intWitRes1.y_start", "intWitRes1.y_reset", "intWitRes1.y"}, range={0.0, 1.0, 1.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/InverseXRegularized.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/InverseXRegularized.mos
index e21cbcc52a3..2524b4f0b56 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/InverseXRegularized.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/InverseXRegularized.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.InverseXRegularized", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="InverseXRegularizedBlock");
+simulateModel("Buildings.Utilities.Math.Examples.InverseXRegularized", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InverseXRegularizedBlock");
 createPlot(id = 1,
  y = {"inverseXRegularized.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Polynominal.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Polynominal.mos
index 6c3e7aa09c8..18c2d593b5c 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Polynominal.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Polynominal.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.Polynominal", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="Polynominal");
+simulateModel("Buildings.Utilities.Math.Examples.Polynominal", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Polynominal");
 createPlot(id = 1,
  y = {"polynominal.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/PowerLinearized.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/PowerLinearized.mos
index 5ae8d52b9d9..3a1ccd985d4 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/PowerLinearized.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/PowerLinearized.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.PowerLinearized", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="PowerLinearizedBlock");
+simulateModel("Buildings.Utilities.Math.Examples.PowerLinearized", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PowerLinearizedBlock");
 createPlot(id = 1,
  y = {"powerLinearized.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/QuadraticLinear.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/QuadraticLinear.mos
index a735da44b40..63167a61517 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/QuadraticLinear.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/QuadraticLinear.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.QuadraticLinear", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="QuadraticLinear");
+simulateModel("Buildings.Utilities.Math.Examples.QuadraticLinear", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="QuadraticLinear");
 createPlot(id = 1,
  y = {"quadraticLinear.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/RegNonZeroPower.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/RegNonZeroPower.mos
index f7fa93bc0e1..79ce59a8c98 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/RegNonZeroPower.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/RegNonZeroPower.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.RegNonZeroPower", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="RegNonZeroPowerBlock");
+simulateModel("Buildings.Utilities.Math.Examples.RegNonZeroPower", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="RegNonZeroPowerBlock");
 createPlot(id = 1,
  y = {"regNonZeroPower.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothBlocks.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothBlocks.mos
index 8348650d246..a17bdd8c0f0 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothBlocks.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothBlocks.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.SmoothBlocks", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SmoothBlocks");
+simulateModel("Buildings.Utilities.Math.Examples.SmoothBlocks", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SmoothBlocks");
 removePlots();
 createPlot(id = 3,
  position = {4, 21, 531, 524},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothExponential.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothExponential.mos
index ceac787a72b..a41a9e52728 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothExponential.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothExponential.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.SmoothExponential", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="SmoothExponential");
+simulateModel("Buildings.Utilities.Math.Examples.SmoothExponential", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SmoothExponential");
 createPlot(id = 1,
  y = {"smoothExponential.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothHeaviside.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothHeaviside.mos
index 67f607d8d90..7f2026322af 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothHeaviside.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothHeaviside.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.SmoothHeaviside", method="euler", tolerance=1e-6, stopTime=1.0, resultFile="SmoothHeaviside");
+simulateModel("Buildings.Utilities.Math.Examples.SmoothHeaviside", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SmoothHeaviside");
 createPlot(id = 1,
  y = {"smoothHeaviside.y"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothLimit.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothLimit.mos
index e2643cc826e..8c04fc0b39d 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothLimit.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothLimit.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Utilities.Math.Examples.SmoothLimit",  startTime=0, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SmoothLimit");
+simulateModel("Buildings.Utilities.Math.Examples.SmoothLimit",  startTime=0, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SmoothLimit");
 createPlot(id = 1,
  position = {4, 21, 531, 524},
  y = {"smoLim.y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothMin.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothMin.mos
index ffd95e59e9f..03b0c832f64 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothMin.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/SmoothMin.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Utilities.Math.Examples.SmoothMin",  startTime=0, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SmoothMin");
+simulateModel("Buildings.Utilities.Math.Examples.SmoothMin",  startTime=0, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SmoothMin");
 createPlot(id=1,
 position={4, 21, 531, 524},
 y={"smoLim[2].y", "smoLim[1].y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Splice.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Splice.mos
index 58645d5e226..89e9163248e 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Splice.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Splice.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.Splice",tolerance=1e-6, stopTime=2, method="dassl", resultFile="Splice");
+simulateModel("Buildings.Utilities.Math.Examples.Splice",tolerance=1e-6, stopTime=2, method="CVode", resultFile="Splice");
 removePlots();
 createPlot(id = 1,
  position = {15, 10, 481, 313},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/VectorFunctions.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/VectorFunctions.mos
index f7783b34d0e..f16636ce943 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/VectorFunctions.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/VectorFunctions.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Examples.VectorFunctions", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="VectorFunctions");
+simulateModel("Buildings.Utilities.Math.Examples.VectorFunctions", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="VectorFunctions");
 removePlots();
 createPlot(id = 5,
  position = {60, 90, 674, 527},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ0.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ0.mos
index 1d55be037f4..a24b37becfc 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ0.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ0.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselJ0", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="dassl", resultFile="BesselJ0");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselJ0", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="CVode", resultFile="BesselJ0");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ1.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ1.mos
index fb036fe33f9..e8932e47f4c 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselJ1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselJ1", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="dassl", resultFile="BesselJ1");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselJ1", tolerance=1e-6, startTime=0.0, stopTime=30.0, method="CVode", resultFile="BesselJ1");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY0.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY0.mos
index 15da1e6c998..f93920e8263 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY0.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY0.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselY0", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="dassl", resultFile="BesselY0");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselY0", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="CVode", resultFile="BesselY0");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY1.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY1.mos
index 0d2f8384978..883e8d3db56 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/BesselY1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselY1", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="dassl", resultFile="BesselY1");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.BesselY1", tolerance=1e-6, startTime=0.1, stopTime=30.0, method="CVode", resultFile="BesselY1");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Binomial.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Binomial.mos
index 482e9a79961..88cf174772d 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Binomial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Binomial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.Binomial", tolerance=1e-6, startTime=0.0, stopTime=15.9, method="dassl", resultFile="Binomial");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.Binomial", tolerance=1e-6, startTime=0.0, stopTime=15.9, method="CVode", resultFile="Binomial");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/ExponentialIntegralE1.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/ExponentialIntegralE1.mos
index 129b720b8e7..8fd4a9e38af 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/ExponentialIntegralE1.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/ExponentialIntegralE1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.ExponentialIntegralE1", tolerance=1e-6, startTime=0.01, stopTime=3.0, method="dassl", resultFile="ExponentialIntegralE1");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.ExponentialIntegralE1", tolerance=1e-6, startTime=0.01, stopTime=3.0, method="CVode", resultFile="ExponentialIntegralE1");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Factorial.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Factorial.mos
index 271c217b2c2..3053b8df984 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Factorial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Factorial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.Factorial", tolerance=1e-6, startTime=0.0, stopTime=12.9, method="dassl", resultFile="Factorial");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.Factorial", tolerance=1e-6, startTime=0.0, stopTime=12.9, method="CVode", resultFile="Factorial");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/FallingFactorial.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/FallingFactorial.mos
index 933e034a1d0..62783dc43d2 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/FallingFactorial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/FallingFactorial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.FallingFactorial", tolerance=1e-6, startTime=0.0, stopTime=13.9, method="dassl", resultFile="FallingFactorial");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.FallingFactorial", tolerance=1e-6, startTime=0.0, stopTime=13.9, method="CVode", resultFile="FallingFactorial");
 createPlot(id = 1,
  position = {35, 30, 631, 456},
  x = "time",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mos
index 6a6b4c91f61..ec92a5ff056 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.InverseXDerivativeCheck", startTime=-1, method="dassl", tolerance=1e-08, stopTime=1.0, resultFile="InverseXDerivativeCheck");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.InverseXDerivativeCheck", startTime=-1, method="CVode", tolerance=1e-08, stopTime=1.0, resultFile="InverseXDerivativeCheck");
 createPlot(id=1, position={35, 30, 592, 421},
  y={"y_comp", "y"},
 range={-1.0, 1.0, -2.0, 2.0}, grid=true, filename="InverseXDerivativeCheck.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivative_2_Check.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivative_2_Check.mos
index 48c48dda547..a82f942e6ee 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivative_2_Check.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXDerivative_2_Check.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.InverseXDerivative_2_Check", startTime=-1.5, stopTime=1.5, method="dassl", tolerance=1e-08, resultFile="InverseXDerivative_2_Check");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.InverseXDerivative_2_Check", startTime=-1.5, stopTime=1.5, method="CVode", tolerance=1e-08, resultFile="InverseXDerivative_2_Check");
 createPlot(id=5, position={35, 30, 592, 594},
 y={"y", "y_comp"},
 range={-1.0, 1.0, -2.0, 2.0}, grid=true, filename="InverseXDerivative_2_Check.mat", colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXRegularized.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXRegularized.mos
index c346a3807bf..0f5dbc1c394 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXRegularized.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/InverseXRegularized.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.InverseXRegularized", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="InverseXRegularized");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.InverseXRegularized", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="InverseXRegularized");
 createPlot(id=1, position={10, 7, 644, 642},
 x="x",
 y={"y", "xInv"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/IsMonotonic.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/IsMonotonic.mos
index 2c1097f9dc6..c01f672c072 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/IsMonotonic.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/IsMonotonic.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.IsMonotonic", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="IsMonotonic");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.IsMonotonic", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="IsMonotonic");
 createPlot(id=1,
 position={15, 10, 407, 281},
 y={"x_incStrict[1]", "x_incStrict[2]", "x_incStrict[3]", "x_notMon[1]", "x_notMon[2]", "x_notMon[3]", "x_incWeak[1]", "x_incWeak[2]", "x_incWeak[3]", "x_incWeak[4]", "x_notWeak[1]", "x_notWeak[2]", "x_notWeak[3]", "x_notWeak[4]",  "x_decStrict[1]", "x_decStrict[2]", "x_decStrict[3]", "x_decWeak[1]", "x_decWeak[2]", "x_decWeak[3]", "x_decWeak[4]"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Polynomial.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Polynomial.mos
index fc1fd5a33ca..a45c6f89a28 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Polynomial.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Polynomial.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.Polynomial", startTime=0, stopTime=4, tolerance=1E-6, method="dassl", resultFile="Polynomial");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.Polynomial", startTime=0, stopTime=4, tolerance=1E-6, method="CVode", resultFile="Polynomial");
 createPlot(id = 5,
  position = {45, 33, 639, 463},
  y = {"x"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/PowerLinearized.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/PowerLinearized.mos
index 3aa5dbbac87..0d76ab67a59 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/PowerLinearized.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/PowerLinearized.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.PowerLinearized", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="PowerLinearized");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.PowerLinearized", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="PowerLinearized");
 createPlot(id = 1,
  position = {10, 7, 644, 426},
  x = "T4",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/QuinticHermite.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/QuinticHermite.mos
index 29ded3cc7af..75f2fc7f281 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/QuinticHermite.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/QuinticHermite.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.QuinticHermite", stopTime=3, method="dassl", tolerance=1e-6, resultFile="QuinticHermite");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.QuinticHermite", stopTime=3, method="CVode", tolerance=1e-6, resultFile="QuinticHermite");
 createPlot(id=1, position={0, 0, 975, 526}, y={"y"}, range={0.0, 3.0, -2.0, 5.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 975, 261}, y={"dy"}, range={0.0, 3.0, -2.0, 6.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 1309, 239}, y={"ddy"}, range={0.0, 3.0, -10.0, 15.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPower.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPower.mos
index d932164742c..8001706ac35 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPower.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPower.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.RegNonZeroPower", startTime=-1, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="RegNonZeroPower");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.RegNonZeroPower", startTime=-1, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="RegNonZeroPower");
 removePlots();
 createPlot(id = 2,
  position = {35, 30, 609, 469},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivativeCheck.mos
index 414e548a65e..c17d1760be4 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.RegNonZeroPowerDerivativeCheck", startTime=-1, tolerance=1E-08, method="dassl", stopTime=1.0, resultFile="RegNonZeroPowerDerivativeCheck");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.RegNonZeroPowerDerivativeCheck", startTime=-1, tolerance=1E-08, method="CVode", stopTime=1.0, resultFile="RegNonZeroPowerDerivativeCheck");
 removePlots();
 createPlot(id = 5,
  position = {45, 33, 639, 463},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mos
index a9d47f00fc5..4fc2aa8d7df 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegNonZeroPowerDerivative_2_Check.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.RegNonZeroPowerDerivative_2_Check", startTime=-1, tolerance=1E-8, method="dassl", stopTime=1.0, resultFile="RegNonZeroPowerDerivative_2_Check");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.RegNonZeroPowerDerivative_2_Check", startTime=-1, tolerance=1E-8, method="CVode", stopTime=1.0, resultFile="RegNonZeroPowerDerivative_2_Check");
 removePlots();
 createPlot(id = 5,
  position = {45, 33, 639, 463},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegStep.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegStep.mos
index cafaf3a1343..b12efbb434b 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegStep.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/RegStep.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.RegStep", startTime=-1, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="RegStep");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.RegStep", startTime=-1, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="RegStep");
 removePlots();
 createPlot(id = 2,
  position = {35, 30, 609, 469},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Round.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Round.mos
new file mode 100644
index 00000000000..12d126b22fd
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Round.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Utilities.Math.Functions.Examples.Round", startTime=-2, stopTime=2, method="Cvode", tolerance=1e-06, resultFile="Round");
+createPlot(id=1, position={35, 35, 1536, 906}, y={"ym2", "ym1", "y", "y1", "y2"}, range={-2.0, 2.0, -2.5, 2.5}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothExponentialDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothExponentialDerivativeCheck.mos
index d071f43d75f..6119944253a 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothExponentialDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SmoothExponentialDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.SmoothExponentialDerivativeCheck", startTime=-1, stopTime=1, tolerance=1E-8, method="dassl", resultFile="SmoothExponentialDerivativeCheck");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.SmoothExponentialDerivativeCheck", startTime=-1, stopTime=1, tolerance=1E-8, method="CVode", resultFile="SmoothExponentialDerivativeCheck");
 removePlots();
 createPlot(id = 5,
  position = {45, 33, 639, 463},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunction.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunction.mos
index a0a93d240cf..5b0d8fed6ff 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunction.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunction.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.SpliceFunction", startTime=-1, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SpliceFunction");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.SpliceFunction", startTime=-1, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SpliceFunction");
 removePlots();
 createPlot(id = 2,
  position = {35, 30, 609, 469},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mos
index f8d551a2842..69d5ee41eb6 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.SpliceFunctionDerivativeCheck", startTime=-1, method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SpliceFunctionDerivativeCheck");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.SpliceFunctionDerivativeCheck", startTime=-1, method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SpliceFunctionDerivativeCheck");
 removePlots();
 createPlot(id = 5,
  position = {45, 33, 639, 463},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mos
index 32e0a8f7d00..559f8c794fd 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Math.Functions.Examples.TrapezoidalIntegration", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TrapezoidalIntegration");
+simulateModel("Buildings.Utilities.Math.Functions.Examples.TrapezoidalIntegration", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TrapezoidalIntegration");
 removePlots();
 createPlot(id = 5,
  y = {"y"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Density_pTX.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Density_pTX.mos
index 4b1ec1ea8e1..be0c4fab4ab 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Density_pTX.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Density_pTX.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.Density_pTX", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="Density_pTX_block");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.Density_pTX", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Density_pTX_block");
 createPlot(id = 7,
  position = {35, 30, 399, 343},
  x = "den.T",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/DewPointTemperature.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/DewPointTemperature.mos
index 6740153438c..5e284b3fec7 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/DewPointTemperature.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/DewPointTemperature.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.DewPointTemperature", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="DewPointTemperature");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.DewPointTemperature", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="DewPointTemperature");
 removePlots();
 createPlot(id = 3,
  position = {55, 50, 682, 582},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/HumidityRatioPressure.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/HumidityRatioPressure.mos
index 1a11e290087..e4ee5e9af01 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/HumidityRatioPressure.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/HumidityRatioPressure.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.HumidityRatioPressure", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="HumidityRatioPressure");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.HumidityRatioPressure", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="HumidityRatioPressure");
 removePlots();
 createPlot(id = 3,
  position = {55, 50, 682, 580},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/MassFraction_pTphi.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/MassFraction_pTphi.mos
index e8421d1861d..acdb2cd6e41 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/MassFraction_pTphi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/MassFraction_pTphi.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.MassFraction_pTphi", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="MassFraction_pTphi");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.MassFraction_pTphi", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="MassFraction_pTphi");
 removePlots();
 createPlot(id = 1,
  position = {15, 10, 668, 370},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Phi_pTX.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Phi_pTX.mos
index 6a2a8882862..9d214f2fa1a 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Phi_pTX.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/Phi_pTX.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.Phi_pTX", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="Phi_pTX_block");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.Phi_pTX", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Phi_pTX_block");
 createPlot(id = 7,
  position = {35, 30, 399, 343},
  x = "phi.T",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressure.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressure.mos
index 2b219a48e63..9759493929b 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressure.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressure.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.SaturationPressure", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SaturationPressureBlock");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.SaturationPressure", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SaturationPressureBlock");
 createPlot(id=1,
 position={15, 10, 490, 316},
 x="pSat.T",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressureLiquid.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressureLiquid.mos
index c0724465fa6..e6ecdff8e19 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressureLiquid.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SaturationPressureLiquid.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.SaturationPressureLiquid", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SaturationPressureLiquidBlock");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.SaturationPressureLiquid", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SaturationPressureLiquidBlock");
 createPlot(id=1,
 position={15, 10, 490, 316},
 x="pSat.T",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SublimationPressureIce.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SublimationPressureIce.mos
index 6c9bbd9b6bb..090d72512a0 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SublimationPressureIce.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/SublimationPressureIce.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.SublimationPressureIce", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SublimationPressureIceBlock");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.SublimationPressureIce", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SublimationPressureIceBlock");
 createPlot(id=1,
 position={15, 10, 490, 316},
 x="pSat.T",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mos
index 9010abb9b82..a5e7023857a 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.TWetBul_TDryBulPhi", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TWetBul_TDryBulPhi");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.TWetBul_TDryBulPhi", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TWetBul_TDryBulPhi");
 createPlot(id = 1,
  position = {102, 64, 757, 517},
  x = "wetBulPhi.phi",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mos
index dd28f1636a8..65472d683e7 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TWetBul_TDryBulXi.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.TWetBul_TDryBulXi", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TWetBul_TDryBulXi");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.TWetBul_TDryBulXi", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TWetBul_TDryBulXi");
 createPlot(id = 1,
  x = "wetBul.Xi[1]",
  y = {"wetBul.TWetBul", "wetBulApp.TWetBul"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TotalAirDryAir.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TotalAirDryAir.mos
index 9b07f448308..c6ffe19c525 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TotalAirDryAir.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Examples/TotalAirDryAir.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Examples.TotalAirDryAir", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="TotalAirDryAir");
+simulateModel("Buildings.Utilities.Psychrometrics.Examples.TotalAirDryAir", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TotalAirDryAir");
 createPlot(id = 1,
  y = {"toTotalAir.XiTotalAir", "toTotalAir.XiDry", "toTotalAir.XNonVapor", "toDryAir.XiTotalAir", "toDryAir.XiDry"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mos
index 74dc73adfac..f4a8621aecc 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.DewPointTemperatureDerivativeCheck", startTime=-1, stopTime=1, method="dassl", tolerance=1E-9, resultFile="DewPointTemperatureDerivativeCheck");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.DewPointTemperatureDerivativeCheck", startTime=-1, stopTime=1, method="CVode", tolerance=1E-9, resultFile="DewPointTemperatureDerivativeCheck");
 createPlot(id = 1,
  y = {"y", "y_comp"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mos
index 3bd1b3755d9..5946fa612c3 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.DewPointTemperatureDerivativeCheck_amb", startTime=-1, stopTime=1, method="dassl", tolerance=1E-9, resultFile="DewPointTemperatureDerivativeCheck_amb");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.DewPointTemperatureDerivativeCheck_amb", startTime=-1, stopTime=1, method="CVode", tolerance=1E-9, resultFile="DewPointTemperatureDerivativeCheck_amb");
 createPlot(id = 1,
  y = {"y", "y_comp"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mos
index 020b607dc34..b4073f02163 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.InverseDewPointTemperatureDerivativeCheck_amb", startTime=-1, stopTime=1, method="dassl", tolerance=1E-9, resultFile="InverseDewPointTemperatureDerivativeCheck_amb");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.InverseDewPointTemperatureDerivativeCheck_amb", startTime=-1, stopTime=1, method="CVode", tolerance=1E-9, resultFile="InverseDewPointTemperatureDerivativeCheck_amb");
 createPlot(id = 1,
  y = {"y", "y_comp"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mos
index 37b48ff24a6..46f827ee54f 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.SaturationPressureDerivativeCheck", startTime=-1, stopTime=1, method="dassl", tolerance=1E-9, resultFile="SaturationPressureDerivativeCheck");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.SaturationPressureDerivativeCheck", startTime=-1, stopTime=1, method="CVode", tolerance=1E-9, resultFile="SaturationPressureDerivativeCheck");
 createPlot(id = 1,
  y = {"y", "y_comp"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mos
index 748682afdfb..5815ab4433d 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.WaterVaporPressureDerivativeCheck", startTime=-1, stopTime=1, method="dassl", tolerance=1E-9, resultFile="WaterVaporPressureDerivativeCheck");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.WaterVaporPressureDerivativeCheck", startTime=-1, stopTime=1, method="CVode", tolerance=1E-9, resultFile="WaterVaporPressureDerivativeCheck");
 createPlot(id = 1,
  y = {"y", "y_comp"},
  grid = true);
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mos
index f548beebf96..3e5fa983d26 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.Density_pTX", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="Density_pTX");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.Density_pTX", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="Density_pTX");
 createPlot(id=1, position={15, 10, 536, 478},
  y={"T"},
 range={0.0, 1.0, 18.0, 26.0}, grid=true, filename="Density_pTX.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mos
index 1b497500aa8..2e7b12a8d6b 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.SaturationPressure", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="SaturationPressure");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.SaturationPressure", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="SaturationPressure");
 createPlot(id=1,
 position={15, 10, 490, 316},
 x="T",
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mos
index 1aa4861eb6b..2449c118380 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.X_pSatpphi", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="X_pSatpphi");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.X_pSatpphi", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="X_pSatpphi");
 createPlot(id = 1,
  position = {15, 10, 400, 572},
  y = {"phi"},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mos
index d315ebe397c..2717d1db627 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.pW_TDewPoi", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="pW_TDewPoi");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.pW_TDewPoi", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="pW_TDewPoi");
 removePlots();
 createPlot(id = 1,
  position = {15, 10, 561, 493},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mos
index 9922524f37e..28a42736850 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.pW_TDewPoi_comparison", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="pW_TDewPoi_comparison");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.pW_TDewPoi_comparison", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="pW_TDewPoi_comparison");
 createPlot(id = 20,
  filename = "pW_TDewPoi_comparison.mat",
  position = {35, 9, 400, 376},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_X.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_X.mos
index e0cb3b7bbe0..6da5d0dfd6b 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_X.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/pW_X.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.pW_X", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="pW_X");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.pW_X", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="pW_X");
 removePlots();
 createPlot(id = 1,
  position = {15, 10, 561, 493},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mos
index b65d76a7bd3..f588113c29f 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.phi_pTX", method="dassl", tolerance=1e-6, stopTime=1.0, resultFile="phi_pTX");
+simulateModel("Buildings.Utilities.Psychrometrics.Functions.Examples.phi_pTX", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="phi_pTX");
 createPlot(id=1, position={15, 10, 536, 478},
  y={"T"},
 range={0.0, 1.0, 18.0, 26.0}, grid=true, filename="phi_pTX.mat", leftTitleType=1, bottomTitleType=1, colors={{0,0,255}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/CalendarTime.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/CalendarTime.mos
index 6015344bd06..8f763544aac 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/CalendarTime.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/CalendarTime.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Time.Examples.CalendarTime", tolerance=1e-6, stopTime=1e+08, numberOfIntervals=0, outputInterval=1001, method="dassl", resultFile="CalendarTime");
+simulateModel("Buildings.Utilities.Time.Examples.CalendarTime", tolerance=1e-6, stopTime=1e+08, numberOfIntervals=0, outputInterval=1001, method="CVode", resultFile="CalendarTime");
 createPlot(id=1, position={0, 0, 2254, 1062}, y={"calendarTime2016.year"}, range={0.0, 100000000.0, 2012.0, 2020.0}, grid=true, filename="CalendarTime.mat", colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 2254, 209}, y={"calendarTime2016.month"}, range={0.0, 100000000.0, 0.0, 15.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={0, 0, 2254, 210}, y={"calendarTime2016.day"}, range={0.0, 100000000.0, 0.0, 40.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/ModelTime.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/ModelTime.mos
index 360c1f87a3f..5c1fa85967d 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/ModelTime.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Examples/ModelTime.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Time.Examples.ModelTime", startTime=-1, tolerance=1e-6, stopTime=1, method="dassl", resultFile="ModelTime");
+simulateModel("Buildings.Utilities.Time.Examples.ModelTime", startTime=-1, tolerance=1e-6, stopTime=1, method="CVode", resultFile="ModelTime");
 createPlot(
 id=1,
 position={15, 10, 482, 336},
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonths.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonths.mos
index 81173778b3e..414497f19a7 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonths.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonths.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Time.Validation.CalendarTimeMonths", startTime=172800, tolerance=1e-6, stopTime=345600, method="dassl", resultFile="CalendarTimeMonths");
+simulateModel("Buildings.Utilities.Time.Validation.CalendarTimeMonths", startTime=172800, tolerance=1e-6, stopTime=345600, method="CVode", resultFile="CalendarTimeMonths");
 createPlot(id=1, position={35, 30, 1021, 971}, y={"calTim.year"}, range={170000.0, 350000.0, 1800.0, 2400.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 1021, 158}, y={"calTim.month"}, range={170000.0, 350000.0, 0.8, 1.2}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 1021, 159}, y={"calTim.day"}, range={170000.0, 350000.0, 2.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsMinus.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsMinus.mos
index f4dafdd3b31..6fec2c58234 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsMinus.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsMinus.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Time.Validation.CalendarTimeMonthsMinus", startTime=172799, tolerance=1e-6, stopTime=345599, method="dassl", resultFile="CalendarTimeMonthsMinus");
+simulateModel("Buildings.Utilities.Time.Validation.CalendarTimeMonthsMinus", startTime=172799, tolerance=1e-6, stopTime=345599, method="CVode", resultFile="CalendarTimeMonthsMinus");
 createPlot(id=1, position={35, 30, 1021, 971}, y={"calTim.year"}, range={170000.0, 350000.0, 1800.0, 2400.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 1021, 158}, y={"calTim.month"}, range={170000.0, 350000.0, 0.8, 1.2}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 1021, 159}, y={"calTim.day"}, range={170000.0, 350000.0, 2.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsPlus.mos b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsPlus.mos
index 9c763df3d17..a5af234ca97 100644
--- a/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsPlus.mos
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/Time/Validation/CalendarTimeMonthsPlus.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Utilities.Time.Validation.CalendarTimeMonthsPlus", startTime=172801, tolerance=1e-6, stopTime=345601, method="dassl", resultFile="CalendarTimeMonthsPlus");
+simulateModel("Buildings.Utilities.Time.Validation.CalendarTimeMonthsPlus", startTime=172801, tolerance=1e-6, stopTime=345601, method="CVode", resultFile="CalendarTimeMonthsPlus");
 createPlot(id=1, position={35, 30, 1021, 971}, y={"calTim.year"}, range={170000.0, 350000.0, 1800.0, 2400.0}, grid=true, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 1021, 158}, y={"calTim.month"}, range={170000.0, 350000.0, 0.8, 1.2}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=1, position={35, 30, 1021, 159}, y={"calTim.day"}, range={170000.0, 350000.0, 2.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.BaseClasses.Validation.ControllerEconomizer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.BaseClasses.Validation.ControllerEconomizer.mos
index c06507c4ea5..4d52deb8643 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.BaseClasses.Validation.ControllerEconomizer.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.BaseClasses.Validation.ControllerEconomizer.mos
@@ -5,6 +5,5 @@ compareVars :=
     "conEco.TMix",
     "conEco.TOut",
     "conEco.TRet",
-    "conEco.minOAFra",
-    "conEco.yHea"
+    "conEco.minOAFra"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.Examples.Guideline36.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.Examples.Guideline36.mos
index 3d53a776dde..f0355731259 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.Examples.Guideline36.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Air.Systems.SingleZone.VAV.Examples.Guideline36.mos
@@ -1,9 +1,9 @@
 compareVars :=
   {
-    "controller.TZonCooSet",
-    "controller.TZonHeaSet",
-    "controller.TZon",
-    "controller.yFan",
-    "controller.yHeaCoi",
-    "controller.yCooCoi"
+    "con.TZonCooSet",
+    "con.TZonHeaSet",
+    "con.TZon",
+    "con.yFan",
+    "con.yHeaCoi",
+    "con.yCooCoi"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.LimitMin.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.LimitMin.mos
new file mode 100644
index 00000000000..fa3c6d3e3af
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.LimitMin.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "limCeiHei.u",
+    "limCeiHei.ceiHei"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.ModeAndSetPoints.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Validation.ModeAndSetPoints.mos
similarity index 77%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.ModeAndSetPoints.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Validation.ModeAndSetPoints.mos
index 198ef5392cc..df94dbc6c81 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.ModeAndSetPoints.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Validation.ModeAndSetPoints.mos
@@ -4,13 +4,13 @@ compareVars :=
     "setPoi.heaSetAdj",
     "TZon1.y",
     "TZon2.y",
-    "setPoi.TZonHeaOn",
-    "setPoi.TZonCooOn",
+    "setPoi.THeaSetOcc",
+    "setPoi.TCooSetOcc",
     "setPoi.TZonCooSet",
     "setPoi.TZonHeaSet",
     "setPoi.yOpeMod",
     "setPoi1.uOccSen",
-    "setPoi1.uWinSta",
+    "setPoi1.uWin",
     "setPoi1.TZonCooSet",
     "setPoi1.TZonHeaSet"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.GroupStatus.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.GroupStatus.mos
new file mode 100644
index 00000000000..1537022a2cc
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.GroupStatus.mos
@@ -0,0 +1,34 @@
+compareVars :=
+  {
+    "zonGroSta.zonOcc[1]",
+    "zonGroSta.zonOcc[2]",
+    "zonGroSta.uOcc[1]",
+    "zonGroSta.uOcc[2]",
+    "zonGroSta.tNexOcc[1]",
+    "zonGroSta.tNexOcc[2]",
+    "zonGroSta.uCooTim[1]",
+    "zonGroSta.uCooTim[2]",
+    "zonGroSta.uWarTim[1]",
+    "zonGroSta.uWarTim[2]",
+    "zonGroSta.uOccHeaHig[1]",
+    "zonGroSta.uOccHeaHig[2]",
+    "zonGroSta.uUnoHeaHig[1]",
+    "zonGroSta.uUnoHeaHig[2]",
+    "zonGroSta.uEndSetBac[1]",
+    "zonGroSta.uEndSetBac[2]",
+    "zonGroSta.uWin[1]",
+    "zonGroSta.uWin[2]",
+    "zonGroSta.TZon[1]",
+    "zonGroSta.TZon[2]",
+    "zonGroSta.uGroOcc",
+    "zonGroSta.nexOcc",
+    "zonGroSta.yCooTim",
+    "zonGroSta.yWarTim",
+    "zonGroSta.yOccHeaHig",
+    "zonGroSta.yColZon",
+    "zonGroSta.yOpeWin",
+    "zonGroSta.ySetBac",
+    "zonGroSta.yEndSetBac",
+    "zonGroSta.TZonMax",
+    "zonGroSta.TZonMin"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode.mos
index 9917793bae4..8da0451d593 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.OperationMode.mos
@@ -2,9 +2,14 @@ compareVars :=
   {
     "opeModSel.yOpeMod",
     "opeModSel.uOcc",
+    "opeModSel.uHigOccCoo",
+    "opeModSel.uOccHeaHig",
     "opeModSel.tNexOcc",
-    "opeModSel.occHeaHigMin",
-    "opeModSel.maxHigOccCoo",
-    "opeModSel.unoHeaHigMin",
-    "opeModSel.maxHigUnoCoo"
+    "opeModSel.maxCooDowTim",
+    "opeModSel.maxWarUpTim",
+    "TZonHeaSetUno.y",
+    "TZonCooSetUno.y",
+    "TZonHeaSetOcc.y",
+    "TZonCooSetOcc.y",
+    "opeModSel.TZonMax"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.ZoneStatus.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.ZoneStatus.mos
index a2b5318cb26..58b99f3d790 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.ZoneStatus.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.Validation.ZoneStatus.mos
@@ -1,21 +1,17 @@
 compareVars :=
   {
-    "noWinZonSta.TZonHeaSetOcc",
-    "noWinZonSta.TZonCooSetOcc",
-    "noWinZonSta.TZonMax",
     "noWinZonSta.TZon",
-    "noWinZonSta.TZonMin",
-    "noWinZonSta.TZonHeaSetUno",
-    "noWinZonSta.TZonCooSetUno",
-    "noWinZonSta.yOccHeaHigMin",
-    "noWinZonSta.yMaxHigOccCoo",
-    "noWinZonSta.yLowUnoHea",
-    "noWinZonSta.yUnoHeaHigMin",
-    "noWinZonSta.yMaxHigUnoCoo",
-    "noWinZonSta.yHigUnoCoo",
-    "witWinZonSta.cooDowTim",
-    "witWinZonSta.warUpTim",
-    "witWinZonSta.uWinSta",
-    "witWinZonSta.yCooTim",
-    "witWinZonSta.yWarTim"
+    "noWinZonSta.THeaSetOcc",
+    "noWinZonSta.TCooSetOcc",
+    "noWinZonSta.THeaSetUno",
+    "noWinZonSta.TCooSetUno",
+    "noWinZonSta.yOccHeaHig",
+    "noWinZonSta.yHigOccCoo",
+    "noWinZonSta.yUnoHeaHig",
+    "noWinZonSta.yEndSetBac",
+    "witWinZonSta.uWin",
+    "witWinZonSta.yOccHeaHig",
+    "witWinZonSta.yHigOccCoo",
+    "witWinZonSta.yUnoHeaHig",
+    "witWinZonSta.yEndSetBac"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.DamperValves.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.DamperValves.mos
index dd2496ffc0a..e439f5551a5 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.DamperValves.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.DamperValves.mos
@@ -3,7 +3,6 @@ compareVars :=
     "damVal.uHea",
     "damVal.uCoo",
     "damVal.VDisSet_flow",
-    "damVal.VDis_flow",
     "damVal.yDam",
     "damVal.TDisHeaSet",
     "damVal.yHeaVal",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.SystemRequests.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.SystemRequests.mos
index 7add7262615..a858a9429a0 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.SystemRequests.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.Validation.SystemRequests.mos
@@ -6,7 +6,7 @@ compareVars :=
     "sysReq_RehBox.yZonTemResReq",
     "sysReq_RehBox.VDisSet_flow",
     "sysReq_RehBox.VDis_flow",
-    "sysReq_RehBox.uDam",
+    "sysReq_RehBox.yDam_actual",
     "sysReq_RehBox.yZonPreResReq",
     "sysReq_RehBox.TDisHeaSet",
     "sysReq_RehBox.TDis",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.Controller.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.Controller.mos
index e2526a36bd6..cc5dec6a1eb 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.Controller.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Validation.Controller.mos
@@ -6,7 +6,6 @@ compareVars :=
     "con.conHeaLoo.y",
     "con.conCooLoo.y",
     "con.damVal.VDisSet_flow",
-    "con.damVal.VDis_flow",
     "con.damVal.yDam",
     "con.damVal.TDisHeaSet",
     "con.damVal.TDis",
@@ -19,7 +18,6 @@ compareVars :=
     "con1.conHeaLoo.y",
     "con1.conCooLoo.y",
     "con1.damVal.VDisSet_flow",
-    "con1.damVal.VDis_flow",
     "con1.damVal.yDam",
     "con1.damVal.TDisHeaSet",
     "con1.damVal.TDis",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Greater.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Greater.mos
index 96c5987aa1c..449540abdf9 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Greater.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Greater.mos
@@ -1,6 +1,7 @@
 compareVars :=
   {
-    "greater1.u1",
-    "greater1.u2",
-    "greater1.y"
+    "gre.u1",
+    "gre.u2",
+    "gre.y",
+    "greHys.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterThreshold.mos
index 7d8c182b1d7..8b09d9692d5 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterThreshold.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterThreshold.mos
@@ -1,5 +1,7 @@
 compareVars :=
   {
-    "greThr.u",
-    "greThr.y"
+    "gre.u",
+    "gre.t",
+    "gre.y",
+    "greHys.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.IntegratorWithReset.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.IntegratorWithReset.mos
index 7b3a586119e..fa3f586ce9e 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.IntegratorWithReset.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.IntegratorWithReset.mos
@@ -2,14 +2,13 @@ compareVars :=
   {
     "cons.y",
     "booleanPulse.y",
+    "intDef.y_start",
+    "intDef.y",
+    "intDef.y_reset_in",
     "intWitRes1.y_start",
-    "intWitRes1.y_reset",
     "intWitRes1.y",
+    "intWitRes1.y_reset_in",
     "intWitRes2.y_start",
     "intWitRes2.y",
-    "intWitRes2.y_reset_in",
-    "intNoReset.y_start",
-    "intNoReset.y",
-    "intDef.y_start",
-    "intDef.y"
+    "intWitRes2.y_reset_in"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Less.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Less.mos
index 415c0ca8b81..e4f29a4a039 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Less.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Less.mos
@@ -1,6 +1,7 @@
 compareVars :=
   {
-    "less1.u1",
-    "less1.u2",
-    "less1.y"
+    "les.u1",
+    "les.u2",
+    "les.y",
+    "lesHys.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessThreshold.mos
index 01ca8738149..91e7d0d90ed 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessThreshold.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessThreshold.mos
@@ -1,5 +1,7 @@
 compareVars :=
   {
-    "lesThr.u",
-    "lesThr.y"
+    "les.u",
+    "les.t",
+    "les.y",
+    "lesHys.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PID.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PID.mos
new file mode 100644
index 00000000000..e496c5856dd
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PID.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "limPID.u_s",
+    "limPID.u_m",
+    "limPID.u_s",
+    "limPID.y",
+    "noLimPID.y",
+    "limP.y",
+    "limPI.y",
+    "limPD.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialDerivativeOutput.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialDerivativeOutput.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialState.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDInitialState.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDScale.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDScale.mos
new file mode 100644
index 00000000000..6cafce676d8
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDScale.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "pidSca.y",
+    "pidNoSca.y",
+    "pla1.y",
+    "pla2.y",
+    "pidSca.u_s"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithReset.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithReset.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithResetScale.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithResetScale.mos
new file mode 100644
index 00000000000..6eafbd8f9a3
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.PIDWithResetScale.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "pidSca.y",
+    "pidNoSca.y",
+    "pla1.y",
+    "pla2.y",
+    "pidSca.u_s",
+    "pidSca.trigger"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.Pulse.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.Pulse.mos
new file mode 100644
index 00000000000..64dd4f68adc
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.Pulse.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "pul.y",
+    "pul1.y",
+    "pul2.y",
+    "pul3.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTable.mos
new file mode 100644
index 00000000000..6c8a1e0df70
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTable.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "intTimTab.y[1]",
+    "intTimTab.y[2]",
+    "intTimTab1.y[1]",
+    "intTimTab1.y[2]",
+    "tabOneRow.y[1]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTableNegativeStartTime.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTableNegativeStartTime.mos
new file mode 100644
index 00000000000..6c8a1e0df70
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Sources.Validation.TimeTableNegativeStartTime.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "intTimTab.y[1]",
+    "intTimTab.y[2]",
+    "intTimTab1.y[1]",
+    "intTimTab1.y[2]",
+    "tabOneRow.y[1]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterEqualThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterEqualThreshold.mos
index 2e7f7b36cf1..24e05b8c587 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterEqualThreshold.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterEqualThreshold.mos
@@ -1,6 +1,6 @@
 compareVars :=
   {
-    "intGreEquThr.threshold",
+    "intGreEquThr.t",
     "intGreEquThr.u",
     "intGreEquThr.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterThreshold.mos
index ba496868e40..8b7bad226fa 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterThreshold.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.GreaterThreshold.mos
@@ -1,6 +1,6 @@
 compareVars :=
   {
-    "intGreThr.threshold",
+    "intGreThr.t",
     "intGreThr.u",
     "intGreThr.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessEqualThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessEqualThreshold.mos
index 694ae30b815..9321f9629b8 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessEqualThreshold.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessEqualThreshold.mos
@@ -1,6 +1,6 @@
 compareVars :=
   {
-    "intLesEquThr.threshold",
+    "intLesEquThr.t",
     "intLesEquThr.u",
     "intLesEquThr.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessThreshold.mos
index 9668847eeb0..30e32692c1a 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessThreshold.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Integers.Validation.LessThreshold.mos
@@ -1,6 +1,6 @@
 compareVars :=
   {
-    "intLesThr.threshold",
+    "intLesThr.t",
     "intLesThr.u",
     "intLesThr.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.Pulse.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.Pulse.mos
index a317fd4b413..c99623c972b 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.Pulse.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.Pulse.mos
@@ -1,4 +1,18 @@
 compareVars :=
   {
-    "booPul.y"
+    "booPul_a1.y",
+    "booPul_a2.y",
+    "booPul_a3.y",
+    "booPul_a4.y",
+    "booPul_a5.y",
+    "booPul_b1.y",
+    "booPul_b2.y",
+    "booPul_b3.y",
+    "booPul_b4.y",
+    "booPul_b5.y",
+    "booPul_c1.y",
+    "booPul_c2.y",
+    "booPul_c3.y",
+    "booPul_c4.y",
+    "booPul_c5.y"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulseNegativeStartTime.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulseNegativeStartTime.mos
new file mode 100644
index 00000000000..c99623c972b
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulseNegativeStartTime.mos
@@ -0,0 +1,18 @@
+compareVars :=
+  {
+    "booPul_a1.y",
+    "booPul_a2.y",
+    "booPul_a3.y",
+    "booPul_a4.y",
+    "booPul_a5.y",
+    "booPul_b1.y",
+    "booPul_b2.y",
+    "booPul_b3.y",
+    "booPul_b4.y",
+    "booPul_b5.y",
+    "booPul_c1.y",
+    "booPul_c2.y",
+    "booPul_c3.y",
+    "booPul_c4.y",
+    "booPul_c5.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulsePositiveStartTime.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulsePositiveStartTime.mos
new file mode 100644
index 00000000000..c99623c972b
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.PulsePositiveStartTime.mos
@@ -0,0 +1,18 @@
+compareVars :=
+  {
+    "booPul_a1.y",
+    "booPul_a2.y",
+    "booPul_a3.y",
+    "booPul_a4.y",
+    "booPul_a5.y",
+    "booPul_b1.y",
+    "booPul_b2.y",
+    "booPul_b3.y",
+    "booPul_b4.y",
+    "booPul_b5.y",
+    "booPul_c1.y",
+    "booPul_c2.y",
+    "booPul_c3.y",
+    "booPul_c4.y",
+    "booPul_c5.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTable.mos
new file mode 100644
index 00000000000..4079de8aa36
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTable.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "booTimTab.y[1]",
+    "booTimTab.y[2]",
+    "booTimTabTwi.y[1]",
+    "booTimTabTwi.y[2]",
+    "booTimTabOneRow.y[1]",
+    "booTimTabOneRow.y[2]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTableNegativeStartTime.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTableNegativeStartTime.mos
new file mode 100644
index 00000000000..4079de8aa36
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Sources.Validation.TimeTableNegativeStartTime.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "booTimTab.y[1]",
+    "booTimTab.y[2]",
+    "booTimTabTwi.y[1]",
+    "booTimTabTwi.y[2]",
+    "booTimTabOneRow.y[1]",
+    "booTimTabOneRow.y[2]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Latch.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Latch.mos
index 4b6c6dda8d0..bb013264541 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Latch.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Latch.mos
@@ -1,17 +1,17 @@
 compareVars :=
   {
-    "falCle.u",
-    "falCle.clr",
-    "falCle.y",
-    "truCle.u",
-    "truCle.clr",
-    "truCle.y",
-    "iniFalOut.u",
-    "iniFalOut.clr",
-    "iniFalOut.y",
-    "iniTruOut.u",
-    "iniTruOut.clr",
-    "iniTruOut.y",
+    "falCleTruIni.u",
+    "falCleTruIni.clr",
+    "falCleTruIni.y",
+    "falCleFalIni.u",
+    "falCleFalIni.clr",
+    "falCleFalIni.y",
+    "truCleTruIni.u",
+    "truCleTruIni.clr",
+    "truCleTruIni.y",
+    "truCleFalIni.u",
+    "truCleFalIni.clr",
+    "truCleFalIni.y",
     "swiCleInp.u",
     "swiCleInp.clr",
     "swiCleInp.y",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Timer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Timer.mos
index c2f252099c4..9f432365392 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Timer.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Timer.mos
@@ -1,17 +1,15 @@
 compareVars :=
   {
-    "resetTimer.u",
-    "resetTimer.y",
-    "accuTimer.u",
-    "accuTimer.reset",
-    "accuTimer.y",
-    "accuTimer1.u",
-    "accuTimer1.reset",
-    "accuTimer1.y",
-    "accuTimer2.u",
-    "accuTimer2.reset",
-    "accuTimer2.y",
-    "accuTimer3.u",
-    "accuTimer3.reset",
-    "accuTimer3.y"
+    "noThr.u",
+    "noThr.y",
+    "noThr.t",
+    "noThr.passed",
+    "thrTim.u",
+    "thrTim.y",
+    "thrTim.t",
+    "thrTim.passed",
+    "thrTim1.u",
+    "thrTim1.y",
+    "thrTim1.t",
+    "thrTim1.passed"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulating.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulating.mos
new file mode 100644
index 00000000000..6bd9527b37f
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulating.mos
@@ -0,0 +1,17 @@
+compareVars :=
+  {
+    "noThr.u",
+    "noThr.y",
+    "thrTim.u",
+    "thrTim.passed",
+    "thrTim.y",
+    "thrTim.t",
+    "noThrWitRes.u",
+    "noThrWitRes.reset",
+    "noThrWitRes.y",
+    "thrTimWitRes.u",
+    "thrTimWitRes.reset",
+    "thrTimWitRes.passed",
+    "thrTimWitRes.y",
+    "thrTimWitRes.t"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulatingNegativeStartTime.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulatingNegativeStartTime.mos
new file mode 100644
index 00000000000..b41228723a7
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerAccumulatingNegativeStartTime.mos
@@ -0,0 +1,19 @@
+compareVars :=
+  {
+    "noThr.u",
+    "noThr.y",
+    "noThr.t",
+    "thrTim.u",
+    "thrTim.passed",
+    "thrTim.y",
+    "thrTim.t",
+    "noThrWitRes.u",
+    "noThrWitRes.reset",
+    "noThrWitRes.y",
+    "noThrWitRes.t",
+    "thrTimWitRes.u",
+    "thrTimWitRes.reset",
+    "thrTimWitRes.passed",
+    "thrTimWitRes.y",
+    "thrTimWitRes.t"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerNegativeStartTime.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerNegativeStartTime.mos
new file mode 100644
index 00000000000..000f4c58580
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TimerNegativeStartTime.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "noThr.u",
+    "noThr.y",
+    "noThr.t",
+    "noThr.passed",
+    "thrTim.u",
+    "thrTim.y",
+    "thrTim.t",
+    "thrTim.passed"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Toggle.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Toggle.mos
index 4b6c6dda8d0..bb013264541 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Toggle.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.Toggle.mos
@@ -1,17 +1,17 @@
 compareVars :=
   {
-    "falCle.u",
-    "falCle.clr",
-    "falCle.y",
-    "truCle.u",
-    "truCle.clr",
-    "truCle.y",
-    "iniFalOut.u",
-    "iniFalOut.clr",
-    "iniFalOut.y",
-    "iniTruOut.u",
-    "iniTruOut.clr",
-    "iniTruOut.y",
+    "falCleTruIni.u",
+    "falCleTruIni.clr",
+    "falCleTruIni.y",
+    "falCleFalIni.u",
+    "falCleFalIni.clr",
+    "falCleFalIni.y",
+    "truCleTruIni.u",
+    "truCleTruIni.clr",
+    "truCleTruIni.y",
+    "truCleFalIni.u",
+    "truCleFalIni.clr",
+    "truCleFalIni.y",
     "swiCleInp.u",
     "swiCleInp.clr",
     "swiCleInp.y",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.DewPoint_TDryBulPhi.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.DewPoint_TDryBulPhi.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.SpecificEnthalpy_TDryBulPhi.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.SpecificEnthalpy_TDryBulPhi.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.WetBulb_TDryBulPhi.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Psychrometrics.Validation.WetBulb_TDryBulPhi.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_low.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_low.mos
new file mode 100644
index 00000000000..dd4648c8ad9
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_low.mos
@@ -0,0 +1,10 @@
+compareVars :=
+  {
+    "cab[1].Amp",
+    "cab[2].Amp",
+    "cab[3].Amp",
+    "cab[4].Amp",
+    "cab[5].Amp",
+    "cab[6].Amp",
+    "cab[7].Amp"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_med.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_med.mos
new file mode 100644
index 00000000000..dd4648c8ad9
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Electrical.Transmission.Functions.Validation.SelectCable_med.mos
@@ -0,0 +1,10 @@
+compareVars :=
+  {
+    "cab[1].Amp",
+    "cab[2].Amp",
+    "cab[3].Amp",
+    "cab[4].Amp",
+    "cab[5].Amp",
+    "cab[6].Amp",
+    "cab[7].Amp"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Controls.Examples.RoomVAV.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Controls.Examples.RoomVAV.mos
new file mode 100644
index 00000000000..50cbaf5094f
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Controls.Examples.RoomVAV.mos
@@ -0,0 +1,10 @@
+compareVars :=
+  {
+    "vavBoxCon.TRooHeaSet",
+    "vavBoxCon.TRooCooSet",
+    "vavBoxCon.TRoo",
+    "vavBoxCon.conHea.y",
+    "vavBoxCon.conCoo.y",
+    "vavBoxCon.yDam",
+    "vavBoxCon.yVal"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Guideline36.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Guideline36.mos
index 082e8735b03..172611cc8b6 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Guideline36.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Examples.VAVReheat.Guideline36.mos
@@ -5,31 +5,20 @@ compareVars :=
     "flo.nor.air.vol.T",
     "flo.wes.air.vol.T",
     "flo.cor.air.vol.T",
-<<<<<<< HEAD
-=======
     "sou.TSup",
     "eas.TSup",
     "nor.TSup",
     "wes.TSup",
     "cor.TSup",
->>>>>>> master
     "sou.vav.m_flow",
     "eas.vav.m_flow",
     "nor.vav.m_flow",
     "wes.vav.m_flow",
     "cor.vav.m_flow_turbulent",
-<<<<<<< HEAD
-    "TSupSou.T",
-    "TSupEas.T",
-    "TSupNor.T",
-    "TSupWes.T",
-    "TSupCor.T"
-=======
     "conAHU.VEffOutAir_flow",
     "conAHU.VOut_flow",
     "conAHU.yOutDamPos",
     "conAHU.eco.mod.uOutDamPosMin",
     "conAHU.eco.mod.uOutDamPosMax",
     "conAHU.yRetDamPos"
->>>>>>> master
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Dampers.Validation.PressureIndependent.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Dampers.Validation.PressureIndependent.mos
new file mode 100644
index 00000000000..ef4b47268d4
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Actuators.Dampers.Validation.PressureIndependent.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "damPreInd.m_flow",
+    "damExp.m_flow",
+    "damExpPI.m_flow",
+    "damPreInd.y",
+    "damPreInd.y_actual"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertFuelFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertFuelFlow.mos
new file mode 100644
index 00000000000..c8b8f11d334
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertFuelFlow.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "assFue.assMes.u",
+    "assFue.mFue_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertPower.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertPower.mos
new file mode 100644
index 00000000000..4b284ccf9fb
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertPower.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "per.PEleMax",
+    "per.PEleMin",
+    "assPow.PEleDem",
+    "assPow.assMesP.u",
+    "assPow.assMesDP.u"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterFlow.mos
new file mode 100644
index 00000000000..3f14d283e64
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterFlow.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "assWatMas.mWat_flow",
+    "per.mWatMin_flow",
+    "runSig.y",
+    "assWatMas.assMes.u"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterTemperature.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterTemperature.mos
new file mode 100644
index 00000000000..65fa2d16234
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.AssertWaterTemperature.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "TWat.y[1]",
+    "per.TWatMax",
+    "assWatTem.assMes.u"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.Controller.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.Controller.mos
new file mode 100644
index 00000000000..3b807812844
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.Controller.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "con.runSig",
+    "con.avaSig",
+    "con.mWat_flow",
+    "con.opeMod"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.CoolDown.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.CoolDown.mos
new file mode 100644
index 00000000000..50d25cb7cb0
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.CoolDown.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "actMod",
+    "runSig.y",
+    "cooDowOpt.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversion.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversion.mos
new file mode 100644
index 00000000000..f7529c7cdff
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversion.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "con.opeMod",
+    "eneConEngTem.mFue_flow",
+    "eneConTimDel.mFue_flow",
+    "eneConEngTem.QGen_flow",
+    "eneConTimDel.QGen_flow",
+    "eneConEngTem.PEleNet",
+    "eneConTimDel.PEleNet",
+    "PEle.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionNormal.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionNormal.mos
new file mode 100644
index 00000000000..07d1a77c3c5
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionNormal.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "opeModBas.PEle",
+    "opeModBas.QGen_flow",
+    "opeModBas.mWat_flow",
+    "opeModBas.TWatIn",
+    "opeModBas.mAir_flow",
+    "opeModBas.mFue_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionWarmUp.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionWarmUp.mos
new file mode 100644
index 00000000000..d5d265c568d
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EnergyConversionWarmUp.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "opeModWarUpEngTem.PEleNet",
+    "opeModWarUpEngTem.TWatIn",
+    "opeModWarUpEngTem.TRoo",
+    "opeModWarUpEngTem.TEng",
+    "opeModWarUpEngTem.PEleNet",
+    "opeModWarUpEngTem.QGen_flow",
+    "opeModWarUpEngTem.mFue_flow",
+    "opeModWarUpEngTem.mAir_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EngineTemperature.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EngineTemperature.mos
new file mode 100644
index 00000000000..10854af1c0e
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.EngineTemperature.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "eng.TRoo.T",
+    "eng.TWat.T",
+    "eng.QGen_flow",
+    "per.capEng",
+    "eng.TEng"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.FilterPower.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.FilterPower.mos
new file mode 100644
index 00000000000..9bd26aff45d
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.FilterPower.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "filPow.PEleDem",
+    "filPow.PEle",
+    "filPow.assPow.assMesP.u",
+    "filPow.assPow.assMesDP.u"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.PowerConsumption.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.PowerConsumption.mos
new file mode 100644
index 00000000000..d25c714bcc5
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.PowerConsumption.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "con.opeMod",
+    "powCon.PCon"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.StandBy.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.StandBy.mos
new file mode 100644
index 00000000000..886a52a70f6
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.StandBy.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "transition1.condition",
+    "transition2.condition",
+    "actMod"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTemperature.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTemperature.mos
new file mode 100644
index 00000000000..49e8ef845b3
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTemperature.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "transition1.condition",
+    "transition2.condition",
+    "transition3.condition",
+    "TEng.y",
+    "per.TEngNom",
+    "actMod"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTimeDelay.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTimeDelay.mos
new file mode 100644
index 00000000000..7f95c112adf
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WarmUpTimeDelay.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "transition1.condition",
+    "transition2.condition",
+    "transition3.condition",
+    "per.timeDelayStart",
+    "actMod"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WaterFlowControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WaterFlowControl.mos
new file mode 100644
index 00000000000..5854f75e9d0
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.BaseClasses.Validation.WaterFlowControl.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "conWat.opeMod",
+    "conWat.PEle",
+    "conWat.TWatIn",
+    "conWat.mWatSet_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ElectricalFollowing.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ElectricalFollowing.mos
new file mode 100644
index 00000000000..47b8a5aae93
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ElectricalFollowing.mos
@@ -0,0 +1,20 @@
+compareVars :=
+  {
+    "EEle.y",
+    "EEleVal.y",
+    "EThe.y",
+    "ETheVal.y",
+    "eleFol.PEleNet",
+    "PEleNetVal.y",
+    "eleFol.eneCon.QGen_flow",
+    "QGenVal_flow.y",
+    "eleFol.QWat_flow",
+    "QWatVal_flow.y",
+    "eleFol.QLos.Q_flow",
+    "QLosVal_flow.y",
+    "eleFol.opeMod.opeMod",
+    "eleFol.TWatOut.T",
+    "TWatOutVal.y",
+    "eleFol.eng.TEng",
+    "TEngVal.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ThermalFollowing.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ThermalFollowing.mos
new file mode 100644
index 00000000000..c4fca1e7632
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.CHPs.Validation.ThermalFollowing.mos
@@ -0,0 +1,28 @@
+compareVars :=
+  {
+    "EEle.y",
+    "EEleVal.y",
+    "EThe.y",
+    "ETheVal.y",
+    "theFol.PEleNet",
+    "theFolNeg.PEleNet",
+    "PEleNetVal.y",
+    "theFol.eneCon.QGen_flow",
+    "theFolNeg.eneCon.QGen_flow",
+    "QGenVal_flow.y",
+    "theFol.QWat_flow",
+    "theFolNeg.QWat_flow",
+    "QWatVal_flow.y",
+    "theFol.QLos.Q_flow",
+    "theFolNeg.QLos.Q_flow",
+    "QLosVal_flow.y",
+    "theFol.opeMod.opeMod",
+    "theFolNeg.opeMod.opeMod",
+    "theFol.TWatOut.T",
+    "theFolNeg.TWatOut.T",
+    "TWatOutVal.y",
+    "TWatOutSet.y",
+    "theFol.eng.TEng",
+    "theFolNeg.eng.TEng",
+    "TEngVal.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatPumps.Examples.EquationFitReversible_CoolingClosedLoop.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatPumps.Examples.EquationFitReversible_CoolingClosedLoop.mos
index 0c24b1c2f34..5503b77de0b 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatPumps.Examples.EquationFitReversible_CoolingClosedLoop.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.HeatPumps.Examples.EquationFitReversible_CoolingClosedLoop.mos
@@ -2,6 +2,7 @@ compareVars :=
   {
     "heaPum.QSou_flow",
     "heaPum.QLoa_flow",
+    "uMod.y",
     "heaPum.sta_a1.T",
     "heaPum.sta_b1.T",
     "heaPum.COP",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Storage.Examples.Stratified.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Storage.Examples.Stratified.mos
index fcc152445bd..72e834278dc 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Storage.Examples.Stratified.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Storage.Examples.Stratified.mos
@@ -2,16 +2,6 @@ compareVars :=
   {
     "dH.y",
     "tanSim.m_flow",
-    "tanEnh.vol[1].T",
-    "tanEnh.vol[2].T",
-    "tanEnh.vol[3].T",
-    "tanEnh.vol[4].T",
-    "tanEnh.vol[5].T",
-    "tanEnh.vol[6].T",
-    "tanEnh.vol[7].T",
-    "tanEnh.vol[8].T",
-    "tanEnh.vol[9].T",
-    "tanEnh.vol[10].T",
     "tanSim.vol[1].T",
     "tanSim.vol[2].T",
     "tanSim.vol[3].T",
@@ -21,5 +11,15 @@ compareVars :=
     "tanSim.vol[7].T",
     "tanSim.vol[8].T",
     "tanSim.vol[9].T",
-    "tanSim.vol[10].T"
+    "tanSim.vol[10].T",
+    "tanEnh.vol[1].T",
+    "tanEnh.vol[2].T",
+    "tanEnh.vol[3].T",
+    "tanEnh.vol[4].T",
+    "tanEnh.vol[5].T",
+    "tanEnh.vol[6].T",
+    "tanEnh.vol[7].T",
+    "tanEnh.vol[8].T",
+    "tanEnh.vol[9].T",
+    "tanEnh.vol[10].T"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.HeatTransfer.Convection.Validation.ZeroWindSpeed.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.HeatTransfer.Convection.Validation.ZeroWindSpeed.mos
new file mode 100644
index 00000000000..4879ed5dbd1
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.HeatTransfer.Convection.Validation.ZeroWindSpeed.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "nor.q_flow",
+    "wes.q_flow",
+    "sou.q_flow",
+    "eas.q_flow",
+    "nor.dir"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamProperties.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamProperties.mos
index c99e46636a6..717e8e02efc 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamProperties.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamProperties.mos
@@ -12,14 +12,8 @@ compareVars :=
     "hIse",
     "beta",
     "kappa",
-<<<<<<< HEAD
-    "ddpT",
-    "ddTp",
-    "dddX[1]",
-=======
     "ddhp",
     "ddph",
->>>>>>> master
     "cp",
     "cv",
     "lambda",
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamSaturatedProperties.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamSaturatedProperties.mos
deleted file mode 100644
index 599b303eb9a..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamSaturatedProperties.mos
+++ /dev/null
@@ -1,12 +0,0 @@
-compareVars :=
-  {
-    "TSat_degC",
-    "dl",
-    "dv",
-    "hl",
-    "hv",
-    "hlv",
-    "sl",
-    "sv",
-    "slv"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos~HEAD b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos~HEAD
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos~master b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos~master
deleted file mode 100644
index 3f5ccdb9d48..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Media.Examples.SteamTemperatureEnthalpyInversion.mos~master
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "T",
-    "h"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.ChangeSign.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.ChangeSign.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.ChangeSign.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.ChangeSign.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Derivative.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.Derivative.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.Derivative.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.Derivative.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqual.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqual.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqual.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqual.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.GreaterEqualThreshold.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.HysteresisWithHold.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqual.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqual.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqual.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqual.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LessEqualThreshold.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPID.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPID.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.LimPID.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPID.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput.mos
new file mode 100644
index 00000000000..a55e057a97e
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialDerivativeOutput.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "limPID.y",
+    "limPD.y",
+    "limPID.D.y",
+    "limPD.D.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState.mos
new file mode 100644
index 00000000000..acbe7637975
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDInitialState.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "limPID.I.y",
+    "limPID.D.y",
+    "limPI.I.y",
+    "limPID.D.u"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset.mos
new file mode 100644
index 00000000000..0da4d8bbb6b
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.LimPIDWithReset.mos
@@ -0,0 +1,15 @@
+compareVars :=
+  {
+    "limPIDPar.u_s",
+    "limPIDPar.u_m",
+    "limPIDPar.y",
+    "limPIDInp.u_s",
+    "limPIDInp.u_m",
+    "limPIDInp.y",
+    "limPIPar.u_s",
+    "limPIPar.u_m",
+    "limPIPar.y",
+    "limPIInp.u_s",
+    "limPIInp.u_m",
+    "limPIInp.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Continuous.Validation.NumberOfRequests.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.Timer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.Timer.mos
new file mode 100644
index 00000000000..c2f252099c4
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Logical.Validation.Timer.mos
@@ -0,0 +1,17 @@
+compareVars :=
+  {
+    "resetTimer.u",
+    "resetTimer.y",
+    "accuTimer.u",
+    "accuTimer.reset",
+    "accuTimer.y",
+    "accuTimer1.u",
+    "accuTimer1.reset",
+    "accuTimer1.y",
+    "accuTimer2.u",
+    "accuTimer2.reset",
+    "accuTimer2.y",
+    "accuTimer3.u",
+    "accuTimer3.reset",
+    "accuTimer3.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi.mos
new file mode 100644
index 00000000000..3718114be5e
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TDewPoi_TDryBulPhi.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "dewBulPhi.TDewPoi",
+    "TDewPoi.T",
+    "dewBulPhi1.TDewPoi",
+    "TDewPoi1.T",
+    "add.y",
+    "add1.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi.mos
new file mode 100644
index 00000000000..8d2150b0c07
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.TWetBul_TDryBulPhi.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "wetBulPhi.TWetBul",
+    "wetBulPhi_BuiLib.TWetBul",
+    "add.y",
+    "phi.y",
+    "wetBulPhi.TWetBul",
+    "wetBulXi.TWetBul",
+    "add1.y",
+    "phi.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi.mos
new file mode 100644
index 00000000000..23965b479fb
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Controls.OBC.CDL.Psychrometrics.Validation.h_TDryBulPhi.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "hBulPhi.h",
+    "phi.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.FFD.Tutorial.MixedConvectionWithBox.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.FFD.Tutorial.MixedConvectionWithBox.mos
deleted file mode 100644
index ddefdda02f9..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.FFD.Tutorial.MixedConvectionWithBox.mos
+++ /dev/null
@@ -1,8 +0,0 @@
-compareVars :=
-  {
-    "roo.yCFD[1]",
-    "roo.yCFD[2]",
-    "TFlo.port.Q_flow",
-    "TOthWal[1].port.Q_flow",
-    "TOthWal[2].port.Q_flow"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvection.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvection.mos
deleted file mode 100644
index 6a19188bd61..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvection.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "roo.yCFD[1]",
-    "roo.yCFD[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvectionWithExteriorWall.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvectionWithExteriorWall.mos
deleted file mode 100644
index 6a19188bd61..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvectionWithExteriorWall.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "roo.yCFD[1]",
-    "roo.yCFD[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvection.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvection.mos
deleted file mode 100644
index 6a19188bd61..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvection.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "roo.yCFD[1]",
-    "roo.yCFD[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvectionWithBox.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvectionWithBox.mos
deleted file mode 100644
index 6a19188bd61..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.MixedConvectionWithBox.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "roo.yCFD[1]",
-    "roo.yCFD[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.NaturalConvection.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.NaturalConvection.mos
deleted file mode 100644
index 6a19188bd61..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.Detailed.Examples.ISAT.Tutorial.NaturalConvection.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "roo.yCFD[1]",
-    "roo.yCFD[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones1.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones1.mos
new file mode 100644
index 00000000000..db08eb91101
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones1.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "fmuZonCor.T",
+    "fmuZonCor.QCon_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2.mos
new file mode 100644
index 00000000000..91a9beacc74
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "fmuZonCor.T",
+    "fmuZonSou.T",
+    "fmuZonCor.QCon_flow",
+    "fmuZonSou.QCon_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones3.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones3.mos
new file mode 100644
index 00000000000..fb79f147624
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones3.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "fmuZonCor.T",
+    "fmuZonNor.T",
+    "fmuZonSou.T",
+    "fmuZonCor.QCon_flow",
+    "fmuZonSou.QCon_flow",
+    "fmuZonNor.QCon_flow"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos
new file mode 100644
index 00000000000..4b9759eaa69
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "zon1.zon.TAir",
+    "zon2.zon1.TAir",
+    "zon2.zon2.TAir"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos
new file mode 100644
index 00000000000..36c85637e2b
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "bui[1].zon.TAir",
+    "bui[2].zon.TAir"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos
new file mode 100644
index 00000000000..9bd1ac28f6f
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "bui[1].zon1.TAir",
+    "bui[1].zon2.TAir",
+    "bui[1].TAirEnePlu.y",
+    "bui[2].zon1.TAir",
+    "bui[2].zon2.TAir",
+    "bui[2].TAirEnePlu.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable.mos
new file mode 100644
index 00000000000..551e9cdc466
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "zon.TAir",
+    "equEle.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos
new file mode 100644
index 00000000000..551e9cdc466
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "zon.TAir",
+    "equEle.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos
new file mode 100644
index 00000000000..cb79952ea8c
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "zon.TAir",
+    "equEle.y",
+    "incBeaSou.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos
new file mode 100644
index 00000000000..3bbd2beb50e
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "zon.TAir",
+    "equEle.y",
+    "equEle2.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable.mos
new file mode 100644
index 00000000000..d42542dd509
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "zon.TAir",
+    "schInt.u",
+    "equEle.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.InternalGain.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.InternalGain.mos
new file mode 100644
index 00000000000..030f9dd3466
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.InternalGain.mos
@@ -0,0 +1,19 @@
+compareVars :=
+  {
+    "noGai.bui.zon.TAir",
+    "radOnl.bui.zon.TAir",
+    "conOnl.bui.zon.TAir",
+    "latOnl.bui.zon.TAir",
+    "noGai.bui.zon.TRad",
+    "radOnl.bui.zon.TRad",
+    "conOnl.bui.zon.TRad",
+    "latOnl.bui.zon.TRad",
+    "noGai.bui.zon.phi",
+    "radOnl.bui.zon.phi",
+    "conOnl.bui.zon.phi",
+    "latOnl.bui.zon.phi",
+    "noGai.bui.zon.ports[1].Xi_outflow[1]",
+    "radOnl.bui.zon.ports[1].Xi_outflow[1]",
+    "conOnl.bui.zon.ports[1].Xi_outflow[1]",
+    "latOnl.bui.zon.ports[1].Xi_outflow[1]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos
new file mode 100644
index 00000000000..c666bca4d0d
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "zon.TAir",
+    "zonMeaAirTem.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.RefBldgSmallOffice.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.RefBldgSmallOffice.mos
new file mode 100644
index 00000000000..04814115da9
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.RefBldgSmallOffice.mos
@@ -0,0 +1,17 @@
+compareVars :=
+  {
+    "building.weaBus.TDryBul",
+    "att.TAir",
+    "cor.TAir",
+    "sou.TAir",
+    "eas.TAir",
+    "nor.TAir",
+    "wes.TAir",
+    "TOutEP",
+    "TAttEP",
+    "TCorEP",
+    "TSouEP",
+    "TEasEP",
+    "TNorEP",
+    "TWesEP"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.ZoneTemperatureInitialization.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.ZoneTemperatureInitialization.mos
new file mode 100644
index 00000000000..1e8316d4f1d
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.ZoneTemperatureInitialization.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "zon.TAir",
+    "TRad.y",
+    "zon.TRad"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.ReducedOrder.Examples.SimpleRoomFourElementsTraceSubstance.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.ReducedOrder.Examples.SimpleRoomFourElementsTraceSubstance.mos
new file mode 100644
index 00000000000..db2420bb295
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.ReducedOrder.Examples.SimpleRoomFourElementsTraceSubstance.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "thermalZoneFourElements.TAir",
+    "thermalZoneFourElements.volAir.C[1]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Comfort.Validation.FangerCBE.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Comfort.Validation.FangerCBE.mos
new file mode 100644
index 00000000000..ceb20b6ca46
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Comfort.Validation.FangerCBE.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "PMVRef.y[1]",
+    "com.PMV"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Examples.KalmanFilter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Examples.KalmanFilter.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Examples.KalmanFilter.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Examples.KalmanFilter.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Examples.SimpleRoom.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Examples.SimpleRoom.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Examples.SimpleRoom.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Examples.SimpleRoom.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Functions.Examples.Exchange.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Functions.Examples.Exchange.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Functions.Examples.Exchange.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Functions.Examples.Exchange.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Functions.Examples.ExchangeWithPassPythonObject.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python27.Functions.Examples.ExchangeWithPassPythonObject.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Math.Functions.Examples.Round.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Math.Functions.Examples.Round.mos
new file mode 100644
index 00000000000..d3695e34b9a
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.Math.Functions.Examples.Round.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "ym2",
+    "ym1",
+    "y",
+    "y1",
+    "y2"
+  };
diff --git a/Buildings/Resources/Scripts/travis/Makefile b/Buildings/Resources/Scripts/travis/Makefile
index dc2a3d42d24..27194d932e7 100644
--- a/Buildings/Resources/Scripts/travis/Makefile
+++ b/Buildings/Resources/Scripts/travis/Makefile
@@ -1,56 +1,14 @@
 ############################################################
 # Makefile for the regression tests that are run on travis
 ############################################################
-ROOT = ../../../..
+# $(TRAVIS_BUILD_DIR) is /home/travis/build/lbl-srg/modelica-buildings
+ROOT = $(TRAVIS_BUILD_DIR)
 
-<<<<<<< HEAD
-test-documentation:
-	(cd $(ROOT)/Buildings; ../bin/runUnitTests.py --validate-html-only)
-	(cd $(ROOT)/Buildings/Resources/Documentation/userGuide; make regressiontest)
-	(cd $(ROOT)/Buildings/Resources/src/fluid/heatpumps/calibration/doc; make regressiontest)
-
-test-experiment-setup:
-	(cd $(ROOT)/Buildings; ../bin/runUnitTests.py --validate-experiment-setup)
-
-test-autogenerated-files:
-	#echo ### Check for package.order to be up to date
-	(cd  $(ROOT)/Buildings; \
-	  python -c 'import buildingspy.development.refactor as r; \
-	  r.write_package_order(".", recursive=True)'; \
-	  git diff --exit-code . )
-
-	#echo ### Verify that all OpenModelica scripts are up to date, and no old scripts exist
-	(cd  $(ROOT)/Buildings && \
-	  rm Resources/Scripts/OpenModelica/compareVars/*.mos && \
-	  python -c 'import buildingspy.development.regressiontest as u; \
-	  u.Tester().writeOpenModelicaResultDictionary()')
-	git status --porcelain $(ROOT)/Buildings/Resources/Scripts/OpenModelica;
-	test -z "$$(git status --porcelain $(ROOT)/Buildings/Resources/Scripts/OpenModelica)"
-
-	#echo ### Check for UnitConversion package to be consistent with the script that generates it
-	(cd  $(ROOT); \
-	  python Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py; \
-	  git diff --exit-code Buildings)
-
-test-verify-files:
-	(cd $(ROOT)/Buildings && ../bin/verifyFiles.py)
-
-=======
->>>>>>> master
 # Test whether all EnergyPlus validation files are up to date.
 # This targets searches all files `run.sh` and executes them.
 # The target below excludes run.sh in ThermalZones as they are using a more recent
 # version of EnergyPlus that has not yet been released.
 test-energyplus-validations:
-<<<<<<< HEAD
-	export PATH=$(ROOT)/ENERGYPLUS_VERSION:$(PATH)
-	(cd $(ROOT)/Buildings/Resources/Data && \
-	for ff in `find . -name run.sh`; do; \
-	(echo "*** Testing $ff" && cd `dirname $ff` && ./run.sh);
-	done; \
-	cd $(ROOT)/Buildings/Resources/Data && \
-	git diff --exit-code .)
-=======
 	@find $(ROOT)/Buildings/Resources/Data -name run.sh | xargs -I {} sh -c \
 	  'cd `dirname {}` && \
 	   echo "*********************************************************" && \
@@ -93,18 +51,18 @@ test-spawn-portability:
 
 test-omc:
 	(cd $(ROOT) && $(TRAVIS_BUILD_DIR)/Buildings/Resources/Scripts/travis/omc/testOpenModelica.sh)
->>>>>>> master
 
 test-dymola:
 	(cd $(ROOT)/Buildings && \
-	  python ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool dymola)
+	  export PYTHONPATH=$(TRAVIS_BUILD_DIR)/Buildings/Resources/Python-Sources && \
+	  python3 ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool dymola)
 
 test-optimica:
 	(cd $(ROOT)/Buildings && \
 	  export PYTHONPATH=$(TRAVIS_BUILD_DIR)/Buildings/Resources/Python-Sources && \
-	  python ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool optimica --skip-verification)
+	  python3 ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool optimica --skip-verification)
 
 test-jmodelica:
 	(cd $(ROOT)/Buildings && \
 	  export PYTHONPATH=$(TRAVIS_BUILD_DIR)/Buildings/Resources/Python-Sources && \
-	  python ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool jmodelica --skip-verification)
+	  python3 ../bin/runUnitTests.py --batch --single-package $(PACKAGE) --tool jmodelica --skip-verification)
diff --git a/Buildings/Resources/Scripts/travis/dymola/dymola b/Buildings/Resources/Scripts/travis/dymola/dymola
old mode 100644
new mode 100755
index 3d0160db654..3b3707dd100
--- a/Buildings/Resources/Scripts/travis/dymola/dymola
+++ b/Buildings/Resources/Scripts/travis/dymola/dymola
@@ -10,17 +10,11 @@ arg_lis=`echo $@ | sed -e "s|${cur_dir}|.|g"`
 docker run \
   --user=${UID} \
   --mac-address=${MAC_ADDRESS} \
+  -v /tmp/.X11-unix:/tmp/.X11-unix \
+  -e DISPLAY=${DISPLAY} \
   --detach=false \
   --rm \
   -v ${sha_dir}:/mnt/shared \
-<<<<<<< HEAD
-  ${DOCKER_USERNAME}/travis_ubuntu-1804_dymola-2020x-x86_64 /bin/bash -c \
-  "Xvfb :77  -extension RANDR -extension GLX & \
-  export DISPLAY=:77.0 && \
-  cd /mnt/shared/${bas_nam} && \
-  dymola ${arg_lis}"
-=======
   ${DOCKER_USERNAME}/travis_ubuntu-1804_dymola:2022-x86_64 /bin/bash -c \
   "cd /mnt/shared/${bas_nam} && \
    dymola ${arg_lis}"
->>>>>>> master
diff --git a/Buildings/Resources/Scripts/travis/jmodelica/jm_ipython.sh b/Buildings/Resources/Scripts/travis/jmodelica/jm_ipython.sh
old mode 100644
new mode 100755
diff --git a/Buildings/Resources/Scripts/travis/omc/testOpenModelica.sh b/Buildings/Resources/Scripts/travis/omc/testOpenModelica.sh
new file mode 100755
index 00000000000..14ad930e167
--- /dev/null
+++ b/Buildings/Resources/Scripts/travis/omc/testOpenModelica.sh
@@ -0,0 +1,64 @@
+# This file translates and simulates all models in FILES with omc
+# Upon success, it exits with 0, otherwise it exits with a non-zero value.
+#
+# This file will eventually be replaced once OpenModelica testing is fully integrated
+# in BuildingsPy.
+#
+# Run this file from a directory that contains the Buildings directory.
+FILES="Buildings.Controls.OBC*"
+
+# Delete old files
+rm -f Buildings_* Buildings.* Modelica_* 2&> /dev/null
+# Write list of models
+mosScript=openmod.mos
+
+echo "clearCommandLineOptions();" > $mosScript
+echo "setCommandLineOptions(\"--matchingAlgorithm=PFPlusExt -d=initialization,NLSanalyticJacobian,newInst\");" >> $mosScript
+echo "setCommandLineOptions(\"+d=nogen,initialization,backenddaeinfo,discreteinfo,stateselection\");" >> $mosScript
+echo "setCommandLineOptions(\"--simCodeTarget=C\");" >> $mosScript
+echo "setCommandLineOptions(\"--target=gcc\");" >> $mosScript
+echo "setCompiler(\"clang\");" >> $mosScript
+echo "setCXXCompiler(\"clang++\");" >> $mosScript
+echo "setCommandLineOptions(\"+ignoreCommandLineOptionsAnnotation=false\");" >> $mosScript
+echo "setCommandLineOptions(\"+ignoreSimulationFlagsAnnotation=false\");" >> $mosScript
+echo "setCommandLineOptions(\"-d=nfAPI\");" >> $mosScript
+echo "setCommandLineOptions(\"--newBackend\");" >> $mosScript
+
+echo "loadModel(Modelica, {\"3.2.3\"});" >> $mosScript
+echo "getErrorString();" >> $mosScript
+echo "loadModel(Buildings); getErrorString();" >> $mosScript
+
+fileList=`find Buildings/Resources/Scripts/OpenModelica/compareVars -name $FILES`
+for ff in $fileList; do
+  fileName=`basename $ff`;
+  modelName="${fileName%.*}";
+  line="simulate(${modelName});";
+  echo $line >> $mosScript
+  echo $line
+done
+
+
+export OPENMODELICALIBRARY=`pwd`:/usr/lib/omlibrary
+#omc +d=nogen,initialization,backenddaeinfo,discreteinfo,stateselection --newBackend $mosScript
+omc $mosScript
+
+
+# Check for failures
+exiFla=0
+for ff in $fileList; do
+  fileName=`basename $ff`;
+  modelName="${fileName%.*}";
+  logName="${modelName}.log"
+  if [ -f $logName ]; then
+    cou=`grep -c "The simulation finished successfully" $logName`
+    if [ "${cou}" -ne  "1" ]; then
+        echo "$modelName failed."
+        exiFla=1
+    fi;
+   else
+        echo "$modelName failed to generate log file."
+        exiFla=1
+   fi;
+done
+rm -f Buildings_* Buildings.* Modelica_* 2&> /dev/null
+exit $exiFla
diff --git a/Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh b/Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh
old mode 100644
new mode 100755
diff --git a/Buildings/Resources/bin/ConvertWeatherData.jar b/Buildings/Resources/bin/ConvertWeatherData.jar
index bfe773603b0..2fec94566b6 100644
Binary files a/Buildings/Resources/bin/ConvertWeatherData.jar and b/Buildings/Resources/bin/ConvertWeatherData.jar differ
diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/cryptographicsHash.c b/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/cryptographicsHash.c
new file mode 100644
index 00000000000..5fa86744827
--- /dev/null
+++ b/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/cryptographicsHash.c
@@ -0,0 +1,317 @@
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define LITTLE_ENDIAN * This should be #define'd already, if true. */
+/* #define SHA1HANDSOFF * Copies data before messing with it. */
+
+#ifndef SHA1HANDSOFF
+#define SHA1HANDSOFF
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* for uint32_t */
+#include <stdint.h>
+
+#include "cryptographicsHash.h"
+
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#elif BYTE_ORDER == BIG_ENDIAN
+#define blk0(i) block->l[i]
+#else
+#error "Endianness not defined!"
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+
+void SHA1Transform(
+    uint32_t state[5],
+    const unsigned char buffer[64]
+)
+{
+    uint32_t a, b, c, d, e;
+
+    typedef union
+    {
+        unsigned char c[64];
+        uint32_t l[16];
+    } CHAR64LONG16;
+
+#ifdef SHA1HANDSOFF
+    CHAR64LONG16 block[1];      /* use array to appear as a pointer */
+
+    memcpy(block, buffer, 64);
+#else
+    /* The following had better never be used because it causes the
+     * pointer-to-const buffer to be cast into a pointer to non-const.
+     * And the result is written through.  I threw a "const" in, hoping
+     * this will cause a diagnostic.
+     */
+    CHAR64LONG16 *block = (const CHAR64LONG16 *) buffer;
+#endif
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a, b, c, d, e, 0);
+    R0(e, a, b, c, d, 1);
+    R0(d, e, a, b, c, 2);
+    R0(c, d, e, a, b, 3);
+    R0(b, c, d, e, a, 4);
+    R0(a, b, c, d, e, 5);
+    R0(e, a, b, c, d, 6);
+    R0(d, e, a, b, c, 7);
+    R0(c, d, e, a, b, 8);
+    R0(b, c, d, e, a, 9);
+    R0(a, b, c, d, e, 10);
+    R0(e, a, b, c, d, 11);
+    R0(d, e, a, b, c, 12);
+    R0(c, d, e, a, b, 13);
+    R0(b, c, d, e, a, 14);
+    R0(a, b, c, d, e, 15);
+    R1(e, a, b, c, d, 16);
+    R1(d, e, a, b, c, 17);
+    R1(c, d, e, a, b, 18);
+    R1(b, c, d, e, a, 19);
+    R2(a, b, c, d, e, 20);
+    R2(e, a, b, c, d, 21);
+    R2(d, e, a, b, c, 22);
+    R2(c, d, e, a, b, 23);
+    R2(b, c, d, e, a, 24);
+    R2(a, b, c, d, e, 25);
+    R2(e, a, b, c, d, 26);
+    R2(d, e, a, b, c, 27);
+    R2(c, d, e, a, b, 28);
+    R2(b, c, d, e, a, 29);
+    R2(a, b, c, d, e, 30);
+    R2(e, a, b, c, d, 31);
+    R2(d, e, a, b, c, 32);
+    R2(c, d, e, a, b, 33);
+    R2(b, c, d, e, a, 34);
+    R2(a, b, c, d, e, 35);
+    R2(e, a, b, c, d, 36);
+    R2(d, e, a, b, c, 37);
+    R2(c, d, e, a, b, 38);
+    R2(b, c, d, e, a, 39);
+    R3(a, b, c, d, e, 40);
+    R3(e, a, b, c, d, 41);
+    R3(d, e, a, b, c, 42);
+    R3(c, d, e, a, b, 43);
+    R3(b, c, d, e, a, 44);
+    R3(a, b, c, d, e, 45);
+    R3(e, a, b, c, d, 46);
+    R3(d, e, a, b, c, 47);
+    R3(c, d, e, a, b, 48);
+    R3(b, c, d, e, a, 49);
+    R3(a, b, c, d, e, 50);
+    R3(e, a, b, c, d, 51);
+    R3(d, e, a, b, c, 52);
+    R3(c, d, e, a, b, 53);
+    R3(b, c, d, e, a, 54);
+    R3(a, b, c, d, e, 55);
+    R3(e, a, b, c, d, 56);
+    R3(d, e, a, b, c, 57);
+    R3(c, d, e, a, b, 58);
+    R3(b, c, d, e, a, 59);
+    R4(a, b, c, d, e, 60);
+    R4(e, a, b, c, d, 61);
+    R4(d, e, a, b, c, 62);
+    R4(c, d, e, a, b, 63);
+    R4(b, c, d, e, a, 64);
+    R4(a, b, c, d, e, 65);
+    R4(e, a, b, c, d, 66);
+    R4(d, e, a, b, c, 67);
+    R4(c, d, e, a, b, 68);
+    R4(b, c, d, e, a, 69);
+    R4(a, b, c, d, e, 70);
+    R4(e, a, b, c, d, 71);
+    R4(d, e, a, b, c, 72);
+    R4(c, d, e, a, b, 73);
+    R4(b, c, d, e, a, 74);
+    R4(a, b, c, d, e, 75);
+    R4(e, a, b, c, d, 76);
+    R4(d, e, a, b, c, 77);
+    R4(c, d, e, a, b, 78);
+    R4(b, c, d, e, a, 79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+#ifdef SHA1HANDSOFF
+    memset(block, '\0', sizeof(block));
+#endif
+}
+
+
+/* SHA1Init - Initialize new context */
+
+void SHA1Init(
+    SHA1_CTX * context
+)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+
+void SHA1Update(
+    SHA1_CTX * context,
+    const unsigned char *data,
+    uint32_t len
+)
+{
+    uint32_t i;
+
+    uint32_t j;
+
+    j = context->count[0];
+    if ((context->count[0] += len << 3) < j)
+        context->count[1]++;
+    context->count[1] += (len >> 29);
+    j = (j >> 3) & 63;
+    if ((j + len) > 63)
+    {
+        memcpy(&context->buffer[j], data, (i = 64 - j));
+        SHA1Transform(context->state, context->buffer);
+        for (; i + 63 < len; i += 64)
+        {
+            SHA1Transform(context->state, &data[i]);
+        }
+        j = 0;
+    }
+    else
+        i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/* Add padding and return the message digest. */
+
+void SHA1Final(
+    unsigned char digest[20],
+    SHA1_CTX * context
+)
+{
+    unsigned i;
+
+    unsigned char finalcount[8];
+
+    unsigned char c;
+
+#if 0    /* untested "improvement" by DHR */
+    /* Convert context->count to a sequence of bytes
+     * in finalcount.  Second element first, but
+     * big-endian order within element.
+     * But we do it all backwards.
+     */
+    unsigned char *fcp = &finalcount[8];
+
+    for (i = 0; i < 2; i++)
+    {
+        uint32_t t = context->count[i];
+
+        int j;
+
+        for (j = 0; j < 4; t >>= 8, j++)
+            *--fcp = (unsigned char) t}
+#else
+    for (i = 0; i < 8; i++)
+    {
+        finalcount[i] = (unsigned char) ((context->count[(i >= 4 ? 0 : 1)] >> ((3 - (i & 3)) * 8)) & 255);      /* Endian independent */
+    }
+#endif
+    c = 0200;
+    SHA1Update(context, &c, 1);
+    while ((context->count[0] & 504) != 448)
+    {
+        c = 0000;
+        SHA1Update(context, &c, 1);
+    }
+    SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */
+    for (i = 0; i < 20; i++)
+    {
+        digest[i] = (unsigned char)
+            ((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
+    }
+    /* Wipe variables */
+    memset(context, '\0', sizeof(*context));
+    memset(&finalcount, '\0', sizeof(finalcount));
+}
+
+void SHA1(
+    char *hash_out,
+    const char *str,
+    int len)
+{
+    SHA1_CTX ctx;
+    unsigned int ii;
+
+    SHA1Init(&ctx);
+    for (ii=0; ii<(unsigned int)len; ii+=1)
+        SHA1Update(&ctx, (const unsigned char*)str + ii, 1);
+    SHA1Final((unsigned char *)hash_out, &ctx);
+    hash_out[20] = '\0';
+}
+
+const char* cryptographicsHash(const char* str, void (*SpawnError)(const char *string))
+{
+  char result[21];
+  size_t offset;
+  char* hexresult = malloc(41*sizeof(char));
+
+  if (!hexresult){
+    SpawnError("Failed to allocate memory in cryptographicHash.");
+  }
+
+  SHA1( result, str, (int)strlen(str) );
+
+  for(offset = 0; offset < 20; offset++) {
+    sprintf( ( hexresult + (2*offset)), "%02x", result[offset]&0xff);
+  }
+
+  return hexresult;
+}
+
+#endif
diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/README.md b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/README.md
new file mode 100644
index 00000000000..54ba643fdf3
--- /dev/null
+++ b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/README.md
@@ -0,0 +1,12 @@
+This directory contains FMUs that are precompiled for Linux 64bit.
+They are used in the examples in
+Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation
+
+To generate the FMUs, run
+
+$ jm_ipython.sh jmodelica.py Zones1.mo
+$ jm_ipython.sh jmodelica.py Zones3.mo
+
+This will generate the files Zones1.fmu and Zones3.fmu.
+Note that the file Zones3.fmu can also be used for the example
+Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2
diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/RoomModel.mo b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/RoomModel.mo
new file mode 100644
index 00000000000..4d4bc8e8a3e
--- /dev/null
+++ b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/RoomModel.mo
@@ -0,0 +1,125 @@
+within ;
+model RoomModel "Model of a thermal zones"
+
+  parameter Modelica.SIunits.Time samplePeriod(min=100*Modelica.Constants.eps, start=0.1) = 60
+    "Sample period of component";
+
+  parameter Modelica.SIunits.Volume V "Volume";
+  parameter Modelica.SIunits.Area AFlo "Floor area";
+  parameter Real mSenFac "Factor for scaling sensible thermal mass of volume";
+
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T "Temperature of the zone air";
+  input Real X(min=0, final unit="1") "Water vapor mass fraction in kg water/kg dry air";
+  input Modelica.SIunits.MassFlowRate mInlets_flow
+     "Sum of positive mass flow rates into the zone for all air inlets (including infiltration)";
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAveInlet
+    "Average of inlets medium temperatures carried by the mass flow rates";
+  input Modelica.SIunits.HeatFlowRate QGaiRad_flow
+    "Radiative sensible heat gain added to the zone";
+
+  discrete output Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TRad(start=20)
+    "Average radiative temperature in the room";
+  output Modelica.SIunits.HeatFlowRate QConSen_flow
+    "Convective sensible heat added to the zone";
+  output Modelica.SIunits.HeatFlowRate QLat_flow(start=-0.1)
+    "Latent heat gain added to the zone";
+  output Modelica.SIunits.HeatFlowRate QPeo_flow
+      "Heat gain due to people";
+  discrete output Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TCon(start=20)
+    "Construction temperature (first order approximation)";
+
+protected
+  parameter Modelica.SIunits.Time startTime(fixed=false) "First sample time instant";
+  parameter Modelica.SIunits.Length h = V/AFlo "Room height";
+  parameter Modelica.SIunits.Area ACon = 2*AFlo + sqrt(AFlo)*h*4 "Surface area of constructions";
+  parameter Modelica.SIunits.ThermalConductance Ah = ACon * 8 "Conductance A*h for all surfaces";
+  parameter Modelica.SIunits.HeatCapacity CCon = ACon*0.2*800*2000 "Heat capacity of constructions";
+
+  output Boolean sampleTrigger "True, if sample time instant";
+
+  discrete Modelica.SIunits.Time tLast "Time when state was updated the last time";
+  discrete Modelica.SIunits.Time tNext "Next requested sampling time";
+  discrete Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TLast "Temperature of the zone air";
+  discrete Real XLast(min=0, final unit="1") "Water vapor mass fraction in kg water/kg dry air";
+  discrete Modelica.SIunits.MassFlowRate mInlets_flowLast
+     "Sum of positive mass flow rates into the zone for all air inlets (including infiltration)";
+  discrete Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TAveInletLast
+    "Average of inlets medium temperatures carried by the mass flow rates";
+  discrete Modelica.SIunits.HeatFlowRate QGaiRad_flowLast
+    "Radiative sensible heat gain added to the zone";
+  discrete Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TConLast(start=20)
+    "Construction temperature (first order approximation)";
+
+  function newInput "Function that outputs true if the xCur and xPre have different values"
+  input Real xCur[:] "Current input";
+  input Real xPre[:] "Previous input";
+  output Boolean inputChanged "True if the input changed, false otherwise";
+  protected
+   Integer n = 1 "Dimension of input";
+  algorithm
+  inputChanged := false;
+  for i in 1:n loop
+    if abs(xCur[i]-xPre[i]) > 1E-10 then
+      inputChanged := true;
+      break;
+    end if;
+  end for;
+  end newInput;
+
+initial equation
+  startTime = time;
+  assert(false, "*** Test warning written by " + getInstanceName() + ".\n", AssertionLevel.warning);
+equation
+  sampleTrigger = sample(startTime, samplePeriod);
+
+  when initial() then
+    tLast = startTime;
+    tNext = time + samplePeriod;
+    TConLast = 20;
+    TCon = 20;
+
+    TRad = TCon;
+    TLast = T;
+    XLast = X;
+    mInlets_flowLast = mInlets_flow;
+    QGaiRad_flowLast = QGaiRad_flow;
+    TAveInletLast = TAveInlet;
+  elsewhen (time >= pre(tNext)) then
+    // Time advanced.
+    tLast = pre(tLast);
+    tNext = time + samplePeriod;
+    TConLast = pre(TCon);
+    TCon = TConLast + (tLast-time) / CCon * (QConSen_flow +  QGaiRad_flow);
+
+    TRad = TCon;
+    TLast = T;
+    XLast = X;
+    mInlets_flowLast = mInlets_flow;
+    QGaiRad_flowLast = QGaiRad_flow;
+    TAveInletLast = TAveInlet;
+  elsewhen newInput(
+    {T, X, mInlets_flow, QGaiRad_flow, TAveInlet},
+    {pre(TLast), pre(XLast), pre(mInlets_flowLast), pre(QGaiRad_flowLast), pre(TAveInletLast)}) then
+    // Time did not advance but inputs changed
+    tLast = pre(tLast);
+    tNext = pre(tNext);
+    TConLast = pre(TConLast);
+    TCon = TConLast + (tLast-time) / CCon * (QConSen_flow +  QGaiRad_flow);
+
+    TRad = TCon;
+    TLast = T;
+    XLast = X;
+    mInlets_flowLast = mInlets_flow;
+    QGaiRad_flowLast = QGaiRad_flow;
+    TAveInletLast = TAveInlet;
+  end when;
+
+  QConSen_flow = Ah * (TCon-T);
+  QLat_flow = 0;
+  QPeo_flow = 0;
+  annotation (Documentation(info="<html>
+<p>
+Simple room model that is used for testing the Spawn of EnergyPlus coupling.
+</p>
+</html>"));
+end RoomModel;
diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones1.mo b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones1.mo
new file mode 100644
index 00000000000..0598b2911de
--- /dev/null
+++ b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones1.mo
@@ -0,0 +1,53 @@
+within ;
+model Zones1 "Model of a thermal zone"
+
+  constant Modelica.SIunits.Volume Core_ZN_V = 3*4*3 "Volume";
+  constant Modelica.SIunits.Area Core_ZN_AFlo = 3*4 "Floor area";
+  constant Real Core_ZN_mSenFac = 1 "Factor for scaling sensible thermal mass of volume";
+ // parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC Core_ZN_T_start = 20
+ //   "Initial temperature of zone air";
+
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC Core_ZN_T "Temperature of the zone air";
+  input Real Core_ZN_X(min=0, final unit="1") "Water vapor mass fraction in kg water/kg dry air";
+  input Modelica.SIunits.MassFlowRate Core_ZN_mInlets_flow
+     "Sum of positive mass flow rates into the zone for all air inlets (including infiltration)";
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC Core_ZN_TAveInlet
+    "Average of inlets medium temperatures carried by the mass flow rates";
+  input Modelica.SIunits.HeatFlowRate Core_ZN_QGaiRad_flow
+    "Radiative sensible heat gain added to the zone";
+
+  discrete output Modelica.SIunits.Conversions.NonSIunits.Temperature_degC Core_ZN_TRad
+    "Average radiative temperature in the room";
+  output Modelica.SIunits.HeatFlowRate Core_ZN_QConSen_flow
+    "Convective sensible heat added to the zone";
+  output Modelica.SIunits.HeatFlowRate Core_ZN_QLat_flow
+    "Latent heat gain added to the zone";
+  output Modelica.SIunits.HeatFlowRate Core_ZN_QPeo_flow
+      "Heat gain due to people";
+
+protected
+  RoomModel core(
+    V =       Core_ZN_V,
+    AFlo =    Core_ZN_AFlo,
+    mSenFac = Core_ZN_mSenFac) "Room model";
+
+equation
+  // Inputs for room
+  core.T            = Core_ZN_T;
+  core.X            = Core_ZN_X;
+  core.mInlets_flow = Core_ZN_mInlets_flow;
+  core.TAveInlet    = Core_ZN_TAveInlet;
+  core.QGaiRad_flow = Core_ZN_QGaiRad_flow;
+
+  // Outputs from room
+  core.TRad         = Core_ZN_TRad;
+  core.QConSen_flow = Core_ZN_QConSen_flow;
+  core.QLat_flow    = Core_ZN_QLat_flow;
+  core.QPeo_flow    = Core_ZN_QPeo_flow;
+
+  annotation (Documentation(info="<html>
+<p>
+Simple model of one thermal zone that is used for testing the Spawn of EnergyPlus coupling.
+</p>
+</html>"));
+end Zones1;
diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.mo b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.mo
new file mode 100644
index 00000000000..52830a85440
--- /dev/null
+++ b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.mo
@@ -0,0 +1,134 @@
+within ;
+model Zones3 "Model of three thermal zones"
+
+  constant Modelica.SIunits.Volume Core_ZN_V = 3*4*3 "Volume";
+  constant Modelica.SIunits.Area Core_ZN_AFlo = 3*4 "Floor area";
+  constant Real Core_ZN_mSenFac = 1 "Factor for scaling sensible thermal mass of volume";
+
+
+  constant Modelica.SIunits.Volume South_ZN_V = 3*4*3 "Volume";
+  constant Modelica.SIunits.Area South_ZN_AFlo = 3*4 "Floor area";
+  constant Real South_ZN_mSenFac = 1 "Factor for scaling sensible thermal mass of volume";
+
+
+  constant Modelica.SIunits.Volume North_ZN_V = 3*4*3 "Volume";
+  constant Modelica.SIunits.Area North_ZN_AFlo = 3*4 "Floor area";
+  constant Real North_ZN_mSenFac = 1 "Factor for scaling sensible thermal mass of volume";
+
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC Core_ZN_T "Temperature of the zone air";
+  input Real Core_ZN_X(min=0, final unit="1") "Water vapor mass fraction in kg water/kg dry air";
+  input Modelica.SIunits.MassFlowRate Core_ZN_mInlets_flow
+     "Sum of positive mass flow rates into the zone for all air inlets (including infiltration)";
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC Core_ZN_TAveInlet
+    "Average of inlets medium temperatures carried by the mass flow rates";
+  input Modelica.SIunits.HeatFlowRate Core_ZN_QGaiRad_flow
+    "Radiative sensible heat gain added to the zone";
+
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC South_ZN_T "Temperature of the zone air";
+  input Real South_ZN_X(min=0, final unit="1") "Water vapor mass fraction in kg water/kg dry air";
+  input Modelica.SIunits.MassFlowRate South_ZN_mInlets_flow
+     "Sum of positive mass flow rates into the zone for all air inlets (including infiltration)";
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC South_ZN_TAveInlet
+    "Average of inlets medium temperatures carried by the mass flow rates";
+  input Modelica.SIunits.HeatFlowRate South_ZN_QGaiRad_flow
+    "Radiative sensible heat gain added to the zone";
+
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC North_ZN_T "Temperature of the zone air";
+  input Real North_ZN_X(min=0, final unit="1") "Water vapor mass fraction in kg water/kg dry air";
+  input Modelica.SIunits.MassFlowRate North_ZN_mInlets_flow
+     "Sum of positive mass flow rates into the zone for all air inlets (including infiltration)";
+  input Modelica.SIunits.Conversions.NonSIunits.Temperature_degC North_ZN_TAveInlet
+    "Average of inlets medium temperatures carried by the mass flow rates";
+  input Modelica.SIunits.HeatFlowRate North_ZN_QGaiRad_flow
+    "Radiative sensible heat gain added to the zone";
+
+
+  discrete output Modelica.SIunits.Conversions.NonSIunits.Temperature_degC Core_ZN_TRad
+    "Average radiative temperature in the room";
+  output Modelica.SIunits.HeatFlowRate Core_ZN_QConSen_flow
+    "Convective sensible heat added to the zone";
+  output Modelica.SIunits.HeatFlowRate Core_ZN_QLat_flow(start=-0.1)
+    "Latent heat gain added to the zone";
+  output Modelica.SIunits.HeatFlowRate Core_ZN_QPeo_flow
+      "Heat gain due to people";
+
+  discrete output Modelica.SIunits.Conversions.NonSIunits.Temperature_degC South_ZN_TRad
+    "Average radiative temperature in the room";
+  output Modelica.SIunits.HeatFlowRate South_ZN_QConSen_flow
+    "Convective sensible heat added to the zone";
+  output Modelica.SIunits.HeatFlowRate South_ZN_QLat_flow(start=0.1)
+    "Latent heat gain added to the zone";
+  output Modelica.SIunits.HeatFlowRate South_ZN_QPeo_flow
+      "Heat gain due to people";
+
+  discrete output Modelica.SIunits.Conversions.NonSIunits.Temperature_degC North_ZN_TRad
+    "Average radiative temperature in the room";
+  output Modelica.SIunits.HeatFlowRate North_ZN_QConSen_flow
+    "Convective sensible heat added to the zone";
+  output Modelica.SIunits.HeatFlowRate North_ZN_QLat_flow(start=0.1)
+    "Latent heat gain added to the zone";
+  output Modelica.SIunits.HeatFlowRate North_ZN_QPeo_flow
+      "Heat gain due to people";
+
+protected
+  RoomModel core(
+    V =       Core_ZN_V,
+    AFlo =    Core_ZN_AFlo,
+    mSenFac = Core_ZN_mSenFac) "Room model";
+
+  RoomModel north(
+    V =       North_ZN_V,
+    AFlo =    North_ZN_AFlo,
+    mSenFac = North_ZN_mSenFac) "Room model";
+
+  RoomModel south(
+    V =       South_ZN_V,
+    AFlo =    South_ZN_AFlo,
+    mSenFac = South_ZN_mSenFac) "Room model";
+
+equation
+  // Inputs for room
+  core.T            = Core_ZN_T;
+  core.X            = Core_ZN_X;
+  core.mInlets_flow = Core_ZN_mInlets_flow;
+  core.TAveInlet    = Core_ZN_TAveInlet;
+  core.QGaiRad_flow = Core_ZN_QGaiRad_flow;
+
+  // Outputs from room
+  core.TRad         = Core_ZN_TRad;
+  core.QConSen_flow = Core_ZN_QConSen_flow;
+  core.QLat_flow    = Core_ZN_QLat_flow;
+  core.QPeo_flow    = Core_ZN_QPeo_flow;
+
+  // Inputs for room
+  north.T            = North_ZN_T;
+  north.X            = North_ZN_X;
+  north.mInlets_flow = North_ZN_mInlets_flow;
+  north.TAveInlet    = North_ZN_TAveInlet;
+  north.QGaiRad_flow = North_ZN_QGaiRad_flow;
+
+  // Outputs from room
+  north.TRad         = North_ZN_TRad;
+  north.QConSen_flow = North_ZN_QConSen_flow;
+  north.QLat_flow    = North_ZN_QLat_flow;
+  north.QPeo_flow    = North_ZN_QPeo_flow;
+
+  // Inputs for room
+  south.T            = South_ZN_T;
+  south.X            = South_ZN_X;
+  south.mInlets_flow = South_ZN_mInlets_flow;
+  south.TAveInlet    = South_ZN_TAveInlet;
+  south.QGaiRad_flow = South_ZN_QGaiRad_flow;
+
+  // Outputs from room
+  south.TRad         = South_ZN_TRad;
+  south.QConSen_flow = South_ZN_QConSen_flow;
+  south.QLat_flow    = South_ZN_QLat_flow;
+  south.QPeo_flow    = South_ZN_QPeo_flow;
+
+  annotation (Documentation(info="<html>
+<p>
+Simple model of three thermal zones that is used for testing the Spawn of EnergyPlus coupling.
+</p>
+</html>"));
+end Zones3;
diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/jmodelica.py b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/jmodelica.py
new file mode 100644
index 00000000000..e33c8fffc09
--- /dev/null
+++ b/Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/jmodelica.py
@@ -0,0 +1,41 @@
+##########################################################################
+# Script to generate an FMU for model-exhange with JModelica.
+#
+##########################################################################
+# Import the function for compilation of models and the load_fmu method
+
+from pymodelica import compile_fmu
+import traceback
+import logging
+
+from pyfmi import load_fmu
+import pymodelica
+
+import os
+import shutil
+import sys
+#    import matplotlib.pyplot as plt
+
+debug_solver = False
+models=["Zones1", "Zones3"]
+# Overwrite models with command line argument if specified
+if len(sys.argv) > 1:
+  # If the argument is a file, then parse it to a model name
+  if os.path.isfile(sys.argv[1]):
+    models = sys.argv[1].replace(os.path.sep, '.')[:-3]
+  else:
+    models = sys.argv[1]
+
+# Increase memory
+pymodelica.environ['JVM_ARGS'] = '-Xmx4096m'
+
+for model in models:
+  print("*** Compiling {}".format(model))
+  sys.stdout.flush()
+
+  ######################################################################
+  # Compile fmu
+  fmu_name = compile_fmu(model,
+                         version="2.0",
+                         compiler_log_level='warning',
+                         compiler_options = {"generate_html_diagnostics" : False})
diff --git a/Buildings/Resources/src/convertEPW/doc/ConvertWeatherData.html b/Buildings/Resources/src/convertEPW/doc/ConvertWeatherData.html
index f44d18f2eb0..d0d2a990769 100644
--- a/Buildings/Resources/src/convertEPW/doc/ConvertWeatherData.html
+++ b/Buildings/Resources/src/convertEPW/doc/ConvertWeatherData.html
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-ConvertWeatherData
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="ConvertWeatherData";
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -45,88 +25,113 @@
         }
     }
     catch(err) {
->>>>>>> master
     }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
+//-->
+var data = {"i0":9,"i1":9,"i2":9,"i3":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "./";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?ConvertWeatherData.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ConvertWeatherData.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
 <!-- ======== START OF CLASS DATA ======== -->
-<H2>
-Class ConvertWeatherData</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="./resources/inherit.gif" ALT="extended by "><B>ConvertWeatherData</B>
-</PRE>
-<HR>
-<DL>
-<DT><PRE>public class <B>ConvertWeatherData</B><DT>extends java.lang.Object</DL>
-</PRE>
-
-<P>
-This program converts a weather file
+<main role="main">
+<div class="header">
+<h2 title="Class ConvertWeatherData" class="title">Class ConvertWeatherData</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>ConvertWeatherData</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">ConvertWeatherData</span>
+extends java.lang.Object</pre>
+<div class="block">This program converts a weather file
  from .epw format for EnergyPlus
  to .mos format for Modelica.<p>
 
@@ -136,56 +141,35 @@ <H2>
     </pre>
  where <code>inputFile</code> is an EnergyPlus TMY3 file
  in the <code>epw</code> format.
- This will produce an <code>mos</code> file.
-<P>
-
-<P>
-<HR>
-
-<P>
-
+ This will produce an <code>mos</code> file.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="ConvertWeatherData.html#ConvertWeatherData()">ConvertWeatherData</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ConvertWeatherData</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
-<<<<<<< HEAD
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.util.ArrayList&lt;java.lang.String&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="ConvertWeatherData.html#convert(java.lang.String, java.util.ArrayList)">convert</A></B>(java.lang.String&nbsp;filename,
-        java.util.ArrayList&lt;java.lang.String&gt;&nbsp;myArr)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Read and convert data from weather file in epw format</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="ConvertWeatherData.html#getSimulationTime(int[])">getSimulationTime</A></B>(int[]&nbsp;time)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Transfer weather time
-=======
 <section role="region">
 <ul class="blockList">
 <li class="blockList"><a id="method.summary">
@@ -213,76 +197,63 @@ <h3>Method Summary</h3>
                  boolean&nbsp;minuteFlag)</code></th>
 <td class="colLast">
 <div class="block">Transfer weather time
->>>>>>> master
  from a format in year, month, date, hour and minute
- to a format in seconds for simulation</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="ConvertWeatherData.html#main(java.lang.String[])">main</A></B>(java.lang.String[]&nbsp;args)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This method is used to transfer the weather data file from .epw format for EnergyPlus
- to .mos for Modelica</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="ConvertWeatherData.html#write(java.lang.String, java.util.ArrayList)">write</A></B>(java.lang.String&nbsp;filename,
-      java.util.ArrayList&lt;java.lang.String&gt;&nbsp;myArr)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Write converted data into .mos file</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
+ to a format in seconds for simulation</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#main(java.lang.String%5B%5D)">main</a></span>&#8203;(java.lang.String[]&nbsp;args)</code></th>
+<td class="colLast">
+<div class="block">This method is used to transfer the weather data file from .epw format for EnergyPlus
+ to .mos for Modelica</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#write(java.lang.String,java.util.ArrayList)">write</a></span>&#8203;(java.lang.String&nbsp;filename,
+     java.util.ArrayList&lt;java.lang.String&gt;&nbsp;myArr)</code></th>
+<td class="colLast">
+<div class="block">Write converted data into .mos file</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="ConvertWeatherData()"><!-- --></A><H3>
-ConvertWeatherData</H3>
-<PRE>
-public <B>ConvertWeatherData</B>()</PRE>
-<DL>
-</DL>
-
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="&lt;init&gt;()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ConvertWeatherData</h4>
+<pre>public&nbsp;ConvertWeatherData()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
-<<<<<<< HEAD
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="getSimulationTime(int[])"><!-- --></A><H3>
-getSimulationTime</H3>
-<PRE>
-public static java.lang.String <B>getSimulationTime</B>(int[]&nbsp;time)</PRE>
-<DL>
-<DD>Transfer weather time
-=======
 <section role="region">
 <ul class="blockList">
 <li class="blockList"><a id="method.detail">
@@ -298,122 +269,136 @@ <h4>getSimulationTime</h4>
 <pre class="methodSignature">public static&nbsp;java.lang.String&nbsp;getSimulationTime&#8203;(int[]&nbsp;time,
                                                  boolean&nbsp;minuteFlag)</pre>
 <div class="block">Transfer weather time
->>>>>>> master
  from a format in year, month, date, hour and minute
- to a format in seconds for simulation
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>time</CODE> - time(year, month, day, hour, minute) in weather data file
-<DT><B>Returns:</B><DD>simulation time in seconds</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="write(java.lang.String, java.util.ArrayList)"><!-- --></A><H3>
-write</H3>
-<PRE>
-public static void <B>write</B>(java.lang.String&nbsp;filename,
+ to a format in seconds for simulation</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>time</code> - time(year, month, day, hour, minute) in weather data file</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>simulation time in seconds</dd>
+</dl>
+</li>
+</ul>
+<a id="write(java.lang.String,java.util.ArrayList)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>write</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;write&#8203;(java.lang.String&nbsp;filename,
                          java.util.ArrayList&lt;java.lang.String&gt;&nbsp;myArr)
-                  throws java.io.IOException</PRE>
-<DL>
-<DD>Write converted data into .mos file
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>filename</CODE> - the name of .mos weather data file<DD><CODE>myArr</CODE> - array where the weather data is stored
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE> - when problems occur during file access</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="convert(java.lang.String, java.util.ArrayList)"><!-- --></A><H3>
-convert</H3>
-<PRE>
-public static java.util.ArrayList&lt;java.lang.String&gt; <B>convert</B>(java.lang.String&nbsp;filename,
+                  throws java.io.IOException</pre>
+<div class="block">Write converted data into .mos file</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>filename</code> - the name of .mos weather data file</dd>
+<dd><code>myArr</code> - array where the weather data is stored</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - when problems occur during file access</dd>
+</dl>
+</li>
+</ul>
+<a id="convert(java.lang.String,java.util.ArrayList)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convert</h4>
+<pre class="methodSignature">public static&nbsp;java.util.ArrayList&lt;java.lang.String&gt;&nbsp;convert&#8203;(java.lang.String&nbsp;filename,
                                                             java.util.ArrayList&lt;java.lang.String&gt;&nbsp;myArr)
-                                                     throws java.io.IOException</PRE>
-<DL>
-<DD>Read and convert data from weather file in epw format
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>filename</CODE> - the name of .epw weather data file<DD><CODE>myArr</CODE> - the array where the weather data is stored
-<DT><B>Throws:</B>
-<DD><CODE>java.io.IOException</CODE> - when problems occur during file access</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="main(java.lang.String[])"><!-- --></A><H3>
-main</H3>
-<PRE>
-public static void <B>main</B>(java.lang.String[]&nbsp;args)</PRE>
-<DL>
-<DD>This method is used to transfer the weather data file from .epw format for EnergyPlus
- to .mos for Modelica
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>args</CODE> - name of .epw weather data file</DL>
-</DD>
-</DL>
+                                                     throws java.io.IOException</pre>
+<div class="block">Read and convert data from weather file in epw format</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>filename</code> - the name of .epw weather data file</dd>
+<dd><code>myArr</code> - the array where the weather data is stored</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - when problems occur during file access</dd>
+</dl>
+</li>
+</ul>
+<a id="main(java.lang.String[])">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>main</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;main&#8203;(java.lang.String[]&nbsp;args)</pre>
+<div class="block">This method is used to transfer the weather data file from .epw format for EnergyPlus
+ to .mos for Modelica</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>args</code> - name of .epw weather data file</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?ConvertWeatherData.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ConvertWeatherData.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/allclasses-frame.html b/Buildings/Resources/src/convertEPW/doc/allclasses-frame.html
deleted file mode 100644
index 6f3f49d1692..00000000000
--- a/Buildings/Resources/src/convertEPW/doc/allclasses-frame.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-All Classes
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;" target="classFrame">ConvertWeatherData</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/Buildings/Resources/src/convertEPW/doc/allclasses-noframe.html b/Buildings/Resources/src/convertEPW/doc/allclasses-noframe.html
deleted file mode 100644
index 7dc9ce5cafe..00000000000
--- a/Buildings/Resources/src/convertEPW/doc/allclasses-noframe.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-All Classes
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/Buildings/Resources/src/convertEPW/doc/constant-values.html b/Buildings/Resources/src/convertEPW/doc/constant-values.html
index dc5e02cc07b..3cec5aa2f75 100644
--- a/Buildings/Resources/src/convertEPW/doc/constant-values.html
+++ b/Buildings/Resources/src/convertEPW/doc/constant-values.html
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-Constant Field Values
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Constant Field Values";
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -43,128 +23,124 @@
         if (location.href.indexOf('is-external=true') == -1) {
             parent.document.title="Constant Field Values";
         }
->>>>>>> master
     }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
+    catch(err) {
+    }
+//-->
+var pathtoroot = "./";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Constant Field Values</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-</UL>
-
-<HR>
-
-
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<section role="region">
+<h2 title="Contents">Contents</h2>
+</section>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?constant-values.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/deprecated-list.html b/Buildings/Resources/src/convertEPW/doc/deprecated-list.html
index 29dc99bebc3..9f8d670969f 100644
--- a/Buildings/Resources/src/convertEPW/doc/deprecated-list.html
+++ b/Buildings/Resources/src/convertEPW/doc/deprecated-list.html
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-Deprecated List
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Deprecated List";
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -43,128 +23,122 @@
         if (location.href.indexOf('is-external=true') == -1) {
             parent.document.title="Deprecated List";
         }
->>>>>>> master
     }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
+    catch(err) {
+    }
+//-->
+var pathtoroot = "./";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-</UL>
-
-<HR>
-
-
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 title="Deprecated API" class="title">Deprecated API</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?deprecated-list.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/element-list b/Buildings/Resources/src/convertEPW/doc/element-list
new file mode 100644
index 00000000000..147af067f15
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/element-list
@@ -0,0 +1 @@
+unnamed package
diff --git a/Buildings/Resources/src/convertEPW/doc/help-doc.html b/Buildings/Resources/src/convertEPW/doc/help-doc.html
index d5c8970263b..4e2faf0209e 100644
--- a/Buildings/Resources/src/convertEPW/doc/help-doc.html
+++ b/Buildings/Resources/src/convertEPW/doc/help-doc.html
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-API Help
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="API Help";
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -43,195 +23,242 @@
         if (location.href.indexOf('is-external=true') == -1) {
             parent.document.title="API Help";
         }
->>>>>>> master
     }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
+    catch(err) {
+    }
+//-->
+var pathtoroot = "./";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Enums<LI>Exceptions<LI>Errors<LI>Annotation Types</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Annotation Type</H3>
-<BLOCKQUOTE>
-
-<P>
-Each annotation type has its own separate page with the following sections:<UL>
-<LI>Annotation Type declaration<LI>Annotation Type description<LI>Required Element Summary<LI>Optional Element Summary<LI>Element Detail</UL>
-</BLOCKQUOTE>
-</BLOCKQUOTE>
-<H3>
-Enum</H3>
-<BLOCKQUOTE>
-
-<P>
-Each enum has its own separate page with the following sections:<UL>
-<LI>Enum declaration<LI>Enum description<LI>Enum Constant Summary<LI>Enum Constant Detail</UL>
-</BLOCKQUOTE>
-<H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
-<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
-</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-all.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames.  All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<H3>
-Constant Field Values</H3>
-The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet.</EM>
-</FONT>
-<BR>
-<HR>
-
-
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 class="title">How This API Document Is Organized</h1>
+<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<section role="region">
+<h2>Package</h2>
+<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. These pages may contain six categories:</p>
+<ul>
+<li>Interfaces</li>
+<li>Classes</li>
+<li>Enums</li>
+<li>Exceptions</li>
+<li>Errors</li>
+<li>Annotation Types</li>
+</ul>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Class or Interface</h2>
+<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
+<ul>
+<li>Class Inheritance Diagram</li>
+<li>Direct Subclasses</li>
+<li>All Known Subinterfaces</li>
+<li>All Known Implementing Classes</li>
+<li>Class or Interface Declaration</li>
+<li>Class or Interface Description</li>
+</ul>
+<br>
+<ul>
+<li>Nested Class Summary</li>
+<li>Field Summary</li>
+<li>Property Summary</li>
+<li>Constructor Summary</li>
+<li>Method Summary</li>
+</ul>
+<br>
+<ul>
+<li>Field Detail</li>
+<li>Property Detail</li>
+<li>Constructor Detail</li>
+<li>Method Detail</li>
+</ul>
+<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Annotation Type</h2>
+<p>Each annotation type has its own separate page with the following sections:</p>
+<ul>
+<li>Annotation Type Declaration</li>
+<li>Annotation Type Description</li>
+<li>Required Element Summary</li>
+<li>Optional Element Summary</li>
+<li>Element Detail</li>
+</ul>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Enum</h2>
+<p>Each enum has its own separate page with the following sections:</p>
+<ul>
+<li>Enum Declaration</li>
+<li>Enum Description</li>
+<li>Enum Constant Summary</li>
+<li>Enum Constant Detail</li>
+</ul>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Tree (Class Hierarchy)</h2>
+<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. Classes are organized by inheritance structure starting with <code>java.lang.Object</code>. Interfaces do not inherit from <code>java.lang.Object</code>.</p>
+<ul>
+<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
+<li>When viewing a particular package, class or interface page, clicking on "Tree" displays the hierarchy for only that package.</li>
+</ul>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Deprecated API</h2>
+<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Index</h2>
+<p>The <a href="index-all.html">Index</a> contains an alphabetic index of all classes, interfaces, constructors, methods, and fields, as well as lists of all packages and all classes.</p>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>All&nbsp;Classes</h2>
+<p>The <a href="allclasses.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Serialized Form</h2>
+<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Constant Field Values</h2>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</section>
+</li>
+<li class="blockList">
+<section role="region">
+<h2>Search</h2>
+<p>You can search for definitions of modules, packages, types, fields, methods and other terms defined in the API, using some or all of the name. "Camel-case" abbreviations are supported: for example, "InpStr" will find "InputStream" and "InputStreamReader".</p>
+</section>
+</li>
+</ul>
+<hr>
+<span class="emphasizedPhrase">This help file applies to API documentation generated by the standard doclet.</span></div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?help-doc.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/index-all.html b/Buildings/Resources/src/convertEPW/doc/index-all.html
index 0e91b8917a5..dbb2bf3ec70 100644
--- a/Buildings/Resources/src/convertEPW/doc/index-all.html
+++ b/Buildings/Resources/src/convertEPW/doc/index-all.html
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-Index
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Index";
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -43,89 +23,87 @@
         if (location.href.indexOf('is-external=true') == -1) {
             parent.document.title="Index";
         }
->>>>>>> master
     }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
+    catch(err) {
+    }
+//-->
+var pathtoroot = "./";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="./index.html?index-all.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="./allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="./allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="#_C_">C</A> <A HREF="#_G_">G</A> <A HREF="#_M_">M</A> <A HREF="#_W_">W</A> <HR>
-<A NAME="_C_"><!-- --></A><H2>
-<B>C</B></H2>
-<DL>
-<DT><A HREF="./ConvertWeatherData.html#convert(java.lang.String, java.util.ArrayList)"><B>convert(String, ArrayList&lt;String&gt;)</B></A> -
-Static method in class <A HREF="./ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</A>
-<DD>Read and convert data from weather file in epw format
-<DT><A HREF="./ConvertWeatherData.html" title="class in &lt;Unnamed&gt;"><B>ConvertWeatherData</B></A> - Class in <A HREF="./package-summary.html">&lt;Unnamed&gt;</A><DD>This program converts a weather file
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="contentContainer"><a href="#I:C">C</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:W">W</a>&nbsp;<br><a href="allclasses-index.html">All&nbsp;Classes</a>&nbsp;<a href="allpackages-index.html">All&nbsp;Packages</a><a id="I:C">
+<!--   -->
+</a>
+<h2 class="title">C</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="ConvertWeatherData.html#convert(java.lang.String,java.util.ArrayList)">convert(String, ArrayList&lt;String&gt;)</a></span> - Static method in class <a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</a></dt>
+<dd>
+<div class="block">Read and convert data from weather file in epw format</div>
+</dd>
+<dt><a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;"><span class="typeNameLink">ConvertWeatherData</span></a> - Class in <a href="package-summary.html">&lt;Unnamed&gt;</a></dt>
+<dd>
+<div class="block">This program converts a weather file
  from .epw format for EnergyPlus
-<<<<<<< HEAD
- to .mos format for Modelica.<DT><A HREF="./ConvertWeatherData.html#ConvertWeatherData()"><B>ConvertWeatherData()</B></A> -
-Constructor for class <A HREF="./ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_G_"><!-- --></A><H2>
-<B>G</B></H2>
-<DL>
-<DT><A HREF="./ConvertWeatherData.html#getSimulationTime(int[])"><B>getSimulationTime(int[])</B></A> -
-Static method in class <A HREF="./ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</A>
-<DD>Transfer weather time
-=======
  to .mos format for Modelica.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="ConvertWeatherData.html#%3Cinit%3E()">ConvertWeatherData()</a></span> - Constructor for class <a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</a></dt>
@@ -139,79 +117,76 @@ <h2 class="title">G</h2>
 <dt><span class="memberNameLink"><a href="ConvertWeatherData.html#getSimulationTime(int%5B%5D,boolean)">getSimulationTime(int[], boolean)</a></span> - Static method in class <a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</a></dt>
 <dd>
 <div class="block">Transfer weather time
->>>>>>> master
  from a format in year, month, date, hour and minute
- to a format in seconds for simulation
-</DL>
-<HR>
-<A NAME="_M_"><!-- --></A><H2>
-<B>M</B></H2>
-<DL>
-<DT><A HREF="./ConvertWeatherData.html#main(java.lang.String[])"><B>main(String[])</B></A> -
-Static method in class <A HREF="./ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</A>
-<DD>This method is used to transfer the weather data file from .epw format for EnergyPlus
- to .mos for Modelica
-</DL>
-<HR>
-<A NAME="_W_"><!-- --></A><H2>
-<B>W</B></H2>
-<DL>
-<DT><A HREF="./ConvertWeatherData.html#write(java.lang.String, java.util.ArrayList)"><B>write(String, ArrayList&lt;String&gt;)</B></A> -
-Static method in class <A HREF="./ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</A>
-<DD>Write converted data into .mos file
-</DL>
-<HR>
-<A HREF="#_C_">C</A> <A HREF="#_G_">G</A> <A HREF="#_M_">M</A> <A HREF="#_W_">W</A>
-
+ to a format in seconds for simulation</div>
+</dd>
+</dl>
+<a id="I:M">
+<!--   -->
+</a>
+<h2 class="title">M</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="ConvertWeatherData.html#main(java.lang.String%5B%5D)">main(String[])</a></span> - Static method in class <a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</a></dt>
+<dd>
+<div class="block">This method is used to transfer the weather data file from .epw format for EnergyPlus
+ to .mos for Modelica</div>
+</dd>
+</dl>
+<a id="I:W">
+<!--   -->
+</a>
+<h2 class="title">W</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="ConvertWeatherData.html#write(java.lang.String,java.util.ArrayList)">write(String, ArrayList&lt;String&gt;)</a></span> - Static method in class <a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</a></dt>
+<dd>
+<div class="block">Write converted data into .mos file</div>
+</dd>
+</dl>
+<a href="#I:C">C</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:W">W</a>&nbsp;<br><a href="allclasses-index.html">All&nbsp;Classes</a>&nbsp;<a href="allpackages-index.html">All&nbsp;Packages</a></div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="./help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="./index.html?index-all.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="./allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="./allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/index.html b/Buildings/Resources/src/convertEPW/doc/index.html
index f886d42c652..97611681f0d 100644
--- a/Buildings/Resources/src/convertEPW/doc/index.html
+++ b/Buildings/Resources/src/convertEPW/doc/index.html
@@ -1,41 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Wed Nov 21 08:52:45 PST 2012-->
-<TITLE>
-Generated Documentation (Untitled)
-</TITLE>
-<SCRIPT type="text/javascript">
-    targetPage = "" + window.location.search;
-    if (targetPage != "" && targetPage != "undefined")
-        targetPage = targetPage.substring(1);
-    if (targetPage.indexOf(":") != -1)
-        targetPage = "undefined";
-    function loadFrames() {
-        if (targetPage != "" && targetPage != "undefined")
-             top.classFrame.location = top.targetPage;
-    }
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-</HEAD>
-<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
-<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
-<FRAME src="ConvertWeatherData.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to<A HREF="ConvertWeatherData.html">Non-frame version.</A>
-</NOFRAMES>
-</FRAMESET>
-</HTML>
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -59,4 +21,3 @@ <H2>
 </main>
 </body>
 </html>
->>>>>>> master
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 00000000000..34abd18f32d
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_65_dadada_1x400.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_65_dadada_1x400.png
new file mode 100644
index 00000000000..f058a938533
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_65_dadada_1x400.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_dadada_1x400.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 00000000000..2ce04c16517
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 00000000000..a90afb8bf80
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 00000000000..dbe091f6dc0
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_glass_95_fef1ec_1x400.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 00000000000..5dc3593e462
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_222222_256x240.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_222222_256x240.png
new file mode 100644
index 00000000000..e723e17cb54
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_222222_256x240.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_2e83ff_256x240.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 00000000000..1f5f49756ca
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_2e83ff_256x240.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_454545_256x240.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_454545_256x240.png
new file mode 100644
index 00000000000..618f5b0ca75
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_454545_256x240.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_888888_256x240.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_888888_256x240.png
new file mode 100644
index 00000000000..ee5e33f2723
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_888888_256x240.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_cd0a0a_256x240.png b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 00000000000..7e8ebc180a2
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/jquery/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-3.3.1.js b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-3.3.1.js
new file mode 100644
index 00000000000..9b5206bcc60
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-3.3.1.js
@@ -0,0 +1,10364 @@
+/*!
+ * jQuery JavaScript Library v3.3.1
+ * https://jquery.com/
+ *
+ * Includes Sizzle.js
+ * https://sizzlejs.com/
+ *
+ * Copyright JS Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2018-01-20T17:24Z
+ */
+( function( global, factory ) {
+
+	"use strict";
+
+	if ( typeof module === "object" && typeof module.exports === "object" ) {
+
+		// For CommonJS and CommonJS-like environments where a proper `window`
+		// is present, execute the factory and get jQuery.
+		// For environments that do not have a `window` with a `document`
+		// (such as Node.js), expose a factory as module.exports.
+		// This accentuates the need for the creation of a real `window`.
+		// e.g. var jQuery = require("jquery")(window);
+		// See ticket #14549 for more info.
+		module.exports = global.document ?
+			factory( global, true ) :
+			function( w ) {
+				if ( !w.document ) {
+					throw new Error( "jQuery requires a window with a document" );
+				}
+				return factory( w );
+			};
+	} else {
+		factory( global );
+	}
+
+// Pass this if window is not defined yet
+} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
+// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
+// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+// enough that all such attempts are guarded in a try block.
+"use strict";
+
+var arr = [];
+
+var document = window.document;
+
+var getProto = Object.getPrototypeOf;
+
+var slice = arr.slice;
+
+var concat = arr.concat;
+
+var push = arr.push;
+
+var indexOf = arr.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var fnToString = hasOwn.toString;
+
+var ObjectFunctionString = fnToString.call( Object );
+
+var support = {};
+
+var isFunction = function isFunction( obj ) {
+
+      // Support: Chrome <=57, Firefox <=52
+      // In some browsers, typeof returns "function" for HTML <object> elements
+      // (i.e., `typeof document.createElement( "object" ) === "function"`).
+      // We don't want to classify *any* DOM node as a function.
+      return typeof obj === "function" && typeof obj.nodeType !== "number";
+  };
+
+
+var isWindow = function isWindow( obj ) {
+		return obj != null && obj === obj.window;
+	};
+
+
+
+
+	var preservedScriptAttributes = {
+		type: true,
+		src: true,
+		noModule: true
+	};
+
+	function DOMEval( code, doc, node ) {
+		doc = doc || document;
+
+		var i,
+			script = doc.createElement( "script" );
+
+		script.text = code;
+		if ( node ) {
+			for ( i in preservedScriptAttributes ) {
+				if ( node[ i ] ) {
+					script[ i ] = node[ i ];
+				}
+			}
+		}
+		doc.head.appendChild( script ).parentNode.removeChild( script );
+	}
+
+
+function toType( obj ) {
+	if ( obj == null ) {
+		return obj + "";
+	}
+
+	// Support: Android <=2.3 only (functionish RegExp)
+	return typeof obj === "object" || typeof obj === "function" ?
+		class2type[ toString.call( obj ) ] || "object" :
+		typeof obj;
+}
+/* global Symbol */
+// Defining this global in .eslintrc.json would create a danger of using the global
+// unguarded in another place, it seems safer to define global only for this module
+
+
+
+var
+	version = "3.3.1",
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+
+		// The jQuery object is actually just the init constructor 'enhanced'
+		// Need init if jQuery is called (just allow error to be thrown if not included)
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Support: Android <=4.0 only
+	// Make sure we trim BOM and NBSP
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+
+jQuery.fn = jQuery.prototype = {
+
+	// The current version of jQuery being used
+	jquery: version,
+
+	constructor: jQuery,
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	toArray: function() {
+		return slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+
+		// Return all the elements in a clean array
+		if ( num == null ) {
+			return slice.call( this );
+		}
+
+		// Return just the one element from the set
+		return num < 0 ? this[ num + this.length ] : this[ num ];
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	each: function( callback ) {
+		return jQuery.each( this, callback );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map( this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		} ) );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ) );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor();
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: arr.sort,
+	splice: arr.splice
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[ 0 ] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+
+		// Skip the boolean and the target
+		target = arguments[ i ] || {};
+		i++;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !isFunction( target ) ) {
+		target = {};
+	}
+
+	// Extend jQuery itself if only one argument is passed
+	if ( i === length ) {
+		target = this;
+		i--;
+	}
+
+	for ( ; i < length; i++ ) {
+
+		// Only deal with non-null/undefined values
+		if ( ( options = arguments[ i ] ) != null ) {
+
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
+					( copyIsArray = Array.isArray( copy ) ) ) ) {
+
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && Array.isArray( src ) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject( src ) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend( {
+
+	// Unique for each copy of jQuery on the page
+	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+
+	// Assume jQuery is ready without the ready module
+	isReady: true,
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	noop: function() {},
+
+	isPlainObject: function( obj ) {
+		var proto, Ctor;
+
+		// Detect obvious negatives
+		// Use toString instead of jQuery.type to catch host objects
+		if ( !obj || toString.call( obj ) !== "[object Object]" ) {
+			return false;
+		}
+
+		proto = getProto( obj );
+
+		// Objects with no prototype (e.g., `Object.create( null )`) are plain
+		if ( !proto ) {
+			return true;
+		}
+
+		// Objects with prototype are plain iff they were constructed by a global Object function
+		Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
+		return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
+	},
+
+	isEmptyObject: function( obj ) {
+
+		/* eslint-disable no-unused-vars */
+		// See https://github.com/eslint/eslint/issues/6125
+		var name;
+
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	// Evaluates a script in a global context
+	globalEval: function( code ) {
+		DOMEval( code );
+	},
+
+	each: function( obj, callback ) {
+		var length, i = 0;
+
+		if ( isArrayLike( obj ) ) {
+			length = obj.length;
+			for ( ; i < length; i++ ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
+				}
+			}
+		} else {
+			for ( i in obj ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Support: Android <=4.0 only
+	trim: function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var ret = results || [];
+
+		if ( arr != null ) {
+			if ( isArrayLike( Object( arr ) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
+			} else {
+				push.call( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		return arr == null ? -1 : indexOf.call( arr, elem, i );
+	},
+
+	// Support: Android <=4.0 only, PhantomJS 1 only
+	// push.apply(_, arraylike) throws on ancient WebKit
+	merge: function( first, second ) {
+		var len = +second.length,
+			j = 0,
+			i = first.length;
+
+		for ( ; j < len; j++ ) {
+			first[ i++ ] = second[ j ];
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, invert ) {
+		var callbackInverse,
+			matches = [],
+			i = 0,
+			length = elems.length,
+			callbackExpect = !invert;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			callbackInverse = !callback( elems[ i ], i );
+			if ( callbackInverse !== callbackExpect ) {
+				matches.push( elems[ i ] );
+			}
+		}
+
+		return matches;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var length, value,
+			i = 0,
+			ret = [];
+
+		// Go through the array, translating each of the items to their new values
+		if ( isArrayLike( elems ) ) {
+			length = elems.length;
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// jQuery.support is not used in Core but other projects attach their
+	// properties to it so it needs to exist.
+	support: support
+} );
+
+if ( typeof Symbol === "function" ) {
+	jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
+}
+
+// Populate the class2type map
+jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+function( i, name ) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+} );
+
+function isArrayLike( obj ) {
+
+	// Support: real iOS 8.2 only (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = !!obj && "length" in obj && obj.length,
+		type = toType( obj );
+
+	if ( isFunction( obj ) || isWindow( obj ) ) {
+		return false;
+	}
+
+	return type === "array" || length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+}
+var Sizzle =
+/*!
+ * Sizzle CSS Selector Engine v2.3.3
+ * https://sizzlejs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2016-08-08
+ */
+(function( window ) {
+
+var i,
+	support,
+	Expr,
+	getText,
+	isXML,
+	tokenize,
+	compile,
+	select,
+	outermostContext,
+	sortInput,
+	hasDuplicate,
+
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsHTML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+
+	// Instance-specific data
+	expando = "sizzle" + 1 * new Date(),
+	preferredDoc = window.document,
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+		}
+		return 0;
+	},
+
+	// Instance methods
+	hasOwn = ({}).hasOwnProperty,
+	arr = [],
+	pop = arr.pop,
+	push_native = arr.push,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf as it's faster than native
+	// https://jsperf.com/thor-indexof-vs-for/5
+	indexOf = function( list, elem ) {
+		var i = 0,
+			len = list.length;
+		for ( ; i < len; i++ ) {
+			if ( list[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+	// Regular expressions
+
+	// http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+
+	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
+
+	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + whitespace +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+		"*\\]",
+
+	pseudos = ":(" + identifier + ")(?:\\((" +
+		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+		// 1. quoted (capture 3; capture 4 or capture 5)
+		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+		// 2. simple (capture 6)
+		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+		// 3. anything else (capture 2)
+		".*" +
+		")\\)|)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rwhitespace = new RegExp( whitespace + "+", "g" ),
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + identifier + ")" ),
+		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
+		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
+
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
+	rnative = /^[^{]+\{\s*\[native \w/,
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+	rsibling = /[+~]/,
+
+	// CSS escapes
+	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+	funescape = function( _, escaped, escapedWhitespace ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		// Support: Firefox<24
+		// Workaround erroneous numeric interpretation of +"0x"
+		return high !== high || escapedWhitespace ?
+			escaped :
+			high < 0 ?
+				// BMP codepoint
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	},
+
+	// CSS string/identifier serialization
+	// https://drafts.csswg.org/cssom/#common-serializing-idioms
+	rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
+	fcssescape = function( ch, asCodePoint ) {
+		if ( asCodePoint ) {
+
+			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+			if ( ch === "\0" ) {
+				return "\uFFFD";
+			}
+
+			// Control characters and (dependent upon position) numbers get escaped as code points
+			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+		}
+
+		// Other potentially-special ASCII characters get backslash-escaped
+		return "\\" + ch;
+	},
+
+	// Used for iframes
+	// See setDocument()
+	// Removing the function wrapper causes a "Permission Denied"
+	// error in IE
+	unloadHandler = function() {
+		setDocument();
+	},
+
+	disabledAncestor = addCombinator(
+		function( elem ) {
+			return elem.disabled === true && ("form" in elem || "label" in elem);
+		},
+		{ dir: "parentNode", next: "legend" }
+	);
+
+// Optimize for push.apply( _, NodeList )
+try {
+	push.apply(
+		(arr = slice.call( preferredDoc.childNodes )),
+		preferredDoc.childNodes
+	);
+	// Support: Android<4.0
+	// Detect silently failing push.apply
+	arr[ preferredDoc.childNodes.length ].nodeType;
+} catch ( e ) {
+	push = { apply: arr.length ?
+
+		// Leverage slice if possible
+		function( target, els ) {
+			push_native.apply( target, slice.call(els) );
+		} :
+
+		// Support: IE<9
+		// Otherwise append directly
+		function( target, els ) {
+			var j = target.length,
+				i = 0;
+			// Can't trust NodeList.length
+			while ( (target[j++] = els[i++]) ) {}
+			target.length = j - 1;
+		}
+	};
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var m, i, elem, nid, match, groups, newSelector,
+		newContext = context && context.ownerDocument,
+
+		// nodeType defaults to 9, since context defaults to document
+		nodeType = context ? context.nodeType : 9;
+
+	results = results || [];
+
+	// Return early from calls with invalid selector or context
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+
+		return results;
+	}
+
+	// Try to shortcut find operations (as opposed to filters) in HTML documents
+	if ( !seed ) {
+
+		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+			setDocument( context );
+		}
+		context = context || document;
+
+		if ( documentIsHTML ) {
+
+			// If the selector is sufficiently simple, try using a "get*By*" DOM method
+			// (excepting DocumentFragment context, where the methods don't exist)
+			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+
+				// ID selector
+				if ( (m = match[1]) ) {
+
+					// Document context
+					if ( nodeType === 9 ) {
+						if ( (elem = context.getElementById( m )) ) {
+
+							// Support: IE, Opera, Webkit
+							// TODO: identify versions
+							// getElementById can match elements by name instead of ID
+							if ( elem.id === m ) {
+								results.push( elem );
+								return results;
+							}
+						} else {
+							return results;
+						}
+
+					// Element context
+					} else {
+
+						// Support: IE, Opera, Webkit
+						// TODO: identify versions
+						// getElementById can match elements by name instead of ID
+						if ( newContext && (elem = newContext.getElementById( m )) &&
+							contains( context, elem ) &&
+							elem.id === m ) {
+
+							results.push( elem );
+							return results;
+						}
+					}
+
+				// Type selector
+				} else if ( match[2] ) {
+					push.apply( results, context.getElementsByTagName( selector ) );
+					return results;
+
+				// Class selector
+				} else if ( (m = match[3]) && support.getElementsByClassName &&
+					context.getElementsByClassName ) {
+
+					push.apply( results, context.getElementsByClassName( m ) );
+					return results;
+				}
+			}
+
+			// Take advantage of querySelectorAll
+			if ( support.qsa &&
+				!compilerCache[ selector + " " ] &&
+				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+
+				if ( nodeType !== 1 ) {
+					newContext = context;
+					newSelector = selector;
+
+				// qSA looks outside Element context, which is not what we want
+				// Thanks to Andrew Dupont for this workaround technique
+				// Support: IE <=8
+				// Exclude object elements
+				} else if ( context.nodeName.toLowerCase() !== "object" ) {
+
+					// Capture the context ID, setting it first if necessary
+					if ( (nid = context.getAttribute( "id" )) ) {
+						nid = nid.replace( rcssescape, fcssescape );
+					} else {
+						context.setAttribute( "id", (nid = expando) );
+					}
+
+					// Prefix every selector in the list
+					groups = tokenize( selector );
+					i = groups.length;
+					while ( i-- ) {
+						groups[i] = "#" + nid + " " + toSelector( groups[i] );
+					}
+					newSelector = groups.join( "," );
+
+					// Expand context for sibling selectors
+					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+						context;
+				}
+
+				if ( newSelector ) {
+					try {
+						push.apply( results,
+							newContext.querySelectorAll( newSelector )
+						);
+						return results;
+					} catch ( qsaError ) {
+					} finally {
+						if ( nid === expando ) {
+							context.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {function(string, object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var keys = [];
+
+	function cache( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key + " " ] = value);
+	}
+	return cache;
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created element and returns a boolean result
+ */
+function assert( fn ) {
+	var el = document.createElement("fieldset");
+
+	try {
+		return !!fn( el );
+	} catch (e) {
+		return false;
+	} finally {
+		// Remove from its parent by default
+		if ( el.parentNode ) {
+			el.parentNode.removeChild( el );
+		}
+		// release memory in IE
+		el = null;
+	}
+}
+
+/**
+ * Adds the same handler for all of the specified attrs
+ * @param {String} attrs Pipe-separated list of attributes
+ * @param {Function} handler The method that will be applied
+ */
+function addHandle( attrs, handler ) {
+	var arr = attrs.split("|"),
+		i = arr.length;
+
+	while ( i-- ) {
+		Expr.attrHandle[ arr[i] ] = handler;
+	}
+}
+
+/**
+ * Checks document order of two siblings
+ * @param {Element} a
+ * @param {Element} b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+ */
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+			a.sourceIndex - b.sourceIndex;
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+/**
+ * Returns a function to use in pseudos for input types
+ * @param {String} type
+ */
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for buttons
+ * @param {String} type
+ */
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for :enabled/:disabled
+ * @param {Boolean} disabled true for :disabled; false for :enabled
+ */
+function createDisabledPseudo( disabled ) {
+
+	// Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
+	return function( elem ) {
+
+		// Only certain elements can match :enabled or :disabled
+		// https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
+		// https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
+		if ( "form" in elem ) {
+
+			// Check for inherited disabledness on relevant non-disabled elements:
+			// * listed form-associated elements in a disabled fieldset
+			//   https://html.spec.whatwg.org/multipage/forms.html#category-listed
+			//   https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled
+			// * option elements in a disabled optgroup
+			//   https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled
+			// All such elements have a "form" property.
+			if ( elem.parentNode && elem.disabled === false ) {
+
+				// Option elements defer to a parent optgroup if present
+				if ( "label" in elem ) {
+					if ( "label" in elem.parentNode ) {
+						return elem.parentNode.disabled === disabled;
+					} else {
+						return elem.disabled === disabled;
+					}
+				}
+
+				// Support: IE 6 - 11
+				// Use the isDisabled shortcut property to check for disabled fieldset ancestors
+				return elem.isDisabled === disabled ||
+
+					// Where there is no isDisabled, check manually
+					/* jshint -W018 */
+					elem.isDisabled !== !disabled &&
+						disabledAncestor( elem ) === disabled;
+			}
+
+			return elem.disabled === disabled;
+
+		// Try to winnow out elements that can't be disabled before trusting the disabled property.
+		// Some victims get caught in our net (label, legend, menu, track), but it shouldn't
+		// even exist on them, let alone have a boolean value.
+		} else if ( "label" in elem ) {
+			return elem.disabled === disabled;
+		}
+
+		// Remaining elements are neither :enabled nor :disabled
+		return false;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for positionals
+ * @param {Function} fn
+ */
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
+ * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var hasCompare, subWindow,
+		doc = node ? node.ownerDocument || node : preferredDoc;
+
+	// Return early if doc is invalid or already selected
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Update global variables
+	document = doc;
+	docElem = document.documentElement;
+	documentIsHTML = !isXML( document );
+
+	// Support: IE 9-11, Edge
+	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
+	if ( preferredDoc !== document &&
+		(subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+
+		// Support: IE 11, Edge
+		if ( subWindow.addEventListener ) {
+			subWindow.addEventListener( "unload", unloadHandler, false );
+
+		// Support: IE 9 - 10 only
+		} else if ( subWindow.attachEvent ) {
+			subWindow.attachEvent( "onunload", unloadHandler );
+		}
+	}
+
+	/* Attributes
+	---------------------------------------------------------------------- */
+
+	// Support: IE<8
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
+	support.attributes = assert(function( el ) {
+		el.className = "i";
+		return !el.getAttribute("className");
+	});
+
+	/* getElement(s)By*
+	---------------------------------------------------------------------- */
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.getElementsByTagName = assert(function( el ) {
+		el.appendChild( document.createComment("") );
+		return !el.getElementsByTagName("*").length;
+	});
+
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
+
+	// Support: IE<10
+	// Check if getElementById returns elements by name
+	// The broken getElementById methods don't pick up programmatically-set names,
+	// so use a roundabout getElementsByName test
+	support.getById = assert(function( el ) {
+		docElem.appendChild( el ).id = expando;
+		return !document.getElementsByName || !document.getElementsByName( expando ).length;
+	});
+
+	// ID filter and find
+	if ( support.getById ) {
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var elem = context.getElementById( id );
+				return elem ? [ elem ] : [];
+			}
+		};
+	} else {
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== "undefined" &&
+					elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+
+		// Support: IE 6 - 7 only
+		// getElementById is not reliable as a find shortcut
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var node, i, elems,
+					elem = context.getElementById( id );
+
+				if ( elem ) {
+
+					// Verify the id attribute
+					node = elem.getAttributeNode("id");
+					if ( node && node.value === id ) {
+						return [ elem ];
+					}
+
+					// Fall back on getElementsByName
+					elems = context.getElementsByName( id );
+					i = 0;
+					while ( (elem = elems[i++]) ) {
+						node = elem.getAttributeNode("id");
+						if ( node && node.value === id ) {
+							return [ elem ];
+						}
+					}
+				}
+
+				return [];
+			}
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.getElementsByTagName ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( tag );
+
+			// DocumentFragment nodes don't have gEBTN
+			} else if ( support.qsa ) {
+				return context.querySelectorAll( tag );
+			}
+		} :
+
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Class
+	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	/* QSA/matchesSelector
+	---------------------------------------------------------------------- */
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21)
+	// We allow this because of a bug in IE8/9 that throws an error
+	// whenever `document.activeElement` is accessed on an iframe
+	// So, we allow :focus to pass through QSA all the time to avoid the IE error
+	// See https://bugs.jquery.com/ticket/13378
+	rbuggyQSA = [];
+
+	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( el ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explicitly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// https://bugs.jquery.com/ticket/12359
+			docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
+				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
+				"<option selected=''></option></select>";
+
+			// Support: IE8, Opera 11-12.16
+			// Nothing should be selected when empty strings follow ^= or $= or *=
+			// The test attribute must be unknown in Opera but "safe" for WinRT
+			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( el.querySelectorAll("[msallowcapture^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
+
+			// Support: IE8
+			// Boolean attributes and "value" are not treated correctly
+			if ( !el.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+			}
+
+			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
+			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+				rbuggyQSA.push("~=");
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !el.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+
+			// Support: Safari 8+, iOS 8+
+			// https://bugs.webkit.org/show_bug.cgi?id=136851
+			// In-page `selector#id sibling-combinator selector` fails
+			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
+				rbuggyQSA.push(".#.+[+~]");
+			}
+		});
+
+		assert(function( el ) {
+			el.innerHTML = "<a href='' disabled='disabled'></a>" +
+				"<select disabled='disabled'><option/></select>";
+
+			// Support: Windows 8 Native Apps
+			// The type and name attributes are restricted during .innerHTML assignment
+			var input = document.createElement("input");
+			input.setAttribute( "type", "hidden" );
+			el.appendChild( input ).setAttribute( "name", "D" );
+
+			// Support: IE8
+			// Enforce case-sensitivity of name attribute
+			if ( el.querySelectorAll("[name=d]").length ) {
+				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( el.querySelectorAll(":enabled").length !== 2 ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Support: IE9-11+
+			// IE's :disabled selector does not pick up the children of disabled fieldsets
+			docElem.appendChild( el ).disabled = true;
+			if ( el.querySelectorAll(":disabled").length !== 2 ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			el.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+		docElem.webkitMatchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( el ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( el, "*" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( el, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+	/* Contains
+	---------------------------------------------------------------------- */
+	hasCompare = rnative.test( docElem.compareDocumentPosition );
+
+	// Element contains another
+	// Purposefully self-exclusive
+	// As in, an element does not contain itself
+	contains = hasCompare || rnative.test( docElem.contains ) ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	/* Sorting
+	---------------------------------------------------------------------- */
+
+	// Document order sorting
+	sortOrder = hasCompare ?
+	function( a, b ) {
+
+		// Flag for duplicate removal
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		// Sort on method existence if only one input has compareDocumentPosition
+		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+		if ( compare ) {
+			return compare;
+		}
+
+		// Calculate position if both inputs belong to the same document
+		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+			a.compareDocumentPosition( b ) :
+
+			// Otherwise we know they are disconnected
+			1;
+
+		// Disconnected nodes
+		if ( compare & 1 ||
+			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+			// Choose the first element that is related to our preferred document
+			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+				return -1;
+			}
+			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+				return 1;
+			}
+
+			// Maintain original order
+			return sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+		}
+
+		return compare & 4 ? -1 : 1;
+	} :
+	function( a, b ) {
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Parentless nodes are either documents or disconnected
+		if ( !aup || !bup ) {
+			return a === document ? -1 :
+				b === document ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	return document;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	if ( support.matchesSelector && documentIsHTML &&
+		!compilerCache[ expr + " " ] &&
+		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch (e) {}
+	}
+
+	return Sizzle( expr, document, null, [ elem ] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	var fn = Expr.attrHandle[ name.toLowerCase() ],
+		// Don't get fooled by Object.prototype properties (jQuery #13807)
+		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+			fn( elem, name, !documentIsHTML ) :
+			undefined;
+
+	return val !== undefined ?
+		val :
+		support.attributes || !documentIsHTML ?
+			elem.getAttribute( name ) :
+			(val = elem.getAttributeNode(name)) && val.specified ?
+				val.value :
+				null;
+};
+
+Sizzle.escape = function( sel ) {
+	return (sel + "").replace( rcssescape, fcssescape );
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Document sorting and removing duplicates
+ * @param {ArrayLike} results
+ */
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		j = 0,
+		i = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	sortInput = !support.sortStable && results.slice( 0 );
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		while ( (elem = results[i++]) ) {
+			if ( elem === results[ i ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	// Clear input after sorting to release objects
+	// See https://github.com/jquery/sizzle/pull/225
+	sortInput = null;
+
+	return results;
+};
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		while ( (node = elem[i++]) ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (jQuery #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	attrHandle: {},
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[6] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[3] ) {
+				match[2] = match[4] || match[5] || "";
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeNameSelector ) {
+			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+			return nodeNameSelector === "*" ?
+				function() { return true; } :
+				function( elem ) {
+					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+				};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, uniqueCache, outerCache, node, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType,
+						diff = false;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) {
+
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+
+							// Seek `elem` from a previously-cached index
+
+							// ...in a gzip-friendly way
+							node = parent;
+							outerCache = node[ expando ] || (node[ expando ] = {});
+
+							// Support: IE <9 only
+							// Defend against cloned attroperties (jQuery gh-1709)
+							uniqueCache = outerCache[ node.uniqueID ] ||
+								(outerCache[ node.uniqueID ] = {});
+
+							cache = uniqueCache[ type ] || [];
+							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+							diff = nodeIndex && cache[ 2 ];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						} else {
+							// Use previously-cached element index if available
+							if ( useCache ) {
+								// ...in a gzip-friendly way
+								node = elem;
+								outerCache = node[ expando ] || (node[ expando ] = {});
+
+								// Support: IE <9 only
+								// Defend against cloned attroperties (jQuery gh-1709)
+								uniqueCache = outerCache[ node.uniqueID ] ||
+									(outerCache[ node.uniqueID ] = {});
+
+								cache = uniqueCache[ type ] || [];
+								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+								diff = nodeIndex;
+							}
+
+							// xml :nth-child(...)
+							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
+							if ( diff === false ) {
+								// Use the same loop as above to seek `elem` from the start
+								while ( (node = ++nodeIndex && node && node[ dir ] ||
+									(diff = nodeIndex = 0) || start.pop()) ) {
+
+									if ( ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) &&
+										++diff ) {
+
+										// Cache the index of each encountered element
+										if ( useCache ) {
+											outerCache = node[ expando ] || (node[ expando ] = {});
+
+											// Support: IE <9 only
+											// Defend against cloned attroperties (jQuery gh-1709)
+											uniqueCache = outerCache[ node.uniqueID ] ||
+												(outerCache[ node.uniqueID ] = {});
+
+											uniqueCache[ type ] = [ dirruns, diff ];
+										}
+
+										if ( node === elem ) {
+											break;
+										}
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					// Don't keep the element (issue #299)
+					input[0] = null;
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifier
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsHTML ?
+						elem.lang :
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": createDisabledPseudo( false ),
+		"disabled": createDisabledPseudo( true ),
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+			//   but not by others (comment: 8; processing instruction: 7; etc.)
+			// nodeType < 6 works because attributes (2) do not appear as children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeType < 6 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+
+				// Support: IE<8
+				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( (tokens = []) );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push({
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			});
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push({
+					value: matched,
+					type: type,
+					matches: match
+				});
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+};
+
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
+	}
+	return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		skip = combinator.next,
+		key = skip || dir,
+		checkNonElements = base && key === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
+				}
+			}
+			return false;
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var oldCache, uniqueCache, outerCache,
+				newCache = [ dirruns, doneName ];
+
+			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+
+						// Support: IE <9 only
+						// Defend against cloned attroperties (jQuery gh-1709)
+						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+
+						if ( skip && skip === elem.nodeName.toLowerCase() ) {
+							elem = elem[ dir ] || elem;
+						} else if ( (oldCache = uniqueCache[ key ]) &&
+							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+							// Assign to newCache so results back-propagate to previous elements
+							return (newCache[ 2 ] = oldCache[ 2 ]);
+						} else {
+							// Reuse newcache so results back-propagate to previous elements
+							uniqueCache[ key ] = newCache;
+
+							// A match means we're done; a fail means we have to keep checking
+							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+			return false;
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+			// Avoid hanging onto element (issue #299)
+			checkContext = null;
+			return ret;
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector(
+						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+					).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	var bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, outermost ) {
+			var elem, j, matcher,
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				setMatched = [],
+				contextBackup = outermostContext,
+				// We must always have either seed elements or outermost context
+				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				len = elems.length;
+
+			if ( outermost ) {
+				outermostContext = context === document || context || outermost;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			// Support: IE<9, Safari
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					if ( !context && elem.ownerDocument !== document ) {
+						setDocument( elem );
+						xml = !documentIsHTML;
+					}
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context || document, xml) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// `i` is now the count of elements visited above, and adding it to `matchedCount`
+			// makes the latter nonnegative.
+			matchedCount += i;
+
+			// Apply set filters to unmatched elements
+			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
+			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
+			// no element matchers and no seed.
+			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
+			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
+			// numerically zero.
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !match ) {
+			match = tokenize( selector );
+		}
+		i = match.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( match[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+		// Save selector and tokenization
+		cached.selector = selector;
+	}
+	return cached;
+};
+
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ *  selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ *  selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		compiled = typeof selector === "function" && selector,
+		match = !seed && tokenize( (selector = compiled.selector || selector) );
+
+	results = results || [];
+
+	// Try to minimize operations if there is only one selector in the list and no seed
+	// (the latter of which guarantees us context)
+	if ( match.length === 1 ) {
+
+		// Reduce context if the leading compound selector is an ID
+		tokens = match[0] = match[0].slice( 0 );
+		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+				context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
+
+			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			if ( !context ) {
+				return results;
+
+			// Precompiled matchers will still verify ancestry, so step up a level
+			} else if ( compiled ) {
+				context = context.parentNode;
+			}
+
+			selector = selector.slice( tokens.shift().value.length );
+		}
+
+		// Fetch a seed set for right-to-left matching
+		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		while ( i-- ) {
+			token = tokens[i];
+
+			// Abort if we hit a combinator
+			if ( Expr.relative[ (type = token.type) ] ) {
+				break;
+			}
+			if ( (find = Expr.find[ type ]) ) {
+				// Search, expanding context for leading sibling combinators
+				if ( (seed = find(
+					token.matches[0].replace( runescape, funescape ),
+					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+				)) ) {
+
+					// If seed is empty or no tokens remain, we can return early
+					tokens.splice( i, 1 );
+					selector = seed.length && toSelector( tokens );
+					if ( !selector ) {
+						push.apply( results, seed );
+						return results;
+					}
+
+					break;
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function if one is not provided
+	// Provide `match` to avoid retokenization if we modified the selector above
+	( compiled || compile( selector, match ) )(
+		seed,
+		context,
+		!documentIsHTML,
+		results,
+		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
+	);
+	return results;
+};
+
+// One-time assignments
+
+// Sort stability
+support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Support: Chrome 14-35+
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = !!hasDuplicate;
+
+// Initialize against the default document
+setDocument();
+
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( el ) {
+	// Should return 1, but returns 4 (following)
+	return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( el ) {
+	el.innerHTML = "<a href='#'></a>";
+	return el.firstChild.getAttribute("href") === "#" ;
+}) ) {
+	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+		if ( !isXML ) {
+			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		}
+	});
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( el ) {
+	el.innerHTML = "<input/>";
+	el.firstChild.setAttribute( "value", "" );
+	return el.firstChild.getAttribute( "value" ) === "";
+}) ) {
+	addHandle( "value", function( elem, name, isXML ) {
+		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+			return elem.defaultValue;
+		}
+	});
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( el ) {
+	return el.getAttribute("disabled") == null;
+}) ) {
+	addHandle( booleans, function( elem, name, isXML ) {
+		var val;
+		if ( !isXML ) {
+			return elem[ name ] === true ? name.toLowerCase() :
+					(val = elem.getAttributeNode( name )) && val.specified ?
+					val.value :
+				null;
+		}
+	});
+}
+
+return Sizzle;
+
+})( window );
+
+
+
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+
+// Deprecated
+jQuery.expr[ ":" ] = jQuery.expr.pseudos;
+jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+jQuery.escapeSelector = Sizzle.escape;
+
+
+
+
+var dir = function( elem, dir, until ) {
+	var matched = [],
+		truncate = until !== undefined;
+
+	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
+		if ( elem.nodeType === 1 ) {
+			if ( truncate && jQuery( elem ).is( until ) ) {
+				break;
+			}
+			matched.push( elem );
+		}
+	}
+	return matched;
+};
+
+
+var siblings = function( n, elem ) {
+	var matched = [];
+
+	for ( ; n; n = n.nextSibling ) {
+		if ( n.nodeType === 1 && n !== elem ) {
+			matched.push( n );
+		}
+	}
+
+	return matched;
+};
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+
+
+function nodeName( elem, name ) {
+
+  return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+
+};
+var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
+
+
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			return !!qualifier.call( elem, i, elem ) !== not;
+		} );
+	}
+
+	// Single element
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		} );
+	}
+
+	// Arraylike of elements (jQuery, arguments, Array)
+	if ( typeof qualifier !== "string" ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
+		} );
+	}
+
+	// Filtered directly for both simple and complex selectors
+	return jQuery.filter( qualifier, elements, not );
+}
+
+jQuery.filter = function( expr, elems, not ) {
+	var elem = elems[ 0 ];
+
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	if ( elems.length === 1 && elem.nodeType === 1 ) {
+		return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [];
+	}
+
+	return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+		return elem.nodeType === 1;
+	} ) );
+};
+
+jQuery.fn.extend( {
+	find: function( selector ) {
+		var i, ret,
+			len = this.length,
+			self = this;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter( function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			} ) );
+		}
+
+		ret = this.pushStack( [] );
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		return len > 1 ? jQuery.uniqueSort( ret ) : ret;
+	},
+	filter: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], false ) );
+	},
+	not: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], true ) );
+	},
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	}
+} );
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	// Shortcut simple #id case for speed
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
+
+	init = jQuery.fn.init = function( selector, context, root ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Method init() accepts an alternate rootjQuery
+		// so migrate can support jQuery.sub (gh-2101)
+		root = root || rootjQuery;
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector[ 0 ] === "<" &&
+				selector[ selector.length - 1 ] === ">" &&
+				selector.length >= 3 ) {
+
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && ( match[ 1 ] || !context ) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[ 1 ] ) {
+					context = context instanceof jQuery ? context[ 0 ] : context;
+
+					// Option to run scripts is true for back-compat
+					// Intentionally let the error be thrown if parseHTML is not present
+					jQuery.merge( this, jQuery.parseHTML(
+						match[ 1 ],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+
+							// Properties of context are called as methods if possible
+							if ( isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[ 2 ] );
+
+					if ( elem ) {
+
+						// Inject the element directly into the jQuery object
+						this[ 0 ] = elem;
+						this.length = 1;
+					}
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || root ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this[ 0 ] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( isFunction( selector ) ) {
+			return root.ready !== undefined ?
+				root.ready( selector ) :
+
+				// Execute immediately if ready is not present
+				selector( jQuery );
+		}
+
+		return jQuery.makeArray( selector, this );
+	};
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+
+	// Methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend( {
+	has: function( target ) {
+		var targets = jQuery( target, this ),
+			l = targets.length;
+
+		return this.filter( function() {
+			var i = 0;
+			for ( ; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[ i ] ) ) {
+					return true;
+				}
+			}
+		} );
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			matched = [],
+			targets = typeof selectors !== "string" && jQuery( selectors );
+
+		// Positional selectors never match, since there's no _selection_ context
+		if ( !rneedsContext.test( selectors ) ) {
+			for ( ; i < l; i++ ) {
+				for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+
+					// Always skip document fragments
+					if ( cur.nodeType < 11 && ( targets ?
+						targets.index( cur ) > -1 :
+
+						// Don't pass non-elements to Sizzle
+						cur.nodeType === 1 &&
+							jQuery.find.matchesSelector( cur, selectors ) ) ) {
+
+						matched.push( cur );
+						break;
+					}
+				}
+			}
+		}
+
+		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
+	},
+
+	// Determine the position of an element within the set
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// Index in selector
+		if ( typeof elem === "string" ) {
+			return indexOf.call( jQuery( elem ), this[ 0 ] );
+		}
+
+		// Locate the position of the desired element
+		return indexOf.call( this,
+
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[ 0 ] : elem
+		);
+	},
+
+	add: function( selector, context ) {
+		return this.pushStack(
+			jQuery.uniqueSort(
+				jQuery.merge( this.get(), jQuery( selector, context ) )
+			)
+		);
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	}
+} );
+
+function sibling( cur, dir ) {
+	while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
+	return cur;
+}
+
+jQuery.each( {
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return siblings( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return siblings( elem.firstChild );
+	},
+	contents: function( elem ) {
+        if ( nodeName( elem, "iframe" ) ) {
+            return elem.contentDocument;
+        }
+
+        // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
+        // Treat the template element as a regular one in browsers that
+        // don't support it.
+        if ( nodeName( elem, "template" ) ) {
+            elem = elem.content || elem;
+        }
+
+        return jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var matched = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			matched = jQuery.filter( selector, matched );
+		}
+
+		if ( this.length > 1 ) {
+
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				jQuery.uniqueSort( matched );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				matched.reverse();
+			}
+		}
+
+		return this.pushStack( matched );
+	};
+} );
+var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g );
+
+
+
+// Convert String-formatted options into Object-formatted ones
+function createOptions( options ) {
+	var object = {};
+	jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	} );
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		createOptions( options ) :
+		jQuery.extend( {}, options );
+
+	var // Flag to know if list is currently firing
+		firing,
+
+		// Last fire value for non-forgettable lists
+		memory,
+
+		// Flag to know if list was already fired
+		fired,
+
+		// Flag to prevent firing
+		locked,
+
+		// Actual callback list
+		list = [],
+
+		// Queue of execution data for repeatable lists
+		queue = [],
+
+		// Index of currently firing callback (modified by add/remove as needed)
+		firingIndex = -1,
+
+		// Fire callbacks
+		fire = function() {
+
+			// Enforce single-firing
+			locked = locked || options.once;
+
+			// Execute callbacks for all pending executions,
+			// respecting firingIndex overrides and runtime changes
+			fired = firing = true;
+			for ( ; queue.length; firingIndex = -1 ) {
+				memory = queue.shift();
+				while ( ++firingIndex < list.length ) {
+
+					// Run callback and check for early termination
+					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
+						options.stopOnFalse ) {
+
+						// Jump to end and forget the data so .add doesn't re-fire
+						firingIndex = list.length;
+						memory = false;
+					}
+				}
+			}
+
+			// Forget the data if we're done with it
+			if ( !options.memory ) {
+				memory = false;
+			}
+
+			firing = false;
+
+			// Clean up if we're done firing for good
+			if ( locked ) {
+
+				// Keep an empty list if we have data for future add calls
+				if ( memory ) {
+					list = [];
+
+				// Otherwise, this object is spent
+				} else {
+					list = "";
+				}
+			}
+		},
+
+		// Actual Callbacks object
+		self = {
+
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+
+					// If we have memory from a past run, we should fire after adding
+					if ( memory && !firing ) {
+						firingIndex = list.length - 1;
+						queue.push( memory );
+					}
+
+					( function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							if ( isFunction( arg ) ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && toType( arg ) !== "string" ) {
+
+								// Inspect recursively
+								add( arg );
+							}
+						} );
+					} )( arguments );
+
+					if ( memory && !firing ) {
+						fire();
+					}
+				}
+				return this;
+			},
+
+			// Remove a callback from the list
+			remove: function() {
+				jQuery.each( arguments, function( _, arg ) {
+					var index;
+					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+						list.splice( index, 1 );
+
+						// Handle firing indexes
+						if ( index <= firingIndex ) {
+							firingIndex--;
+						}
+					}
+				} );
+				return this;
+			},
+
+			// Check if a given callback is in the list.
+			// If no argument is given, return whether or not list has callbacks attached.
+			has: function( fn ) {
+				return fn ?
+					jQuery.inArray( fn, list ) > -1 :
+					list.length > 0;
+			},
+
+			// Remove all callbacks from the list
+			empty: function() {
+				if ( list ) {
+					list = [];
+				}
+				return this;
+			},
+
+			// Disable .fire and .add
+			// Abort any current/pending executions
+			// Clear all callbacks and values
+			disable: function() {
+				locked = queue = [];
+				list = memory = "";
+				return this;
+			},
+			disabled: function() {
+				return !list;
+			},
+
+			// Disable .fire
+			// Also disable .add unless we have memory (since it would have no effect)
+			// Abort any pending executions
+			lock: function() {
+				locked = queue = [];
+				if ( !memory && !firing ) {
+					list = memory = "";
+				}
+				return this;
+			},
+			locked: function() {
+				return !!locked;
+			},
+
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				if ( !locked ) {
+					args = args || [];
+					args = [ context, args.slice ? args.slice() : args ];
+					queue.push( args );
+					if ( !firing ) {
+						fire();
+					}
+				}
+				return this;
+			},
+
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+
+
+function Identity( v ) {
+	return v;
+}
+function Thrower( ex ) {
+	throw ex;
+}
+
+function adoptValue( value, resolve, reject, noValue ) {
+	var method;
+
+	try {
+
+		// Check for promise aspect first to privilege synchronous behavior
+		if ( value && isFunction( ( method = value.promise ) ) ) {
+			method.call( value ).done( resolve ).fail( reject );
+
+		// Other thenables
+		} else if ( value && isFunction( ( method = value.then ) ) ) {
+			method.call( value, resolve, reject );
+
+		// Other non-thenables
+		} else {
+
+			// Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer:
+			// * false: [ value ].slice( 0 ) => resolve( value )
+			// * true: [ value ].slice( 1 ) => resolve()
+			resolve.apply( undefined, [ value ].slice( noValue ) );
+		}
+
+	// For Promises/A+, convert exceptions into rejections
+	// Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
+	// Deferred#then to conditionally suppress rejection.
+	} catch ( value ) {
+
+		// Support: Android 4.0 only
+		// Strict mode functions invoked without .call/.apply get global-object context
+		reject.apply( undefined, [ value ] );
+	}
+}
+
+jQuery.extend( {
+
+	Deferred: function( func ) {
+		var tuples = [
+
+				// action, add listener, callbacks,
+				// ... .then handlers, argument index, [final state]
+				[ "notify", "progress", jQuery.Callbacks( "memory" ),
+					jQuery.Callbacks( "memory" ), 2 ],
+				[ "resolve", "done", jQuery.Callbacks( "once memory" ),
+					jQuery.Callbacks( "once memory" ), 0, "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks( "once memory" ),
+					jQuery.Callbacks( "once memory" ), 1, "rejected" ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				"catch": function( fn ) {
+					return promise.then( null, fn );
+				},
+
+				// Keep pipe for back-compat
+				pipe: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+
+					return jQuery.Deferred( function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+
+							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
+							var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
+
+							// deferred.progress(function() { bind to newDefer or newDefer.notify })
+							// deferred.done(function() { bind to newDefer or newDefer.resolve })
+							// deferred.fail(function() { bind to newDefer or newDefer.reject })
+							deferred[ tuple[ 1 ] ]( function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && isFunction( returned.promise ) ) {
+									returned.promise()
+										.progress( newDefer.notify )
+										.done( newDefer.resolve )
+										.fail( newDefer.reject );
+								} else {
+									newDefer[ tuple[ 0 ] + "With" ](
+										this,
+										fn ? [ returned ] : arguments
+									);
+								}
+							} );
+						} );
+						fns = null;
+					} ).promise();
+				},
+				then: function( onFulfilled, onRejected, onProgress ) {
+					var maxDepth = 0;
+					function resolve( depth, deferred, handler, special ) {
+						return function() {
+							var that = this,
+								args = arguments,
+								mightThrow = function() {
+									var returned, then;
+
+									// Support: Promises/A+ section 2.3.3.3.3
+									// https://promisesaplus.com/#point-59
+									// Ignore double-resolution attempts
+									if ( depth < maxDepth ) {
+										return;
+									}
+
+									returned = handler.apply( that, args );
+
+									// Support: Promises/A+ section 2.3.1
+									// https://promisesaplus.com/#point-48
+									if ( returned === deferred.promise() ) {
+										throw new TypeError( "Thenable self-resolution" );
+									}
+
+									// Support: Promises/A+ sections 2.3.3.1, 3.5
+									// https://promisesaplus.com/#point-54
+									// https://promisesaplus.com/#point-75
+									// Retrieve `then` only once
+									then = returned &&
+
+										// Support: Promises/A+ section 2.3.4
+										// https://promisesaplus.com/#point-64
+										// Only check objects and functions for thenability
+										( typeof returned === "object" ||
+											typeof returned === "function" ) &&
+										returned.then;
+
+									// Handle a returned thenable
+									if ( isFunction( then ) ) {
+
+										// Special processors (notify) just wait for resolution
+										if ( special ) {
+											then.call(
+												returned,
+												resolve( maxDepth, deferred, Identity, special ),
+												resolve( maxDepth, deferred, Thrower, special )
+											);
+
+										// Normal processors (resolve) also hook into progress
+										} else {
+
+											// ...and disregard older resolution values
+											maxDepth++;
+
+											then.call(
+												returned,
+												resolve( maxDepth, deferred, Identity, special ),
+												resolve( maxDepth, deferred, Thrower, special ),
+												resolve( maxDepth, deferred, Identity,
+													deferred.notifyWith )
+											);
+										}
+
+									// Handle all other returned values
+									} else {
+
+										// Only substitute handlers pass on context
+										// and multiple values (non-spec behavior)
+										if ( handler !== Identity ) {
+											that = undefined;
+											args = [ returned ];
+										}
+
+										// Process the value(s)
+										// Default process is resolve
+										( special || deferred.resolveWith )( that, args );
+									}
+								},
+
+								// Only normal processors (resolve) catch and reject exceptions
+								process = special ?
+									mightThrow :
+									function() {
+										try {
+											mightThrow();
+										} catch ( e ) {
+
+											if ( jQuery.Deferred.exceptionHook ) {
+												jQuery.Deferred.exceptionHook( e,
+													process.stackTrace );
+											}
+
+											// Support: Promises/A+ section 2.3.3.3.4.1
+											// https://promisesaplus.com/#point-61
+											// Ignore post-resolution exceptions
+											if ( depth + 1 >= maxDepth ) {
+
+												// Only substitute handlers pass on context
+												// and multiple values (non-spec behavior)
+												if ( handler !== Thrower ) {
+													that = undefined;
+													args = [ e ];
+												}
+
+												deferred.rejectWith( that, args );
+											}
+										}
+									};
+
+							// Support: Promises/A+ section 2.3.3.3.1
+							// https://promisesaplus.com/#point-57
+							// Re-resolve promises immediately to dodge false rejection from
+							// subsequent errors
+							if ( depth ) {
+								process();
+							} else {
+
+								// Call an optional hook to record the stack, in case of exception
+								// since it's otherwise lost when execution goes async
+								if ( jQuery.Deferred.getStackHook ) {
+									process.stackTrace = jQuery.Deferred.getStackHook();
+								}
+								window.setTimeout( process );
+							}
+						};
+					}
+
+					return jQuery.Deferred( function( newDefer ) {
+
+						// progress_handlers.add( ... )
+						tuples[ 0 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								isFunction( onProgress ) ?
+									onProgress :
+									Identity,
+								newDefer.notifyWith
+							)
+						);
+
+						// fulfilled_handlers.add( ... )
+						tuples[ 1 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								isFunction( onFulfilled ) ?
+									onFulfilled :
+									Identity
+							)
+						);
+
+						// rejected_handlers.add( ... )
+						tuples[ 2 ][ 3 ].add(
+							resolve(
+								0,
+								newDefer,
+								isFunction( onRejected ) ?
+									onRejected :
+									Thrower
+							)
+						);
+					} ).promise();
+				},
+
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 5 ];
+
+			// promise.progress = list.add
+			// promise.done = list.add
+			// promise.fail = list.add
+			promise[ tuple[ 1 ] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add(
+					function() {
+
+						// state = "resolved" (i.e., fulfilled)
+						// state = "rejected"
+						state = stateString;
+					},
+
+					// rejected_callbacks.disable
+					// fulfilled_callbacks.disable
+					tuples[ 3 - i ][ 2 ].disable,
+
+					// rejected_handlers.disable
+					// fulfilled_handlers.disable
+					tuples[ 3 - i ][ 3 ].disable,
+
+					// progress_callbacks.lock
+					tuples[ 0 ][ 2 ].lock,
+
+					// progress_handlers.lock
+					tuples[ 0 ][ 3 ].lock
+				);
+			}
+
+			// progress_handlers.fire
+			// fulfilled_handlers.fire
+			// rejected_handlers.fire
+			list.add( tuple[ 3 ].fire );
+
+			// deferred.notify = function() { deferred.notifyWith(...) }
+			// deferred.resolve = function() { deferred.resolveWith(...) }
+			// deferred.reject = function() { deferred.rejectWith(...) }
+			deferred[ tuple[ 0 ] ] = function() {
+				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
+				return this;
+			};
+
+			// deferred.notifyWith = list.fireWith
+			// deferred.resolveWith = list.fireWith
+			// deferred.rejectWith = list.fireWith
+			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
+		} );
+
+		// Make the deferred a promise
+		promise.promise( deferred );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( singleValue ) {
+		var
+
+			// count of uncompleted subordinates
+			remaining = arguments.length,
+
+			// count of unprocessed arguments
+			i = remaining,
+
+			// subordinate fulfillment data
+			resolveContexts = Array( i ),
+			resolveValues = slice.call( arguments ),
+
+			// the master Deferred
+			master = jQuery.Deferred(),
+
+			// subordinate callback factory
+			updateFunc = function( i ) {
+				return function( value ) {
+					resolveContexts[ i ] = this;
+					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( !( --remaining ) ) {
+						master.resolveWith( resolveContexts, resolveValues );
+					}
+				};
+			};
+
+		// Single- and empty arguments are adopted like Promise.resolve
+		if ( remaining <= 1 ) {
+			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
+				!remaining );
+
+			// Use .then() to unwrap secondary thenables (cf. gh-3000)
+			if ( master.state() === "pending" ||
+				isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
+
+				return master.then();
+			}
+		}
+
+		// Multiple arguments are aggregated like Promise.all array elements
+		while ( i-- ) {
+			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
+		}
+
+		return master.promise();
+	}
+} );
+
+
+// These usually indicate a programmer mistake during development,
+// warn about them ASAP rather than swallowing them by default.
+var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
+
+jQuery.Deferred.exceptionHook = function( error, stack ) {
+
+	// Support: IE 8 - 9 only
+	// Console exists when dev tools are open, which can happen at any time
+	if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
+		window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
+	}
+};
+
+
+
+
+jQuery.readyException = function( error ) {
+	window.setTimeout( function() {
+		throw error;
+	} );
+};
+
+
+
+
+// The deferred used on DOM ready
+var readyList = jQuery.Deferred();
+
+jQuery.fn.ready = function( fn ) {
+
+	readyList
+		.then( fn )
+
+		// Wrap jQuery.readyException in a function so that the lookup
+		// happens at the time of error handling instead of callback
+		// registration.
+		.catch( function( error ) {
+			jQuery.readyException( error );
+		} );
+
+	return this;
+};
+
+jQuery.extend( {
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+			return;
+		}
+
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
+
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
+
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
+	}
+} );
+
+jQuery.ready.then = readyList.then;
+
+// The ready event handler and self cleanup method
+function completed() {
+	document.removeEventListener( "DOMContentLoaded", completed );
+	window.removeEventListener( "load", completed );
+	jQuery.ready();
+}
+
+// Catch cases where $(document).ready() is called
+// after the browser event has already occurred.
+// Support: IE <=9 - 10 only
+// Older IE sometimes signals "interactive" too soon
+if ( document.readyState === "complete" ||
+	( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
+
+	// Handle it asynchronously to allow scripts the opportunity to delay ready
+	window.setTimeout( jQuery.ready );
+
+} else {
+
+	// Use the handy event callback
+	document.addEventListener( "DOMContentLoaded", completed );
+
+	// A fallback to window.onload, that will always work
+	window.addEventListener( "load", completed );
+}
+
+
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+	var i = 0,
+		len = elems.length,
+		bulk = key == null;
+
+	// Sets many values
+	if ( toType( key ) === "object" ) {
+		chainable = true;
+		for ( i in key ) {
+			access( elems, fn, i, key[ i ], true, emptyGet, raw );
+		}
+
+	// Sets one value
+	} else if ( value !== undefined ) {
+		chainable = true;
+
+		if ( !isFunction( value ) ) {
+			raw = true;
+		}
+
+		if ( bulk ) {
+
+			// Bulk operations run against the entire set
+			if ( raw ) {
+				fn.call( elems, value );
+				fn = null;
+
+			// ...except when executing function values
+			} else {
+				bulk = fn;
+				fn = function( elem, key, value ) {
+					return bulk.call( jQuery( elem ), value );
+				};
+			}
+		}
+
+		if ( fn ) {
+			for ( ; i < len; i++ ) {
+				fn(
+					elems[ i ], key, raw ?
+					value :
+					value.call( elems[ i ], i, fn( elems[ i ], key ) )
+				);
+			}
+		}
+	}
+
+	if ( chainable ) {
+		return elems;
+	}
+
+	// Gets
+	if ( bulk ) {
+		return fn.call( elems );
+	}
+
+	return len ? fn( elems[ 0 ], key ) : emptyGet;
+};
+
+
+// Matches dashed string for camelizing
+var rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([a-z])/g;
+
+// Used by camelCase as callback to replace()
+function fcamelCase( all, letter ) {
+	return letter.toUpperCase();
+}
+
+// Convert dashed to camelCase; used by the css and data modules
+// Support: IE <=9 - 11, Edge 12 - 15
+// Microsoft forgot to hump their vendor prefix (#9572)
+function camelCase( string ) {
+	return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+}
+var acceptData = function( owner ) {
+
+	// Accepts only:
+	//  - Node
+	//    - Node.ELEMENT_NODE
+	//    - Node.DOCUMENT_NODE
+	//  - Object
+	//    - Any
+	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
+};
+
+
+
+
+function Data() {
+	this.expando = jQuery.expando + Data.uid++;
+}
+
+Data.uid = 1;
+
+Data.prototype = {
+
+	cache: function( owner ) {
+
+		// Check if the owner object already has a cache
+		var value = owner[ this.expando ];
+
+		// If not, create one
+		if ( !value ) {
+			value = {};
+
+			// We can accept data for non-element nodes in modern browsers,
+			// but we should not, see #8335.
+			// Always return an empty object.
+			if ( acceptData( owner ) ) {
+
+				// If it is a node unlikely to be stringify-ed or looped over
+				// use plain assignment
+				if ( owner.nodeType ) {
+					owner[ this.expando ] = value;
+
+				// Otherwise secure it in a non-enumerable property
+				// configurable must be true to allow the property to be
+				// deleted when data is removed
+				} else {
+					Object.defineProperty( owner, this.expando, {
+						value: value,
+						configurable: true
+					} );
+				}
+			}
+		}
+
+		return value;
+	},
+	set: function( owner, data, value ) {
+		var prop,
+			cache = this.cache( owner );
+
+		// Handle: [ owner, key, value ] args
+		// Always use camelCase key (gh-2257)
+		if ( typeof data === "string" ) {
+			cache[ camelCase( data ) ] = value;
+
+		// Handle: [ owner, { properties } ] args
+		} else {
+
+			// Copy the properties one-by-one to the cache object
+			for ( prop in data ) {
+				cache[ camelCase( prop ) ] = data[ prop ];
+			}
+		}
+		return cache;
+	},
+	get: function( owner, key ) {
+		return key === undefined ?
+			this.cache( owner ) :
+
+			// Always use camelCase key (gh-2257)
+			owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ];
+	},
+	access: function( owner, key, value ) {
+
+		// In cases where either:
+		//
+		//   1. No key was specified
+		//   2. A string key was specified, but no value provided
+		//
+		// Take the "read" path and allow the get method to determine
+		// which value to return, respectively either:
+		//
+		//   1. The entire cache object
+		//   2. The data stored at the key
+		//
+		if ( key === undefined ||
+				( ( key && typeof key === "string" ) && value === undefined ) ) {
+
+			return this.get( owner, key );
+		}
+
+		// When the key is not a string, or both a key and value
+		// are specified, set or extend (existing objects) with either:
+		//
+		//   1. An object of properties
+		//   2. A key and value
+		//
+		this.set( owner, key, value );
+
+		// Since the "set" path can have two possible entry points
+		// return the expected data based on which path was taken[*]
+		return value !== undefined ? value : key;
+	},
+	remove: function( owner, key ) {
+		var i,
+			cache = owner[ this.expando ];
+
+		if ( cache === undefined ) {
+			return;
+		}
+
+		if ( key !== undefined ) {
+
+			// Support array or space separated string of keys
+			if ( Array.isArray( key ) ) {
+
+				// If key is an array of keys...
+				// We always set camelCase keys, so remove that.
+				key = key.map( camelCase );
+			} else {
+				key = camelCase( key );
+
+				// If a key with the spaces exists, use it.
+				// Otherwise, create an array by matching non-whitespace
+				key = key in cache ?
+					[ key ] :
+					( key.match( rnothtmlwhite ) || [] );
+			}
+
+			i = key.length;
+
+			while ( i-- ) {
+				delete cache[ key[ i ] ];
+			}
+		}
+
+		// Remove the expando if there's no more data
+		if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
+
+			// Support: Chrome <=35 - 45
+			// Webkit & Blink performance suffers when deleting properties
+			// from DOM nodes, so set to undefined instead
+			// https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
+			if ( owner.nodeType ) {
+				owner[ this.expando ] = undefined;
+			} else {
+				delete owner[ this.expando ];
+			}
+		}
+	},
+	hasData: function( owner ) {
+		var cache = owner[ this.expando ];
+		return cache !== undefined && !jQuery.isEmptyObject( cache );
+	}
+};
+var dataPriv = new Data();
+
+var dataUser = new Data();
+
+
+
+//	Implementation Summary
+//
+//	1. Enforce API surface and semantic compatibility with 1.9.x branch
+//	2. Improve the module's maintainability by reducing the storage
+//		paths to a single mechanism.
+//	3. Use the same single mechanism to support "private" and "user" data.
+//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
+//	5. Avoid exposing implementation details on user objects (eg. expando properties)
+//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
+
+var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+	rmultiDash = /[A-Z]/g;
+
+function getData( data ) {
+	if ( data === "true" ) {
+		return true;
+	}
+
+	if ( data === "false" ) {
+		return false;
+	}
+
+	if ( data === "null" ) {
+		return null;
+	}
+
+	// Only convert to a number if it doesn't change the string
+	if ( data === +data + "" ) {
+		return +data;
+	}
+
+	if ( rbrace.test( data ) ) {
+		return JSON.parse( data );
+	}
+
+	return data;
+}
+
+function dataAttr( elem, key, data ) {
+	var name;
+
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = getData( data );
+			} catch ( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			dataUser.set( elem, key, data );
+		} else {
+			data = undefined;
+		}
+	}
+	return data;
+}
+
+jQuery.extend( {
+	hasData: function( elem ) {
+		return dataUser.hasData( elem ) || dataPriv.hasData( elem );
+	},
+
+	data: function( elem, name, data ) {
+		return dataUser.access( elem, name, data );
+	},
+
+	removeData: function( elem, name ) {
+		dataUser.remove( elem, name );
+	},
+
+	// TODO: Now that all calls to _data and _removeData have been replaced
+	// with direct calls to dataPriv methods, these can be deprecated.
+	_data: function( elem, name, data ) {
+		return dataPriv.access( elem, name, data );
+	},
+
+	_removeData: function( elem, name ) {
+		dataPriv.remove( elem, name );
+	}
+} );
+
+jQuery.fn.extend( {
+	data: function( key, value ) {
+		var i, name, data,
+			elem = this[ 0 ],
+			attrs = elem && elem.attributes;
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = dataUser.get( elem );
+
+				if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
+					i = attrs.length;
+					while ( i-- ) {
+
+						// Support: IE 11 only
+						// The attrs elements can be null (#14894)
+						if ( attrs[ i ] ) {
+							name = attrs[ i ].name;
+							if ( name.indexOf( "data-" ) === 0 ) {
+								name = camelCase( name.slice( 5 ) );
+								dataAttr( elem, name, data[ name ] );
+							}
+						}
+					}
+					dataPriv.set( elem, "hasDataAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each( function() {
+				dataUser.set( this, key );
+			} );
+		}
+
+		return access( this, function( value ) {
+			var data;
+
+			// The calling jQuery object (element matches) is not empty
+			// (and therefore has an element appears at this[ 0 ]) and the
+			// `value` parameter was not undefined. An empty jQuery object
+			// will result in `undefined` for elem = this[ 0 ] which will
+			// throw an exception if an attempt to read a data cache is made.
+			if ( elem && value === undefined ) {
+
+				// Attempt to get data from the cache
+				// The key will always be camelCased in Data
+				data = dataUser.get( elem, key );
+				if ( data !== undefined ) {
+					return data;
+				}
+
+				// Attempt to "discover" the data in
+				// HTML5 custom data-* attrs
+				data = dataAttr( elem, key );
+				if ( data !== undefined ) {
+					return data;
+				}
+
+				// We tried really hard, but the data doesn't exist.
+				return;
+			}
+
+			// Set the data...
+			this.each( function() {
+
+				// We always store the camelCased key
+				dataUser.set( this, key, value );
+			} );
+		}, null, value, arguments.length > 1, null, true );
+	},
+
+	removeData: function( key ) {
+		return this.each( function() {
+			dataUser.remove( this, key );
+		} );
+	}
+} );
+
+
+jQuery.extend( {
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = dataPriv.get( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || Array.isArray( data ) ) {
+					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+			startLength--;
+		}
+
+		if ( fn ) {
+
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			// Clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
+		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// Not public - generate a queueHooks object, or return the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
+			empty: jQuery.Callbacks( "once memory" ).add( function() {
+				dataPriv.remove( elem, [ type + "queue", key ] );
+			} )
+		} );
+	}
+} );
+
+jQuery.fn.extend( {
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[ 0 ], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each( function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// Ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			} );
+	},
+	dequeue: function( type ) {
+		return this.each( function() {
+			jQuery.dequeue( this, type );
+		} );
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while ( i-- ) {
+			tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
+	}
+} );
+var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
+
+var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
+
+
+var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+var isHiddenWithinTree = function( elem, el ) {
+
+		// isHiddenWithinTree might be called from jQuery#filter function;
+		// in that case, element will be second argument
+		elem = el || elem;
+
+		// Inline style trumps all
+		return elem.style.display === "none" ||
+			elem.style.display === "" &&
+
+			// Otherwise, check computed style
+			// Support: Firefox <=43 - 45
+			// Disconnected elements can have computed display: none, so first confirm that elem is
+			// in the document.
+			jQuery.contains( elem.ownerDocument, elem ) &&
+
+			jQuery.css( elem, "display" ) === "none";
+	};
+
+var swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+
+
+function adjustCSS( elem, prop, valueParts, tween ) {
+	var adjusted, scale,
+		maxIterations = 20,
+		currentValue = tween ?
+			function() {
+				return tween.cur();
+			} :
+			function() {
+				return jQuery.css( elem, prop, "" );
+			},
+		initial = currentValue(),
+		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+		// Starting value computation is required for potential unit mismatches
+		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
+			rcssNum.exec( jQuery.css( elem, prop ) );
+
+	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
+
+		// Support: Firefox <=54
+		// Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144)
+		initial = initial / 2;
+
+		// Trust units reported by jQuery.css
+		unit = unit || initialInUnit[ 3 ];
+
+		// Iteratively approximate from a nonzero starting point
+		initialInUnit = +initial || 1;
+
+		while ( maxIterations-- ) {
+
+			// Evaluate and update our best guess (doubling guesses that zero out).
+			// Finish if the scale equals or crosses 1 (making the old*new product non-positive).
+			jQuery.style( elem, prop, initialInUnit + unit );
+			if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) {
+				maxIterations = 0;
+			}
+			initialInUnit = initialInUnit / scale;
+
+		}
+
+		initialInUnit = initialInUnit * 2;
+		jQuery.style( elem, prop, initialInUnit + unit );
+
+		// Make sure we update the tween properties later on
+		valueParts = valueParts || [];
+	}
+
+	if ( valueParts ) {
+		initialInUnit = +initialInUnit || +initial || 0;
+
+		// Apply relative offset (+=/-=) if specified
+		adjusted = valueParts[ 1 ] ?
+			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
+			+valueParts[ 2 ];
+		if ( tween ) {
+			tween.unit = unit;
+			tween.start = initialInUnit;
+			tween.end = adjusted;
+		}
+	}
+	return adjusted;
+}
+
+
+var defaultDisplayMap = {};
+
+function getDefaultDisplay( elem ) {
+	var temp,
+		doc = elem.ownerDocument,
+		nodeName = elem.nodeName,
+		display = defaultDisplayMap[ nodeName ];
+
+	if ( display ) {
+		return display;
+	}
+
+	temp = doc.body.appendChild( doc.createElement( nodeName ) );
+	display = jQuery.css( temp, "display" );
+
+	temp.parentNode.removeChild( temp );
+
+	if ( display === "none" ) {
+		display = "block";
+	}
+	defaultDisplayMap[ nodeName ] = display;
+
+	return display;
+}
+
+function showHide( elements, show ) {
+	var display, elem,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	// Determine new display value for elements that need to change
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		display = elem.style.display;
+		if ( show ) {
+
+			// Since we force visibility upon cascade-hidden elements, an immediate (and slow)
+			// check is required in this first loop unless we have a nonempty display value (either
+			// inline or about-to-be-restored)
+			if ( display === "none" ) {
+				values[ index ] = dataPriv.get( elem, "display" ) || null;
+				if ( !values[ index ] ) {
+					elem.style.display = "";
+				}
+			}
+			if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
+				values[ index ] = getDefaultDisplay( elem );
+			}
+		} else {
+			if ( display !== "none" ) {
+				values[ index ] = "none";
+
+				// Remember what we're overwriting
+				dataPriv.set( elem, "display", display );
+			}
+		}
+	}
+
+	// Set the display of the elements in a second loop to avoid constant reflow
+	for ( index = 0; index < length; index++ ) {
+		if ( values[ index ] != null ) {
+			elements[ index ].style.display = values[ index ];
+		}
+	}
+
+	return elements;
+}
+
+jQuery.fn.extend( {
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
+
+		return this.each( function() {
+			if ( isHiddenWithinTree( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		} );
+	}
+} );
+var rcheckableType = ( /^(?:checkbox|radio)$/i );
+
+var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
+
+var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
+
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
+
+	// Support: IE <=9 only
+	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+
+	// XHTML parsers do not magically insert elements in the
+	// same way that tag soup parsers do. So we cannot shorten
+	// this by omitting <tbody> or other required elements.
+	thead: [ 1, "<table>", "</table>" ],
+	col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
+	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+	_default: [ 0, "", "" ]
+};
+
+// Support: IE <=9 only
+wrapMap.optgroup = wrapMap.option;
+
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+
+function getAll( context, tag ) {
+
+	// Support: IE <=9 - 11 only
+	// Use typeof to avoid zero-argument method invocation on host objects (#15151)
+	var ret;
+
+	if ( typeof context.getElementsByTagName !== "undefined" ) {
+		ret = context.getElementsByTagName( tag || "*" );
+
+	} else if ( typeof context.querySelectorAll !== "undefined" ) {
+		ret = context.querySelectorAll( tag || "*" );
+
+	} else {
+		ret = [];
+	}
+
+	if ( tag === undefined || tag && nodeName( context, tag ) ) {
+		return jQuery.merge( [ context ], ret );
+	}
+
+	return ret;
+}
+
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var i = 0,
+		l = elems.length;
+
+	for ( ; i < l; i++ ) {
+		dataPriv.set(
+			elems[ i ],
+			"globalEval",
+			!refElements || dataPriv.get( refElements[ i ], "globalEval" )
+		);
+	}
+}
+
+
+var rhtml = /<|&#?\w+;/;
+
+function buildFragment( elems, context, scripts, selection, ignored ) {
+	var elem, tmp, tag, wrap, contains, j,
+		fragment = context.createDocumentFragment(),
+		nodes = [],
+		i = 0,
+		l = elems.length;
+
+	for ( ; i < l; i++ ) {
+		elem = elems[ i ];
+
+		if ( elem || elem === 0 ) {
+
+			// Add nodes directly
+			if ( toType( elem ) === "object" ) {
+
+				// Support: Android <=4.0 only, PhantomJS 1 only
+				// push.apply(_, arraylike) throws on ancient WebKit
+				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+			// Convert non-html into a text node
+			} else if ( !rhtml.test( elem ) ) {
+				nodes.push( context.createTextNode( elem ) );
+
+			// Convert html into DOM nodes
+			} else {
+				tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
+
+				// Deserialize a standard representation
+				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
+				wrap = wrapMap[ tag ] || wrapMap._default;
+				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
+
+				// Descend through wrappers to the right content
+				j = wrap[ 0 ];
+				while ( j-- ) {
+					tmp = tmp.lastChild;
+				}
+
+				// Support: Android <=4.0 only, PhantomJS 1 only
+				// push.apply(_, arraylike) throws on ancient WebKit
+				jQuery.merge( nodes, tmp.childNodes );
+
+				// Remember the top-level container
+				tmp = fragment.firstChild;
+
+				// Ensure the created nodes are orphaned (#12392)
+				tmp.textContent = "";
+			}
+		}
+	}
+
+	// Remove wrapper from fragment
+	fragment.textContent = "";
+
+	i = 0;
+	while ( ( elem = nodes[ i++ ] ) ) {
+
+		// Skip elements already in the context collection (trac-4087)
+		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
+			if ( ignored ) {
+				ignored.push( elem );
+			}
+			continue;
+		}
+
+		contains = jQuery.contains( elem.ownerDocument, elem );
+
+		// Append to fragment
+		tmp = getAll( fragment.appendChild( elem ), "script" );
+
+		// Preserve script evaluation history
+		if ( contains ) {
+			setGlobalEval( tmp );
+		}
+
+		// Capture executables
+		if ( scripts ) {
+			j = 0;
+			while ( ( elem = tmp[ j++ ] ) ) {
+				if ( rscriptType.test( elem.type || "" ) ) {
+					scripts.push( elem );
+				}
+			}
+		}
+	}
+
+	return fragment;
+}
+
+
+( function() {
+	var fragment = document.createDocumentFragment(),
+		div = fragment.appendChild( document.createElement( "div" ) ),
+		input = document.createElement( "input" );
+
+	// Support: Android 4.0 - 4.3 only
+	// Check state lost if the name is set (#11217)
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Android <=4.1 only
+	// Older WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE <=11 only
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+} )();
+var documentElement = document.documentElement;
+
+
+
+var
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+
+function returnTrue() {
+	return true;
+}
+
+function returnFalse() {
+	return false;
+}
+
+// Support: IE <=9 only
+// See #13393 for more info
+function safeActiveElement() {
+	try {
+		return document.activeElement;
+	} catch ( err ) { }
+}
+
+function on( elem, types, selector, data, fn, one ) {
+	var origFn, type;
+
+	// Types can be a map of types/handlers
+	if ( typeof types === "object" ) {
+
+		// ( types-Object, selector, data )
+		if ( typeof selector !== "string" ) {
+
+			// ( types-Object, data )
+			data = data || selector;
+			selector = undefined;
+		}
+		for ( type in types ) {
+			on( elem, type, selector, data, types[ type ], one );
+		}
+		return elem;
+	}
+
+	if ( data == null && fn == null ) {
+
+		// ( types, fn )
+		fn = selector;
+		data = selector = undefined;
+	} else if ( fn == null ) {
+		if ( typeof selector === "string" ) {
+
+			// ( types, selector, fn )
+			fn = data;
+			data = undefined;
+		} else {
+
+			// ( types, data, fn )
+			fn = data;
+			data = selector;
+			selector = undefined;
+		}
+	}
+	if ( fn === false ) {
+		fn = returnFalse;
+	} else if ( !fn ) {
+		return elem;
+	}
+
+	if ( one === 1 ) {
+		origFn = fn;
+		fn = function( event ) {
+
+			// Can use an empty set, since event contains the info
+			jQuery().off( event );
+			return origFn.apply( this, arguments );
+		};
+
+		// Use same guid so caller can remove using origFn
+		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+	}
+	return elem.each( function() {
+		jQuery.event.add( this, types, fn, data, selector );
+	} );
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	global: {},
+
+	add: function( elem, types, handler, data, selector ) {
+
+		var handleObjIn, eventHandle, tmp,
+			events, t, handleObj,
+			special, handlers, type, namespaces, origType,
+			elemData = dataPriv.get( elem );
+
+		// Don't attach events to noData or text/comment nodes (but allow plain objects)
+		if ( !elemData ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Ensure that invalid selectors throw exceptions at attach time
+		// Evaluate against documentElement in case elem is a non-element node (e.g., document)
+		if ( selector ) {
+			jQuery.find.matchesSelector( documentElement, selector );
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		if ( !( events = elemData.events ) ) {
+			events = elemData.events = {};
+		}
+		if ( !( eventHandle = elemData.handle ) ) {
+			eventHandle = elemData.handle = function( e ) {
+
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
+					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
+			};
+		}
+
+		// Handle multiple events separated by a space
+		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+
+			// There *must* be a type, no attaching namespace-only handlers
+			if ( !type ) {
+				continue;
+			}
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend( {
+				type: type,
+				origType: origType,
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join( "." )
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			if ( !( handlers = events[ type ] ) ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener if the special events handler returns false
+				if ( !special.setup ||
+					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+	},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+
+		var j, origCount, tmp,
+			events, t, handleObj,
+			special, handlers, type, namespaces, origType,
+			elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
+
+		if ( !elemData || !( events = elemData.events ) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+			handlers = events[ type ] || [];
+			tmp = tmp[ 2 ] &&
+				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
+
+			// Remove matching events
+			origCount = j = handlers.length;
+			while ( j-- ) {
+				handleObj = handlers[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !selector || selector === handleObj.selector ||
+						selector === "**" && handleObj.selector ) ) {
+					handlers.splice( j, 1 );
+
+					if ( handleObj.selector ) {
+						handlers.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( origCount && !handlers.length ) {
+				if ( !special.teardown ||
+					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove data and the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			dataPriv.remove( elem, "handle events" );
+		}
+	},
+
+	dispatch: function( nativeEvent ) {
+
+		// Make a writable jQuery.Event from the native event object
+		var event = jQuery.event.fix( nativeEvent );
+
+		var i, j, ret, matched, handleObj, handlerQueue,
+			args = new Array( arguments.length ),
+			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[ 0 ] = event;
+
+		for ( i = 1; i < arguments.length; i++ ) {
+			args[ i ] = arguments[ i ];
+		}
+
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( ( handleObj = matched.handlers[ j++ ] ) &&
+				!event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
+				// a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+						handleObj.handler ).apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( ( event.result = ret ) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var i, handleObj, sel, matchedHandlers, matchedSelectors,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Find delegate handlers
+		if ( delegateCount &&
+
+			// Support: IE <=9
+			// Black-hole SVG <use> instance trees (trac-13180)
+			cur.nodeType &&
+
+			// Support: Firefox <=42
+			// Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
+			// https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
+			// Support: IE 11 only
+			// ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
+			!( event.type === "click" && event.button >= 1 ) ) {
+
+			for ( ; cur !== this; cur = cur.parentNode || this ) {
+
+				// Don't check non-elements (#13208)
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
+					matchedHandlers = [];
+					matchedSelectors = {};
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matchedSelectors[ sel ] === undefined ) {
+							matchedSelectors[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) > -1 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matchedSelectors[ sel ] ) {
+							matchedHandlers.push( handleObj );
+						}
+					}
+					if ( matchedHandlers.length ) {
+						handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		cur = this;
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
+		}
+
+		return handlerQueue;
+	},
+
+	addProp: function( name, hook ) {
+		Object.defineProperty( jQuery.Event.prototype, name, {
+			enumerable: true,
+			configurable: true,
+
+			get: isFunction( hook ) ?
+				function() {
+					if ( this.originalEvent ) {
+							return hook( this.originalEvent );
+					}
+				} :
+				function() {
+					if ( this.originalEvent ) {
+							return this.originalEvent[ name ];
+					}
+				},
+
+			set: function( value ) {
+				Object.defineProperty( this, name, {
+					enumerable: true,
+					configurable: true,
+					writable: true,
+					value: value
+				} );
+			}
+		} );
+	},
+
+	fix: function( originalEvent ) {
+		return originalEvent[ jQuery.expando ] ?
+			originalEvent :
+			new jQuery.Event( originalEvent );
+	},
+
+	special: {
+		load: {
+
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		focus: {
+
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== safeActiveElement() && this.focus ) {
+					this.focus();
+					return false;
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === safeActiveElement() && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
+		},
+		click: {
+
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( this.type === "checkbox" && this.click && nodeName( this, "input" ) ) {
+					this.click();
+					return false;
+				}
+			},
+
+			// For cross-browser consistency, don't fire native .click() on links
+			_default: function( event ) {
+				return nodeName( event.target, "a" );
+			}
+		},
+
+		beforeunload: {
+			postDispatch: function( event ) {
+
+				// Support: Firefox 20+
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
+					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	}
+};
+
+jQuery.removeEvent = function( elem, type, handle ) {
+
+	// This "if" is needed for plain objects
+	if ( elem.removeEventListener ) {
+		elem.removeEventListener( type, handle );
+	}
+};
+
+jQuery.Event = function( src, props ) {
+
+	// Allow instantiation without the 'new' keyword
+	if ( !( this instanceof jQuery.Event ) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = src.defaultPrevented ||
+				src.defaultPrevented === undefined &&
+
+				// Support: Android <=2.3 only
+				src.returnValue === false ?
+			returnTrue :
+			returnFalse;
+
+		// Create target properties
+		// Support: Safari <=6 - 7 only
+		// Target should not be a text node (#504, #13143)
+		this.target = ( src.target && src.target.nodeType === 3 ) ?
+			src.target.parentNode :
+			src.target;
+
+		this.currentTarget = src.currentTarget;
+		this.relatedTarget = src.relatedTarget;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || Date.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	constructor: jQuery.Event,
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
+	isSimulated: false,
+
+	preventDefault: function() {
+		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
+
+		if ( e && !this.isSimulated ) {
+			e.preventDefault();
+		}
+	},
+	stopPropagation: function() {
+		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
+
+		if ( e && !this.isSimulated ) {
+			e.stopPropagation();
+		}
+	},
+	stopImmediatePropagation: function() {
+		var e = this.originalEvent;
+
+		this.isImmediatePropagationStopped = returnTrue;
+
+		if ( e && !this.isSimulated ) {
+			e.stopImmediatePropagation();
+		}
+
+		this.stopPropagation();
+	}
+};
+
+// Includes all common event props including KeyEvent and MouseEvent specific props
+jQuery.each( {
+	altKey: true,
+	bubbles: true,
+	cancelable: true,
+	changedTouches: true,
+	ctrlKey: true,
+	detail: true,
+	eventPhase: true,
+	metaKey: true,
+	pageX: true,
+	pageY: true,
+	shiftKey: true,
+	view: true,
+	"char": true,
+	charCode: true,
+	key: true,
+	keyCode: true,
+	button: true,
+	buttons: true,
+	clientX: true,
+	clientY: true,
+	offsetX: true,
+	offsetY: true,
+	pointerId: true,
+	pointerType: true,
+	screenX: true,
+	screenY: true,
+	targetTouches: true,
+	toElement: true,
+	touches: true,
+
+	which: function( event ) {
+		var button = event.button;
+
+		// Add which for key events
+		if ( event.which == null && rkeyEvent.test( event.type ) ) {
+			return event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
+			if ( button & 1 ) {
+				return 1;
+			}
+
+			if ( button & 2 ) {
+				return 3;
+			}
+
+			if ( button & 4 ) {
+				return 2;
+			}
+
+			return 0;
+		}
+
+		return event.which;
+	}
+}, jQuery.event.addProp );
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+// so that event delegation works in jQuery.
+// Do the same for pointerenter/pointerleave and pointerover/pointerout
+//
+// Support: Safari 7 only
+// Safari sends mouseenter too often; see:
+// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
+// for the description of the bug (it existed in older Chrome versions as well).
+jQuery.each( {
+	mouseenter: "mouseover",
+	mouseleave: "mouseout",
+	pointerenter: "pointerover",
+	pointerleave: "pointerout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mouseenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+} );
+
+jQuery.fn.extend( {
+
+	on: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn );
+	},
+	one: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ?
+					handleObj.origType + "." + handleObj.namespace :
+					handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each( function() {
+			jQuery.event.remove( this, types, fn, selector );
+		} );
+	}
+} );
+
+
+var
+
+	/* eslint-disable max-len */
+
+	// See https://github.com/eslint/eslint/issues/3229
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
+
+	/* eslint-enable */
+
+	// Support: IE <=10 - 11, Edge 12 - 13 only
+	// In IE/Edge using regex groups here causes severe slowdowns.
+	// See https://connect.microsoft.com/IE/feedback/details/1736512/
+	rnoInnerhtml = /<script|<style|<link/i,
+
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
+
+// Prefer a tbody over its parent table for containing new rows
+function manipulationTarget( elem, content ) {
+	if ( nodeName( elem, "table" ) &&
+		nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
+
+		return jQuery( elem ).children( "tbody" )[ 0 ] || elem;
+	}
+
+	return elem;
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	if ( ( elem.type || "" ).slice( 0, 5 ) === "true/" ) {
+		elem.type = elem.type.slice( 5 );
+	} else {
+		elem.removeAttribute( "type" );
+	}
+
+	return elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// 1. Copy private data: events, handlers, etc.
+	if ( dataPriv.hasData( src ) ) {
+		pdataOld = dataPriv.access( src );
+		pdataCur = dataPriv.set( dest, pdataOld );
+		events = pdataOld.events;
+
+		if ( events ) {
+			delete pdataCur.handle;
+			pdataCur.events = {};
+
+			for ( type in events ) {
+				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( dest, type, events[ type ][ i ] );
+				}
+			}
+		}
+	}
+
+	// 2. Copy user data
+	if ( dataUser.hasData( src ) ) {
+		udataOld = dataUser.access( src );
+		udataCur = jQuery.extend( {}, udataOld );
+
+		dataUser.set( dest, udataCur );
+	}
+}
+
+// Fix IE bugs, see support tests
+function fixInput( src, dest ) {
+	var nodeName = dest.nodeName.toLowerCase();
+
+	// Fails to persist the checked state of a cloned checkbox or radio button.
+	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+		dest.checked = src.checked;
+
+	// Fails to return the selected option to the default selected state when cloning options
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
+
+function domManip( collection, args, callback, ignored ) {
+
+	// Flatten any nested arrays
+	args = concat.apply( [], args );
+
+	var fragment, first, scripts, hasScripts, node, doc,
+		i = 0,
+		l = collection.length,
+		iNoClone = l - 1,
+		value = args[ 0 ],
+		valueIsFunction = isFunction( value );
+
+	// We can't cloneNode fragments that contain checked, in WebKit
+	if ( valueIsFunction ||
+			( l > 1 && typeof value === "string" &&
+				!support.checkClone && rchecked.test( value ) ) ) {
+		return collection.each( function( index ) {
+			var self = collection.eq( index );
+			if ( valueIsFunction ) {
+				args[ 0 ] = value.call( this, index, self.html() );
+			}
+			domManip( self, args, callback, ignored );
+		} );
+	}
+
+	if ( l ) {
+		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
+		first = fragment.firstChild;
+
+		if ( fragment.childNodes.length === 1 ) {
+			fragment = first;
+		}
+
+		// Require either new content or an interest in ignored elements to invoke the callback
+		if ( first || ignored ) {
+			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+			hasScripts = scripts.length;
+
+			// Use the original fragment for the last item
+			// instead of the first because it can end up
+			// being emptied incorrectly in certain situations (#8070).
+			for ( ; i < l; i++ ) {
+				node = fragment;
+
+				if ( i !== iNoClone ) {
+					node = jQuery.clone( node, true, true );
+
+					// Keep references to cloned scripts for later restoration
+					if ( hasScripts ) {
+
+						// Support: Android <=4.0 only, PhantomJS 1 only
+						// push.apply(_, arraylike) throws on ancient WebKit
+						jQuery.merge( scripts, getAll( node, "script" ) );
+					}
+				}
+
+				callback.call( collection[ i ], node, i );
+			}
+
+			if ( hasScripts ) {
+				doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+				// Reenable scripts
+				jQuery.map( scripts, restoreScript );
+
+				// Evaluate executable scripts on first document insertion
+				for ( i = 0; i < hasScripts; i++ ) {
+					node = scripts[ i ];
+					if ( rscriptType.test( node.type || "" ) &&
+						!dataPriv.access( node, "globalEval" ) &&
+						jQuery.contains( doc, node ) ) {
+
+						if ( node.src && ( node.type || "" ).toLowerCase()  !== "module" ) {
+
+							// Optional AJAX dependency, but won't run scripts if not present
+							if ( jQuery._evalUrl ) {
+								jQuery._evalUrl( node.src );
+							}
+						} else {
+							DOMEval( node.textContent.replace( rcleanScript, "" ), doc, node );
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return collection;
+}
+
+function remove( elem, selector, keepData ) {
+	var node,
+		nodes = selector ? jQuery.filter( selector, elem ) : elem,
+		i = 0;
+
+	for ( ; ( node = nodes[ i ] ) != null; i++ ) {
+		if ( !keepData && node.nodeType === 1 ) {
+			jQuery.cleanData( getAll( node ) );
+		}
+
+		if ( node.parentNode ) {
+			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
+				setGlobalEval( getAll( node, "script" ) );
+			}
+			node.parentNode.removeChild( node );
+		}
+	}
+
+	return elem;
+}
+
+jQuery.extend( {
+	htmlPrefilter: function( html ) {
+		return html.replace( rxhtmlTag, "<$1></$2>" );
+	},
+
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var i, l, srcElements, destElements,
+			clone = elem.cloneNode( true ),
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		// Fix IE cloning issues
+		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
+				!jQuery.isXMLDoc( elem ) ) {
+
+			// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			for ( i = 0, l = srcElements.length; i < l; i++ ) {
+				fixInput( srcElements[ i ], destElements[ i ] );
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0, l = srcElements.length; i < l; i++ ) {
+					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		// Return the cloned set
+		return clone;
+	},
+
+	cleanData: function( elems ) {
+		var data, elem, type,
+			special = jQuery.event.special,
+			i = 0;
+
+		for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
+			if ( acceptData( elem ) ) {
+				if ( ( data = elem[ dataPriv.expando ] ) ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+
+					// Support: Chrome <=35 - 45+
+					// Assign undefined instead of using delete, see Data#remove
+					elem[ dataPriv.expando ] = undefined;
+				}
+				if ( elem[ dataUser.expando ] ) {
+
+					// Support: Chrome <=35 - 45+
+					// Assign undefined instead of using delete, see Data#remove
+					elem[ dataUser.expando ] = undefined;
+				}
+			}
+		}
+	}
+} );
+
+jQuery.fn.extend( {
+	detach: function( selector ) {
+		return remove( this, selector, true );
+	},
+
+	remove: function( selector ) {
+		return remove( this, selector );
+	},
+
+	text: function( value ) {
+		return access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().each( function() {
+					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+						this.textContent = value;
+					}
+				} );
+		}, null, value, arguments.length );
+	},
+
+	append: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		} );
+	},
+
+	prepend: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		} );
+	},
+
+	before: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		} );
+	},
+
+	after: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		} );
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; ( elem = this[ i ] ) != null; i++ ) {
+			if ( elem.nodeType === 1 ) {
+
+				// Prevent memory leaks
+				jQuery.cleanData( getAll( elem, false ) );
+
+				// Remove any remaining nodes
+				elem.textContent = "";
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function() {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		} );
+	},
+
+	html: function( value ) {
+		return access( this, function( value ) {
+			var elem = this[ 0 ] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined && elem.nodeType === 1 ) {
+				return elem.innerHTML;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+
+				value = jQuery.htmlPrefilter( value );
+
+				try {
+					for ( ; i < l; i++ ) {
+						elem = this[ i ] || {};
+
+						// Remove element nodes and prevent memory leaks
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch ( e ) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var ignored = [];
+
+		// Make the changes, replacing each non-ignored context element with the new content
+		return domManip( this, arguments, function( elem ) {
+			var parent = this.parentNode;
+
+			if ( jQuery.inArray( this, ignored ) < 0 ) {
+				jQuery.cleanData( getAll( this ) );
+				if ( parent ) {
+					parent.replaceChild( elem, this );
+				}
+			}
+
+		// Force callback invocation
+		}, ignored );
+	}
+} );
+
+jQuery.each( {
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1,
+			i = 0;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone( true );
+			jQuery( insert[ i ] )[ original ]( elems );
+
+			// Support: Android <=4.0 only, PhantomJS 1 only
+			// .get() because push.apply(_, arraylike) throws on ancient WebKit
+			push.apply( ret, elems.get() );
+		}
+
+		return this.pushStack( ret );
+	};
+} );
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+var getStyles = function( elem ) {
+
+		// Support: IE <=11 only, Firefox <=30 (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		var view = elem.ownerDocument.defaultView;
+
+		if ( !view || !view.opener ) {
+			view = window;
+		}
+
+		return view.getComputedStyle( elem );
+	};
+
+var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
+
+
+
+( function() {
+
+	// Executing both pixelPosition & boxSizingReliable tests require only one layout
+	// so they're executed at the same time to save the second computation.
+	function computeStyleTests() {
+
+		// This is a singleton, we need to execute it only once
+		if ( !div ) {
+			return;
+		}
+
+		container.style.cssText = "position:absolute;left:-11111px;width:60px;" +
+			"margin-top:1px;padding:0;border:0";
+		div.style.cssText =
+			"position:relative;display:block;box-sizing:border-box;overflow:scroll;" +
+			"margin:auto;border:1px;padding:1px;" +
+			"width:60%;top:1%";
+		documentElement.appendChild( container ).appendChild( div );
+
+		var divStyle = window.getComputedStyle( div );
+		pixelPositionVal = divStyle.top !== "1%";
+
+		// Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
+		reliableMarginLeftVal = roundPixelMeasures( divStyle.marginLeft ) === 12;
+
+		// Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3
+		// Some styles come back with percentage values, even though they shouldn't
+		div.style.right = "60%";
+		pixelBoxStylesVal = roundPixelMeasures( divStyle.right ) === 36;
+
+		// Support: IE 9 - 11 only
+		// Detect misreporting of content dimensions for box-sizing:border-box elements
+		boxSizingReliableVal = roundPixelMeasures( divStyle.width ) === 36;
+
+		// Support: IE 9 only
+		// Detect overflow:scroll screwiness (gh-3699)
+		div.style.position = "absolute";
+		scrollboxSizeVal = div.offsetWidth === 36 || "absolute";
+
+		documentElement.removeChild( container );
+
+		// Nullify the div so it wouldn't be stored in the memory and
+		// it will also be a sign that checks already performed
+		div = null;
+	}
+
+	function roundPixelMeasures( measure ) {
+		return Math.round( parseFloat( measure ) );
+	}
+
+	var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
+		reliableMarginLeftVal,
+		container = document.createElement( "div" ),
+		div = document.createElement( "div" );
+
+	// Finish early in limited (non-browser) environments
+	if ( !div.style ) {
+		return;
+	}
+
+	// Support: IE <=9 - 11 only
+	// Style of cloned element affects source element cloned (#8908)
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	jQuery.extend( support, {
+		boxSizingReliable: function() {
+			computeStyleTests();
+			return boxSizingReliableVal;
+		},
+		pixelBoxStyles: function() {
+			computeStyleTests();
+			return pixelBoxStylesVal;
+		},
+		pixelPosition: function() {
+			computeStyleTests();
+			return pixelPositionVal;
+		},
+		reliableMarginLeft: function() {
+			computeStyleTests();
+			return reliableMarginLeftVal;
+		},
+		scrollboxSize: function() {
+			computeStyleTests();
+			return scrollboxSizeVal;
+		}
+	} );
+} )();
+
+
+function curCSS( elem, name, computed ) {
+	var width, minWidth, maxWidth, ret,
+
+		// Support: Firefox 51+
+		// Retrieving style before computed somehow
+		// fixes an issue with getting wrong values
+		// on detached elements
+		style = elem.style;
+
+	computed = computed || getStyles( elem );
+
+	// getPropertyValue is needed for:
+	//   .css('filter') (IE 9 only, #12537)
+	//   .css('--customProperty) (#3144)
+	if ( computed ) {
+		ret = computed.getPropertyValue( name ) || computed[ name ];
+
+		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+			ret = jQuery.style( elem, name );
+		}
+
+		// A tribute to the "awesome hack by Dean Edwards"
+		// Android Browser returns percentage for some values,
+		// but width seems to be reliably pixels.
+		// This is against the CSSOM draft spec:
+		// https://drafts.csswg.org/cssom/#resolved-values
+		if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) {
+
+			// Remember the original values
+			width = style.width;
+			minWidth = style.minWidth;
+			maxWidth = style.maxWidth;
+
+			// Put in the new values to get a computed value out
+			style.minWidth = style.maxWidth = style.width = ret;
+			ret = computed.width;
+
+			// Revert the changed values
+			style.width = width;
+			style.minWidth = minWidth;
+			style.maxWidth = maxWidth;
+		}
+	}
+
+	return ret !== undefined ?
+
+		// Support: IE <=9 - 11 only
+		// IE returns zIndex value as an integer.
+		ret + "" :
+		ret;
+}
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+
+	// Define the hook, we'll check on the first run if it's really needed.
+	return {
+		get: function() {
+			if ( conditionFn() ) {
+
+				// Hook not needed (or it's not possible to use it due
+				// to missing dependency), remove it.
+				delete this.get;
+				return;
+			}
+
+			// Hook needed; redefine it so that the support test is not executed again.
+			return ( this.get = hookFn ).apply( this, arguments );
+		}
+	};
+}
+
+
+var
+
+	// Swappable if display is none or starts with table
+	// except "table", "table-cell", or "table-caption"
+	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rcustomProp = /^--/,
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: "0",
+		fontWeight: "400"
+	},
+
+	cssPrefixes = [ "Webkit", "Moz", "ms" ],
+	emptyStyle = document.createElement( "div" ).style;
+
+// Return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( name ) {
+
+	// Shortcut for names that are not vendor prefixed
+	if ( name in emptyStyle ) {
+		return name;
+	}
+
+	// Check for vendor prefixed names
+	var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in emptyStyle ) {
+			return name;
+		}
+	}
+}
+
+// Return a property mapped along what jQuery.cssProps suggests or to
+// a vendor prefixed property.
+function finalPropName( name ) {
+	var ret = jQuery.cssProps[ name ];
+	if ( !ret ) {
+		ret = jQuery.cssProps[ name ] = vendorPropName( name ) || name;
+	}
+	return ret;
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+
+	// Any relative (+/-) values have already been
+	// normalized at this point
+	var matches = rcssNum.exec( value );
+	return matches ?
+
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) :
+		value;
+}
+
+function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) {
+	var i = dimension === "width" ? 1 : 0,
+		extra = 0,
+		delta = 0;
+
+	// Adjustment may not be necessary
+	if ( box === ( isBorderBox ? "border" : "content" ) ) {
+		return 0;
+	}
+
+	for ( ; i < 4; i += 2 ) {
+
+		// Both box models exclude margin
+		if ( box === "margin" ) {
+			delta += jQuery.css( elem, box + cssExpand[ i ], true, styles );
+		}
+
+		// If we get here with a content-box, we're seeking "padding" or "border" or "margin"
+		if ( !isBorderBox ) {
+
+			// Add padding
+			delta += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// For "border" or "margin", add border
+			if ( box !== "padding" ) {
+				delta += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+
+			// But still keep track of it otherwise
+			} else {
+				extra += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+
+		// If we get here with a border-box (content + padding + border), we're seeking "content" or
+		// "padding" or "margin"
+		} else {
+
+			// For "content", subtract padding
+			if ( box === "content" ) {
+				delta -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// For "content" or "padding", subtract border
+			if ( box !== "margin" ) {
+				delta -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	// Account for positive content-box scroll gutter when requested by providing computedVal
+	if ( !isBorderBox && computedVal >= 0 ) {
+
+		// offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border
+		// Assuming integer scroll gutter, subtract the rest and round down
+		delta += Math.max( 0, Math.ceil(
+			elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+			computedVal -
+			delta -
+			extra -
+			0.5
+		) );
+	}
+
+	return delta;
+}
+
+function getWidthOrHeight( elem, dimension, extra ) {
+
+	// Start with computed style
+	var styles = getStyles( elem ),
+		val = curCSS( elem, dimension, styles ),
+		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+		valueIsBorderBox = isBorderBox;
+
+	// Support: Firefox <=54
+	// Return a confounding non-pixel value or feign ignorance, as appropriate.
+	if ( rnumnonpx.test( val ) ) {
+		if ( !extra ) {
+			return val;
+		}
+		val = "auto";
+	}
+
+	// Check for style in case a browser which returns unreliable values
+	// for getComputedStyle silently falls back to the reliable elem.style
+	valueIsBorderBox = valueIsBorderBox &&
+		( support.boxSizingReliable() || val === elem.style[ dimension ] );
+
+	// Fall back to offsetWidth/offsetHeight when value is "auto"
+	// This happens for inline elements with no explicit setting (gh-3571)
+	// Support: Android <=4.1 - 4.3 only
+	// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
+	if ( val === "auto" ||
+		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) {
+
+		val = elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ];
+
+		// offsetWidth/offsetHeight provide border-box values
+		valueIsBorderBox = true;
+	}
+
+	// Normalize "" and auto
+	val = parseFloat( val ) || 0;
+
+	// Adjust for the element's box model
+	return ( val +
+		boxModelAdjustment(
+			elem,
+			dimension,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles,
+
+			// Provide the current computed size to request scroll gutter calculation (gh-3589)
+			val
+		)
+	) + "px";
+}
+
+jQuery.extend( {
+
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"animationIterationCount": true,
+		"columnCount": true,
+		"fillOpacity": true,
+		"flexGrow": true,
+		"flexShrink": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"order": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = camelCase( name ),
+			isCustomProp = rcustomProp.test( name ),
+			style = elem.style;
+
+		// Make sure that we're working with the right name. We don't
+		// want to query the value if it is a CSS custom property
+		// since they are user-defined.
+		if ( !isCustomProp ) {
+			name = finalPropName( origName );
+		}
+
+		// Gets hook for the prefixed version, then unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// Convert "+=" or "-=" to relative numbers (#7345)
+			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
+				value = adjustCSS( elem, name, ret );
+
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that null and NaN values aren't set (#7116)
+			if ( value == null || value !== value ) {
+				return;
+			}
+
+			// If a number was passed in, add the unit (except for certain CSS properties)
+			if ( type === "number" ) {
+				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
+			}
+
+			// background-* props affect original clone's values
+			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !( "set" in hooks ) ||
+				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
+
+				if ( isCustomProp ) {
+					style.setProperty( name, value );
+				} else {
+					style[ name ] = value;
+				}
+			}
+
+		} else {
+
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks &&
+				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
+
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var val, num, hooks,
+			origName = camelCase( name ),
+			isCustomProp = rcustomProp.test( name );
+
+		// Make sure that we're working with the right name. We don't
+		// want to modify the value if it is a CSS custom property
+		// since they are user-defined.
+		if ( !isCustomProp ) {
+			name = finalPropName( origName );
+		}
+
+		// Try prefixed name followed by the unprefixed name
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		// Convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Make numeric if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || isFinite( num ) ? num || 0 : val;
+		}
+
+		return val;
+	}
+} );
+
+jQuery.each( [ "height", "width" ], function( i, dimension ) {
+	jQuery.cssHooks[ dimension ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+
+				// Certain elements can have dimension info if we invisibly show them
+				// but it must have a current display style that would benefit
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
+
+					// Support: Safari 8+
+					// Table columns in Safari have non-zero offsetWidth & zero
+					// getBoundingClientRect().width unless display is changed.
+					// Support: IE <=11 only
+					// Running getBoundingClientRect on a disconnected node
+					// in IE throws an error.
+					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
+						swap( elem, cssShow, function() {
+							return getWidthOrHeight( elem, dimension, extra );
+						} ) :
+						getWidthOrHeight( elem, dimension, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var matches,
+				styles = getStyles( elem ),
+				isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+				subtract = extra && boxModelAdjustment(
+					elem,
+					dimension,
+					extra,
+					isBorderBox,
+					styles
+				);
+
+			// Account for unreliable border-box dimensions by comparing offset* to computed and
+			// faking a content-box to get border and padding (gh-3699)
+			if ( isBorderBox && support.scrollboxSize() === styles.position ) {
+				subtract -= Math.ceil(
+					elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+					parseFloat( styles[ dimension ] ) -
+					boxModelAdjustment( elem, dimension, "border", false, styles ) -
+					0.5
+				);
+			}
+
+			// Convert to pixels if value adjustment is needed
+			if ( subtract && ( matches = rcssNum.exec( value ) ) &&
+				( matches[ 3 ] || "px" ) !== "px" ) {
+
+				elem.style[ dimension ] = value;
+				value = jQuery.css( elem, dimension );
+			}
+
+			return setPositiveNumber( elem, value, subtract );
+		}
+	};
+} );
+
+jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+	function( elem, computed ) {
+		if ( computed ) {
+			return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
+				elem.getBoundingClientRect().left -
+					swap( elem, { marginLeft: 0 }, function() {
+						return elem.getBoundingClientRect().left;
+					} )
+				) + "px";
+		}
+	}
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each( {
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// Assumes a single number if not a string
+				parts = typeof value === "string" ? value.split( " " ) : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( prefix !== "margin" ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+} );
+
+jQuery.fn.extend( {
+	css: function( name, value ) {
+		return access( this, function( elem, name, value ) {
+			var styles, len,
+				map = {},
+				i = 0;
+
+			if ( Array.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+				}
+
+				return map;
+			}
+
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	}
+} );
+
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || jQuery.easing._default;
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			// Use a property on the element directly when it is not a DOM element,
+			// or when there is no matching style property that exists.
+			if ( tween.elem.nodeType !== 1 ||
+				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// Passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails.
+			// Simple values such as "10px" are parsed to Float;
+			// complex values such as "rotate(1rad)" are returned as-is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+
+			// Use step hook for back compat.
+			// Use cssHook if its there.
+			// Use .style if available and use plain properties where available.
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.nodeType === 1 &&
+				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
+					jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE <=9 only
+// Panic based approach to setting things on disconnected nodes
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p * Math.PI ) / 2;
+	},
+	_default: "swing"
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+	fxNow, inProgress,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rrun = /queueHooks$/;
+
+function schedule() {
+	if ( inProgress ) {
+		if ( document.hidden === false && window.requestAnimationFrame ) {
+			window.requestAnimationFrame( schedule );
+		} else {
+			window.setTimeout( schedule, jQuery.fx.interval );
+		}
+
+		jQuery.fx.tick();
+	}
+}
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	window.setTimeout( function() {
+		fxNow = undefined;
+	} );
+	return ( fxNow = Date.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		i = 0,
+		attrs = { height: type };
+
+	// If we include width, step value is 1 to do all cssExpand values,
+	// otherwise step value is 2 to skip over Left and Right
+	includeWidth = includeWidth ? 1 : 0;
+	for ( ; i < 4; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
+
+			// We're done with this property
+			return tween;
+		}
+	}
+}
+
+function defaultPrefilter( elem, props, opts ) {
+	var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
+		isBox = "width" in props || "height" in props,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHiddenWithinTree( elem ),
+		dataShow = dataPriv.get( elem, "fxshow" );
+
+	// Queue-skipping animations hijack the fx hooks
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always( function() {
+
+			// Ensure the complete handler is called before this completes
+			anim.always( function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			} );
+		} );
+	}
+
+	// Detect show/hide animations
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.test( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+
+				// Pretend to be hidden if this is a "show" and
+				// there is still data from a stopped show/hide
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+
+				// Ignore all other no-op show/hide data
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+		}
+	}
+
+	// Bail out if this is a no-op like .hide().hide()
+	propTween = !jQuery.isEmptyObject( props );
+	if ( !propTween && jQuery.isEmptyObject( orig ) ) {
+		return;
+	}
+
+	// Restrict "overflow" and "display" styles during box animations
+	if ( isBox && elem.nodeType === 1 ) {
+
+		// Support: IE <=9 - 11, Edge 12 - 15
+		// Record all 3 overflow attributes because IE does not infer the shorthand
+		// from identically-valued overflowX and overflowY and Edge just mirrors
+		// the overflowX value there.
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Identify a display type, preferring old show/hide data over the CSS cascade
+		restoreDisplay = dataShow && dataShow.display;
+		if ( restoreDisplay == null ) {
+			restoreDisplay = dataPriv.get( elem, "display" );
+		}
+		display = jQuery.css( elem, "display" );
+		if ( display === "none" ) {
+			if ( restoreDisplay ) {
+				display = restoreDisplay;
+			} else {
+
+				// Get nonempty value(s) by temporarily forcing visibility
+				showHide( [ elem ], true );
+				restoreDisplay = elem.style.display || restoreDisplay;
+				display = jQuery.css( elem, "display" );
+				showHide( [ elem ] );
+			}
+		}
+
+		// Animate inline elements as inline-block
+		if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
+			if ( jQuery.css( elem, "float" ) === "none" ) {
+
+				// Restore the original display value at the end of pure show/hide animations
+				if ( !propTween ) {
+					anim.done( function() {
+						style.display = restoreDisplay;
+					} );
+					if ( restoreDisplay == null ) {
+						display = style.display;
+						restoreDisplay = display === "none" ? "" : display;
+					}
+				}
+				style.display = "inline-block";
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		anim.always( function() {
+			style.overflow = opts.overflow[ 0 ];
+			style.overflowX = opts.overflow[ 1 ];
+			style.overflowY = opts.overflow[ 2 ];
+		} );
+	}
+
+	// Implement show/hide animations
+	propTween = false;
+	for ( prop in orig ) {
+
+		// General show/hide setup for this element animation
+		if ( !propTween ) {
+			if ( dataShow ) {
+				if ( "hidden" in dataShow ) {
+					hidden = dataShow.hidden;
+				}
+			} else {
+				dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
+			}
+
+			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
+			if ( toggle ) {
+				dataShow.hidden = !hidden;
+			}
+
+			// Show elements before animating them
+			if ( hidden ) {
+				showHide( [ elem ], true );
+			}
+
+			/* eslint-disable no-loop-func */
+
+			anim.done( function() {
+
+			/* eslint-enable no-loop-func */
+
+				// The final step of a "hide" animation is actually hiding the element
+				if ( !hidden ) {
+					showHide( [ elem ] );
+				}
+				dataPriv.remove( elem, "fxshow" );
+				for ( prop in orig ) {
+					jQuery.style( elem, prop, orig[ prop ] );
+				}
+			} );
+		}
+
+		// Per-property setup
+		propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+		if ( !( prop in dataShow ) ) {
+			dataShow[ prop ] = propTween.start;
+			if ( hidden ) {
+				propTween.end = propTween.start;
+				propTween.start = 0;
+			}
+		}
+	}
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( Array.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// Not quite $.extend, this won't overwrite existing keys.
+			// Reusing 'index' because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = Animation.prefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+
+			// Don't match elem in the :animated selector
+			delete tick.elem;
+		} ),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+
+				// Support: Android 2.3 only
+				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ] );
+
+			// If there's more to do, yield
+			if ( percent < 1 && length ) {
+				return remaining;
+			}
+
+			// If this was an empty animation, synthesize a final progress notification
+			if ( !length ) {
+				deferred.notifyWith( elem, [ animation, 1, 0 ] );
+			}
+
+			// Resolve the animation and report its conclusion
+			deferred.resolveWith( elem, [ animation ] );
+			return false;
+		},
+		animation = deferred.promise( {
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, {
+				specialEasing: {},
+				easing: jQuery.easing._default
+			}, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+
+					// If we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// Resolve when we played the last frame; otherwise, reject
+				if ( gotoEnd ) {
+					deferred.notifyWith( elem, [ animation, 1, 0 ] );
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		} ),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length; index++ ) {
+		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			if ( isFunction( result.stop ) ) {
+				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
+					result.stop.bind( result );
+			}
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	// Attach callbacks from options
+	animation
+		.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		} )
+	);
+
+	return animation;
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweeners: {
+		"*": [ function( prop, value ) {
+			var tween = this.createTween( prop, value );
+			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
+			return tween;
+		} ]
+	},
+
+	tweener: function( props, callback ) {
+		if ( isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.match( rnothtmlwhite );
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length; index++ ) {
+			prop = props[ index ];
+			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
+			Animation.tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilters: [ defaultPrefilter ],
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			Animation.prefilters.unshift( callback );
+		} else {
+			Animation.prefilters.push( callback );
+		}
+	}
+} );
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !isFunction( easing ) && easing
+	};
+
+	// Go to the end state if fx are off
+	if ( jQuery.fx.off ) {
+		opt.duration = 0;
+
+	} else {
+		if ( typeof opt.duration !== "number" ) {
+			if ( opt.duration in jQuery.fx.speeds ) {
+				opt.duration = jQuery.fx.speeds[ opt.duration ];
+
+			} else {
+				opt.duration = jQuery.fx.speeds._default;
+			}
+		}
+	}
+
+	// Normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.fn.extend( {
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// Show any hidden elements after setting opacity to 0
+		return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show()
+
+			// Animate to the value specified
+			.end().animate( { opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations, or finishing resolves immediately
+				if ( empty || dataPriv.get( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each( function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = dataPriv.get( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this &&
+					( type == null || timers[ index ].queue === type ) ) {
+
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// Start the next in the queue if the last step wasn't forced.
+			// Timers currently will call their complete callbacks, which
+			// will dequeue but only if they were gotoEnd.
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		} );
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each( function() {
+			var index,
+				data = dataPriv.get( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// Enable finishing flag on private data
+			data.finish = true;
+
+			// Empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
+			}
+
+			// Look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// Look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// Turn off finishing flag
+			delete data.finish;
+		} );
+	}
+} );
+
+jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+} );
+
+// Generate shortcuts for custom animations
+jQuery.each( {
+	slideDown: genFx( "show" ),
+	slideUp: genFx( "hide" ),
+	slideToggle: genFx( "toggle" ),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+} );
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+	var timer,
+		i = 0,
+		timers = jQuery.timers;
+
+	fxNow = Date.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+
+		// Run the timer and safely remove it when done (allowing for external removal)
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	jQuery.timers.push( timer );
+	jQuery.fx.start();
+};
+
+jQuery.fx.interval = 13;
+jQuery.fx.start = function() {
+	if ( inProgress ) {
+		return;
+	}
+
+	inProgress = true;
+	schedule();
+};
+
+jQuery.fx.stop = function() {
+	inProgress = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+
+	// Default speed
+	_default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+	type = type || "fx";
+
+	return this.queue( type, function( next, hooks ) {
+		var timeout = window.setTimeout( next, time );
+		hooks.stop = function() {
+			window.clearTimeout( timeout );
+		};
+	} );
+};
+
+
+( function() {
+	var input = document.createElement( "input" ),
+		select = document.createElement( "select" ),
+		opt = select.appendChild( document.createElement( "option" ) );
+
+	input.type = "checkbox";
+
+	// Support: Android <=4.3 only
+	// Default value for a checkbox should be "on"
+	support.checkOn = input.value !== "";
+
+	// Support: IE <=11 only
+	// Must access selectedIndex to make default options select
+	support.optSelected = opt.selected;
+
+	// Support: IE <=11 only
+	// An input loses its value after becoming a radio
+	input = document.createElement( "input" );
+	input.value = "t";
+	input.type = "radio";
+	support.radioValue = input.value === "t";
+} )();
+
+
+var boolHook,
+	attrHandle = jQuery.expr.attrHandle;
+
+jQuery.fn.extend( {
+	attr: function( name, value ) {
+		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each( function() {
+			jQuery.removeAttr( this, name );
+		} );
+	}
+} );
+
+jQuery.extend( {
+	attr: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set attributes on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// Attribute hooks are determined by the lowercase version
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
+		}
+
+		if ( value !== undefined ) {
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
+			}
+
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			elem.setAttribute( name, value + "" );
+			return value;
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		ret = jQuery.find.attr( elem, name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return ret == null ? undefined : ret;
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !support.radioValue && value === "radio" &&
+					nodeName( elem, "input" ) ) {
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name,
+			i = 0,
+
+			// Attribute names can contain non-HTML whitespace characters
+			// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+			attrNames = value && value.match( rnothtmlwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( ( name = attrNames[ i++ ] ) ) {
+				elem.removeAttribute( name );
+			}
+		}
+	}
+} );
+
+// Hooks for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			elem.setAttribute( name, name );
+		}
+		return name;
+	}
+};
+
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+	var getter = attrHandle[ name ] || jQuery.find.attr;
+
+	attrHandle[ name ] = function( elem, name, isXML ) {
+		var ret, handle,
+			lowercaseName = name.toLowerCase();
+
+		if ( !isXML ) {
+
+			// Avoid an infinite loop by temporarily removing this function from the getter
+			handle = attrHandle[ lowercaseName ];
+			attrHandle[ lowercaseName ] = ret;
+			ret = getter( elem, name, isXML ) != null ?
+				lowercaseName :
+				null;
+			attrHandle[ lowercaseName ] = handle;
+		}
+		return ret;
+	};
+} );
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button)$/i,
+	rclickable = /^(?:a|area)$/i;
+
+jQuery.fn.extend( {
+	prop: function( name, value ) {
+		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		return this.each( function() {
+			delete this[ jQuery.propFix[ name ] || name ];
+		} );
+	}
+} );
+
+jQuery.extend( {
+	prop: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set properties on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			return ( elem[ name ] = value );
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		return elem[ name ];
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+
+				// Support: IE <=9 - 11 only
+				// elem.tabIndex doesn't always return the
+				// correct value when it hasn't been explicitly set
+				// https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// Use proper attribute retrieval(#12072)
+				var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+				if ( tabindex ) {
+					return parseInt( tabindex, 10 );
+				}
+
+				if (
+					rfocusable.test( elem.nodeName ) ||
+					rclickable.test( elem.nodeName ) &&
+					elem.href
+				) {
+					return 0;
+				}
+
+				return -1;
+			}
+		}
+	},
+
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
+	}
+} );
+
+// Support: IE <=11 only
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
+// eslint rule "no-unused-expressions" is disabled for this code
+// since it considers such accessions noop
+if ( !support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+
+			/* eslint no-unused-expressions: "off" */
+
+			var parent = elem.parentNode;
+			if ( parent && parent.parentNode ) {
+				parent.parentNode.selectedIndex;
+			}
+			return null;
+		},
+		set: function( elem ) {
+
+			/* eslint no-unused-expressions: "off" */
+
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+	};
+}
+
+jQuery.each( [
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+} );
+
+
+
+
+	// Strip and collapse whitespace according to HTML spec
+	// https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace
+	function stripAndCollapse( value ) {
+		var tokens = value.match( rnothtmlwhite ) || [];
+		return tokens.join( " " );
+	}
+
+
+function getClass( elem ) {
+	return elem.getAttribute && elem.getAttribute( "class" ) || "";
+}
+
+function classesToArray( value ) {
+	if ( Array.isArray( value ) ) {
+		return value;
+	}
+	if ( typeof value === "string" ) {
+		return value.match( rnothtmlwhite ) || [];
+	}
+	return [];
+}
+
+jQuery.fn.extend( {
+	addClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		classes = classesToArray( value );
+
+		if ( classes.length ) {
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = stripAndCollapse( cur );
+					if ( curValue !== finalValue ) {
+						elem.setAttribute( "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( !arguments.length ) {
+			return this.attr( "class", "" );
+		}
+
+		classes = classesToArray( value );
+
+		if ( classes.length ) {
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = stripAndCollapse( cur );
+					if ( curValue !== finalValue ) {
+						elem.setAttribute( "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isValidValue = type === "string" || Array.isArray( value );
+
+		if ( typeof stateVal === "boolean" && isValidValue ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
+
+		if ( isFunction( value ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).toggleClass(
+					value.call( this, i, getClass( this ), stateVal ),
+					stateVal
+				);
+			} );
+		}
+
+		return this.each( function() {
+			var className, i, self, classNames;
+
+			if ( isValidValue ) {
+
+				// Toggle individual class names
+				i = 0;
+				self = jQuery( this );
+				classNames = classesToArray( value );
+
+				while ( ( className = classNames[ i++ ] ) ) {
+
+					// Check each className given, space separated list
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
+				}
+
+			// Toggle whole class name
+			} else if ( value === undefined || type === "boolean" ) {
+				className = getClass( this );
+				if ( className ) {
+
+					// Store className if set
+					dataPriv.set( this, "__className__", className );
+				}
+
+				// If the element has a class name or if we're passed `false`,
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				if ( this.setAttribute ) {
+					this.setAttribute( "class",
+						className || value === false ?
+						"" :
+						dataPriv.get( this, "__className__" ) || ""
+					);
+				}
+			}
+		} );
+	},
+
+	hasClass: function( selector ) {
+		var className, elem,
+			i = 0;
+
+		className = " " + selector + " ";
+		while ( ( elem = this[ i++ ] ) ) {
+			if ( elem.nodeType === 1 &&
+				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
+					return true;
+			}
+		}
+
+		return false;
+	}
+} );
+
+
+
+
+var rreturn = /\r/g;
+
+jQuery.fn.extend( {
+	val: function( value ) {
+		var hooks, ret, valueIsFunction,
+			elem = this[ 0 ];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] ||
+					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks &&
+					"get" in hooks &&
+					( ret = hooks.get( elem, "value" ) ) !== undefined
+				) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				// Handle most common string cases
+				if ( typeof ret === "string" ) {
+					return ret.replace( rreturn, "" );
+				}
+
+				// Handle cases where value is null/undef or number
+				return ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		valueIsFunction = isFunction( value );
+
+		return this.each( function( i ) {
+			var val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( valueIsFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+
+			} else if ( typeof val === "number" ) {
+				val += "";
+
+			} else if ( Array.isArray( val ) ) {
+				val = jQuery.map( val, function( value ) {
+					return value == null ? "" : value + "";
+				} );
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	valHooks: {
+		option: {
+			get: function( elem ) {
+
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+
+					// Support: IE <=10 - 11 only
+					// option.text throws exceptions (#14686, #14858)
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					stripAndCollapse( jQuery.text( elem ) );
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option, i,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one",
+					values = one ? null : [],
+					max = one ? index + 1 : options.length;
+
+				if ( index < 0 ) {
+					i = max;
+
+				} else {
+					i = one ? index : 0;
+				}
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// Support: IE <=9 only
+					// IE8-9 doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+
+							// Don't return options that are disabled or in a disabled optgroup
+							!option.disabled &&
+							( !option.parentNode.disabled ||
+								!nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+
+					/* eslint-disable no-cond-assign */
+
+					if ( option.selected =
+						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
+					) {
+						optionSet = true;
+					}
+
+					/* eslint-enable no-cond-assign */
+				}
+
+				// Force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	}
+} );
+
+// Radios and checkboxes getter/setter
+jQuery.each( [ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( Array.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+			}
+		}
+	};
+	if ( !support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+		};
+	}
+} );
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+support.focusin = "onfocusin" in window;
+
+
+var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	stopPropagationCallback = function( e ) {
+		e.stopPropagation();
+	};
+
+jQuery.extend( jQuery.event, {
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+
+		var i, cur, tmp, bubbleType, ontype, handle, special, lastElement,
+			eventPath = [ elem || document ],
+			type = hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
+
+		cur = lastElement = tmp = elem = elem || document;
+
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf( "." ) > -1 ) {
+
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split( "." );
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf( ":" ) < 0 && "on" + type;
+
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
+
+		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+		event.isTrigger = onlyHandlers ? 2 : 3;
+		event.namespace = namespaces.join( "." );
+		event.rnamespace = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
+			null;
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push( cur );
+				tmp = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === ( elem.ownerDocument || document ) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+			}
+		}
+
+		// Fire handlers on the event path
+		i = 0;
+		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
+			lastElement = cur;
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
+
+			// jQuery handler
+			handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
+				dataPriv.get( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && handle.apply && acceptData( cur ) ) {
+				event.result = handle.apply( cur, data );
+				if ( event.result === false ) {
+					event.preventDefault();
+				}
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( ( !special._default ||
+				special._default.apply( eventPath.pop(), data ) === false ) &&
+				acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name as the event.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && isFunction( elem[ type ] ) && !isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
+
+					if ( tmp ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+
+					if ( event.isPropagationStopped() ) {
+						lastElement.addEventListener( type, stopPropagationCallback );
+					}
+
+					elem[ type ]();
+
+					if ( event.isPropagationStopped() ) {
+						lastElement.removeEventListener( type, stopPropagationCallback );
+					}
+
+					jQuery.event.triggered = undefined;
+
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	// Piggyback on a donor event to simulate a different one
+	// Used only for `focus(in | out)` events
+	simulate: function( type, elem, event ) {
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{
+				type: type,
+				isSimulated: true
+			}
+		);
+
+		jQuery.event.trigger( e, null, elem );
+	}
+
+} );
+
+jQuery.fn.extend( {
+
+	trigger: function( type, data ) {
+		return this.each( function() {
+			jQuery.event.trigger( type, data, this );
+		} );
+	},
+	triggerHandler: function( type, data ) {
+		var elem = this[ 0 ];
+		if ( elem ) {
+			return jQuery.event.trigger( type, data, elem, true );
+		}
+	}
+} );
+
+
+// Support: Firefox <=44
+// Firefox doesn't have focus(in | out) events
+// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+//
+// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
+// focus(in | out) events fire after focus & blur events,
+// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
+if ( !support.focusin ) {
+	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
+		};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				var doc = this.ownerDocument || this,
+					attaches = dataPriv.access( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
+				}
+				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
+			},
+			teardown: function() {
+				var doc = this.ownerDocument || this,
+					attaches = dataPriv.access( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					dataPriv.remove( doc, fix );
+
+				} else {
+					dataPriv.access( doc, fix, attaches );
+				}
+			}
+		};
+	} );
+}
+var location = window.location;
+
+var nonce = Date.now();
+
+var rquery = ( /\?/ );
+
+
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+	var xml;
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+
+	// Support: IE 9 - 11 only
+	// IE throws on parseFromString with invalid input.
+	try {
+		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
+	} catch ( e ) {
+		xml = undefined;
+	}
+
+	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
+		jQuery.error( "Invalid XML: " + data );
+	}
+	return xml;
+};
+
+
+var
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( Array.isArray( obj ) ) {
+
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams(
+					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+					v,
+					traditional,
+					add
+				);
+			}
+		} );
+
+	} else if ( !traditional && toType( obj ) === "object" ) {
+
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, valueOrFunction ) {
+
+			// If value is a function, invoke it and use its return value
+			var value = isFunction( valueOrFunction ) ?
+				valueOrFunction() :
+				valueOrFunction;
+
+			s[ s.length ] = encodeURIComponent( key ) + "=" +
+				encodeURIComponent( value == null ? "" : value );
+		};
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		} );
+
+	} else {
+
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" );
+};
+
+jQuery.fn.extend( {
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map( function() {
+
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		} )
+		.filter( function() {
+			var type = this.type;
+
+			// Use .is( ":disabled" ) so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		} )
+		.map( function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			if ( val == null ) {
+				return null;
+			}
+
+			if ( Array.isArray( val ) ) {
+				return jQuery.map( val, function( val ) {
+					return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+				} );
+			}
+
+			return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		} ).get();
+	}
+} );
+
+
+var
+	r20 = /%20/g,
+	rhash = /#.*$/,
+	rantiCache = /([?&])_=[^&]*/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
+
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = "*/".concat( "*" ),
+
+	// Anchor tag for parsing the document origin
+	originAnchor = document.createElement( "a" );
+	originAnchor.href = location.href;
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType,
+			i = 0,
+			dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || [];
+
+		if ( isFunction( func ) ) {
+
+			// For each dataType in the dataTypeExpression
+			while ( ( dataType = dataTypes[ i++ ] ) ) {
+
+				// Prepend if requested
+				if ( dataType[ 0 ] === "+" ) {
+					dataType = dataType.slice( 1 ) || "*";
+					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
+
+				// Otherwise append
+				} else {
+					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
+				}
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+	var inspected = {},
+		seekingTransport = ( structure === transports );
+
+	function inspect( dataType ) {
+		var selected;
+		inspected[ dataType ] = true;
+		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+			if ( typeof dataTypeOrTransport === "string" &&
+				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+
+				options.dataTypes.unshift( dataTypeOrTransport );
+				inspect( dataTypeOrTransport );
+				return false;
+			} else if ( seekingTransport ) {
+				return !( selected = dataTypeOrTransport );
+			}
+		} );
+		return selected;
+	}
+
+	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var key, deep,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+
+	return target;
+}
+
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var ct, type, finalDataType, firstDataType,
+		contents = s.contents,
+		dataTypes = s.dataTypes;
+
+	// Remove auto dataType and get content-type in the process
+	while ( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+	var conv2, current, conv, tmp, prev,
+		converters = {},
+
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice();
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	current = dataTypes.shift();
+
+	// Convert to each sequential dataType
+	while ( current ) {
+
+		if ( s.responseFields[ current ] ) {
+			jqXHR[ s.responseFields[ current ] ] = response;
+		}
+
+		// Apply the dataFilter if provided
+		if ( !prev && isSuccess && s.dataFilter ) {
+			response = s.dataFilter( response, s.dataType );
+		}
+
+		prev = current;
+		current = dataTypes.shift();
+
+		if ( current ) {
+
+			// There's only work to do if current dataType is non-auto
+			if ( current === "*" ) {
+
+				current = prev;
+
+			// Convert response if prev dataType is non-auto and differs from current
+			} else if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split( " " );
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.unshift( tmp[ 1 ] );
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s.throws ) {
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return {
+								state: "parsererror",
+								error: conv ? e : "No conversion from " + prev + " to " + current
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return { state: "success", data: response };
+}
+
+jQuery.extend( {
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajaxSettings: {
+		url: location.href,
+		type: "GET",
+		isLocal: rlocalProtocol.test( location.protocol ),
+		global: true,
+		processData: true,
+		async: true,
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			"*": allTypes,
+			text: "text/plain",
+			html: "text/html",
+			xml: "application/xml, text/xml",
+			json: "application/json, text/javascript"
+		},
+
+		contents: {
+			xml: /\bxml\b/,
+			html: /\bhtml/,
+			json: /\bjson\b/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText",
+			json: "responseJSON"
+		},
+
+		// Data converters
+		// Keys separate source (or catchall "*") and destination types with a single space
+		converters: {
+
+			// Convert anything to text
+			"* text": String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": JSON.parse,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			url: true,
+			context: true
+		}
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		return settings ?
+
+			// Building a settings object
+			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+			// Extending ajaxSettings
+			ajaxExtend( jQuery.ajaxSettings, target );
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var transport,
+
+			// URL without anti-cache param
+			cacheURL,
+
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+
+			// timeout handle
+			timeoutTimer,
+
+			// Url cleanup var
+			urlAnchor,
+
+			// Request state (becomes false upon send and true upon completion)
+			completed,
+
+			// To know if global events are to be dispatched
+			fireGlobals,
+
+			// Loop variable
+			i,
+
+			// uncached part of the url
+			uncached,
+
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+
+			// Callbacks context
+			callbackContext = s.context || s,
+
+			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+			globalEventContext = s.context &&
+				( callbackContext.nodeType || callbackContext.jquery ) ?
+					jQuery( callbackContext ) :
+					jQuery.event,
+
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks( "once memory" ),
+
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+
+			// Default abort message
+			strAbort = "canceled",
+
+			// Fake xhr
+			jqXHR = {
+				readyState: 0,
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( completed ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match == null ? null : match;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return completed ? responseHeadersString : null;
+				},
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( completed == null ) {
+						name = requestHeadersNames[ name.toLowerCase() ] =
+							requestHeadersNames[ name.toLowerCase() ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( completed == null ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Status-dependent callbacks
+				statusCode: function( map ) {
+					var code;
+					if ( map ) {
+						if ( completed ) {
+
+							// Execute the appropriate callbacks
+							jqXHR.always( map[ jqXHR.status ] );
+						} else {
+
+							// Lazy-add the new callbacks in a way that preserves old ones
+							for ( code in map ) {
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
+						}
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					var finalText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( finalText );
+					}
+					done( 0, finalText );
+					return this;
+				}
+			};
+
+		// Attach deferreds
+		deferred.promise( jqXHR );
+
+		// Add protocol if not provided (prefilters might expect it)
+		// Handle falsy url in the settings object (#10093: consistency with old signature)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url || location.href ) + "" )
+			.replace( rprotocol, location.protocol + "//" );
+
+		// Alias method option to type as per ticket #12004
+		s.type = options.method || options.type || s.method || s.type;
+
+		// Extract dataTypes list
+		s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ];
+
+		// A cross-domain request is in order when the origin doesn't match the current origin.
+		if ( s.crossDomain == null ) {
+			urlAnchor = document.createElement( "a" );
+
+			// Support: IE <=8 - 11, Edge 12 - 15
+			// IE throws exception on accessing the href property if url is malformed,
+			// e.g. http://example.com:80x/
+			try {
+				urlAnchor.href = s.url;
+
+				// Support: IE <=8 - 11 only
+				// Anchor's host property isn't correctly set when s.url is relative
+				urlAnchor.href = urlAnchor.href;
+				s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
+					urlAnchor.protocol + "//" + urlAnchor.host;
+			} catch ( e ) {
+
+				// If there is an error parsing the URL, assume it is crossDomain,
+				// it can be rejected by the transport if it is invalid
+				s.crossDomain = true;
+			}
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( completed ) {
+			return jqXHR;
+		}
+
+		// We can fire global events as of now if asked to
+		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+		fireGlobals = jQuery.event && s.global;
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Save the URL in case we're toying with the If-Modified-Since
+		// and/or If-None-Match header later on
+		// Remove hash to simplify url manipulation
+		cacheURL = s.url.replace( rhash, "" );
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// Remember the hash so we can put it back
+			uncached = s.url.slice( cacheURL.length );
+
+			// If data is available and should be processed, append data to url
+			if ( s.data && ( s.processData || typeof s.data === "string" ) ) {
+				cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data;
+
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Add or update anti-cache param if needed
+			if ( s.cache === false ) {
+				cacheURL = cacheURL.replace( rantiCache, "$1" );
+				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
+			}
+
+			// Put hash and anti-cache on the URL that will be requested (gh-1732)
+			s.url = cacheURL + uncached;
+
+		// Change '%20' to '+' if this is encoded form body content (gh-2658)
+		} else if ( s.data && s.processData &&
+			( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) {
+			s.data = s.data.replace( r20, "+" );
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			if ( jQuery.lastModified[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+			}
+			if ( jQuery.etag[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+				s.accepts[ s.dataTypes[ 0 ] ] +
+					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend &&
+			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) {
+
+			// Abort if not done already and return
+			return jqXHR.abort();
+		}
+
+		// Aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		completeDeferred.add( s.complete );
+		jqXHR.done( s.success );
+		jqXHR.fail( s.error );
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+
+			// If request was aborted inside ajaxSend, stop there
+			if ( completed ) {
+				return jqXHR;
+			}
+
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = window.setTimeout( function() {
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				completed = false;
+				transport.send( requestHeaders, done );
+			} catch ( e ) {
+
+				// Rethrow post-completion exceptions
+				if ( completed ) {
+					throw e;
+				}
+
+				// Propagate others as results
+				done( -1, e );
+			}
+		}
+
+		// Callback for when everything is done
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Ignore repeat invocations
+			if ( completed ) {
+				return;
+			}
+
+			completed = true;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				window.clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Determine if successful
+			isSuccess = status >= 200 && status < 300 || status === 304;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// Convert no matter what (that way responseXXX fields are always set)
+			response = ajaxConvert( s, response, jqXHR, isSuccess );
+
+			// If successful, handle type chaining
+			if ( isSuccess ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					modified = jqXHR.getResponseHeader( "Last-Modified" );
+					if ( modified ) {
+						jQuery.lastModified[ cacheURL ] = modified;
+					}
+					modified = jqXHR.getResponseHeader( "etag" );
+					if ( modified ) {
+						jQuery.etag[ cacheURL ] = modified;
+					}
+				}
+
+				// if no content
+				if ( status === 204 || s.type === "HEAD" ) {
+					statusText = "nocontent";
+
+				// if not modified
+				} else if ( status === 304 ) {
+					statusText = "notmodified";
+
+				// If we have data, let's convert it
+				} else {
+					statusText = response.state;
+					success = response.data;
+					error = response.error;
+					isSuccess = !error;
+				}
+			} else {
+
+				// Extract error from statusText and normalize for non-aborts
+				error = statusText;
+				if ( status || !statusText ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+					[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	}
+} );
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+
+		// Shift arguments if data argument was omitted
+		if ( isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		// The url can be an options object (which then must have .url)
+		return jQuery.ajax( jQuery.extend( {
+			url: url,
+			type: method,
+			dataType: type,
+			data: data,
+			success: callback
+		}, jQuery.isPlainObject( url ) && url ) );
+	};
+} );
+
+
+jQuery._evalUrl = function( url ) {
+	return jQuery.ajax( {
+		url: url,
+
+		// Make this explicit, since user can override this through ajaxSetup (#11264)
+		type: "GET",
+		dataType: "script",
+		cache: true,
+		async: false,
+		global: false,
+		"throws": true
+	} );
+};
+
+
+jQuery.fn.extend( {
+	wrapAll: function( html ) {
+		var wrap;
+
+		if ( this[ 0 ] ) {
+			if ( isFunction( html ) ) {
+				html = html.call( this[ 0 ] );
+			}
+
+			// The elements to wrap the target around
+			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+
+			if ( this[ 0 ].parentNode ) {
+				wrap.insertBefore( this[ 0 ] );
+			}
+
+			wrap.map( function() {
+				var elem = this;
+
+				while ( elem.firstElementChild ) {
+					elem = elem.firstElementChild;
+				}
+
+				return elem;
+			} ).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( isFunction( html ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).wrapInner( html.call( this, i ) );
+			} );
+		}
+
+		return this.each( function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		} );
+	},
+
+	wrap: function( html ) {
+		var htmlIsFunction = isFunction( html );
+
+		return this.each( function( i ) {
+			jQuery( this ).wrapAll( htmlIsFunction ? html.call( this, i ) : html );
+		} );
+	},
+
+	unwrap: function( selector ) {
+		this.parent( selector ).not( "body" ).each( function() {
+			jQuery( this ).replaceWith( this.childNodes );
+		} );
+		return this;
+	}
+} );
+
+
+jQuery.expr.pseudos.hidden = function( elem ) {
+	return !jQuery.expr.pseudos.visible( elem );
+};
+jQuery.expr.pseudos.visible = function( elem ) {
+	return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
+};
+
+
+
+
+jQuery.ajaxSettings.xhr = function() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch ( e ) {}
+};
+
+var xhrSuccessStatus = {
+
+		// File protocol always yields status code 0, assume 200
+		0: 200,
+
+		// Support: IE <=9 only
+		// #1450: sometimes IE returns 1223 when it should be 204
+		1223: 204
+	},
+	xhrSupported = jQuery.ajaxSettings.xhr();
+
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+support.ajax = xhrSupported = !!xhrSupported;
+
+jQuery.ajaxTransport( function( options ) {
+	var callback, errorCallback;
+
+	// Cross domain only allowed if supported through XMLHttpRequest
+	if ( support.cors || xhrSupported && !options.crossDomain ) {
+		return {
+			send: function( headers, complete ) {
+				var i,
+					xhr = options.xhr();
+
+				xhr.open(
+					options.type,
+					options.url,
+					options.async,
+					options.username,
+					options.password
+				);
+
+				// Apply custom fields if provided
+				if ( options.xhrFields ) {
+					for ( i in options.xhrFields ) {
+						xhr[ i ] = options.xhrFields[ i ];
+					}
+				}
+
+				// Override mime type if needed
+				if ( options.mimeType && xhr.overrideMimeType ) {
+					xhr.overrideMimeType( options.mimeType );
+				}
+
+				// X-Requested-With header
+				// For cross-domain requests, seeing as conditions for a preflight are
+				// akin to a jigsaw puzzle, we simply never set it to be sure.
+				// (it can always be set on a per-request basis or even using ajaxSetup)
+				// For same-domain requests, won't change header if already provided.
+				if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
+					headers[ "X-Requested-With" ] = "XMLHttpRequest";
+				}
+
+				// Set headers
+				for ( i in headers ) {
+					xhr.setRequestHeader( i, headers[ i ] );
+				}
+
+				// Callback
+				callback = function( type ) {
+					return function() {
+						if ( callback ) {
+							callback = errorCallback = xhr.onload =
+								xhr.onerror = xhr.onabort = xhr.ontimeout =
+									xhr.onreadystatechange = null;
+
+							if ( type === "abort" ) {
+								xhr.abort();
+							} else if ( type === "error" ) {
+
+								// Support: IE <=9 only
+								// On a manual native abort, IE9 throws
+								// errors on any property access that is not readyState
+								if ( typeof xhr.status !== "number" ) {
+									complete( 0, "error" );
+								} else {
+									complete(
+
+										// File: protocol always yields status 0; see #8605, #14207
+										xhr.status,
+										xhr.statusText
+									);
+								}
+							} else {
+								complete(
+									xhrSuccessStatus[ xhr.status ] || xhr.status,
+									xhr.statusText,
+
+									// Support: IE <=9 only
+									// IE9 has no XHR2 but throws on binary (trac-11426)
+									// For XHR2 non-text, let the caller handle it (gh-2498)
+									( xhr.responseType || "text" ) !== "text"  ||
+									typeof xhr.responseText !== "string" ?
+										{ binary: xhr.response } :
+										{ text: xhr.responseText },
+									xhr.getAllResponseHeaders()
+								);
+							}
+						}
+					};
+				};
+
+				// Listen to events
+				xhr.onload = callback();
+				errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" );
+
+				// Support: IE 9 only
+				// Use onreadystatechange to replace onabort
+				// to handle uncaught aborts
+				if ( xhr.onabort !== undefined ) {
+					xhr.onabort = errorCallback;
+				} else {
+					xhr.onreadystatechange = function() {
+
+						// Check readyState before timeout as it changes
+						if ( xhr.readyState === 4 ) {
+
+							// Allow onerror to be called first,
+							// but that will not handle a native abort
+							// Also, save errorCallback to a variable
+							// as xhr.onerror cannot be accessed
+							window.setTimeout( function() {
+								if ( callback ) {
+									errorCallback();
+								}
+							} );
+						}
+					};
+				}
+
+				// Create the abort callback
+				callback = callback( "abort" );
+
+				try {
+
+					// Do send the request (this may raise an exception)
+					xhr.send( options.hasContent && options.data || null );
+				} catch ( e ) {
+
+					// #14683: Only rethrow if this hasn't been notified as an error yet
+					if ( callback ) {
+						throw e;
+					}
+				}
+			},
+
+			abort: function() {
+				if ( callback ) {
+					callback();
+				}
+			}
+		};
+	}
+} );
+
+
+
+
+// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
+jQuery.ajaxPrefilter( function( s ) {
+	if ( s.crossDomain ) {
+		s.contents.script = false;
+	}
+} );
+
+// Install script dataType
+jQuery.ajaxSetup( {
+	accepts: {
+		script: "text/javascript, application/javascript, " +
+			"application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /\b(?:java|ecma)script\b/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+} );
+
+// Handle cache's special case and crossDomain
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+	}
+} );
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function( s ) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+		var script, callback;
+		return {
+			send: function( _, complete ) {
+				script = jQuery( "<script>" ).prop( {
+					charset: s.scriptCharset,
+					src: s.url
+				} ).on(
+					"load error",
+					callback = function( evt ) {
+						script.remove();
+						callback = null;
+						if ( evt ) {
+							complete( evt.type === "error" ? 404 : 200, evt.type );
+						}
+					}
+				);
+
+				// Use native DOM manipulation to avoid our domManip AJAX trickery
+				document.head.appendChild( script[ 0 ] );
+			},
+			abort: function() {
+				if ( callback ) {
+					callback();
+				}
+			}
+		};
+	}
+} );
+
+
+
+
+var oldCallbacks = [],
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup( {
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		this[ callback ] = true;
+		return callback;
+	}
+} );
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+			"url" :
+			typeof s.data === "string" &&
+				( s.contentType || "" )
+					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
+				rjsonp.test( s.data ) && "data"
+		);
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+
+		// Insert callback into url or form data
+		if ( jsonProp ) {
+			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+		} else if ( s.jsonp !== false ) {
+			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters[ "script json" ] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// Force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		overwritten = window[ callbackName ];
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always( function() {
+
+			// If previous value didn't exist - remove it
+			if ( overwritten === undefined ) {
+				jQuery( window ).removeProp( callbackName );
+
+			// Otherwise restore preexisting value
+			} else {
+				window[ callbackName ] = overwritten;
+			}
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+
+				// Make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// Save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		} );
+
+		// Delegate to script
+		return "script";
+	}
+} );
+
+
+
+
+// Support: Safari 8 only
+// In Safari 8 documents created via document.implementation.createHTMLDocument
+// collapse sibling forms: the second one becomes a child of the first one.
+// Because of that, this security measure has to be disabled in Safari 8.
+// https://bugs.webkit.org/show_bug.cgi?id=137337
+support.createHTMLDocument = ( function() {
+	var body = document.implementation.createHTMLDocument( "" ).body;
+	body.innerHTML = "<form></form><form></form>";
+	return body.childNodes.length === 2;
+} )();
+
+
+// Argument "data" should be string of html
+// context (optional): If specified, the fragment will be created in this context,
+// defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+	if ( typeof data !== "string" ) {
+		return [];
+	}
+	if ( typeof context === "boolean" ) {
+		keepScripts = context;
+		context = false;
+	}
+
+	var base, parsed, scripts;
+
+	if ( !context ) {
+
+		// Stop scripts or inline event handlers from being executed immediately
+		// by using document.implementation
+		if ( support.createHTMLDocument ) {
+			context = document.implementation.createHTMLDocument( "" );
+
+			// Set the base href for the created document
+			// so any parsed elements with URLs
+			// are based on the document's URL (gh-2965)
+			base = context.createElement( "base" );
+			base.href = document.location.href;
+			context.head.appendChild( base );
+		} else {
+			context = document;
+		}
+	}
+
+	parsed = rsingleTag.exec( data );
+	scripts = !keepScripts && [];
+
+	// Single tag
+	if ( parsed ) {
+		return [ context.createElement( parsed[ 1 ] ) ];
+	}
+
+	parsed = buildFragment( [ data ], context, scripts );
+
+	if ( scripts && scripts.length ) {
+		jQuery( scripts ).remove();
+	}
+
+	return jQuery.merge( [], parsed.childNodes );
+};
+
+
+/**
+ * Load a url into a page
+ */
+jQuery.fn.load = function( url, params, callback ) {
+	var selector, type, response,
+		self = this,
+		off = url.indexOf( " " );
+
+	if ( off > -1 ) {
+		selector = stripAndCollapse( url.slice( off ) );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax( {
+			url: url,
+
+			// If "type" variable is undefined, then "GET" method will be used.
+			// Make value of this field explicit since
+			// user can override it through ajaxSetup method
+			type: type || "GET",
+			dataType: "html",
+			data: params
+		} ).done( function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		// If the request succeeds, this function gets "data", "status", "jqXHR"
+		// but they are ignored because response was set above.
+		// If it fails, this function gets "jqXHR", "status", "error"
+		} ).always( callback && function( jqXHR, status ) {
+			self.each( function() {
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
+			} );
+		} );
+	}
+
+	return this;
+};
+
+
+
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [
+	"ajaxStart",
+	"ajaxStop",
+	"ajaxComplete",
+	"ajaxError",
+	"ajaxSuccess",
+	"ajaxSend"
+], function( i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
+	};
+} );
+
+
+
+
+jQuery.expr.pseudos.animated = function( elem ) {
+	return jQuery.grep( jQuery.timers, function( fn ) {
+		return elem === fn.elem;
+	} ).length;
+};
+
+
+
+
+jQuery.offset = {
+	setOffset: function( elem, options, i ) {
+		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+			position = jQuery.css( elem, "position" ),
+			curElem = jQuery( elem ),
+			props = {};
+
+		// Set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		curOffset = curElem.offset();
+		curCSSTop = jQuery.css( elem, "top" );
+		curCSSLeft = jQuery.css( elem, "left" );
+		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+			( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1;
+
+		// Need to be able to calculate position if either
+		// top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( isFunction( options ) ) {
+
+			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
+			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+jQuery.fn.extend( {
+
+	// offset() relates an element's border box to the document origin
+	offset: function( options ) {
+
+		// Preserve chaining for setter
+		if ( arguments.length ) {
+			return options === undefined ?
+				this :
+				this.each( function( i ) {
+					jQuery.offset.setOffset( this, options, i );
+				} );
+		}
+
+		var rect, win,
+			elem = this[ 0 ];
+
+		if ( !elem ) {
+			return;
+		}
+
+		// Return zeros for disconnected and hidden (display: none) elements (gh-2310)
+		// Support: IE <=11 only
+		// Running getBoundingClientRect on a
+		// disconnected node in IE throws an error
+		if ( !elem.getClientRects().length ) {
+			return { top: 0, left: 0 };
+		}
+
+		// Get document-relative position by adding viewport scroll to viewport-relative gBCR
+		rect = elem.getBoundingClientRect();
+		win = elem.ownerDocument.defaultView;
+		return {
+			top: rect.top + win.pageYOffset,
+			left: rect.left + win.pageXOffset
+		};
+	},
+
+	// position() relates an element's margin box to its offset parent's padding box
+	// This corresponds to the behavior of CSS absolute positioning
+	position: function() {
+		if ( !this[ 0 ] ) {
+			return;
+		}
+
+		var offsetParent, offset, doc,
+			elem = this[ 0 ],
+			parentOffset = { top: 0, left: 0 };
+
+		// position:fixed elements are offset from the viewport, which itself always has zero offset
+		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+
+			// Assume position:fixed implies availability of getBoundingClientRect
+			offset = elem.getBoundingClientRect();
+
+		} else {
+			offset = this.offset();
+
+			// Account for the *real* offset parent, which can be the document or its root element
+			// when a statically positioned element is identified
+			doc = elem.ownerDocument;
+			offsetParent = elem.offsetParent || doc.documentElement;
+			while ( offsetParent &&
+				( offsetParent === doc.body || offsetParent === doc.documentElement ) &&
+				jQuery.css( offsetParent, "position" ) === "static" ) {
+
+				offsetParent = offsetParent.parentNode;
+			}
+			if ( offsetParent && offsetParent !== elem && offsetParent.nodeType === 1 ) {
+
+				// Incorporate borders into its offset, since they are outside its content origin
+				parentOffset = jQuery( offsetParent ).offset();
+				parentOffset.top += jQuery.css( offsetParent, "borderTopWidth", true );
+				parentOffset.left += jQuery.css( offsetParent, "borderLeftWidth", true );
+			}
+		}
+
+		// Subtract parent offsets and element margins
+		return {
+			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
+		};
+	},
+
+	// This method will return documentElement in the following cases:
+	// 1) For the element inside the iframe without offsetParent, this method will return
+	//    documentElement of the parent window
+	// 2) For the hidden or detached element
+	// 3) For body or html element, i.e. in case of the html node - it will return itself
+	//
+	// but those exceptions were never presented as a real life use-cases
+	// and might be considered as more preferable results.
+	//
+	// This logic, however, is not guaranteed and can change at any point in the future
+	offsetParent: function() {
+		return this.map( function() {
+			var offsetParent = this.offsetParent;
+
+			while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+
+			return offsetParent || documentElement;
+		} );
+	}
+} );
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+	var top = "pageYOffset" === prop;
+
+	jQuery.fn[ method ] = function( val ) {
+		return access( this, function( elem, method, val ) {
+
+			// Coalesce documents and windows
+			var win;
+			if ( isWindow( elem ) ) {
+				win = elem;
+			} else if ( elem.nodeType === 9 ) {
+				win = elem.defaultView;
+			}
+
+			if ( val === undefined ) {
+				return win ? win[ prop ] : elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : win.pageXOffset,
+					top ? val : win.pageYOffset
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length );
+	};
+} );
+
+// Support: Safari <=7 - 9.1, Chrome <=37 - 49
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
+// getComputedStyle returns percent when specified for top/left/bottom/right;
+// rather than make the css module depend on the offset module, just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+		function( elem, computed ) {
+			if ( computed ) {
+				computed = curCSS( elem, prop );
+
+				// If curCSS returns percentage, fallback to offset
+				return rnumnonpx.test( computed ) ?
+					jQuery( elem ).position()[ prop ] + "px" :
+					computed;
+			}
+		}
+	);
+} );
+
+
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
+		function( defaultExtra, funcName ) {
+
+		// Margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+			return access( this, function( elem, type, value ) {
+				var doc;
+
+				if ( isWindow( elem ) ) {
+
+					// $( window ).outerWidth/Height return w/h including scrollbars (gh-1729)
+					return funcName.indexOf( "outer" ) === 0 ?
+						elem[ "inner" + name ] :
+						elem.document.documentElement[ "client" + name ];
+				}
+
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
+
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
+					// whichever is greatest
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
+
+				return value === undefined ?
+
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, extra ) :
+
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable );
+		};
+	} );
+} );
+
+
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
+	function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+} );
+
+jQuery.fn.extend( {
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+} );
+
+
+
+
+jQuery.fn.extend( {
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ?
+			this.off( selector, "**" ) :
+			this.off( types, selector || "**", fn );
+	}
+} );
+
+// Bind a function to a context, optionally partially applying any
+// arguments.
+// jQuery.proxy is deprecated to promote standards (specifically Function#bind)
+// However, it is not slated for removal any time soon
+jQuery.proxy = function( fn, context ) {
+	var tmp, args, proxy;
+
+	if ( typeof context === "string" ) {
+		tmp = fn[ context ];
+		context = fn;
+		fn = tmp;
+	}
+
+	// Quick check to determine if target is callable, in the spec
+	// this throws a TypeError, but we will just return undefined.
+	if ( !isFunction( fn ) ) {
+		return undefined;
+	}
+
+	// Simulated bind
+	args = slice.call( arguments, 2 );
+	proxy = function() {
+		return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+	};
+
+	// Set the guid of unique handler to the same of original handler, so it can be removed
+	proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+	return proxy;
+};
+
+jQuery.holdReady = function( hold ) {
+	if ( hold ) {
+		jQuery.readyWait++;
+	} else {
+		jQuery.ready( true );
+	}
+};
+jQuery.isArray = Array.isArray;
+jQuery.parseJSON = JSON.parse;
+jQuery.nodeName = nodeName;
+jQuery.isFunction = isFunction;
+jQuery.isWindow = isWindow;
+jQuery.camelCase = camelCase;
+jQuery.type = toType;
+
+jQuery.now = Date.now;
+
+jQuery.isNumeric = function( obj ) {
+
+	// As of jQuery 3.0, isNumeric is limited to
+	// strings and numbers (primitives or objects)
+	// that can be coerced to finite numbers (gh-2662)
+	var type = jQuery.type( obj );
+	return ( type === "number" || type === "string" ) &&
+
+		// parseFloat NaNs numeric-cast false positives ("")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		!isNaN( obj - parseFloat( obj ) );
+};
+
+
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+	define( "jquery", [], function() {
+		return jQuery;
+	} );
+}
+
+
+
+
+var
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+	if ( window.$ === jQuery ) {
+		window.$ = _$;
+	}
+
+	if ( deep && window.jQuery === jQuery ) {
+		window.jQuery = _jQuery;
+	}
+
+	return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in AMD
+// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( !noGlobal ) {
+	window.jQuery = window.$ = jQuery;
+}
+
+
+
+
+return jQuery;
+} );
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-migrate-3.0.1.js b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-migrate-3.0.1.js
new file mode 100644
index 00000000000..6c1d4ff282b
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-migrate-3.0.1.js
@@ -0,0 +1,628 @@
+/*!
+ * jQuery Migrate - v3.0.1 - 2017-09-26
+ * Copyright jQuery Foundation and other contributors
+ */
+;( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery" ], window, factory );
+	} else if ( typeof module === "object" && module.exports ) {
+
+		// Node/CommonJS
+		// eslint-disable-next-line no-undef
+		module.exports = factory( require( "jquery" ), window );
+	} else {
+
+		// Browser globals
+		factory( jQuery, window );
+	}
+} )( function( jQuery, window ) {
+"use strict";
+
+
+jQuery.migrateVersion = "3.0.1";
+
+jQuery.migrateMute = true;
+
+/* exported migrateWarn, migrateWarnFunc, migrateWarnProp */
+
+( function() {
+
+	var rbadVersions = /^[12]\./;
+
+	// Support: IE9 only
+	// IE9 only creates console object when dev tools are first opened
+	// IE9 console is a host object, callable but doesn't have .apply()
+	if ( !window.console || !window.console.log ) {
+		return;
+	}
+
+	// Need jQuery 3.0.0+ and no older Migrate loaded
+	if ( !jQuery || rbadVersions.test( jQuery.fn.jquery ) ) {
+		window.console.log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" );
+	}
+	if ( jQuery.migrateWarnings ) {
+		window.console.log( "JQMIGRATE: Migrate plugin loaded multiple times" );
+	}
+
+	// Show a message on the console so devs know we're active
+	window.console.log( "JQMIGRATE: Migrate is installed" +
+		( jQuery.migrateMute ? "" : " with logging active" ) +
+		", version " + jQuery.migrateVersion );
+
+} )();
+
+var warnedAbout = {};
+
+// List of warnings already given; public read only
+jQuery.migrateWarnings = [];
+
+// Set to false to disable traces that appear with warnings
+if ( jQuery.migrateTrace === undefined ) {
+	jQuery.migrateTrace = true;
+}
+
+// Forget any warnings we've already given; public
+jQuery.migrateReset = function() {
+	warnedAbout = {};
+	jQuery.migrateWarnings.length = 0;
+};
+
+function migrateWarn( msg ) {
+	var console = window.console;
+	if ( !warnedAbout[ msg ] ) {
+		warnedAbout[ msg ] = true;
+		jQuery.migrateWarnings.push( msg );
+		if ( console && console.warn && !jQuery.migrateMute ) {
+			console.warn( "JQMIGRATE: " + msg );
+			if ( jQuery.migrateTrace && console.trace ) {
+				console.trace();
+			}
+		}
+	}
+}
+
+function migrateWarnProp( obj, prop, value, msg ) {
+	Object.defineProperty( obj, prop, {
+		configurable: true,
+		enumerable: true,
+		get: function() {
+			migrateWarn( msg );
+			return value;
+		},
+		set: function( newValue ) {
+			migrateWarn( msg );
+			value = newValue;
+		}
+	} );
+}
+
+function migrateWarnFunc( obj, prop, newFunc, msg ) {
+	obj[ prop ] = function() {
+		migrateWarn( msg );
+		return newFunc.apply( this, arguments );
+	};
+}
+
+if ( window.document.compatMode === "BackCompat" ) {
+
+	// JQuery has never supported or tested Quirks Mode
+	migrateWarn( "jQuery is not compatible with Quirks Mode" );
+}
+
+
+var oldInit = jQuery.fn.init,
+	oldIsNumeric = jQuery.isNumeric,
+	oldFind = jQuery.find,
+	rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
+	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g;
+
+jQuery.fn.init = function( arg1 ) {
+	var args = Array.prototype.slice.call( arguments );
+
+	if ( typeof arg1 === "string" && arg1 === "#" ) {
+
+		// JQuery( "#" ) is a bogus ID selector, but it returned an empty set before jQuery 3.0
+		migrateWarn( "jQuery( '#' ) is not a valid selector" );
+		args[ 0 ] = [];
+	}
+
+	return oldInit.apply( this, args );
+};
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.find = function( selector ) {
+	var args = Array.prototype.slice.call( arguments );
+
+	// Support: PhantomJS 1.x
+	// String#match fails to match when used with a //g RegExp, only on some strings
+	if ( typeof selector === "string" && rattrHashTest.test( selector ) ) {
+
+		// The nonstandard and undocumented unquoted-hash was removed in jQuery 1.12.0
+		// First see if qS thinks it's a valid selector, if so avoid a false positive
+		try {
+			window.document.querySelector( selector );
+		} catch ( err1 ) {
+
+			// Didn't *look* valid to qSA, warn and try quoting what we think is the value
+			selector = selector.replace( rattrHashGlob, function( _, attr, op, value ) {
+				return "[" + attr + op + "\"" + value + "\"]";
+			} );
+
+			// If the regexp *may* have created an invalid selector, don't update it
+			// Note that there may be false alarms if selector uses jQuery extensions
+			try {
+				window.document.querySelector( selector );
+				migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
+				args[ 0 ] = selector;
+			} catch ( err2 ) {
+				migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
+			}
+		}
+	}
+
+	return oldFind.apply( this, args );
+};
+
+// Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
+var findProp;
+for ( findProp in oldFind ) {
+	if ( Object.prototype.hasOwnProperty.call( oldFind, findProp ) ) {
+		jQuery.find[ findProp ] = oldFind[ findProp ];
+	}
+}
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	migrateWarn( "jQuery.fn.size() is deprecated and removed; use the .length property" );
+	return this.length;
+};
+
+jQuery.parseJSON = function() {
+	migrateWarn( "jQuery.parseJSON is deprecated; use JSON.parse" );
+	return JSON.parse.apply( null, arguments );
+};
+
+jQuery.isNumeric = function( val ) {
+
+	// The jQuery 2.2.3 implementation of isNumeric
+	function isNumeric2( obj ) {
+		var realStringObj = obj && obj.toString();
+		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
+	}
+
+	var newValue = oldIsNumeric( val ),
+		oldValue = isNumeric2( val );
+
+	if ( newValue !== oldValue ) {
+		migrateWarn( "jQuery.isNumeric() should not be called on constructed objects" );
+	}
+
+	return oldValue;
+};
+
+migrateWarnFunc( jQuery, "holdReady", jQuery.holdReady,
+	"jQuery.holdReady is deprecated" );
+
+migrateWarnFunc( jQuery, "unique", jQuery.uniqueSort,
+	"jQuery.unique is deprecated; use jQuery.uniqueSort" );
+
+// Now jQuery.expr.pseudos is the standard incantation
+migrateWarnProp( jQuery.expr, "filters", jQuery.expr.pseudos,
+	"jQuery.expr.filters is deprecated; use jQuery.expr.pseudos" );
+migrateWarnProp( jQuery.expr, ":", jQuery.expr.pseudos,
+	"jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos" );
+
+
+var oldAjax = jQuery.ajax;
+
+jQuery.ajax = function( ) {
+	var jQXHR = oldAjax.apply( this, arguments );
+
+	// Be sure we got a jQXHR (e.g., not sync)
+	if ( jQXHR.promise ) {
+		migrateWarnFunc( jQXHR, "success", jQXHR.done,
+			"jQXHR.success is deprecated and removed" );
+		migrateWarnFunc( jQXHR, "error", jQXHR.fail,
+			"jQXHR.error is deprecated and removed" );
+		migrateWarnFunc( jQXHR, "complete", jQXHR.always,
+			"jQXHR.complete is deprecated and removed" );
+	}
+
+	return jQXHR;
+};
+
+
+var oldRemoveAttr = jQuery.fn.removeAttr,
+	oldToggleClass = jQuery.fn.toggleClass,
+	rmatchNonSpace = /\S+/g;
+
+jQuery.fn.removeAttr = function( name ) {
+	var self = this;
+
+	jQuery.each( name.match( rmatchNonSpace ), function( i, attr ) {
+		if ( jQuery.expr.match.bool.test( attr ) ) {
+			migrateWarn( "jQuery.fn.removeAttr no longer sets boolean properties: " + attr );
+			self.prop( attr, false );
+		}
+	} );
+
+	return oldRemoveAttr.apply( this, arguments );
+};
+
+jQuery.fn.toggleClass = function( state ) {
+
+	// Only deprecating no-args or single boolean arg
+	if ( state !== undefined && typeof state !== "boolean" ) {
+		return oldToggleClass.apply( this, arguments );
+	}
+
+	migrateWarn( "jQuery.fn.toggleClass( boolean ) is deprecated" );
+
+	// Toggle entire class name of each element
+	return this.each( function() {
+		var className = this.getAttribute && this.getAttribute( "class" ) || "";
+
+		if ( className ) {
+			jQuery.data( this, "__className__", className );
+		}
+
+		// If the element has a class name or if we're passed `false`,
+		// then remove the whole classname (if there was one, the above saved it).
+		// Otherwise bring back whatever was previously saved (if anything),
+		// falling back to the empty string if nothing was stored.
+		if ( this.setAttribute ) {
+			this.setAttribute( "class",
+				className || state === false ?
+				"" :
+				jQuery.data( this, "__className__" ) || ""
+			);
+		}
+	} );
+};
+
+
+var internalSwapCall = false;
+
+// If this version of jQuery has .swap(), don't false-alarm on internal uses
+if ( jQuery.swap ) {
+	jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
+		var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
+
+		if ( oldHook ) {
+			jQuery.cssHooks[ name ].get = function() {
+				var ret;
+
+				internalSwapCall = true;
+				ret = oldHook.apply( this, arguments );
+				internalSwapCall = false;
+				return ret;
+			};
+		}
+	} );
+}
+
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	if ( !internalSwapCall ) {
+		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+	}
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+var oldData = jQuery.data;
+
+jQuery.data = function( elem, name, value ) {
+	var curData;
+
+	// Name can be an object, and each entry in the object is meant to be set as data
+	if ( name && typeof name === "object" && arguments.length === 2 ) {
+		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
+		var sameKeys = {};
+		for ( var key in name ) {
+			if ( key !== jQuery.camelCase( key ) ) {
+				migrateWarn( "jQuery.data() always sets/gets camelCased names: " + key );
+				curData[ key ] = name[ key ];
+			} else {
+				sameKeys[ key ] = name[ key ];
+			}
+		}
+
+		oldData.call( this, elem, sameKeys );
+
+		return name;
+	}
+
+	// If the name is transformed, look for the un-transformed name in the data object
+	if ( name && typeof name === "string" && name !== jQuery.camelCase( name ) ) {
+		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
+		if ( curData && name in curData ) {
+			migrateWarn( "jQuery.data() always sets/gets camelCased names: " + name );
+			if ( arguments.length > 2 ) {
+				curData[ name ] = value;
+			}
+			return curData[ name ];
+		}
+	}
+
+	return oldData.apply( this, arguments );
+};
+
+var oldTweenRun = jQuery.Tween.prototype.run;
+var linearEasing = function( pct ) {
+		return pct;
+	};
+
+jQuery.Tween.prototype.run = function( ) {
+	if ( jQuery.easing[ this.easing ].length > 1 ) {
+		migrateWarn(
+			"'jQuery.easing." + this.easing.toString() + "' should use only one argument"
+		);
+
+		jQuery.easing[ this.easing ] = linearEasing;
+	}
+
+	oldTweenRun.apply( this, arguments );
+};
+
+jQuery.fx.interval = jQuery.fx.interval || 13;
+
+// Support: IE9, Android <=4.4
+// Avoid false positives on browsers that lack rAF
+if ( window.requestAnimationFrame ) {
+	migrateWarnProp( jQuery.fx, "interval", jQuery.fx.interval,
+		"jQuery.fx.interval is deprecated" );
+}
+
+var oldLoad = jQuery.fn.load,
+	oldEventAdd = jQuery.event.add,
+	originalFix = jQuery.event.fix;
+
+jQuery.event.props = [];
+jQuery.event.fixHooks = {};
+
+migrateWarnProp( jQuery.event.props, "concat", jQuery.event.props.concat,
+	"jQuery.event.props.concat() is deprecated and removed" );
+
+jQuery.event.fix = function( originalEvent ) {
+	var event,
+		type = originalEvent.type,
+		fixHook = this.fixHooks[ type ],
+		props = jQuery.event.props;
+
+	if ( props.length ) {
+		migrateWarn( "jQuery.event.props are deprecated and removed: " + props.join() );
+		while ( props.length ) {
+			jQuery.event.addProp( props.pop() );
+		}
+	}
+
+	if ( fixHook && !fixHook._migrated_ ) {
+		fixHook._migrated_ = true;
+		migrateWarn( "jQuery.event.fixHooks are deprecated and removed: " + type );
+		if ( ( props = fixHook.props ) && props.length ) {
+			while ( props.length ) {
+				jQuery.event.addProp( props.pop() );
+			}
+		}
+	}
+
+	event = originalFix.call( this, originalEvent );
+
+	return fixHook && fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+};
+
+jQuery.event.add = function( elem, types ) {
+
+	// This misses the multiple-types case but that seems awfully rare
+	if ( elem === window && types === "load" && window.document.readyState === "complete" ) {
+		migrateWarn( "jQuery(window).on('load'...) called after load event occurred" );
+	}
+	return oldEventAdd.apply( this, arguments );
+};
+
+jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
+
+	jQuery.fn[ name ] = function() {
+		var args = Array.prototype.slice.call( arguments, 0 );
+
+		// If this is an ajax load() the first arg should be the string URL;
+		// technically this could also be the "Anything" arg of the event .load()
+		// which just goes to show why this dumb signature has been deprecated!
+		// jQuery custom builds that exclude the Ajax module justifiably die here.
+		if ( name === "load" && typeof args[ 0 ] === "string" ) {
+			return oldLoad.apply( this, args );
+		}
+
+		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+
+		args.splice( 0, 0, name );
+		if ( arguments.length ) {
+			return this.on.apply( this, args );
+		}
+
+		// Use .triggerHandler here because:
+		// - load and unload events don't need to bubble, only applied to window or image
+		// - error event should not bubble to window, although it does pre-1.7
+		// See http://bugs.jquery.com/ticket/11820
+		this.triggerHandler.apply( this, args );
+		return this;
+	};
+
+} );
+
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
+	function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		migrateWarn( "jQuery.fn." + name + "() event shorthand is deprecated" );
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+} );
+
+// Trigger "ready" event only once, on document ready
+jQuery( function() {
+	jQuery( window.document ).triggerHandler( "ready" );
+} );
+
+jQuery.event.special.ready = {
+	setup: function() {
+		if ( this === window.document ) {
+			migrateWarn( "'ready' event is deprecated" );
+		}
+	}
+};
+
+jQuery.fn.extend( {
+
+	bind: function( types, data, fn ) {
+		migrateWarn( "jQuery.fn.bind() is deprecated" );
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		migrateWarn( "jQuery.fn.unbind() is deprecated" );
+		return this.off( types, null, fn );
+	},
+	delegate: function( selector, types, data, fn ) {
+		migrateWarn( "jQuery.fn.delegate() is deprecated" );
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		migrateWarn( "jQuery.fn.undelegate() is deprecated" );
+		return arguments.length === 1 ?
+			this.off( selector, "**" ) :
+			this.off( types, selector || "**", fn );
+	},
+	hover: function( fnOver, fnOut ) {
+		migrateWarn( "jQuery.fn.hover() is deprecated" );
+		return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver );
+	}
+} );
+
+
+var oldOffset = jQuery.fn.offset;
+
+jQuery.fn.offset = function() {
+	var docElem,
+		elem = this[ 0 ],
+		origin = { top: 0, left: 0 };
+
+	if ( !elem || !elem.nodeType ) {
+		migrateWarn( "jQuery.fn.offset() requires a valid DOM element" );
+		return origin;
+	}
+
+	docElem = ( elem.ownerDocument || window.document ).documentElement;
+	if ( !jQuery.contains( docElem, elem ) ) {
+		migrateWarn( "jQuery.fn.offset() requires an element connected to a document" );
+		return origin;
+	}
+
+	return oldOffset.apply( this, arguments );
+};
+
+
+var oldParam = jQuery.param;
+
+jQuery.param = function( data, traditional ) {
+	var ajaxTraditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+
+	if ( traditional === undefined && ajaxTraditional ) {
+
+		migrateWarn( "jQuery.param() no longer uses jQuery.ajaxSettings.traditional" );
+		traditional = ajaxTraditional;
+	}
+
+	return oldParam.call( this, data, traditional );
+};
+
+var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
+
+jQuery.fn.andSelf = function() {
+	migrateWarn( "jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()" );
+	return oldSelf.apply( this, arguments );
+};
+
+
+var oldDeferred = jQuery.Deferred,
+	tuples = [
+
+		// Action, add listener, callbacks, .then handlers, final state
+		[ "resolve", "done", jQuery.Callbacks( "once memory" ),
+			jQuery.Callbacks( "once memory" ), "resolved" ],
+		[ "reject", "fail", jQuery.Callbacks( "once memory" ),
+			jQuery.Callbacks( "once memory" ), "rejected" ],
+		[ "notify", "progress", jQuery.Callbacks( "memory" ),
+			jQuery.Callbacks( "memory" ) ]
+	];
+
+jQuery.Deferred = function( func ) {
+	var deferred = oldDeferred(),
+		promise = deferred.promise();
+
+	deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+		var fns = arguments;
+
+		migrateWarn( "deferred.pipe() is deprecated" );
+
+		return jQuery.Deferred( function( newDefer ) {
+			jQuery.each( tuples, function( i, tuple ) {
+				var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+
+				// Deferred.done(function() { bind to newDefer or newDefer.resolve })
+				// deferred.fail(function() { bind to newDefer or newDefer.reject })
+				// deferred.progress(function() { bind to newDefer or newDefer.notify })
+				deferred[ tuple[ 1 ] ]( function() {
+					var returned = fn && fn.apply( this, arguments );
+					if ( returned && jQuery.isFunction( returned.promise ) ) {
+						returned.promise()
+							.done( newDefer.resolve )
+							.fail( newDefer.reject )
+							.progress( newDefer.notify );
+					} else {
+						newDefer[ tuple[ 0 ] + "With" ](
+							this === promise ? newDefer.promise() : this,
+							fn ? [ returned ] : arguments
+						);
+					}
+				} );
+			} );
+			fns = null;
+		} ).promise();
+
+	};
+
+	if ( func ) {
+		func.call( deferred, deferred );
+	}
+
+	return deferred;
+};
+
+// Preserve handler of uncaught exceptions in promise chains
+jQuery.Deferred.exceptionHook = oldDeferred.exceptionHook;
+
+return jQuery;
+} );
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.css b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.css
new file mode 100644
index 00000000000..c4487b41cdb
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.css
@@ -0,0 +1,582 @@
+/*! jQuery UI - v1.12.1 - 2018-12-06
+* http://jqueryui.com
+* Includes: core.css, autocomplete.css, menu.css, theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=custom-theme&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgImgOpacityContent=75&bgImgOpacityHeader=75&cornerRadiusShadow=8px&offsetLeftShadow=-8px&offsetTopShadow=-8px&thicknessShadow=8px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=%23aaaaaa&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=%23aaaaaa&iconColorError=%23cd0a0a&fcError=%23cd0a0a&borderColorError=%23cd0a0a&bgTextureError=glass&bgColorError=%23fef1ec&iconColorHighlight=%232e83ff&fcHighlight=%23363636&borderColorHighlight=%23fcefa1&bgTextureHighlight=glass&bgColorHighlight=%23fbf9ee&iconColorActive=%23454545&fcActive=%23212121&borderColorActive=%23aaaaaa&bgTextureActive=glass&bgColorActive=%23dadada&iconColorHover=%23454545&fcHover=%23212121&borderColorHover=%23999999&bgTextureHover=glass&bgColorHover=%23dadada&iconColorDefault=%23888888&fcDefault=%23555555&borderColorDefault=%23d3d3d3&bgTextureDefault=glass&bgColorDefault=%23e6e6e6&iconColorContent=%23222222&fcContent=%23222222&borderColorContent=%23aaaaaa&bgTextureContent=flat&bgColorContent=%23ffffff&iconColorHeader=%23222222&fcHeader=%23222222&borderColorHeader=%23aaaaaa&bgTextureHeader=highlight_soft&bgColorHeader=%23cccccc&cornerRadius=4px&fwDefault=normal&fsDefault=1.1em&ffDefault=Verdana%2CArial%2Csans-serif
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0); /* support: IE8 */
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+	pointer-events: none;
+}
+
+
+/* Icons
+----------------------------------*/
+.ui-icon {
+	display: inline-block;
+	vertical-align: middle;
+	margin-top: -.25em;
+	position: relative;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+.ui-widget-icon-block {
+	left: 50%;
+	margin-left: -8px;
+	display: block;
+}
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-menu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	display: block;
+	outline: 0;
+}
+.ui-menu .ui-menu {
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	cursor: pointer;
+	/* support: IE10, see #8844 */
+	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
+}
+.ui-menu .ui-menu-item-wrapper {
+	position: relative;
+	padding: 3px 1em 3px .4em;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px 0;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+	margin: -1px;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item-wrapper {
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: .2em;
+	margin: auto 0;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	left: auto;
+	right: 0;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget.ui-widget-content {
+	border: 1px solid #d3d3d3;
+}
+.ui-widget-content {
+	border: 1px solid #aaaaaa;
+	background: #ffffff;
+	color: #222222;
+}
+.ui-widget-content a {
+	color: #222222;
+}
+.ui-widget-header {
+	border: 1px solid #aaaaaa;
+	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
+	color: #222222;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default,
+.ui-button,
+
+/* We use html here because we need a greater specificity to make sure disabled
+works properly when clicked or hovered */
+html .ui-button.ui-state-disabled:hover,
+html .ui-button.ui-state-disabled:active {
+	border: 1px solid #d3d3d3;
+	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #555555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited,
+a.ui-button,
+a:link.ui-button,
+a:visited.ui-button,
+.ui-button {
+	color: #555555;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus,
+.ui-button:hover,
+.ui-button:focus {
+	border: 1px solid #999999;
+	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited,
+.ui-state-focus a,
+.ui-state-focus a:hover,
+.ui-state-focus a:link,
+.ui-state-focus a:visited,
+a.ui-button:hover,
+a.ui-button:focus {
+	color: #212121;
+	text-decoration: none;
+}
+
+.ui-visual-focus {
+	box-shadow: 0 0 3px 1px rgb(94, 158, 214);
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+	border: 1px solid #aaaaaa;
+	background: #dadada url("images/ui-bg_glass_65_dadada_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-icon-background,
+.ui-state-active .ui-icon-background {
+	border: #aaaaaa;
+	background-color: #212121;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
+	color: #363636;
+}
+.ui-state-checked {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
+	color: #cd0a0a;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #cd0a0a;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #cd0a0a;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70); /* support: IE8 */
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35); /* support: IE8 */
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url("images/ui-icons_222222_256x240.png");
+}
+.ui-widget-header .ui-icon {
+	background-image: url("images/ui-icons_222222_256x240.png");
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon,
+.ui-button:hover .ui-icon,
+.ui-button:focus .ui-icon {
+	background-image: url("images/ui-icons_454545_256x240.png");
+}
+.ui-state-active .ui-icon,
+.ui-button:active .ui-icon {
+	background-image: url("images/ui-icons_454545_256x240.png");
+}
+.ui-state-highlight .ui-icon,
+.ui-button .ui-state-highlight.ui-icon {
+	background-image: url("images/ui-icons_2e83ff_256x240.png");
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url("images/ui-icons_cd0a0a_256x240.png");
+}
+.ui-button .ui-icon {
+	background-image: url("images/ui-icons_888888_256x240.png");
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-caret-1-n { background-position: 0 0; }
+.ui-icon-caret-1-ne { background-position: -16px 0; }
+.ui-icon-caret-1-e { background-position: -32px 0; }
+.ui-icon-caret-1-se { background-position: -48px 0; }
+.ui-icon-caret-1-s { background-position: -65px 0; }
+.ui-icon-caret-1-sw { background-position: -80px 0; }
+.ui-icon-caret-1-w { background-position: -96px 0; }
+.ui-icon-caret-1-nw { background-position: -112px 0; }
+.ui-icon-caret-2-n-s { background-position: -128px 0; }
+.ui-icon-caret-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -65px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -65px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 1px -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #aaaaaa;
+	opacity: .3;
+	filter: Alpha(Opacity=30); /* support: IE8 */
+}
+.ui-widget-shadow {
+	-webkit-box-shadow: -8px -8px 8px #aaaaaa;
+	box-shadow: -8px -8px 8px #aaaaaa;
+}
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.js b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.js
new file mode 100644
index 00000000000..87fb2143450
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.js
@@ -0,0 +1,2659 @@
+/*! jQuery UI - v1.12.1 - 2018-12-06
+* http://jqueryui.com
+* Includes: widget.js, position.js, keycode.js, unique-id.js, widgets/autocomplete.js, widgets/menu.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define([ "jquery" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+}(function( $ ) {
+
+$.ui = $.ui || {};
+
+var version = $.ui.version = "1.12.1";
+
+
+/*!
+ * jQuery UI Widget 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Widget
+//>>group: Core
+//>>description: Provides a factory for creating stateful widgets with a common API.
+//>>docs: http://api.jqueryui.com/jQuery.widget/
+//>>demos: http://jqueryui.com/widget/
+
+
+
+var widgetUuid = 0;
+var widgetSlice = Array.prototype.slice;
+
+$.cleanData = ( function( orig ) {
+	return function( elems ) {
+		var events, elem, i;
+		for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
+			try {
+
+				// Only trigger remove when necessary to save time
+				events = $._data( elem, "events" );
+				if ( events && events.remove ) {
+					$( elem ).triggerHandler( "remove" );
+				}
+
+			// Http://bugs.jquery.com/ticket/8235
+			} catch ( e ) {}
+		}
+		orig( elems );
+	};
+} )( $.cleanData );
+
+$.widget = function( name, base, prototype ) {
+	var existingConstructor, constructor, basePrototype;
+
+	// ProxiedPrototype allows the provided prototype to remain unmodified
+	// so that it can be used as a mixin for multiple widgets (#8876)
+	var proxiedPrototype = {};
+
+	var namespace = name.split( "." )[ 0 ];
+	name = name.split( "." )[ 1 ];
+	var fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	if ( $.isArray( prototype ) ) {
+		prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
+	}
+
+	// Create selector for plugin
+	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+		return !!$.data( elem, fullName );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	existingConstructor = $[ namespace ][ name ];
+	constructor = $[ namespace ][ name ] = function( options, element ) {
+
+		// Allow instantiation without "new" keyword
+		if ( !this._createWidget ) {
+			return new constructor( options, element );
+		}
+
+		// Allow instantiation without initializing for simple inheritance
+		// must use "new" keyword (the code above always passes args)
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+
+	// Extend with the existing constructor to carry over any static properties
+	$.extend( constructor, existingConstructor, {
+		version: prototype.version,
+
+		// Copy the object used to create the prototype in case we need to
+		// redefine the widget later
+		_proto: $.extend( {}, prototype ),
+
+		// Track widgets that inherit from this widget in case this widget is
+		// redefined after a widget inherits from it
+		_childConstructors: []
+	} );
+
+	basePrototype = new base();
+
+	// We need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+	basePrototype.options = $.widget.extend( {}, basePrototype.options );
+	$.each( prototype, function( prop, value ) {
+		if ( !$.isFunction( value ) ) {
+			proxiedPrototype[ prop ] = value;
+			return;
+		}
+		proxiedPrototype[ prop ] = ( function() {
+			function _super() {
+				return base.prototype[ prop ].apply( this, arguments );
+			}
+
+			function _superApply( args ) {
+				return base.prototype[ prop ].apply( this, args );
+			}
+
+			return function() {
+				var __super = this._super;
+				var __superApply = this._superApply;
+				var returnValue;
+
+				this._super = _super;
+				this._superApply = _superApply;
+
+				returnValue = value.apply( this, arguments );
+
+				this._super = __super;
+				this._superApply = __superApply;
+
+				return returnValue;
+			};
+		} )();
+	} );
+	constructor.prototype = $.widget.extend( basePrototype, {
+
+		// TODO: remove support for widgetEventPrefix
+		// always use the name + a colon as the prefix, e.g., draggable:start
+		// don't prefix for widgets that aren't DOM-based
+		widgetEventPrefix: existingConstructor ? ( basePrototype.widgetEventPrefix || name ) : name
+	}, proxiedPrototype, {
+		constructor: constructor,
+		namespace: namespace,
+		widgetName: name,
+		widgetFullName: fullName
+	} );
+
+	// If this widget is being redefined then we need to find all widgets that
+	// are inheriting from it and redefine all of them so that they inherit from
+	// the new version of this widget. We're essentially trying to replace one
+	// level in the prototype chain.
+	if ( existingConstructor ) {
+		$.each( existingConstructor._childConstructors, function( i, child ) {
+			var childPrototype = child.prototype;
+
+			// Redefine the child widget using the same prototype that was
+			// originally used, but inherit from the new version of the base
+			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor,
+				child._proto );
+		} );
+
+		// Remove the list of existing child constructors from the old constructor
+		// so the old child constructors can be garbage collected
+		delete existingConstructor._childConstructors;
+	} else {
+		base._childConstructors.push( constructor );
+	}
+
+	$.widget.bridge( name, constructor );
+
+	return constructor;
+};
+
+$.widget.extend = function( target ) {
+	var input = widgetSlice.call( arguments, 1 );
+	var inputIndex = 0;
+	var inputLength = input.length;
+	var key;
+	var value;
+
+	for ( ; inputIndex < inputLength; inputIndex++ ) {
+		for ( key in input[ inputIndex ] ) {
+			value = input[ inputIndex ][ key ];
+			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+
+				// Clone objects
+				if ( $.isPlainObject( value ) ) {
+					target[ key ] = $.isPlainObject( target[ key ] ) ?
+						$.widget.extend( {}, target[ key ], value ) :
+
+						// Don't extend strings, arrays, etc. with objects
+						$.widget.extend( {}, value );
+
+				// Copy everything else by reference
+				} else {
+					target[ key ] = value;
+				}
+			}
+		}
+	}
+	return target;
+};
+
+$.widget.bridge = function( name, object ) {
+	var fullName = object.prototype.widgetFullName || name;
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string";
+		var args = widgetSlice.call( arguments, 1 );
+		var returnValue = this;
+
+		if ( isMethodCall ) {
+
+			// If this is an empty collection, we need to have the instance method
+			// return undefined instead of the jQuery instance
+			if ( !this.length && options === "instance" ) {
+				returnValue = undefined;
+			} else {
+				this.each( function() {
+					var methodValue;
+					var instance = $.data( this, fullName );
+
+					if ( options === "instance" ) {
+						returnValue = instance;
+						return false;
+					}
+
+					if ( !instance ) {
+						return $.error( "cannot call methods on " + name +
+							" prior to initialization; " +
+							"attempted to call method '" + options + "'" );
+					}
+
+					if ( !$.isFunction( instance[ options ] ) || options.charAt( 0 ) === "_" ) {
+						return $.error( "no such method '" + options + "' for " + name +
+							" widget instance" );
+					}
+
+					methodValue = instance[ options ].apply( instance, args );
+
+					if ( methodValue !== instance && methodValue !== undefined ) {
+						returnValue = methodValue && methodValue.jquery ?
+							returnValue.pushStack( methodValue.get() ) :
+							methodValue;
+						return false;
+					}
+				} );
+			}
+		} else {
+
+			// Allow multiple hashes to be passed on init
+			if ( args.length ) {
+				options = $.widget.extend.apply( null, [ options ].concat( args ) );
+			}
+
+			this.each( function() {
+				var instance = $.data( this, fullName );
+				if ( instance ) {
+					instance.option( options || {} );
+					if ( instance._init ) {
+						instance._init();
+					}
+				} else {
+					$.data( this, fullName, new object( options, this ) );
+				}
+			} );
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( /* options, element */ ) {};
+$.Widget._childConstructors = [];
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	defaultElement: "<div>",
+
+	options: {
+		classes: {},
+		disabled: false,
+
+		// Callbacks
+		create: null
+	},
+
+	_createWidget: function( options, element ) {
+		element = $( element || this.defaultElement || this )[ 0 ];
+		this.element = $( element );
+		this.uuid = widgetUuid++;
+		this.eventNamespace = "." + this.widgetName + this.uuid;
+
+		this.bindings = $();
+		this.hoverable = $();
+		this.focusable = $();
+		this.classesElementLookup = {};
+
+		if ( element !== this ) {
+			$.data( element, this.widgetFullName, this );
+			this._on( true, this.element, {
+				remove: function( event ) {
+					if ( event.target === element ) {
+						this.destroy();
+					}
+				}
+			} );
+			this.document = $( element.style ?
+
+				// Element within the document
+				element.ownerDocument :
+
+				// Element is window or document
+				element.document || element );
+			this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow );
+		}
+
+		this.options = $.widget.extend( {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		this._create();
+
+		if ( this.options.disabled ) {
+			this._setOptionDisabled( this.options.disabled );
+		}
+
+		this._trigger( "create", null, this._getCreateEventData() );
+		this._init();
+	},
+
+	_getCreateOptions: function() {
+		return {};
+	},
+
+	_getCreateEventData: $.noop,
+
+	_create: $.noop,
+
+	_init: $.noop,
+
+	destroy: function() {
+		var that = this;
+
+		this._destroy();
+		$.each( this.classesElementLookup, function( key, value ) {
+			that._removeClass( value, key );
+		} );
+
+		// We can probably remove the unbind calls in 2.0
+		// all event bindings should go through this._on()
+		this.element
+			.off( this.eventNamespace )
+			.removeData( this.widgetFullName );
+		this.widget()
+			.off( this.eventNamespace )
+			.removeAttr( "aria-disabled" );
+
+		// Clean up events and states
+		this.bindings.off( this.eventNamespace );
+	},
+
+	_destroy: $.noop,
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key;
+		var parts;
+		var curOption;
+		var i;
+
+		if ( arguments.length === 0 ) {
+
+			// Don't return a reference to the internal hash
+			return $.widget.extend( {}, this.options );
+		}
+
+		if ( typeof key === "string" ) {
+
+			// Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+			options = {};
+			parts = key.split( "." );
+			key = parts.shift();
+			if ( parts.length ) {
+				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+				for ( i = 0; i < parts.length - 1; i++ ) {
+					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+					curOption = curOption[ parts[ i ] ];
+				}
+				key = parts.pop();
+				if ( arguments.length === 1 ) {
+					return curOption[ key ] === undefined ? null : curOption[ key ];
+				}
+				curOption[ key ] = value;
+			} else {
+				if ( arguments.length === 1 ) {
+					return this.options[ key ] === undefined ? null : this.options[ key ];
+				}
+				options[ key ] = value;
+			}
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+
+	_setOptions: function( options ) {
+		var key;
+
+		for ( key in options ) {
+			this._setOption( key, options[ key ] );
+		}
+
+		return this;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "classes" ) {
+			this._setOptionClasses( value );
+		}
+
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this._setOptionDisabled( value );
+		}
+
+		return this;
+	},
+
+	_setOptionClasses: function( value ) {
+		var classKey, elements, currentElements;
+
+		for ( classKey in value ) {
+			currentElements = this.classesElementLookup[ classKey ];
+			if ( value[ classKey ] === this.options.classes[ classKey ] ||
+					!currentElements ||
+					!currentElements.length ) {
+				continue;
+			}
+
+			// We are doing this to create a new jQuery object because the _removeClass() call
+			// on the next line is going to destroy the reference to the current elements being
+			// tracked. We need to save a copy of this collection so that we can add the new classes
+			// below.
+			elements = $( currentElements.get() );
+			this._removeClass( currentElements, classKey );
+
+			// We don't use _addClass() here, because that uses this.options.classes
+			// for generating the string of classes. We want to use the value passed in from
+			// _setOption(), this is the new value of the classes option which was passed to
+			// _setOption(). We pass this value directly to _classes().
+			elements.addClass( this._classes( {
+				element: elements,
+				keys: classKey,
+				classes: value,
+				add: true
+			} ) );
+		}
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
+
+		// If the widget is becoming disabled, then nothing is interactive
+		if ( value ) {
+			this._removeClass( this.hoverable, null, "ui-state-hover" );
+			this._removeClass( this.focusable, null, "ui-state-focus" );
+		}
+	},
+
+	enable: function() {
+		return this._setOptions( { disabled: false } );
+	},
+
+	disable: function() {
+		return this._setOptions( { disabled: true } );
+	},
+
+	_classes: function( options ) {
+		var full = [];
+		var that = this;
+
+		options = $.extend( {
+			element: this.element,
+			classes: this.options.classes || {}
+		}, options );
+
+		function processClassString( classes, checkOption ) {
+			var current, i;
+			for ( i = 0; i < classes.length; i++ ) {
+				current = that.classesElementLookup[ classes[ i ] ] || $();
+				if ( options.add ) {
+					current = $( $.unique( current.get().concat( options.element.get() ) ) );
+				} else {
+					current = $( current.not( options.element ).get() );
+				}
+				that.classesElementLookup[ classes[ i ] ] = current;
+				full.push( classes[ i ] );
+				if ( checkOption && options.classes[ classes[ i ] ] ) {
+					full.push( options.classes[ classes[ i ] ] );
+				}
+			}
+		}
+
+		this._on( options.element, {
+			"remove": "_untrackClassesElement"
+		} );
+
+		if ( options.keys ) {
+			processClassString( options.keys.match( /\S+/g ) || [], true );
+		}
+		if ( options.extra ) {
+			processClassString( options.extra.match( /\S+/g ) || [] );
+		}
+
+		return full.join( " " );
+	},
+
+	_untrackClassesElement: function( event ) {
+		var that = this;
+		$.each( that.classesElementLookup, function( key, value ) {
+			if ( $.inArray( event.target, value ) !== -1 ) {
+				that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
+			}
+		} );
+	},
+
+	_removeClass: function( element, keys, extra ) {
+		return this._toggleClass( element, keys, extra, false );
+	},
+
+	_addClass: function( element, keys, extra ) {
+		return this._toggleClass( element, keys, extra, true );
+	},
+
+	_toggleClass: function( element, keys, extra, add ) {
+		add = ( typeof add === "boolean" ) ? add : extra;
+		var shift = ( typeof element === "string" || element === null ),
+			options = {
+				extra: shift ? keys : extra,
+				keys: shift ? element : keys,
+				element: shift ? this.element : element,
+				add: add
+			};
+		options.element.toggleClass( this._classes( options ), add );
+		return this;
+	},
+
+	_on: function( suppressDisabledCheck, element, handlers ) {
+		var delegateElement;
+		var instance = this;
+
+		// No suppressDisabledCheck flag, shuffle arguments
+		if ( typeof suppressDisabledCheck !== "boolean" ) {
+			handlers = element;
+			element = suppressDisabledCheck;
+			suppressDisabledCheck = false;
+		}
+
+		// No element argument, shuffle and use this.element
+		if ( !handlers ) {
+			handlers = element;
+			element = this.element;
+			delegateElement = this.widget();
+		} else {
+			element = delegateElement = $( element );
+			this.bindings = this.bindings.add( element );
+		}
+
+		$.each( handlers, function( event, handler ) {
+			function handlerProxy() {
+
+				// Allow widgets to customize the disabled handling
+				// - disabled as an array instead of boolean
+				// - disabled class as method for disabling individual parts
+				if ( !suppressDisabledCheck &&
+						( instance.options.disabled === true ||
+						$( this ).hasClass( "ui-state-disabled" ) ) ) {
+					return;
+				}
+				return ( typeof handler === "string" ? instance[ handler ] : handler )
+					.apply( instance, arguments );
+			}
+
+			// Copy the guid so direct unbinding works
+			if ( typeof handler !== "string" ) {
+				handlerProxy.guid = handler.guid =
+					handler.guid || handlerProxy.guid || $.guid++;
+			}
+
+			var match = event.match( /^([\w:-]*)\s*(.*)$/ );
+			var eventName = match[ 1 ] + instance.eventNamespace;
+			var selector = match[ 2 ];
+
+			if ( selector ) {
+				delegateElement.on( eventName, selector, handlerProxy );
+			} else {
+				element.on( eventName, handlerProxy );
+			}
+		} );
+	},
+
+	_off: function( element, eventName ) {
+		eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
+			this.eventNamespace;
+		element.off( eventName ).off( eventName );
+
+		// Clear the stack to avoid memory leaks (#10056)
+		this.bindings = $( this.bindings.not( element ).get() );
+		this.focusable = $( this.focusable.not( element ).get() );
+		this.hoverable = $( this.hoverable.not( element ).get() );
+	},
+
+	_delay: function( handler, delay ) {
+		function handlerProxy() {
+			return ( typeof handler === "string" ? instance[ handler ] : handler )
+				.apply( instance, arguments );
+		}
+		var instance = this;
+		return setTimeout( handlerProxy, delay || 0 );
+	},
+
+	_hoverable: function( element ) {
+		this.hoverable = this.hoverable.add( element );
+		this._on( element, {
+			mouseenter: function( event ) {
+				this._addClass( $( event.currentTarget ), null, "ui-state-hover" );
+			},
+			mouseleave: function( event ) {
+				this._removeClass( $( event.currentTarget ), null, "ui-state-hover" );
+			}
+		} );
+	},
+
+	_focusable: function( element ) {
+		this.focusable = this.focusable.add( element );
+		this._on( element, {
+			focusin: function( event ) {
+				this._addClass( $( event.currentTarget ), null, "ui-state-focus" );
+			},
+			focusout: function( event ) {
+				this._removeClass( $( event.currentTarget ), null, "ui-state-focus" );
+			}
+		} );
+	},
+
+	_trigger: function( type, event, data ) {
+		var prop, orig;
+		var callback = this.options[ type ];
+
+		data = data || {};
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+
+		// The original event may come from any element
+		// so we need to reset the target on the new event
+		event.target = this.element[ 0 ];
+
+		// Copy original event properties over to the new event
+		orig = event.originalEvent;
+		if ( orig ) {
+			for ( prop in orig ) {
+				if ( !( prop in event ) ) {
+					event[ prop ] = orig[ prop ];
+				}
+			}
+		}
+
+		this.element.trigger( event, data );
+		return !( $.isFunction( callback ) &&
+			callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+		if ( typeof options === "string" ) {
+			options = { effect: options };
+		}
+
+		var hasOptions;
+		var effectName = !options ?
+			method :
+			options === true || typeof options === "number" ?
+				defaultEffect :
+				options.effect || defaultEffect;
+
+		options = options || {};
+		if ( typeof options === "number" ) {
+			options = { duration: options };
+		}
+
+		hasOptions = !$.isEmptyObject( options );
+		options.complete = callback;
+
+		if ( options.delay ) {
+			element.delay( options.delay );
+		}
+
+		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+			element[ method ]( options );
+		} else if ( effectName !== method && element[ effectName ] ) {
+			element[ effectName ]( options.duration, options.easing, callback );
+		} else {
+			element.queue( function( next ) {
+				$( this )[ method ]();
+				if ( callback ) {
+					callback.call( element[ 0 ] );
+				}
+				next();
+			} );
+		}
+	};
+} );
+
+var widget = $.widget;
+
+
+/*!
+ * jQuery UI Position 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/position/
+ */
+
+//>>label: Position
+//>>group: Core
+//>>description: Positions elements relative to other elements.
+//>>docs: http://api.jqueryui.com/position/
+//>>demos: http://jqueryui.com/position/
+
+
+( function() {
+var cachedScrollbarWidth,
+	max = Math.max,
+	abs = Math.abs,
+	rhorizontal = /left|center|right/,
+	rvertical = /top|center|bottom/,
+	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
+	rposition = /^\w+/,
+	rpercent = /%$/,
+	_position = $.fn.position;
+
+function getOffsets( offsets, width, height ) {
+	return [
+		parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
+		parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
+	];
+}
+
+function parseCss( element, property ) {
+	return parseInt( $.css( element, property ), 10 ) || 0;
+}
+
+function getDimensions( elem ) {
+	var raw = elem[ 0 ];
+	if ( raw.nodeType === 9 ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: 0, left: 0 }
+		};
+	}
+	if ( $.isWindow( raw ) ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
+		};
+	}
+	if ( raw.preventDefault ) {
+		return {
+			width: 0,
+			height: 0,
+			offset: { top: raw.pageY, left: raw.pageX }
+		};
+	}
+	return {
+		width: elem.outerWidth(),
+		height: elem.outerHeight(),
+		offset: elem.offset()
+	};
+}
+
+$.position = {
+	scrollbarWidth: function() {
+		if ( cachedScrollbarWidth !== undefined ) {
+			return cachedScrollbarWidth;
+		}
+		var w1, w2,
+			div = $( "<div " +
+				"style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'>" +
+				"<div style='height:100px;width:auto;'></div></div>" ),
+			innerDiv = div.children()[ 0 ];
+
+		$( "body" ).append( div );
+		w1 = innerDiv.offsetWidth;
+		div.css( "overflow", "scroll" );
+
+		w2 = innerDiv.offsetWidth;
+
+		if ( w1 === w2 ) {
+			w2 = div[ 0 ].clientWidth;
+		}
+
+		div.remove();
+
+		return ( cachedScrollbarWidth = w1 - w2 );
+	},
+	getScrollInfo: function( within ) {
+		var overflowX = within.isWindow || within.isDocument ? "" :
+				within.element.css( "overflow-x" ),
+			overflowY = within.isWindow || within.isDocument ? "" :
+				within.element.css( "overflow-y" ),
+			hasOverflowX = overflowX === "scroll" ||
+				( overflowX === "auto" && within.width < within.element[ 0 ].scrollWidth ),
+			hasOverflowY = overflowY === "scroll" ||
+				( overflowY === "auto" && within.height < within.element[ 0 ].scrollHeight );
+		return {
+			width: hasOverflowY ? $.position.scrollbarWidth() : 0,
+			height: hasOverflowX ? $.position.scrollbarWidth() : 0
+		};
+	},
+	getWithinInfo: function( element ) {
+		var withinElement = $( element || window ),
+			isWindow = $.isWindow( withinElement[ 0 ] ),
+			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9,
+			hasOffset = !isWindow && !isDocument;
+		return {
+			element: withinElement,
+			isWindow: isWindow,
+			isDocument: isDocument,
+			offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 },
+			scrollLeft: withinElement.scrollLeft(),
+			scrollTop: withinElement.scrollTop(),
+			width: withinElement.outerWidth(),
+			height: withinElement.outerHeight()
+		};
+	}
+};
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// Make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
+		target = $( options.of ),
+		within = $.position.getWithinInfo( options.within ),
+		scrollInfo = $.position.getScrollInfo( within ),
+		collision = ( options.collision || "flip" ).split( " " ),
+		offsets = {};
+
+	dimensions = getDimensions( target );
+	if ( target[ 0 ].preventDefault ) {
+
+		// Force left top to allow flipping
+		options.at = "left top";
+	}
+	targetWidth = dimensions.width;
+	targetHeight = dimensions.height;
+	targetOffset = dimensions.offset;
+
+	// Clone to reuse original targetOffset later
+	basePosition = $.extend( {}, targetOffset );
+
+	// Force my and at to have valid horizontal and vertical positions
+	// if a value is missing or invalid, it will be converted to center
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[ this ] || "" ).split( " " ),
+			horizontalOffset,
+			verticalOffset;
+
+		if ( pos.length === 1 ) {
+			pos = rhorizontal.test( pos[ 0 ] ) ?
+				pos.concat( [ "center" ] ) :
+				rvertical.test( pos[ 0 ] ) ?
+					[ "center" ].concat( pos ) :
+					[ "center", "center" ];
+		}
+		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+
+		// Calculate offsets
+		horizontalOffset = roffset.exec( pos[ 0 ] );
+		verticalOffset = roffset.exec( pos[ 1 ] );
+		offsets[ this ] = [
+			horizontalOffset ? horizontalOffset[ 0 ] : 0,
+			verticalOffset ? verticalOffset[ 0 ] : 0
+		];
+
+		// Reduce to just the positions without the offsets
+		options[ this ] = [
+			rposition.exec( pos[ 0 ] )[ 0 ],
+			rposition.exec( pos[ 1 ] )[ 0 ]
+		];
+	} );
+
+	// Normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	if ( options.at[ 0 ] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[ 0 ] === "center" ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[ 1 ] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[ 1 ] === "center" ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
+	basePosition.left += atOffset[ 0 ];
+	basePosition.top += atOffset[ 1 ];
+
+	return this.each( function() {
+		var collisionPosition, using,
+			elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseCss( this, "marginLeft" ),
+			marginTop = parseCss( this, "marginTop" ),
+			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) +
+				scrollInfo.width,
+			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) +
+				scrollInfo.height,
+			position = $.extend( {}, basePosition ),
+			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
+
+		if ( options.my[ 0 ] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[ 0 ] === "center" ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[ 1 ] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[ 1 ] === "center" ) {
+			position.top -= elemHeight / 2;
+		}
+
+		position.left += myOffset[ 0 ];
+		position.top += myOffset[ 1 ];
+
+		collisionPosition = {
+			marginLeft: marginLeft,
+			marginTop: marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[ i ] ] ) {
+				$.ui.position[ collision[ i ] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
+					my: options.my,
+					at: options.at,
+					within: within,
+					elem: elem
+				} );
+			}
+		} );
+
+		if ( options.using ) {
+
+			// Adds feedback as second argument to using callback, if present
+			using = function( props ) {
+				var left = targetOffset.left - position.left,
+					right = left + targetWidth - elemWidth,
+					top = targetOffset.top - position.top,
+					bottom = top + targetHeight - elemHeight,
+					feedback = {
+						target: {
+							element: target,
+							left: targetOffset.left,
+							top: targetOffset.top,
+							width: targetWidth,
+							height: targetHeight
+						},
+						element: {
+							element: elem,
+							left: position.left,
+							top: position.top,
+							width: elemWidth,
+							height: elemHeight
+						},
+						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
+						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
+					};
+				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
+					feedback.horizontal = "center";
+				}
+				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
+					feedback.vertical = "middle";
+				}
+				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
+					feedback.important = "horizontal";
+				} else {
+					feedback.important = "vertical";
+				}
+				options.using.call( this, props, feedback );
+			};
+		}
+
+		elem.offset( $.extend( position, { using: using } ) );
+	} );
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
+				outerWidth = within.width,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = withinOffset - collisionPosLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
+				newOverRight;
+
+			// Element is wider than within
+			if ( data.collisionWidth > outerWidth ) {
+
+				// Element is initially over the left side of within
+				if ( overLeft > 0 && overRight <= 0 ) {
+					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth -
+						withinOffset;
+					position.left += overLeft - newOverRight;
+
+				// Element is initially over right side of within
+				} else if ( overRight > 0 && overLeft <= 0 ) {
+					position.left = withinOffset;
+
+				// Element is initially over both left and right sides of within
+				} else {
+					if ( overLeft > overRight ) {
+						position.left = withinOffset + outerWidth - data.collisionWidth;
+					} else {
+						position.left = withinOffset;
+					}
+				}
+
+			// Too far left -> align with left edge
+			} else if ( overLeft > 0 ) {
+				position.left += overLeft;
+
+			// Too far right -> align with right edge
+			} else if ( overRight > 0 ) {
+				position.left -= overRight;
+
+			// Adjust based on position and margin
+			} else {
+				position.left = max( position.left - collisionPosLeft, position.left );
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
+				outerHeight = data.within.height,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = withinOffset - collisionPosTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
+				newOverBottom;
+
+			// Element is taller than within
+			if ( data.collisionHeight > outerHeight ) {
+
+				// Element is initially over the top of within
+				if ( overTop > 0 && overBottom <= 0 ) {
+					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight -
+						withinOffset;
+					position.top += overTop - newOverBottom;
+
+				// Element is initially over bottom of within
+				} else if ( overBottom > 0 && overTop <= 0 ) {
+					position.top = withinOffset;
+
+				// Element is initially over both top and bottom of within
+				} else {
+					if ( overTop > overBottom ) {
+						position.top = withinOffset + outerHeight - data.collisionHeight;
+					} else {
+						position.top = withinOffset;
+					}
+				}
+
+			// Too far up -> align with top
+			} else if ( overTop > 0 ) {
+				position.top += overTop;
+
+			// Too far down -> align with bottom edge
+			} else if ( overBottom > 0 ) {
+				position.top -= overBottom;
+
+			// Adjust based on position and margin
+			} else {
+				position.top = max( position.top - collisionPosTop, position.top );
+			}
+		}
+	},
+	flip: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.left + within.scrollLeft,
+				outerWidth = within.width,
+				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = collisionPosLeft - offsetLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					data.at[ 0 ] === "right" ?
+						-data.targetWidth :
+						0,
+				offset = -2 * data.offset[ 0 ],
+				newOverRight,
+				newOverLeft;
+
+			if ( overLeft < 0 ) {
+				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth -
+					outerWidth - withinOffset;
+				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			} else if ( overRight > 0 ) {
+				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset +
+					atOffset + offset - offsetLeft;
+				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.top + within.scrollTop,
+				outerHeight = within.height,
+				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = collisionPosTop - offsetTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
+				top = data.my[ 1 ] === "top",
+				myOffset = top ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					data.at[ 1 ] === "bottom" ?
+						-data.targetHeight :
+						0,
+				offset = -2 * data.offset[ 1 ],
+				newOverTop,
+				newOverBottom;
+			if ( overTop < 0 ) {
+				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight -
+					outerHeight - withinOffset;
+				if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			} else if ( overBottom > 0 ) {
+				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset +
+					offset - offsetTop;
+				if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+		}
+	},
+	flipfit: {
+		left: function() {
+			$.ui.position.flip.left.apply( this, arguments );
+			$.ui.position.fit.left.apply( this, arguments );
+		},
+		top: function() {
+			$.ui.position.flip.top.apply( this, arguments );
+			$.ui.position.fit.top.apply( this, arguments );
+		}
+	}
+};
+
+} )();
+
+var position = $.ui.position;
+
+
+/*!
+ * jQuery UI Keycode 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Keycode
+//>>group: Core
+//>>description: Provide keycodes as keynames
+//>>docs: http://api.jqueryui.com/jQuery.ui.keyCode/
+
+
+var keycode = $.ui.keyCode = {
+	BACKSPACE: 8,
+	COMMA: 188,
+	DELETE: 46,
+	DOWN: 40,
+	END: 35,
+	ENTER: 13,
+	ESCAPE: 27,
+	HOME: 36,
+	LEFT: 37,
+	PAGE_DOWN: 34,
+	PAGE_UP: 33,
+	PERIOD: 190,
+	RIGHT: 39,
+	SPACE: 32,
+	TAB: 9,
+	UP: 38
+};
+
+
+/*!
+ * jQuery UI Unique ID 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: uniqueId
+//>>group: Core
+//>>description: Functions to generate and remove uniqueId's
+//>>docs: http://api.jqueryui.com/uniqueId/
+
+
+
+var uniqueId = $.fn.extend( {
+	uniqueId: ( function() {
+		var uuid = 0;
+
+		return function() {
+			return this.each( function() {
+				if ( !this.id ) {
+					this.id = "ui-id-" + ( ++uuid );
+				}
+			} );
+		};
+	} )(),
+
+	removeUniqueId: function() {
+		return this.each( function() {
+			if ( /^ui-id-\d+$/.test( this.id ) ) {
+				$( this ).removeAttr( "id" );
+			}
+		} );
+	}
+} );
+
+
+
+var safeActiveElement = $.ui.safeActiveElement = function( document ) {
+	var activeElement;
+
+	// Support: IE 9 only
+	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+	try {
+		activeElement = document.activeElement;
+	} catch ( error ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 9 - 11 only
+	// IE may return null instead of an element
+	// Interestingly, this only seems to occur when NOT in an iframe
+	if ( !activeElement ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 11 only
+	// IE11 returns a seemingly empty object in some cases when accessing
+	// document.activeElement from an <iframe>
+	if ( !activeElement.nodeName ) {
+		activeElement = document.body;
+	}
+
+	return activeElement;
+};
+
+
+/*!
+ * jQuery UI Menu 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Menu
+//>>group: Widgets
+//>>description: Creates nestable menus.
+//>>docs: http://api.jqueryui.com/menu/
+//>>demos: http://jqueryui.com/menu/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/menu.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+var widgetsMenu = $.widget( "ui.menu", {
+	version: "1.12.1",
+	defaultElement: "<ul>",
+	delay: 300,
+	options: {
+		icons: {
+			submenu: "ui-icon-caret-1-e"
+		},
+		items: "> *",
+		menus: "ul",
+		position: {
+			my: "left top",
+			at: "right top"
+		},
+		role: "menu",
+
+		// Callbacks
+		blur: null,
+		focus: null,
+		select: null
+	},
+
+	_create: function() {
+		this.activeMenu = this.element;
+
+		// Flag used to prevent firing of the click handler
+		// as the event bubbles up through nested menus
+		this.mouseHandled = false;
+		this.element
+			.uniqueId()
+			.attr( {
+				role: this.options.role,
+				tabIndex: 0
+			} );
+
+		this._addClass( "ui-menu", "ui-widget ui-widget-content" );
+		this._on( {
+
+			// Prevent focus from sticking to links inside menu after clicking
+			// them (focus should always stay on UL during navigation).
+			"mousedown .ui-menu-item": function( event ) {
+				event.preventDefault();
+			},
+			"click .ui-menu-item": function( event ) {
+				var target = $( event.target );
+				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
+					this.select( event );
+
+					// Only set the mouseHandled flag if the event will bubble, see #9469.
+					if ( !event.isPropagationStopped() ) {
+						this.mouseHandled = true;
+					}
+
+					// Open submenu on click
+					if ( target.has( ".ui-menu" ).length ) {
+						this.expand( event );
+					} else if ( !this.element.is( ":focus" ) &&
+							active.closest( ".ui-menu" ).length ) {
+
+						// Redirect focus to the menu
+						this.element.trigger( "focus", [ true ] );
+
+						// If the active item is on the top level, let it stay active.
+						// Otherwise, blur the active item since it is no longer visible.
+						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
+							clearTimeout( this.timer );
+						}
+					}
+				}
+			},
+			"mouseenter .ui-menu-item": function( event ) {
+
+				// Ignore mouse events while typeahead is active, see #10458.
+				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
+				// is over an item in the menu
+				if ( this.previousFilter ) {
+					return;
+				}
+
+				var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
+					target = $( event.currentTarget );
+
+				// Ignore bubbled events on parent items, see #11641
+				if ( actualTarget[ 0 ] !== target[ 0 ] ) {
+					return;
+				}
+
+				// Remove ui-state-active class from siblings of the newly focused menu item
+				// to avoid a jump caused by adjacent elements both having a class with a border
+				this._removeClass( target.siblings().children( ".ui-state-active" ),
+					null, "ui-state-active" );
+				this.focus( event, target );
+			},
+			mouseleave: "collapseAll",
+			"mouseleave .ui-menu": "collapseAll",
+			focus: function( event, keepActiveItem ) {
+
+				// If there's already an active item, keep it active
+				// If not, activate the first item
+				var item = this.active || this.element.find( this.options.items ).eq( 0 );
+
+				if ( !keepActiveItem ) {
+					this.focus( event, item );
+				}
+			},
+			blur: function( event ) {
+				this._delay( function() {
+					var notContained = !$.contains(
+						this.element[ 0 ],
+						$.ui.safeActiveElement( this.document[ 0 ] )
+					);
+					if ( notContained ) {
+						this.collapseAll( event );
+					}
+				} );
+			},
+			keydown: "_keydown"
+		} );
+
+		this.refresh();
+
+		// Clicks outside of a menu collapse any open menus
+		this._on( this.document, {
+			click: function( event ) {
+				if ( this._closeOnDocumentClick( event ) ) {
+					this.collapseAll( event );
+				}
+
+				// Reset the mouseHandled flag
+				this.mouseHandled = false;
+			}
+		} );
+	},
+
+	_destroy: function() {
+		var items = this.element.find( ".ui-menu-item" )
+				.removeAttr( "role aria-disabled" ),
+			submenus = items.children( ".ui-menu-item-wrapper" )
+				.removeUniqueId()
+				.removeAttr( "tabIndex role aria-haspopup" );
+
+		// Destroy (sub)menus
+		this.element
+			.removeAttr( "aria-activedescendant" )
+			.find( ".ui-menu" ).addBack()
+				.removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
+					"tabIndex" )
+				.removeUniqueId()
+				.show();
+
+		submenus.children().each( function() {
+			var elem = $( this );
+			if ( elem.data( "ui-menu-submenu-caret" ) ) {
+				elem.remove();
+			}
+		} );
+	},
+
+	_keydown: function( event ) {
+		var match, prev, character, skip,
+			preventDefault = true;
+
+		switch ( event.keyCode ) {
+		case $.ui.keyCode.PAGE_UP:
+			this.previousPage( event );
+			break;
+		case $.ui.keyCode.PAGE_DOWN:
+			this.nextPage( event );
+			break;
+		case $.ui.keyCode.HOME:
+			this._move( "first", "first", event );
+			break;
+		case $.ui.keyCode.END:
+			this._move( "last", "last", event );
+			break;
+		case $.ui.keyCode.UP:
+			this.previous( event );
+			break;
+		case $.ui.keyCode.DOWN:
+			this.next( event );
+			break;
+		case $.ui.keyCode.LEFT:
+			this.collapse( event );
+			break;
+		case $.ui.keyCode.RIGHT:
+			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+				this.expand( event );
+			}
+			break;
+		case $.ui.keyCode.ENTER:
+		case $.ui.keyCode.SPACE:
+			this._activate( event );
+			break;
+		case $.ui.keyCode.ESCAPE:
+			this.collapse( event );
+			break;
+		default:
+			preventDefault = false;
+			prev = this.previousFilter || "";
+			skip = false;
+
+			// Support number pad values
+			character = event.keyCode >= 96 && event.keyCode <= 105 ?
+				( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode );
+
+			clearTimeout( this.filterTimer );
+
+			if ( character === prev ) {
+				skip = true;
+			} else {
+				character = prev + character;
+			}
+
+			match = this._filterMenuItems( character );
+			match = skip && match.index( this.active.next() ) !== -1 ?
+				this.active.nextAll( ".ui-menu-item" ) :
+				match;
+
+			// If no matches on the current filter, reset to the last character pressed
+			// to move down the menu to the first item that starts with that character
+			if ( !match.length ) {
+				character = String.fromCharCode( event.keyCode );
+				match = this._filterMenuItems( character );
+			}
+
+			if ( match.length ) {
+				this.focus( event, match );
+				this.previousFilter = character;
+				this.filterTimer = this._delay( function() {
+					delete this.previousFilter;
+				}, 1000 );
+			} else {
+				delete this.previousFilter;
+			}
+		}
+
+		if ( preventDefault ) {
+			event.preventDefault();
+		}
+	},
+
+	_activate: function( event ) {
+		if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+			if ( this.active.children( "[aria-haspopup='true']" ).length ) {
+				this.expand( event );
+			} else {
+				this.select( event );
+			}
+		}
+	},
+
+	refresh: function() {
+		var menus, items, newSubmenus, newItems, newWrappers,
+			that = this,
+			icon = this.options.icons.submenu,
+			submenus = this.element.find( this.options.menus );
+
+		this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length );
+
+		// Initialize nested menus
+		newSubmenus = submenus.filter( ":not(.ui-menu)" )
+			.hide()
+			.attr( {
+				role: this.options.role,
+				"aria-hidden": "true",
+				"aria-expanded": "false"
+			} )
+			.each( function() {
+				var menu = $( this ),
+					item = menu.prev(),
+					submenuCaret = $( "<span>" ).data( "ui-menu-submenu-caret", true );
+
+				that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon );
+				item
+					.attr( "aria-haspopup", "true" )
+					.prepend( submenuCaret );
+				menu.attr( "aria-labelledby", item.attr( "id" ) );
+			} );
+
+		this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" );
+
+		menus = submenus.add( this.element );
+		items = menus.find( this.options.items );
+
+		// Initialize menu-items containing spaces and/or dashes only as dividers
+		items.not( ".ui-menu-item" ).each( function() {
+			var item = $( this );
+			if ( that._isDivider( item ) ) {
+				that._addClass( item, "ui-menu-divider", "ui-widget-content" );
+			}
+		} );
+
+		// Don't refresh list items that are already adapted
+		newItems = items.not( ".ui-menu-item, .ui-menu-divider" );
+		newWrappers = newItems.children()
+			.not( ".ui-menu" )
+				.uniqueId()
+				.attr( {
+					tabIndex: -1,
+					role: this._itemRole()
+				} );
+		this._addClass( newItems, "ui-menu-item" )
+			._addClass( newWrappers, "ui-menu-item-wrapper" );
+
+		// Add aria-disabled attribute to any disabled menu item
+		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
+
+		// If the active item has been removed, blur the menu
+		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+			this.blur();
+		}
+	},
+
+	_itemRole: function() {
+		return {
+			menu: "menuitem",
+			listbox: "option"
+		}[ this.options.role ];
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "icons" ) {
+			var icons = this.element.find( ".ui-menu-icon" );
+			this._removeClass( icons, null, this.options.icons.submenu )
+				._addClass( icons, null, value.submenu );
+		}
+		this._super( key, value );
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", String( value ) );
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
+	focus: function( event, item ) {
+		var nested, focused, activeParent;
+		this.blur( event, event && event.type === "focus" );
+
+		this._scrollIntoView( item );
+
+		this.active = item.first();
+
+		focused = this.active.children( ".ui-menu-item-wrapper" );
+		this._addClass( focused, null, "ui-state-active" );
+
+		// Only update aria-activedescendant if there's a role
+		// otherwise we assume focus is managed elsewhere
+		if ( this.options.role ) {
+			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
+		}
+
+		// Highlight active parent menu item, if any
+		activeParent = this.active
+			.parent()
+				.closest( ".ui-menu-item" )
+					.children( ".ui-menu-item-wrapper" );
+		this._addClass( activeParent, null, "ui-state-active" );
+
+		if ( event && event.type === "keydown" ) {
+			this._close();
+		} else {
+			this.timer = this._delay( function() {
+				this._close();
+			}, this.delay );
+		}
+
+		nested = item.children( ".ui-menu" );
+		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
+			this._startOpening( nested );
+		}
+		this.activeMenu = item.parent();
+
+		this._trigger( "focus", event, { item: item } );
+	},
+
+	_scrollIntoView: function( item ) {
+		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+		if ( this._hasScroll() ) {
+			borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
+			paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
+			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+			scroll = this.activeMenu.scrollTop();
+			elementHeight = this.activeMenu.height();
+			itemHeight = item.outerHeight();
+
+			if ( offset < 0 ) {
+				this.activeMenu.scrollTop( scroll + offset );
+			} else if ( offset + itemHeight > elementHeight ) {
+				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+			}
+		}
+	},
+
+	blur: function( event, fromFocus ) {
+		if ( !fromFocus ) {
+			clearTimeout( this.timer );
+		}
+
+		if ( !this.active ) {
+			return;
+		}
+
+		this._removeClass( this.active.children( ".ui-menu-item-wrapper" ),
+			null, "ui-state-active" );
+
+		this._trigger( "blur", event, { item: this.active } );
+		this.active = null;
+	},
+
+	_startOpening: function( submenu ) {
+		clearTimeout( this.timer );
+
+		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
+		// shift in the submenu position when mousing over the caret icon
+		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
+			return;
+		}
+
+		this.timer = this._delay( function() {
+			this._close();
+			this._open( submenu );
+		}, this.delay );
+	},
+
+	_open: function( submenu ) {
+		var position = $.extend( {
+			of: this.active
+		}, this.options.position );
+
+		clearTimeout( this.timer );
+		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
+			.hide()
+			.attr( "aria-hidden", "true" );
+
+		submenu
+			.show()
+			.removeAttr( "aria-hidden" )
+			.attr( "aria-expanded", "true" )
+			.position( position );
+	},
+
+	collapseAll: function( event, all ) {
+		clearTimeout( this.timer );
+		this.timer = this._delay( function() {
+
+			// If we were passed an event, look for the submenu that contains the event
+			var currentMenu = all ? this.element :
+				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
+
+			// If we found no valid submenu ancestor, use the main menu to close all
+			// sub menus anyway
+			if ( !currentMenu.length ) {
+				currentMenu = this.element;
+			}
+
+			this._close( currentMenu );
+
+			this.blur( event );
+
+			// Work around active item staying active after menu is blurred
+			this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" );
+
+			this.activeMenu = currentMenu;
+		}, this.delay );
+	},
+
+	// With no arguments, closes the currently active menu - if nothing is active
+	// it closes all menus.  If passed an argument, it will search for menus BELOW
+	_close: function( startMenu ) {
+		if ( !startMenu ) {
+			startMenu = this.active ? this.active.parent() : this.element;
+		}
+
+		startMenu.find( ".ui-menu" )
+			.hide()
+			.attr( "aria-hidden", "true" )
+			.attr( "aria-expanded", "false" );
+	},
+
+	_closeOnDocumentClick: function( event ) {
+		return !$( event.target ).closest( ".ui-menu" ).length;
+	},
+
+	_isDivider: function( item ) {
+
+		// Match hyphen, em dash, en dash
+		return !/[^\-\u2014\u2013\s]/.test( item.text() );
+	},
+
+	collapse: function( event ) {
+		var newItem = this.active &&
+			this.active.parent().closest( ".ui-menu-item", this.element );
+		if ( newItem && newItem.length ) {
+			this._close();
+			this.focus( event, newItem );
+		}
+	},
+
+	expand: function( event ) {
+		var newItem = this.active &&
+			this.active
+				.children( ".ui-menu " )
+					.find( this.options.items )
+						.first();
+
+		if ( newItem && newItem.length ) {
+			this._open( newItem.parent() );
+
+			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+			this._delay( function() {
+				this.focus( event, newItem );
+			} );
+		}
+	},
+
+	next: function( event ) {
+		this._move( "next", "first", event );
+	},
+
+	previous: function( event ) {
+		this._move( "prev", "last", event );
+	},
+
+	isFirstItem: function() {
+		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
+	},
+
+	isLastItem: function() {
+		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+	},
+
+	_move: function( direction, filter, event ) {
+		var next;
+		if ( this.active ) {
+			if ( direction === "first" || direction === "last" ) {
+				next = this.active
+					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
+					.eq( -1 );
+			} else {
+				next = this.active
+					[ direction + "All" ]( ".ui-menu-item" )
+					.eq( 0 );
+			}
+		}
+		if ( !next || !next.length || !this.active ) {
+			next = this.activeMenu.find( this.options.items )[ filter ]();
+		}
+
+		this.focus( event, next );
+	},
+
+	nextPage: function( event ) {
+		var item, base, height;
+
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isLastItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.nextAll( ".ui-menu-item" ).each( function() {
+				item = $( this );
+				return item.offset().top - base - height < 0;
+			} );
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.find( this.options.items )
+				[ !this.active ? "first" : "last" ]() );
+		}
+	},
+
+	previousPage: function( event ) {
+		var item, base, height;
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isFirstItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.prevAll( ".ui-menu-item" ).each( function() {
+				item = $( this );
+				return item.offset().top - base + height > 0;
+			} );
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.find( this.options.items ).first() );
+		}
+	},
+
+	_hasScroll: function() {
+		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
+	},
+
+	select: function( event ) {
+
+		// TODO: It should never be possible to not have an active item at this
+		// point, but the tests don't trigger mouseenter before click.
+		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+		var ui = { item: this.active };
+		if ( !this.active.has( ".ui-menu" ).length ) {
+			this.collapseAll( event, true );
+		}
+		this._trigger( "select", event, ui );
+	},
+
+	_filterMenuItems: function( character ) {
+		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
+			regex = new RegExp( "^" + escapedCharacter, "i" );
+
+		return this.activeMenu
+			.find( this.options.items )
+
+				// Only match on items, not dividers or other content (#10571)
+				.filter( ".ui-menu-item" )
+					.filter( function() {
+						return regex.test(
+							$.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
+					} );
+	}
+} );
+
+
+/*!
+ * jQuery UI Autocomplete 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Autocomplete
+//>>group: Widgets
+//>>description: Lists suggested words as the user is typing.
+//>>docs: http://api.jqueryui.com/autocomplete/
+//>>demos: http://jqueryui.com/autocomplete/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/autocomplete.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+
+$.widget( "ui.autocomplete", {
+	version: "1.12.1",
+	defaultElement: "<input>",
+	options: {
+		appendTo: null,
+		autoFocus: false,
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null,
+
+		// Callbacks
+		change: null,
+		close: null,
+		focus: null,
+		open: null,
+		response: null,
+		search: null,
+		select: null
+	},
+
+	requestIndex: 0,
+	pending: 0,
+
+	_create: function() {
+
+		// Some browsers only repeat keydown events, not keypress events,
+		// so we use the suppressKeyPress flag to determine if we've already
+		// handled the keydown event. #7269
+		// Unfortunately the code for & in keypress is the same as the up arrow,
+		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
+		// events when we know the keydown event was used to modify the
+		// search term. #7799
+		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
+			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
+			isTextarea = nodeName === "textarea",
+			isInput = nodeName === "input";
+
+		// Textareas are always multi-line
+		// Inputs are always single-line, even if inside a contentEditable element
+		// IE also treats inputs as contentEditable
+		// All other element types are determined by whether or not they're contentEditable
+		this.isMultiLine = isTextarea || !isInput && this._isContentEditable( this.element );
+
+		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
+		this.isNewMenu = true;
+
+		this._addClass( "ui-autocomplete-input" );
+		this.element.attr( "autocomplete", "off" );
+
+		this._on( this.element, {
+			keydown: function( event ) {
+				if ( this.element.prop( "readOnly" ) ) {
+					suppressKeyPress = true;
+					suppressInput = true;
+					suppressKeyPressRepeat = true;
+					return;
+				}
+
+				suppressKeyPress = false;
+				suppressInput = false;
+				suppressKeyPressRepeat = false;
+				var keyCode = $.ui.keyCode;
+				switch ( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					suppressKeyPress = true;
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					suppressKeyPress = true;
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					suppressKeyPress = true;
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					suppressKeyPress = true;
+					this._keyEvent( "next", event );
+					break;
+				case keyCode.ENTER:
+
+					// when menu is open and has focus
+					if ( this.menu.active ) {
+
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.TAB:
+					if ( this.menu.active ) {
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.ESCAPE:
+					if ( this.menu.element.is( ":visible" ) ) {
+						if ( !this.isMultiLine ) {
+							this._value( this.term );
+						}
+						this.close( event );
+
+						// Different browsers have different default behavior for escape
+						// Single press can mean undo or clear
+						// Double press in IE means clear the whole form
+						event.preventDefault();
+					}
+					break;
+				default:
+					suppressKeyPressRepeat = true;
+
+					// search timeout should be triggered before the input value is changed
+					this._searchTimeout( event );
+					break;
+				}
+			},
+			keypress: function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+						event.preventDefault();
+					}
+					return;
+				}
+				if ( suppressKeyPressRepeat ) {
+					return;
+				}
+
+				// Replicate some key handlers to allow them to repeat in Firefox and Opera
+				var keyCode = $.ui.keyCode;
+				switch ( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					this._keyEvent( "next", event );
+					break;
+				}
+			},
+			input: function( event ) {
+				if ( suppressInput ) {
+					suppressInput = false;
+					event.preventDefault();
+					return;
+				}
+				this._searchTimeout( event );
+			},
+			focus: function() {
+				this.selectedItem = null;
+				this.previous = this._value();
+			},
+			blur: function( event ) {
+				if ( this.cancelBlur ) {
+					delete this.cancelBlur;
+					return;
+				}
+
+				clearTimeout( this.searching );
+				this.close( event );
+				this._change( event );
+			}
+		} );
+
+		this._initSource();
+		this.menu = $( "<ul>" )
+			.appendTo( this._appendTo() )
+			.menu( {
+
+				// disable ARIA support, the live region takes care of that
+				role: null
+			} )
+			.hide()
+			.menu( "instance" );
+
+		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
+		this._on( this.menu.element, {
+			mousedown: function( event ) {
+
+				// prevent moving focus out of the text field
+				event.preventDefault();
+
+				// IE doesn't prevent moving focus even with event.preventDefault()
+				// so we set a flag to know when we should ignore the blur event
+				this.cancelBlur = true;
+				this._delay( function() {
+					delete this.cancelBlur;
+
+					// Support: IE 8 only
+					// Right clicking a menu item or selecting text from the menu items will
+					// result in focus moving out of the input. However, we've already received
+					// and ignored the blur event because of the cancelBlur flag set above. So
+					// we restore focus to ensure that the menu closes properly based on the user's
+					// next actions.
+					if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+						this.element.trigger( "focus" );
+					}
+				} );
+			},
+			menufocus: function( event, ui ) {
+				var label, item;
+
+				// support: Firefox
+				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
+				if ( this.isNewMenu ) {
+					this.isNewMenu = false;
+					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
+						this.menu.blur();
+
+						this.document.one( "mousemove", function() {
+							$( event.target ).trigger( event.originalEvent );
+						} );
+
+						return;
+					}
+				}
+
+				item = ui.item.data( "ui-autocomplete-item" );
+				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+
+					// use value to match what will end up in the input, if it was a key event
+					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
+						this._value( item.value );
+					}
+				}
+
+				// Announce the value in the liveRegion
+				label = ui.item.attr( "aria-label" ) || item.value;
+				if ( label && $.trim( label ).length ) {
+					this.liveRegion.children().hide();
+					$( "<div>" ).text( label ).appendTo( this.liveRegion );
+				}
+			},
+			menuselect: function( event, ui ) {
+				var item = ui.item.data( "ui-autocomplete-item" ),
+					previous = this.previous;
+
+				// Only trigger when focus was lost (click on menu)
+				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+					this.element.trigger( "focus" );
+					this.previous = previous;
+
+					// #6109 - IE triggers two focus events and the second
+					// is asynchronous, so we need to reset the previous
+					// term synchronously and asynchronously :-(
+					this._delay( function() {
+						this.previous = previous;
+						this.selectedItem = item;
+					} );
+				}
+
+				if ( false !== this._trigger( "select", event, { item: item } ) ) {
+					this._value( item.value );
+				}
+
+				// reset the term after the select event
+				// this allows custom select handling to work properly
+				this.term = this._value();
+
+				this.close( event );
+				this.selectedItem = item;
+			}
+		} );
+
+		this.liveRegion = $( "<div>", {
+			role: "status",
+			"aria-live": "assertive",
+			"aria-relevant": "additions"
+		} )
+			.appendTo( this.document[ 0 ].body );
+
+		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
+
+		// Turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		} );
+	},
+
+	_destroy: function() {
+		clearTimeout( this.searching );
+		this.element.removeAttr( "autocomplete" );
+		this.menu.element.remove();
+		this.liveRegion.remove();
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( this._appendTo() );
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_isEventTargetInWidget: function( event ) {
+		var menuElement = this.menu.element[ 0 ];
+
+		return event.target === this.element[ 0 ] ||
+			event.target === menuElement ||
+			$.contains( menuElement, event.target );
+	},
+
+	_closeOnClickOutside: function( event ) {
+		if ( !this._isEventTargetInWidget( event ) ) {
+			this.close();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+
+		if ( element ) {
+			element = element.jquery || element.nodeType ?
+				$( element ) :
+				this.document.find( element ).eq( 0 );
+		}
+
+		if ( !element || !element[ 0 ] ) {
+			element = this.element.closest( ".ui-front, dialog" );
+		}
+
+		if ( !element.length ) {
+			element = this.document[ 0 ].body;
+		}
+
+		return element;
+	},
+
+	_initSource: function() {
+		var array, url,
+			that = this;
+		if ( $.isArray( this.options.source ) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter( array, request.term ) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( that.xhr ) {
+					that.xhr.abort();
+				}
+				that.xhr = $.ajax( {
+					url: url,
+					data: request,
+					dataType: "json",
+					success: function( data ) {
+						response( data );
+					},
+					error: function() {
+						response( [] );
+					}
+				} );
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	_searchTimeout: function( event ) {
+		clearTimeout( this.searching );
+		this.searching = this._delay( function() {
+
+			// Search if the value has changed, or if the user retypes the same value (see #7434)
+			var equalValues = this.term === this._value(),
+				menuVisible = this.menu.element.is( ":visible" ),
+				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
+
+			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
+				this.selectedItem = null;
+				this.search( null, event );
+			}
+		}, this.options.delay );
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this._value();
+
+		// Always save the actual value, not the one passed as an argument
+		this.term = this._value();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this._addClass( "ui-autocomplete-loading" );
+		this.cancelSearch = false;
+
+		this.source( { term: value }, this._response() );
+	},
+
+	_response: function() {
+		var index = ++this.requestIndex;
+
+		return $.proxy( function( content ) {
+			if ( index === this.requestIndex ) {
+				this.__response( content );
+			}
+
+			this.pending--;
+			if ( !this.pending ) {
+				this._removeClass( "ui-autocomplete-loading" );
+			}
+		}, this );
+	},
+
+	__response: function( content ) {
+		if ( content ) {
+			content = this._normalize( content );
+		}
+		this._trigger( "response", null, { content: content } );
+		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+
+			// use ._close() instead of .close() so we don't cancel future searches
+			this._close();
+		}
+	},
+
+	close: function( event ) {
+		this.cancelSearch = true;
+		this._close( event );
+	},
+
+	_close: function( event ) {
+
+		// Remove the handler that closes the menu on outside clicks
+		this._off( this.document, "mousedown" );
+
+		if ( this.menu.element.is( ":visible" ) ) {
+			this.menu.element.hide();
+			this.menu.blur();
+			this.isNewMenu = true;
+			this._trigger( "close", event );
+		}
+	},
+
+	_change: function( event ) {
+		if ( this.previous !== this._value() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
+			return items;
+		}
+		return $.map( items, function( item ) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend( {}, item, {
+				label: item.label || item.value,
+				value: item.value || item.label
+			} );
+		} );
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element.empty();
+		this._renderMenu( ul, items );
+		this.isNewMenu = true;
+		this.menu.refresh();
+
+		// Size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend( {
+			of: this.element
+		}, this.options.position ) );
+
+		if ( this.options.autoFocus ) {
+			this.menu.next();
+		}
+
+		// Listen for interactions outside of the widget (#6642)
+		this._on( this.document, {
+			mousedown: "_closeOnClickOutside"
+		} );
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+
+			// Firefox wraps long text (possibly a rounding bug)
+			// so we add 1px to avoid the wrapping (#7513)
+			ul.width( "" ).outerWidth() + 1,
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var that = this;
+		$.each( items, function( index, item ) {
+			that._renderItemData( ul, item );
+		} );
+	},
+
+	_renderItemData: function( ul, item ) {
+		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
+	},
+
+	_renderItem: function( ul, item ) {
+		return $( "<li>" )
+			.append( $( "<div>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is( ":visible" ) ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
+				this.menu.isLastItem() && /^next/.test( direction ) ) {
+
+			if ( !this.isMultiLine ) {
+				this._value( this.term );
+			}
+
+			this.menu.blur();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	},
+
+	_value: function() {
+		return this.valueMethod.apply( this.element, arguments );
+	},
+
+	_keyEvent: function( keyEvent, event ) {
+		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+			this._move( keyEvent, event );
+
+			// Prevents moving cursor to beginning/end of the text field in some browsers
+			event.preventDefault();
+		}
+	},
+
+	// Support: Chrome <=50
+	// We should be able to just use this.element.prop( "isContentEditable" )
+	// but hidden elements always report false in Chrome.
+	// https://code.google.com/p/chromium/issues/detail?id=313082
+	_isContentEditable: function( element ) {
+		if ( !element.length ) {
+			return false;
+		}
+
+		var editable = element.prop( "contentEditable" );
+
+		if ( editable === "inherit" ) {
+		  return this._isContentEditable( element.parent() );
+		}
+
+		return editable === "true";
+	}
+} );
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+	},
+	filter: function( array, term ) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
+		return $.grep( array, function( value ) {
+			return matcher.test( value.label || value.value || value );
+		} );
+	}
+} );
+
+// Live region extension, adding a `messages` option
+// NOTE: This is an experimental API. We are still investigating
+// a full solution for string manipulation and internationalization.
+$.widget( "ui.autocomplete", $.ui.autocomplete, {
+	options: {
+		messages: {
+			noResults: "No search results.",
+			results: function( amount ) {
+				return amount + ( amount > 1 ? " results are" : " result is" ) +
+					" available, use up and down arrow keys to navigate.";
+			}
+		}
+	},
+
+	__response: function( content ) {
+		var message;
+		this._superApply( arguments );
+		if ( this.options.disabled || this.cancelSearch ) {
+			return;
+		}
+		if ( content && content.length ) {
+			message = this.options.messages.results( content.length );
+		} else {
+			message = this.options.messages.noResults;
+		}
+		this.liveRegion.children().hide();
+		$( "<div>" ).text( message ).appendTo( this.liveRegion );
+	}
+} );
+
+var widgetsAutocomplete = $.ui.autocomplete;
+
+
+
+
+}));
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.css b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.css
new file mode 100644
index 00000000000..6be72f58c02
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.css
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.12.1 - 2018-12-06
+* http://jqueryui.com
+* Includes: core.css, autocomplete.css, menu.css, theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=custom-theme&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgImgOpacityContent=75&bgImgOpacityHeader=75&cornerRadiusShadow=8px&offsetLeftShadow=-8px&offsetTopShadow=-8px&thicknessShadow=8px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=%23aaaaaa&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=%23aaaaaa&iconColorError=%23cd0a0a&fcError=%23cd0a0a&borderColorError=%23cd0a0a&bgTextureError=glass&bgColorError=%23fef1ec&iconColorHighlight=%232e83ff&fcHighlight=%23363636&borderColorHighlight=%23fcefa1&bgTextureHighlight=glass&bgColorHighlight=%23fbf9ee&iconColorActive=%23454545&fcActive=%23212121&borderColorActive=%23aaaaaa&bgTextureActive=glass&bgColorActive=%23dadada&iconColorHover=%23454545&fcHover=%23212121&borderColorHover=%23999999&bgTextureHover=glass&bgColorHover=%23dadada&iconColorDefault=%23888888&fcDefault=%23555555&borderColorDefault=%23d3d3d3&bgTextureDefault=glass&bgColorDefault=%23e6e6e6&iconColorContent=%23222222&fcContent=%23222222&borderColorContent=%23aaaaaa&bgTextureContent=flat&bgColorContent=%23ffffff&iconColorHeader=%23222222&fcHeader=%23222222&borderColorHeader=%23aaaaaa&bgTextureHeader=highlight_soft&bgColorHeader=%23cccccc&cornerRadius=4px&fwDefault=normal&fsDefault=1.1em&ffDefault=Verdana%2CArial%2Csans-serif
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #d3d3d3}.ui-widget-content{border:1px solid #aaa;background:#fff;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#212121;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #aaa;background:#dadada url("images/ui-bg_glass_65_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-icon-background,.ui-state-active .ui-icon-background{border:#aaa;background-color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-checked{border:1px solid #fcefa1;background:#fbf9ee}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{-webkit-box-shadow:-8px -8px 8px #aaa;box-shadow:-8px -8px 8px #aaa}
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.js b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.js
new file mode 100644
index 00000000000..54d4beb8554
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.min.js
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.12.1 - 2018-12-06
+* http://jqueryui.com
+* Includes: widget.js, position.js, keycode.js, unique-id.js, widgets/autocomplete.js, widgets/menu.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){t.ui=t.ui||{},t.ui.version="1.12.1";var e=0,i=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var s,n,o=i.call(arguments,1),a=0,r=o.length;r>a;a++)for(s in o[a])n=o[a][s],o[a].hasOwnProperty(s)&&void 0!==n&&(e[s]=t.isPlainObject(n)?t.isPlainObject(e[s])?t.widget.extend({},e[s],n):t.widget.extend({},n):n);return e},t.widget.bridge=function(e,s){var n=s.prototype.widgetFullName||e;t.fn[e]=function(o){var a="string"==typeof o,r=i.call(arguments,1),l=this;return a?this.length||"instance"!==o?this.each(function(){var i,s=t.data(this,n);return"instance"===o?(l=s,!1):s?t.isFunction(s[o])&&"_"!==o.charAt(0)?(i=s[o].apply(s,r),i!==s&&void 0!==i?(l=i&&i.jquery?l.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+o+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+o+"'")}):l=void 0:(r.length&&(o=t.widget.extend.apply(null,[o].concat(r))),this.each(function(){var e=t.data(this,n);e?(e.option(o||{}),e._init&&e._init()):t.data(this,n,new s(o,this))})),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(i,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=e++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),i),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,l=/top|center|bottom/,h=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):l.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=l.test(i[1])?i[1]:"center",t=h.exec(i[0]),e=h.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,l=t(this),h=l.outerWidth(),c=l.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=h+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),T=e(k.my,l.outerWidth(),l.outerHeight());"right"===n.my[0]?D.left-=h:"center"===n.my[0]&&(D.left-=h/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=T[0],D.top+=T[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:h,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+T[0],u[1]+T[1]],my:n.my,at:n.at,within:b,elem:l})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-h,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:l,left:D.left,top:D.top,width:h,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};h>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),l.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,l=n-r,h=r+e.collisionWidth-a-n;e.collisionWidth>a?l>0&&0>=h?(i=t.left+l+e.collisionWidth-a-n,t.left+=l-i):t.left=h>0&&0>=l?n:l>h?n+a-e.collisionWidth:n:l>0?t.left+=l:h>0?t.left-=h:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,l=n-r,h=r+e.collisionHeight-a-n;e.collisionHeight>a?l>0&&0>=h?(i=t.top+l+e.collisionHeight-a-n,t.top+=l-i):t.top=h>0&&0>=l?n:l>h?n+a-e.collisionHeight:n:l>0?t.top+=l:h>0?t.top-=h:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,l=n.isWindow?n.scrollLeft:n.offset.left,h=t.left-e.collisionPosition.marginLeft,c=h-l,u=h+e.collisionWidth-r-l,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-l,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,l=n.isWindow?n.scrollTop:n.offset.top,h=t.top-e.collisionPosition.marginTop,c=h-l,u=h+e.collisionHeight-r-l,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-l,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,l=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=l.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=l.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete});
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.css b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.css
new file mode 100644
index 00000000000..d8c81c2b9d7
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.css
@@ -0,0 +1,156 @@
+/*!
+ * jQuery UI CSS Framework 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/category/theming/
+ */
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0); /* support: IE8 */
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+	pointer-events: none;
+}
+
+
+/* Icons
+----------------------------------*/
+.ui-icon {
+	display: inline-block;
+	vertical-align: middle;
+	margin-top: -.25em;
+	position: relative;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+.ui-widget-icon-block {
+	left: 50%;
+	margin-left: -8px;
+	display: block;
+}
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-menu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	display: block;
+	outline: 0;
+}
+.ui-menu .ui-menu {
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	cursor: pointer;
+	/* support: IE10, see #8844 */
+	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
+}
+.ui-menu .ui-menu-item-wrapper {
+	position: relative;
+	padding: 3px 1em 3px .4em;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px 0;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+	margin: -1px;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item-wrapper {
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: .2em;
+	margin: auto 0;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	left: auto;
+	right: 0;
+}
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.min.css b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.min.css
new file mode 100644
index 00000000000..e8808927f7c
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jquery-ui.structure.min.css
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.12.1 - 2018-12-06
+* http://jqueryui.com
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.js b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.js
new file mode 100644
index 00000000000..a74cc709f68
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.js
@@ -0,0 +1,56 @@
+/*!
+
+JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
+<http://stuk.github.io/jszip-utils>
+
+(c) 2014 Stuart Knightley, David Duponchel
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
+
+*/
+;(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+var global=typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {};/* jshint evil: true, newcap: false */
+/* global IEBinaryToArray_ByteStr, IEBinaryToArray_ByteStr_Last */
+"use strict";
+
+// Adapted from http://stackoverflow.com/questions/1095102/how-do-i-load-binary-image-data-using-javascript-and-xmlhttprequest
+var IEBinaryToArray_ByteStr_Script =
+    "<!-- IEBinaryToArray_ByteStr -->\r\n"+
+    "<script type='text/vbscript'>\r\n"+
+    "Function IEBinaryToArray_ByteStr(Binary)\r\n"+
+    "   IEBinaryToArray_ByteStr = CStr(Binary)\r\n"+
+    "End Function\r\n"+
+    "Function IEBinaryToArray_ByteStr_Last(Binary)\r\n"+
+    "   Dim lastIndex\r\n"+
+    "   lastIndex = LenB(Binary)\r\n"+
+    "   if lastIndex mod 2 Then\r\n"+
+    "       IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n"+
+    "   Else\r\n"+
+    "       IEBinaryToArray_ByteStr_Last = "+'""'+"\r\n"+
+    "   End If\r\n"+
+    "End Function\r\n"+
+    "</script>\r\n";
+
+// inject VBScript
+document.write(IEBinaryToArray_ByteStr_Script);
+
+global.JSZipUtils._getBinaryFromXHR = function (xhr) {
+    var binary = xhr.responseBody;
+    var byteMapping = {};
+    for ( var i = 0; i < 256; i++ ) {
+        for ( var j = 0; j < 256; j++ ) {
+            byteMapping[ String.fromCharCode( i + (j << 8) ) ] =
+                String.fromCharCode(i) + String.fromCharCode(j);
+        }
+    }
+    var rawBytes = IEBinaryToArray_ByteStr(binary);
+    var lastChr = IEBinaryToArray_ByteStr_Last(binary);
+    return rawBytes.replace(/[\s\S]/g, function( match ) {
+        return byteMapping[match];
+    }) + lastChr;
+};
+
+// enforcing Stuk's coding style
+// vim: set shiftwidth=4 softtabstop=4:
+
+},{}]},{},[1])
+;
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.min.js b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.min.js
new file mode 100644
index 00000000000..93d8bc8ef28
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils-ie.min.js
@@ -0,0 +1,10 @@
+/*!
+
+JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
+<http://stuk.github.io/jszip-utils>
+
+(c) 2014 Stuart Knightley, David Duponchel
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
+
+*/
+!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(){var a="undefined"!=typeof self?self:"undefined"!=typeof window?window:{},b="<!-- IEBinaryToArray_ByteStr -->\r\n<script type='text/vbscript'>\r\nFunction IEBinaryToArray_ByteStr(Binary)\r\n   IEBinaryToArray_ByteStr = CStr(Binary)\r\nEnd Function\r\nFunction IEBinaryToArray_ByteStr_Last(Binary)\r\n   Dim lastIndex\r\n   lastIndex = LenB(Binary)\r\n   if lastIndex mod 2 Then\r\n       IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n   Else\r\n       IEBinaryToArray_ByteStr_Last = \"\"\r\n   End If\r\nEnd Function\r\n</script>\r\n";document.write(b),a.JSZipUtils._getBinaryFromXHR=function(a){for(var b=a.responseBody,c={},d=0;256>d;d++)for(var e=0;256>e;e++)c[String.fromCharCode(d+(e<<8))]=String.fromCharCode(d)+String.fromCharCode(e);var f=IEBinaryToArray_ByteStr(b),g=IEBinaryToArray_ByteStr_Last(b);return f.replace(/[\s\S]/g,function(a){return c[a]})+g}},{}]},{},[1]);
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.js b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.js
new file mode 100644
index 00000000000..775895ec92d
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.js
@@ -0,0 +1,118 @@
+/*!
+
+JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
+<http://stuk.github.io/jszip-utils>
+
+(c) 2014 Stuart Knightley, David Duponchel
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
+
+*/
+!function(e){"object"==typeof exports?module.exports=e():"function"==typeof define&&define.amd?define(e):"undefined"!=typeof window?window.JSZipUtils=e():"undefined"!=typeof global?global.JSZipUtils=e():"undefined"!=typeof self&&(self.JSZipUtils=e())}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';
+
+var JSZipUtils = {};
+// just use the responseText with xhr1, response with xhr2.
+// The transformation doesn't throw away high-order byte (with responseText)
+// because JSZip handles that case. If not used with JSZip, you may need to
+// do it, see https://developer.mozilla.org/En/Using_XMLHttpRequest#Handling_binary_data
+JSZipUtils._getBinaryFromXHR = function (xhr) {
+    // for xhr.responseText, the 0xFF mask is applied by JSZip
+    return xhr.response || xhr.responseText;
+};
+
+// taken from jQuery
+function createStandardXHR() {
+    try {
+        return new window.XMLHttpRequest();
+    } catch( e ) {}
+}
+
+function createActiveXHR() {
+    try {
+        return new window.ActiveXObject("Microsoft.XMLHTTP");
+    } catch( e ) {}
+}
+
+// Create the request object
+var createXHR = window.ActiveXObject ?
+    /* Microsoft failed to properly
+     * implement the XMLHttpRequest in IE7 (can't request local files),
+     * so we use the ActiveXObject when it is available
+     * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+     * we need a fallback.
+     */
+    function() {
+    return createStandardXHR() || createActiveXHR();
+} :
+    // For all other browsers, use the standard XMLHttpRequest object
+    createStandardXHR;
+
+
+
+JSZipUtils.getBinaryContent = function(path, callback) {
+    /*
+     * Here is the tricky part : getting the data.
+     * In firefox/chrome/opera/... setting the mimeType to 'text/plain; charset=x-user-defined'
+     * is enough, the result is in the standard xhr.responseText.
+     * cf https://developer.mozilla.org/En/XMLHttpRequest/Using_XMLHttpRequest#Receiving_binary_data_in_older_browsers
+     * In IE <= 9, we must use (the IE only) attribute responseBody
+     * (for binary data, its content is different from responseText).
+     * In IE 10, the 'charset=x-user-defined' trick doesn't work, only the
+     * responseType will work :
+     * http://msdn.microsoft.com/en-us/library/ie/hh673569%28v=vs.85%29.aspx#Binary_Object_upload_and_download
+     *
+     * I'd like to use jQuery to avoid this XHR madness, but it doesn't support
+     * the responseType attribute : http://bugs.jquery.com/ticket/11461
+     */
+    try {
+
+        var xhr = createXHR();
+
+        xhr.open('GET', path, true);
+
+        // recent browsers
+        if ("responseType" in xhr) {
+            xhr.responseType = "arraybuffer";
+        }
+
+        // older browser
+        if(xhr.overrideMimeType) {
+            xhr.overrideMimeType("text/plain; charset=x-user-defined");
+        }
+
+        xhr.onreadystatechange = function(evt) {
+            var file, err;
+            // use `xhr` and not `this`... thanks IE
+            if (xhr.readyState === 4) {
+                if (xhr.status === 200 || xhr.status === 0) {
+                    file = null;
+                    err = null;
+                    try {
+                        file = JSZipUtils._getBinaryFromXHR(xhr);
+                    } catch(e) {
+                        err = new Error(e);
+                    }
+                    callback(err, file);
+                } else {
+                    callback(new Error("Ajax error for " + path + " : " + this.status + " " + this.statusText), null);
+                }
+            }
+        };
+
+        xhr.send();
+
+    } catch (e) {
+        callback(new Error(e), null);
+    }
+};
+
+// export
+module.exports = JSZipUtils;
+
+// enforcing Stuk's coding style
+// vim: set shiftwidth=4 softtabstop=4:
+
+},{}]},{},[1])
+(1)
+});
+;
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.min.js b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.min.js
new file mode 100644
index 00000000000..78c7f5e5aa8
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jszip-utils/dist/jszip-utils.min.js
@@ -0,0 +1,10 @@
+/*!
+
+JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
+<http://stuk.github.io/jszip-utils>
+
+(c) 2014 Stuart Knightley, David Duponchel
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
+
+*/
+!function(a){"object"==typeof exports?module.exports=a():"function"==typeof define&&define.amd?define(a):"undefined"!=typeof window?window.JSZipUtils=a():"undefined"!=typeof global?global.JSZipUtils=a():"undefined"!=typeof self&&(self.JSZipUtils=a())}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b){"use strict";function c(){try{return new window.XMLHttpRequest}catch(a){}}function d(){try{return new window.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}}var e={};e._getBinaryFromXHR=function(a){return a.response||a.responseText};var f=window.ActiveXObject?function(){return c()||d()}:c;e.getBinaryContent=function(a,b){try{var c=f();c.open("GET",a,!0),"responseType"in c&&(c.responseType="arraybuffer"),c.overrideMimeType&&c.overrideMimeType("text/plain; charset=x-user-defined"),c.onreadystatechange=function(){var d,f;if(4===c.readyState)if(200===c.status||0===c.status){d=null,f=null;try{d=e._getBinaryFromXHR(c)}catch(g){f=new Error(g)}b(f,d)}else b(new Error("Ajax error for "+a+" : "+this.status+" "+this.statusText),null)},c.send()}catch(d){b(new Error(d),null)}},b.exports=e},{}]},{},[1])(1)});
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.js b/Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.js
new file mode 100644
index 00000000000..e53c056b262
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.js
@@ -0,0 +1,11367 @@
+/*!
+
+JSZip v3.2.1 - A JavaScript class for generating and reading zip files
+<http://stuartk.com/jszip>
+
+(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
+
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/master/LICENSE
+*/
+
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.JSZip = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';
+var utils = require('./utils');
+var support = require('./support');
+// private property
+var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+
+// public method for encoding
+exports.encode = function(input) {
+    var output = [];
+    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+    var i = 0, len = input.length, remainingBytes = len;
+
+    var isArray = utils.getTypeOf(input) !== "string";
+    while (i < input.length) {
+        remainingBytes = len - i;
+
+        if (!isArray) {
+            chr1 = input.charCodeAt(i++);
+            chr2 = i < len ? input.charCodeAt(i++) : 0;
+            chr3 = i < len ? input.charCodeAt(i++) : 0;
+        } else {
+            chr1 = input[i++];
+            chr2 = i < len ? input[i++] : 0;
+            chr3 = i < len ? input[i++] : 0;
+        }
+
+        enc1 = chr1 >> 2;
+        enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+        enc3 = remainingBytes > 1 ? (((chr2 & 15) << 2) | (chr3 >> 6)) : 64;
+        enc4 = remainingBytes > 2 ? (chr3 & 63) : 64;
+
+        output.push(_keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4));
+
+    }
+
+    return output.join("");
+};
+
+// public method for decoding
+exports.decode = function(input) {
+    var chr1, chr2, chr3;
+    var enc1, enc2, enc3, enc4;
+    var i = 0, resultIndex = 0;
+
+    var dataUrlPrefix = "data:";
+
+    if (input.substr(0, dataUrlPrefix.length) === dataUrlPrefix) {
+        // This is a common error: people give a data url
+        // (data:image/png;base64,iVBOR...) with a {base64: true} and
+        // wonders why things don't work.
+        // We can detect that the string input looks like a data url but we
+        // *can't* be sure it is one: removing everything up to the comma would
+        // be too dangerous.
+        throw new Error("Invalid base64 input, it looks like a data url.");
+    }
+
+    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+    var totalLength = input.length * 3 / 4;
+    if(input.charAt(input.length - 1) === _keyStr.charAt(64)) {
+        totalLength--;
+    }
+    if(input.charAt(input.length - 2) === _keyStr.charAt(64)) {
+        totalLength--;
+    }
+    if (totalLength % 1 !== 0) {
+        // totalLength is not an integer, the length does not match a valid
+        // base64 content. That can happen if:
+        // - the input is not a base64 content
+        // - the input is *almost* a base64 content, with a extra chars at the
+        //   beginning or at the end
+        // - the input uses a base64 variant (base64url for example)
+        throw new Error("Invalid base64 input, bad content length.");
+    }
+    var output;
+    if (support.uint8array) {
+        output = new Uint8Array(totalLength|0);
+    } else {
+        output = new Array(totalLength|0);
+    }
+
+    while (i < input.length) {
+
+        enc1 = _keyStr.indexOf(input.charAt(i++));
+        enc2 = _keyStr.indexOf(input.charAt(i++));
+        enc3 = _keyStr.indexOf(input.charAt(i++));
+        enc4 = _keyStr.indexOf(input.charAt(i++));
+
+        chr1 = (enc1 << 2) | (enc2 >> 4);
+        chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+        chr3 = ((enc3 & 3) << 6) | enc4;
+
+        output[resultIndex++] = chr1;
+
+        if (enc3 !== 64) {
+            output[resultIndex++] = chr2;
+        }
+        if (enc4 !== 64) {
+            output[resultIndex++] = chr3;
+        }
+
+    }
+
+    return output;
+};
+
+},{"./support":30,"./utils":32}],2:[function(require,module,exports){
+'use strict';
+
+var external = require("./external");
+var DataWorker = require('./stream/DataWorker');
+var DataLengthProbe = require('./stream/DataLengthProbe');
+var Crc32Probe = require('./stream/Crc32Probe');
+var DataLengthProbe = require('./stream/DataLengthProbe');
+
+/**
+ * Represent a compressed object, with everything needed to decompress it.
+ * @constructor
+ * @param {number} compressedSize the size of the data compressed.
+ * @param {number} uncompressedSize the size of the data after decompression.
+ * @param {number} crc32 the crc32 of the decompressed file.
+ * @param {object} compression the type of compression, see lib/compressions.js.
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the compressed data.
+ */
+function CompressedObject(compressedSize, uncompressedSize, crc32, compression, data) {
+    this.compressedSize = compressedSize;
+    this.uncompressedSize = uncompressedSize;
+    this.crc32 = crc32;
+    this.compression = compression;
+    this.compressedContent = data;
+}
+
+CompressedObject.prototype = {
+    /**
+     * Create a worker to get the uncompressed content.
+     * @return {GenericWorker} the worker.
+     */
+    getContentWorker : function () {
+        var worker = new DataWorker(external.Promise.resolve(this.compressedContent))
+        .pipe(this.compression.uncompressWorker())
+        .pipe(new DataLengthProbe("data_length"));
+
+        var that = this;
+        worker.on("end", function () {
+            if(this.streamInfo['data_length'] !== that.uncompressedSize) {
+                throw new Error("Bug : uncompressed data size mismatch");
+            }
+        });
+        return worker;
+    },
+    /**
+     * Create a worker to get the compressed content.
+     * @return {GenericWorker} the worker.
+     */
+    getCompressedWorker : function () {
+        return new DataWorker(external.Promise.resolve(this.compressedContent))
+        .withStreamInfo("compressedSize", this.compressedSize)
+        .withStreamInfo("uncompressedSize", this.uncompressedSize)
+        .withStreamInfo("crc32", this.crc32)
+        .withStreamInfo("compression", this.compression)
+        ;
+    }
+};
+
+/**
+ * Chain the given worker with other workers to compress the content with the
+ * given compresion.
+ * @param {GenericWorker} uncompressedWorker the worker to pipe.
+ * @param {Object} compression the compression object.
+ * @param {Object} compressionOptions the options to use when compressing.
+ * @return {GenericWorker} the new worker compressing the content.
+ */
+CompressedObject.createWorkerFrom = function (uncompressedWorker, compression, compressionOptions) {
+    return uncompressedWorker
+    .pipe(new Crc32Probe())
+    .pipe(new DataLengthProbe("uncompressedSize"))
+    .pipe(compression.compressWorker(compressionOptions))
+    .pipe(new DataLengthProbe("compressedSize"))
+    .withStreamInfo("compression", compression);
+};
+
+module.exports = CompressedObject;
+
+},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(require,module,exports){
+'use strict';
+
+var GenericWorker = require("./stream/GenericWorker");
+
+exports.STORE = {
+    magic: "\x00\x00",
+    compressWorker : function (compressionOptions) {
+        return new GenericWorker("STORE compression");
+    },
+    uncompressWorker : function () {
+        return new GenericWorker("STORE decompression");
+    }
+};
+exports.DEFLATE = require('./flate');
+
+},{"./flate":7,"./stream/GenericWorker":28}],4:[function(require,module,exports){
+'use strict';
+
+var utils = require('./utils');
+
+/**
+ * The following functions come from pako, from pako/lib/zlib/crc32.js
+ * released under the MIT license, see pako https://github.com/nodeca/pako/
+ */
+
+// Use ordinary array, since untyped makes no boost here
+function makeTable() {
+    var c, table = [];
+
+    for(var n =0; n < 256; n++){
+        c = n;
+        for(var k =0; k < 8; k++){
+            c = ((c&1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
+        }
+        table[n] = c;
+    }
+
+    return table;
+}
+
+// Create table on load. Just 255 signed longs. Not a problem.
+var crcTable = makeTable();
+
+
+function crc32(crc, buf, len, pos) {
+    var t = crcTable, end = pos + len;
+
+    crc = crc ^ (-1);
+
+    for (var i = pos; i < end; i++ ) {
+        crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
+    }
+
+    return (crc ^ (-1)); // >>> 0;
+}
+
+// That's all for the pako functions.
+
+/**
+ * Compute the crc32 of a string.
+ * This is almost the same as the function crc32, but for strings. Using the
+ * same function for the two use cases leads to horrible performances.
+ * @param {Number} crc the starting value of the crc.
+ * @param {String} str the string to use.
+ * @param {Number} len the length of the string.
+ * @param {Number} pos the starting position for the crc32 computation.
+ * @return {Number} the computed crc32.
+ */
+function crc32str(crc, str, len, pos) {
+    var t = crcTable, end = pos + len;
+
+    crc = crc ^ (-1);
+
+    for (var i = pos; i < end; i++ ) {
+        crc = (crc >>> 8) ^ t[(crc ^ str.charCodeAt(i)) & 0xFF];
+    }
+
+    return (crc ^ (-1)); // >>> 0;
+}
+
+module.exports = function crc32wrapper(input, crc) {
+    if (typeof input === "undefined" || !input.length) {
+        return 0;
+    }
+
+    var isArray = utils.getTypeOf(input) !== "string";
+
+    if(isArray) {
+        return crc32(crc|0, input, input.length, 0);
+    } else {
+        return crc32str(crc|0, input, input.length, 0);
+    }
+};
+
+},{"./utils":32}],5:[function(require,module,exports){
+'use strict';
+exports.base64 = false;
+exports.binary = false;
+exports.dir = false;
+exports.createFolders = true;
+exports.date = null;
+exports.compression = null;
+exports.compressionOptions = null;
+exports.comment = null;
+exports.unixPermissions = null;
+exports.dosPermissions = null;
+
+},{}],6:[function(require,module,exports){
+/* global Promise */
+'use strict';
+
+// load the global object first:
+// - it should be better integrated in the system (unhandledRejection in node)
+// - the environment may have a custom Promise implementation (see zone.js)
+var ES6Promise = null;
+if (typeof Promise !== "undefined") {
+    ES6Promise = Promise;
+} else {
+    ES6Promise = require("lie");
+}
+
+/**
+ * Let the user use/change some implementations.
+ */
+module.exports = {
+    Promise: ES6Promise
+};
+
+},{"lie":37}],7:[function(require,module,exports){
+'use strict';
+var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
+
+var pako = require("pako");
+var utils = require("./utils");
+var GenericWorker = require("./stream/GenericWorker");
+
+var ARRAY_TYPE = USE_TYPEDARRAY ? "uint8array" : "array";
+
+exports.magic = "\x08\x00";
+
+/**
+ * Create a worker that uses pako to inflate/deflate.
+ * @constructor
+ * @param {String} action the name of the pako function to call : either "Deflate" or "Inflate".
+ * @param {Object} options the options to use when (de)compressing.
+ */
+function FlateWorker(action, options) {
+    GenericWorker.call(this, "FlateWorker/" + action);
+
+    this._pako = null;
+    this._pakoAction = action;
+    this._pakoOptions = options;
+    // the `meta` object from the last chunk received
+    // this allow this worker to pass around metadata
+    this.meta = {};
+}
+
+utils.inherits(FlateWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+FlateWorker.prototype.processChunk = function (chunk) {
+    this.meta = chunk.meta;
+    if (this._pako === null) {
+        this._createPako();
+    }
+    this._pako.push(utils.transformTo(ARRAY_TYPE, chunk.data), false);
+};
+
+/**
+ * @see GenericWorker.flush
+ */
+FlateWorker.prototype.flush = function () {
+    GenericWorker.prototype.flush.call(this);
+    if (this._pako === null) {
+        this._createPako();
+    }
+    this._pako.push([], true);
+};
+/**
+ * @see GenericWorker.cleanUp
+ */
+FlateWorker.prototype.cleanUp = function () {
+    GenericWorker.prototype.cleanUp.call(this);
+    this._pako = null;
+};
+
+/**
+ * Create the _pako object.
+ * TODO: lazy-loading this object isn't the best solution but it's the
+ * quickest. The best solution is to lazy-load the worker list. See also the
+ * issue #446.
+ */
+FlateWorker.prototype._createPako = function () {
+    this._pako = new pako[this._pakoAction]({
+        raw: true,
+        level: this._pakoOptions.level || -1 // default compression
+    });
+    var self = this;
+    this._pako.onData = function(data) {
+        self.push({
+            data : data,
+            meta : self.meta
+        });
+    };
+};
+
+exports.compressWorker = function (compressionOptions) {
+    return new FlateWorker("Deflate", compressionOptions);
+};
+exports.uncompressWorker = function () {
+    return new FlateWorker("Inflate", {});
+};
+
+},{"./stream/GenericWorker":28,"./utils":32,"pako":38}],8:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var GenericWorker = require('../stream/GenericWorker');
+var utf8 = require('../utf8');
+var crc32 = require('../crc32');
+var signature = require('../signature');
+
+/**
+ * Transform an integer into a string in hexadecimal.
+ * @private
+ * @param {number} dec the number to convert.
+ * @param {number} bytes the number of bytes to generate.
+ * @returns {string} the result.
+ */
+var decToHex = function(dec, bytes) {
+    var hex = "", i;
+    for (i = 0; i < bytes; i++) {
+        hex += String.fromCharCode(dec & 0xff);
+        dec = dec >>> 8;
+    }
+    return hex;
+};
+
+/**
+ * Generate the UNIX part of the external file attributes.
+ * @param {Object} unixPermissions the unix permissions or null.
+ * @param {Boolean} isDir true if the entry is a directory, false otherwise.
+ * @return {Number} a 32 bit integer.
+ *
+ * adapted from http://unix.stackexchange.com/questions/14705/the-zip-formats-external-file-attribute :
+ *
+ * TTTTsstrwxrwxrwx0000000000ADVSHR
+ * ^^^^____________________________ file type, see zipinfo.c (UNX_*)
+ *     ^^^_________________________ setuid, setgid, sticky
+ *        ^^^^^^^^^________________ permissions
+ *                 ^^^^^^^^^^______ not used ?
+ *                           ^^^^^^ DOS attribute bits : Archive, Directory, Volume label, System file, Hidden, Read only
+ */
+var generateUnixExternalFileAttr = function (unixPermissions, isDir) {
+
+    var result = unixPermissions;
+    if (!unixPermissions) {
+        // I can't use octal values in strict mode, hence the hexa.
+        //  040775 => 0x41fd
+        // 0100664 => 0x81b4
+        result = isDir ? 0x41fd : 0x81b4;
+    }
+    return (result & 0xFFFF) << 16;
+};
+
+/**
+ * Generate the DOS part of the external file attributes.
+ * @param {Object} dosPermissions the dos permissions or null.
+ * @param {Boolean} isDir true if the entry is a directory, false otherwise.
+ * @return {Number} a 32 bit integer.
+ *
+ * Bit 0     Read-Only
+ * Bit 1     Hidden
+ * Bit 2     System
+ * Bit 3     Volume Label
+ * Bit 4     Directory
+ * Bit 5     Archive
+ */
+var generateDosExternalFileAttr = function (dosPermissions, isDir) {
+
+    // the dir flag is already set for compatibility
+    return (dosPermissions || 0)  & 0x3F;
+};
+
+/**
+ * Generate the various parts used in the construction of the final zip file.
+ * @param {Object} streamInfo the hash with informations about the compressed file.
+ * @param {Boolean} streamedContent is the content streamed ?
+ * @param {Boolean} streamingEnded is the stream finished ?
+ * @param {number} offset the current offset from the start of the zip file.
+ * @param {String} platform let's pretend we are this platform (change platform dependents fields)
+ * @param {Function} encodeFileName the function to encode the file name / comment.
+ * @return {Object} the zip parts.
+ */
+var generateZipParts = function(streamInfo, streamedContent, streamingEnded, offset, platform, encodeFileName) {
+    var file = streamInfo['file'],
+    compression = streamInfo['compression'],
+    useCustomEncoding = encodeFileName !== utf8.utf8encode,
+    encodedFileName = utils.transformTo("string", encodeFileName(file.name)),
+    utfEncodedFileName = utils.transformTo("string", utf8.utf8encode(file.name)),
+    comment = file.comment,
+    encodedComment = utils.transformTo("string", encodeFileName(comment)),
+    utfEncodedComment = utils.transformTo("string", utf8.utf8encode(comment)),
+    useUTF8ForFileName = utfEncodedFileName.length !== file.name.length,
+    useUTF8ForComment = utfEncodedComment.length !== comment.length,
+    dosTime,
+    dosDate,
+    extraFields = "",
+    unicodePathExtraField = "",
+    unicodeCommentExtraField = "",
+    dir = file.dir,
+    date = file.date;
+
+
+    var dataInfo = {
+        crc32 : 0,
+        compressedSize : 0,
+        uncompressedSize : 0
+    };
+
+    // if the content is streamed, the sizes/crc32 are only available AFTER
+    // the end of the stream.
+    if (!streamedContent || streamingEnded) {
+        dataInfo.crc32 = streamInfo['crc32'];
+        dataInfo.compressedSize = streamInfo['compressedSize'];
+        dataInfo.uncompressedSize = streamInfo['uncompressedSize'];
+    }
+
+    var bitflag = 0;
+    if (streamedContent) {
+        // Bit 3: the sizes/crc32 are set to zero in the local header.
+        // The correct values are put in the data descriptor immediately
+        // following the compressed data.
+        bitflag |= 0x0008;
+    }
+    if (!useCustomEncoding && (useUTF8ForFileName || useUTF8ForComment)) {
+        // Bit 11: Language encoding flag (EFS).
+        bitflag |= 0x0800;
+    }
+
+
+    var extFileAttr = 0;
+    var versionMadeBy = 0;
+    if (dir) {
+        // dos or unix, we set the dos dir flag
+        extFileAttr |= 0x00010;
+    }
+    if(platform === "UNIX") {
+        versionMadeBy = 0x031E; // UNIX, version 3.0
+        extFileAttr |= generateUnixExternalFileAttr(file.unixPermissions, dir);
+    } else { // DOS or other, fallback to DOS
+        versionMadeBy = 0x0014; // DOS, version 2.0
+        extFileAttr |= generateDosExternalFileAttr(file.dosPermissions, dir);
+    }
+
+    // date
+    // @see http://www.delorie.com/djgpp/doc/rbinter/it/52/13.html
+    // @see http://www.delorie.com/djgpp/doc/rbinter/it/65/16.html
+    // @see http://www.delorie.com/djgpp/doc/rbinter/it/66/16.html
+
+    dosTime = date.getUTCHours();
+    dosTime = dosTime << 6;
+    dosTime = dosTime | date.getUTCMinutes();
+    dosTime = dosTime << 5;
+    dosTime = dosTime | date.getUTCSeconds() / 2;
+
+    dosDate = date.getUTCFullYear() - 1980;
+    dosDate = dosDate << 4;
+    dosDate = dosDate | (date.getUTCMonth() + 1);
+    dosDate = dosDate << 5;
+    dosDate = dosDate | date.getUTCDate();
+
+    if (useUTF8ForFileName) {
+        // set the unicode path extra field. unzip needs at least one extra
+        // field to correctly handle unicode path, so using the path is as good
+        // as any other information. This could improve the situation with
+        // other archive managers too.
+        // This field is usually used without the utf8 flag, with a non
+        // unicode path in the header (winrar, winzip). This helps (a bit)
+        // with the messy Windows' default compressed folders feature but
+        // breaks on p7zip which doesn't seek the unicode path extra field.
+        // So for now, UTF-8 everywhere !
+        unicodePathExtraField =
+            // Version
+            decToHex(1, 1) +
+            // NameCRC32
+            decToHex(crc32(encodedFileName), 4) +
+            // UnicodeName
+            utfEncodedFileName;
+
+        extraFields +=
+            // Info-ZIP Unicode Path Extra Field
+            "\x75\x70" +
+            // size
+            decToHex(unicodePathExtraField.length, 2) +
+            // content
+            unicodePathExtraField;
+    }
+
+    if(useUTF8ForComment) {
+
+        unicodeCommentExtraField =
+            // Version
+            decToHex(1, 1) +
+            // CommentCRC32
+            decToHex(crc32(encodedComment), 4) +
+            // UnicodeName
+            utfEncodedComment;
+
+        extraFields +=
+            // Info-ZIP Unicode Path Extra Field
+            "\x75\x63" +
+            // size
+            decToHex(unicodeCommentExtraField.length, 2) +
+            // content
+            unicodeCommentExtraField;
+    }
+
+    var header = "";
+
+    // version needed to extract
+    header += "\x0A\x00";
+    // general purpose bit flag
+    header += decToHex(bitflag, 2);
+    // compression method
+    header += compression.magic;
+    // last mod file time
+    header += decToHex(dosTime, 2);
+    // last mod file date
+    header += decToHex(dosDate, 2);
+    // crc-32
+    header += decToHex(dataInfo.crc32, 4);
+    // compressed size
+    header += decToHex(dataInfo.compressedSize, 4);
+    // uncompressed size
+    header += decToHex(dataInfo.uncompressedSize, 4);
+    // file name length
+    header += decToHex(encodedFileName.length, 2);
+    // extra field length
+    header += decToHex(extraFields.length, 2);
+
+
+    var fileRecord = signature.LOCAL_FILE_HEADER + header + encodedFileName + extraFields;
+
+    var dirRecord = signature.CENTRAL_FILE_HEADER +
+        // version made by (00: DOS)
+        decToHex(versionMadeBy, 2) +
+        // file header (common to file and central directory)
+        header +
+        // file comment length
+        decToHex(encodedComment.length, 2) +
+        // disk number start
+        "\x00\x00" +
+        // internal file attributes TODO
+        "\x00\x00" +
+        // external file attributes
+        decToHex(extFileAttr, 4) +
+        // relative offset of local header
+        decToHex(offset, 4) +
+        // file name
+        encodedFileName +
+        // extra field
+        extraFields +
+        // file comment
+        encodedComment;
+
+    return {
+        fileRecord: fileRecord,
+        dirRecord: dirRecord
+    };
+};
+
+/**
+ * Generate the EOCD record.
+ * @param {Number} entriesCount the number of entries in the zip file.
+ * @param {Number} centralDirLength the length (in bytes) of the central dir.
+ * @param {Number} localDirLength the length (in bytes) of the local dir.
+ * @param {String} comment the zip file comment as a binary string.
+ * @param {Function} encodeFileName the function to encode the comment.
+ * @return {String} the EOCD record.
+ */
+var generateCentralDirectoryEnd = function (entriesCount, centralDirLength, localDirLength, comment, encodeFileName) {
+    var dirEnd = "";
+    var encodedComment = utils.transformTo("string", encodeFileName(comment));
+
+    // end of central dir signature
+    dirEnd = signature.CENTRAL_DIRECTORY_END +
+        // number of this disk
+        "\x00\x00" +
+        // number of the disk with the start of the central directory
+        "\x00\x00" +
+        // total number of entries in the central directory on this disk
+        decToHex(entriesCount, 2) +
+        // total number of entries in the central directory
+        decToHex(entriesCount, 2) +
+        // size of the central directory   4 bytes
+        decToHex(centralDirLength, 4) +
+        // offset of start of central directory with respect to the starting disk number
+        decToHex(localDirLength, 4) +
+        // .ZIP file comment length
+        decToHex(encodedComment.length, 2) +
+        // .ZIP file comment
+        encodedComment;
+
+    return dirEnd;
+};
+
+/**
+ * Generate data descriptors for a file entry.
+ * @param {Object} streamInfo the hash generated by a worker, containing informations
+ * on the file entry.
+ * @return {String} the data descriptors.
+ */
+var generateDataDescriptors = function (streamInfo) {
+    var descriptor = "";
+    descriptor = signature.DATA_DESCRIPTOR +
+        // crc-32                          4 bytes
+        decToHex(streamInfo['crc32'], 4) +
+        // compressed size                 4 bytes
+        decToHex(streamInfo['compressedSize'], 4) +
+        // uncompressed size               4 bytes
+        decToHex(streamInfo['uncompressedSize'], 4);
+
+    return descriptor;
+};
+
+
+/**
+ * A worker to concatenate other workers to create a zip file.
+ * @param {Boolean} streamFiles `true` to stream the content of the files,
+ * `false` to accumulate it.
+ * @param {String} comment the comment to use.
+ * @param {String} platform the platform to use, "UNIX" or "DOS".
+ * @param {Function} encodeFileName the function to encode file names and comments.
+ */
+function ZipFileWorker(streamFiles, comment, platform, encodeFileName) {
+    GenericWorker.call(this, "ZipFileWorker");
+    // The number of bytes written so far. This doesn't count accumulated chunks.
+    this.bytesWritten = 0;
+    // The comment of the zip file
+    this.zipComment = comment;
+    // The platform "generating" the zip file.
+    this.zipPlatform = platform;
+    // the function to encode file names and comments.
+    this.encodeFileName = encodeFileName;
+    // Should we stream the content of the files ?
+    this.streamFiles = streamFiles;
+    // If `streamFiles` is false, we will need to accumulate the content of the
+    // files to calculate sizes / crc32 (and write them *before* the content).
+    // This boolean indicates if we are accumulating chunks (it will change a lot
+    // during the lifetime of this worker).
+    this.accumulate = false;
+    // The buffer receiving chunks when accumulating content.
+    this.contentBuffer = [];
+    // The list of generated directory records.
+    this.dirRecords = [];
+    // The offset (in bytes) from the beginning of the zip file for the current source.
+    this.currentSourceOffset = 0;
+    // The total number of entries in this zip file.
+    this.entriesCount = 0;
+    // the name of the file currently being added, null when handling the end of the zip file.
+    // Used for the emited metadata.
+    this.currentFile = null;
+
+
+
+    this._sources = [];
+}
+utils.inherits(ZipFileWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.push
+ */
+ZipFileWorker.prototype.push = function (chunk) {
+
+    var currentFilePercent = chunk.meta.percent || 0;
+    var entriesCount = this.entriesCount;
+    var remainingFiles = this._sources.length;
+
+    if(this.accumulate) {
+        this.contentBuffer.push(chunk);
+    } else {
+        this.bytesWritten += chunk.data.length;
+
+        GenericWorker.prototype.push.call(this, {
+            data : chunk.data,
+            meta : {
+                currentFile : this.currentFile,
+                percent : entriesCount ? (currentFilePercent + 100 * (entriesCount - remainingFiles - 1)) / entriesCount : 100
+            }
+        });
+    }
+};
+
+/**
+ * The worker started a new source (an other worker).
+ * @param {Object} streamInfo the streamInfo object from the new source.
+ */
+ZipFileWorker.prototype.openedSource = function (streamInfo) {
+    this.currentSourceOffset = this.bytesWritten;
+    this.currentFile = streamInfo['file'].name;
+
+    var streamedContent = this.streamFiles && !streamInfo['file'].dir;
+
+    // don't stream folders (because they don't have any content)
+    if(streamedContent) {
+        var record = generateZipParts(streamInfo, streamedContent, false, this.currentSourceOffset, this.zipPlatform, this.encodeFileName);
+        this.push({
+            data : record.fileRecord,
+            meta : {percent:0}
+        });
+    } else {
+        // we need to wait for the whole file before pushing anything
+        this.accumulate = true;
+    }
+};
+
+/**
+ * The worker finished a source (an other worker).
+ * @param {Object} streamInfo the streamInfo object from the finished source.
+ */
+ZipFileWorker.prototype.closedSource = function (streamInfo) {
+    this.accumulate = false;
+    var streamedContent = this.streamFiles && !streamInfo['file'].dir;
+    var record = generateZipParts(streamInfo, streamedContent, true, this.currentSourceOffset, this.zipPlatform, this.encodeFileName);
+
+    this.dirRecords.push(record.dirRecord);
+    if(streamedContent) {
+        // after the streamed file, we put data descriptors
+        this.push({
+            data : generateDataDescriptors(streamInfo),
+            meta : {percent:100}
+        });
+    } else {
+        // the content wasn't streamed, we need to push everything now
+        // first the file record, then the content
+        this.push({
+            data : record.fileRecord,
+            meta : {percent:0}
+        });
+        while(this.contentBuffer.length) {
+            this.push(this.contentBuffer.shift());
+        }
+    }
+    this.currentFile = null;
+};
+
+/**
+ * @see GenericWorker.flush
+ */
+ZipFileWorker.prototype.flush = function () {
+
+    var localDirLength = this.bytesWritten;
+    for(var i = 0; i < this.dirRecords.length; i++) {
+        this.push({
+            data : this.dirRecords[i],
+            meta : {percent:100}
+        });
+    }
+    var centralDirLength = this.bytesWritten - localDirLength;
+
+    var dirEnd = generateCentralDirectoryEnd(this.dirRecords.length, centralDirLength, localDirLength, this.zipComment, this.encodeFileName);
+
+    this.push({
+        data : dirEnd,
+        meta : {percent:100}
+    });
+};
+
+/**
+ * Prepare the next source to be read.
+ */
+ZipFileWorker.prototype.prepareNextSource = function () {
+    this.previous = this._sources.shift();
+    this.openedSource(this.previous.streamInfo);
+    if (this.isPaused) {
+        this.previous.pause();
+    } else {
+        this.previous.resume();
+    }
+};
+
+/**
+ * @see GenericWorker.registerPrevious
+ */
+ZipFileWorker.prototype.registerPrevious = function (previous) {
+    this._sources.push(previous);
+    var self = this;
+
+    previous.on('data', function (chunk) {
+        self.processChunk(chunk);
+    });
+    previous.on('end', function () {
+        self.closedSource(self.previous.streamInfo);
+        if(self._sources.length) {
+            self.prepareNextSource();
+        } else {
+            self.end();
+        }
+    });
+    previous.on('error', function (e) {
+        self.error(e);
+    });
+    return this;
+};
+
+/**
+ * @see GenericWorker.resume
+ */
+ZipFileWorker.prototype.resume = function () {
+    if(!GenericWorker.prototype.resume.call(this)) {
+        return false;
+    }
+
+    if (!this.previous && this._sources.length) {
+        this.prepareNextSource();
+        return true;
+    }
+    if (!this.previous && !this._sources.length && !this.generatedError) {
+        this.end();
+        return true;
+    }
+};
+
+/**
+ * @see GenericWorker.error
+ */
+ZipFileWorker.prototype.error = function (e) {
+    var sources = this._sources;
+    if(!GenericWorker.prototype.error.call(this, e)) {
+        return false;
+    }
+    for(var i = 0; i < sources.length; i++) {
+        try {
+            sources[i].error(e);
+        } catch(e) {
+            // the `error` exploded, nothing to do
+        }
+    }
+    return true;
+};
+
+/**
+ * @see GenericWorker.lock
+ */
+ZipFileWorker.prototype.lock = function () {
+    GenericWorker.prototype.lock.call(this);
+    var sources = this._sources;
+    for(var i = 0; i < sources.length; i++) {
+        sources[i].lock();
+    }
+};
+
+module.exports = ZipFileWorker;
+
+},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(require,module,exports){
+'use strict';
+
+var compressions = require('../compressions');
+var ZipFileWorker = require('./ZipFileWorker');
+
+/**
+ * Find the compression to use.
+ * @param {String} fileCompression the compression defined at the file level, if any.
+ * @param {String} zipCompression the compression defined at the load() level.
+ * @return {Object} the compression object to use.
+ */
+var getCompression = function (fileCompression, zipCompression) {
+
+    var compressionName = fileCompression || zipCompression;
+    var compression = compressions[compressionName];
+    if (!compression) {
+        throw new Error(compressionName + " is not a valid compression method !");
+    }
+    return compression;
+};
+
+/**
+ * Create a worker to generate a zip file.
+ * @param {JSZip} zip the JSZip instance at the right root level.
+ * @param {Object} options to generate the zip file.
+ * @param {String} comment the comment to use.
+ */
+exports.generateWorker = function (zip, options, comment) {
+
+    var zipFileWorker = new ZipFileWorker(options.streamFiles, comment, options.platform, options.encodeFileName);
+    var entriesCount = 0;
+    try {
+
+        zip.forEach(function (relativePath, file) {
+            entriesCount++;
+            var compression = getCompression(file.options.compression, options.compression);
+            var compressionOptions = file.options.compressionOptions || options.compressionOptions || {};
+            var dir = file.dir, date = file.date;
+
+            file._compressWorker(compression, compressionOptions)
+            .withStreamInfo("file", {
+                name : relativePath,
+                dir : dir,
+                date : date,
+                comment : file.comment || "",
+                unixPermissions : file.unixPermissions,
+                dosPermissions : file.dosPermissions
+            })
+            .pipe(zipFileWorker);
+        });
+        zipFileWorker.entriesCount = entriesCount;
+    } catch (e) {
+        zipFileWorker.error(e);
+    }
+
+    return zipFileWorker;
+};
+
+},{"../compressions":3,"./ZipFileWorker":8}],10:[function(require,module,exports){
+'use strict';
+
+/**
+ * Representation a of zip file in js
+ * @constructor
+ */
+function JSZip() {
+    // if this constructor is used without `new`, it adds `new` before itself:
+    if(!(this instanceof JSZip)) {
+        return new JSZip();
+    }
+
+    if(arguments.length) {
+        throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");
+    }
+
+    // object containing the files :
+    // {
+    //   "folder/" : {...},
+    //   "folder/data.txt" : {...}
+    // }
+    this.files = {};
+
+    this.comment = null;
+
+    // Where we are in the hierarchy
+    this.root = "";
+    this.clone = function() {
+        var newObj = new JSZip();
+        for (var i in this) {
+            if (typeof this[i] !== "function") {
+                newObj[i] = this[i];
+            }
+        }
+        return newObj;
+    };
+}
+JSZip.prototype = require('./object');
+JSZip.prototype.loadAsync = require('./load');
+JSZip.support = require('./support');
+JSZip.defaults = require('./defaults');
+
+// TODO find a better way to handle this version,
+// a require('package.json').version doesn't work with webpack, see #327
+JSZip.version = "3.2.0";
+
+JSZip.loadAsync = function (content, options) {
+    return new JSZip().loadAsync(content, options);
+};
+
+JSZip.external = require("./external");
+module.exports = JSZip;
+
+},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(require,module,exports){
+'use strict';
+var utils = require('./utils');
+var external = require("./external");
+var utf8 = require('./utf8');
+var utils = require('./utils');
+var ZipEntries = require('./zipEntries');
+var Crc32Probe = require('./stream/Crc32Probe');
+var nodejsUtils = require("./nodejsUtils");
+
+/**
+ * Check the CRC32 of an entry.
+ * @param {ZipEntry} zipEntry the zip entry to check.
+ * @return {Promise} the result.
+ */
+function checkEntryCRC32(zipEntry) {
+    return new external.Promise(function (resolve, reject) {
+        var worker = zipEntry.decompressed.getContentWorker().pipe(new Crc32Probe());
+        worker.on("error", function (e) {
+            reject(e);
+        })
+        .on("end", function () {
+            if (worker.streamInfo.crc32 !== zipEntry.decompressed.crc32) {
+                reject(new Error("Corrupted zip : CRC32 mismatch"));
+            } else {
+                resolve();
+            }
+        })
+        .resume();
+    });
+}
+
+module.exports = function(data, options) {
+    var zip = this;
+    options = utils.extend(options || {}, {
+        base64: false,
+        checkCRC32: false,
+        optimizedBinaryString: false,
+        createFolders: false,
+        decodeFileName: utf8.utf8decode
+    });
+
+    if (nodejsUtils.isNode && nodejsUtils.isStream(data)) {
+        return external.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file."));
+    }
+
+    return utils.prepareContent("the loaded zip file", data, true, options.optimizedBinaryString, options.base64)
+    .then(function(data) {
+        var zipEntries = new ZipEntries(options);
+        zipEntries.load(data);
+        return zipEntries;
+    }).then(function checkCRC32(zipEntries) {
+        var promises = [external.Promise.resolve(zipEntries)];
+        var files = zipEntries.files;
+        if (options.checkCRC32) {
+            for (var i = 0; i < files.length; i++) {
+                promises.push(checkEntryCRC32(files[i]));
+            }
+        }
+        return external.Promise.all(promises);
+    }).then(function addFiles(results) {
+        var zipEntries = results.shift();
+        var files = zipEntries.files;
+        for (var i = 0; i < files.length; i++) {
+            var input = files[i];
+            zip.file(input.fileNameStr, input.decompressed, {
+                binary: true,
+                optimizedBinaryString: true,
+                date: input.date,
+                dir: input.dir,
+                comment : input.fileCommentStr.length ? input.fileCommentStr : null,
+                unixPermissions : input.unixPermissions,
+                dosPermissions : input.dosPermissions,
+                createFolders: options.createFolders
+            });
+        }
+        if (zipEntries.zipComment.length) {
+            zip.comment = zipEntries.zipComment;
+        }
+
+        return zip;
+    });
+};
+
+},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(require,module,exports){
+"use strict";
+
+var utils = require('../utils');
+var GenericWorker = require('../stream/GenericWorker');
+
+/**
+ * A worker that use a nodejs stream as source.
+ * @constructor
+ * @param {String} filename the name of the file entry for this stream.
+ * @param {Readable} stream the nodejs stream.
+ */
+function NodejsStreamInputAdapter(filename, stream) {
+    GenericWorker.call(this, "Nodejs stream input adapter for " + filename);
+    this._upstreamEnded = false;
+    this._bindStream(stream);
+}
+
+utils.inherits(NodejsStreamInputAdapter, GenericWorker);
+
+/**
+ * Prepare the stream and bind the callbacks on it.
+ * Do this ASAP on node 0.10 ! A lazy binding doesn't always work.
+ * @param {Stream} stream the nodejs stream to use.
+ */
+NodejsStreamInputAdapter.prototype._bindStream = function (stream) {
+    var self = this;
+    this._stream = stream;
+    stream.pause();
+    stream
+    .on("data", function (chunk) {
+        self.push({
+            data: chunk,
+            meta : {
+                percent : 0
+            }
+        });
+    })
+    .on("error", function (e) {
+        if(self.isPaused) {
+            this.generatedError = e;
+        } else {
+            self.error(e);
+        }
+    })
+    .on("end", function () {
+        if(self.isPaused) {
+            self._upstreamEnded = true;
+        } else {
+            self.end();
+        }
+    });
+};
+NodejsStreamInputAdapter.prototype.pause = function () {
+    if(!GenericWorker.prototype.pause.call(this)) {
+        return false;
+    }
+    this._stream.pause();
+    return true;
+};
+NodejsStreamInputAdapter.prototype.resume = function () {
+    if(!GenericWorker.prototype.resume.call(this)) {
+        return false;
+    }
+
+    if(this._upstreamEnded) {
+        this.end();
+    } else {
+        this._stream.resume();
+    }
+
+    return true;
+};
+
+module.exports = NodejsStreamInputAdapter;
+
+},{"../stream/GenericWorker":28,"../utils":32}],13:[function(require,module,exports){
+'use strict';
+
+var Readable = require('readable-stream').Readable;
+
+var utils = require('../utils');
+utils.inherits(NodejsStreamOutputAdapter, Readable);
+
+/**
+* A nodejs stream using a worker as source.
+* @see the SourceWrapper in http://nodejs.org/api/stream.html
+* @constructor
+* @param {StreamHelper} helper the helper wrapping the worker
+* @param {Object} options the nodejs stream options
+* @param {Function} updateCb the update callback.
+*/
+function NodejsStreamOutputAdapter(helper, options, updateCb) {
+    Readable.call(this, options);
+    this._helper = helper;
+
+    var self = this;
+    helper.on("data", function (data, meta) {
+        if (!self.push(data)) {
+            self._helper.pause();
+        }
+        if(updateCb) {
+            updateCb(meta);
+        }
+    })
+    .on("error", function(e) {
+        self.emit('error', e);
+    })
+    .on("end", function () {
+        self.push(null);
+    });
+}
+
+
+NodejsStreamOutputAdapter.prototype._read = function() {
+    this._helper.resume();
+};
+
+module.exports = NodejsStreamOutputAdapter;
+
+},{"../utils":32,"readable-stream":16}],14:[function(require,module,exports){
+'use strict';
+
+module.exports = {
+    /**
+     * True if this is running in Nodejs, will be undefined in a browser.
+     * In a browser, browserify won't include this file and the whole module
+     * will be resolved an empty object.
+     */
+    isNode : typeof Buffer !== "undefined",
+    /**
+     * Create a new nodejs Buffer from an existing content.
+     * @param {Object} data the data to pass to the constructor.
+     * @param {String} encoding the encoding to use.
+     * @return {Buffer} a new Buffer.
+     */
+    newBufferFrom: function(data, encoding) {
+        if (Buffer.from && Buffer.from !== Uint8Array.from) {
+            return Buffer.from(data, encoding);
+        } else {
+            if (typeof data === "number") {
+                // Safeguard for old Node.js versions. On newer versions,
+                // Buffer.from(number) / Buffer(number, encoding) already throw.
+                throw new Error("The \"data\" argument must not be a number");
+            }
+            return new Buffer(data, encoding);
+        }
+    },
+    /**
+     * Create a new nodejs Buffer with the specified size.
+     * @param {Integer} size the size of the buffer.
+     * @return {Buffer} a new Buffer.
+     */
+    allocBuffer: function (size) {
+        if (Buffer.alloc) {
+            return Buffer.alloc(size);
+        } else {
+            var buf = new Buffer(size);
+            buf.fill(0);
+            return buf;
+        }
+    },
+    /**
+     * Find out if an object is a Buffer.
+     * @param {Object} b the object to test.
+     * @return {Boolean} true if the object is a Buffer, false otherwise.
+     */
+    isBuffer : function(b){
+        return Buffer.isBuffer(b);
+    },
+
+    isStream : function (obj) {
+        return obj &&
+            typeof obj.on === "function" &&
+            typeof obj.pause === "function" &&
+            typeof obj.resume === "function";
+    }
+};
+
+},{}],15:[function(require,module,exports){
+'use strict';
+var utf8 = require('./utf8');
+var utils = require('./utils');
+var GenericWorker = require('./stream/GenericWorker');
+var StreamHelper = require('./stream/StreamHelper');
+var defaults = require('./defaults');
+var CompressedObject = require('./compressedObject');
+var ZipObject = require('./zipObject');
+var generate = require("./generate");
+var nodejsUtils = require("./nodejsUtils");
+var NodejsStreamInputAdapter = require("./nodejs/NodejsStreamInputAdapter");
+
+
+/**
+ * Add a file in the current folder.
+ * @private
+ * @param {string} name the name of the file
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data of the file
+ * @param {Object} originalOptions the options of the file
+ * @return {Object} the new file.
+ */
+var fileAdd = function(name, data, originalOptions) {
+    // be sure sub folders exist
+    var dataType = utils.getTypeOf(data),
+        parent;
+
+
+    /*
+     * Correct options.
+     */
+
+    var o = utils.extend(originalOptions || {}, defaults);
+    o.date = o.date || new Date();
+    if (o.compression !== null) {
+        o.compression = o.compression.toUpperCase();
+    }
+
+    if (typeof o.unixPermissions === "string") {
+        o.unixPermissions = parseInt(o.unixPermissions, 8);
+    }
+
+    // UNX_IFDIR  0040000 see zipinfo.c
+    if (o.unixPermissions && (o.unixPermissions & 0x4000)) {
+        o.dir = true;
+    }
+    // Bit 4    Directory
+    if (o.dosPermissions && (o.dosPermissions & 0x0010)) {
+        o.dir = true;
+    }
+
+    if (o.dir) {
+        name = forceTrailingSlash(name);
+    }
+    if (o.createFolders && (parent = parentFolder(name))) {
+        folderAdd.call(this, parent, true);
+    }
+
+    var isUnicodeString = dataType === "string" && o.binary === false && o.base64 === false;
+    if (!originalOptions || typeof originalOptions.binary === "undefined") {
+        o.binary = !isUnicodeString;
+    }
+
+
+    var isCompressedEmpty = (data instanceof CompressedObject) && data.uncompressedSize === 0;
+
+    if (isCompressedEmpty || o.dir || !data || data.length === 0) {
+        o.base64 = false;
+        o.binary = true;
+        data = "";
+        o.compression = "STORE";
+        dataType = "string";
+    }
+
+    /*
+     * Convert content to fit.
+     */
+
+    var zipObjectContent = null;
+    if (data instanceof CompressedObject || data instanceof GenericWorker) {
+        zipObjectContent = data;
+    } else if (nodejsUtils.isNode && nodejsUtils.isStream(data)) {
+        zipObjectContent = new NodejsStreamInputAdapter(name, data);
+    } else {
+        zipObjectContent = utils.prepareContent(name, data, o.binary, o.optimizedBinaryString, o.base64);
+    }
+
+    var object = new ZipObject(name, zipObjectContent, o);
+    this.files[name] = object;
+    /*
+    TODO: we can't throw an exception because we have async promises
+    (we can have a promise of a Date() for example) but returning a
+    promise is useless because file(name, data) returns the JSZip
+    object for chaining. Should we break that to allow the user
+    to catch the error ?
+
+    return external.Promise.resolve(zipObjectContent)
+    .then(function () {
+        return object;
+    });
+    */
+};
+
+/**
+ * Find the parent folder of the path.
+ * @private
+ * @param {string} path the path to use
+ * @return {string} the parent folder, or ""
+ */
+var parentFolder = function (path) {
+    if (path.slice(-1) === '/') {
+        path = path.substring(0, path.length - 1);
+    }
+    var lastSlash = path.lastIndexOf('/');
+    return (lastSlash > 0) ? path.substring(0, lastSlash) : "";
+};
+
+/**
+ * Returns the path with a slash at the end.
+ * @private
+ * @param {String} path the path to check.
+ * @return {String} the path with a trailing slash.
+ */
+var forceTrailingSlash = function(path) {
+    // Check the name ends with a /
+    if (path.slice(-1) !== "/") {
+        path += "/"; // IE doesn't like substr(-1)
+    }
+    return path;
+};
+
+/**
+ * Add a (sub) folder in the current folder.
+ * @private
+ * @param {string} name the folder's name
+ * @param {boolean=} [createFolders] If true, automatically create sub
+ *  folders. Defaults to false.
+ * @return {Object} the new folder.
+ */
+var folderAdd = function(name, createFolders) {
+    createFolders = (typeof createFolders !== 'undefined') ? createFolders : defaults.createFolders;
+
+    name = forceTrailingSlash(name);
+
+    // Does this folder already exist?
+    if (!this.files[name]) {
+        fileAdd.call(this, name, null, {
+            dir: true,
+            createFolders: createFolders
+        });
+    }
+    return this.files[name];
+};
+
+/**
+* Cross-window, cross-Node-context regular expression detection
+* @param  {Object}  object Anything
+* @return {Boolean}        true if the object is a regular expression,
+* false otherwise
+*/
+function isRegExp(object) {
+    return Object.prototype.toString.call(object) === "[object RegExp]";
+}
+
+// return the actual prototype of JSZip
+var out = {
+    /**
+     * @see loadAsync
+     */
+    load: function() {
+        throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.");
+    },
+
+
+    /**
+     * Call a callback function for each entry at this folder level.
+     * @param {Function} cb the callback function:
+     * function (relativePath, file) {...}
+     * It takes 2 arguments : the relative path and the file.
+     */
+    forEach: function(cb) {
+        var filename, relativePath, file;
+        for (filename in this.files) {
+            if (!this.files.hasOwnProperty(filename)) {
+                continue;
+            }
+            file = this.files[filename];
+            relativePath = filename.slice(this.root.length, filename.length);
+            if (relativePath && filename.slice(0, this.root.length) === this.root) { // the file is in the current root
+                cb(relativePath, file); // TODO reverse the parameters ? need to be clean AND consistent with the filter search fn...
+            }
+        }
+    },
+
+    /**
+     * Filter nested files/folders with the specified function.
+     * @param {Function} search the predicate to use :
+     * function (relativePath, file) {...}
+     * It takes 2 arguments : the relative path and the file.
+     * @return {Array} An array of matching elements.
+     */
+    filter: function(search) {
+        var result = [];
+        this.forEach(function (relativePath, entry) {
+            if (search(relativePath, entry)) { // the file matches the function
+                result.push(entry);
+            }
+
+        });
+        return result;
+    },
+
+    /**
+     * Add a file to the zip file, or search a file.
+     * @param   {string|RegExp} name The name of the file to add (if data is defined),
+     * the name of the file to find (if no data) or a regex to match files.
+     * @param   {String|ArrayBuffer|Uint8Array|Buffer} data  The file data, either raw or base64 encoded
+     * @param   {Object} o     File options
+     * @return  {JSZip|Object|Array} this JSZip object (when adding a file),
+     * a file (when searching by string) or an array of files (when searching by regex).
+     */
+    file: function(name, data, o) {
+        if (arguments.length === 1) {
+            if (isRegExp(name)) {
+                var regexp = name;
+                return this.filter(function(relativePath, file) {
+                    return !file.dir && regexp.test(relativePath);
+                });
+            }
+            else { // text
+                var obj = this.files[this.root + name];
+                if (obj && !obj.dir) {
+                    return obj;
+                } else {
+                    return null;
+                }
+            }
+        }
+        else { // more than one argument : we have data !
+            name = this.root + name;
+            fileAdd.call(this, name, data, o);
+        }
+        return this;
+    },
+
+    /**
+     * Add a directory to the zip file, or search.
+     * @param   {String|RegExp} arg The name of the directory to add, or a regex to search folders.
+     * @return  {JSZip} an object with the new directory as the root, or an array containing matching folders.
+     */
+    folder: function(arg) {
+        if (!arg) {
+            return this;
+        }
+
+        if (isRegExp(arg)) {
+            return this.filter(function(relativePath, file) {
+                return file.dir && arg.test(relativePath);
+            });
+        }
+
+        // else, name is a new folder
+        var name = this.root + arg;
+        var newFolder = folderAdd.call(this, name);
+
+        // Allow chaining by returning a new object with this folder as the root
+        var ret = this.clone();
+        ret.root = newFolder.name;
+        return ret;
+    },
+
+    /**
+     * Delete a file, or a directory and all sub-files, from the zip
+     * @param {string} name the name of the file to delete
+     * @return {JSZip} this JSZip object
+     */
+    remove: function(name) {
+        name = this.root + name;
+        var file = this.files[name];
+        if (!file) {
+            // Look for any folders
+            if (name.slice(-1) !== "/") {
+                name += "/";
+            }
+            file = this.files[name];
+        }
+
+        if (file && !file.dir) {
+            // file
+            delete this.files[name];
+        } else {
+            // maybe a folder, delete recursively
+            var kids = this.filter(function(relativePath, file) {
+                return file.name.slice(0, name.length) === name;
+            });
+            for (var i = 0; i < kids.length; i++) {
+                delete this.files[kids[i].name];
+            }
+        }
+
+        return this;
+    },
+
+    /**
+     * Generate the complete zip file
+     * @param {Object} options the options to generate the zip file :
+     * - compression, "STORE" by default.
+     * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
+     * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the zip file
+     */
+    generate: function(options) {
+        throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.");
+    },
+
+    /**
+     * Generate the complete zip file as an internal stream.
+     * @param {Object} options the options to generate the zip file :
+     * - compression, "STORE" by default.
+     * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
+     * @return {StreamHelper} the streamed zip file.
+     */
+    generateInternalStream: function(options) {
+      var worker, opts = {};
+      try {
+          opts = utils.extend(options || {}, {
+              streamFiles: false,
+              compression: "STORE",
+              compressionOptions : null,
+              type: "",
+              platform: "DOS",
+              comment: null,
+              mimeType: 'application/zip',
+              encodeFileName: utf8.utf8encode
+          });
+
+          opts.type = opts.type.toLowerCase();
+          opts.compression = opts.compression.toUpperCase();
+
+          // "binarystring" is prefered but the internals use "string".
+          if(opts.type === "binarystring") {
+            opts.type = "string";
+          }
+
+          if (!opts.type) {
+            throw new Error("No output type specified.");
+          }
+
+          utils.checkSupport(opts.type);
+
+          // accept nodejs `process.platform`
+          if(
+              opts.platform === 'darwin' ||
+              opts.platform === 'freebsd' ||
+              opts.platform === 'linux' ||
+              opts.platform === 'sunos'
+          ) {
+              opts.platform = "UNIX";
+          }
+          if (opts.platform === 'win32') {
+              opts.platform = "DOS";
+          }
+
+          var comment = opts.comment || this.comment || "";
+          worker = generate.generateWorker(this, opts, comment);
+      } catch (e) {
+        worker = new GenericWorker("error");
+        worker.error(e);
+      }
+      return new StreamHelper(worker, opts.type || "string", opts.mimeType);
+    },
+    /**
+     * Generate the complete zip file asynchronously.
+     * @see generateInternalStream
+     */
+    generateAsync: function(options, onUpdate) {
+        return this.generateInternalStream(options).accumulate(onUpdate);
+    },
+    /**
+     * Generate the complete zip file asynchronously.
+     * @see generateInternalStream
+     */
+    generateNodeStream: function(options, onUpdate) {
+        options = options || {};
+        if (!options.type) {
+            options.type = "nodebuffer";
+        }
+        return this.generateInternalStream(options).toNodejsStream(onUpdate);
+    }
+};
+module.exports = out;
+
+},{"./compressedObject":2,"./defaults":5,"./generate":9,"./nodejs/NodejsStreamInputAdapter":12,"./nodejsUtils":14,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31,"./utils":32,"./zipObject":35}],16:[function(require,module,exports){
+/*
+ * This file is used by module bundlers (browserify/webpack/etc) when
+ * including a stream implementation. We use "readable-stream" to get a
+ * consistent behavior between nodejs versions but bundlers often have a shim
+ * for "stream". Using this shim greatly improve the compatibility and greatly
+ * reduce the final size of the bundle (only one stream implementation, not
+ * two).
+ */
+module.exports = require("stream");
+
+},{"stream":undefined}],17:[function(require,module,exports){
+'use strict';
+var DataReader = require('./DataReader');
+var utils = require('../utils');
+
+function ArrayReader(data) {
+    DataReader.call(this, data);
+	for(var i = 0; i < this.data.length; i++) {
+		data[i] = data[i] & 0xFF;
+	}
+}
+utils.inherits(ArrayReader, DataReader);
+/**
+ * @see DataReader.byteAt
+ */
+ArrayReader.prototype.byteAt = function(i) {
+    return this.data[this.zero + i];
+};
+/**
+ * @see DataReader.lastIndexOfSignature
+ */
+ArrayReader.prototype.lastIndexOfSignature = function(sig) {
+    var sig0 = sig.charCodeAt(0),
+        sig1 = sig.charCodeAt(1),
+        sig2 = sig.charCodeAt(2),
+        sig3 = sig.charCodeAt(3);
+    for (var i = this.length - 4; i >= 0; --i) {
+        if (this.data[i] === sig0 && this.data[i + 1] === sig1 && this.data[i + 2] === sig2 && this.data[i + 3] === sig3) {
+            return i - this.zero;
+        }
+    }
+
+    return -1;
+};
+/**
+ * @see DataReader.readAndCheckSignature
+ */
+ArrayReader.prototype.readAndCheckSignature = function (sig) {
+    var sig0 = sig.charCodeAt(0),
+        sig1 = sig.charCodeAt(1),
+        sig2 = sig.charCodeAt(2),
+        sig3 = sig.charCodeAt(3),
+        data = this.readData(4);
+    return sig0 === data[0] && sig1 === data[1] && sig2 === data[2] && sig3 === data[3];
+};
+/**
+ * @see DataReader.readData
+ */
+ArrayReader.prototype.readData = function(size) {
+    this.checkOffset(size);
+    if(size === 0) {
+        return [];
+    }
+    var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+    this.index += size;
+    return result;
+};
+module.exports = ArrayReader;
+
+},{"../utils":32,"./DataReader":18}],18:[function(require,module,exports){
+'use strict';
+var utils = require('../utils');
+
+function DataReader(data) {
+    this.data = data; // type : see implementation
+    this.length = data.length;
+    this.index = 0;
+    this.zero = 0;
+}
+DataReader.prototype = {
+    /**
+     * Check that the offset will not go too far.
+     * @param {string} offset the additional offset to check.
+     * @throws {Error} an Error if the offset is out of bounds.
+     */
+    checkOffset: function(offset) {
+        this.checkIndex(this.index + offset);
+    },
+    /**
+     * Check that the specified index will not be too far.
+     * @param {string} newIndex the index to check.
+     * @throws {Error} an Error if the index is out of bounds.
+     */
+    checkIndex: function(newIndex) {
+        if (this.length < this.zero + newIndex || newIndex < 0) {
+            throw new Error("End of data reached (data length = " + this.length + ", asked index = " + (newIndex) + "). Corrupted zip ?");
+        }
+    },
+    /**
+     * Change the index.
+     * @param {number} newIndex The new index.
+     * @throws {Error} if the new index is out of the data.
+     */
+    setIndex: function(newIndex) {
+        this.checkIndex(newIndex);
+        this.index = newIndex;
+    },
+    /**
+     * Skip the next n bytes.
+     * @param {number} n the number of bytes to skip.
+     * @throws {Error} if the new index is out of the data.
+     */
+    skip: function(n) {
+        this.setIndex(this.index + n);
+    },
+    /**
+     * Get the byte at the specified index.
+     * @param {number} i the index to use.
+     * @return {number} a byte.
+     */
+    byteAt: function(i) {
+        // see implementations
+    },
+    /**
+     * Get the next number with a given byte size.
+     * @param {number} size the number of bytes to read.
+     * @return {number} the corresponding number.
+     */
+    readInt: function(size) {
+        var result = 0,
+            i;
+        this.checkOffset(size);
+        for (i = this.index + size - 1; i >= this.index; i--) {
+            result = (result << 8) + this.byteAt(i);
+        }
+        this.index += size;
+        return result;
+    },
+    /**
+     * Get the next string with a given byte size.
+     * @param {number} size the number of bytes to read.
+     * @return {string} the corresponding string.
+     */
+    readString: function(size) {
+        return utils.transformTo("string", this.readData(size));
+    },
+    /**
+     * Get raw data without conversion, <size> bytes.
+     * @param {number} size the number of bytes to read.
+     * @return {Object} the raw data, implementation specific.
+     */
+    readData: function(size) {
+        // see implementations
+    },
+    /**
+     * Find the last occurence of a zip signature (4 bytes).
+     * @param {string} sig the signature to find.
+     * @return {number} the index of the last occurence, -1 if not found.
+     */
+    lastIndexOfSignature: function(sig) {
+        // see implementations
+    },
+    /**
+     * Read the signature (4 bytes) at the current position and compare it with sig.
+     * @param {string} sig the expected signature
+     * @return {boolean} true if the signature matches, false otherwise.
+     */
+    readAndCheckSignature: function(sig) {
+        // see implementations
+    },
+    /**
+     * Get the next date.
+     * @return {Date} the date.
+     */
+    readDate: function() {
+        var dostime = this.readInt(4);
+        return new Date(Date.UTC(
+        ((dostime >> 25) & 0x7f) + 1980, // year
+        ((dostime >> 21) & 0x0f) - 1, // month
+        (dostime >> 16) & 0x1f, // day
+        (dostime >> 11) & 0x1f, // hour
+        (dostime >> 5) & 0x3f, // minute
+        (dostime & 0x1f) << 1)); // second
+    }
+};
+module.exports = DataReader;
+
+},{"../utils":32}],19:[function(require,module,exports){
+'use strict';
+var Uint8ArrayReader = require('./Uint8ArrayReader');
+var utils = require('../utils');
+
+function NodeBufferReader(data) {
+    Uint8ArrayReader.call(this, data);
+}
+utils.inherits(NodeBufferReader, Uint8ArrayReader);
+
+/**
+ * @see DataReader.readData
+ */
+NodeBufferReader.prototype.readData = function(size) {
+    this.checkOffset(size);
+    var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+    this.index += size;
+    return result;
+};
+module.exports = NodeBufferReader;
+
+},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(require,module,exports){
+'use strict';
+var DataReader = require('./DataReader');
+var utils = require('../utils');
+
+function StringReader(data) {
+    DataReader.call(this, data);
+}
+utils.inherits(StringReader, DataReader);
+/**
+ * @see DataReader.byteAt
+ */
+StringReader.prototype.byteAt = function(i) {
+    return this.data.charCodeAt(this.zero + i);
+};
+/**
+ * @see DataReader.lastIndexOfSignature
+ */
+StringReader.prototype.lastIndexOfSignature = function(sig) {
+    return this.data.lastIndexOf(sig) - this.zero;
+};
+/**
+ * @see DataReader.readAndCheckSignature
+ */
+StringReader.prototype.readAndCheckSignature = function (sig) {
+    var data = this.readData(4);
+    return sig === data;
+};
+/**
+ * @see DataReader.readData
+ */
+StringReader.prototype.readData = function(size) {
+    this.checkOffset(size);
+    // this will work because the constructor applied the "& 0xff" mask.
+    var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+    this.index += size;
+    return result;
+};
+module.exports = StringReader;
+
+},{"../utils":32,"./DataReader":18}],21:[function(require,module,exports){
+'use strict';
+var ArrayReader = require('./ArrayReader');
+var utils = require('../utils');
+
+function Uint8ArrayReader(data) {
+    ArrayReader.call(this, data);
+}
+utils.inherits(Uint8ArrayReader, ArrayReader);
+/**
+ * @see DataReader.readData
+ */
+Uint8ArrayReader.prototype.readData = function(size) {
+    this.checkOffset(size);
+    if(size === 0) {
+        // in IE10, when using subarray(idx, idx), we get the array [0x00] instead of [].
+        return new Uint8Array(0);
+    }
+    var result = this.data.subarray(this.zero + this.index, this.zero + this.index + size);
+    this.index += size;
+    return result;
+};
+module.exports = Uint8ArrayReader;
+
+},{"../utils":32,"./ArrayReader":17}],22:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var support = require('../support');
+var ArrayReader = require('./ArrayReader');
+var StringReader = require('./StringReader');
+var NodeBufferReader = require('./NodeBufferReader');
+var Uint8ArrayReader = require('./Uint8ArrayReader');
+
+/**
+ * Create a reader adapted to the data.
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data to read.
+ * @return {DataReader} the data reader.
+ */
+module.exports = function (data) {
+    var type = utils.getTypeOf(data);
+    utils.checkSupport(type);
+    if (type === "string" && !support.uint8array) {
+        return new StringReader(data);
+    }
+    if (type === "nodebuffer") {
+        return new NodeBufferReader(data);
+    }
+    if (support.uint8array) {
+        return new Uint8ArrayReader(utils.transformTo("uint8array", data));
+    }
+    return new ArrayReader(utils.transformTo("array", data));
+};
+
+},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(require,module,exports){
+'use strict';
+exports.LOCAL_FILE_HEADER = "PK\x03\x04";
+exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
+exports.CENTRAL_DIRECTORY_END = "PK\x05\x06";
+exports.ZIP64_CENTRAL_DIRECTORY_LOCATOR = "PK\x06\x07";
+exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
+exports.DATA_DESCRIPTOR = "PK\x07\x08";
+
+},{}],24:[function(require,module,exports){
+'use strict';
+
+var GenericWorker = require('./GenericWorker');
+var utils = require('../utils');
+
+/**
+ * A worker which convert chunks to a specified type.
+ * @constructor
+ * @param {String} destType the destination type.
+ */
+function ConvertWorker(destType) {
+    GenericWorker.call(this, "ConvertWorker to " + destType);
+    this.destType = destType;
+}
+utils.inherits(ConvertWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+ConvertWorker.prototype.processChunk = function (chunk) {
+    this.push({
+        data : utils.transformTo(this.destType, chunk.data),
+        meta : chunk.meta
+    });
+};
+module.exports = ConvertWorker;
+
+},{"../utils":32,"./GenericWorker":28}],25:[function(require,module,exports){
+'use strict';
+
+var GenericWorker = require('./GenericWorker');
+var crc32 = require('../crc32');
+var utils = require('../utils');
+
+/**
+ * A worker which calculate the crc32 of the data flowing through.
+ * @constructor
+ */
+function Crc32Probe() {
+    GenericWorker.call(this, "Crc32Probe");
+    this.withStreamInfo("crc32", 0);
+}
+utils.inherits(Crc32Probe, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+Crc32Probe.prototype.processChunk = function (chunk) {
+    this.streamInfo.crc32 = crc32(chunk.data, this.streamInfo.crc32 || 0);
+    this.push(chunk);
+};
+module.exports = Crc32Probe;
+
+},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var GenericWorker = require('./GenericWorker');
+
+/**
+ * A worker which calculate the total length of the data flowing through.
+ * @constructor
+ * @param {String} propName the name used to expose the length
+ */
+function DataLengthProbe(propName) {
+    GenericWorker.call(this, "DataLengthProbe for " + propName);
+    this.propName = propName;
+    this.withStreamInfo(propName, 0);
+}
+utils.inherits(DataLengthProbe, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+DataLengthProbe.prototype.processChunk = function (chunk) {
+    if(chunk) {
+        var length = this.streamInfo[this.propName] || 0;
+        this.streamInfo[this.propName] = length + chunk.data.length;
+    }
+    GenericWorker.prototype.processChunk.call(this, chunk);
+};
+module.exports = DataLengthProbe;
+
+
+},{"../utils":32,"./GenericWorker":28}],27:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var GenericWorker = require('./GenericWorker');
+
+// the size of the generated chunks
+// TODO expose this as a public variable
+var DEFAULT_BLOCK_SIZE = 16 * 1024;
+
+/**
+ * A worker that reads a content and emits chunks.
+ * @constructor
+ * @param {Promise} dataP the promise of the data to split
+ */
+function DataWorker(dataP) {
+    GenericWorker.call(this, "DataWorker");
+    var self = this;
+    this.dataIsReady = false;
+    this.index = 0;
+    this.max = 0;
+    this.data = null;
+    this.type = "";
+
+    this._tickScheduled = false;
+
+    dataP.then(function (data) {
+        self.dataIsReady = true;
+        self.data = data;
+        self.max = data && data.length || 0;
+        self.type = utils.getTypeOf(data);
+        if(!self.isPaused) {
+            self._tickAndRepeat();
+        }
+    }, function (e) {
+        self.error(e);
+    });
+}
+
+utils.inherits(DataWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.cleanUp
+ */
+DataWorker.prototype.cleanUp = function () {
+    GenericWorker.prototype.cleanUp.call(this);
+    this.data = null;
+};
+
+/**
+ * @see GenericWorker.resume
+ */
+DataWorker.prototype.resume = function () {
+    if(!GenericWorker.prototype.resume.call(this)) {
+        return false;
+    }
+
+    if (!this._tickScheduled && this.dataIsReady) {
+        this._tickScheduled = true;
+        utils.delay(this._tickAndRepeat, [], this);
+    }
+    return true;
+};
+
+/**
+ * Trigger a tick a schedule an other call to this function.
+ */
+DataWorker.prototype._tickAndRepeat = function() {
+    this._tickScheduled = false;
+    if(this.isPaused || this.isFinished) {
+        return;
+    }
+    this._tick();
+    if(!this.isFinished) {
+        utils.delay(this._tickAndRepeat, [], this);
+        this._tickScheduled = true;
+    }
+};
+
+/**
+ * Read and push a chunk.
+ */
+DataWorker.prototype._tick = function() {
+
+    if(this.isPaused || this.isFinished) {
+        return false;
+    }
+
+    var size = DEFAULT_BLOCK_SIZE;
+    var data = null, nextIndex = Math.min(this.max, this.index + size);
+    if (this.index >= this.max) {
+        // EOF
+        return this.end();
+    } else {
+        switch(this.type) {
+            case "string":
+                data = this.data.substring(this.index, nextIndex);
+            break;
+            case "uint8array":
+                data = this.data.subarray(this.index, nextIndex);
+            break;
+            case "array":
+            case "nodebuffer":
+                data = this.data.slice(this.index, nextIndex);
+            break;
+        }
+        this.index = nextIndex;
+        return this.push({
+            data : data,
+            meta : {
+                percent : this.max ? this.index / this.max * 100 : 0
+            }
+        });
+    }
+};
+
+module.exports = DataWorker;
+
+},{"../utils":32,"./GenericWorker":28}],28:[function(require,module,exports){
+'use strict';
+
+/**
+ * A worker that does nothing but passing chunks to the next one. This is like
+ * a nodejs stream but with some differences. On the good side :
+ * - it works on IE 6-9 without any issue / polyfill
+ * - it weights less than the full dependencies bundled with browserify
+ * - it forwards errors (no need to declare an error handler EVERYWHERE)
+ *
+ * A chunk is an object with 2 attributes : `meta` and `data`. The former is an
+ * object containing anything (`percent` for example), see each worker for more
+ * details. The latter is the real data (String, Uint8Array, etc).
+ *
+ * @constructor
+ * @param {String} name the name of the stream (mainly used for debugging purposes)
+ */
+function GenericWorker(name) {
+    // the name of the worker
+    this.name = name || "default";
+    // an object containing metadata about the workers chain
+    this.streamInfo = {};
+    // an error which happened when the worker was paused
+    this.generatedError = null;
+    // an object containing metadata to be merged by this worker into the general metadata
+    this.extraStreamInfo = {};
+    // true if the stream is paused (and should not do anything), false otherwise
+    this.isPaused = true;
+    // true if the stream is finished (and should not do anything), false otherwise
+    this.isFinished = false;
+    // true if the stream is locked to prevent further structure updates (pipe), false otherwise
+    this.isLocked = false;
+    // the event listeners
+    this._listeners = {
+        'data':[],
+        'end':[],
+        'error':[]
+    };
+    // the previous worker, if any
+    this.previous = null;
+}
+
+GenericWorker.prototype = {
+    /**
+     * Push a chunk to the next workers.
+     * @param {Object} chunk the chunk to push
+     */
+    push : function (chunk) {
+        this.emit("data", chunk);
+    },
+    /**
+     * End the stream.
+     * @return {Boolean} true if this call ended the worker, false otherwise.
+     */
+    end : function () {
+        if (this.isFinished) {
+            return false;
+        }
+
+        this.flush();
+        try {
+            this.emit("end");
+            this.cleanUp();
+            this.isFinished = true;
+        } catch (e) {
+            this.emit("error", e);
+        }
+        return true;
+    },
+    /**
+     * End the stream with an error.
+     * @param {Error} e the error which caused the premature end.
+     * @return {Boolean} true if this call ended the worker with an error, false otherwise.
+     */
+    error : function (e) {
+        if (this.isFinished) {
+            return false;
+        }
+
+        if(this.isPaused) {
+            this.generatedError = e;
+        } else {
+            this.isFinished = true;
+
+            this.emit("error", e);
+
+            // in the workers chain exploded in the middle of the chain,
+            // the error event will go downward but we also need to notify
+            // workers upward that there has been an error.
+            if(this.previous) {
+                this.previous.error(e);
+            }
+
+            this.cleanUp();
+        }
+        return true;
+    },
+    /**
+     * Add a callback on an event.
+     * @param {String} name the name of the event (data, end, error)
+     * @param {Function} listener the function to call when the event is triggered
+     * @return {GenericWorker} the current object for chainability
+     */
+    on : function (name, listener) {
+        this._listeners[name].push(listener);
+        return this;
+    },
+    /**
+     * Clean any references when a worker is ending.
+     */
+    cleanUp : function () {
+        this.streamInfo = this.generatedError = this.extraStreamInfo = null;
+        this._listeners = [];
+    },
+    /**
+     * Trigger an event. This will call registered callback with the provided arg.
+     * @param {String} name the name of the event (data, end, error)
+     * @param {Object} arg the argument to call the callback with.
+     */
+    emit : function (name, arg) {
+        if (this._listeners[name]) {
+            for(var i = 0; i < this._listeners[name].length; i++) {
+                this._listeners[name][i].call(this, arg);
+            }
+        }
+    },
+    /**
+     * Chain a worker with an other.
+     * @param {Worker} next the worker receiving events from the current one.
+     * @return {worker} the next worker for chainability
+     */
+    pipe : function (next) {
+        return next.registerPrevious(this);
+    },
+    /**
+     * Same as `pipe` in the other direction.
+     * Using an API with `pipe(next)` is very easy.
+     * Implementing the API with the point of view of the next one registering
+     * a source is easier, see the ZipFileWorker.
+     * @param {Worker} previous the previous worker, sending events to this one
+     * @return {Worker} the current worker for chainability
+     */
+    registerPrevious : function (previous) {
+        if (this.isLocked) {
+            throw new Error("The stream '" + this + "' has already been used.");
+        }
+
+        // sharing the streamInfo...
+        this.streamInfo = previous.streamInfo;
+        // ... and adding our own bits
+        this.mergeStreamInfo();
+        this.previous =  previous;
+        var self = this;
+        previous.on('data', function (chunk) {
+            self.processChunk(chunk);
+        });
+        previous.on('end', function () {
+            self.end();
+        });
+        previous.on('error', function (e) {
+            self.error(e);
+        });
+        return this;
+    },
+    /**
+     * Pause the stream so it doesn't send events anymore.
+     * @return {Boolean} true if this call paused the worker, false otherwise.
+     */
+    pause : function () {
+        if(this.isPaused || this.isFinished) {
+            return false;
+        }
+        this.isPaused = true;
+
+        if(this.previous) {
+            this.previous.pause();
+        }
+        return true;
+    },
+    /**
+     * Resume a paused stream.
+     * @return {Boolean} true if this call resumed the worker, false otherwise.
+     */
+    resume : function () {
+        if(!this.isPaused || this.isFinished) {
+            return false;
+        }
+        this.isPaused = false;
+
+        // if true, the worker tried to resume but failed
+        var withError = false;
+        if(this.generatedError) {
+            this.error(this.generatedError);
+            withError = true;
+        }
+        if(this.previous) {
+            this.previous.resume();
+        }
+
+        return !withError;
+    },
+    /**
+     * Flush any remaining bytes as the stream is ending.
+     */
+    flush : function () {},
+    /**
+     * Process a chunk. This is usually the method overridden.
+     * @param {Object} chunk the chunk to process.
+     */
+    processChunk : function(chunk) {
+        this.push(chunk);
+    },
+    /**
+     * Add a key/value to be added in the workers chain streamInfo once activated.
+     * @param {String} key the key to use
+     * @param {Object} value the associated value
+     * @return {Worker} the current worker for chainability
+     */
+    withStreamInfo : function (key, value) {
+        this.extraStreamInfo[key] = value;
+        this.mergeStreamInfo();
+        return this;
+    },
+    /**
+     * Merge this worker's streamInfo into the chain's streamInfo.
+     */
+    mergeStreamInfo : function () {
+        for(var key in this.extraStreamInfo) {
+            if (!this.extraStreamInfo.hasOwnProperty(key)) {
+                continue;
+            }
+            this.streamInfo[key] = this.extraStreamInfo[key];
+        }
+    },
+
+    /**
+     * Lock the stream to prevent further updates on the workers chain.
+     * After calling this method, all calls to pipe will fail.
+     */
+    lock: function () {
+        if (this.isLocked) {
+            throw new Error("The stream '" + this + "' has already been used.");
+        }
+        this.isLocked = true;
+        if (this.previous) {
+            this.previous.lock();
+        }
+    },
+
+    /**
+     *
+     * Pretty print the workers chain.
+     */
+    toString : function () {
+        var me = "Worker " + this.name;
+        if (this.previous) {
+            return this.previous + " -> " + me;
+        } else {
+            return me;
+        }
+    }
+};
+
+module.exports = GenericWorker;
+
+},{}],29:[function(require,module,exports){
+'use strict';
+
+var utils = require('../utils');
+var ConvertWorker = require('./ConvertWorker');
+var GenericWorker = require('./GenericWorker');
+var base64 = require('../base64');
+var support = require("../support");
+var external = require("../external");
+
+var NodejsStreamOutputAdapter = null;
+if (support.nodestream) {
+    try {
+        NodejsStreamOutputAdapter = require('../nodejs/NodejsStreamOutputAdapter');
+    } catch(e) {}
+}
+
+/**
+ * Apply the final transformation of the data. If the user wants a Blob for
+ * example, it's easier to work with an U8intArray and finally do the
+ * ArrayBuffer/Blob conversion.
+ * @param {String} type the name of the final type
+ * @param {String|Uint8Array|Buffer} content the content to transform
+ * @param {String} mimeType the mime type of the content, if applicable.
+ * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the content in the right format.
+ */
+function transformZipOutput(type, content, mimeType) {
+    switch(type) {
+        case "blob" :
+            return utils.newBlob(utils.transformTo("arraybuffer", content), mimeType);
+        case "base64" :
+            return base64.encode(content);
+        default :
+            return utils.transformTo(type, content);
+    }
+}
+
+/**
+ * Concatenate an array of data of the given type.
+ * @param {String} type the type of the data in the given array.
+ * @param {Array} dataArray the array containing the data chunks to concatenate
+ * @return {String|Uint8Array|Buffer} the concatenated data
+ * @throws Error if the asked type is unsupported
+ */
+function concat (type, dataArray) {
+    var i, index = 0, res = null, totalLength = 0;
+    for(i = 0; i < dataArray.length; i++) {
+        totalLength += dataArray[i].length;
+    }
+    switch(type) {
+        case "string":
+            return dataArray.join("");
+          case "array":
+            return Array.prototype.concat.apply([], dataArray);
+        case "uint8array":
+            res = new Uint8Array(totalLength);
+            for(i = 0; i < dataArray.length; i++) {
+                res.set(dataArray[i], index);
+                index += dataArray[i].length;
+            }
+            return res;
+        case "nodebuffer":
+            return Buffer.concat(dataArray);
+        default:
+            throw new Error("concat : unsupported type '"  + type + "'");
+    }
+}
+
+/**
+ * Listen a StreamHelper, accumulate its content and concatenate it into a
+ * complete block.
+ * @param {StreamHelper} helper the helper to use.
+ * @param {Function} updateCallback a callback called on each update. Called
+ * with one arg :
+ * - the metadata linked to the update received.
+ * @return Promise the promise for the accumulation.
+ */
+function accumulate(helper, updateCallback) {
+    return new external.Promise(function (resolve, reject){
+        var dataArray = [];
+        var chunkType = helper._internalType,
+            resultType = helper._outputType,
+            mimeType = helper._mimeType;
+        helper
+        .on('data', function (data, meta) {
+            dataArray.push(data);
+            if(updateCallback) {
+                updateCallback(meta);
+            }
+        })
+        .on('error', function(err) {
+            dataArray = [];
+            reject(err);
+        })
+        .on('end', function (){
+            try {
+                var result = transformZipOutput(resultType, concat(chunkType, dataArray), mimeType);
+                resolve(result);
+            } catch (e) {
+                reject(e);
+            }
+            dataArray = [];
+        })
+        .resume();
+    });
+}
+
+/**
+ * An helper to easily use workers outside of JSZip.
+ * @constructor
+ * @param {Worker} worker the worker to wrap
+ * @param {String} outputType the type of data expected by the use
+ * @param {String} mimeType the mime type of the content, if applicable.
+ */
+function StreamHelper(worker, outputType, mimeType) {
+    var internalType = outputType;
+    switch(outputType) {
+        case "blob":
+        case "arraybuffer":
+            internalType = "uint8array";
+        break;
+        case "base64":
+            internalType = "string";
+        break;
+    }
+
+    try {
+        // the type used internally
+        this._internalType = internalType;
+        // the type used to output results
+        this._outputType = outputType;
+        // the mime type
+        this._mimeType = mimeType;
+        utils.checkSupport(internalType);
+        this._worker = worker.pipe(new ConvertWorker(internalType));
+        // the last workers can be rewired without issues but we need to
+        // prevent any updates on previous workers.
+        worker.lock();
+    } catch(e) {
+        this._worker = new GenericWorker("error");
+        this._worker.error(e);
+    }
+}
+
+StreamHelper.prototype = {
+    /**
+     * Listen a StreamHelper, accumulate its content and concatenate it into a
+     * complete block.
+     * @param {Function} updateCb the update callback.
+     * @return Promise the promise for the accumulation.
+     */
+    accumulate : function (updateCb) {
+        return accumulate(this, updateCb);
+    },
+    /**
+     * Add a listener on an event triggered on a stream.
+     * @param {String} evt the name of the event
+     * @param {Function} fn the listener
+     * @return {StreamHelper} the current helper.
+     */
+    on : function (evt, fn) {
+        var self = this;
+
+        if(evt === "data") {
+            this._worker.on(evt, function (chunk) {
+                fn.call(self, chunk.data, chunk.meta);
+            });
+        } else {
+            this._worker.on(evt, function () {
+                utils.delay(fn, arguments, self);
+            });
+        }
+        return this;
+    },
+    /**
+     * Resume the flow of chunks.
+     * @return {StreamHelper} the current helper.
+     */
+    resume : function () {
+        utils.delay(this._worker.resume, [], this._worker);
+        return this;
+    },
+    /**
+     * Pause the flow of chunks.
+     * @return {StreamHelper} the current helper.
+     */
+    pause : function () {
+        this._worker.pause();
+        return this;
+    },
+    /**
+     * Return a nodejs stream for this helper.
+     * @param {Function} updateCb the update callback.
+     * @return {NodejsStreamOutputAdapter} the nodejs stream.
+     */
+    toNodejsStream : function (updateCb) {
+        utils.checkSupport("nodestream");
+        if (this._outputType !== "nodebuffer") {
+            // an object stream containing blob/arraybuffer/uint8array/string
+            // is strange and I don't know if it would be useful.
+            // I you find this comment and have a good usecase, please open a
+            // bug report !
+            throw new Error(this._outputType + " is not supported by this method");
+        }
+
+        return new NodejsStreamOutputAdapter(this, {
+            objectMode : this._outputType !== "nodebuffer"
+        }, updateCb);
+    }
+};
+
+
+module.exports = StreamHelper;
+
+},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(require,module,exports){
+'use strict';
+
+exports.base64 = true;
+exports.array = true;
+exports.string = true;
+exports.arraybuffer = typeof ArrayBuffer !== "undefined" && typeof Uint8Array !== "undefined";
+exports.nodebuffer = typeof Buffer !== "undefined";
+// contains true if JSZip can read/generate Uint8Array, false otherwise.
+exports.uint8array = typeof Uint8Array !== "undefined";
+
+if (typeof ArrayBuffer === "undefined") {
+    exports.blob = false;
+}
+else {
+    var buffer = new ArrayBuffer(0);
+    try {
+        exports.blob = new Blob([buffer], {
+            type: "application/zip"
+        }).size === 0;
+    }
+    catch (e) {
+        try {
+            var Builder = self.BlobBuilder || self.WebKitBlobBuilder || self.MozBlobBuilder || self.MSBlobBuilder;
+            var builder = new Builder();
+            builder.append(buffer);
+            exports.blob = builder.getBlob('application/zip').size === 0;
+        }
+        catch (e) {
+            exports.blob = false;
+        }
+    }
+}
+
+try {
+    exports.nodestream = !!require('readable-stream').Readable;
+} catch(e) {
+    exports.nodestream = false;
+}
+
+},{"readable-stream":16}],31:[function(require,module,exports){
+'use strict';
+
+var utils = require('./utils');
+var support = require('./support');
+var nodejsUtils = require('./nodejsUtils');
+var GenericWorker = require('./stream/GenericWorker');
+
+/**
+ * The following functions come from pako, from pako/lib/utils/strings
+ * released under the MIT license, see pako https://github.com/nodeca/pako/
+ */
+
+// Table with utf8 lengths (calculated by first byte of sequence)
+// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
+// because max possible codepoint is 0x10ffff
+var _utf8len = new Array(256);
+for (var i=0; i<256; i++) {
+  _utf8len[i] = (i >= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
+}
+_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
+
+// convert string to array (typed, when possible)
+var string2buf = function (str) {
+    var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
+
+    // count binary size
+    for (m_pos = 0; m_pos < str_len; m_pos++) {
+        c = str.charCodeAt(m_pos);
+        if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
+            c2 = str.charCodeAt(m_pos+1);
+            if ((c2 & 0xfc00) === 0xdc00) {
+                c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
+                m_pos++;
+            }
+        }
+        buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
+    }
+
+    // allocate buffer
+    if (support.uint8array) {
+        buf = new Uint8Array(buf_len);
+    } else {
+        buf = new Array(buf_len);
+    }
+
+    // convert
+    for (i=0, m_pos = 0; i < buf_len; m_pos++) {
+        c = str.charCodeAt(m_pos);
+        if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
+            c2 = str.charCodeAt(m_pos+1);
+            if ((c2 & 0xfc00) === 0xdc00) {
+                c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
+                m_pos++;
+            }
+        }
+        if (c < 0x80) {
+            /* one byte */
+            buf[i++] = c;
+        } else if (c < 0x800) {
+            /* two bytes */
+            buf[i++] = 0xC0 | (c >>> 6);
+            buf[i++] = 0x80 | (c & 0x3f);
+        } else if (c < 0x10000) {
+            /* three bytes */
+            buf[i++] = 0xE0 | (c >>> 12);
+            buf[i++] = 0x80 | (c >>> 6 & 0x3f);
+            buf[i++] = 0x80 | (c & 0x3f);
+        } else {
+            /* four bytes */
+            buf[i++] = 0xf0 | (c >>> 18);
+            buf[i++] = 0x80 | (c >>> 12 & 0x3f);
+            buf[i++] = 0x80 | (c >>> 6 & 0x3f);
+            buf[i++] = 0x80 | (c & 0x3f);
+        }
+    }
+
+    return buf;
+};
+
+// Calculate max possible position in utf8 buffer,
+// that will not break sequence. If that's not possible
+// - (very small limits) return max size as is.
+//
+// buf[] - utf8 bytes array
+// max   - length limit (mandatory);
+var utf8border = function(buf, max) {
+    var pos;
+
+    max = max || buf.length;
+    if (max > buf.length) { max = buf.length; }
+
+    // go back from last position, until start of sequence found
+    pos = max-1;
+    while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
+
+    // Fuckup - very small and broken sequence,
+    // return max, because we should return something anyway.
+    if (pos < 0) { return max; }
+
+    // If we came to start of buffer - that means vuffer is too small,
+    // return max too.
+    if (pos === 0) { return max; }
+
+    return (pos + _utf8len[buf[pos]] > max) ? pos : max;
+};
+
+// convert array to string
+var buf2string = function (buf) {
+    var str, i, out, c, c_len;
+    var len = buf.length;
+
+    // Reserve max possible length (2 words per char)
+    // NB: by unknown reasons, Array is significantly faster for
+    //     String.fromCharCode.apply than Uint16Array.
+    var utf16buf = new Array(len*2);
+
+    for (out=0, i=0; i<len;) {
+        c = buf[i++];
+        // quick process ascii
+        if (c < 0x80) { utf16buf[out++] = c; continue; }
+
+        c_len = _utf8len[c];
+        // skip 5 & 6 byte codes
+        if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
+
+        // apply mask on first byte
+        c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
+        // join the rest
+        while (c_len > 1 && i < len) {
+            c = (c << 6) | (buf[i++] & 0x3f);
+            c_len--;
+        }
+
+        // terminated by end of string?
+        if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
+
+        if (c < 0x10000) {
+            utf16buf[out++] = c;
+        } else {
+            c -= 0x10000;
+            utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
+            utf16buf[out++] = 0xdc00 | (c & 0x3ff);
+        }
+    }
+
+    // shrinkBuf(utf16buf, out)
+    if (utf16buf.length !== out) {
+        if(utf16buf.subarray) {
+            utf16buf = utf16buf.subarray(0, out);
+        } else {
+            utf16buf.length = out;
+        }
+    }
+
+    // return String.fromCharCode.apply(null, utf16buf);
+    return utils.applyFromCharCode(utf16buf);
+};
+
+
+// That's all for the pako functions.
+
+
+/**
+ * Transform a javascript string into an array (typed if possible) of bytes,
+ * UTF-8 encoded.
+ * @param {String} str the string to encode
+ * @return {Array|Uint8Array|Buffer} the UTF-8 encoded string.
+ */
+exports.utf8encode = function utf8encode(str) {
+    if (support.nodebuffer) {
+        return nodejsUtils.newBufferFrom(str, "utf-8");
+    }
+
+    return string2buf(str);
+};
+
+
+/**
+ * Transform a bytes array (or a representation) representing an UTF-8 encoded
+ * string into a javascript string.
+ * @param {Array|Uint8Array|Buffer} buf the data de decode
+ * @return {String} the decoded string.
+ */
+exports.utf8decode = function utf8decode(buf) {
+    if (support.nodebuffer) {
+        return utils.transformTo("nodebuffer", buf).toString("utf-8");
+    }
+
+    buf = utils.transformTo(support.uint8array ? "uint8array" : "array", buf);
+
+    return buf2string(buf);
+};
+
+/**
+ * A worker to decode utf8 encoded binary chunks into string chunks.
+ * @constructor
+ */
+function Utf8DecodeWorker() {
+    GenericWorker.call(this, "utf-8 decode");
+    // the last bytes if a chunk didn't end with a complete codepoint.
+    this.leftOver = null;
+}
+utils.inherits(Utf8DecodeWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+Utf8DecodeWorker.prototype.processChunk = function (chunk) {
+
+    var data = utils.transformTo(support.uint8array ? "uint8array" : "array", chunk.data);
+
+    // 1st step, re-use what's left of the previous chunk
+    if (this.leftOver && this.leftOver.length) {
+        if(support.uint8array) {
+            var previousData = data;
+            data = new Uint8Array(previousData.length + this.leftOver.length);
+            data.set(this.leftOver, 0);
+            data.set(previousData, this.leftOver.length);
+        } else {
+            data = this.leftOver.concat(data);
+        }
+        this.leftOver = null;
+    }
+
+    var nextBoundary = utf8border(data);
+    var usableData = data;
+    if (nextBoundary !== data.length) {
+        if (support.uint8array) {
+            usableData = data.subarray(0, nextBoundary);
+            this.leftOver = data.subarray(nextBoundary, data.length);
+        } else {
+            usableData = data.slice(0, nextBoundary);
+            this.leftOver = data.slice(nextBoundary, data.length);
+        }
+    }
+
+    this.push({
+        data : exports.utf8decode(usableData),
+        meta : chunk.meta
+    });
+};
+
+/**
+ * @see GenericWorker.flush
+ */
+Utf8DecodeWorker.prototype.flush = function () {
+    if(this.leftOver && this.leftOver.length) {
+        this.push({
+            data : exports.utf8decode(this.leftOver),
+            meta : {}
+        });
+        this.leftOver = null;
+    }
+};
+exports.Utf8DecodeWorker = Utf8DecodeWorker;
+
+/**
+ * A worker to endcode string chunks into utf8 encoded binary chunks.
+ * @constructor
+ */
+function Utf8EncodeWorker() {
+    GenericWorker.call(this, "utf-8 encode");
+}
+utils.inherits(Utf8EncodeWorker, GenericWorker);
+
+/**
+ * @see GenericWorker.processChunk
+ */
+Utf8EncodeWorker.prototype.processChunk = function (chunk) {
+    this.push({
+        data : exports.utf8encode(chunk.data),
+        meta : chunk.meta
+    });
+};
+exports.Utf8EncodeWorker = Utf8EncodeWorker;
+
+},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(require,module,exports){
+'use strict';
+
+var support = require('./support');
+var base64 = require('./base64');
+var nodejsUtils = require('./nodejsUtils');
+var setImmediate = require('set-immediate-shim');
+var external = require("./external");
+
+
+/**
+ * Convert a string that pass as a "binary string": it should represent a byte
+ * array but may have > 255 char codes. Be sure to take only the first byte
+ * and returns the byte array.
+ * @param {String} str the string to transform.
+ * @return {Array|Uint8Array} the string in a binary format.
+ */
+function string2binary(str) {
+    var result = null;
+    if (support.uint8array) {
+      result = new Uint8Array(str.length);
+    } else {
+      result = new Array(str.length);
+    }
+    return stringToArrayLike(str, result);
+}
+
+/**
+ * Create a new blob with the given content and the given type.
+ * @param {String|ArrayBuffer} part the content to put in the blob. DO NOT use
+ * an Uint8Array because the stock browser of android 4 won't accept it (it
+ * will be silently converted to a string, "[object Uint8Array]").
+ *
+ * Use only ONE part to build the blob to avoid a memory leak in IE11 / Edge:
+ * when a large amount of Array is used to create the Blob, the amount of
+ * memory consumed is nearly 100 times the original data amount.
+ *
+ * @param {String} type the mime type of the blob.
+ * @return {Blob} the created blob.
+ */
+exports.newBlob = function(part, type) {
+    exports.checkSupport("blob");
+
+    try {
+        // Blob constructor
+        return new Blob([part], {
+            type: type
+        });
+    }
+    catch (e) {
+
+        try {
+            // deprecated, browser only, old way
+            var Builder = self.BlobBuilder || self.WebKitBlobBuilder || self.MozBlobBuilder || self.MSBlobBuilder;
+            var builder = new Builder();
+            builder.append(part);
+            return builder.getBlob(type);
+        }
+        catch (e) {
+
+            // well, fuck ?!
+            throw new Error("Bug : can't construct the Blob.");
+        }
+    }
+
+
+};
+/**
+ * The identity function.
+ * @param {Object} input the input.
+ * @return {Object} the same input.
+ */
+function identity(input) {
+    return input;
+}
+
+/**
+ * Fill in an array with a string.
+ * @param {String} str the string to use.
+ * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to fill in (will be mutated).
+ * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated array.
+ */
+function stringToArrayLike(str, array) {
+    for (var i = 0; i < str.length; ++i) {
+        array[i] = str.charCodeAt(i) & 0xFF;
+    }
+    return array;
+}
+
+/**
+ * An helper for the function arrayLikeToString.
+ * This contains static informations and functions that
+ * can be optimized by the browser JIT compiler.
+ */
+var arrayToStringHelper = {
+    /**
+     * Transform an array of int into a string, chunk by chunk.
+     * See the performances notes on arrayLikeToString.
+     * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
+     * @param {String} type the type of the array.
+     * @param {Integer} chunk the chunk size.
+     * @return {String} the resulting string.
+     * @throws Error if the chunk is too big for the stack.
+     */
+    stringifyByChunk: function(array, type, chunk) {
+        var result = [], k = 0, len = array.length;
+        // shortcut
+        if (len <= chunk) {
+            return String.fromCharCode.apply(null, array);
+        }
+        while (k < len) {
+            if (type === "array" || type === "nodebuffer") {
+                result.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
+            }
+            else {
+                result.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
+            }
+            k += chunk;
+        }
+        return result.join("");
+    },
+    /**
+     * Call String.fromCharCode on every item in the array.
+     * This is the naive implementation, which generate A LOT of intermediate string.
+     * This should be used when everything else fail.
+     * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
+     * @return {String} the result.
+     */
+    stringifyByChar: function(array){
+        var resultStr = "";
+        for(var i = 0; i < array.length; i++) {
+            resultStr += String.fromCharCode(array[i]);
+        }
+        return resultStr;
+    },
+    applyCanBeUsed : {
+        /**
+         * true if the browser accepts to use String.fromCharCode on Uint8Array
+         */
+        uint8array : (function () {
+            try {
+                return support.uint8array && String.fromCharCode.apply(null, new Uint8Array(1)).length === 1;
+            } catch (e) {
+                return false;
+            }
+        })(),
+        /**
+         * true if the browser accepts to use String.fromCharCode on nodejs Buffer.
+         */
+        nodebuffer : (function () {
+            try {
+                return support.nodebuffer && String.fromCharCode.apply(null, nodejsUtils.allocBuffer(1)).length === 1;
+            } catch (e) {
+                return false;
+            }
+        })()
+    }
+};
+
+/**
+ * Transform an array-like object to a string.
+ * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
+ * @return {String} the result.
+ */
+function arrayLikeToString(array) {
+    // Performances notes :
+    // --------------------
+    // String.fromCharCode.apply(null, array) is the fastest, see
+    // see http://jsperf.com/converting-a-uint8array-to-a-string/2
+    // but the stack is limited (and we can get huge arrays !).
+    //
+    // result += String.fromCharCode(array[i]); generate too many strings !
+    //
+    // This code is inspired by http://jsperf.com/arraybuffer-to-string-apply-performance/2
+    // TODO : we now have workers that split the work. Do we still need that ?
+    var chunk = 65536,
+        type = exports.getTypeOf(array),
+        canUseApply = true;
+    if (type === "uint8array") {
+        canUseApply = arrayToStringHelper.applyCanBeUsed.uint8array;
+    } else if (type === "nodebuffer") {
+        canUseApply = arrayToStringHelper.applyCanBeUsed.nodebuffer;
+    }
+
+    if (canUseApply) {
+        while (chunk > 1) {
+            try {
+                return arrayToStringHelper.stringifyByChunk(array, type, chunk);
+            } catch (e) {
+                chunk = Math.floor(chunk / 2);
+            }
+        }
+    }
+
+    // no apply or chunk error : slow and painful algorithm
+    // default browser on android 4.*
+    return arrayToStringHelper.stringifyByChar(array);
+}
+
+exports.applyFromCharCode = arrayLikeToString;
+
+
+/**
+ * Copy the data from an array-like to an other array-like.
+ * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayFrom the origin array.
+ * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayTo the destination array which will be mutated.
+ * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated destination array.
+ */
+function arrayLikeToArrayLike(arrayFrom, arrayTo) {
+    for (var i = 0; i < arrayFrom.length; i++) {
+        arrayTo[i] = arrayFrom[i];
+    }
+    return arrayTo;
+}
+
+// a matrix containing functions to transform everything into everything.
+var transform = {};
+
+// string to ?
+transform["string"] = {
+    "string": identity,
+    "array": function(input) {
+        return stringToArrayLike(input, new Array(input.length));
+    },
+    "arraybuffer": function(input) {
+        return transform["string"]["uint8array"](input).buffer;
+    },
+    "uint8array": function(input) {
+        return stringToArrayLike(input, new Uint8Array(input.length));
+    },
+    "nodebuffer": function(input) {
+        return stringToArrayLike(input, nodejsUtils.allocBuffer(input.length));
+    }
+};
+
+// array to ?
+transform["array"] = {
+    "string": arrayLikeToString,
+    "array": identity,
+    "arraybuffer": function(input) {
+        return (new Uint8Array(input)).buffer;
+    },
+    "uint8array": function(input) {
+        return new Uint8Array(input);
+    },
+    "nodebuffer": function(input) {
+        return nodejsUtils.newBufferFrom(input);
+    }
+};
+
+// arraybuffer to ?
+transform["arraybuffer"] = {
+    "string": function(input) {
+        return arrayLikeToString(new Uint8Array(input));
+    },
+    "array": function(input) {
+        return arrayLikeToArrayLike(new Uint8Array(input), new Array(input.byteLength));
+    },
+    "arraybuffer": identity,
+    "uint8array": function(input) {
+        return new Uint8Array(input);
+    },
+    "nodebuffer": function(input) {
+        return nodejsUtils.newBufferFrom(new Uint8Array(input));
+    }
+};
+
+// uint8array to ?
+transform["uint8array"] = {
+    "string": arrayLikeToString,
+    "array": function(input) {
+        return arrayLikeToArrayLike(input, new Array(input.length));
+    },
+    "arraybuffer": function(input) {
+        return input.buffer;
+    },
+    "uint8array": identity,
+    "nodebuffer": function(input) {
+        return nodejsUtils.newBufferFrom(input);
+    }
+};
+
+// nodebuffer to ?
+transform["nodebuffer"] = {
+    "string": arrayLikeToString,
+    "array": function(input) {
+        return arrayLikeToArrayLike(input, new Array(input.length));
+    },
+    "arraybuffer": function(input) {
+        return transform["nodebuffer"]["uint8array"](input).buffer;
+    },
+    "uint8array": function(input) {
+        return arrayLikeToArrayLike(input, new Uint8Array(input.length));
+    },
+    "nodebuffer": identity
+};
+
+/**
+ * Transform an input into any type.
+ * The supported output type are : string, array, uint8array, arraybuffer, nodebuffer.
+ * If no output type is specified, the unmodified input will be returned.
+ * @param {String} outputType the output type.
+ * @param {String|Array|ArrayBuffer|Uint8Array|Buffer} input the input to convert.
+ * @throws {Error} an Error if the browser doesn't support the requested output type.
+ */
+exports.transformTo = function(outputType, input) {
+    if (!input) {
+        // undefined, null, etc
+        // an empty string won't harm.
+        input = "";
+    }
+    if (!outputType) {
+        return input;
+    }
+    exports.checkSupport(outputType);
+    var inputType = exports.getTypeOf(input);
+    var result = transform[inputType][outputType](input);
+    return result;
+};
+
+/**
+ * Return the type of the input.
+ * The type will be in a format valid for JSZip.utils.transformTo : string, array, uint8array, arraybuffer.
+ * @param {Object} input the input to identify.
+ * @return {String} the (lowercase) type of the input.
+ */
+exports.getTypeOf = function(input) {
+    if (typeof input === "string") {
+        return "string";
+    }
+    if (Object.prototype.toString.call(input) === "[object Array]") {
+        return "array";
+    }
+    if (support.nodebuffer && nodejsUtils.isBuffer(input)) {
+        return "nodebuffer";
+    }
+    if (support.uint8array && input instanceof Uint8Array) {
+        return "uint8array";
+    }
+    if (support.arraybuffer && input instanceof ArrayBuffer) {
+        return "arraybuffer";
+    }
+};
+
+/**
+ * Throw an exception if the type is not supported.
+ * @param {String} type the type to check.
+ * @throws {Error} an Error if the browser doesn't support the requested type.
+ */
+exports.checkSupport = function(type) {
+    var supported = support[type.toLowerCase()];
+    if (!supported) {
+        throw new Error(type + " is not supported by this platform");
+    }
+};
+
+exports.MAX_VALUE_16BITS = 65535;
+exports.MAX_VALUE_32BITS = -1; // well, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" is parsed as -1
+
+/**
+ * Prettify a string read as binary.
+ * @param {string} str the string to prettify.
+ * @return {string} a pretty string.
+ */
+exports.pretty = function(str) {
+    var res = '',
+        code, i;
+    for (i = 0; i < (str || "").length; i++) {
+        code = str.charCodeAt(i);
+        res += '\\x' + (code < 16 ? "0" : "") + code.toString(16).toUpperCase();
+    }
+    return res;
+};
+
+/**
+ * Defer the call of a function.
+ * @param {Function} callback the function to call asynchronously.
+ * @param {Array} args the arguments to give to the callback.
+ */
+exports.delay = function(callback, args, self) {
+    setImmediate(function () {
+        callback.apply(self || null, args || []);
+    });
+};
+
+/**
+ * Extends a prototype with an other, without calling a constructor with
+ * side effects. Inspired by nodejs' `utils.inherits`
+ * @param {Function} ctor the constructor to augment
+ * @param {Function} superCtor the parent constructor to use
+ */
+exports.inherits = function (ctor, superCtor) {
+    var Obj = function() {};
+    Obj.prototype = superCtor.prototype;
+    ctor.prototype = new Obj();
+};
+
+/**
+ * Merge the objects passed as parameters into a new one.
+ * @private
+ * @param {...Object} var_args All objects to merge.
+ * @return {Object} a new object with the data of the others.
+ */
+exports.extend = function() {
+    var result = {}, i, attr;
+    for (i = 0; i < arguments.length; i++) { // arguments is not enumerable in some browsers
+        for (attr in arguments[i]) {
+            if (arguments[i].hasOwnProperty(attr) && typeof result[attr] === "undefined") {
+                result[attr] = arguments[i][attr];
+            }
+        }
+    }
+    return result;
+};
+
+/**
+ * Transform arbitrary content into a Promise.
+ * @param {String} name a name for the content being processed.
+ * @param {Object} inputData the content to process.
+ * @param {Boolean} isBinary true if the content is not an unicode string
+ * @param {Boolean} isOptimizedBinaryString true if the string content only has one byte per character.
+ * @param {Boolean} isBase64 true if the string content is encoded with base64.
+ * @return {Promise} a promise in a format usable by JSZip.
+ */
+exports.prepareContent = function(name, inputData, isBinary, isOptimizedBinaryString, isBase64) {
+
+    // if inputData is already a promise, this flatten it.
+    var promise = external.Promise.resolve(inputData).then(function(data) {
+        
+        
+        var isBlob = support.blob && (data instanceof Blob || ['[object File]', '[object Blob]'].indexOf(Object.prototype.toString.call(data)) !== -1);
+
+        if (isBlob && typeof FileReader !== "undefined") {
+            return new external.Promise(function (resolve, reject) {
+                var reader = new FileReader();
+
+                reader.onload = function(e) {
+                    resolve(e.target.result);
+                };
+                reader.onerror = function(e) {
+                    reject(e.target.error);
+                };
+                reader.readAsArrayBuffer(data);
+            });
+        } else {
+            return data;
+        }
+    });
+
+    return promise.then(function(data) {
+        var dataType = exports.getTypeOf(data);
+
+        if (!dataType) {
+            return external.Promise.reject(
+                new Error("Can't read the data of '" + name + "'. Is it " +
+                          "in a supported JavaScript type (String, Blob, ArrayBuffer, etc) ?")
+            );
+        }
+        // special case : it's way easier to work with Uint8Array than with ArrayBuffer
+        if (dataType === "arraybuffer") {
+            data = exports.transformTo("uint8array", data);
+        } else if (dataType === "string") {
+            if (isBase64) {
+                data = base64.decode(data);
+            }
+            else if (isBinary) {
+                // optimizedBinaryString === true means that the file has already been filtered with a 0xFF mask
+                if (isOptimizedBinaryString !== true) {
+                    // this is a string, not in a base64 format.
+                    // Be sure that this is a correct "binary string"
+                    data = string2binary(data);
+                }
+            }
+        }
+        return data;
+    });
+};
+
+},{"./base64":1,"./external":6,"./nodejsUtils":14,"./support":30,"set-immediate-shim":54}],33:[function(require,module,exports){
+'use strict';
+var readerFor = require('./reader/readerFor');
+var utils = require('./utils');
+var sig = require('./signature');
+var ZipEntry = require('./zipEntry');
+var utf8 = require('./utf8');
+var support = require('./support');
+//  class ZipEntries {{{
+/**
+ * All the entries in the zip file.
+ * @constructor
+ * @param {Object} loadOptions Options for loading the stream.
+ */
+function ZipEntries(loadOptions) {
+    this.files = [];
+    this.loadOptions = loadOptions;
+}
+ZipEntries.prototype = {
+    /**
+     * Check that the reader is on the specified signature.
+     * @param {string} expectedSignature the expected signature.
+     * @throws {Error} if it is an other signature.
+     */
+    checkSignature: function(expectedSignature) {
+        if (!this.reader.readAndCheckSignature(expectedSignature)) {
+            this.reader.index -= 4;
+            var signature = this.reader.readString(4);
+            throw new Error("Corrupted zip or bug: unexpected signature " + "(" + utils.pretty(signature) + ", expected " + utils.pretty(expectedSignature) + ")");
+        }
+    },
+    /**
+     * Check if the given signature is at the given index.
+     * @param {number} askedIndex the index to check.
+     * @param {string} expectedSignature the signature to expect.
+     * @return {boolean} true if the signature is here, false otherwise.
+     */
+    isSignature: function(askedIndex, expectedSignature) {
+        var currentIndex = this.reader.index;
+        this.reader.setIndex(askedIndex);
+        var signature = this.reader.readString(4);
+        var result = signature === expectedSignature;
+        this.reader.setIndex(currentIndex);
+        return result;
+    },
+    /**
+     * Read the end of the central directory.
+     */
+    readBlockEndOfCentral: function() {
+        this.diskNumber = this.reader.readInt(2);
+        this.diskWithCentralDirStart = this.reader.readInt(2);
+        this.centralDirRecordsOnThisDisk = this.reader.readInt(2);
+        this.centralDirRecords = this.reader.readInt(2);
+        this.centralDirSize = this.reader.readInt(4);
+        this.centralDirOffset = this.reader.readInt(4);
+
+        this.zipCommentLength = this.reader.readInt(2);
+        // warning : the encoding depends of the system locale
+        // On a linux machine with LANG=en_US.utf8, this field is utf8 encoded.
+        // On a windows machine, this field is encoded with the localized windows code page.
+        var zipComment = this.reader.readData(this.zipCommentLength);
+        var decodeParamType = support.uint8array ? "uint8array" : "array";
+        // To get consistent behavior with the generation part, we will assume that
+        // this is utf8 encoded unless specified otherwise.
+        var decodeContent = utils.transformTo(decodeParamType, zipComment);
+        this.zipComment = this.loadOptions.decodeFileName(decodeContent);
+    },
+    /**
+     * Read the end of the Zip 64 central directory.
+     * Not merged with the method readEndOfCentral :
+     * The end of central can coexist with its Zip64 brother,
+     * I don't want to read the wrong number of bytes !
+     */
+    readBlockZip64EndOfCentral: function() {
+        this.zip64EndOfCentralSize = this.reader.readInt(8);
+        this.reader.skip(4);
+        // this.versionMadeBy = this.reader.readString(2);
+        // this.versionNeeded = this.reader.readInt(2);
+        this.diskNumber = this.reader.readInt(4);
+        this.diskWithCentralDirStart = this.reader.readInt(4);
+        this.centralDirRecordsOnThisDisk = this.reader.readInt(8);
+        this.centralDirRecords = this.reader.readInt(8);
+        this.centralDirSize = this.reader.readInt(8);
+        this.centralDirOffset = this.reader.readInt(8);
+
+        this.zip64ExtensibleData = {};
+        var extraDataSize = this.zip64EndOfCentralSize - 44,
+            index = 0,
+            extraFieldId,
+            extraFieldLength,
+            extraFieldValue;
+        while (index < extraDataSize) {
+            extraFieldId = this.reader.readInt(2);
+            extraFieldLength = this.reader.readInt(4);
+            extraFieldValue = this.reader.readData(extraFieldLength);
+            this.zip64ExtensibleData[extraFieldId] = {
+                id: extraFieldId,
+                length: extraFieldLength,
+                value: extraFieldValue
+            };
+        }
+    },
+    /**
+     * Read the end of the Zip 64 central directory locator.
+     */
+    readBlockZip64EndOfCentralLocator: function() {
+        this.diskWithZip64CentralDirStart = this.reader.readInt(4);
+        this.relativeOffsetEndOfZip64CentralDir = this.reader.readInt(8);
+        this.disksCount = this.reader.readInt(4);
+        if (this.disksCount > 1) {
+            throw new Error("Multi-volumes zip are not supported");
+        }
+    },
+    /**
+     * Read the local files, based on the offset read in the central part.
+     */
+    readLocalFiles: function() {
+        var i, file;
+        for (i = 0; i < this.files.length; i++) {
+            file = this.files[i];
+            this.reader.setIndex(file.localHeaderOffset);
+            this.checkSignature(sig.LOCAL_FILE_HEADER);
+            file.readLocalPart(this.reader);
+            file.handleUTF8();
+            file.processAttributes();
+        }
+    },
+    /**
+     * Read the central directory.
+     */
+    readCentralDir: function() {
+        var file;
+
+        this.reader.setIndex(this.centralDirOffset);
+        while (this.reader.readAndCheckSignature(sig.CENTRAL_FILE_HEADER)) {
+            file = new ZipEntry({
+                zip64: this.zip64
+            }, this.loadOptions);
+            file.readCentralPart(this.reader);
+            this.files.push(file);
+        }
+
+        if (this.centralDirRecords !== this.files.length) {
+            if (this.centralDirRecords !== 0 && this.files.length === 0) {
+                // We expected some records but couldn't find ANY.
+                // This is really suspicious, as if something went wrong.
+                throw new Error("Corrupted zip or bug: expected " + this.centralDirRecords + " records in central dir, got " + this.files.length);
+            } else {
+                // We found some records but not all.
+                // Something is wrong but we got something for the user: no error here.
+                // console.warn("expected", this.centralDirRecords, "records in central dir, got", this.files.length);
+            }
+        }
+    },
+    /**
+     * Read the end of central directory.
+     */
+    readEndOfCentral: function() {
+        var offset = this.reader.lastIndexOfSignature(sig.CENTRAL_DIRECTORY_END);
+        if (offset < 0) {
+            // Check if the content is a truncated zip or complete garbage.
+            // A "LOCAL_FILE_HEADER" is not required at the beginning (auto
+            // extractible zip for example) but it can give a good hint.
+            // If an ajax request was used without responseType, we will also
+            // get unreadable data.
+            var isGarbage = !this.isSignature(0, sig.LOCAL_FILE_HEADER);
+
+            if (isGarbage) {
+                throw new Error("Can't find end of central directory : is this a zip file ? " +
+                                "If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html");
+            } else {
+                throw new Error("Corrupted zip: can't find end of central directory");
+            }
+
+        }
+        this.reader.setIndex(offset);
+        var endOfCentralDirOffset = offset;
+        this.checkSignature(sig.CENTRAL_DIRECTORY_END);
+        this.readBlockEndOfCentral();
+
+
+        /* extract from the zip spec :
+            4)  If one of the fields in the end of central directory
+                record is too small to hold required data, the field
+                should be set to -1 (0xFFFF or 0xFFFFFFFF) and the
+                ZIP64 format record should be created.
+            5)  The end of central directory record and the
+                Zip64 end of central directory locator record must
+                reside on the same disk when splitting or spanning
+                an archive.
+         */
+        if (this.diskNumber === utils.MAX_VALUE_16BITS || this.diskWithCentralDirStart === utils.MAX_VALUE_16BITS || this.centralDirRecordsOnThisDisk === utils.MAX_VALUE_16BITS || this.centralDirRecords === utils.MAX_VALUE_16BITS || this.centralDirSize === utils.MAX_VALUE_32BITS || this.centralDirOffset === utils.MAX_VALUE_32BITS) {
+            this.zip64 = true;
+
+            /*
+            Warning : the zip64 extension is supported, but ONLY if the 64bits integer read from
+            the zip file can fit into a 32bits integer. This cannot be solved : JavaScript represents
+            all numbers as 64-bit double precision IEEE 754 floating point numbers.
+            So, we have 53bits for integers and bitwise operations treat everything as 32bits.
+            see https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Operators/Bitwise_Operators
+            and http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf section 8.5
+            */
+
+            // should look for a zip64 EOCD locator
+            offset = this.reader.lastIndexOfSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
+            if (offset < 0) {
+                throw new Error("Corrupted zip: can't find the ZIP64 end of central directory locator");
+            }
+            this.reader.setIndex(offset);
+            this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
+            this.readBlockZip64EndOfCentralLocator();
+
+            // now the zip64 EOCD record
+            if (!this.isSignature(this.relativeOffsetEndOfZip64CentralDir, sig.ZIP64_CENTRAL_DIRECTORY_END)) {
+                // console.warn("ZIP64 end of central directory not where expected.");
+                this.relativeOffsetEndOfZip64CentralDir = this.reader.lastIndexOfSignature(sig.ZIP64_CENTRAL_DIRECTORY_END);
+                if (this.relativeOffsetEndOfZip64CentralDir < 0) {
+                    throw new Error("Corrupted zip: can't find the ZIP64 end of central directory");
+                }
+            }
+            this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir);
+            this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_END);
+            this.readBlockZip64EndOfCentral();
+        }
+
+        var expectedEndOfCentralDirOffset = this.centralDirOffset + this.centralDirSize;
+        if (this.zip64) {
+            expectedEndOfCentralDirOffset += 20; // end of central dir 64 locator
+            expectedEndOfCentralDirOffset += 12 /* should not include the leading 12 bytes */ + this.zip64EndOfCentralSize;
+        }
+
+        var extraBytes = endOfCentralDirOffset - expectedEndOfCentralDirOffset;
+
+        if (extraBytes > 0) {
+            // console.warn(extraBytes, "extra bytes at beginning or within zipfile");
+            if (this.isSignature(endOfCentralDirOffset, sig.CENTRAL_FILE_HEADER)) {
+                // The offsets seem wrong, but we have something at the specified offset.
+                // So… we keep it.
+            } else {
+                // the offset is wrong, update the "zero" of the reader
+                // this happens if data has been prepended (crx files for example)
+                this.reader.zero = extraBytes;
+            }
+        } else if (extraBytes < 0) {
+            throw new Error("Corrupted zip: missing " + Math.abs(extraBytes) + " bytes.");
+        }
+    },
+    prepareReader: function(data) {
+        this.reader = readerFor(data);
+    },
+    /**
+     * Read a zip file and create ZipEntries.
+     * @param {String|ArrayBuffer|Uint8Array|Buffer} data the binary string representing a zip file.
+     */
+    load: function(data) {
+        this.prepareReader(data);
+        this.readEndOfCentral();
+        this.readCentralDir();
+        this.readLocalFiles();
+    }
+};
+// }}} end of ZipEntries
+module.exports = ZipEntries;
+
+},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utf8":31,"./utils":32,"./zipEntry":34}],34:[function(require,module,exports){
+'use strict';
+var readerFor = require('./reader/readerFor');
+var utils = require('./utils');
+var CompressedObject = require('./compressedObject');
+var crc32fn = require('./crc32');
+var utf8 = require('./utf8');
+var compressions = require('./compressions');
+var support = require('./support');
+
+var MADE_BY_DOS = 0x00;
+var MADE_BY_UNIX = 0x03;
+
+/**
+ * Find a compression registered in JSZip.
+ * @param {string} compressionMethod the method magic to find.
+ * @return {Object|null} the JSZip compression object, null if none found.
+ */
+var findCompression = function(compressionMethod) {
+    for (var method in compressions) {
+        if (!compressions.hasOwnProperty(method)) {
+            continue;
+        }
+        if (compressions[method].magic === compressionMethod) {
+            return compressions[method];
+        }
+    }
+    return null;
+};
+
+// class ZipEntry {{{
+/**
+ * An entry in the zip file.
+ * @constructor
+ * @param {Object} options Options of the current file.
+ * @param {Object} loadOptions Options for loading the stream.
+ */
+function ZipEntry(options, loadOptions) {
+    this.options = options;
+    this.loadOptions = loadOptions;
+}
+ZipEntry.prototype = {
+    /**
+     * say if the file is encrypted.
+     * @return {boolean} true if the file is encrypted, false otherwise.
+     */
+    isEncrypted: function() {
+        // bit 1 is set
+        return (this.bitFlag & 0x0001) === 0x0001;
+    },
+    /**
+     * say if the file has utf-8 filename/comment.
+     * @return {boolean} true if the filename/comment is in utf-8, false otherwise.
+     */
+    useUTF8: function() {
+        // bit 11 is set
+        return (this.bitFlag & 0x0800) === 0x0800;
+    },
+    /**
+     * Read the local part of a zip file and add the info in this object.
+     * @param {DataReader} reader the reader to use.
+     */
+    readLocalPart: function(reader) {
+        var compression, localExtraFieldsLength;
+
+        // we already know everything from the central dir !
+        // If the central dir data are false, we are doomed.
+        // On the bright side, the local part is scary  : zip64, data descriptors, both, etc.
+        // The less data we get here, the more reliable this should be.
+        // Let's skip the whole header and dash to the data !
+        reader.skip(22);
+        // in some zip created on windows, the filename stored in the central dir contains \ instead of /.
+        // Strangely, the filename here is OK.
+        // I would love to treat these zip files as corrupted (see http://www.info-zip.org/FAQ.html#backslashes
+        // or APPNOTE#4.4.17.1, "All slashes MUST be forward slashes '/'") but there are a lot of bad zip generators...
+        // Search "unzip mismatching "local" filename continuing with "central" filename version" on
+        // the internet.
+        //
+        // I think I see the logic here : the central directory is used to display
+        // content and the local directory is used to extract the files. Mixing / and \
+        // may be used to display \ to windows users and use / when extracting the files.
+        // Unfortunately, this lead also to some issues : http://seclists.org/fulldisclosure/2009/Sep/394
+        this.fileNameLength = reader.readInt(2);
+        localExtraFieldsLength = reader.readInt(2); // can't be sure this will be the same as the central dir
+        // the fileName is stored as binary data, the handleUTF8 method will take care of the encoding.
+        this.fileName = reader.readData(this.fileNameLength);
+        reader.skip(localExtraFieldsLength);
+
+        if (this.compressedSize === -1 || this.uncompressedSize === -1) {
+            throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory " + "(compressedSize === -1 || uncompressedSize === -1)");
+        }
+
+        compression = findCompression(this.compressionMethod);
+        if (compression === null) { // no compression found
+            throw new Error("Corrupted zip : compression " + utils.pretty(this.compressionMethod) + " unknown (inner file : " + utils.transformTo("string", this.fileName) + ")");
+        }
+        this.decompressed = new CompressedObject(this.compressedSize, this.uncompressedSize, this.crc32, compression, reader.readData(this.compressedSize));
+    },
+
+    /**
+     * Read the central part of a zip file and add the info in this object.
+     * @param {DataReader} reader the reader to use.
+     */
+    readCentralPart: function(reader) {
+        this.versionMadeBy = reader.readInt(2);
+        reader.skip(2);
+        // this.versionNeeded = reader.readInt(2);
+        this.bitFlag = reader.readInt(2);
+        this.compressionMethod = reader.readString(2);
+        this.date = reader.readDate();
+        this.crc32 = reader.readInt(4);
+        this.compressedSize = reader.readInt(4);
+        this.uncompressedSize = reader.readInt(4);
+        var fileNameLength = reader.readInt(2);
+        this.extraFieldsLength = reader.readInt(2);
+        this.fileCommentLength = reader.readInt(2);
+        this.diskNumberStart = reader.readInt(2);
+        this.internalFileAttributes = reader.readInt(2);
+        this.externalFileAttributes = reader.readInt(4);
+        this.localHeaderOffset = reader.readInt(4);
+
+        if (this.isEncrypted()) {
+            throw new Error("Encrypted zip are not supported");
+        }
+
+        // will be read in the local part, see the comments there
+        reader.skip(fileNameLength);
+        this.readExtraFields(reader);
+        this.parseZIP64ExtraField(reader);
+        this.fileComment = reader.readData(this.fileCommentLength);
+    },
+
+    /**
+     * Parse the external file attributes and get the unix/dos permissions.
+     */
+    processAttributes: function () {
+        this.unixPermissions = null;
+        this.dosPermissions = null;
+        var madeBy = this.versionMadeBy >> 8;
+
+        // Check if we have the DOS directory flag set.
+        // We look for it in the DOS and UNIX permissions
+        // but some unknown platform could set it as a compatibility flag.
+        this.dir = this.externalFileAttributes & 0x0010 ? true : false;
+
+        if(madeBy === MADE_BY_DOS) {
+            // first 6 bits (0 to 5)
+            this.dosPermissions = this.externalFileAttributes & 0x3F;
+        }
+
+        if(madeBy === MADE_BY_UNIX) {
+            this.unixPermissions = (this.externalFileAttributes >> 16) & 0xFFFF;
+            // the octal permissions are in (this.unixPermissions & 0x01FF).toString(8);
+        }
+
+        // fail safe : if the name ends with a / it probably means a folder
+        if (!this.dir && this.fileNameStr.slice(-1) === '/') {
+            this.dir = true;
+        }
+    },
+
+    /**
+     * Parse the ZIP64 extra field and merge the info in the current ZipEntry.
+     * @param {DataReader} reader the reader to use.
+     */
+    parseZIP64ExtraField: function(reader) {
+
+        if (!this.extraFields[0x0001]) {
+            return;
+        }
+
+        // should be something, preparing the extra reader
+        var extraReader = readerFor(this.extraFields[0x0001].value);
+
+        // I really hope that these 64bits integer can fit in 32 bits integer, because js
+        // won't let us have more.
+        if (this.uncompressedSize === utils.MAX_VALUE_32BITS) {
+            this.uncompressedSize = extraReader.readInt(8);
+        }
+        if (this.compressedSize === utils.MAX_VALUE_32BITS) {
+            this.compressedSize = extraReader.readInt(8);
+        }
+        if (this.localHeaderOffset === utils.MAX_VALUE_32BITS) {
+            this.localHeaderOffset = extraReader.readInt(8);
+        }
+        if (this.diskNumberStart === utils.MAX_VALUE_32BITS) {
+            this.diskNumberStart = extraReader.readInt(4);
+        }
+    },
+    /**
+     * Read the central part of a zip file and add the info in this object.
+     * @param {DataReader} reader the reader to use.
+     */
+    readExtraFields: function(reader) {
+        var end = reader.index + this.extraFieldsLength,
+            extraFieldId,
+            extraFieldLength,
+            extraFieldValue;
+
+        if (!this.extraFields) {
+            this.extraFields = {};
+        }
+
+        while (reader.index < end) {
+            extraFieldId = reader.readInt(2);
+            extraFieldLength = reader.readInt(2);
+            extraFieldValue = reader.readData(extraFieldLength);
+
+            this.extraFields[extraFieldId] = {
+                id: extraFieldId,
+                length: extraFieldLength,
+                value: extraFieldValue
+            };
+        }
+    },
+    /**
+     * Apply an UTF8 transformation if needed.
+     */
+    handleUTF8: function() {
+        var decodeParamType = support.uint8array ? "uint8array" : "array";
+        if (this.useUTF8()) {
+            this.fileNameStr = utf8.utf8decode(this.fileName);
+            this.fileCommentStr = utf8.utf8decode(this.fileComment);
+        } else {
+            var upath = this.findExtraFieldUnicodePath();
+            if (upath !== null) {
+                this.fileNameStr = upath;
+            } else {
+                // ASCII text or unsupported code page
+                var fileNameByteArray =  utils.transformTo(decodeParamType, this.fileName);
+                this.fileNameStr = this.loadOptions.decodeFileName(fileNameByteArray);
+            }
+
+            var ucomment = this.findExtraFieldUnicodeComment();
+            if (ucomment !== null) {
+                this.fileCommentStr = ucomment;
+            } else {
+                // ASCII text or unsupported code page
+                var commentByteArray =  utils.transformTo(decodeParamType, this.fileComment);
+                this.fileCommentStr = this.loadOptions.decodeFileName(commentByteArray);
+            }
+        }
+    },
+
+    /**
+     * Find the unicode path declared in the extra field, if any.
+     * @return {String} the unicode path, null otherwise.
+     */
+    findExtraFieldUnicodePath: function() {
+        var upathField = this.extraFields[0x7075];
+        if (upathField) {
+            var extraReader = readerFor(upathField.value);
+
+            // wrong version
+            if (extraReader.readInt(1) !== 1) {
+                return null;
+            }
+
+            // the crc of the filename changed, this field is out of date.
+            if (crc32fn(this.fileName) !== extraReader.readInt(4)) {
+                return null;
+            }
+
+            return utf8.utf8decode(extraReader.readData(upathField.length - 5));
+        }
+        return null;
+    },
+
+    /**
+     * Find the unicode comment declared in the extra field, if any.
+     * @return {String} the unicode comment, null otherwise.
+     */
+    findExtraFieldUnicodeComment: function() {
+        var ucommentField = this.extraFields[0x6375];
+        if (ucommentField) {
+            var extraReader = readerFor(ucommentField.value);
+
+            // wrong version
+            if (extraReader.readInt(1) !== 1) {
+                return null;
+            }
+
+            // the crc of the comment changed, this field is out of date.
+            if (crc32fn(this.fileComment) !== extraReader.readInt(4)) {
+                return null;
+            }
+
+            return utf8.utf8decode(extraReader.readData(ucommentField.length - 5));
+        }
+        return null;
+    }
+};
+module.exports = ZipEntry;
+
+},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(require,module,exports){
+'use strict';
+
+var StreamHelper = require('./stream/StreamHelper');
+var DataWorker = require('./stream/DataWorker');
+var utf8 = require('./utf8');
+var CompressedObject = require('./compressedObject');
+var GenericWorker = require('./stream/GenericWorker');
+
+/**
+ * A simple object representing a file in the zip file.
+ * @constructor
+ * @param {string} name the name of the file
+ * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data
+ * @param {Object} options the options of the file
+ */
+var ZipObject = function(name, data, options) {
+    this.name = name;
+    this.dir = options.dir;
+    this.date = options.date;
+    this.comment = options.comment;
+    this.unixPermissions = options.unixPermissions;
+    this.dosPermissions = options.dosPermissions;
+
+    this._data = data;
+    this._dataBinary = options.binary;
+    // keep only the compression
+    this.options = {
+        compression : options.compression,
+        compressionOptions : options.compressionOptions
+    };
+};
+
+ZipObject.prototype = {
+    /**
+     * Create an internal stream for the content of this object.
+     * @param {String} type the type of each chunk.
+     * @return StreamHelper the stream.
+     */
+    internalStream: function (type) {
+        var result = null, outputType = "string";
+        try {
+            if (!type) {
+                throw new Error("No output type specified.");
+            }
+            outputType = type.toLowerCase();
+            var askUnicodeString = outputType === "string" || outputType === "text";
+            if (outputType === "binarystring" || outputType === "text") {
+                outputType = "string";
+            }
+            result = this._decompressWorker();
+
+            var isUnicodeString = !this._dataBinary;
+
+            if (isUnicodeString && !askUnicodeString) {
+                result = result.pipe(new utf8.Utf8EncodeWorker());
+            }
+            if (!isUnicodeString && askUnicodeString) {
+                result = result.pipe(new utf8.Utf8DecodeWorker());
+            }
+        } catch (e) {
+            result = new GenericWorker("error");
+            result.error(e);
+        }
+
+        return new StreamHelper(result, outputType, "");
+    },
+
+    /**
+     * Prepare the content in the asked type.
+     * @param {String} type the type of the result.
+     * @param {Function} onUpdate a function to call on each internal update.
+     * @return Promise the promise of the result.
+     */
+    async: function (type, onUpdate) {
+        return this.internalStream(type).accumulate(onUpdate);
+    },
+
+    /**
+     * Prepare the content as a nodejs stream.
+     * @param {String} type the type of each chunk.
+     * @param {Function} onUpdate a function to call on each internal update.
+     * @return Stream the stream.
+     */
+    nodeStream: function (type, onUpdate) {
+        return this.internalStream(type || "nodebuffer").toNodejsStream(onUpdate);
+    },
+
+    /**
+     * Return a worker for the compressed content.
+     * @private
+     * @param {Object} compression the compression object to use.
+     * @param {Object} compressionOptions the options to use when compressing.
+     * @return Worker the worker.
+     */
+    _compressWorker: function (compression, compressionOptions) {
+        if (
+            this._data instanceof CompressedObject &&
+            this._data.compression.magic === compression.magic
+        ) {
+            return this._data.getCompressedWorker();
+        } else {
+            var result = this._decompressWorker();
+            if(!this._dataBinary) {
+                result = result.pipe(new utf8.Utf8EncodeWorker());
+            }
+            return CompressedObject.createWorkerFrom(result, compression, compressionOptions);
+        }
+    },
+    /**
+     * Return a worker for the decompressed content.
+     * @private
+     * @return Worker the worker.
+     */
+    _decompressWorker : function () {
+        if (this._data instanceof CompressedObject) {
+            return this._data.getContentWorker();
+        } else if (this._data instanceof GenericWorker) {
+            return this._data;
+        } else {
+            return new DataWorker(this._data);
+        }
+    }
+};
+
+var removedMethods = ["asText", "asBinary", "asNodeBuffer", "asUint8Array", "asArrayBuffer"];
+var removedFn = function () {
+    throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.");
+};
+
+for(var i = 0; i < removedMethods.length; i++) {
+    ZipObject.prototype[removedMethods[i]] = removedFn;
+}
+module.exports = ZipObject;
+
+},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(require,module,exports){
+(function (global){
+'use strict';
+var Mutation = global.MutationObserver || global.WebKitMutationObserver;
+
+var scheduleDrain;
+
+{
+  if (Mutation) {
+    var called = 0;
+    var observer = new Mutation(nextTick);
+    var element = global.document.createTextNode('');
+    observer.observe(element, {
+      characterData: true
+    });
+    scheduleDrain = function () {
+      element.data = (called = ++called % 2);
+    };
+  } else if (!global.setImmediate && typeof global.MessageChannel !== 'undefined') {
+    var channel = new global.MessageChannel();
+    channel.port1.onmessage = nextTick;
+    scheduleDrain = function () {
+      channel.port2.postMessage(0);
+    };
+  } else if ('document' in global && 'onreadystatechange' in global.document.createElement('script')) {
+    scheduleDrain = function () {
+
+      // Create a <script> element; its readystatechange event will be fired asynchronously once it is inserted
+      // into the document. Do so, thus queuing up the task. Remember to clean up once it's been called.
+      var scriptEl = global.document.createElement('script');
+      scriptEl.onreadystatechange = function () {
+        nextTick();
+
+        scriptEl.onreadystatechange = null;
+        scriptEl.parentNode.removeChild(scriptEl);
+        scriptEl = null;
+      };
+      global.document.documentElement.appendChild(scriptEl);
+    };
+  } else {
+    scheduleDrain = function () {
+      setTimeout(nextTick, 0);
+    };
+  }
+}
+
+var draining;
+var queue = [];
+//named nextTick for less confusing stack traces
+function nextTick() {
+  draining = true;
+  var i, oldQueue;
+  var len = queue.length;
+  while (len) {
+    oldQueue = queue;
+    queue = [];
+    i = -1;
+    while (++i < len) {
+      oldQueue[i]();
+    }
+    len = queue.length;
+  }
+  draining = false;
+}
+
+module.exports = immediate;
+function immediate(task) {
+  if (queue.push(task) === 1 && !draining) {
+    scheduleDrain();
+  }
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],37:[function(require,module,exports){
+'use strict';
+var immediate = require('immediate');
+
+/* istanbul ignore next */
+function INTERNAL() {}
+
+var handlers = {};
+
+var REJECTED = ['REJECTED'];
+var FULFILLED = ['FULFILLED'];
+var PENDING = ['PENDING'];
+
+module.exports = Promise;
+
+function Promise(resolver) {
+  if (typeof resolver !== 'function') {
+    throw new TypeError('resolver must be a function');
+  }
+  this.state = PENDING;
+  this.queue = [];
+  this.outcome = void 0;
+  if (resolver !== INTERNAL) {
+    safelyResolveThenable(this, resolver);
+  }
+}
+
+Promise.prototype["finally"] = function (callback) {
+  if (typeof callback !== 'function') {
+    return this;
+  }
+  var p = this.constructor;
+  return this.then(resolve, reject);
+
+  function resolve(value) {
+    function yes () {
+      return value;
+    }
+    return p.resolve(callback()).then(yes);
+  }
+  function reject(reason) {
+    function no () {
+      throw reason;
+    }
+    return p.resolve(callback()).then(no);
+  }
+};
+Promise.prototype["catch"] = function (onRejected) {
+  return this.then(null, onRejected);
+};
+Promise.prototype.then = function (onFulfilled, onRejected) {
+  if (typeof onFulfilled !== 'function' && this.state === FULFILLED ||
+    typeof onRejected !== 'function' && this.state === REJECTED) {
+    return this;
+  }
+  var promise = new this.constructor(INTERNAL);
+  if (this.state !== PENDING) {
+    var resolver = this.state === FULFILLED ? onFulfilled : onRejected;
+    unwrap(promise, resolver, this.outcome);
+  } else {
+    this.queue.push(new QueueItem(promise, onFulfilled, onRejected));
+  }
+
+  return promise;
+};
+function QueueItem(promise, onFulfilled, onRejected) {
+  this.promise = promise;
+  if (typeof onFulfilled === 'function') {
+    this.onFulfilled = onFulfilled;
+    this.callFulfilled = this.otherCallFulfilled;
+  }
+  if (typeof onRejected === 'function') {
+    this.onRejected = onRejected;
+    this.callRejected = this.otherCallRejected;
+  }
+}
+QueueItem.prototype.callFulfilled = function (value) {
+  handlers.resolve(this.promise, value);
+};
+QueueItem.prototype.otherCallFulfilled = function (value) {
+  unwrap(this.promise, this.onFulfilled, value);
+};
+QueueItem.prototype.callRejected = function (value) {
+  handlers.reject(this.promise, value);
+};
+QueueItem.prototype.otherCallRejected = function (value) {
+  unwrap(this.promise, this.onRejected, value);
+};
+
+function unwrap(promise, func, value) {
+  immediate(function () {
+    var returnValue;
+    try {
+      returnValue = func(value);
+    } catch (e) {
+      return handlers.reject(promise, e);
+    }
+    if (returnValue === promise) {
+      handlers.reject(promise, new TypeError('Cannot resolve promise with itself'));
+    } else {
+      handlers.resolve(promise, returnValue);
+    }
+  });
+}
+
+handlers.resolve = function (self, value) {
+  var result = tryCatch(getThen, value);
+  if (result.status === 'error') {
+    return handlers.reject(self, result.value);
+  }
+  var thenable = result.value;
+
+  if (thenable) {
+    safelyResolveThenable(self, thenable);
+  } else {
+    self.state = FULFILLED;
+    self.outcome = value;
+    var i = -1;
+    var len = self.queue.length;
+    while (++i < len) {
+      self.queue[i].callFulfilled(value);
+    }
+  }
+  return self;
+};
+handlers.reject = function (self, error) {
+  self.state = REJECTED;
+  self.outcome = error;
+  var i = -1;
+  var len = self.queue.length;
+  while (++i < len) {
+    self.queue[i].callRejected(error);
+  }
+  return self;
+};
+
+function getThen(obj) {
+  // Make sure we only access the accessor once as required by the spec
+  var then = obj && obj.then;
+  if (obj && (typeof obj === 'object' || typeof obj === 'function') && typeof then === 'function') {
+    return function appyThen() {
+      then.apply(obj, arguments);
+    };
+  }
+}
+
+function safelyResolveThenable(self, thenable) {
+  // Either fulfill, reject or reject with error
+  var called = false;
+  function onError(value) {
+    if (called) {
+      return;
+    }
+    called = true;
+    handlers.reject(self, value);
+  }
+
+  function onSuccess(value) {
+    if (called) {
+      return;
+    }
+    called = true;
+    handlers.resolve(self, value);
+  }
+
+  function tryToUnwrap() {
+    thenable(onSuccess, onError);
+  }
+
+  var result = tryCatch(tryToUnwrap);
+  if (result.status === 'error') {
+    onError(result.value);
+  }
+}
+
+function tryCatch(func, value) {
+  var out = {};
+  try {
+    out.value = func(value);
+    out.status = 'success';
+  } catch (e) {
+    out.status = 'error';
+    out.value = e;
+  }
+  return out;
+}
+
+Promise.resolve = resolve;
+function resolve(value) {
+  if (value instanceof this) {
+    return value;
+  }
+  return handlers.resolve(new this(INTERNAL), value);
+}
+
+Promise.reject = reject;
+function reject(reason) {
+  var promise = new this(INTERNAL);
+  return handlers.reject(promise, reason);
+}
+
+Promise.all = all;
+function all(iterable) {
+  var self = this;
+  if (Object.prototype.toString.call(iterable) !== '[object Array]') {
+    return this.reject(new TypeError('must be an array'));
+  }
+
+  var len = iterable.length;
+  var called = false;
+  if (!len) {
+    return this.resolve([]);
+  }
+
+  var values = new Array(len);
+  var resolved = 0;
+  var i = -1;
+  var promise = new this(INTERNAL);
+
+  while (++i < len) {
+    allResolver(iterable[i], i);
+  }
+  return promise;
+  function allResolver(value, i) {
+    self.resolve(value).then(resolveFromAll, function (error) {
+      if (!called) {
+        called = true;
+        handlers.reject(promise, error);
+      }
+    });
+    function resolveFromAll(outValue) {
+      values[i] = outValue;
+      if (++resolved === len && !called) {
+        called = true;
+        handlers.resolve(promise, values);
+      }
+    }
+  }
+}
+
+Promise.race = race;
+function race(iterable) {
+  var self = this;
+  if (Object.prototype.toString.call(iterable) !== '[object Array]') {
+    return this.reject(new TypeError('must be an array'));
+  }
+
+  var len = iterable.length;
+  var called = false;
+  if (!len) {
+    return this.resolve([]);
+  }
+
+  var i = -1;
+  var promise = new this(INTERNAL);
+
+  while (++i < len) {
+    resolver(iterable[i]);
+  }
+  return promise;
+  function resolver(value) {
+    self.resolve(value).then(function (response) {
+      if (!called) {
+        called = true;
+        handlers.resolve(promise, response);
+      }
+    }, function (error) {
+      if (!called) {
+        called = true;
+        handlers.reject(promise, error);
+      }
+    });
+  }
+}
+
+},{"immediate":36}],38:[function(require,module,exports){
+// Top level file is just a mixin of submodules & constants
+'use strict';
+
+var assign    = require('./lib/utils/common').assign;
+
+var deflate   = require('./lib/deflate');
+var inflate   = require('./lib/inflate');
+var constants = require('./lib/zlib/constants');
+
+var pako = {};
+
+assign(pako, deflate, inflate, constants);
+
+module.exports = pako;
+
+},{"./lib/deflate":39,"./lib/inflate":40,"./lib/utils/common":41,"./lib/zlib/constants":44}],39:[function(require,module,exports){
+'use strict';
+
+
+var zlib_deflate = require('./zlib/deflate');
+var utils        = require('./utils/common');
+var strings      = require('./utils/strings');
+var msg          = require('./zlib/messages');
+var ZStream      = require('./zlib/zstream');
+
+var toString = Object.prototype.toString;
+
+/* Public constants ==========================================================*/
+/* ===========================================================================*/
+
+var Z_NO_FLUSH      = 0;
+var Z_FINISH        = 4;
+
+var Z_OK            = 0;
+var Z_STREAM_END    = 1;
+var Z_SYNC_FLUSH    = 2;
+
+var Z_DEFAULT_COMPRESSION = -1;
+
+var Z_DEFAULT_STRATEGY    = 0;
+
+var Z_DEFLATED  = 8;
+
+/* ===========================================================================*/
+
+
+/**
+ * class Deflate
+ *
+ * Generic JS-style wrapper for zlib calls. If you don't need
+ * streaming behaviour - use more simple functions: [[deflate]],
+ * [[deflateRaw]] and [[gzip]].
+ **/
+
+/* internal
+ * Deflate.chunks -> Array
+ *
+ * Chunks of output data, if [[Deflate#onData]] not overriden.
+ **/
+
+/**
+ * Deflate.result -> Uint8Array|Array
+ *
+ * Compressed result, generated by default [[Deflate#onData]]
+ * and [[Deflate#onEnd]] handlers. Filled after you push last chunk
+ * (call [[Deflate#push]] with `Z_FINISH` / `true` param)  or if you
+ * push a chunk with explicit flush (call [[Deflate#push]] with
+ * `Z_SYNC_FLUSH` param).
+ **/
+
+/**
+ * Deflate.err -> Number
+ *
+ * Error code after deflate finished. 0 (Z_OK) on success.
+ * You will not need it in real life, because deflate errors
+ * are possible only on wrong options or bad `onData` / `onEnd`
+ * custom handlers.
+ **/
+
+/**
+ * Deflate.msg -> String
+ *
+ * Error message, if [[Deflate.err]] != 0
+ **/
+
+
+/**
+ * new Deflate(options)
+ * - options (Object): zlib deflate options.
+ *
+ * Creates new deflator instance with specified params. Throws exception
+ * on bad params. Supported options:
+ *
+ * - `level`
+ * - `windowBits`
+ * - `memLevel`
+ * - `strategy`
+ * - `dictionary`
+ *
+ * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
+ * for more information on these.
+ *
+ * Additional options, for internal needs:
+ *
+ * - `chunkSize` - size of generated data chunks (16K by default)
+ * - `raw` (Boolean) - do raw deflate
+ * - `gzip` (Boolean) - create gzip wrapper
+ * - `to` (String) - if equal to 'string', then result will be "binary string"
+ *    (each char code [0..255])
+ * - `header` (Object) - custom header for gzip
+ *   - `text` (Boolean) - true if compressed data believed to be text
+ *   - `time` (Number) - modification time, unix timestamp
+ *   - `os` (Number) - operation system code
+ *   - `extra` (Array) - array of bytes with extra data (max 65536)
+ *   - `name` (String) - file name (binary string)
+ *   - `comment` (String) - comment (binary string)
+ *   - `hcrc` (Boolean) - true if header crc should be added
+ *
+ * ##### Example:
+ *
+ * ```javascript
+ * var pako = require('pako')
+ *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
+ *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
+ *
+ * var deflate = new pako.Deflate({ level: 3});
+ *
+ * deflate.push(chunk1, false);
+ * deflate.push(chunk2, true);  // true -> last chunk
+ *
+ * if (deflate.err) { throw new Error(deflate.err); }
+ *
+ * console.log(deflate.result);
+ * ```
+ **/
+function Deflate(options) {
+  if (!(this instanceof Deflate)) return new Deflate(options);
+
+  this.options = utils.assign({
+    level: Z_DEFAULT_COMPRESSION,
+    method: Z_DEFLATED,
+    chunkSize: 16384,
+    windowBits: 15,
+    memLevel: 8,
+    strategy: Z_DEFAULT_STRATEGY,
+    to: ''
+  }, options || {});
+
+  var opt = this.options;
+
+  if (opt.raw && (opt.windowBits > 0)) {
+    opt.windowBits = -opt.windowBits;
+  }
+
+  else if (opt.gzip && (opt.windowBits > 0) && (opt.windowBits < 16)) {
+    opt.windowBits += 16;
+  }
+
+  this.err    = 0;      // error code, if happens (0 = Z_OK)
+  this.msg    = '';     // error message
+  this.ended  = false;  // used to avoid multiple onEnd() calls
+  this.chunks = [];     // chunks of compressed data
+
+  this.strm = new ZStream();
+  this.strm.avail_out = 0;
+
+  var status = zlib_deflate.deflateInit2(
+    this.strm,
+    opt.level,
+    opt.method,
+    opt.windowBits,
+    opt.memLevel,
+    opt.strategy
+  );
+
+  if (status !== Z_OK) {
+    throw new Error(msg[status]);
+  }
+
+  if (opt.header) {
+    zlib_deflate.deflateSetHeader(this.strm, opt.header);
+  }
+
+  if (opt.dictionary) {
+    var dict;
+    // Convert data if needed
+    if (typeof opt.dictionary === 'string') {
+      // If we need to compress text, change encoding to utf8.
+      dict = strings.string2buf(opt.dictionary);
+    } else if (toString.call(opt.dictionary) === '[object ArrayBuffer]') {
+      dict = new Uint8Array(opt.dictionary);
+    } else {
+      dict = opt.dictionary;
+    }
+
+    status = zlib_deflate.deflateSetDictionary(this.strm, dict);
+
+    if (status !== Z_OK) {
+      throw new Error(msg[status]);
+    }
+
+    this._dict_set = true;
+  }
+}
+
+/**
+ * Deflate#push(data[, mode]) -> Boolean
+ * - data (Uint8Array|Array|ArrayBuffer|String): input data. Strings will be
+ *   converted to utf8 byte sequence.
+ * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
+ *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
+ *
+ * Sends input data to deflate pipe, generating [[Deflate#onData]] calls with
+ * new compressed chunks. Returns `true` on success. The last data block must have
+ * mode Z_FINISH (or `true`). That will flush internal pending buffers and call
+ * [[Deflate#onEnd]]. For interim explicit flushes (without ending the stream) you
+ * can use mode Z_SYNC_FLUSH, keeping the compression context.
+ *
+ * On fail call [[Deflate#onEnd]] with error code and return false.
+ *
+ * We strongly recommend to use `Uint8Array` on input for best speed (output
+ * array format is detected automatically). Also, don't skip last param and always
+ * use the same type in your code (boolean or number). That will improve JS speed.
+ *
+ * For regular `Array`-s make sure all elements are [0..255].
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * push(chunk, false); // push one of data chunks
+ * ...
+ * push(chunk, true);  // push last chunk
+ * ```
+ **/
+Deflate.prototype.push = function (data, mode) {
+  var strm = this.strm;
+  var chunkSize = this.options.chunkSize;
+  var status, _mode;
+
+  if (this.ended) { return false; }
+
+  _mode = (mode === ~~mode) ? mode : ((mode === true) ? Z_FINISH : Z_NO_FLUSH);
+
+  // Convert data if needed
+  if (typeof data === 'string') {
+    // If we need to compress text, change encoding to utf8.
+    strm.input = strings.string2buf(data);
+  } else if (toString.call(data) === '[object ArrayBuffer]') {
+    strm.input = new Uint8Array(data);
+  } else {
+    strm.input = data;
+  }
+
+  strm.next_in = 0;
+  strm.avail_in = strm.input.length;
+
+  do {
+    if (strm.avail_out === 0) {
+      strm.output = new utils.Buf8(chunkSize);
+      strm.next_out = 0;
+      strm.avail_out = chunkSize;
+    }
+    status = zlib_deflate.deflate(strm, _mode);    /* no bad return value */
+
+    if (status !== Z_STREAM_END && status !== Z_OK) {
+      this.onEnd(status);
+      this.ended = true;
+      return false;
+    }
+    if (strm.avail_out === 0 || (strm.avail_in === 0 && (_mode === Z_FINISH || _mode === Z_SYNC_FLUSH))) {
+      if (this.options.to === 'string') {
+        this.onData(strings.buf2binstring(utils.shrinkBuf(strm.output, strm.next_out)));
+      } else {
+        this.onData(utils.shrinkBuf(strm.output, strm.next_out));
+      }
+    }
+  } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== Z_STREAM_END);
+
+  // Finalize on the last chunk.
+  if (_mode === Z_FINISH) {
+    status = zlib_deflate.deflateEnd(this.strm);
+    this.onEnd(status);
+    this.ended = true;
+    return status === Z_OK;
+  }
+
+  // callback interim results if Z_SYNC_FLUSH.
+  if (_mode === Z_SYNC_FLUSH) {
+    this.onEnd(Z_OK);
+    strm.avail_out = 0;
+    return true;
+  }
+
+  return true;
+};
+
+
+/**
+ * Deflate#onData(chunk) -> Void
+ * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
+ *   on js engine support. When string output requested, each chunk
+ *   will be string.
+ *
+ * By default, stores data blocks in `chunks[]` property and glue
+ * those in `onEnd`. Override this handler, if you need another behaviour.
+ **/
+Deflate.prototype.onData = function (chunk) {
+  this.chunks.push(chunk);
+};
+
+
+/**
+ * Deflate#onEnd(status) -> Void
+ * - status (Number): deflate status. 0 (Z_OK) on success,
+ *   other if not.
+ *
+ * Called once after you tell deflate that the input stream is
+ * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
+ * or if an error happened. By default - join collected chunks,
+ * free memory and fill `results` / `err` properties.
+ **/
+Deflate.prototype.onEnd = function (status) {
+  // On success - join
+  if (status === Z_OK) {
+    if (this.options.to === 'string') {
+      this.result = this.chunks.join('');
+    } else {
+      this.result = utils.flattenChunks(this.chunks);
+    }
+  }
+  this.chunks = [];
+  this.err = status;
+  this.msg = this.strm.msg;
+};
+
+
+/**
+ * deflate(data[, options]) -> Uint8Array|Array|String
+ * - data (Uint8Array|Array|String): input data to compress.
+ * - options (Object): zlib deflate options.
+ *
+ * Compress `data` with deflate algorithm and `options`.
+ *
+ * Supported options are:
+ *
+ * - level
+ * - windowBits
+ * - memLevel
+ * - strategy
+ * - dictionary
+ *
+ * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
+ * for more information on these.
+ *
+ * Sugar (options):
+ *
+ * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
+ *   negative windowBits implicitly.
+ * - `to` (String) - if equal to 'string', then result will be "binary string"
+ *    (each char code [0..255])
+ *
+ * ##### Example:
+ *
+ * ```javascript
+ * var pako = require('pako')
+ *   , data = Uint8Array([1,2,3,4,5,6,7,8,9]);
+ *
+ * console.log(pako.deflate(data));
+ * ```
+ **/
+function deflate(input, options) {
+  var deflator = new Deflate(options);
+
+  deflator.push(input, true);
+
+  // That will never happens, if you don't cheat with options :)
+  if (deflator.err) { throw deflator.msg || msg[deflator.err]; }
+
+  return deflator.result;
+}
+
+
+/**
+ * deflateRaw(data[, options]) -> Uint8Array|Array|String
+ * - data (Uint8Array|Array|String): input data to compress.
+ * - options (Object): zlib deflate options.
+ *
+ * The same as [[deflate]], but creates raw data, without wrapper
+ * (header and adler32 crc).
+ **/
+function deflateRaw(input, options) {
+  options = options || {};
+  options.raw = true;
+  return deflate(input, options);
+}
+
+
+/**
+ * gzip(data[, options]) -> Uint8Array|Array|String
+ * - data (Uint8Array|Array|String): input data to compress.
+ * - options (Object): zlib deflate options.
+ *
+ * The same as [[deflate]], but create gzip wrapper instead of
+ * deflate one.
+ **/
+function gzip(input, options) {
+  options = options || {};
+  options.gzip = true;
+  return deflate(input, options);
+}
+
+
+exports.Deflate = Deflate;
+exports.deflate = deflate;
+exports.deflateRaw = deflateRaw;
+exports.gzip = gzip;
+
+},{"./utils/common":41,"./utils/strings":42,"./zlib/deflate":46,"./zlib/messages":51,"./zlib/zstream":53}],40:[function(require,module,exports){
+'use strict';
+
+
+var zlib_inflate = require('./zlib/inflate');
+var utils        = require('./utils/common');
+var strings      = require('./utils/strings');
+var c            = require('./zlib/constants');
+var msg          = require('./zlib/messages');
+var ZStream      = require('./zlib/zstream');
+var GZheader     = require('./zlib/gzheader');
+
+var toString = Object.prototype.toString;
+
+/**
+ * class Inflate
+ *
+ * Generic JS-style wrapper for zlib calls. If you don't need
+ * streaming behaviour - use more simple functions: [[inflate]]
+ * and [[inflateRaw]].
+ **/
+
+/* internal
+ * inflate.chunks -> Array
+ *
+ * Chunks of output data, if [[Inflate#onData]] not overriden.
+ **/
+
+/**
+ * Inflate.result -> Uint8Array|Array|String
+ *
+ * Uncompressed result, generated by default [[Inflate#onData]]
+ * and [[Inflate#onEnd]] handlers. Filled after you push last chunk
+ * (call [[Inflate#push]] with `Z_FINISH` / `true` param) or if you
+ * push a chunk with explicit flush (call [[Inflate#push]] with
+ * `Z_SYNC_FLUSH` param).
+ **/
+
+/**
+ * Inflate.err -> Number
+ *
+ * Error code after inflate finished. 0 (Z_OK) on success.
+ * Should be checked if broken data possible.
+ **/
+
+/**
+ * Inflate.msg -> String
+ *
+ * Error message, if [[Inflate.err]] != 0
+ **/
+
+
+/**
+ * new Inflate(options)
+ * - options (Object): zlib inflate options.
+ *
+ * Creates new inflator instance with specified params. Throws exception
+ * on bad params. Supported options:
+ *
+ * - `windowBits`
+ * - `dictionary`
+ *
+ * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
+ * for more information on these.
+ *
+ * Additional options, for internal needs:
+ *
+ * - `chunkSize` - size of generated data chunks (16K by default)
+ * - `raw` (Boolean) - do raw inflate
+ * - `to` (String) - if equal to 'string', then result will be converted
+ *   from utf8 to utf16 (javascript) string. When string output requested,
+ *   chunk length can differ from `chunkSize`, depending on content.
+ *
+ * By default, when no options set, autodetect deflate/gzip data format via
+ * wrapper header.
+ *
+ * ##### Example:
+ *
+ * ```javascript
+ * var pako = require('pako')
+ *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
+ *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
+ *
+ * var inflate = new pako.Inflate({ level: 3});
+ *
+ * inflate.push(chunk1, false);
+ * inflate.push(chunk2, true);  // true -> last chunk
+ *
+ * if (inflate.err) { throw new Error(inflate.err); }
+ *
+ * console.log(inflate.result);
+ * ```
+ **/
+function Inflate(options) {
+  if (!(this instanceof Inflate)) return new Inflate(options);
+
+  this.options = utils.assign({
+    chunkSize: 16384,
+    windowBits: 0,
+    to: ''
+  }, options || {});
+
+  var opt = this.options;
+
+  // Force window size for `raw` data, if not set directly,
+  // because we have no header for autodetect.
+  if (opt.raw && (opt.windowBits >= 0) && (opt.windowBits < 16)) {
+    opt.windowBits = -opt.windowBits;
+    if (opt.windowBits === 0) { opt.windowBits = -15; }
+  }
+
+  // If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate
+  if ((opt.windowBits >= 0) && (opt.windowBits < 16) &&
+      !(options && options.windowBits)) {
+    opt.windowBits += 32;
+  }
+
+  // Gzip header has no info about windows size, we can do autodetect only
+  // for deflate. So, if window size not set, force it to max when gzip possible
+  if ((opt.windowBits > 15) && (opt.windowBits < 48)) {
+    // bit 3 (16) -> gzipped data
+    // bit 4 (32) -> autodetect gzip/deflate
+    if ((opt.windowBits & 15) === 0) {
+      opt.windowBits |= 15;
+    }
+  }
+
+  this.err    = 0;      // error code, if happens (0 = Z_OK)
+  this.msg    = '';     // error message
+  this.ended  = false;  // used to avoid multiple onEnd() calls
+  this.chunks = [];     // chunks of compressed data
+
+  this.strm   = new ZStream();
+  this.strm.avail_out = 0;
+
+  var status  = zlib_inflate.inflateInit2(
+    this.strm,
+    opt.windowBits
+  );
+
+  if (status !== c.Z_OK) {
+    throw new Error(msg[status]);
+  }
+
+  this.header = new GZheader();
+
+  zlib_inflate.inflateGetHeader(this.strm, this.header);
+}
+
+/**
+ * Inflate#push(data[, mode]) -> Boolean
+ * - data (Uint8Array|Array|ArrayBuffer|String): input data
+ * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
+ *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
+ *
+ * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with
+ * new output chunks. Returns `true` on success. The last data block must have
+ * mode Z_FINISH (or `true`). That will flush internal pending buffers and call
+ * [[Inflate#onEnd]]. For interim explicit flushes (without ending the stream) you
+ * can use mode Z_SYNC_FLUSH, keeping the decompression context.
+ *
+ * On fail call [[Inflate#onEnd]] with error code and return false.
+ *
+ * We strongly recommend to use `Uint8Array` on input for best speed (output
+ * format is detected automatically). Also, don't skip last param and always
+ * use the same type in your code (boolean or number). That will improve JS speed.
+ *
+ * For regular `Array`-s make sure all elements are [0..255].
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * push(chunk, false); // push one of data chunks
+ * ...
+ * push(chunk, true);  // push last chunk
+ * ```
+ **/
+Inflate.prototype.push = function (data, mode) {
+  var strm = this.strm;
+  var chunkSize = this.options.chunkSize;
+  var dictionary = this.options.dictionary;
+  var status, _mode;
+  var next_out_utf8, tail, utf8str;
+  var dict;
+
+  // Flag to properly process Z_BUF_ERROR on testing inflate call
+  // when we check that all output data was flushed.
+  var allowBufError = false;
+
+  if (this.ended) { return false; }
+  _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH);
+
+  // Convert data if needed
+  if (typeof data === 'string') {
+    // Only binary strings can be decompressed on practice
+    strm.input = strings.binstring2buf(data);
+  } else if (toString.call(data) === '[object ArrayBuffer]') {
+    strm.input = new Uint8Array(data);
+  } else {
+    strm.input = data;
+  }
+
+  strm.next_in = 0;
+  strm.avail_in = strm.input.length;
+
+  do {
+    if (strm.avail_out === 0) {
+      strm.output = new utils.Buf8(chunkSize);
+      strm.next_out = 0;
+      strm.avail_out = chunkSize;
+    }
+
+    status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH);    /* no bad return value */
+
+    if (status === c.Z_NEED_DICT && dictionary) {
+      // Convert data if needed
+      if (typeof dictionary === 'string') {
+        dict = strings.string2buf(dictionary);
+      } else if (toString.call(dictionary) === '[object ArrayBuffer]') {
+        dict = new Uint8Array(dictionary);
+      } else {
+        dict = dictionary;
+      }
+
+      status = zlib_inflate.inflateSetDictionary(this.strm, dict);
+
+    }
+
+    if (status === c.Z_BUF_ERROR && allowBufError === true) {
+      status = c.Z_OK;
+      allowBufError = false;
+    }
+
+    if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
+      this.onEnd(status);
+      this.ended = true;
+      return false;
+    }
+
+    if (strm.next_out) {
+      if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && (_mode === c.Z_FINISH || _mode === c.Z_SYNC_FLUSH))) {
+
+        if (this.options.to === 'string') {
+
+          next_out_utf8 = strings.utf8border(strm.output, strm.next_out);
+
+          tail = strm.next_out - next_out_utf8;
+          utf8str = strings.buf2string(strm.output, next_out_utf8);
+
+          // move tail
+          strm.next_out = tail;
+          strm.avail_out = chunkSize - tail;
+          if (tail) { utils.arraySet(strm.output, strm.output, next_out_utf8, tail, 0); }
+
+          this.onData(utf8str);
+
+        } else {
+          this.onData(utils.shrinkBuf(strm.output, strm.next_out));
+        }
+      }
+    }
+
+    // When no more input data, we should check that internal inflate buffers
+    // are flushed. The only way to do it when avail_out = 0 - run one more
+    // inflate pass. But if output data not exists, inflate return Z_BUF_ERROR.
+    // Here we set flag to process this error properly.
+    //
+    // NOTE. Deflate does not return error in this case and does not needs such
+    // logic.
+    if (strm.avail_in === 0 && strm.avail_out === 0) {
+      allowBufError = true;
+    }
+
+  } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END);
+
+  if (status === c.Z_STREAM_END) {
+    _mode = c.Z_FINISH;
+  }
+
+  // Finalize on the last chunk.
+  if (_mode === c.Z_FINISH) {
+    status = zlib_inflate.inflateEnd(this.strm);
+    this.onEnd(status);
+    this.ended = true;
+    return status === c.Z_OK;
+  }
+
+  // callback interim results if Z_SYNC_FLUSH.
+  if (_mode === c.Z_SYNC_FLUSH) {
+    this.onEnd(c.Z_OK);
+    strm.avail_out = 0;
+    return true;
+  }
+
+  return true;
+};
+
+
+/**
+ * Inflate#onData(chunk) -> Void
+ * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
+ *   on js engine support. When string output requested, each chunk
+ *   will be string.
+ *
+ * By default, stores data blocks in `chunks[]` property and glue
+ * those in `onEnd`. Override this handler, if you need another behaviour.
+ **/
+Inflate.prototype.onData = function (chunk) {
+  this.chunks.push(chunk);
+};
+
+
+/**
+ * Inflate#onEnd(status) -> Void
+ * - status (Number): inflate status. 0 (Z_OK) on success,
+ *   other if not.
+ *
+ * Called either after you tell inflate that the input stream is
+ * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
+ * or if an error happened. By default - join collected chunks,
+ * free memory and fill `results` / `err` properties.
+ **/
+Inflate.prototype.onEnd = function (status) {
+  // On success - join
+  if (status === c.Z_OK) {
+    if (this.options.to === 'string') {
+      // Glue & convert here, until we teach pako to send
+      // utf8 alligned strings to onData
+      this.result = this.chunks.join('');
+    } else {
+      this.result = utils.flattenChunks(this.chunks);
+    }
+  }
+  this.chunks = [];
+  this.err = status;
+  this.msg = this.strm.msg;
+};
+
+
+/**
+ * inflate(data[, options]) -> Uint8Array|Array|String
+ * - data (Uint8Array|Array|String): input data to decompress.
+ * - options (Object): zlib inflate options.
+ *
+ * Decompress `data` with inflate/ungzip and `options`. Autodetect
+ * format via wrapper header by default. That's why we don't provide
+ * separate `ungzip` method.
+ *
+ * Supported options are:
+ *
+ * - windowBits
+ *
+ * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
+ * for more information.
+ *
+ * Sugar (options):
+ *
+ * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
+ *   negative windowBits implicitly.
+ * - `to` (String) - if equal to 'string', then result will be converted
+ *   from utf8 to utf16 (javascript) string. When string output requested,
+ *   chunk length can differ from `chunkSize`, depending on content.
+ *
+ *
+ * ##### Example:
+ *
+ * ```javascript
+ * var pako = require('pako')
+ *   , input = pako.deflate([1,2,3,4,5,6,7,8,9])
+ *   , output;
+ *
+ * try {
+ *   output = pako.inflate(input);
+ * } catch (err)
+ *   console.log(err);
+ * }
+ * ```
+ **/
+function inflate(input, options) {
+  var inflator = new Inflate(options);
+
+  inflator.push(input, true);
+
+  // That will never happens, if you don't cheat with options :)
+  if (inflator.err) { throw inflator.msg || msg[inflator.err]; }
+
+  return inflator.result;
+}
+
+
+/**
+ * inflateRaw(data[, options]) -> Uint8Array|Array|String
+ * - data (Uint8Array|Array|String): input data to decompress.
+ * - options (Object): zlib inflate options.
+ *
+ * The same as [[inflate]], but creates raw data, without wrapper
+ * (header and adler32 crc).
+ **/
+function inflateRaw(input, options) {
+  options = options || {};
+  options.raw = true;
+  return inflate(input, options);
+}
+
+
+/**
+ * ungzip(data[, options]) -> Uint8Array|Array|String
+ * - data (Uint8Array|Array|String): input data to decompress.
+ * - options (Object): zlib inflate options.
+ *
+ * Just shortcut to [[inflate]], because it autodetects format
+ * by header.content. Done for convenience.
+ **/
+
+
+exports.Inflate = Inflate;
+exports.inflate = inflate;
+exports.inflateRaw = inflateRaw;
+exports.ungzip  = inflate;
+
+},{"./utils/common":41,"./utils/strings":42,"./zlib/constants":44,"./zlib/gzheader":47,"./zlib/inflate":49,"./zlib/messages":51,"./zlib/zstream":53}],41:[function(require,module,exports){
+'use strict';
+
+
+var TYPED_OK =  (typeof Uint8Array !== 'undefined') &&
+                (typeof Uint16Array !== 'undefined') &&
+                (typeof Int32Array !== 'undefined');
+
+
+exports.assign = function (obj /*from1, from2, from3, ...*/) {
+  var sources = Array.prototype.slice.call(arguments, 1);
+  while (sources.length) {
+    var source = sources.shift();
+    if (!source) { continue; }
+
+    if (typeof source !== 'object') {
+      throw new TypeError(source + 'must be non-object');
+    }
+
+    for (var p in source) {
+      if (source.hasOwnProperty(p)) {
+        obj[p] = source[p];
+      }
+    }
+  }
+
+  return obj;
+};
+
+
+// reduce buffer size, avoiding mem copy
+exports.shrinkBuf = function (buf, size) {
+  if (buf.length === size) { return buf; }
+  if (buf.subarray) { return buf.subarray(0, size); }
+  buf.length = size;
+  return buf;
+};
+
+
+var fnTyped = {
+  arraySet: function (dest, src, src_offs, len, dest_offs) {
+    if (src.subarray && dest.subarray) {
+      dest.set(src.subarray(src_offs, src_offs + len), dest_offs);
+      return;
+    }
+    // Fallback to ordinary array
+    for (var i = 0; i < len; i++) {
+      dest[dest_offs + i] = src[src_offs + i];
+    }
+  },
+  // Join array of chunks to single array.
+  flattenChunks: function (chunks) {
+    var i, l, len, pos, chunk, result;
+
+    // calculate data length
+    len = 0;
+    for (i = 0, l = chunks.length; i < l; i++) {
+      len += chunks[i].length;
+    }
+
+    // join chunks
+    result = new Uint8Array(len);
+    pos = 0;
+    for (i = 0, l = chunks.length; i < l; i++) {
+      chunk = chunks[i];
+      result.set(chunk, pos);
+      pos += chunk.length;
+    }
+
+    return result;
+  }
+};
+
+var fnUntyped = {
+  arraySet: function (dest, src, src_offs, len, dest_offs) {
+    for (var i = 0; i < len; i++) {
+      dest[dest_offs + i] = src[src_offs + i];
+    }
+  },
+  // Join array of chunks to single array.
+  flattenChunks: function (chunks) {
+    return [].concat.apply([], chunks);
+  }
+};
+
+
+// Enable/Disable typed arrays use, for testing
+//
+exports.setTyped = function (on) {
+  if (on) {
+    exports.Buf8  = Uint8Array;
+    exports.Buf16 = Uint16Array;
+    exports.Buf32 = Int32Array;
+    exports.assign(exports, fnTyped);
+  } else {
+    exports.Buf8  = Array;
+    exports.Buf16 = Array;
+    exports.Buf32 = Array;
+    exports.assign(exports, fnUntyped);
+  }
+};
+
+exports.setTyped(TYPED_OK);
+
+},{}],42:[function(require,module,exports){
+// String encode/decode helpers
+'use strict';
+
+
+var utils = require('./common');
+
+
+// Quick check if we can use fast array to bin string conversion
+//
+// - apply(Array) can fail on Android 2.2
+// - apply(Uint8Array) can fail on iOS 5.1 Safary
+//
+var STR_APPLY_OK = true;
+var STR_APPLY_UIA_OK = true;
+
+try { String.fromCharCode.apply(null, [ 0 ]); } catch (__) { STR_APPLY_OK = false; }
+try { String.fromCharCode.apply(null, new Uint8Array(1)); } catch (__) { STR_APPLY_UIA_OK = false; }
+
+
+// Table with utf8 lengths (calculated by first byte of sequence)
+// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
+// because max possible codepoint is 0x10ffff
+var _utf8len = new utils.Buf8(256);
+for (var q = 0; q < 256; q++) {
+  _utf8len[q] = (q >= 252 ? 6 : q >= 248 ? 5 : q >= 240 ? 4 : q >= 224 ? 3 : q >= 192 ? 2 : 1);
+}
+_utf8len[254] = _utf8len[254] = 1; // Invalid sequence start
+
+
+// convert string to array (typed, when possible)
+exports.string2buf = function (str) {
+  var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
+
+  // count binary size
+  for (m_pos = 0; m_pos < str_len; m_pos++) {
+    c = str.charCodeAt(m_pos);
+    if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) {
+      c2 = str.charCodeAt(m_pos + 1);
+      if ((c2 & 0xfc00) === 0xdc00) {
+        c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
+        m_pos++;
+      }
+    }
+    buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
+  }
+
+  // allocate buffer
+  buf = new utils.Buf8(buf_len);
+
+  // convert
+  for (i = 0, m_pos = 0; i < buf_len; m_pos++) {
+    c = str.charCodeAt(m_pos);
+    if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) {
+      c2 = str.charCodeAt(m_pos + 1);
+      if ((c2 & 0xfc00) === 0xdc00) {
+        c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
+        m_pos++;
+      }
+    }
+    if (c < 0x80) {
+      /* one byte */
+      buf[i++] = c;
+    } else if (c < 0x800) {
+      /* two bytes */
+      buf[i++] = 0xC0 | (c >>> 6);
+      buf[i++] = 0x80 | (c & 0x3f);
+    } else if (c < 0x10000) {
+      /* three bytes */
+      buf[i++] = 0xE0 | (c >>> 12);
+      buf[i++] = 0x80 | (c >>> 6 & 0x3f);
+      buf[i++] = 0x80 | (c & 0x3f);
+    } else {
+      /* four bytes */
+      buf[i++] = 0xf0 | (c >>> 18);
+      buf[i++] = 0x80 | (c >>> 12 & 0x3f);
+      buf[i++] = 0x80 | (c >>> 6 & 0x3f);
+      buf[i++] = 0x80 | (c & 0x3f);
+    }
+  }
+
+  return buf;
+};
+
+// Helper (used in 2 places)
+function buf2binstring(buf, len) {
+  // use fallback for big arrays to avoid stack overflow
+  if (len < 65537) {
+    if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) {
+      return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len));
+    }
+  }
+
+  var result = '';
+  for (var i = 0; i < len; i++) {
+    result += String.fromCharCode(buf[i]);
+  }
+  return result;
+}
+
+
+// Convert byte array to binary string
+exports.buf2binstring = function (buf) {
+  return buf2binstring(buf, buf.length);
+};
+
+
+// Convert binary string (typed, when possible)
+exports.binstring2buf = function (str) {
+  var buf = new utils.Buf8(str.length);
+  for (var i = 0, len = buf.length; i < len; i++) {
+    buf[i] = str.charCodeAt(i);
+  }
+  return buf;
+};
+
+
+// convert array to string
+exports.buf2string = function (buf, max) {
+  var i, out, c, c_len;
+  var len = max || buf.length;
+
+  // Reserve max possible length (2 words per char)
+  // NB: by unknown reasons, Array is significantly faster for
+  //     String.fromCharCode.apply than Uint16Array.
+  var utf16buf = new Array(len * 2);
+
+  for (out = 0, i = 0; i < len;) {
+    c = buf[i++];
+    // quick process ascii
+    if (c < 0x80) { utf16buf[out++] = c; continue; }
+
+    c_len = _utf8len[c];
+    // skip 5 & 6 byte codes
+    if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len - 1; continue; }
+
+    // apply mask on first byte
+    c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
+    // join the rest
+    while (c_len > 1 && i < len) {
+      c = (c << 6) | (buf[i++] & 0x3f);
+      c_len--;
+    }
+
+    // terminated by end of string?
+    if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
+
+    if (c < 0x10000) {
+      utf16buf[out++] = c;
+    } else {
+      c -= 0x10000;
+      utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
+      utf16buf[out++] = 0xdc00 | (c & 0x3ff);
+    }
+  }
+
+  return buf2binstring(utf16buf, out);
+};
+
+
+// Calculate max possible position in utf8 buffer,
+// that will not break sequence. If that's not possible
+// - (very small limits) return max size as is.
+//
+// buf[] - utf8 bytes array
+// max   - length limit (mandatory);
+exports.utf8border = function (buf, max) {
+  var pos;
+
+  max = max || buf.length;
+  if (max > buf.length) { max = buf.length; }
+
+  // go back from last position, until start of sequence found
+  pos = max - 1;
+  while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
+
+  // Fuckup - very small and broken sequence,
+  // return max, because we should return something anyway.
+  if (pos < 0) { return max; }
+
+  // If we came to start of buffer - that means vuffer is too small,
+  // return max too.
+  if (pos === 0) { return max; }
+
+  return (pos + _utf8len[buf[pos]] > max) ? pos : max;
+};
+
+},{"./common":41}],43:[function(require,module,exports){
+'use strict';
+
+// Note: adler32 takes 12% for level 0 and 2% for level 6.
+// It doesn't worth to make additional optimizationa as in original.
+// Small size is preferable.
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+function adler32(adler, buf, len, pos) {
+  var s1 = (adler & 0xffff) |0,
+      s2 = ((adler >>> 16) & 0xffff) |0,
+      n = 0;
+
+  while (len !== 0) {
+    // Set limit ~ twice less than 5552, to keep
+    // s2 in 31-bits, because we force signed ints.
+    // in other case %= will fail.
+    n = len > 2000 ? 2000 : len;
+    len -= n;
+
+    do {
+      s1 = (s1 + buf[pos++]) |0;
+      s2 = (s2 + s1) |0;
+    } while (--n);
+
+    s1 %= 65521;
+    s2 %= 65521;
+  }
+
+  return (s1 | (s2 << 16)) |0;
+}
+
+
+module.exports = adler32;
+
+},{}],44:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+module.exports = {
+
+  /* Allowed flush values; see deflate() and inflate() below for details */
+  Z_NO_FLUSH:         0,
+  Z_PARTIAL_FLUSH:    1,
+  Z_SYNC_FLUSH:       2,
+  Z_FULL_FLUSH:       3,
+  Z_FINISH:           4,
+  Z_BLOCK:            5,
+  Z_TREES:            6,
+
+  /* Return codes for the compression/decompression functions. Negative values
+  * are errors, positive values are used for special but normal events.
+  */
+  Z_OK:               0,
+  Z_STREAM_END:       1,
+  Z_NEED_DICT:        2,
+  Z_ERRNO:           -1,
+  Z_STREAM_ERROR:    -2,
+  Z_DATA_ERROR:      -3,
+  //Z_MEM_ERROR:     -4,
+  Z_BUF_ERROR:       -5,
+  //Z_VERSION_ERROR: -6,
+
+  /* compression levels */
+  Z_NO_COMPRESSION:         0,
+  Z_BEST_SPEED:             1,
+  Z_BEST_COMPRESSION:       9,
+  Z_DEFAULT_COMPRESSION:   -1,
+
+
+  Z_FILTERED:               1,
+  Z_HUFFMAN_ONLY:           2,
+  Z_RLE:                    3,
+  Z_FIXED:                  4,
+  Z_DEFAULT_STRATEGY:       0,
+
+  /* Possible values of the data_type field (though see inflate()) */
+  Z_BINARY:                 0,
+  Z_TEXT:                   1,
+  //Z_ASCII:                1, // = Z_TEXT (deprecated)
+  Z_UNKNOWN:                2,
+
+  /* The deflate compression method */
+  Z_DEFLATED:               8
+  //Z_NULL:                 null // Use -1 or null inline, depending on var type
+};
+
+},{}],45:[function(require,module,exports){
+'use strict';
+
+// Note: we can't get significant speed boost here.
+// So write code to minimize size - no pregenerated tables
+// and array tools dependencies.
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+// Use ordinary array, since untyped makes no boost here
+function makeTable() {
+  var c, table = [];
+
+  for (var n = 0; n < 256; n++) {
+    c = n;
+    for (var k = 0; k < 8; k++) {
+      c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
+    }
+    table[n] = c;
+  }
+
+  return table;
+}
+
+// Create table on load. Just 255 signed longs. Not a problem.
+var crcTable = makeTable();
+
+
+function crc32(crc, buf, len, pos) {
+  var t = crcTable,
+      end = pos + len;
+
+  crc ^= -1;
+
+  for (var i = pos; i < end; i++) {
+    crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
+  }
+
+  return (crc ^ (-1)); // >>> 0;
+}
+
+
+module.exports = crc32;
+
+},{}],46:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+var utils   = require('../utils/common');
+var trees   = require('./trees');
+var adler32 = require('./adler32');
+var crc32   = require('./crc32');
+var msg     = require('./messages');
+
+/* Public constants ==========================================================*/
+/* ===========================================================================*/
+
+
+/* Allowed flush values; see deflate() and inflate() below for details */
+var Z_NO_FLUSH      = 0;
+var Z_PARTIAL_FLUSH = 1;
+//var Z_SYNC_FLUSH    = 2;
+var Z_FULL_FLUSH    = 3;
+var Z_FINISH        = 4;
+var Z_BLOCK         = 5;
+//var Z_TREES         = 6;
+
+
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+var Z_OK            = 0;
+var Z_STREAM_END    = 1;
+//var Z_NEED_DICT     = 2;
+//var Z_ERRNO         = -1;
+var Z_STREAM_ERROR  = -2;
+var Z_DATA_ERROR    = -3;
+//var Z_MEM_ERROR     = -4;
+var Z_BUF_ERROR     = -5;
+//var Z_VERSION_ERROR = -6;
+
+
+/* compression levels */
+//var Z_NO_COMPRESSION      = 0;
+//var Z_BEST_SPEED          = 1;
+//var Z_BEST_COMPRESSION    = 9;
+var Z_DEFAULT_COMPRESSION = -1;
+
+
+var Z_FILTERED            = 1;
+var Z_HUFFMAN_ONLY        = 2;
+var Z_RLE                 = 3;
+var Z_FIXED               = 4;
+var Z_DEFAULT_STRATEGY    = 0;
+
+/* Possible values of the data_type field (though see inflate()) */
+//var Z_BINARY              = 0;
+//var Z_TEXT                = 1;
+//var Z_ASCII               = 1; // = Z_TEXT
+var Z_UNKNOWN             = 2;
+
+
+/* The deflate compression method */
+var Z_DEFLATED  = 8;
+
+/*============================================================================*/
+
+
+var MAX_MEM_LEVEL = 9;
+/* Maximum value for memLevel in deflateInit2 */
+var MAX_WBITS = 15;
+/* 32K LZ77 window */
+var DEF_MEM_LEVEL = 8;
+
+
+var LENGTH_CODES  = 29;
+/* number of length codes, not counting the special END_BLOCK code */
+var LITERALS      = 256;
+/* number of literal bytes 0..255 */
+var L_CODES       = LITERALS + 1 + LENGTH_CODES;
+/* number of Literal or Length codes, including the END_BLOCK code */
+var D_CODES       = 30;
+/* number of distance codes */
+var BL_CODES      = 19;
+/* number of codes used to transfer the bit lengths */
+var HEAP_SIZE     = 2 * L_CODES + 1;
+/* maximum heap size */
+var MAX_BITS  = 15;
+/* All codes must not exceed MAX_BITS bits */
+
+var MIN_MATCH = 3;
+var MAX_MATCH = 258;
+var MIN_LOOKAHEAD = (MAX_MATCH + MIN_MATCH + 1);
+
+var PRESET_DICT = 0x20;
+
+var INIT_STATE = 42;
+var EXTRA_STATE = 69;
+var NAME_STATE = 73;
+var COMMENT_STATE = 91;
+var HCRC_STATE = 103;
+var BUSY_STATE = 113;
+var FINISH_STATE = 666;
+
+var BS_NEED_MORE      = 1; /* block not completed, need more input or more output */
+var BS_BLOCK_DONE     = 2; /* block flush performed */
+var BS_FINISH_STARTED = 3; /* finish started, need only more output at next deflate */
+var BS_FINISH_DONE    = 4; /* finish done, accept no more input or output */
+
+var OS_CODE = 0x03; // Unix :) . Don't detect, use this default.
+
+function err(strm, errorCode) {
+  strm.msg = msg[errorCode];
+  return errorCode;
+}
+
+function rank(f) {
+  return ((f) << 1) - ((f) > 4 ? 9 : 0);
+}
+
+function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
+
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->output buffer and copying into it.
+ * (See also read_buf()).
+ */
+function flush_pending(strm) {
+  var s = strm.state;
+
+  //_tr_flush_bits(s);
+  var len = s.pending;
+  if (len > strm.avail_out) {
+    len = strm.avail_out;
+  }
+  if (len === 0) { return; }
+
+  utils.arraySet(strm.output, s.pending_buf, s.pending_out, len, strm.next_out);
+  strm.next_out += len;
+  s.pending_out += len;
+  strm.total_out += len;
+  strm.avail_out -= len;
+  s.pending -= len;
+  if (s.pending === 0) {
+    s.pending_out = 0;
+  }
+}
+
+
+function flush_block_only(s, last) {
+  trees._tr_flush_block(s, (s.block_start >= 0 ? s.block_start : -1), s.strstart - s.block_start, last);
+  s.block_start = s.strstart;
+  flush_pending(s.strm);
+}
+
+
+function put_byte(s, b) {
+  s.pending_buf[s.pending++] = b;
+}
+
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+function putShortMSB(s, b) {
+//  put_byte(s, (Byte)(b >> 8));
+//  put_byte(s, (Byte)(b & 0xff));
+  s.pending_buf[s.pending++] = (b >>> 8) & 0xff;
+  s.pending_buf[s.pending++] = b & 0xff;
+}
+
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->input buffer and copying from it.
+ * (See also flush_pending()).
+ */
+function read_buf(strm, buf, start, size) {
+  var len = strm.avail_in;
+
+  if (len > size) { len = size; }
+  if (len === 0) { return 0; }
+
+  strm.avail_in -= len;
+
+  // zmemcpy(buf, strm->next_in, len);
+  utils.arraySet(buf, strm.input, strm.next_in, len, start);
+  if (strm.state.wrap === 1) {
+    strm.adler = adler32(strm.adler, buf, len, start);
+  }
+
+  else if (strm.state.wrap === 2) {
+    strm.adler = crc32(strm.adler, buf, len, start);
+  }
+
+  strm.next_in += len;
+  strm.total_in += len;
+
+  return len;
+}
+
+
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+function longest_match(s, cur_match) {
+  var chain_length = s.max_chain_length;      /* max hash chain length */
+  var scan = s.strstart; /* current string */
+  var match;                       /* matched string */
+  var len;                           /* length of current match */
+  var best_len = s.prev_length;              /* best match length so far */
+  var nice_match = s.nice_match;             /* stop if match long enough */
+  var limit = (s.strstart > (s.w_size - MIN_LOOKAHEAD)) ?
+      s.strstart - (s.w_size - MIN_LOOKAHEAD) : 0/*NIL*/;
+
+  var _win = s.window; // shortcut
+
+  var wmask = s.w_mask;
+  var prev  = s.prev;
+
+  /* Stop when cur_match becomes <= limit. To simplify the code,
+   * we prevent matches with the string of window index 0.
+   */
+
+  var strend = s.strstart + MAX_MATCH;
+  var scan_end1  = _win[scan + best_len - 1];
+  var scan_end   = _win[scan + best_len];
+
+  /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+   * It is easy to get rid of this optimization if necessary.
+   */
+  // Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+  /* Do not waste too much time if we already have a good match: */
+  if (s.prev_length >= s.good_match) {
+    chain_length >>= 2;
+  }
+  /* Do not look for matches beyond the end of the input. This is necessary
+   * to make deflate deterministic.
+   */
+  if (nice_match > s.lookahead) { nice_match = s.lookahead; }
+
+  // Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+  do {
+    // Assert(cur_match < s->strstart, "no future");
+    match = cur_match;
+
+    /* Skip to next match if the match length cannot increase
+     * or if the match length is less than 2.  Note that the checks below
+     * for insufficient lookahead only occur occasionally for performance
+     * reasons.  Therefore uninitialized memory will be accessed, and
+     * conditional jumps will be made that depend on those values.
+     * However the length of the match is limited to the lookahead, so
+     * the output of deflate is not affected by the uninitialized values.
+     */
+
+    if (_win[match + best_len]     !== scan_end  ||
+        _win[match + best_len - 1] !== scan_end1 ||
+        _win[match]                !== _win[scan] ||
+        _win[++match]              !== _win[scan + 1]) {
+      continue;
+    }
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2;
+    match++;
+    // Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+      /*jshint noempty:false*/
+    } while (_win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
+             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
+             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
+             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
+             scan < strend);
+
+    // Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (strend - scan);
+    scan = strend - MAX_MATCH;
+
+    if (len > best_len) {
+      s.match_start = cur_match;
+      best_len = len;
+      if (len >= nice_match) {
+        break;
+      }
+      scan_end1  = _win[scan + best_len - 1];
+      scan_end   = _win[scan + best_len];
+    }
+  } while ((cur_match = prev[cur_match & wmask]) > limit && --chain_length !== 0);
+
+  if (best_len <= s.lookahead) {
+    return best_len;
+  }
+  return s.lookahead;
+}
+
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+function fill_window(s) {
+  var _w_size = s.w_size;
+  var p, n, m, more, str;
+
+  //Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+  do {
+    more = s.window_size - s.lookahead - s.strstart;
+
+    // JS ints have 32 bit, block below not needed
+    /* Deal with !@#$% 64K limit: */
+    //if (sizeof(int) <= 2) {
+    //    if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+    //        more = wsize;
+    //
+    //  } else if (more == (unsigned)(-1)) {
+    //        /* Very unlikely, but possible on 16 bit machine if
+    //         * strstart == 0 && lookahead == 1 (input done a byte at time)
+    //         */
+    //        more--;
+    //    }
+    //}
+
+
+    /* If the window is almost full and there is insufficient lookahead,
+     * move the upper half to the lower one to make room in the upper half.
+     */
+    if (s.strstart >= _w_size + (_w_size - MIN_LOOKAHEAD)) {
+
+      utils.arraySet(s.window, s.window, _w_size, _w_size, 0);
+      s.match_start -= _w_size;
+      s.strstart -= _w_size;
+      /* we now have strstart >= MAX_DIST */
+      s.block_start -= _w_size;
+
+      /* Slide the hash table (could be avoided with 32 bit values
+       at the expense of memory usage). We slide even when level == 0
+       to keep the hash table consistent if we switch back to level > 0
+       later. (Using level 0 permanently is not an optimal usage of
+       zlib, so we don't care about this pathological case.)
+       */
+
+      n = s.hash_size;
+      p = n;
+      do {
+        m = s.head[--p];
+        s.head[p] = (m >= _w_size ? m - _w_size : 0);
+      } while (--n);
+
+      n = _w_size;
+      p = n;
+      do {
+        m = s.prev[--p];
+        s.prev[p] = (m >= _w_size ? m - _w_size : 0);
+        /* If n is not on any hash chain, prev[n] is garbage but
+         * its value will never be used.
+         */
+      } while (--n);
+
+      more += _w_size;
+    }
+    if (s.strm.avail_in === 0) {
+      break;
+    }
+
+    /* If there was no sliding:
+     *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+     *    more == window_size - lookahead - strstart
+     * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+     * => more >= window_size - 2*WSIZE + 2
+     * In the BIG_MEM or MMAP case (not yet supported),
+     *   window_size == input_size + MIN_LOOKAHEAD  &&
+     *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+     * Otherwise, window_size == 2*WSIZE so more >= 2.
+     * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+     */
+    //Assert(more >= 2, "more < 2");
+    n = read_buf(s.strm, s.window, s.strstart + s.lookahead, more);
+    s.lookahead += n;
+
+    /* Initialize the hash value now that we have some input: */
+    if (s.lookahead + s.insert >= MIN_MATCH) {
+      str = s.strstart - s.insert;
+      s.ins_h = s.window[str];
+
+      /* UPDATE_HASH(s, s->ins_h, s->window[str + 1]); */
+      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + 1]) & s.hash_mask;
+//#if MIN_MATCH != 3
+//        Call update_hash() MIN_MATCH-3 more times
+//#endif
+      while (s.insert) {
+        /* UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); */
+        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH - 1]) & s.hash_mask;
+
+        s.prev[str & s.w_mask] = s.head[s.ins_h];
+        s.head[s.ins_h] = str;
+        str++;
+        s.insert--;
+        if (s.lookahead + s.insert < MIN_MATCH) {
+          break;
+        }
+      }
+    }
+    /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+     * but this is not important since only literal bytes will be emitted.
+     */
+
+  } while (s.lookahead < MIN_LOOKAHEAD && s.strm.avail_in !== 0);
+
+  /* If the WIN_INIT bytes after the end of the current data have never been
+   * written, then zero those bytes in order to avoid memory check reports of
+   * the use of uninitialized (or uninitialised as Julian writes) bytes by
+   * the longest match routines.  Update the high water mark for the next
+   * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+   * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+   */
+//  if (s.high_water < s.window_size) {
+//    var curr = s.strstart + s.lookahead;
+//    var init = 0;
+//
+//    if (s.high_water < curr) {
+//      /* Previous high water mark below current data -- zero WIN_INIT
+//       * bytes or up to end of window, whichever is less.
+//       */
+//      init = s.window_size - curr;
+//      if (init > WIN_INIT)
+//        init = WIN_INIT;
+//      zmemzero(s->window + curr, (unsigned)init);
+//      s->high_water = curr + init;
+//    }
+//    else if (s->high_water < (ulg)curr + WIN_INIT) {
+//      /* High water mark at or above current data, but below current data
+//       * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+//       * to end of window, whichever is less.
+//       */
+//      init = (ulg)curr + WIN_INIT - s->high_water;
+//      if (init > s->window_size - s->high_water)
+//        init = s->window_size - s->high_water;
+//      zmemzero(s->window + s->high_water, (unsigned)init);
+//      s->high_water += init;
+//    }
+//  }
+//
+//  Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+//    "not enough room for search");
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+function deflate_stored(s, flush) {
+  /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+   * to pending_buf_size, and each stored block has a 5 byte header:
+   */
+  var max_block_size = 0xffff;
+
+  if (max_block_size > s.pending_buf_size - 5) {
+    max_block_size = s.pending_buf_size - 5;
+  }
+
+  /* Copy as much as possible from input to output: */
+  for (;;) {
+    /* Fill the window as much as possible: */
+    if (s.lookahead <= 1) {
+
+      //Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+      //  s->block_start >= (long)s->w_size, "slide too late");
+//      if (!(s.strstart < s.w_size + (s.w_size - MIN_LOOKAHEAD) ||
+//        s.block_start >= s.w_size)) {
+//        throw  new Error("slide too late");
+//      }
+
+      fill_window(s);
+      if (s.lookahead === 0 && flush === Z_NO_FLUSH) {
+        return BS_NEED_MORE;
+      }
+
+      if (s.lookahead === 0) {
+        break;
+      }
+      /* flush the current block */
+    }
+    //Assert(s->block_start >= 0L, "block gone");
+//    if (s.block_start < 0) throw new Error("block gone");
+
+    s.strstart += s.lookahead;
+    s.lookahead = 0;
+
+    /* Emit a stored block if pending_buf will be full: */
+    var max_start = s.block_start + max_block_size;
+
+    if (s.strstart === 0 || s.strstart >= max_start) {
+      /* strstart == 0 is possible when wraparound on 16-bit machine */
+      s.lookahead = s.strstart - max_start;
+      s.strstart = max_start;
+      /*** FLUSH_BLOCK(s, 0); ***/
+      flush_block_only(s, false);
+      if (s.strm.avail_out === 0) {
+        return BS_NEED_MORE;
+      }
+      /***/
+
+
+    }
+    /* Flush if we may have to slide, otherwise block_start may become
+     * negative and the data will be gone:
+     */
+    if (s.strstart - s.block_start >= (s.w_size - MIN_LOOKAHEAD)) {
+      /*** FLUSH_BLOCK(s, 0); ***/
+      flush_block_only(s, false);
+      if (s.strm.avail_out === 0) {
+        return BS_NEED_MORE;
+      }
+      /***/
+    }
+  }
+
+  s.insert = 0;
+
+  if (flush === Z_FINISH) {
+    /*** FLUSH_BLOCK(s, 1); ***/
+    flush_block_only(s, true);
+    if (s.strm.avail_out === 0) {
+      return BS_FINISH_STARTED;
+    }
+    /***/
+    return BS_FINISH_DONE;
+  }
+
+  if (s.strstart > s.block_start) {
+    /*** FLUSH_BLOCK(s, 0); ***/
+    flush_block_only(s, false);
+    if (s.strm.avail_out === 0) {
+      return BS_NEED_MORE;
+    }
+    /***/
+  }
+
+  return BS_NEED_MORE;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+function deflate_fast(s, flush) {
+  var hash_head;        /* head of the hash chain */
+  var bflush;           /* set if current block must be flushed */
+
+  for (;;) {
+    /* Make sure that we always have enough lookahead, except
+     * at the end of the input file. We need MAX_MATCH bytes
+     * for the next match, plus MIN_MATCH bytes to insert the
+     * string following the next match.
+     */
+    if (s.lookahead < MIN_LOOKAHEAD) {
+      fill_window(s);
+      if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
+        return BS_NEED_MORE;
+      }
+      if (s.lookahead === 0) {
+        break; /* flush the current block */
+      }
+    }
+
+    /* Insert the string window[strstart .. strstart+2] in the
+     * dictionary, and set hash_head to the head of the hash chain:
+     */
+    hash_head = 0/*NIL*/;
+    if (s.lookahead >= MIN_MATCH) {
+      /*** INSERT_STRING(s, s.strstart, hash_head); ***/
+      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
+      hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
+      s.head[s.ins_h] = s.strstart;
+      /***/
+    }
+
+    /* Find the longest match, discarding those <= prev_length.
+     * At this point we have always match_length < MIN_MATCH
+     */
+    if (hash_head !== 0/*NIL*/ && ((s.strstart - hash_head) <= (s.w_size - MIN_LOOKAHEAD))) {
+      /* To simplify the code, we prevent matches with the string
+       * of window index 0 (in particular we have to avoid a match
+       * of the string with itself at the start of the input file).
+       */
+      s.match_length = longest_match(s, hash_head);
+      /* longest_match() sets match_start */
+    }
+    if (s.match_length >= MIN_MATCH) {
+      // check_match(s, s.strstart, s.match_start, s.match_length); // for debug only
+
+      /*** _tr_tally_dist(s, s.strstart - s.match_start,
+                     s.match_length - MIN_MATCH, bflush); ***/
+      bflush = trees._tr_tally(s, s.strstart - s.match_start, s.match_length - MIN_MATCH);
+
+      s.lookahead -= s.match_length;
+
+      /* Insert new strings in the hash table only if the match length
+       * is not too large. This saves time but degrades compression.
+       */
+      if (s.match_length <= s.max_lazy_match/*max_insert_length*/ && s.lookahead >= MIN_MATCH) {
+        s.match_length--; /* string at strstart already in table */
+        do {
+          s.strstart++;
+          /*** INSERT_STRING(s, s.strstart, hash_head); ***/
+          s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
+          hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
+          s.head[s.ins_h] = s.strstart;
+          /***/
+          /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+           * always MIN_MATCH bytes ahead.
+           */
+        } while (--s.match_length !== 0);
+        s.strstart++;
+      } else
+      {
+        s.strstart += s.match_length;
+        s.match_length = 0;
+        s.ins_h = s.window[s.strstart];
+        /* UPDATE_HASH(s, s.ins_h, s.window[s.strstart+1]); */
+        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + 1]) & s.hash_mask;
+
+//#if MIN_MATCH != 3
+//                Call UPDATE_HASH() MIN_MATCH-3 more times
+//#endif
+        /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+         * matter since it will be recomputed at next deflate call.
+         */
+      }
+    } else {
+      /* No match, output a literal byte */
+      //Tracevv((stderr,"%c", s.window[s.strstart]));
+      /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
+      bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
+
+      s.lookahead--;
+      s.strstart++;
+    }
+    if (bflush) {
+      /*** FLUSH_BLOCK(s, 0); ***/
+      flush_block_only(s, false);
+      if (s.strm.avail_out === 0) {
+        return BS_NEED_MORE;
+      }
+      /***/
+    }
+  }
+  s.insert = ((s.strstart < (MIN_MATCH - 1)) ? s.strstart : MIN_MATCH - 1);
+  if (flush === Z_FINISH) {
+    /*** FLUSH_BLOCK(s, 1); ***/
+    flush_block_only(s, true);
+    if (s.strm.avail_out === 0) {
+      return BS_FINISH_STARTED;
+    }
+    /***/
+    return BS_FINISH_DONE;
+  }
+  if (s.last_lit) {
+    /*** FLUSH_BLOCK(s, 0); ***/
+    flush_block_only(s, false);
+    if (s.strm.avail_out === 0) {
+      return BS_NEED_MORE;
+    }
+    /***/
+  }
+  return BS_BLOCK_DONE;
+}
+
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+function deflate_slow(s, flush) {
+  var hash_head;          /* head of hash chain */
+  var bflush;              /* set if current block must be flushed */
+
+  var max_insert;
+
+  /* Process the input block. */
+  for (;;) {
+    /* Make sure that we always have enough lookahead, except
+     * at the end of the input file. We need MAX_MATCH bytes
+     * for the next match, plus MIN_MATCH bytes to insert the
+     * string following the next match.
+     */
+    if (s.lookahead < MIN_LOOKAHEAD) {
+      fill_window(s);
+      if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
+        return BS_NEED_MORE;
+      }
+      if (s.lookahead === 0) { break; } /* flush the current block */
+    }
+
+    /* Insert the string window[strstart .. strstart+2] in the
+     * dictionary, and set hash_head to the head of the hash chain:
+     */
+    hash_head = 0/*NIL*/;
+    if (s.lookahead >= MIN_MATCH) {
+      /*** INSERT_STRING(s, s.strstart, hash_head); ***/
+      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
+      hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
+      s.head[s.ins_h] = s.strstart;
+      /***/
+    }
+
+    /* Find the longest match, discarding those <= prev_length.
+     */
+    s.prev_length = s.match_length;
+    s.prev_match = s.match_start;
+    s.match_length = MIN_MATCH - 1;
+
+    if (hash_head !== 0/*NIL*/ && s.prev_length < s.max_lazy_match &&
+        s.strstart - hash_head <= (s.w_size - MIN_LOOKAHEAD)/*MAX_DIST(s)*/) {
+      /* To simplify the code, we prevent matches with the string
+       * of window index 0 (in particular we have to avoid a match
+       * of the string with itself at the start of the input file).
+       */
+      s.match_length = longest_match(s, hash_head);
+      /* longest_match() sets match_start */
+
+      if (s.match_length <= 5 &&
+         (s.strategy === Z_FILTERED || (s.match_length === MIN_MATCH && s.strstart - s.match_start > 4096/*TOO_FAR*/))) {
+
+        /* If prev_match is also MIN_MATCH, match_start is garbage
+         * but we will ignore the current match anyway.
+         */
+        s.match_length = MIN_MATCH - 1;
+      }
+    }
+    /* If there was a match at the previous step and the current
+     * match is not better, output the previous match:
+     */
+    if (s.prev_length >= MIN_MATCH && s.match_length <= s.prev_length) {
+      max_insert = s.strstart + s.lookahead - MIN_MATCH;
+      /* Do not insert strings in hash table beyond this. */
+
+      //check_match(s, s.strstart-1, s.prev_match, s.prev_length);
+
+      /***_tr_tally_dist(s, s.strstart - 1 - s.prev_match,
+                     s.prev_length - MIN_MATCH, bflush);***/
+      bflush = trees._tr_tally(s, s.strstart - 1 - s.prev_match, s.prev_length - MIN_MATCH);
+      /* Insert in hash table all strings up to the end of the match.
+       * strstart-1 and strstart are already inserted. If there is not
+       * enough lookahead, the last two strings are not inserted in
+       * the hash table.
+       */
+      s.lookahead -= s.prev_length - 1;
+      s.prev_length -= 2;
+      do {
+        if (++s.strstart <= max_insert) {
+          /*** INSERT_STRING(s, s.strstart, hash_head); ***/
+          s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
+          hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
+          s.head[s.ins_h] = s.strstart;
+          /***/
+        }
+      } while (--s.prev_length !== 0);
+      s.match_available = 0;
+      s.match_length = MIN_MATCH - 1;
+      s.strstart++;
+
+      if (bflush) {
+        /*** FLUSH_BLOCK(s, 0); ***/
+        flush_block_only(s, false);
+        if (s.strm.avail_out === 0) {
+          return BS_NEED_MORE;
+        }
+        /***/
+      }
+
+    } else if (s.match_available) {
+      /* If there was no match at the previous position, output a
+       * single literal. If there was a match but the current match
+       * is longer, truncate the previous match to a single literal.
+       */
+      //Tracevv((stderr,"%c", s->window[s->strstart-1]));
+      /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
+      bflush = trees._tr_tally(s, 0, s.window[s.strstart - 1]);
+
+      if (bflush) {
+        /*** FLUSH_BLOCK_ONLY(s, 0) ***/
+        flush_block_only(s, false);
+        /***/
+      }
+      s.strstart++;
+      s.lookahead--;
+      if (s.strm.avail_out === 0) {
+        return BS_NEED_MORE;
+      }
+    } else {
+      /* There is no previous match to compare with, wait for
+       * the next step to decide.
+       */
+      s.match_available = 1;
+      s.strstart++;
+      s.lookahead--;
+    }
+  }
+  //Assert (flush != Z_NO_FLUSH, "no flush?");
+  if (s.match_available) {
+    //Tracevv((stderr,"%c", s->window[s->strstart-1]));
+    /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
+    bflush = trees._tr_tally(s, 0, s.window[s.strstart - 1]);
+
+    s.match_available = 0;
+  }
+  s.insert = s.strstart < MIN_MATCH - 1 ? s.strstart : MIN_MATCH - 1;
+  if (flush === Z_FINISH) {
+    /*** FLUSH_BLOCK(s, 1); ***/
+    flush_block_only(s, true);
+    if (s.strm.avail_out === 0) {
+      return BS_FINISH_STARTED;
+    }
+    /***/
+    return BS_FINISH_DONE;
+  }
+  if (s.last_lit) {
+    /*** FLUSH_BLOCK(s, 0); ***/
+    flush_block_only(s, false);
+    if (s.strm.avail_out === 0) {
+      return BS_NEED_MORE;
+    }
+    /***/
+  }
+
+  return BS_BLOCK_DONE;
+}
+
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+function deflate_rle(s, flush) {
+  var bflush;            /* set if current block must be flushed */
+  var prev;              /* byte at distance one to match */
+  var scan, strend;      /* scan goes up to strend for length of run */
+
+  var _win = s.window;
+
+  for (;;) {
+    /* Make sure that we always have enough lookahead, except
+     * at the end of the input file. We need MAX_MATCH bytes
+     * for the longest run, plus one for the unrolled loop.
+     */
+    if (s.lookahead <= MAX_MATCH) {
+      fill_window(s);
+      if (s.lookahead <= MAX_MATCH && flush === Z_NO_FLUSH) {
+        return BS_NEED_MORE;
+      }
+      if (s.lookahead === 0) { break; } /* flush the current block */
+    }
+
+    /* See how many times the previous byte repeats */
+    s.match_length = 0;
+    if (s.lookahead >= MIN_MATCH && s.strstart > 0) {
+      scan = s.strstart - 1;
+      prev = _win[scan];
+      if (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan]) {
+        strend = s.strstart + MAX_MATCH;
+        do {
+          /*jshint noempty:false*/
+        } while (prev === _win[++scan] && prev === _win[++scan] &&
+                 prev === _win[++scan] && prev === _win[++scan] &&
+                 prev === _win[++scan] && prev === _win[++scan] &&
+                 prev === _win[++scan] && prev === _win[++scan] &&
+                 scan < strend);
+        s.match_length = MAX_MATCH - (strend - scan);
+        if (s.match_length > s.lookahead) {
+          s.match_length = s.lookahead;
+        }
+      }
+      //Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+    }
+
+    /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+    if (s.match_length >= MIN_MATCH) {
+      //check_match(s, s.strstart, s.strstart - 1, s.match_length);
+
+      /*** _tr_tally_dist(s, 1, s.match_length - MIN_MATCH, bflush); ***/
+      bflush = trees._tr_tally(s, 1, s.match_length - MIN_MATCH);
+
+      s.lookahead -= s.match_length;
+      s.strstart += s.match_length;
+      s.match_length = 0;
+    } else {
+      /* No match, output a literal byte */
+      //Tracevv((stderr,"%c", s->window[s->strstart]));
+      /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
+      bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
+
+      s.lookahead--;
+      s.strstart++;
+    }
+    if (bflush) {
+      /*** FLUSH_BLOCK(s, 0); ***/
+      flush_block_only(s, false);
+      if (s.strm.avail_out === 0) {
+        return BS_NEED_MORE;
+      }
+      /***/
+    }
+  }
+  s.insert = 0;
+  if (flush === Z_FINISH) {
+    /*** FLUSH_BLOCK(s, 1); ***/
+    flush_block_only(s, true);
+    if (s.strm.avail_out === 0) {
+      return BS_FINISH_STARTED;
+    }
+    /***/
+    return BS_FINISH_DONE;
+  }
+  if (s.last_lit) {
+    /*** FLUSH_BLOCK(s, 0); ***/
+    flush_block_only(s, false);
+    if (s.strm.avail_out === 0) {
+      return BS_NEED_MORE;
+    }
+    /***/
+  }
+  return BS_BLOCK_DONE;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+function deflate_huff(s, flush) {
+  var bflush;             /* set if current block must be flushed */
+
+  for (;;) {
+    /* Make sure that we have a literal to write. */
+    if (s.lookahead === 0) {
+      fill_window(s);
+      if (s.lookahead === 0) {
+        if (flush === Z_NO_FLUSH) {
+          return BS_NEED_MORE;
+        }
+        break;      /* flush the current block */
+      }
+    }
+
+    /* Output a literal byte */
+    s.match_length = 0;
+    //Tracevv((stderr,"%c", s->window[s->strstart]));
+    /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
+    bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
+    s.lookahead--;
+    s.strstart++;
+    if (bflush) {
+      /*** FLUSH_BLOCK(s, 0); ***/
+      flush_block_only(s, false);
+      if (s.strm.avail_out === 0) {
+        return BS_NEED_MORE;
+      }
+      /***/
+    }
+  }
+  s.insert = 0;
+  if (flush === Z_FINISH) {
+    /*** FLUSH_BLOCK(s, 1); ***/
+    flush_block_only(s, true);
+    if (s.strm.avail_out === 0) {
+      return BS_FINISH_STARTED;
+    }
+    /***/
+    return BS_FINISH_DONE;
+  }
+  if (s.last_lit) {
+    /*** FLUSH_BLOCK(s, 0); ***/
+    flush_block_only(s, false);
+    if (s.strm.avail_out === 0) {
+      return BS_NEED_MORE;
+    }
+    /***/
+  }
+  return BS_BLOCK_DONE;
+}
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+function Config(good_length, max_lazy, nice_length, max_chain, func) {
+  this.good_length = good_length;
+  this.max_lazy = max_lazy;
+  this.nice_length = nice_length;
+  this.max_chain = max_chain;
+  this.func = func;
+}
+
+var configuration_table;
+
+configuration_table = [
+  /*      good lazy nice chain */
+  new Config(0, 0, 0, 0, deflate_stored),          /* 0 store only */
+  new Config(4, 4, 8, 4, deflate_fast),            /* 1 max speed, no lazy matches */
+  new Config(4, 5, 16, 8, deflate_fast),           /* 2 */
+  new Config(4, 6, 32, 32, deflate_fast),          /* 3 */
+
+  new Config(4, 4, 16, 16, deflate_slow),          /* 4 lazy matches */
+  new Config(8, 16, 32, 32, deflate_slow),         /* 5 */
+  new Config(8, 16, 128, 128, deflate_slow),       /* 6 */
+  new Config(8, 32, 128, 256, deflate_slow),       /* 7 */
+  new Config(32, 128, 258, 1024, deflate_slow),    /* 8 */
+  new Config(32, 258, 258, 4096, deflate_slow)     /* 9 max compression */
+];
+
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+function lm_init(s) {
+  s.window_size = 2 * s.w_size;
+
+  /*** CLEAR_HASH(s); ***/
+  zero(s.head); // Fill with NIL (= 0);
+
+  /* Set the default configuration parameters:
+   */
+  s.max_lazy_match = configuration_table[s.level].max_lazy;
+  s.good_match = configuration_table[s.level].good_length;
+  s.nice_match = configuration_table[s.level].nice_length;
+  s.max_chain_length = configuration_table[s.level].max_chain;
+
+  s.strstart = 0;
+  s.block_start = 0;
+  s.lookahead = 0;
+  s.insert = 0;
+  s.match_length = s.prev_length = MIN_MATCH - 1;
+  s.match_available = 0;
+  s.ins_h = 0;
+}
+
+
+function DeflateState() {
+  this.strm = null;            /* pointer back to this zlib stream */
+  this.status = 0;            /* as the name implies */
+  this.pending_buf = null;      /* output still pending */
+  this.pending_buf_size = 0;  /* size of pending_buf */
+  this.pending_out = 0;       /* next pending byte to output to the stream */
+  this.pending = 0;           /* nb of bytes in the pending buffer */
+  this.wrap = 0;              /* bit 0 true for zlib, bit 1 true for gzip */
+  this.gzhead = null;         /* gzip header information to write */
+  this.gzindex = 0;           /* where in extra, name, or comment */
+  this.method = Z_DEFLATED; /* can only be DEFLATED */
+  this.last_flush = -1;   /* value of flush param for previous deflate call */
+
+  this.w_size = 0;  /* LZ77 window size (32K by default) */
+  this.w_bits = 0;  /* log2(w_size)  (8..16) */
+  this.w_mask = 0;  /* w_size - 1 */
+
+  this.window = null;
+  /* Sliding window. Input bytes are read into the second half of the window,
+   * and move to the first half later to keep a dictionary of at least wSize
+   * bytes. With this organization, matches are limited to a distance of
+   * wSize-MAX_MATCH bytes, but this ensures that IO is always
+   * performed with a length multiple of the block size.
+   */
+
+  this.window_size = 0;
+  /* Actual size of window: 2*wSize, except when the user input buffer
+   * is directly used as sliding window.
+   */
+
+  this.prev = null;
+  /* Link to older string with same hash index. To limit the size of this
+   * array to 64K, this link is maintained only for the last 32K strings.
+   * An index in this array is thus a window index modulo 32K.
+   */
+
+  this.head = null;   /* Heads of the hash chains or NIL. */
+
+  this.ins_h = 0;       /* hash index of string to be inserted */
+  this.hash_size = 0;   /* number of elements in hash table */
+  this.hash_bits = 0;   /* log2(hash_size) */
+  this.hash_mask = 0;   /* hash_size-1 */
+
+  this.hash_shift = 0;
+  /* Number of bits by which ins_h must be shifted at each input
+   * step. It must be such that after MIN_MATCH steps, the oldest
+   * byte no longer takes part in the hash key, that is:
+   *   hash_shift * MIN_MATCH >= hash_bits
+   */
+
+  this.block_start = 0;
+  /* Window position at the beginning of the current output block. Gets
+   * negative when the window is moved backwards.
+   */
+
+  this.match_length = 0;      /* length of best match */
+  this.prev_match = 0;        /* previous match */
+  this.match_available = 0;   /* set if previous match exists */
+  this.strstart = 0;          /* start of string to insert */
+  this.match_start = 0;       /* start of matching string */
+  this.lookahead = 0;         /* number of valid bytes ahead in window */
+
+  this.prev_length = 0;
+  /* Length of the best match at previous step. Matches not greater than this
+   * are discarded. This is used in the lazy match evaluation.
+   */
+
+  this.max_chain_length = 0;
+  /* To speed up deflation, hash chains are never searched beyond this
+   * length.  A higher limit improves compression ratio but degrades the
+   * speed.
+   */
+
+  this.max_lazy_match = 0;
+  /* Attempt to find a better match only when the current match is strictly
+   * smaller than this value. This mechanism is used only for compression
+   * levels >= 4.
+   */
+  // That's alias to max_lazy_match, don't use directly
+  //this.max_insert_length = 0;
+  /* Insert new strings in the hash table only if the match length is not
+   * greater than this length. This saves time but degrades compression.
+   * max_insert_length is used only for compression levels <= 3.
+   */
+
+  this.level = 0;     /* compression level (1..9) */
+  this.strategy = 0;  /* favor or force Huffman coding*/
+
+  this.good_match = 0;
+  /* Use a faster search when the previous match is longer than this */
+
+  this.nice_match = 0; /* Stop searching when current match exceeds this */
+
+              /* used by trees.c: */
+
+  /* Didn't use ct_data typedef below to suppress compiler warning */
+
+  // struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+  // struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+  // struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+  // Use flat array of DOUBLE size, with interleaved fata,
+  // because JS does not support effective
+  this.dyn_ltree  = new utils.Buf16(HEAP_SIZE * 2);
+  this.dyn_dtree  = new utils.Buf16((2 * D_CODES + 1) * 2);
+  this.bl_tree    = new utils.Buf16((2 * BL_CODES + 1) * 2);
+  zero(this.dyn_ltree);
+  zero(this.dyn_dtree);
+  zero(this.bl_tree);
+
+  this.l_desc   = null;         /* desc. for literal tree */
+  this.d_desc   = null;         /* desc. for distance tree */
+  this.bl_desc  = null;         /* desc. for bit length tree */
+
+  //ush bl_count[MAX_BITS+1];
+  this.bl_count = new utils.Buf16(MAX_BITS + 1);
+  /* number of codes at each bit length for an optimal tree */
+
+  //int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+  this.heap = new utils.Buf16(2 * L_CODES + 1);  /* heap used to build the Huffman trees */
+  zero(this.heap);
+
+  this.heap_len = 0;               /* number of elements in the heap */
+  this.heap_max = 0;               /* element of largest frequency */
+  /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+   * The same heap array is used to build all trees.
+   */
+
+  this.depth = new utils.Buf16(2 * L_CODES + 1); //uch depth[2*L_CODES+1];
+  zero(this.depth);
+  /* Depth of each subtree used as tie breaker for trees of equal frequency
+   */
+
+  this.l_buf = 0;          /* buffer index for literals or lengths */
+
+  this.lit_bufsize = 0;
+  /* Size of match buffer for literals/lengths.  There are 4 reasons for
+   * limiting lit_bufsize to 64K:
+   *   - frequencies can be kept in 16 bit counters
+   *   - if compression is not successful for the first block, all input
+   *     data is still in the window so we can still emit a stored block even
+   *     when input comes from standard input.  (This can also be done for
+   *     all blocks if lit_bufsize is not greater than 32K.)
+   *   - if compression is not successful for a file smaller than 64K, we can
+   *     even emit a stored file instead of a stored block (saving 5 bytes).
+   *     This is applicable only for zip (not gzip or zlib).
+   *   - creating new Huffman trees less frequently may not provide fast
+   *     adaptation to changes in the input data statistics. (Take for
+   *     example a binary file with poorly compressible code followed by
+   *     a highly compressible string table.) Smaller buffer sizes give
+   *     fast adaptation but have of course the overhead of transmitting
+   *     trees more frequently.
+   *   - I can't count above 4
+   */
+
+  this.last_lit = 0;      /* running index in l_buf */
+
+  this.d_buf = 0;
+  /* Buffer index for distances. To simplify the code, d_buf and l_buf have
+   * the same number of elements. To use different lengths, an extra flag
+   * array would be necessary.
+   */
+
+  this.opt_len = 0;       /* bit length of current block with optimal trees */
+  this.static_len = 0;    /* bit length of current block with static trees */
+  this.matches = 0;       /* number of string matches in current block */
+  this.insert = 0;        /* bytes at end of window left to insert */
+
+
+  this.bi_buf = 0;
+  /* Output buffer. bits are inserted starting at the bottom (least
+   * significant bits).
+   */
+  this.bi_valid = 0;
+  /* Number of valid bits in bi_buf.  All bits above the last valid bit
+   * are always zero.
+   */
+
+  // Used for window memory init. We safely ignore it for JS. That makes
+  // sense only for pointers and memory check tools.
+  //this.high_water = 0;
+  /* High water mark offset in window for initialized bytes -- bytes above
+   * this are set to zero in order to avoid memory check warnings when
+   * longest match routines access bytes past the input.  This is then
+   * updated to the new high water mark.
+   */
+}
+
+
+function deflateResetKeep(strm) {
+  var s;
+
+  if (!strm || !strm.state) {
+    return err(strm, Z_STREAM_ERROR);
+  }
+
+  strm.total_in = strm.total_out = 0;
+  strm.data_type = Z_UNKNOWN;
+
+  s = strm.state;
+  s.pending = 0;
+  s.pending_out = 0;
+
+  if (s.wrap < 0) {
+    s.wrap = -s.wrap;
+    /* was made negative by deflate(..., Z_FINISH); */
+  }
+  s.status = (s.wrap ? INIT_STATE : BUSY_STATE);
+  strm.adler = (s.wrap === 2) ?
+    0  // crc32(0, Z_NULL, 0)
+  :
+    1; // adler32(0, Z_NULL, 0)
+  s.last_flush = Z_NO_FLUSH;
+  trees._tr_init(s);
+  return Z_OK;
+}
+
+
+function deflateReset(strm) {
+  var ret = deflateResetKeep(strm);
+  if (ret === Z_OK) {
+    lm_init(strm.state);
+  }
+  return ret;
+}
+
+
+function deflateSetHeader(strm, head) {
+  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+  if (strm.state.wrap !== 2) { return Z_STREAM_ERROR; }
+  strm.state.gzhead = head;
+  return Z_OK;
+}
+
+
+function deflateInit2(strm, level, method, windowBits, memLevel, strategy) {
+  if (!strm) { // === Z_NULL
+    return Z_STREAM_ERROR;
+  }
+  var wrap = 1;
+
+  if (level === Z_DEFAULT_COMPRESSION) {
+    level = 6;
+  }
+
+  if (windowBits < 0) { /* suppress zlib wrapper */
+    wrap = 0;
+    windowBits = -windowBits;
+  }
+
+  else if (windowBits > 15) {
+    wrap = 2;           /* write gzip wrapper instead */
+    windowBits -= 16;
+  }
+
+
+  if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method !== Z_DEFLATED ||
+    windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+    strategy < 0 || strategy > Z_FIXED) {
+    return err(strm, Z_STREAM_ERROR);
+  }
+
+
+  if (windowBits === 8) {
+    windowBits = 9;
+  }
+  /* until 256-byte window bug fixed */
+
+  var s = new DeflateState();
+
+  strm.state = s;
+  s.strm = strm;
+
+  s.wrap = wrap;
+  s.gzhead = null;
+  s.w_bits = windowBits;
+  s.w_size = 1 << s.w_bits;
+  s.w_mask = s.w_size - 1;
+
+  s.hash_bits = memLevel + 7;
+  s.hash_size = 1 << s.hash_bits;
+  s.hash_mask = s.hash_size - 1;
+  s.hash_shift = ~~((s.hash_bits + MIN_MATCH - 1) / MIN_MATCH);
+
+  s.window = new utils.Buf8(s.w_size * 2);
+  s.head = new utils.Buf16(s.hash_size);
+  s.prev = new utils.Buf16(s.w_size);
+
+  // Don't need mem init magic for JS.
+  //s.high_water = 0;  /* nothing written to s->window yet */
+
+  s.lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+  s.pending_buf_size = s.lit_bufsize * 4;
+
+  //overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+  //s->pending_buf = (uchf *) overlay;
+  s.pending_buf = new utils.Buf8(s.pending_buf_size);
+
+  // It is offset from `s.pending_buf` (size is `s.lit_bufsize * 2`)
+  //s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+  s.d_buf = 1 * s.lit_bufsize;
+
+  //s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+  s.l_buf = (1 + 2) * s.lit_bufsize;
+
+  s.level = level;
+  s.strategy = strategy;
+  s.method = method;
+
+  return deflateReset(strm);
+}
+
+function deflateInit(strm, level) {
+  return deflateInit2(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
+}
+
+
+function deflate(strm, flush) {
+  var old_flush, s;
+  var beg, val; // for gzip header write only
+
+  if (!strm || !strm.state ||
+    flush > Z_BLOCK || flush < 0) {
+    return strm ? err(strm, Z_STREAM_ERROR) : Z_STREAM_ERROR;
+  }
+
+  s = strm.state;
+
+  if (!strm.output ||
+      (!strm.input && strm.avail_in !== 0) ||
+      (s.status === FINISH_STATE && flush !== Z_FINISH)) {
+    return err(strm, (strm.avail_out === 0) ? Z_BUF_ERROR : Z_STREAM_ERROR);
+  }
+
+  s.strm = strm; /* just in case */
+  old_flush = s.last_flush;
+  s.last_flush = flush;
+
+  /* Write the header */
+  if (s.status === INIT_STATE) {
+
+    if (s.wrap === 2) { // GZIP header
+      strm.adler = 0;  //crc32(0L, Z_NULL, 0);
+      put_byte(s, 31);
+      put_byte(s, 139);
+      put_byte(s, 8);
+      if (!s.gzhead) { // s->gzhead == Z_NULL
+        put_byte(s, 0);
+        put_byte(s, 0);
+        put_byte(s, 0);
+        put_byte(s, 0);
+        put_byte(s, 0);
+        put_byte(s, s.level === 9 ? 2 :
+                    (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
+                     4 : 0));
+        put_byte(s, OS_CODE);
+        s.status = BUSY_STATE;
+      }
+      else {
+        put_byte(s, (s.gzhead.text ? 1 : 0) +
+                    (s.gzhead.hcrc ? 2 : 0) +
+                    (!s.gzhead.extra ? 0 : 4) +
+                    (!s.gzhead.name ? 0 : 8) +
+                    (!s.gzhead.comment ? 0 : 16)
+                );
+        put_byte(s, s.gzhead.time & 0xff);
+        put_byte(s, (s.gzhead.time >> 8) & 0xff);
+        put_byte(s, (s.gzhead.time >> 16) & 0xff);
+        put_byte(s, (s.gzhead.time >> 24) & 0xff);
+        put_byte(s, s.level === 9 ? 2 :
+                    (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
+                     4 : 0));
+        put_byte(s, s.gzhead.os & 0xff);
+        if (s.gzhead.extra && s.gzhead.extra.length) {
+          put_byte(s, s.gzhead.extra.length & 0xff);
+          put_byte(s, (s.gzhead.extra.length >> 8) & 0xff);
+        }
+        if (s.gzhead.hcrc) {
+          strm.adler = crc32(strm.adler, s.pending_buf, s.pending, 0);
+        }
+        s.gzindex = 0;
+        s.status = EXTRA_STATE;
+      }
+    }
+    else // DEFLATE header
+    {
+      var header = (Z_DEFLATED + ((s.w_bits - 8) << 4)) << 8;
+      var level_flags = -1;
+
+      if (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2) {
+        level_flags = 0;
+      } else if (s.level < 6) {
+        level_flags = 1;
+      } else if (s.level === 6) {
+        level_flags = 2;
+      } else {
+        level_flags = 3;
+      }
+      header |= (level_flags << 6);
+      if (s.strstart !== 0) { header |= PRESET_DICT; }
+      header += 31 - (header % 31);
+
+      s.status = BUSY_STATE;
+      putShortMSB(s, header);
+
+      /* Save the adler32 of the preset dictionary: */
+      if (s.strstart !== 0) {
+        putShortMSB(s, strm.adler >>> 16);
+        putShortMSB(s, strm.adler & 0xffff);
+      }
+      strm.adler = 1; // adler32(0L, Z_NULL, 0);
+    }
+  }
+
+//#ifdef GZIP
+  if (s.status === EXTRA_STATE) {
+    if (s.gzhead.extra/* != Z_NULL*/) {
+      beg = s.pending;  /* start of bytes to update crc */
+
+      while (s.gzindex < (s.gzhead.extra.length & 0xffff)) {
+        if (s.pending === s.pending_buf_size) {
+          if (s.gzhead.hcrc && s.pending > beg) {
+            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
+          }
+          flush_pending(strm);
+          beg = s.pending;
+          if (s.pending === s.pending_buf_size) {
+            break;
+          }
+        }
+        put_byte(s, s.gzhead.extra[s.gzindex] & 0xff);
+        s.gzindex++;
+      }
+      if (s.gzhead.hcrc && s.pending > beg) {
+        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
+      }
+      if (s.gzindex === s.gzhead.extra.length) {
+        s.gzindex = 0;
+        s.status = NAME_STATE;
+      }
+    }
+    else {
+      s.status = NAME_STATE;
+    }
+  }
+  if (s.status === NAME_STATE) {
+    if (s.gzhead.name/* != Z_NULL*/) {
+      beg = s.pending;  /* start of bytes to update crc */
+      //int val;
+
+      do {
+        if (s.pending === s.pending_buf_size) {
+          if (s.gzhead.hcrc && s.pending > beg) {
+            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
+          }
+          flush_pending(strm);
+          beg = s.pending;
+          if (s.pending === s.pending_buf_size) {
+            val = 1;
+            break;
+          }
+        }
+        // JS specific: little magic to add zero terminator to end of string
+        if (s.gzindex < s.gzhead.name.length) {
+          val = s.gzhead.name.charCodeAt(s.gzindex++) & 0xff;
+        } else {
+          val = 0;
+        }
+        put_byte(s, val);
+      } while (val !== 0);
+
+      if (s.gzhead.hcrc && s.pending > beg) {
+        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
+      }
+      if (val === 0) {
+        s.gzindex = 0;
+        s.status = COMMENT_STATE;
+      }
+    }
+    else {
+      s.status = COMMENT_STATE;
+    }
+  }
+  if (s.status === COMMENT_STATE) {
+    if (s.gzhead.comment/* != Z_NULL*/) {
+      beg = s.pending;  /* start of bytes to update crc */
+      //int val;
+
+      do {
+        if (s.pending === s.pending_buf_size) {
+          if (s.gzhead.hcrc && s.pending > beg) {
+            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
+          }
+          flush_pending(strm);
+          beg = s.pending;
+          if (s.pending === s.pending_buf_size) {
+            val = 1;
+            break;
+          }
+        }
+        // JS specific: little magic to add zero terminator to end of string
+        if (s.gzindex < s.gzhead.comment.length) {
+          val = s.gzhead.comment.charCodeAt(s.gzindex++) & 0xff;
+        } else {
+          val = 0;
+        }
+        put_byte(s, val);
+      } while (val !== 0);
+
+      if (s.gzhead.hcrc && s.pending > beg) {
+        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
+      }
+      if (val === 0) {
+        s.status = HCRC_STATE;
+      }
+    }
+    else {
+      s.status = HCRC_STATE;
+    }
+  }
+  if (s.status === HCRC_STATE) {
+    if (s.gzhead.hcrc) {
+      if (s.pending + 2 > s.pending_buf_size) {
+        flush_pending(strm);
+      }
+      if (s.pending + 2 <= s.pending_buf_size) {
+        put_byte(s, strm.adler & 0xff);
+        put_byte(s, (strm.adler >> 8) & 0xff);
+        strm.adler = 0; //crc32(0L, Z_NULL, 0);
+        s.status = BUSY_STATE;
+      }
+    }
+    else {
+      s.status = BUSY_STATE;
+    }
+  }
+//#endif
+
+  /* Flush as much pending output as possible */
+  if (s.pending !== 0) {
+    flush_pending(strm);
+    if (strm.avail_out === 0) {
+      /* Since avail_out is 0, deflate will be called again with
+       * more output space, but possibly with both pending and
+       * avail_in equal to zero. There won't be anything to do,
+       * but this is not an error situation so make sure we
+       * return OK instead of BUF_ERROR at next call of deflate:
+       */
+      s.last_flush = -1;
+      return Z_OK;
+    }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+  } else if (strm.avail_in === 0 && rank(flush) <= rank(old_flush) &&
+    flush !== Z_FINISH) {
+    return err(strm, Z_BUF_ERROR);
+  }
+
+  /* User must not provide more input after the first FINISH: */
+  if (s.status === FINISH_STATE && strm.avail_in !== 0) {
+    return err(strm, Z_BUF_ERROR);
+  }
+
+  /* Start a new block or continue the current one.
+   */
+  if (strm.avail_in !== 0 || s.lookahead !== 0 ||
+    (flush !== Z_NO_FLUSH && s.status !== FINISH_STATE)) {
+    var bstate = (s.strategy === Z_HUFFMAN_ONLY) ? deflate_huff(s, flush) :
+      (s.strategy === Z_RLE ? deflate_rle(s, flush) :
+        configuration_table[s.level].func(s, flush));
+
+    if (bstate === BS_FINISH_STARTED || bstate === BS_FINISH_DONE) {
+      s.status = FINISH_STATE;
+    }
+    if (bstate === BS_NEED_MORE || bstate === BS_FINISH_STARTED) {
+      if (strm.avail_out === 0) {
+        s.last_flush = -1;
+        /* avoid BUF_ERROR next call, see above */
+      }
+      return Z_OK;
+      /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+       * of deflate should use the same flush parameter to make sure
+       * that the flush is complete. So we don't have to output an
+       * empty block here, this will be done at next call. This also
+       * ensures that for a very small output buffer, we emit at most
+       * one empty block.
+       */
+    }
+    if (bstate === BS_BLOCK_DONE) {
+      if (flush === Z_PARTIAL_FLUSH) {
+        trees._tr_align(s);
+      }
+      else if (flush !== Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+
+        trees._tr_stored_block(s, 0, 0, false);
+        /* For a full flush, this empty block will be recognized
+         * as a special marker by inflate_sync().
+         */
+        if (flush === Z_FULL_FLUSH) {
+          /*** CLEAR_HASH(s); ***/             /* forget history */
+          zero(s.head); // Fill with NIL (= 0);
+
+          if (s.lookahead === 0) {
+            s.strstart = 0;
+            s.block_start = 0;
+            s.insert = 0;
+          }
+        }
+      }
+      flush_pending(strm);
+      if (strm.avail_out === 0) {
+        s.last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+        return Z_OK;
+      }
+    }
+  }
+  //Assert(strm->avail_out > 0, "bug2");
+  //if (strm.avail_out <= 0) { throw new Error("bug2");}
+
+  if (flush !== Z_FINISH) { return Z_OK; }
+  if (s.wrap <= 0) { return Z_STREAM_END; }
+
+  /* Write the trailer */
+  if (s.wrap === 2) {
+    put_byte(s, strm.adler & 0xff);
+    put_byte(s, (strm.adler >> 8) & 0xff);
+    put_byte(s, (strm.adler >> 16) & 0xff);
+    put_byte(s, (strm.adler >> 24) & 0xff);
+    put_byte(s, strm.total_in & 0xff);
+    put_byte(s, (strm.total_in >> 8) & 0xff);
+    put_byte(s, (strm.total_in >> 16) & 0xff);
+    put_byte(s, (strm.total_in >> 24) & 0xff);
+  }
+  else
+  {
+    putShortMSB(s, strm.adler >>> 16);
+    putShortMSB(s, strm.adler & 0xffff);
+  }
+
+  flush_pending(strm);
+  /* If avail_out is zero, the application will call deflate again
+   * to flush the rest.
+   */
+  if (s.wrap > 0) { s.wrap = -s.wrap; }
+  /* write the trailer only once! */
+  return s.pending !== 0 ? Z_OK : Z_STREAM_END;
+}
+
+function deflateEnd(strm) {
+  var status;
+
+  if (!strm/*== Z_NULL*/ || !strm.state/*== Z_NULL*/) {
+    return Z_STREAM_ERROR;
+  }
+
+  status = strm.state.status;
+  if (status !== INIT_STATE &&
+    status !== EXTRA_STATE &&
+    status !== NAME_STATE &&
+    status !== COMMENT_STATE &&
+    status !== HCRC_STATE &&
+    status !== BUSY_STATE &&
+    status !== FINISH_STATE
+  ) {
+    return err(strm, Z_STREAM_ERROR);
+  }
+
+  strm.state = null;
+
+  return status === BUSY_STATE ? err(strm, Z_DATA_ERROR) : Z_OK;
+}
+
+
+/* =========================================================================
+ * Initializes the compression dictionary from the given byte
+ * sequence without producing any compressed output.
+ */
+function deflateSetDictionary(strm, dictionary) {
+  var dictLength = dictionary.length;
+
+  var s;
+  var str, n;
+  var wrap;
+  var avail;
+  var next;
+  var input;
+  var tmpDict;
+
+  if (!strm/*== Z_NULL*/ || !strm.state/*== Z_NULL*/) {
+    return Z_STREAM_ERROR;
+  }
+
+  s = strm.state;
+  wrap = s.wrap;
+
+  if (wrap === 2 || (wrap === 1 && s.status !== INIT_STATE) || s.lookahead) {
+    return Z_STREAM_ERROR;
+  }
+
+  /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+  if (wrap === 1) {
+    /* adler32(strm->adler, dictionary, dictLength); */
+    strm.adler = adler32(strm.adler, dictionary, dictLength, 0);
+  }
+
+  s.wrap = 0;   /* avoid computing Adler-32 in read_buf */
+
+  /* if dictionary would fill window, just replace the history */
+  if (dictLength >= s.w_size) {
+    if (wrap === 0) {            /* already empty otherwise */
+      /*** CLEAR_HASH(s); ***/
+      zero(s.head); // Fill with NIL (= 0);
+      s.strstart = 0;
+      s.block_start = 0;
+      s.insert = 0;
+    }
+    /* use the tail */
+    // dictionary = dictionary.slice(dictLength - s.w_size);
+    tmpDict = new utils.Buf8(s.w_size);
+    utils.arraySet(tmpDict, dictionary, dictLength - s.w_size, s.w_size, 0);
+    dictionary = tmpDict;
+    dictLength = s.w_size;
+  }
+  /* insert dictionary into window and hash */
+  avail = strm.avail_in;
+  next = strm.next_in;
+  input = strm.input;
+  strm.avail_in = dictLength;
+  strm.next_in = 0;
+  strm.input = dictionary;
+  fill_window(s);
+  while (s.lookahead >= MIN_MATCH) {
+    str = s.strstart;
+    n = s.lookahead - (MIN_MATCH - 1);
+    do {
+      /* UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); */
+      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH - 1]) & s.hash_mask;
+
+      s.prev[str & s.w_mask] = s.head[s.ins_h];
+
+      s.head[s.ins_h] = str;
+      str++;
+    } while (--n);
+    s.strstart = str;
+    s.lookahead = MIN_MATCH - 1;
+    fill_window(s);
+  }
+  s.strstart += s.lookahead;
+  s.block_start = s.strstart;
+  s.insert = s.lookahead;
+  s.lookahead = 0;
+  s.match_length = s.prev_length = MIN_MATCH - 1;
+  s.match_available = 0;
+  strm.next_in = next;
+  strm.input = input;
+  strm.avail_in = avail;
+  s.wrap = wrap;
+  return Z_OK;
+}
+
+
+exports.deflateInit = deflateInit;
+exports.deflateInit2 = deflateInit2;
+exports.deflateReset = deflateReset;
+exports.deflateResetKeep = deflateResetKeep;
+exports.deflateSetHeader = deflateSetHeader;
+exports.deflate = deflate;
+exports.deflateEnd = deflateEnd;
+exports.deflateSetDictionary = deflateSetDictionary;
+exports.deflateInfo = 'pako deflate (from Nodeca project)';
+
+/* Not implemented
+exports.deflateBound = deflateBound;
+exports.deflateCopy = deflateCopy;
+exports.deflateParams = deflateParams;
+exports.deflatePending = deflatePending;
+exports.deflatePrime = deflatePrime;
+exports.deflateTune = deflateTune;
+*/
+
+},{"../utils/common":41,"./adler32":43,"./crc32":45,"./messages":51,"./trees":52}],47:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+function GZheader() {
+  /* true if compressed data believed to be text */
+  this.text       = 0;
+  /* modification time */
+  this.time       = 0;
+  /* extra flags (not used when writing a gzip file) */
+  this.xflags     = 0;
+  /* operating system */
+  this.os         = 0;
+  /* pointer to extra field or Z_NULL if none */
+  this.extra      = null;
+  /* extra field length (valid if extra != Z_NULL) */
+  this.extra_len  = 0; // Actually, we don't need it in JS,
+                       // but leave for few code modifications
+
+  //
+  // Setup limits is not necessary because in js we should not preallocate memory
+  // for inflate use constant limit in 65536 bytes
+  //
+
+  /* space at extra (only when reading header) */
+  // this.extra_max  = 0;
+  /* pointer to zero-terminated file name or Z_NULL */
+  this.name       = '';
+  /* space at name (only when reading header) */
+  // this.name_max   = 0;
+  /* pointer to zero-terminated comment or Z_NULL */
+  this.comment    = '';
+  /* space at comment (only when reading header) */
+  // this.comm_max   = 0;
+  /* true if there was or will be a header crc */
+  this.hcrc       = 0;
+  /* true when done reading gzip header (not used when writing a gzip file) */
+  this.done       = false;
+}
+
+module.exports = GZheader;
+
+},{}],48:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+// See state defs from inflate.js
+var BAD = 30;       /* got a data error -- remain here until reset */
+var TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state.mode === LEN
+        strm.avail_in >= 6
+        strm.avail_out >= 258
+        start >= strm.avail_out
+        state.bits < 8
+
+   On return, state.mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm.avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm.avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+module.exports = function inflate_fast(strm, start) {
+  var state;
+  var _in;                    /* local strm.input */
+  var last;                   /* have enough input while in < last */
+  var _out;                   /* local strm.output */
+  var beg;                    /* inflate()'s initial strm.output */
+  var end;                    /* while out < end, enough space available */
+//#ifdef INFLATE_STRICT
+  var dmax;                   /* maximum distance from zlib header */
+//#endif
+  var wsize;                  /* window size or zero if not using window */
+  var whave;                  /* valid bytes in the window */
+  var wnext;                  /* window write index */
+  // Use `s_window` instead `window`, avoid conflict with instrumentation tools
+  var s_window;               /* allocated sliding window, if wsize != 0 */
+  var hold;                   /* local strm.hold */
+  var bits;                   /* local strm.bits */
+  var lcode;                  /* local strm.lencode */
+  var dcode;                  /* local strm.distcode */
+  var lmask;                  /* mask for first level of length codes */
+  var dmask;                  /* mask for first level of distance codes */
+  var here;                   /* retrieved table entry */
+  var op;                     /* code bits, operation, extra bits, or */
+                              /*  window position, window bytes to copy */
+  var len;                    /* match length, unused bytes */
+  var dist;                   /* match distance */
+  var from;                   /* where to copy match from */
+  var from_source;
+
+
+  var input, output; // JS specific, because we have no pointers
+
+  /* copy state to local variables */
+  state = strm.state;
+  //here = state.here;
+  _in = strm.next_in;
+  input = strm.input;
+  last = _in + (strm.avail_in - 5);
+  _out = strm.next_out;
+  output = strm.output;
+  beg = _out - (start - strm.avail_out);
+  end = _out + (strm.avail_out - 257);
+//#ifdef INFLATE_STRICT
+  dmax = state.dmax;
+//#endif
+  wsize = state.wsize;
+  whave = state.whave;
+  wnext = state.wnext;
+  s_window = state.window;
+  hold = state.hold;
+  bits = state.bits;
+  lcode = state.lencode;
+  dcode = state.distcode;
+  lmask = (1 << state.lenbits) - 1;
+  dmask = (1 << state.distbits) - 1;
+
+
+  /* decode literals and length/distances until end-of-block or not enough
+     input data or output space */
+
+  top:
+  do {
+    if (bits < 15) {
+      hold += input[_in++] << bits;
+      bits += 8;
+      hold += input[_in++] << bits;
+      bits += 8;
+    }
+
+    here = lcode[hold & lmask];
+
+    dolen:
+    for (;;) { // Goto emulation
+      op = here >>> 24/*here.bits*/;
+      hold >>>= op;
+      bits -= op;
+      op = (here >>> 16) & 0xff/*here.op*/;
+      if (op === 0) {                          /* literal */
+        //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+        //        "inflate:         literal '%c'\n" :
+        //        "inflate:         literal 0x%02x\n", here.val));
+        output[_out++] = here & 0xffff/*here.val*/;
+      }
+      else if (op & 16) {                     /* length base */
+        len = here & 0xffff/*here.val*/;
+        op &= 15;                           /* number of extra bits */
+        if (op) {
+          if (bits < op) {
+            hold += input[_in++] << bits;
+            bits += 8;
+          }
+          len += hold & ((1 << op) - 1);
+          hold >>>= op;
+          bits -= op;
+        }
+        //Tracevv((stderr, "inflate:         length %u\n", len));
+        if (bits < 15) {
+          hold += input[_in++] << bits;
+          bits += 8;
+          hold += input[_in++] << bits;
+          bits += 8;
+        }
+        here = dcode[hold & dmask];
+
+        dodist:
+        for (;;) { // goto emulation
+          op = here >>> 24/*here.bits*/;
+          hold >>>= op;
+          bits -= op;
+          op = (here >>> 16) & 0xff/*here.op*/;
+
+          if (op & 16) {                      /* distance base */
+            dist = here & 0xffff/*here.val*/;
+            op &= 15;                       /* number of extra bits */
+            if (bits < op) {
+              hold += input[_in++] << bits;
+              bits += 8;
+              if (bits < op) {
+                hold += input[_in++] << bits;
+                bits += 8;
+              }
+            }
+            dist += hold & ((1 << op) - 1);
+//#ifdef INFLATE_STRICT
+            if (dist > dmax) {
+              strm.msg = 'invalid distance too far back';
+              state.mode = BAD;
+              break top;
+            }
+//#endif
+            hold >>>= op;
+            bits -= op;
+            //Tracevv((stderr, "inflate:         distance %u\n", dist));
+            op = _out - beg;                /* max distance in output */
+            if (dist > op) {                /* see if copy from window */
+              op = dist - op;               /* distance back in window */
+              if (op > whave) {
+                if (state.sane) {
+                  strm.msg = 'invalid distance too far back';
+                  state.mode = BAD;
+                  break top;
+                }
+
+// (!) This block is disabled in zlib defailts,
+// don't enable it for binary compatibility
+//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+//                if (len <= op - whave) {
+//                  do {
+//                    output[_out++] = 0;
+//                  } while (--len);
+//                  continue top;
+//                }
+//                len -= op - whave;
+//                do {
+//                  output[_out++] = 0;
+//                } while (--op > whave);
+//                if (op === 0) {
+//                  from = _out - dist;
+//                  do {
+//                    output[_out++] = output[from++];
+//                  } while (--len);
+//                  continue top;
+//                }
+//#endif
+              }
+              from = 0; // window index
+              from_source = s_window;
+              if (wnext === 0) {           /* very common case */
+                from += wsize - op;
+                if (op < len) {         /* some from window */
+                  len -= op;
+                  do {
+                    output[_out++] = s_window[from++];
+                  } while (--op);
+                  from = _out - dist;  /* rest from output */
+                  from_source = output;
+                }
+              }
+              else if (wnext < op) {      /* wrap around window */
+                from += wsize + wnext - op;
+                op -= wnext;
+                if (op < len) {         /* some from end of window */
+                  len -= op;
+                  do {
+                    output[_out++] = s_window[from++];
+                  } while (--op);
+                  from = 0;
+                  if (wnext < len) {  /* some from start of window */
+                    op = wnext;
+                    len -= op;
+                    do {
+                      output[_out++] = s_window[from++];
+                    } while (--op);
+                    from = _out - dist;      /* rest from output */
+                    from_source = output;
+                  }
+                }
+              }
+              else {                      /* contiguous in window */
+                from += wnext - op;
+                if (op < len) {         /* some from window */
+                  len -= op;
+                  do {
+                    output[_out++] = s_window[from++];
+                  } while (--op);
+                  from = _out - dist;  /* rest from output */
+                  from_source = output;
+                }
+              }
+              while (len > 2) {
+                output[_out++] = from_source[from++];
+                output[_out++] = from_source[from++];
+                output[_out++] = from_source[from++];
+                len -= 3;
+              }
+              if (len) {
+                output[_out++] = from_source[from++];
+                if (len > 1) {
+                  output[_out++] = from_source[from++];
+                }
+              }
+            }
+            else {
+              from = _out - dist;          /* copy direct from output */
+              do {                        /* minimum length is three */
+                output[_out++] = output[from++];
+                output[_out++] = output[from++];
+                output[_out++] = output[from++];
+                len -= 3;
+              } while (len > 2);
+              if (len) {
+                output[_out++] = output[from++];
+                if (len > 1) {
+                  output[_out++] = output[from++];
+                }
+              }
+            }
+          }
+          else if ((op & 64) === 0) {          /* 2nd level distance code */
+            here = dcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
+            continue dodist;
+          }
+          else {
+            strm.msg = 'invalid distance code';
+            state.mode = BAD;
+            break top;
+          }
+
+          break; // need to emulate goto via "continue"
+        }
+      }
+      else if ((op & 64) === 0) {              /* 2nd level length code */
+        here = lcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
+        continue dolen;
+      }
+      else if (op & 32) {                     /* end-of-block */
+        //Tracevv((stderr, "inflate:         end of block\n"));
+        state.mode = TYPE;
+        break top;
+      }
+      else {
+        strm.msg = 'invalid literal/length code';
+        state.mode = BAD;
+        break top;
+      }
+
+      break; // need to emulate goto via "continue"
+    }
+  } while (_in < last && _out < end);
+
+  /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+  len = bits >> 3;
+  _in -= len;
+  bits -= len << 3;
+  hold &= (1 << bits) - 1;
+
+  /* update state and return */
+  strm.next_in = _in;
+  strm.next_out = _out;
+  strm.avail_in = (_in < last ? 5 + (last - _in) : 5 - (_in - last));
+  strm.avail_out = (_out < end ? 257 + (end - _out) : 257 - (_out - end));
+  state.hold = hold;
+  state.bits = bits;
+  return;
+};
+
+},{}],49:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+var utils         = require('../utils/common');
+var adler32       = require('./adler32');
+var crc32         = require('./crc32');
+var inflate_fast  = require('./inffast');
+var inflate_table = require('./inftrees');
+
+var CODES = 0;
+var LENS = 1;
+var DISTS = 2;
+
+/* Public constants ==========================================================*/
+/* ===========================================================================*/
+
+
+/* Allowed flush values; see deflate() and inflate() below for details */
+//var Z_NO_FLUSH      = 0;
+//var Z_PARTIAL_FLUSH = 1;
+//var Z_SYNC_FLUSH    = 2;
+//var Z_FULL_FLUSH    = 3;
+var Z_FINISH        = 4;
+var Z_BLOCK         = 5;
+var Z_TREES         = 6;
+
+
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+var Z_OK            = 0;
+var Z_STREAM_END    = 1;
+var Z_NEED_DICT     = 2;
+//var Z_ERRNO         = -1;
+var Z_STREAM_ERROR  = -2;
+var Z_DATA_ERROR    = -3;
+var Z_MEM_ERROR     = -4;
+var Z_BUF_ERROR     = -5;
+//var Z_VERSION_ERROR = -6;
+
+/* The deflate compression method */
+var Z_DEFLATED  = 8;
+
+
+/* STATES ====================================================================*/
+/* ===========================================================================*/
+
+
+var    HEAD = 1;       /* i: waiting for magic header */
+var    FLAGS = 2;      /* i: waiting for method and flags (gzip) */
+var    TIME = 3;       /* i: waiting for modification time (gzip) */
+var    OS = 4;         /* i: waiting for extra flags and operating system (gzip) */
+var    EXLEN = 5;      /* i: waiting for extra length (gzip) */
+var    EXTRA = 6;      /* i: waiting for extra bytes (gzip) */
+var    NAME = 7;       /* i: waiting for end of file name (gzip) */
+var    COMMENT = 8;    /* i: waiting for end of comment (gzip) */
+var    HCRC = 9;       /* i: waiting for header crc (gzip) */
+var    DICTID = 10;    /* i: waiting for dictionary check value */
+var    DICT = 11;      /* waiting for inflateSetDictionary() call */
+var        TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
+var        TYPEDO = 13;    /* i: same, but skip check to exit inflate on new block */
+var        STORED = 14;    /* i: waiting for stored size (length and complement) */
+var        COPY_ = 15;     /* i/o: same as COPY below, but only first time in */
+var        COPY = 16;      /* i/o: waiting for input or output to copy stored block */
+var        TABLE = 17;     /* i: waiting for dynamic block table lengths */
+var        LENLENS = 18;   /* i: waiting for code length code lengths */
+var        CODELENS = 19;  /* i: waiting for length/lit and distance code lengths */
+var            LEN_ = 20;      /* i: same as LEN below, but only first time in */
+var            LEN = 21;       /* i: waiting for length/lit/eob code */
+var            LENEXT = 22;    /* i: waiting for length extra bits */
+var            DIST = 23;      /* i: waiting for distance code */
+var            DISTEXT = 24;   /* i: waiting for distance extra bits */
+var            MATCH = 25;     /* o: waiting for output space to copy string */
+var            LIT = 26;       /* o: waiting for output space to write literal */
+var    CHECK = 27;     /* i: waiting for 32-bit check value */
+var    LENGTH = 28;    /* i: waiting for 32-bit length (gzip) */
+var    DONE = 29;      /* finished check, done -- remain here until reset */
+var    BAD = 30;       /* got a data error -- remain here until reset */
+var    MEM = 31;       /* got an inflate() memory error -- remain here until reset */
+var    SYNC = 32;      /* looking for synchronization bytes to restart inflate() */
+
+/* ===========================================================================*/
+
+
+
+var ENOUGH_LENS = 852;
+var ENOUGH_DISTS = 592;
+//var ENOUGH =  (ENOUGH_LENS+ENOUGH_DISTS);
+
+var MAX_WBITS = 15;
+/* 32K LZ77 window */
+var DEF_WBITS = MAX_WBITS;
+
+
+function zswap32(q) {
+  return  (((q >>> 24) & 0xff) +
+          ((q >>> 8) & 0xff00) +
+          ((q & 0xff00) << 8) +
+          ((q & 0xff) << 24));
+}
+
+
+function InflateState() {
+  this.mode = 0;             /* current inflate mode */
+  this.last = false;          /* true if processing last block */
+  this.wrap = 0;              /* bit 0 true for zlib, bit 1 true for gzip */
+  this.havedict = false;      /* true if dictionary provided */
+  this.flags = 0;             /* gzip header method and flags (0 if zlib) */
+  this.dmax = 0;              /* zlib header max distance (INFLATE_STRICT) */
+  this.check = 0;             /* protected copy of check value */
+  this.total = 0;             /* protected copy of output count */
+  // TODO: may be {}
+  this.head = null;           /* where to save gzip header information */
+
+  /* sliding window */
+  this.wbits = 0;             /* log base 2 of requested window size */
+  this.wsize = 0;             /* window size or zero if not using window */
+  this.whave = 0;             /* valid bytes in the window */
+  this.wnext = 0;             /* window write index */
+  this.window = null;         /* allocated sliding window, if needed */
+
+  /* bit accumulator */
+  this.hold = 0;              /* input bit accumulator */
+  this.bits = 0;              /* number of bits in "in" */
+
+  /* for string and stored block copying */
+  this.length = 0;            /* literal or length of data to copy */
+  this.offset = 0;            /* distance back to copy string from */
+
+  /* for table and code decoding */
+  this.extra = 0;             /* extra bits needed */
+
+  /* fixed and dynamic code tables */
+  this.lencode = null;          /* starting table for length/literal codes */
+  this.distcode = null;         /* starting table for distance codes */
+  this.lenbits = 0;           /* index bits for lencode */
+  this.distbits = 0;          /* index bits for distcode */
+
+  /* dynamic table building */
+  this.ncode = 0;             /* number of code length code lengths */
+  this.nlen = 0;              /* number of length code lengths */
+  this.ndist = 0;             /* number of distance code lengths */
+  this.have = 0;              /* number of code lengths in lens[] */
+  this.next = null;              /* next available space in codes[] */
+
+  this.lens = new utils.Buf16(320); /* temporary storage for code lengths */
+  this.work = new utils.Buf16(288); /* work area for code table building */
+
+  /*
+   because we don't have pointers in js, we use lencode and distcode directly
+   as buffers so we don't need codes
+  */
+  //this.codes = new utils.Buf32(ENOUGH);       /* space for code tables */
+  this.lendyn = null;              /* dynamic table for length/literal codes (JS specific) */
+  this.distdyn = null;             /* dynamic table for distance codes (JS specific) */
+  this.sane = 0;                   /* if false, allow invalid distance too far */
+  this.back = 0;                   /* bits back of last unprocessed length/lit */
+  this.was = 0;                    /* initial length of match */
+}
+
+function inflateResetKeep(strm) {
+  var state;
+
+  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+  state = strm.state;
+  strm.total_in = strm.total_out = state.total = 0;
+  strm.msg = ''; /*Z_NULL*/
+  if (state.wrap) {       /* to support ill-conceived Java test suite */
+    strm.adler = state.wrap & 1;
+  }
+  state.mode = HEAD;
+  state.last = 0;
+  state.havedict = 0;
+  state.dmax = 32768;
+  state.head = null/*Z_NULL*/;
+  state.hold = 0;
+  state.bits = 0;
+  //state.lencode = state.distcode = state.next = state.codes;
+  state.lencode = state.lendyn = new utils.Buf32(ENOUGH_LENS);
+  state.distcode = state.distdyn = new utils.Buf32(ENOUGH_DISTS);
+
+  state.sane = 1;
+  state.back = -1;
+  //Tracev((stderr, "inflate: reset\n"));
+  return Z_OK;
+}
+
+function inflateReset(strm) {
+  var state;
+
+  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+  state = strm.state;
+  state.wsize = 0;
+  state.whave = 0;
+  state.wnext = 0;
+  return inflateResetKeep(strm);
+
+}
+
+function inflateReset2(strm, windowBits) {
+  var wrap;
+  var state;
+
+  /* get the state */
+  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+  state = strm.state;
+
+  /* extract wrap request from windowBits parameter */
+  if (windowBits < 0) {
+    wrap = 0;
+    windowBits = -windowBits;
+  }
+  else {
+    wrap = (windowBits >> 4) + 1;
+    if (windowBits < 48) {
+      windowBits &= 15;
+    }
+  }
+
+  /* set number of window bits, free window if different */
+  if (windowBits && (windowBits < 8 || windowBits > 15)) {
+    return Z_STREAM_ERROR;
+  }
+  if (state.window !== null && state.wbits !== windowBits) {
+    state.window = null;
+  }
+
+  /* update state and reset the rest of it */
+  state.wrap = wrap;
+  state.wbits = windowBits;
+  return inflateReset(strm);
+}
+
+function inflateInit2(strm, windowBits) {
+  var ret;
+  var state;
+
+  if (!strm) { return Z_STREAM_ERROR; }
+  //strm.msg = Z_NULL;                 /* in case we return an error */
+
+  state = new InflateState();
+
+  //if (state === Z_NULL) return Z_MEM_ERROR;
+  //Tracev((stderr, "inflate: allocated\n"));
+  strm.state = state;
+  state.window = null/*Z_NULL*/;
+  ret = inflateReset2(strm, windowBits);
+  if (ret !== Z_OK) {
+    strm.state = null/*Z_NULL*/;
+  }
+  return ret;
+}
+
+function inflateInit(strm) {
+  return inflateInit2(strm, DEF_WBITS);
+}
+
+
+/*
+ Return state with length and distance decoding tables and index sizes set to
+ fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+ If BUILDFIXED is defined, then instead this routine builds the tables the
+ first time it's called, and returns those tables the first time and
+ thereafter.  This reduces the size of the code by about 2K bytes, in
+ exchange for a little execution time.  However, BUILDFIXED should not be
+ used for threaded applications, since the rewriting of the tables and virgin
+ may not be thread-safe.
+ */
+var virgin = true;
+
+var lenfix, distfix; // We have no pointers in JS, so keep tables separate
+
+function fixedtables(state) {
+  /* build fixed huffman tables if first call (may not be thread safe) */
+  if (virgin) {
+    var sym;
+
+    lenfix = new utils.Buf32(512);
+    distfix = new utils.Buf32(32);
+
+    /* literal/length table */
+    sym = 0;
+    while (sym < 144) { state.lens[sym++] = 8; }
+    while (sym < 256) { state.lens[sym++] = 9; }
+    while (sym < 280) { state.lens[sym++] = 7; }
+    while (sym < 288) { state.lens[sym++] = 8; }
+
+    inflate_table(LENS,  state.lens, 0, 288, lenfix,   0, state.work, { bits: 9 });
+
+    /* distance table */
+    sym = 0;
+    while (sym < 32) { state.lens[sym++] = 5; }
+
+    inflate_table(DISTS, state.lens, 0, 32,   distfix, 0, state.work, { bits: 5 });
+
+    /* do this just once */
+    virgin = false;
+  }
+
+  state.lencode = lenfix;
+  state.lenbits = 9;
+  state.distcode = distfix;
+  state.distbits = 5;
+}
+
+
+/*
+ Update the window with the last wsize (normally 32K) bytes written before
+ returning.  If window does not exist yet, create it.  This is only called
+ when a window is already in use, or when output has been written during this
+ inflate call, but the end of the deflate stream has not been reached yet.
+ It is also called to create a window for dictionary data when a dictionary
+ is loaded.
+
+ Providing output buffers larger than 32K to inflate() should provide a speed
+ advantage, since only the last 32K of output is copied to the sliding window
+ upon return from inflate(), and since all distances after the first 32K of
+ output will fall in the output data, making match copies simpler and faster.
+ The advantage may be dependent on the size of the processor's data caches.
+ */
+function updatewindow(strm, src, end, copy) {
+  var dist;
+  var state = strm.state;
+
+  /* if it hasn't been done already, allocate space for the window */
+  if (state.window === null) {
+    state.wsize = 1 << state.wbits;
+    state.wnext = 0;
+    state.whave = 0;
+
+    state.window = new utils.Buf8(state.wsize);
+  }
+
+  /* copy state->wsize or less output bytes into the circular window */
+  if (copy >= state.wsize) {
+    utils.arraySet(state.window, src, end - state.wsize, state.wsize, 0);
+    state.wnext = 0;
+    state.whave = state.wsize;
+  }
+  else {
+    dist = state.wsize - state.wnext;
+    if (dist > copy) {
+      dist = copy;
+    }
+    //zmemcpy(state->window + state->wnext, end - copy, dist);
+    utils.arraySet(state.window, src, end - copy, dist, state.wnext);
+    copy -= dist;
+    if (copy) {
+      //zmemcpy(state->window, end - copy, copy);
+      utils.arraySet(state.window, src, end - copy, copy, 0);
+      state.wnext = copy;
+      state.whave = state.wsize;
+    }
+    else {
+      state.wnext += dist;
+      if (state.wnext === state.wsize) { state.wnext = 0; }
+      if (state.whave < state.wsize) { state.whave += dist; }
+    }
+  }
+  return 0;
+}
+
+function inflate(strm, flush) {
+  var state;
+  var input, output;          // input/output buffers
+  var next;                   /* next input INDEX */
+  var put;                    /* next output INDEX */
+  var have, left;             /* available input and output */
+  var hold;                   /* bit buffer */
+  var bits;                   /* bits in bit buffer */
+  var _in, _out;              /* save starting available input and output */
+  var copy;                   /* number of stored or match bytes to copy */
+  var from;                   /* where to copy match bytes from */
+  var from_source;
+  var here = 0;               /* current decoding table entry */
+  var here_bits, here_op, here_val; // paked "here" denormalized (JS specific)
+  //var last;                   /* parent table entry */
+  var last_bits, last_op, last_val; // paked "last" denormalized (JS specific)
+  var len;                    /* length to copy for repeats, bits to drop */
+  var ret;                    /* return code */
+  var hbuf = new utils.Buf8(4);    /* buffer for gzip header crc calculation */
+  var opts;
+
+  var n; // temporary var for NEED_BITS
+
+  var order = /* permutation of code lengths */
+    [ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 ];
+
+
+  if (!strm || !strm.state || !strm.output ||
+      (!strm.input && strm.avail_in !== 0)) {
+    return Z_STREAM_ERROR;
+  }
+
+  state = strm.state;
+  if (state.mode === TYPE) { state.mode = TYPEDO; }    /* skip check */
+
+
+  //--- LOAD() ---
+  put = strm.next_out;
+  output = strm.output;
+  left = strm.avail_out;
+  next = strm.next_in;
+  input = strm.input;
+  have = strm.avail_in;
+  hold = state.hold;
+  bits = state.bits;
+  //---
+
+  _in = have;
+  _out = left;
+  ret = Z_OK;
+
+  inf_leave: // goto emulation
+  for (;;) {
+    switch (state.mode) {
+    case HEAD:
+      if (state.wrap === 0) {
+        state.mode = TYPEDO;
+        break;
+      }
+      //=== NEEDBITS(16);
+      while (bits < 16) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      if ((state.wrap & 2) && hold === 0x8b1f) {  /* gzip header */
+        state.check = 0/*crc32(0L, Z_NULL, 0)*/;
+        //=== CRC2(state.check, hold);
+        hbuf[0] = hold & 0xff;
+        hbuf[1] = (hold >>> 8) & 0xff;
+        state.check = crc32(state.check, hbuf, 2, 0);
+        //===//
+
+        //=== INITBITS();
+        hold = 0;
+        bits = 0;
+        //===//
+        state.mode = FLAGS;
+        break;
+      }
+      state.flags = 0;           /* expect zlib header */
+      if (state.head) {
+        state.head.done = false;
+      }
+      if (!(state.wrap & 1) ||   /* check if zlib header allowed */
+        (((hold & 0xff)/*BITS(8)*/ << 8) + (hold >> 8)) % 31) {
+        strm.msg = 'incorrect header check';
+        state.mode = BAD;
+        break;
+      }
+      if ((hold & 0x0f)/*BITS(4)*/ !== Z_DEFLATED) {
+        strm.msg = 'unknown compression method';
+        state.mode = BAD;
+        break;
+      }
+      //--- DROPBITS(4) ---//
+      hold >>>= 4;
+      bits -= 4;
+      //---//
+      len = (hold & 0x0f)/*BITS(4)*/ + 8;
+      if (state.wbits === 0) {
+        state.wbits = len;
+      }
+      else if (len > state.wbits) {
+        strm.msg = 'invalid window size';
+        state.mode = BAD;
+        break;
+      }
+      state.dmax = 1 << len;
+      //Tracev((stderr, "inflate:   zlib header ok\n"));
+      strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
+      state.mode = hold & 0x200 ? DICTID : TYPE;
+      //=== INITBITS();
+      hold = 0;
+      bits = 0;
+      //===//
+      break;
+    case FLAGS:
+      //=== NEEDBITS(16); */
+      while (bits < 16) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      state.flags = hold;
+      if ((state.flags & 0xff) !== Z_DEFLATED) {
+        strm.msg = 'unknown compression method';
+        state.mode = BAD;
+        break;
+      }
+      if (state.flags & 0xe000) {
+        strm.msg = 'unknown header flags set';
+        state.mode = BAD;
+        break;
+      }
+      if (state.head) {
+        state.head.text = ((hold >> 8) & 1);
+      }
+      if (state.flags & 0x0200) {
+        //=== CRC2(state.check, hold);
+        hbuf[0] = hold & 0xff;
+        hbuf[1] = (hold >>> 8) & 0xff;
+        state.check = crc32(state.check, hbuf, 2, 0);
+        //===//
+      }
+      //=== INITBITS();
+      hold = 0;
+      bits = 0;
+      //===//
+      state.mode = TIME;
+      /* falls through */
+    case TIME:
+      //=== NEEDBITS(32); */
+      while (bits < 32) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      if (state.head) {
+        state.head.time = hold;
+      }
+      if (state.flags & 0x0200) {
+        //=== CRC4(state.check, hold)
+        hbuf[0] = hold & 0xff;
+        hbuf[1] = (hold >>> 8) & 0xff;
+        hbuf[2] = (hold >>> 16) & 0xff;
+        hbuf[3] = (hold >>> 24) & 0xff;
+        state.check = crc32(state.check, hbuf, 4, 0);
+        //===
+      }
+      //=== INITBITS();
+      hold = 0;
+      bits = 0;
+      //===//
+      state.mode = OS;
+      /* falls through */
+    case OS:
+      //=== NEEDBITS(16); */
+      while (bits < 16) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      if (state.head) {
+        state.head.xflags = (hold & 0xff);
+        state.head.os = (hold >> 8);
+      }
+      if (state.flags & 0x0200) {
+        //=== CRC2(state.check, hold);
+        hbuf[0] = hold & 0xff;
+        hbuf[1] = (hold >>> 8) & 0xff;
+        state.check = crc32(state.check, hbuf, 2, 0);
+        //===//
+      }
+      //=== INITBITS();
+      hold = 0;
+      bits = 0;
+      //===//
+      state.mode = EXLEN;
+      /* falls through */
+    case EXLEN:
+      if (state.flags & 0x0400) {
+        //=== NEEDBITS(16); */
+        while (bits < 16) {
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+        }
+        //===//
+        state.length = hold;
+        if (state.head) {
+          state.head.extra_len = hold;
+        }
+        if (state.flags & 0x0200) {
+          //=== CRC2(state.check, hold);
+          hbuf[0] = hold & 0xff;
+          hbuf[1] = (hold >>> 8) & 0xff;
+          state.check = crc32(state.check, hbuf, 2, 0);
+          //===//
+        }
+        //=== INITBITS();
+        hold = 0;
+        bits = 0;
+        //===//
+      }
+      else if (state.head) {
+        state.head.extra = null/*Z_NULL*/;
+      }
+      state.mode = EXTRA;
+      /* falls through */
+    case EXTRA:
+      if (state.flags & 0x0400) {
+        copy = state.length;
+        if (copy > have) { copy = have; }
+        if (copy) {
+          if (state.head) {
+            len = state.head.extra_len - state.length;
+            if (!state.head.extra) {
+              // Use untyped array for more conveniend processing later
+              state.head.extra = new Array(state.head.extra_len);
+            }
+            utils.arraySet(
+              state.head.extra,
+              input,
+              next,
+              // extra field is limited to 65536 bytes
+              // - no need for additional size check
+              copy,
+              /*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/
+              len
+            );
+            //zmemcpy(state.head.extra + len, next,
+            //        len + copy > state.head.extra_max ?
+            //        state.head.extra_max - len : copy);
+          }
+          if (state.flags & 0x0200) {
+            state.check = crc32(state.check, input, copy, next);
+          }
+          have -= copy;
+          next += copy;
+          state.length -= copy;
+        }
+        if (state.length) { break inf_leave; }
+      }
+      state.length = 0;
+      state.mode = NAME;
+      /* falls through */
+    case NAME:
+      if (state.flags & 0x0800) {
+        if (have === 0) { break inf_leave; }
+        copy = 0;
+        do {
+          // TODO: 2 or 1 bytes?
+          len = input[next + copy++];
+          /* use constant limit because in js we should not preallocate memory */
+          if (state.head && len &&
+              (state.length < 65536 /*state.head.name_max*/)) {
+            state.head.name += String.fromCharCode(len);
+          }
+        } while (len && copy < have);
+
+        if (state.flags & 0x0200) {
+          state.check = crc32(state.check, input, copy, next);
+        }
+        have -= copy;
+        next += copy;
+        if (len) { break inf_leave; }
+      }
+      else if (state.head) {
+        state.head.name = null;
+      }
+      state.length = 0;
+      state.mode = COMMENT;
+      /* falls through */
+    case COMMENT:
+      if (state.flags & 0x1000) {
+        if (have === 0) { break inf_leave; }
+        copy = 0;
+        do {
+          len = input[next + copy++];
+          /* use constant limit because in js we should not preallocate memory */
+          if (state.head && len &&
+              (state.length < 65536 /*state.head.comm_max*/)) {
+            state.head.comment += String.fromCharCode(len);
+          }
+        } while (len && copy < have);
+        if (state.flags & 0x0200) {
+          state.check = crc32(state.check, input, copy, next);
+        }
+        have -= copy;
+        next += copy;
+        if (len) { break inf_leave; }
+      }
+      else if (state.head) {
+        state.head.comment = null;
+      }
+      state.mode = HCRC;
+      /* falls through */
+    case HCRC:
+      if (state.flags & 0x0200) {
+        //=== NEEDBITS(16); */
+        while (bits < 16) {
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+        }
+        //===//
+        if (hold !== (state.check & 0xffff)) {
+          strm.msg = 'header crc mismatch';
+          state.mode = BAD;
+          break;
+        }
+        //=== INITBITS();
+        hold = 0;
+        bits = 0;
+        //===//
+      }
+      if (state.head) {
+        state.head.hcrc = ((state.flags >> 9) & 1);
+        state.head.done = true;
+      }
+      strm.adler = state.check = 0;
+      state.mode = TYPE;
+      break;
+    case DICTID:
+      //=== NEEDBITS(32); */
+      while (bits < 32) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      strm.adler = state.check = zswap32(hold);
+      //=== INITBITS();
+      hold = 0;
+      bits = 0;
+      //===//
+      state.mode = DICT;
+      /* falls through */
+    case DICT:
+      if (state.havedict === 0) {
+        //--- RESTORE() ---
+        strm.next_out = put;
+        strm.avail_out = left;
+        strm.next_in = next;
+        strm.avail_in = have;
+        state.hold = hold;
+        state.bits = bits;
+        //---
+        return Z_NEED_DICT;
+      }
+      strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
+      state.mode = TYPE;
+      /* falls through */
+    case TYPE:
+      if (flush === Z_BLOCK || flush === Z_TREES) { break inf_leave; }
+      /* falls through */
+    case TYPEDO:
+      if (state.last) {
+        //--- BYTEBITS() ---//
+        hold >>>= bits & 7;
+        bits -= bits & 7;
+        //---//
+        state.mode = CHECK;
+        break;
+      }
+      //=== NEEDBITS(3); */
+      while (bits < 3) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      state.last = (hold & 0x01)/*BITS(1)*/;
+      //--- DROPBITS(1) ---//
+      hold >>>= 1;
+      bits -= 1;
+      //---//
+
+      switch ((hold & 0x03)/*BITS(2)*/) {
+      case 0:                             /* stored block */
+        //Tracev((stderr, "inflate:     stored block%s\n",
+        //        state.last ? " (last)" : ""));
+        state.mode = STORED;
+        break;
+      case 1:                             /* fixed block */
+        fixedtables(state);
+        //Tracev((stderr, "inflate:     fixed codes block%s\n",
+        //        state.last ? " (last)" : ""));
+        state.mode = LEN_;             /* decode codes */
+        if (flush === Z_TREES) {
+          //--- DROPBITS(2) ---//
+          hold >>>= 2;
+          bits -= 2;
+          //---//
+          break inf_leave;
+        }
+        break;
+      case 2:                             /* dynamic block */
+        //Tracev((stderr, "inflate:     dynamic codes block%s\n",
+        //        state.last ? " (last)" : ""));
+        state.mode = TABLE;
+        break;
+      case 3:
+        strm.msg = 'invalid block type';
+        state.mode = BAD;
+      }
+      //--- DROPBITS(2) ---//
+      hold >>>= 2;
+      bits -= 2;
+      //---//
+      break;
+    case STORED:
+      //--- BYTEBITS() ---// /* go to byte boundary */
+      hold >>>= bits & 7;
+      bits -= bits & 7;
+      //---//
+      //=== NEEDBITS(32); */
+      while (bits < 32) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      if ((hold & 0xffff) !== ((hold >>> 16) ^ 0xffff)) {
+        strm.msg = 'invalid stored block lengths';
+        state.mode = BAD;
+        break;
+      }
+      state.length = hold & 0xffff;
+      //Tracev((stderr, "inflate:       stored length %u\n",
+      //        state.length));
+      //=== INITBITS();
+      hold = 0;
+      bits = 0;
+      //===//
+      state.mode = COPY_;
+      if (flush === Z_TREES) { break inf_leave; }
+      /* falls through */
+    case COPY_:
+      state.mode = COPY;
+      /* falls through */
+    case COPY:
+      copy = state.length;
+      if (copy) {
+        if (copy > have) { copy = have; }
+        if (copy > left) { copy = left; }
+        if (copy === 0) { break inf_leave; }
+        //--- zmemcpy(put, next, copy); ---
+        utils.arraySet(output, input, next, copy, put);
+        //---//
+        have -= copy;
+        next += copy;
+        left -= copy;
+        put += copy;
+        state.length -= copy;
+        break;
+      }
+      //Tracev((stderr, "inflate:       stored end\n"));
+      state.mode = TYPE;
+      break;
+    case TABLE:
+      //=== NEEDBITS(14); */
+      while (bits < 14) {
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+      }
+      //===//
+      state.nlen = (hold & 0x1f)/*BITS(5)*/ + 257;
+      //--- DROPBITS(5) ---//
+      hold >>>= 5;
+      bits -= 5;
+      //---//
+      state.ndist = (hold & 0x1f)/*BITS(5)*/ + 1;
+      //--- DROPBITS(5) ---//
+      hold >>>= 5;
+      bits -= 5;
+      //---//
+      state.ncode = (hold & 0x0f)/*BITS(4)*/ + 4;
+      //--- DROPBITS(4) ---//
+      hold >>>= 4;
+      bits -= 4;
+      //---//
+//#ifndef PKZIP_BUG_WORKAROUND
+      if (state.nlen > 286 || state.ndist > 30) {
+        strm.msg = 'too many length or distance symbols';
+        state.mode = BAD;
+        break;
+      }
+//#endif
+      //Tracev((stderr, "inflate:       table sizes ok\n"));
+      state.have = 0;
+      state.mode = LENLENS;
+      /* falls through */
+    case LENLENS:
+      while (state.have < state.ncode) {
+        //=== NEEDBITS(3);
+        while (bits < 3) {
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+        }
+        //===//
+        state.lens[order[state.have++]] = (hold & 0x07);//BITS(3);
+        //--- DROPBITS(3) ---//
+        hold >>>= 3;
+        bits -= 3;
+        //---//
+      }
+      while (state.have < 19) {
+        state.lens[order[state.have++]] = 0;
+      }
+      // We have separate tables & no pointers. 2 commented lines below not needed.
+      //state.next = state.codes;
+      //state.lencode = state.next;
+      // Switch to use dynamic table
+      state.lencode = state.lendyn;
+      state.lenbits = 7;
+
+      opts = { bits: state.lenbits };
+      ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts);
+      state.lenbits = opts.bits;
+
+      if (ret) {
+        strm.msg = 'invalid code lengths set';
+        state.mode = BAD;
+        break;
+      }
+      //Tracev((stderr, "inflate:       code lengths ok\n"));
+      state.have = 0;
+      state.mode = CODELENS;
+      /* falls through */
+    case CODELENS:
+      while (state.have < state.nlen + state.ndist) {
+        for (;;) {
+          here = state.lencode[hold & ((1 << state.lenbits) - 1)];/*BITS(state.lenbits)*/
+          here_bits = here >>> 24;
+          here_op = (here >>> 16) & 0xff;
+          here_val = here & 0xffff;
+
+          if ((here_bits) <= bits) { break; }
+          //--- PULLBYTE() ---//
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+          //---//
+        }
+        if (here_val < 16) {
+          //--- DROPBITS(here.bits) ---//
+          hold >>>= here_bits;
+          bits -= here_bits;
+          //---//
+          state.lens[state.have++] = here_val;
+        }
+        else {
+          if (here_val === 16) {
+            //=== NEEDBITS(here.bits + 2);
+            n = here_bits + 2;
+            while (bits < n) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            //--- DROPBITS(here.bits) ---//
+            hold >>>= here_bits;
+            bits -= here_bits;
+            //---//
+            if (state.have === 0) {
+              strm.msg = 'invalid bit length repeat';
+              state.mode = BAD;
+              break;
+            }
+            len = state.lens[state.have - 1];
+            copy = 3 + (hold & 0x03);//BITS(2);
+            //--- DROPBITS(2) ---//
+            hold >>>= 2;
+            bits -= 2;
+            //---//
+          }
+          else if (here_val === 17) {
+            //=== NEEDBITS(here.bits + 3);
+            n = here_bits + 3;
+            while (bits < n) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            //--- DROPBITS(here.bits) ---//
+            hold >>>= here_bits;
+            bits -= here_bits;
+            //---//
+            len = 0;
+            copy = 3 + (hold & 0x07);//BITS(3);
+            //--- DROPBITS(3) ---//
+            hold >>>= 3;
+            bits -= 3;
+            //---//
+          }
+          else {
+            //=== NEEDBITS(here.bits + 7);
+            n = here_bits + 7;
+            while (bits < n) {
+              if (have === 0) { break inf_leave; }
+              have--;
+              hold += input[next++] << bits;
+              bits += 8;
+            }
+            //===//
+            //--- DROPBITS(here.bits) ---//
+            hold >>>= here_bits;
+            bits -= here_bits;
+            //---//
+            len = 0;
+            copy = 11 + (hold & 0x7f);//BITS(7);
+            //--- DROPBITS(7) ---//
+            hold >>>= 7;
+            bits -= 7;
+            //---//
+          }
+          if (state.have + copy > state.nlen + state.ndist) {
+            strm.msg = 'invalid bit length repeat';
+            state.mode = BAD;
+            break;
+          }
+          while (copy--) {
+            state.lens[state.have++] = len;
+          }
+        }
+      }
+
+      /* handle error breaks in while */
+      if (state.mode === BAD) { break; }
+
+      /* check for end-of-block code (better have one) */
+      if (state.lens[256] === 0) {
+        strm.msg = 'invalid code -- missing end-of-block';
+        state.mode = BAD;
+        break;
+      }
+
+      /* build code tables -- note: do not change the lenbits or distbits
+         values here (9 and 6) without reading the comments in inftrees.h
+         concerning the ENOUGH constants, which depend on those values */
+      state.lenbits = 9;
+
+      opts = { bits: state.lenbits };
+      ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts);
+      // We have separate tables & no pointers. 2 commented lines below not needed.
+      // state.next_index = opts.table_index;
+      state.lenbits = opts.bits;
+      // state.lencode = state.next;
+
+      if (ret) {
+        strm.msg = 'invalid literal/lengths set';
+        state.mode = BAD;
+        break;
+      }
+
+      state.distbits = 6;
+      //state.distcode.copy(state.codes);
+      // Switch to use dynamic table
+      state.distcode = state.distdyn;
+      opts = { bits: state.distbits };
+      ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts);
+      // We have separate tables & no pointers. 2 commented lines below not needed.
+      // state.next_index = opts.table_index;
+      state.distbits = opts.bits;
+      // state.distcode = state.next;
+
+      if (ret) {
+        strm.msg = 'invalid distances set';
+        state.mode = BAD;
+        break;
+      }
+      //Tracev((stderr, 'inflate:       codes ok\n'));
+      state.mode = LEN_;
+      if (flush === Z_TREES) { break inf_leave; }
+      /* falls through */
+    case LEN_:
+      state.mode = LEN;
+      /* falls through */
+    case LEN:
+      if (have >= 6 && left >= 258) {
+        //--- RESTORE() ---
+        strm.next_out = put;
+        strm.avail_out = left;
+        strm.next_in = next;
+        strm.avail_in = have;
+        state.hold = hold;
+        state.bits = bits;
+        //---
+        inflate_fast(strm, _out);
+        //--- LOAD() ---
+        put = strm.next_out;
+        output = strm.output;
+        left = strm.avail_out;
+        next = strm.next_in;
+        input = strm.input;
+        have = strm.avail_in;
+        hold = state.hold;
+        bits = state.bits;
+        //---
+
+        if (state.mode === TYPE) {
+          state.back = -1;
+        }
+        break;
+      }
+      state.back = 0;
+      for (;;) {
+        here = state.lencode[hold & ((1 << state.lenbits) - 1)];  /*BITS(state.lenbits)*/
+        here_bits = here >>> 24;
+        here_op = (here >>> 16) & 0xff;
+        here_val = here & 0xffff;
+
+        if (here_bits <= bits) { break; }
+        //--- PULLBYTE() ---//
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+        //---//
+      }
+      if (here_op && (here_op & 0xf0) === 0) {
+        last_bits = here_bits;
+        last_op = here_op;
+        last_val = here_val;
+        for (;;) {
+          here = state.lencode[last_val +
+                  ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)];
+          here_bits = here >>> 24;
+          here_op = (here >>> 16) & 0xff;
+          here_val = here & 0xffff;
+
+          if ((last_bits + here_bits) <= bits) { break; }
+          //--- PULLBYTE() ---//
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+          //---//
+        }
+        //--- DROPBITS(last.bits) ---//
+        hold >>>= last_bits;
+        bits -= last_bits;
+        //---//
+        state.back += last_bits;
+      }
+      //--- DROPBITS(here.bits) ---//
+      hold >>>= here_bits;
+      bits -= here_bits;
+      //---//
+      state.back += here_bits;
+      state.length = here_val;
+      if (here_op === 0) {
+        //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+        //        "inflate:         literal '%c'\n" :
+        //        "inflate:         literal 0x%02x\n", here.val));
+        state.mode = LIT;
+        break;
+      }
+      if (here_op & 32) {
+        //Tracevv((stderr, "inflate:         end of block\n"));
+        state.back = -1;
+        state.mode = TYPE;
+        break;
+      }
+      if (here_op & 64) {
+        strm.msg = 'invalid literal/length code';
+        state.mode = BAD;
+        break;
+      }
+      state.extra = here_op & 15;
+      state.mode = LENEXT;
+      /* falls through */
+    case LENEXT:
+      if (state.extra) {
+        //=== NEEDBITS(state.extra);
+        n = state.extra;
+        while (bits < n) {
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+        }
+        //===//
+        state.length += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/;
+        //--- DROPBITS(state.extra) ---//
+        hold >>>= state.extra;
+        bits -= state.extra;
+        //---//
+        state.back += state.extra;
+      }
+      //Tracevv((stderr, "inflate:         length %u\n", state.length));
+      state.was = state.length;
+      state.mode = DIST;
+      /* falls through */
+    case DIST:
+      for (;;) {
+        here = state.distcode[hold & ((1 << state.distbits) - 1)];/*BITS(state.distbits)*/
+        here_bits = here >>> 24;
+        here_op = (here >>> 16) & 0xff;
+        here_val = here & 0xffff;
+
+        if ((here_bits) <= bits) { break; }
+        //--- PULLBYTE() ---//
+        if (have === 0) { break inf_leave; }
+        have--;
+        hold += input[next++] << bits;
+        bits += 8;
+        //---//
+      }
+      if ((here_op & 0xf0) === 0) {
+        last_bits = here_bits;
+        last_op = here_op;
+        last_val = here_val;
+        for (;;) {
+          here = state.distcode[last_val +
+                  ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)];
+          here_bits = here >>> 24;
+          here_op = (here >>> 16) & 0xff;
+          here_val = here & 0xffff;
+
+          if ((last_bits + here_bits) <= bits) { break; }
+          //--- PULLBYTE() ---//
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+          //---//
+        }
+        //--- DROPBITS(last.bits) ---//
+        hold >>>= last_bits;
+        bits -= last_bits;
+        //---//
+        state.back += last_bits;
+      }
+      //--- DROPBITS(here.bits) ---//
+      hold >>>= here_bits;
+      bits -= here_bits;
+      //---//
+      state.back += here_bits;
+      if (here_op & 64) {
+        strm.msg = 'invalid distance code';
+        state.mode = BAD;
+        break;
+      }
+      state.offset = here_val;
+      state.extra = (here_op) & 15;
+      state.mode = DISTEXT;
+      /* falls through */
+    case DISTEXT:
+      if (state.extra) {
+        //=== NEEDBITS(state.extra);
+        n = state.extra;
+        while (bits < n) {
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+        }
+        //===//
+        state.offset += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/;
+        //--- DROPBITS(state.extra) ---//
+        hold >>>= state.extra;
+        bits -= state.extra;
+        //---//
+        state.back += state.extra;
+      }
+//#ifdef INFLATE_STRICT
+      if (state.offset > state.dmax) {
+        strm.msg = 'invalid distance too far back';
+        state.mode = BAD;
+        break;
+      }
+//#endif
+      //Tracevv((stderr, "inflate:         distance %u\n", state.offset));
+      state.mode = MATCH;
+      /* falls through */
+    case MATCH:
+      if (left === 0) { break inf_leave; }
+      copy = _out - left;
+      if (state.offset > copy) {         /* copy from window */
+        copy = state.offset - copy;
+        if (copy > state.whave) {
+          if (state.sane) {
+            strm.msg = 'invalid distance too far back';
+            state.mode = BAD;
+            break;
+          }
+// (!) This block is disabled in zlib defailts,
+// don't enable it for binary compatibility
+//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+//          Trace((stderr, "inflate.c too far\n"));
+//          copy -= state.whave;
+//          if (copy > state.length) { copy = state.length; }
+//          if (copy > left) { copy = left; }
+//          left -= copy;
+//          state.length -= copy;
+//          do {
+//            output[put++] = 0;
+//          } while (--copy);
+//          if (state.length === 0) { state.mode = LEN; }
+//          break;
+//#endif
+        }
+        if (copy > state.wnext) {
+          copy -= state.wnext;
+          from = state.wsize - copy;
+        }
+        else {
+          from = state.wnext - copy;
+        }
+        if (copy > state.length) { copy = state.length; }
+        from_source = state.window;
+      }
+      else {                              /* copy from output */
+        from_source = output;
+        from = put - state.offset;
+        copy = state.length;
+      }
+      if (copy > left) { copy = left; }
+      left -= copy;
+      state.length -= copy;
+      do {
+        output[put++] = from_source[from++];
+      } while (--copy);
+      if (state.length === 0) { state.mode = LEN; }
+      break;
+    case LIT:
+      if (left === 0) { break inf_leave; }
+      output[put++] = state.length;
+      left--;
+      state.mode = LEN;
+      break;
+    case CHECK:
+      if (state.wrap) {
+        //=== NEEDBITS(32);
+        while (bits < 32) {
+          if (have === 0) { break inf_leave; }
+          have--;
+          // Use '|' insdead of '+' to make sure that result is signed
+          hold |= input[next++] << bits;
+          bits += 8;
+        }
+        //===//
+        _out -= left;
+        strm.total_out += _out;
+        state.total += _out;
+        if (_out) {
+          strm.adler = state.check =
+              /*UPDATE(state.check, put - _out, _out);*/
+              (state.flags ? crc32(state.check, output, _out, put - _out) : adler32(state.check, output, _out, put - _out));
+
+        }
+        _out = left;
+        // NB: crc32 stored as signed 32-bit int, zswap32 returns signed too
+        if ((state.flags ? hold : zswap32(hold)) !== state.check) {
+          strm.msg = 'incorrect data check';
+          state.mode = BAD;
+          break;
+        }
+        //=== INITBITS();
+        hold = 0;
+        bits = 0;
+        //===//
+        //Tracev((stderr, "inflate:   check matches trailer\n"));
+      }
+      state.mode = LENGTH;
+      /* falls through */
+    case LENGTH:
+      if (state.wrap && state.flags) {
+        //=== NEEDBITS(32);
+        while (bits < 32) {
+          if (have === 0) { break inf_leave; }
+          have--;
+          hold += input[next++] << bits;
+          bits += 8;
+        }
+        //===//
+        if (hold !== (state.total & 0xffffffff)) {
+          strm.msg = 'incorrect length check';
+          state.mode = BAD;
+          break;
+        }
+        //=== INITBITS();
+        hold = 0;
+        bits = 0;
+        //===//
+        //Tracev((stderr, "inflate:   length matches trailer\n"));
+      }
+      state.mode = DONE;
+      /* falls through */
+    case DONE:
+      ret = Z_STREAM_END;
+      break inf_leave;
+    case BAD:
+      ret = Z_DATA_ERROR;
+      break inf_leave;
+    case MEM:
+      return Z_MEM_ERROR;
+    case SYNC:
+      /* falls through */
+    default:
+      return Z_STREAM_ERROR;
+    }
+  }
+
+  // inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave"
+
+  /*
+     Return from inflate(), updating the total counts and the check value.
+     If there was no progress during the inflate() call, return a buffer
+     error.  Call updatewindow() to create and/or update the window state.
+     Note: a memory error from inflate() is non-recoverable.
+   */
+
+  //--- RESTORE() ---
+  strm.next_out = put;
+  strm.avail_out = left;
+  strm.next_in = next;
+  strm.avail_in = have;
+  state.hold = hold;
+  state.bits = bits;
+  //---
+
+  if (state.wsize || (_out !== strm.avail_out && state.mode < BAD &&
+                      (state.mode < CHECK || flush !== Z_FINISH))) {
+    if (updatewindow(strm, strm.output, strm.next_out, _out - strm.avail_out)) {
+      state.mode = MEM;
+      return Z_MEM_ERROR;
+    }
+  }
+  _in -= strm.avail_in;
+  _out -= strm.avail_out;
+  strm.total_in += _in;
+  strm.total_out += _out;
+  state.total += _out;
+  if (state.wrap && _out) {
+    strm.adler = state.check = /*UPDATE(state.check, strm.next_out - _out, _out);*/
+      (state.flags ? crc32(state.check, output, _out, strm.next_out - _out) : adler32(state.check, output, _out, strm.next_out - _out));
+  }
+  strm.data_type = state.bits + (state.last ? 64 : 0) +
+                    (state.mode === TYPE ? 128 : 0) +
+                    (state.mode === LEN_ || state.mode === COPY_ ? 256 : 0);
+  if (((_in === 0 && _out === 0) || flush === Z_FINISH) && ret === Z_OK) {
+    ret = Z_BUF_ERROR;
+  }
+  return ret;
+}
+
+function inflateEnd(strm) {
+
+  if (!strm || !strm.state /*|| strm->zfree == (free_func)0*/) {
+    return Z_STREAM_ERROR;
+  }
+
+  var state = strm.state;
+  if (state.window) {
+    state.window = null;
+  }
+  strm.state = null;
+  return Z_OK;
+}
+
+function inflateGetHeader(strm, head) {
+  var state;
+
+  /* check state */
+  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
+  state = strm.state;
+  if ((state.wrap & 2) === 0) { return Z_STREAM_ERROR; }
+
+  /* save header structure */
+  state.head = head;
+  head.done = false;
+  return Z_OK;
+}
+
+function inflateSetDictionary(strm, dictionary) {
+  var dictLength = dictionary.length;
+
+  var state;
+  var dictid;
+  var ret;
+
+  /* check state */
+  if (!strm /* == Z_NULL */ || !strm.state /* == Z_NULL */) { return Z_STREAM_ERROR; }
+  state = strm.state;
+
+  if (state.wrap !== 0 && state.mode !== DICT) {
+    return Z_STREAM_ERROR;
+  }
+
+  /* check for correct dictionary identifier */
+  if (state.mode === DICT) {
+    dictid = 1; /* adler32(0, null, 0)*/
+    /* dictid = adler32(dictid, dictionary, dictLength); */
+    dictid = adler32(dictid, dictionary, dictLength, 0);
+    if (dictid !== state.check) {
+      return Z_DATA_ERROR;
+    }
+  }
+  /* copy dictionary to window using updatewindow(), which will amend the
+   existing dictionary if appropriate */
+  ret = updatewindow(strm, dictionary, dictLength, dictLength);
+  if (ret) {
+    state.mode = MEM;
+    return Z_MEM_ERROR;
+  }
+  state.havedict = 1;
+  // Tracev((stderr, "inflate:   dictionary set\n"));
+  return Z_OK;
+}
+
+exports.inflateReset = inflateReset;
+exports.inflateReset2 = inflateReset2;
+exports.inflateResetKeep = inflateResetKeep;
+exports.inflateInit = inflateInit;
+exports.inflateInit2 = inflateInit2;
+exports.inflate = inflate;
+exports.inflateEnd = inflateEnd;
+exports.inflateGetHeader = inflateGetHeader;
+exports.inflateSetDictionary = inflateSetDictionary;
+exports.inflateInfo = 'pako inflate (from Nodeca project)';
+
+/* Not implemented
+exports.inflateCopy = inflateCopy;
+exports.inflateGetDictionary = inflateGetDictionary;
+exports.inflateMark = inflateMark;
+exports.inflatePrime = inflatePrime;
+exports.inflateSync = inflateSync;
+exports.inflateSyncPoint = inflateSyncPoint;
+exports.inflateUndermine = inflateUndermine;
+*/
+
+},{"../utils/common":41,"./adler32":43,"./crc32":45,"./inffast":48,"./inftrees":50}],50:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+var utils = require('../utils/common');
+
+var MAXBITS = 15;
+var ENOUGH_LENS = 852;
+var ENOUGH_DISTS = 592;
+//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS);
+
+var CODES = 0;
+var LENS = 1;
+var DISTS = 2;
+
+var lbase = [ /* Length codes 257..285 base */
+  3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+  35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+];
+
+var lext = [ /* Length codes 257..285 extra */
+  16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+  19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78
+];
+
+var dbase = [ /* Distance codes 0..29 base */
+  1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+  257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+  8193, 12289, 16385, 24577, 0, 0
+];
+
+var dext = [ /* Distance codes 0..29 extra */
+  16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+  23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+  28, 28, 29, 29, 64, 64
+];
+
+module.exports = function inflate_table(type, lens, lens_index, codes, table, table_index, work, opts)
+{
+  var bits = opts.bits;
+      //here = opts.here; /* table entry for duplication */
+
+  var len = 0;               /* a code's length in bits */
+  var sym = 0;               /* index of code symbols */
+  var min = 0, max = 0;          /* minimum and maximum code lengths */
+  var root = 0;              /* number of index bits for root table */
+  var curr = 0;              /* number of index bits for current table */
+  var drop = 0;              /* code bits to drop for sub-table */
+  var left = 0;                   /* number of prefix codes available */
+  var used = 0;              /* code entries in table used */
+  var huff = 0;              /* Huffman code */
+  var incr;              /* for incrementing code, index */
+  var fill;              /* index for replicating entries */
+  var low;               /* low bits for current root entry */
+  var mask;              /* mask for low root bits */
+  var next;             /* next available space in table */
+  var base = null;     /* base value table to use */
+  var base_index = 0;
+//  var shoextra;    /* extra bits table to use */
+  var end;                    /* use base and extra for symbol > end */
+  var count = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1];    /* number of codes of each length */
+  var offs = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1];     /* offsets in table for each length */
+  var extra = null;
+  var extra_index = 0;
+
+  var here_bits, here_op, here_val;
+
+  /*
+   Process a set of code lengths to create a canonical Huffman code.  The
+   code lengths are lens[0..codes-1].  Each length corresponds to the
+   symbols 0..codes-1.  The Huffman code is generated by first sorting the
+   symbols by length from short to long, and retaining the symbol order
+   for codes with equal lengths.  Then the code starts with all zero bits
+   for the first code of the shortest length, and the codes are integer
+   increments for the same length, and zeros are appended as the length
+   increases.  For the deflate format, these bits are stored backwards
+   from their more natural integer increment ordering, and so when the
+   decoding tables are built in the large loop below, the integer codes
+   are incremented backwards.
+
+   This routine assumes, but does not check, that all of the entries in
+   lens[] are in the range 0..MAXBITS.  The caller must assure this.
+   1..MAXBITS is interpreted as that code length.  zero means that that
+   symbol does not occur in this code.
+
+   The codes are sorted by computing a count of codes for each length,
+   creating from that a table of starting indices for each length in the
+   sorted table, and then entering the symbols in order in the sorted
+   table.  The sorted table is work[], with that space being provided by
+   the caller.
+
+   The length counts are used for other purposes as well, i.e. finding
+   the minimum and maximum length codes, determining if there are any
+   codes at all, checking for a valid set of lengths, and looking ahead
+   at length counts to determine sub-table sizes when building the
+   decoding tables.
+   */
+
+  /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+  for (len = 0; len <= MAXBITS; len++) {
+    count[len] = 0;
+  }
+  for (sym = 0; sym < codes; sym++) {
+    count[lens[lens_index + sym]]++;
+  }
+
+  /* bound code lengths, force root to be within code lengths */
+  root = bits;
+  for (max = MAXBITS; max >= 1; max--) {
+    if (count[max] !== 0) { break; }
+  }
+  if (root > max) {
+    root = max;
+  }
+  if (max === 0) {                     /* no symbols to code at all */
+    //table.op[opts.table_index] = 64;  //here.op = (var char)64;    /* invalid code marker */
+    //table.bits[opts.table_index] = 1;   //here.bits = (var char)1;
+    //table.val[opts.table_index++] = 0;   //here.val = (var short)0;
+    table[table_index++] = (1 << 24) | (64 << 16) | 0;
+
+
+    //table.op[opts.table_index] = 64;
+    //table.bits[opts.table_index] = 1;
+    //table.val[opts.table_index++] = 0;
+    table[table_index++] = (1 << 24) | (64 << 16) | 0;
+
+    opts.bits = 1;
+    return 0;     /* no symbols, but wait for decoding to report error */
+  }
+  for (min = 1; min < max; min++) {
+    if (count[min] !== 0) { break; }
+  }
+  if (root < min) {
+    root = min;
+  }
+
+  /* check for an over-subscribed or incomplete set of lengths */
+  left = 1;
+  for (len = 1; len <= MAXBITS; len++) {
+    left <<= 1;
+    left -= count[len];
+    if (left < 0) {
+      return -1;
+    }        /* over-subscribed */
+  }
+  if (left > 0 && (type === CODES || max !== 1)) {
+    return -1;                      /* incomplete set */
+  }
+
+  /* generate offsets into symbol table for each length for sorting */
+  offs[1] = 0;
+  for (len = 1; len < MAXBITS; len++) {
+    offs[len + 1] = offs[len] + count[len];
+  }
+
+  /* sort symbols by length, by symbol order within each length */
+  for (sym = 0; sym < codes; sym++) {
+    if (lens[lens_index + sym] !== 0) {
+      work[offs[lens[lens_index + sym]]++] = sym;
+    }
+  }
+
+  /*
+   Create and fill in decoding tables.  In this loop, the table being
+   filled is at next and has curr index bits.  The code being used is huff
+   with length len.  That code is converted to an index by dropping drop
+   bits off of the bottom.  For codes where len is less than drop + curr,
+   those top drop + curr - len bits are incremented through all values to
+   fill the table with replicated entries.
+
+   root is the number of index bits for the root table.  When len exceeds
+   root, sub-tables are created pointed to by the root entry with an index
+   of the low root bits of huff.  This is saved in low to check for when a
+   new sub-table should be started.  drop is zero when the root table is
+   being filled, and drop is root when sub-tables are being filled.
+
+   When a new sub-table is needed, it is necessary to look ahead in the
+   code lengths to determine what size sub-table is needed.  The length
+   counts are used for this, and so count[] is decremented as codes are
+   entered in the tables.
+
+   used keeps track of how many table entries have been allocated from the
+   provided *table space.  It is checked for LENS and DIST tables against
+   the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+   the initial root table size constants.  See the comments in inftrees.h
+   for more information.
+
+   sym increments through all symbols, and the loop terminates when
+   all codes of length max, i.e. all codes, have been processed.  This
+   routine permits incomplete codes, so another loop after this one fills
+   in the rest of the decoding tables with invalid code markers.
+   */
+
+  /* set up for code type */
+  // poor man optimization - use if-else instead of switch,
+  // to avoid deopts in old v8
+  if (type === CODES) {
+    base = extra = work;    /* dummy value--not used */
+    end = 19;
+
+  } else if (type === LENS) {
+    base = lbase;
+    base_index -= 257;
+    extra = lext;
+    extra_index -= 257;
+    end = 256;
+
+  } else {                    /* DISTS */
+    base = dbase;
+    extra = dext;
+    end = -1;
+  }
+
+  /* initialize opts for loop */
+  huff = 0;                   /* starting code */
+  sym = 0;                    /* starting code symbol */
+  len = min;                  /* starting code length */
+  next = table_index;              /* current table to fill in */
+  curr = root;                /* current table index bits */
+  drop = 0;                   /* current bits to drop from code for index */
+  low = -1;                   /* trigger new sub-table when len > root */
+  used = 1 << root;          /* use root table entries */
+  mask = used - 1;            /* mask for comparing low */
+
+  /* check available table space */
+  if ((type === LENS && used > ENOUGH_LENS) ||
+    (type === DISTS && used > ENOUGH_DISTS)) {
+    return 1;
+  }
+
+  /* process all codes and make table entries */
+  for (;;) {
+    /* create table entry */
+    here_bits = len - drop;
+    if (work[sym] < end) {
+      here_op = 0;
+      here_val = work[sym];
+    }
+    else if (work[sym] > end) {
+      here_op = extra[extra_index + work[sym]];
+      here_val = base[base_index + work[sym]];
+    }
+    else {
+      here_op = 32 + 64;         /* end of block */
+      here_val = 0;
+    }
+
+    /* replicate for those indices with low len bits equal to huff */
+    incr = 1 << (len - drop);
+    fill = 1 << curr;
+    min = fill;                 /* save offset to next table */
+    do {
+      fill -= incr;
+      table[next + (huff >> drop) + fill] = (here_bits << 24) | (here_op << 16) | here_val |0;
+    } while (fill !== 0);
+
+    /* backwards increment the len-bit code huff */
+    incr = 1 << (len - 1);
+    while (huff & incr) {
+      incr >>= 1;
+    }
+    if (incr !== 0) {
+      huff &= incr - 1;
+      huff += incr;
+    } else {
+      huff = 0;
+    }
+
+    /* go to next symbol, update count, len */
+    sym++;
+    if (--count[len] === 0) {
+      if (len === max) { break; }
+      len = lens[lens_index + work[sym]];
+    }
+
+    /* create new sub-table if needed */
+    if (len > root && (huff & mask) !== low) {
+      /* if first time, transition to sub-tables */
+      if (drop === 0) {
+        drop = root;
+      }
+
+      /* increment past last table */
+      next += min;            /* here min is 1 << curr */
+
+      /* determine length of next table */
+      curr = len - drop;
+      left = 1 << curr;
+      while (curr + drop < max) {
+        left -= count[curr + drop];
+        if (left <= 0) { break; }
+        curr++;
+        left <<= 1;
+      }
+
+      /* check for enough space */
+      used += 1 << curr;
+      if ((type === LENS && used > ENOUGH_LENS) ||
+        (type === DISTS && used > ENOUGH_DISTS)) {
+        return 1;
+      }
+
+      /* point entry in root table to sub-table */
+      low = huff & mask;
+      /*table.op[low] = curr;
+      table.bits[low] = root;
+      table.val[low] = next - opts.table_index;*/
+      table[low] = (root << 24) | (curr << 16) | (next - table_index) |0;
+    }
+  }
+
+  /* fill in remaining table entry if code is incomplete (guaranteed to have
+   at most one remaining entry, since if the code is incomplete, the
+   maximum code length that was allowed to get this far is one bit) */
+  if (huff !== 0) {
+    //table.op[next + huff] = 64;            /* invalid code marker */
+    //table.bits[next + huff] = len - drop;
+    //table.val[next + huff] = 0;
+    table[next + huff] = ((len - drop) << 24) | (64 << 16) |0;
+  }
+
+  /* set return parameters */
+  //opts.table_index += used;
+  opts.bits = root;
+  return 0;
+};
+
+},{"../utils/common":41}],51:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+module.exports = {
+  2:      'need dictionary',     /* Z_NEED_DICT       2  */
+  1:      'stream end',          /* Z_STREAM_END      1  */
+  0:      '',                    /* Z_OK              0  */
+  '-1':   'file error',          /* Z_ERRNO         (-1) */
+  '-2':   'stream error',        /* Z_STREAM_ERROR  (-2) */
+  '-3':   'data error',          /* Z_DATA_ERROR    (-3) */
+  '-4':   'insufficient memory', /* Z_MEM_ERROR     (-4) */
+  '-5':   'buffer error',        /* Z_BUF_ERROR     (-5) */
+  '-6':   'incompatible version' /* Z_VERSION_ERROR (-6) */
+};
+
+},{}],52:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+var utils = require('../utils/common');
+
+/* Public constants ==========================================================*/
+/* ===========================================================================*/
+
+
+//var Z_FILTERED          = 1;
+//var Z_HUFFMAN_ONLY      = 2;
+//var Z_RLE               = 3;
+var Z_FIXED               = 4;
+//var Z_DEFAULT_STRATEGY  = 0;
+
+/* Possible values of the data_type field (though see inflate()) */
+var Z_BINARY              = 0;
+var Z_TEXT                = 1;
+//var Z_ASCII             = 1; // = Z_TEXT
+var Z_UNKNOWN             = 2;
+
+/*============================================================================*/
+
+
+function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
+
+// From zutil.h
+
+var STORED_BLOCK = 0;
+var STATIC_TREES = 1;
+var DYN_TREES    = 2;
+/* The three kinds of block type */
+
+var MIN_MATCH    = 3;
+var MAX_MATCH    = 258;
+/* The minimum and maximum match lengths */
+
+// From deflate.h
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+var LENGTH_CODES  = 29;
+/* number of length codes, not counting the special END_BLOCK code */
+
+var LITERALS      = 256;
+/* number of literal bytes 0..255 */
+
+var L_CODES       = LITERALS + 1 + LENGTH_CODES;
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+var D_CODES       = 30;
+/* number of distance codes */
+
+var BL_CODES      = 19;
+/* number of codes used to transfer the bit lengths */
+
+var HEAP_SIZE     = 2 * L_CODES + 1;
+/* maximum heap size */
+
+var MAX_BITS      = 15;
+/* All codes must not exceed MAX_BITS bits */
+
+var Buf_size      = 16;
+/* size of bit buffer in bi_buf */
+
+
+/* ===========================================================================
+ * Constants
+ */
+
+var MAX_BL_BITS = 7;
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+var END_BLOCK   = 256;
+/* end of block literal code */
+
+var REP_3_6     = 16;
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+var REPZ_3_10   = 17;
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+var REPZ_11_138 = 18;
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+/* eslint-disable comma-spacing,array-bracket-spacing */
+var extra_lbits =   /* extra bits for each length code */
+  [0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0];
+
+var extra_dbits =   /* extra bits for each distance code */
+  [0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13];
+
+var extra_blbits =  /* extra bits for each bit length code */
+  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7];
+
+var bl_order =
+  [16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];
+/* eslint-enable comma-spacing,array-bracket-spacing */
+
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+// We pre-fill arrays with 0 to avoid uninitialized gaps
+
+var DIST_CODE_LEN = 512; /* see definition of array dist_code below */
+
+// !!!! Use flat array insdead of structure, Freq = i*2, Len = i*2+1
+var static_ltree  = new Array((L_CODES + 2) * 2);
+zero(static_ltree);
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+var static_dtree  = new Array(D_CODES * 2);
+zero(static_dtree);
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+var _dist_code    = new Array(DIST_CODE_LEN);
+zero(_dist_code);
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+var _length_code  = new Array(MAX_MATCH - MIN_MATCH + 1);
+zero(_length_code);
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+var base_length   = new Array(LENGTH_CODES);
+zero(base_length);
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+var base_dist     = new Array(D_CODES);
+zero(base_dist);
+/* First normalized distance for each code (0 = distance of 1) */
+
+
+function StaticTreeDesc(static_tree, extra_bits, extra_base, elems, max_length) {
+
+  this.static_tree  = static_tree;  /* static tree or NULL */
+  this.extra_bits   = extra_bits;   /* extra bits for each code or NULL */
+  this.extra_base   = extra_base;   /* base index for extra_bits */
+  this.elems        = elems;        /* max number of elements in the tree */
+  this.max_length   = max_length;   /* max bit length for the codes */
+
+  // show if `static_tree` has data or dummy - needed for monomorphic objects
+  this.has_stree    = static_tree && static_tree.length;
+}
+
+
+var static_l_desc;
+var static_d_desc;
+var static_bl_desc;
+
+
+function TreeDesc(dyn_tree, stat_desc) {
+  this.dyn_tree = dyn_tree;     /* the dynamic tree */
+  this.max_code = 0;            /* largest code with non zero frequency */
+  this.stat_desc = stat_desc;   /* the corresponding static tree */
+}
+
+
+
+function d_code(dist) {
+  return dist < 256 ? _dist_code[dist] : _dist_code[256 + (dist >>> 7)];
+}
+
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+function put_short(s, w) {
+//    put_byte(s, (uch)((w) & 0xff));
+//    put_byte(s, (uch)((ush)(w) >> 8));
+  s.pending_buf[s.pending++] = (w) & 0xff;
+  s.pending_buf[s.pending++] = (w >>> 8) & 0xff;
+}
+
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+function send_bits(s, value, length) {
+  if (s.bi_valid > (Buf_size - length)) {
+    s.bi_buf |= (value << s.bi_valid) & 0xffff;
+    put_short(s, s.bi_buf);
+    s.bi_buf = value >> (Buf_size - s.bi_valid);
+    s.bi_valid += length - Buf_size;
+  } else {
+    s.bi_buf |= (value << s.bi_valid) & 0xffff;
+    s.bi_valid += length;
+  }
+}
+
+
+function send_code(s, c, tree) {
+  send_bits(s, tree[c * 2]/*.Code*/, tree[c * 2 + 1]/*.Len*/);
+}
+
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+function bi_reverse(code, len) {
+  var res = 0;
+  do {
+    res |= code & 1;
+    code >>>= 1;
+    res <<= 1;
+  } while (--len > 0);
+  return res >>> 1;
+}
+
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+function bi_flush(s) {
+  if (s.bi_valid === 16) {
+    put_short(s, s.bi_buf);
+    s.bi_buf = 0;
+    s.bi_valid = 0;
+
+  } else if (s.bi_valid >= 8) {
+    s.pending_buf[s.pending++] = s.bi_buf & 0xff;
+    s.bi_buf >>= 8;
+    s.bi_valid -= 8;
+  }
+}
+
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+function gen_bitlen(s, desc)
+//    deflate_state *s;
+//    tree_desc *desc;    /* the tree descriptor */
+{
+  var tree            = desc.dyn_tree;
+  var max_code        = desc.max_code;
+  var stree           = desc.stat_desc.static_tree;
+  var has_stree       = desc.stat_desc.has_stree;
+  var extra           = desc.stat_desc.extra_bits;
+  var base            = desc.stat_desc.extra_base;
+  var max_length      = desc.stat_desc.max_length;
+  var h;              /* heap index */
+  var n, m;           /* iterate over the tree elements */
+  var bits;           /* bit length */
+  var xbits;          /* extra bits */
+  var f;              /* frequency */
+  var overflow = 0;   /* number of elements with bit length too large */
+
+  for (bits = 0; bits <= MAX_BITS; bits++) {
+    s.bl_count[bits] = 0;
+  }
+
+  /* In a first pass, compute the optimal bit lengths (which may
+   * overflow in the case of the bit length tree).
+   */
+  tree[s.heap[s.heap_max] * 2 + 1]/*.Len*/ = 0; /* root of the heap */
+
+  for (h = s.heap_max + 1; h < HEAP_SIZE; h++) {
+    n = s.heap[h];
+    bits = tree[tree[n * 2 + 1]/*.Dad*/ * 2 + 1]/*.Len*/ + 1;
+    if (bits > max_length) {
+      bits = max_length;
+      overflow++;
+    }
+    tree[n * 2 + 1]/*.Len*/ = bits;
+    /* We overwrite tree[n].Dad which is no longer needed */
+
+    if (n > max_code) { continue; } /* not a leaf node */
+
+    s.bl_count[bits]++;
+    xbits = 0;
+    if (n >= base) {
+      xbits = extra[n - base];
+    }
+    f = tree[n * 2]/*.Freq*/;
+    s.opt_len += f * (bits + xbits);
+    if (has_stree) {
+      s.static_len += f * (stree[n * 2 + 1]/*.Len*/ + xbits);
+    }
+  }
+  if (overflow === 0) { return; }
+
+  // Trace((stderr,"\nbit length overflow\n"));
+  /* This happens for example on obj2 and pic of the Calgary corpus */
+
+  /* Find the first bit length which could increase: */
+  do {
+    bits = max_length - 1;
+    while (s.bl_count[bits] === 0) { bits--; }
+    s.bl_count[bits]--;      /* move one leaf down the tree */
+    s.bl_count[bits + 1] += 2; /* move one overflow item as its brother */
+    s.bl_count[max_length]--;
+    /* The brother of the overflow item also moves one step up,
+     * but this does not affect bl_count[max_length]
+     */
+    overflow -= 2;
+  } while (overflow > 0);
+
+  /* Now recompute all bit lengths, scanning in increasing frequency.
+   * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+   * lengths instead of fixing only the wrong ones. This idea is taken
+   * from 'ar' written by Haruhiko Okumura.)
+   */
+  for (bits = max_length; bits !== 0; bits--) {
+    n = s.bl_count[bits];
+    while (n !== 0) {
+      m = s.heap[--h];
+      if (m > max_code) { continue; }
+      if (tree[m * 2 + 1]/*.Len*/ !== bits) {
+        // Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+        s.opt_len += (bits - tree[m * 2 + 1]/*.Len*/) * tree[m * 2]/*.Freq*/;
+        tree[m * 2 + 1]/*.Len*/ = bits;
+      }
+      n--;
+    }
+  }
+}
+
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+function gen_codes(tree, max_code, bl_count)
+//    ct_data *tree;             /* the tree to decorate */
+//    int max_code;              /* largest code with non zero frequency */
+//    ushf *bl_count;            /* number of codes at each bit length */
+{
+  var next_code = new Array(MAX_BITS + 1); /* next code value for each bit length */
+  var code = 0;              /* running code value */
+  var bits;                  /* bit index */
+  var n;                     /* code index */
+
+  /* The distribution counts are first used to generate the code values
+   * without bit reversal.
+   */
+  for (bits = 1; bits <= MAX_BITS; bits++) {
+    next_code[bits] = code = (code + bl_count[bits - 1]) << 1;
+  }
+  /* Check that the bit counts in bl_count are consistent. The last code
+   * must be all ones.
+   */
+  //Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+  //        "inconsistent bit counts");
+  //Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+  for (n = 0;  n <= max_code; n++) {
+    var len = tree[n * 2 + 1]/*.Len*/;
+    if (len === 0) { continue; }
+    /* Now reverse the bits */
+    tree[n * 2]/*.Code*/ = bi_reverse(next_code[len]++, len);
+
+    //Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+    //     n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+  }
+}
+
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+function tr_static_init() {
+  var n;        /* iterates over tree elements */
+  var bits;     /* bit counter */
+  var length;   /* length value */
+  var code;     /* code value */
+  var dist;     /* distance index */
+  var bl_count = new Array(MAX_BITS + 1);
+  /* number of codes at each bit length for an optimal tree */
+
+  // do check in _tr_init()
+  //if (static_init_done) return;
+
+  /* For some embedded targets, global variables are not initialized: */
+/*#ifdef NO_INIT_GLOBAL_POINTERS
+  static_l_desc.static_tree = static_ltree;
+  static_l_desc.extra_bits = extra_lbits;
+  static_d_desc.static_tree = static_dtree;
+  static_d_desc.extra_bits = extra_dbits;
+  static_bl_desc.extra_bits = extra_blbits;
+#endif*/
+
+  /* Initialize the mapping length (0..255) -> length code (0..28) */
+  length = 0;
+  for (code = 0; code < LENGTH_CODES - 1; code++) {
+    base_length[code] = length;
+    for (n = 0; n < (1 << extra_lbits[code]); n++) {
+      _length_code[length++] = code;
+    }
+  }
+  //Assert (length == 256, "tr_static_init: length != 256");
+  /* Note that the length 255 (match length 258) can be represented
+   * in two different ways: code 284 + 5 bits or code 285, so we
+   * overwrite length_code[255] to use the best encoding:
+   */
+  _length_code[length - 1] = code;
+
+  /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+  dist = 0;
+  for (code = 0; code < 16; code++) {
+    base_dist[code] = dist;
+    for (n = 0; n < (1 << extra_dbits[code]); n++) {
+      _dist_code[dist++] = code;
+    }
+  }
+  //Assert (dist == 256, "tr_static_init: dist != 256");
+  dist >>= 7; /* from now on, all distances are divided by 128 */
+  for (; code < D_CODES; code++) {
+    base_dist[code] = dist << 7;
+    for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
+      _dist_code[256 + dist++] = code;
+    }
+  }
+  //Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+  /* Construct the codes of the static literal tree */
+  for (bits = 0; bits <= MAX_BITS; bits++) {
+    bl_count[bits] = 0;
+  }
+
+  n = 0;
+  while (n <= 143) {
+    static_ltree[n * 2 + 1]/*.Len*/ = 8;
+    n++;
+    bl_count[8]++;
+  }
+  while (n <= 255) {
+    static_ltree[n * 2 + 1]/*.Len*/ = 9;
+    n++;
+    bl_count[9]++;
+  }
+  while (n <= 279) {
+    static_ltree[n * 2 + 1]/*.Len*/ = 7;
+    n++;
+    bl_count[7]++;
+  }
+  while (n <= 287) {
+    static_ltree[n * 2 + 1]/*.Len*/ = 8;
+    n++;
+    bl_count[8]++;
+  }
+  /* Codes 286 and 287 do not exist, but we must include them in the
+   * tree construction to get a canonical Huffman tree (longest code
+   * all ones)
+   */
+  gen_codes(static_ltree, L_CODES + 1, bl_count);
+
+  /* The static distance tree is trivial: */
+  for (n = 0; n < D_CODES; n++) {
+    static_dtree[n * 2 + 1]/*.Len*/ = 5;
+    static_dtree[n * 2]/*.Code*/ = bi_reverse(n, 5);
+  }
+
+  // Now data ready and we can init static trees
+  static_l_desc = new StaticTreeDesc(static_ltree, extra_lbits, LITERALS + 1, L_CODES, MAX_BITS);
+  static_d_desc = new StaticTreeDesc(static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS);
+  static_bl_desc = new StaticTreeDesc(new Array(0), extra_blbits, 0,         BL_CODES, MAX_BL_BITS);
+
+  //static_init_done = true;
+}
+
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+function init_block(s) {
+  var n; /* iterates over tree elements */
+
+  /* Initialize the trees. */
+  for (n = 0; n < L_CODES;  n++) { s.dyn_ltree[n * 2]/*.Freq*/ = 0; }
+  for (n = 0; n < D_CODES;  n++) { s.dyn_dtree[n * 2]/*.Freq*/ = 0; }
+  for (n = 0; n < BL_CODES; n++) { s.bl_tree[n * 2]/*.Freq*/ = 0; }
+
+  s.dyn_ltree[END_BLOCK * 2]/*.Freq*/ = 1;
+  s.opt_len = s.static_len = 0;
+  s.last_lit = s.matches = 0;
+}
+
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+function bi_windup(s)
+{
+  if (s.bi_valid > 8) {
+    put_short(s, s.bi_buf);
+  } else if (s.bi_valid > 0) {
+    //put_byte(s, (Byte)s->bi_buf);
+    s.pending_buf[s.pending++] = s.bi_buf;
+  }
+  s.bi_buf = 0;
+  s.bi_valid = 0;
+}
+
+/* ===========================================================================
+ * Copy a stored block, storing first the length and its
+ * one's complement if requested.
+ */
+function copy_block(s, buf, len, header)
+//DeflateState *s;
+//charf    *buf;    /* the input data */
+//unsigned len;     /* its length */
+//int      header;  /* true if block header must be written */
+{
+  bi_windup(s);        /* align on byte boundary */
+
+  if (header) {
+    put_short(s, len);
+    put_short(s, ~len);
+  }
+//  while (len--) {
+//    put_byte(s, *buf++);
+//  }
+  utils.arraySet(s.pending_buf, s.window, buf, len, s.pending);
+  s.pending += len;
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+function smaller(tree, n, m, depth) {
+  var _n2 = n * 2;
+  var _m2 = m * 2;
+  return (tree[_n2]/*.Freq*/ < tree[_m2]/*.Freq*/ ||
+         (tree[_n2]/*.Freq*/ === tree[_m2]/*.Freq*/ && depth[n] <= depth[m]));
+}
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+function pqdownheap(s, tree, k)
+//    deflate_state *s;
+//    ct_data *tree;  /* the tree to restore */
+//    int k;               /* node to move down */
+{
+  var v = s.heap[k];
+  var j = k << 1;  /* left son of k */
+  while (j <= s.heap_len) {
+    /* Set j to the smallest of the two sons: */
+    if (j < s.heap_len &&
+      smaller(tree, s.heap[j + 1], s.heap[j], s.depth)) {
+      j++;
+    }
+    /* Exit if v is smaller than both sons */
+    if (smaller(tree, v, s.heap[j], s.depth)) { break; }
+
+    /* Exchange v with the smallest son */
+    s.heap[k] = s.heap[j];
+    k = j;
+
+    /* And continue down the tree, setting j to the left son of k */
+    j <<= 1;
+  }
+  s.heap[k] = v;
+}
+
+
+// inlined manually
+// var SMALLEST = 1;
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+function compress_block(s, ltree, dtree)
+//    deflate_state *s;
+//    const ct_data *ltree; /* literal tree */
+//    const ct_data *dtree; /* distance tree */
+{
+  var dist;           /* distance of matched string */
+  var lc;             /* match length or unmatched char (if dist == 0) */
+  var lx = 0;         /* running index in l_buf */
+  var code;           /* the code to send */
+  var extra;          /* number of extra bits to send */
+
+  if (s.last_lit !== 0) {
+    do {
+      dist = (s.pending_buf[s.d_buf + lx * 2] << 8) | (s.pending_buf[s.d_buf + lx * 2 + 1]);
+      lc = s.pending_buf[s.l_buf + lx];
+      lx++;
+
+      if (dist === 0) {
+        send_code(s, lc, ltree); /* send a literal byte */
+        //Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+      } else {
+        /* Here, lc is the match length - MIN_MATCH */
+        code = _length_code[lc];
+        send_code(s, code + LITERALS + 1, ltree); /* send the length code */
+        extra = extra_lbits[code];
+        if (extra !== 0) {
+          lc -= base_length[code];
+          send_bits(s, lc, extra);       /* send the extra length bits */
+        }
+        dist--; /* dist is now the match distance - 1 */
+        code = d_code(dist);
+        //Assert (code < D_CODES, "bad d_code");
+
+        send_code(s, code, dtree);       /* send the distance code */
+        extra = extra_dbits[code];
+        if (extra !== 0) {
+          dist -= base_dist[code];
+          send_bits(s, dist, extra);   /* send the extra distance bits */
+        }
+      } /* literal or match pair ? */
+
+      /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+      //Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+      //       "pendingBuf overflow");
+
+    } while (lx < s.last_lit);
+  }
+
+  send_code(s, END_BLOCK, ltree);
+}
+
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+function build_tree(s, desc)
+//    deflate_state *s;
+//    tree_desc *desc; /* the tree descriptor */
+{
+  var tree     = desc.dyn_tree;
+  var stree    = desc.stat_desc.static_tree;
+  var has_stree = desc.stat_desc.has_stree;
+  var elems    = desc.stat_desc.elems;
+  var n, m;          /* iterate over heap elements */
+  var max_code = -1; /* largest code with non zero frequency */
+  var node;          /* new node being created */
+
+  /* Construct the initial heap, with least frequent element in
+   * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+   * heap[0] is not used.
+   */
+  s.heap_len = 0;
+  s.heap_max = HEAP_SIZE;
+
+  for (n = 0; n < elems; n++) {
+    if (tree[n * 2]/*.Freq*/ !== 0) {
+      s.heap[++s.heap_len] = max_code = n;
+      s.depth[n] = 0;
+
+    } else {
+      tree[n * 2 + 1]/*.Len*/ = 0;
+    }
+  }
+
+  /* The pkzip format requires that at least one distance code exists,
+   * and that at least one bit should be sent even if there is only one
+   * possible code. So to avoid special checks later on we force at least
+   * two codes of non zero frequency.
+   */
+  while (s.heap_len < 2) {
+    node = s.heap[++s.heap_len] = (max_code < 2 ? ++max_code : 0);
+    tree[node * 2]/*.Freq*/ = 1;
+    s.depth[node] = 0;
+    s.opt_len--;
+
+    if (has_stree) {
+      s.static_len -= stree[node * 2 + 1]/*.Len*/;
+    }
+    /* node is 0 or 1 so it does not have extra bits */
+  }
+  desc.max_code = max_code;
+
+  /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+   * establish sub-heaps of increasing lengths:
+   */
+  for (n = (s.heap_len >> 1/*int /2*/); n >= 1; n--) { pqdownheap(s, tree, n); }
+
+  /* Construct the Huffman tree by repeatedly combining the least two
+   * frequent nodes.
+   */
+  node = elems;              /* next internal node of the tree */
+  do {
+    //pqremove(s, tree, n);  /* n = node of least frequency */
+    /*** pqremove ***/
+    n = s.heap[1/*SMALLEST*/];
+    s.heap[1/*SMALLEST*/] = s.heap[s.heap_len--];
+    pqdownheap(s, tree, 1/*SMALLEST*/);
+    /***/
+
+    m = s.heap[1/*SMALLEST*/]; /* m = node of next least frequency */
+
+    s.heap[--s.heap_max] = n; /* keep the nodes sorted by frequency */
+    s.heap[--s.heap_max] = m;
+
+    /* Create a new node father of n and m */
+    tree[node * 2]/*.Freq*/ = tree[n * 2]/*.Freq*/ + tree[m * 2]/*.Freq*/;
+    s.depth[node] = (s.depth[n] >= s.depth[m] ? s.depth[n] : s.depth[m]) + 1;
+    tree[n * 2 + 1]/*.Dad*/ = tree[m * 2 + 1]/*.Dad*/ = node;
+
+    /* and insert the new node in the heap */
+    s.heap[1/*SMALLEST*/] = node++;
+    pqdownheap(s, tree, 1/*SMALLEST*/);
+
+  } while (s.heap_len >= 2);
+
+  s.heap[--s.heap_max] = s.heap[1/*SMALLEST*/];
+
+  /* At this point, the fields freq and dad are set. We can now
+   * generate the bit lengths.
+   */
+  gen_bitlen(s, desc);
+
+  /* The field len is now set, we can generate the bit codes */
+  gen_codes(tree, max_code, s.bl_count);
+}
+
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+function scan_tree(s, tree, max_code)
+//    deflate_state *s;
+//    ct_data *tree;   /* the tree to be scanned */
+//    int max_code;    /* and its largest code of non zero frequency */
+{
+  var n;                     /* iterates over all tree elements */
+  var prevlen = -1;          /* last emitted length */
+  var curlen;                /* length of current code */
+
+  var nextlen = tree[0 * 2 + 1]/*.Len*/; /* length of next code */
+
+  var count = 0;             /* repeat count of the current code */
+  var max_count = 7;         /* max repeat count */
+  var min_count = 4;         /* min repeat count */
+
+  if (nextlen === 0) {
+    max_count = 138;
+    min_count = 3;
+  }
+  tree[(max_code + 1) * 2 + 1]/*.Len*/ = 0xffff; /* guard */
+
+  for (n = 0; n <= max_code; n++) {
+    curlen = nextlen;
+    nextlen = tree[(n + 1) * 2 + 1]/*.Len*/;
+
+    if (++count < max_count && curlen === nextlen) {
+      continue;
+
+    } else if (count < min_count) {
+      s.bl_tree[curlen * 2]/*.Freq*/ += count;
+
+    } else if (curlen !== 0) {
+
+      if (curlen !== prevlen) { s.bl_tree[curlen * 2]/*.Freq*/++; }
+      s.bl_tree[REP_3_6 * 2]/*.Freq*/++;
+
+    } else if (count <= 10) {
+      s.bl_tree[REPZ_3_10 * 2]/*.Freq*/++;
+
+    } else {
+      s.bl_tree[REPZ_11_138 * 2]/*.Freq*/++;
+    }
+
+    count = 0;
+    prevlen = curlen;
+
+    if (nextlen === 0) {
+      max_count = 138;
+      min_count = 3;
+
+    } else if (curlen === nextlen) {
+      max_count = 6;
+      min_count = 3;
+
+    } else {
+      max_count = 7;
+      min_count = 4;
+    }
+  }
+}
+
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+function send_tree(s, tree, max_code)
+//    deflate_state *s;
+//    ct_data *tree; /* the tree to be scanned */
+//    int max_code;       /* and its largest code of non zero frequency */
+{
+  var n;                     /* iterates over all tree elements */
+  var prevlen = -1;          /* last emitted length */
+  var curlen;                /* length of current code */
+
+  var nextlen = tree[0 * 2 + 1]/*.Len*/; /* length of next code */
+
+  var count = 0;             /* repeat count of the current code */
+  var max_count = 7;         /* max repeat count */
+  var min_count = 4;         /* min repeat count */
+
+  /* tree[max_code+1].Len = -1; */  /* guard already set */
+  if (nextlen === 0) {
+    max_count = 138;
+    min_count = 3;
+  }
+
+  for (n = 0; n <= max_code; n++) {
+    curlen = nextlen;
+    nextlen = tree[(n + 1) * 2 + 1]/*.Len*/;
+
+    if (++count < max_count && curlen === nextlen) {
+      continue;
+
+    } else if (count < min_count) {
+      do { send_code(s, curlen, s.bl_tree); } while (--count !== 0);
+
+    } else if (curlen !== 0) {
+      if (curlen !== prevlen) {
+        send_code(s, curlen, s.bl_tree);
+        count--;
+      }
+      //Assert(count >= 3 && count <= 6, " 3_6?");
+      send_code(s, REP_3_6, s.bl_tree);
+      send_bits(s, count - 3, 2);
+
+    } else if (count <= 10) {
+      send_code(s, REPZ_3_10, s.bl_tree);
+      send_bits(s, count - 3, 3);
+
+    } else {
+      send_code(s, REPZ_11_138, s.bl_tree);
+      send_bits(s, count - 11, 7);
+    }
+
+    count = 0;
+    prevlen = curlen;
+    if (nextlen === 0) {
+      max_count = 138;
+      min_count = 3;
+
+    } else if (curlen === nextlen) {
+      max_count = 6;
+      min_count = 3;
+
+    } else {
+      max_count = 7;
+      min_count = 4;
+    }
+  }
+}
+
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+function build_bl_tree(s) {
+  var max_blindex;  /* index of last bit length code of non zero freq */
+
+  /* Determine the bit length frequencies for literal and distance trees */
+  scan_tree(s, s.dyn_ltree, s.l_desc.max_code);
+  scan_tree(s, s.dyn_dtree, s.d_desc.max_code);
+
+  /* Build the bit length tree: */
+  build_tree(s, s.bl_desc);
+  /* opt_len now includes the length of the tree representations, except
+   * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+   */
+
+  /* Determine the number of bit length codes to send. The pkzip format
+   * requires that at least 4 bit length codes be sent. (appnote.txt says
+   * 3 but the actual value used is 4.)
+   */
+  for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) {
+    if (s.bl_tree[bl_order[max_blindex] * 2 + 1]/*.Len*/ !== 0) {
+      break;
+    }
+  }
+  /* Update opt_len to include the bit length tree and counts */
+  s.opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
+  //Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+  //        s->opt_len, s->static_len));
+
+  return max_blindex;
+}
+
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+function send_all_trees(s, lcodes, dcodes, blcodes)
+//    deflate_state *s;
+//    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+  var rank;                    /* index in bl_order */
+
+  //Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+  //Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+  //        "too many codes");
+  //Tracev((stderr, "\nbl counts: "));
+  send_bits(s, lcodes - 257, 5); /* not +255 as stated in appnote.txt */
+  send_bits(s, dcodes - 1,   5);
+  send_bits(s, blcodes - 4,  4); /* not -3 as stated in appnote.txt */
+  for (rank = 0; rank < blcodes; rank++) {
+    //Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+    send_bits(s, s.bl_tree[bl_order[rank] * 2 + 1]/*.Len*/, 3);
+  }
+  //Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+  send_tree(s, s.dyn_ltree, lcodes - 1); /* literal tree */
+  //Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+  send_tree(s, s.dyn_dtree, dcodes - 1); /* distance tree */
+  //Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "black list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+function detect_data_type(s) {
+  /* black_mask is the bit mask of black-listed bytes
+   * set bits 0..6, 14..25, and 28..31
+   * 0xf3ffc07f = binary 11110011111111111100000001111111
+   */
+  var black_mask = 0xf3ffc07f;
+  var n;
+
+  /* Check for non-textual ("black-listed") bytes. */
+  for (n = 0; n <= 31; n++, black_mask >>>= 1) {
+    if ((black_mask & 1) && (s.dyn_ltree[n * 2]/*.Freq*/ !== 0)) {
+      return Z_BINARY;
+    }
+  }
+
+  /* Check for textual ("white-listed") bytes. */
+  if (s.dyn_ltree[9 * 2]/*.Freq*/ !== 0 || s.dyn_ltree[10 * 2]/*.Freq*/ !== 0 ||
+      s.dyn_ltree[13 * 2]/*.Freq*/ !== 0) {
+    return Z_TEXT;
+  }
+  for (n = 32; n < LITERALS; n++) {
+    if (s.dyn_ltree[n * 2]/*.Freq*/ !== 0) {
+      return Z_TEXT;
+    }
+  }
+
+  /* There are no "black-listed" or "white-listed" bytes:
+   * this stream either is empty or has tolerated ("gray-listed") bytes only.
+   */
+  return Z_BINARY;
+}
+
+
+var static_init_done = false;
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+function _tr_init(s)
+{
+
+  if (!static_init_done) {
+    tr_static_init();
+    static_init_done = true;
+  }
+
+  s.l_desc  = new TreeDesc(s.dyn_ltree, static_l_desc);
+  s.d_desc  = new TreeDesc(s.dyn_dtree, static_d_desc);
+  s.bl_desc = new TreeDesc(s.bl_tree, static_bl_desc);
+
+  s.bi_buf = 0;
+  s.bi_valid = 0;
+
+  /* Initialize the first block of the first file: */
+  init_block(s);
+}
+
+
+/* ===========================================================================
+ * Send a stored block
+ */
+function _tr_stored_block(s, buf, stored_len, last)
+//DeflateState *s;
+//charf *buf;       /* input block */
+//ulg stored_len;   /* length of input block */
+//int last;         /* one if this is the last block for a file */
+{
+  send_bits(s, (STORED_BLOCK << 1) + (last ? 1 : 0), 3);    /* send block type */
+  copy_block(s, buf, stored_len, true); /* with header */
+}
+
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ */
+function _tr_align(s) {
+  send_bits(s, STATIC_TREES << 1, 3);
+  send_code(s, END_BLOCK, static_ltree);
+  bi_flush(s);
+}
+
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and output the encoded block to the zip file.
+ */
+function _tr_flush_block(s, buf, stored_len, last)
+//DeflateState *s;
+//charf *buf;       /* input block, or NULL if too old */
+//ulg stored_len;   /* length of input block */
+//int last;         /* one if this is the last block for a file */
+{
+  var opt_lenb, static_lenb;  /* opt_len and static_len in bytes */
+  var max_blindex = 0;        /* index of last bit length code of non zero freq */
+
+  /* Build the Huffman trees unless a stored block is forced */
+  if (s.level > 0) {
+
+    /* Check if the file is binary or text */
+    if (s.strm.data_type === Z_UNKNOWN) {
+      s.strm.data_type = detect_data_type(s);
+    }
+
+    /* Construct the literal and distance trees */
+    build_tree(s, s.l_desc);
+    // Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+    //        s->static_len));
+
+    build_tree(s, s.d_desc);
+    // Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+    //        s->static_len));
+    /* At this point, opt_len and static_len are the total bit lengths of
+     * the compressed block data, excluding the tree representations.
+     */
+
+    /* Build the bit length tree for the above two trees, and get the index
+     * in bl_order of the last bit length code to send.
+     */
+    max_blindex = build_bl_tree(s);
+
+    /* Determine the best encoding. Compute the block lengths in bytes. */
+    opt_lenb = (s.opt_len + 3 + 7) >>> 3;
+    static_lenb = (s.static_len + 3 + 7) >>> 3;
+
+    // Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+    //        opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+    //        s->last_lit));
+
+    if (static_lenb <= opt_lenb) { opt_lenb = static_lenb; }
+
+  } else {
+    // Assert(buf != (char*)0, "lost buf");
+    opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+  }
+
+  if ((stored_len + 4 <= opt_lenb) && (buf !== -1)) {
+    /* 4: two words for the lengths */
+
+    /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+     * Otherwise we can't have processed more than WSIZE input bytes since
+     * the last block flush, because compression would have been
+     * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+     * transform a block into a stored block.
+     */
+    _tr_stored_block(s, buf, stored_len, last);
+
+  } else if (s.strategy === Z_FIXED || static_lenb === opt_lenb) {
+
+    send_bits(s, (STATIC_TREES << 1) + (last ? 1 : 0), 3);
+    compress_block(s, static_ltree, static_dtree);
+
+  } else {
+    send_bits(s, (DYN_TREES << 1) + (last ? 1 : 0), 3);
+    send_all_trees(s, s.l_desc.max_code + 1, s.d_desc.max_code + 1, max_blindex + 1);
+    compress_block(s, s.dyn_ltree, s.dyn_dtree);
+  }
+  // Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+  /* The above check is made mod 2^32, for files larger than 512 MB
+   * and uLong implemented on 32 bits.
+   */
+  init_block(s);
+
+  if (last) {
+    bi_windup(s);
+  }
+  // Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+  //       s->compressed_len-7*last));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+function _tr_tally(s, dist, lc)
+//    deflate_state *s;
+//    unsigned dist;  /* distance of matched string */
+//    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+  //var out_length, in_length, dcode;
+
+  s.pending_buf[s.d_buf + s.last_lit * 2]     = (dist >>> 8) & 0xff;
+  s.pending_buf[s.d_buf + s.last_lit * 2 + 1] = dist & 0xff;
+
+  s.pending_buf[s.l_buf + s.last_lit] = lc & 0xff;
+  s.last_lit++;
+
+  if (dist === 0) {
+    /* lc is the unmatched char */
+    s.dyn_ltree[lc * 2]/*.Freq*/++;
+  } else {
+    s.matches++;
+    /* Here, lc is the match length - MIN_MATCH */
+    dist--;             /* dist = match distance - 1 */
+    //Assert((ush)dist < (ush)MAX_DIST(s) &&
+    //       (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+    //       (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+    s.dyn_ltree[(_length_code[lc] + LITERALS + 1) * 2]/*.Freq*/++;
+    s.dyn_dtree[d_code(dist) * 2]/*.Freq*/++;
+  }
+
+// (!) This block is disabled in zlib defailts,
+// don't enable it for binary compatibility
+
+//#ifdef TRUNCATE_BLOCK
+//  /* Try to guess if it is profitable to stop the current block here */
+//  if ((s.last_lit & 0x1fff) === 0 && s.level > 2) {
+//    /* Compute an upper bound for the compressed length */
+//    out_length = s.last_lit*8;
+//    in_length = s.strstart - s.block_start;
+//
+//    for (dcode = 0; dcode < D_CODES; dcode++) {
+//      out_length += s.dyn_dtree[dcode*2]/*.Freq*/ * (5 + extra_dbits[dcode]);
+//    }
+//    out_length >>>= 3;
+//    //Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+//    //       s->last_lit, in_length, out_length,
+//    //       100L - out_length*100L/in_length));
+//    if (s.matches < (s.last_lit>>1)/*int /2*/ && out_length < (in_length>>1)/*int /2*/) {
+//      return true;
+//    }
+//  }
+//#endif
+
+  return (s.last_lit === s.lit_bufsize - 1);
+  /* We avoid equality with lit_bufsize because of wraparound at 64K
+   * on 16 bit machines and because stored blocks are restricted to
+   * 64K-1 bytes.
+   */
+}
+
+exports._tr_init  = _tr_init;
+exports._tr_stored_block = _tr_stored_block;
+exports._tr_flush_block  = _tr_flush_block;
+exports._tr_tally = _tr_tally;
+exports._tr_align = _tr_align;
+
+},{"../utils/common":41}],53:[function(require,module,exports){
+'use strict';
+
+// (C) 1995-2013 Jean-loup Gailly and Mark Adler
+// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//   claim that you wrote the original software. If you use this software
+//   in a product, an acknowledgment in the product documentation would be
+//   appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//   misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+function ZStream() {
+  /* next input byte */
+  this.input = null; // JS specific, because we have no pointers
+  this.next_in = 0;
+  /* number of bytes available at input */
+  this.avail_in = 0;
+  /* total number of input bytes read so far */
+  this.total_in = 0;
+  /* next output byte should be put there */
+  this.output = null; // JS specific, because we have no pointers
+  this.next_out = 0;
+  /* remaining free space at output */
+  this.avail_out = 0;
+  /* total number of bytes output so far */
+  this.total_out = 0;
+  /* last error message, NULL if no error */
+  this.msg = ''/*Z_NULL*/;
+  /* not visible by applications */
+  this.state = null;
+  /* best guess about the data type: binary or text */
+  this.data_type = 2/*Z_UNKNOWN*/;
+  /* adler32 value of the uncompressed data */
+  this.adler = 0;
+}
+
+module.exports = ZStream;
+
+},{}],54:[function(require,module,exports){
+'use strict';
+module.exports = typeof setImmediate === 'function' ? setImmediate :
+	function setImmediate() {
+		var args = [].slice.apply(arguments);
+		args.splice(1, 0, 0);
+		setTimeout.apply(null, args);
+	};
+
+},{}]},{},[10])(10)
+});
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.min.js b/Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.min.js
new file mode 100644
index 00000000000..520db074223
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/jquery/jszip/dist/jszip.min.js
@@ -0,0 +1,13 @@
+/*!
+
+JSZip v3.2.1 - A JavaScript class for generating and reading zip files
+<http://stuartk.com/jszip>
+
+(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
+Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
+
+JSZip uses the library pako released under the MIT license :
+https://github.com/nodeca/pako/blob/master/LICENSE
+*/
+
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=t()}}(function(){return function s(a,o,h){function u(r,t){if(!o[r]){if(!a[r]){var e="function"==typeof require&&require;if(!t&&e)return e(r,!0);if(l)return l(r,!0);var i=new Error("Cannot find module '"+r+"'");throw i.code="MODULE_NOT_FOUND",i}var n=o[r]={exports:{}};a[r][0].call(n.exports,function(t){var e=a[r][1][t];return u(e||t)},n,n.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,t=0;t<h.length;t++)u(h[t]);return u}({1:[function(t,e,r){"use strict";var c=t("./utils"),d=t("./support"),p="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";r.encode=function(t){for(var e,r,i,n,s,a,o,h=[],u=0,l=t.length,f=l,d="string"!==c.getTypeOf(t);u<t.length;)f=l-u,i=d?(e=t[u++],r=u<l?t[u++]:0,u<l?t[u++]:0):(e=t.charCodeAt(u++),r=u<l?t.charCodeAt(u++):0,u<l?t.charCodeAt(u++):0),n=e>>2,s=(3&e)<<4|r>>4,a=1<f?(15&r)<<2|i>>6:64,o=2<f?63&i:64,h.push(p.charAt(n)+p.charAt(s)+p.charAt(a)+p.charAt(o));return h.join("")},r.decode=function(t){var e,r,i,n,s,a,o=0,h=0,u="data:";if(t.substr(0,u.length)===u)throw new Error("Invalid base64 input, it looks like a data url.");var l,f=3*(t=t.replace(/[^A-Za-z0-9\+\/\=]/g,"")).length/4;if(t.charAt(t.length-1)===p.charAt(64)&&f--,t.charAt(t.length-2)===p.charAt(64)&&f--,f%1!=0)throw new Error("Invalid base64 input, bad content length.");for(l=d.uint8array?new Uint8Array(0|f):new Array(0|f);o<t.length;)e=p.indexOf(t.charAt(o++))<<2|(n=p.indexOf(t.charAt(o++)))>>4,r=(15&n)<<4|(s=p.indexOf(t.charAt(o++)))>>2,i=(3&s)<<6|(a=p.indexOf(t.charAt(o++))),l[h++]=e,64!==s&&(l[h++]=r),64!==a&&(l[h++]=i);return l}},{"./support":30,"./utils":32}],2:[function(t,e,r){"use strict";var i=t("./external"),n=t("./stream/DataWorker"),s=t("./stream/DataLengthProbe"),a=t("./stream/Crc32Probe");s=t("./stream/DataLengthProbe");function o(t,e,r,i,n){this.compressedSize=t,this.uncompressedSize=e,this.crc32=r,this.compression=i,this.compressedContent=n}o.prototype={getContentWorker:function(){var t=new n(i.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new s("data_length")),e=this;return t.on("end",function(){if(this.streamInfo.data_length!==e.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),t},getCompressedWorker:function(){return new n(i.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(t,e,r){return t.pipe(new a).pipe(new s("uncompressedSize")).pipe(e.compressWorker(r)).pipe(new s("compressedSize")).withStreamInfo("compression",e)},e.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(t,e,r){"use strict";var i=t("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(t){return new i("STORE compression")},uncompressWorker:function(){return new i("STORE decompression")}},r.DEFLATE=t("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(t,e,r){"use strict";var i=t("./utils");var o=function(){for(var t,e=[],r=0;r<256;r++){t=r;for(var i=0;i<8;i++)t=1&t?3988292384^t>>>1:t>>>1;e[r]=t}return e}();e.exports=function(t,e){return void 0!==t&&t.length?"string"!==i.getTypeOf(t)?function(t,e,r,i){var n=o,s=i+r;t^=-1;for(var a=i;a<s;a++)t=t>>>8^n[255&(t^e[a])];return-1^t}(0|e,t,t.length,0):function(t,e,r,i){var n=o,s=i+r;t^=-1;for(var a=i;a<s;a++)t=t>>>8^n[255&(t^e.charCodeAt(a))];return-1^t}(0|e,t,t.length,0):0}},{"./utils":32}],5:[function(t,e,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(t,e,r){"use strict";var i=null;i="undefined"!=typeof Promise?Promise:t("lie"),e.exports={Promise:i}},{lie:37}],7:[function(t,e,r){"use strict";var i="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,n=t("pako"),s=t("./utils"),a=t("./stream/GenericWorker"),o=i?"uint8array":"array";function h(t,e){a.call(this,"FlateWorker/"+t),this._pako=null,this._pakoAction=t,this._pakoOptions=e,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(t){this.meta=t.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,t.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new n[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var e=this;this._pako.onData=function(t){e.push({data:t,meta:e.meta})}},r.compressWorker=function(t){return new h("Deflate",t)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(t,e,r){"use strict";function A(t,e){var r,i="";for(r=0;r<e;r++)i+=String.fromCharCode(255&t),t>>>=8;return i}function i(t,e,r,i,n,s){var a,o,h=t.file,u=t.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),d=I.transformTo("string",O.utf8encode(h.name)),c=h.comment,p=I.transformTo("string",s(c)),m=I.transformTo("string",O.utf8encode(c)),_=d.length!==h.name.length,g=m.length!==c.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};e&&!r||(x.crc32=t.crc32,x.compressedSize=t.compressedSize,x.uncompressedSize=t.uncompressedSize);var S=0;e&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===n?(C=798,z|=function(t,e){var r=t;return t||(r=e?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(t){return 63&(t||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+d,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(i,4)+f+b+p}}var I=t("../utils"),n=t("../stream/GenericWorker"),O=t("../utf8"),B=t("../crc32"),R=t("../signature");function s(t,e,r,i){n.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=e,this.zipPlatform=r,this.encodeFileName=i,this.streamFiles=t,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,n),s.prototype.push=function(t){var e=t.meta.percent||0,r=this.entriesCount,i=this._sources.length;this.accumulate?this.contentBuffer.push(t):(this.bytesWritten+=t.data.length,n.prototype.push.call(this,{data:t.data,meta:{currentFile:this.currentFile,percent:r?(e+100*(r-i-1))/r:100}}))},s.prototype.openedSource=function(t){this.currentSourceOffset=this.bytesWritten,this.currentFile=t.file.name;var e=this.streamFiles&&!t.file.dir;if(e){var r=i(t,e,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(t){this.accumulate=!1;var e=this.streamFiles&&!t.file.dir,r=i(t,e,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),e)this.push({data:function(t){return R.DATA_DESCRIPTOR+A(t.crc32,4)+A(t.compressedSize,4)+A(t.uncompressedSize,4)}(t),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var t=this.bytesWritten,e=0;e<this.dirRecords.length;e++)this.push({data:this.dirRecords[e],meta:{percent:100}});var r=this.bytesWritten-t,i=function(t,e,r,i,n){var s=I.transformTo("string",n(i));return R.CENTRAL_DIRECTORY_END+"\0\0\0\0"+A(t,2)+A(t,2)+A(e,4)+A(r,4)+A(s.length,2)+s}(this.dirRecords.length,r,t,this.zipComment,this.encodeFileName);this.push({data:i,meta:{percent:100}})},s.prototype.prepareNextSource=function(){this.previous=this._sources.shift(),this.openedSource(this.previous.streamInfo),this.isPaused?this.previous.pause():this.previous.resume()},s.prototype.registerPrevious=function(t){this._sources.push(t);var e=this;return t.on("data",function(t){e.processChunk(t)}),t.on("end",function(){e.closedSource(e.previous.streamInfo),e._sources.length?e.prepareNextSource():e.end()}),t.on("error",function(t){e.error(t)}),this},s.prototype.resume=function(){return!!n.prototype.resume.call(this)&&(!this.previous&&this._sources.length?(this.prepareNextSource(),!0):this.previous||this._sources.length||this.generatedError?void 0:(this.end(),!0))},s.prototype.error=function(t){var e=this._sources;if(!n.prototype.error.call(this,t))return!1;for(var r=0;r<e.length;r++)try{e[r].error(t)}catch(t){}return!0},s.prototype.lock=function(){n.prototype.lock.call(this);for(var t=this._sources,e=0;e<t.length;e++)t[e].lock()},e.exports=s},{"../crc32":4,"../signature":23,"../stream/GenericWorker":28,"../utf8":31,"../utils":32}],9:[function(t,e,r){"use strict";var u=t("../compressions"),i=t("./ZipFileWorker");r.generateWorker=function(t,a,e){var o=new i(a.streamFiles,e,a.platform,a.encodeFileName),h=0;try{t.forEach(function(t,e){h++;var r=function(t,e){var r=t||e,i=u[r];if(!i)throw new Error(r+" is not a valid compression method !");return i}(e.options.compression,a.compression),i=e.options.compressionOptions||a.compressionOptions||{},n=e.dir,s=e.date;e._compressWorker(r,i).withStreamInfo("file",{name:t,dir:n,date:s,comment:e.comment||"",unixPermissions:e.unixPermissions,dosPermissions:e.dosPermissions}).pipe(o)}),o.entriesCount=h}catch(t){o.error(t)}return o}},{"../compressions":3,"./ZipFileWorker":8}],10:[function(t,e,r){"use strict";function i(){if(!(this instanceof i))return new i;if(arguments.length)throw new Error("The constructor with parameters has been removed in JSZip 3.0, please check the upgrade guide.");this.files={},this.comment=null,this.root="",this.clone=function(){var t=new i;for(var e in this)"function"!=typeof this[e]&&(t[e]=this[e]);return t}}(i.prototype=t("./object")).loadAsync=t("./load"),i.support=t("./support"),i.defaults=t("./defaults"),i.version="3.2.0",i.loadAsync=function(t,e){return(new i).loadAsync(t,e)},i.external=t("./external"),e.exports=i},{"./defaults":5,"./external":6,"./load":11,"./object":15,"./support":30}],11:[function(t,e,r){"use strict";var i=t("./utils"),n=t("./external"),o=t("./utf8"),h=(i=t("./utils"),t("./zipEntries")),s=t("./stream/Crc32Probe"),u=t("./nodejsUtils");function l(i){return new n.Promise(function(t,e){var r=i.decompressed.getContentWorker().pipe(new s);r.on("error",function(t){e(t)}).on("end",function(){r.streamInfo.crc32!==i.decompressed.crc32?e(new Error("Corrupted zip : CRC32 mismatch")):t()}).resume()})}e.exports=function(t,s){var a=this;return s=i.extend(s||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:o.utf8decode}),u.isNode&&u.isStream(t)?n.Promise.reject(new Error("JSZip can't accept a stream when loading a zip file.")):i.prepareContent("the loaded zip file",t,!0,s.optimizedBinaryString,s.base64).then(function(t){var e=new h(s);return e.load(t),e}).then(function(t){var e=[n.Promise.resolve(t)],r=t.files;if(s.checkCRC32)for(var i=0;i<r.length;i++)e.push(l(r[i]));return n.Promise.all(e)}).then(function(t){for(var e=t.shift(),r=e.files,i=0;i<r.length;i++){var n=r[i];a.file(n.fileNameStr,n.decompressed,{binary:!0,optimizedBinaryString:!0,date:n.date,dir:n.dir,comment:n.fileCommentStr.length?n.fileCommentStr:null,unixPermissions:n.unixPermissions,dosPermissions:n.dosPermissions,createFolders:s.createFolders})}return e.zipComment.length&&(a.comment=e.zipComment),a})}},{"./external":6,"./nodejsUtils":14,"./stream/Crc32Probe":25,"./utf8":31,"./utils":32,"./zipEntries":33}],12:[function(t,e,r){"use strict";var i=t("../utils"),n=t("../stream/GenericWorker");function s(t,e){n.call(this,"Nodejs stream input adapter for "+t),this._upstreamEnded=!1,this._bindStream(e)}i.inherits(s,n),s.prototype._bindStream=function(t){var e=this;(this._stream=t).pause(),t.on("data",function(t){e.push({data:t,meta:{percent:0}})}).on("error",function(t){e.isPaused?this.generatedError=t:e.error(t)}).on("end",function(){e.isPaused?e._upstreamEnded=!0:e.end()})},s.prototype.pause=function(){return!!n.prototype.pause.call(this)&&(this._stream.pause(),!0)},s.prototype.resume=function(){return!!n.prototype.resume.call(this)&&(this._upstreamEnded?this.end():this._stream.resume(),!0)},e.exports=s},{"../stream/GenericWorker":28,"../utils":32}],13:[function(t,e,r){"use strict";var n=t("readable-stream").Readable;function i(t,e,r){n.call(this,e),this._helper=t;var i=this;t.on("data",function(t,e){i.push(t)||i._helper.pause(),r&&r(e)}).on("error",function(t){i.emit("error",t)}).on("end",function(){i.push(null)})}t("../utils").inherits(i,n),i.prototype._read=function(){this._helper.resume()},e.exports=i},{"../utils":32,"readable-stream":16}],14:[function(t,e,r){"use strict";e.exports={isNode:"undefined"!=typeof Buffer,newBufferFrom:function(t,e){if(Buffer.from&&Buffer.from!==Uint8Array.from)return Buffer.from(t,e);if("number"==typeof t)throw new Error('The "data" argument must not be a number');return new Buffer(t,e)},allocBuffer:function(t){if(Buffer.alloc)return Buffer.alloc(t);var e=new Buffer(t);return e.fill(0),e},isBuffer:function(t){return Buffer.isBuffer(t)},isStream:function(t){return t&&"function"==typeof t.on&&"function"==typeof t.pause&&"function"==typeof t.resume}}},{}],15:[function(t,e,r){"use strict";function s(t,e,r){var i,n=u.getTypeOf(e),s=u.extend(r||{},f);s.date=s.date||new Date,null!==s.compression&&(s.compression=s.compression.toUpperCase()),"string"==typeof s.unixPermissions&&(s.unixPermissions=parseInt(s.unixPermissions,8)),s.unixPermissions&&16384&s.unixPermissions&&(s.dir=!0),s.dosPermissions&&16&s.dosPermissions&&(s.dir=!0),s.dir&&(t=g(t)),s.createFolders&&(i=_(t))&&b.call(this,i,!0);var a="string"===n&&!1===s.binary&&!1===s.base64;r&&void 0!==r.binary||(s.binary=!a),(e instanceof d&&0===e.uncompressedSize||s.dir||!e||0===e.length)&&(s.base64=!1,s.binary=!0,e="",s.compression="STORE",n="string");var o=null;o=e instanceof d||e instanceof l?e:p.isNode&&p.isStream(e)?new m(t,e):u.prepareContent(t,e,s.binary,s.optimizedBinaryString,s.base64);var h=new c(t,o,s);this.files[t]=h}var n=t("./utf8"),u=t("./utils"),l=t("./stream/GenericWorker"),a=t("./stream/StreamHelper"),f=t("./defaults"),d=t("./compressedObject"),c=t("./zipObject"),o=t("./generate"),p=t("./nodejsUtils"),m=t("./nodejs/NodejsStreamInputAdapter"),_=function(t){"/"===t.slice(-1)&&(t=t.substring(0,t.length-1));var e=t.lastIndexOf("/");return 0<e?t.substring(0,e):""},g=function(t){return"/"!==t.slice(-1)&&(t+="/"),t},b=function(t,e){return e=void 0!==e?e:f.createFolders,t=g(t),this.files[t]||s.call(this,t,null,{dir:!0,createFolders:e}),this.files[t]};function h(t){return"[object RegExp]"===Object.prototype.toString.call(t)}var i={load:function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},forEach:function(t){var e,r,i;for(e in this.files)this.files.hasOwnProperty(e)&&(i=this.files[e],(r=e.slice(this.root.length,e.length))&&e.slice(0,this.root.length)===this.root&&t(r,i))},filter:function(r){var i=[];return this.forEach(function(t,e){r(t,e)&&i.push(e)}),i},file:function(t,e,r){if(1!==arguments.length)return t=this.root+t,s.call(this,t,e,r),this;if(h(t)){var i=t;return this.filter(function(t,e){return!e.dir&&i.test(t)})}var n=this.files[this.root+t];return n&&!n.dir?n:null},folder:function(r){if(!r)return this;if(h(r))return this.filter(function(t,e){return e.dir&&r.test(t)});var t=this.root+r,e=b.call(this,t),i=this.clone();return i.root=e.name,i},remove:function(r){r=this.root+r;var t=this.files[r];if(t||("/"!==r.slice(-1)&&(r+="/"),t=this.files[r]),t&&!t.dir)delete this.files[r];else for(var e=this.filter(function(t,e){return e.name.slice(0,r.length)===r}),i=0;i<e.length;i++)delete this.files[e[i].name];return this},generate:function(t){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},generateInternalStream:function(t){var e,r={};try{if((r=u.extend(t||{},{streamFiles:!1,compression:"STORE",compressionOptions:null,type:"",platform:"DOS",comment:null,mimeType:"application/zip",encodeFileName:n.utf8encode})).type=r.type.toLowerCase(),r.compression=r.compression.toUpperCase(),"binarystring"===r.type&&(r.type="string"),!r.type)throw new Error("No output type specified.");u.checkSupport(r.type),"darwin"!==r.platform&&"freebsd"!==r.platform&&"linux"!==r.platform&&"sunos"!==r.platform||(r.platform="UNIX"),"win32"===r.platform&&(r.platform="DOS");var i=r.comment||this.comment||"";e=o.generateWorker(this,r,i)}catch(t){(e=new l("error")).error(t)}return new a(e,r.type||"string",r.mimeType)},generateAsync:function(t,e){return this.generateInternalStream(t).accumulate(e)},generateNodeStream:function(t,e){return(t=t||{}).type||(t.type="nodebuffer"),this.generateInternalStream(t).toNodejsStream(e)}};e.exports=i},{"./compressedObject":2,"./defaults":5,"./generate":9,"./nodejs/NodejsStreamInputAdapter":12,"./nodejsUtils":14,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31,"./utils":32,"./zipObject":35}],16:[function(t,e,r){e.exports=t("stream")},{stream:void 0}],17:[function(t,e,r){"use strict";var i=t("./DataReader");function n(t){i.call(this,t);for(var e=0;e<this.data.length;e++)t[e]=255&t[e]}t("../utils").inherits(n,i),n.prototype.byteAt=function(t){return this.data[this.zero+t]},n.prototype.lastIndexOfSignature=function(t){for(var e=t.charCodeAt(0),r=t.charCodeAt(1),i=t.charCodeAt(2),n=t.charCodeAt(3),s=this.length-4;0<=s;--s)if(this.data[s]===e&&this.data[s+1]===r&&this.data[s+2]===i&&this.data[s+3]===n)return s-this.zero;return-1},n.prototype.readAndCheckSignature=function(t){var e=t.charCodeAt(0),r=t.charCodeAt(1),i=t.charCodeAt(2),n=t.charCodeAt(3),s=this.readData(4);return e===s[0]&&r===s[1]&&i===s[2]&&n===s[3]},n.prototype.readData=function(t){if(this.checkOffset(t),0===t)return[];var e=this.data.slice(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./DataReader":18}],18:[function(t,e,r){"use strict";var i=t("../utils");function n(t){this.data=t,this.length=t.length,this.index=0,this.zero=0}n.prototype={checkOffset:function(t){this.checkIndex(this.index+t)},checkIndex:function(t){if(this.length<this.zero+t||t<0)throw new Error("End of data reached (data length = "+this.length+", asked index = "+t+"). Corrupted zip ?")},setIndex:function(t){this.checkIndex(t),this.index=t},skip:function(t){this.setIndex(this.index+t)},byteAt:function(t){},readInt:function(t){var e,r=0;for(this.checkOffset(t),e=this.index+t-1;e>=this.index;e--)r=(r<<8)+this.byteAt(e);return this.index+=t,r},readString:function(t){return i.transformTo("string",this.readData(t))},readData:function(t){},lastIndexOfSignature:function(t){},readAndCheckSignature:function(t){},readDate:function(){var t=this.readInt(4);return new Date(Date.UTC(1980+(t>>25&127),(t>>21&15)-1,t>>16&31,t>>11&31,t>>5&63,(31&t)<<1))}},e.exports=n},{"../utils":32}],19:[function(t,e,r){"use strict";var i=t("./Uint8ArrayReader");function n(t){i.call(this,t)}t("../utils").inherits(n,i),n.prototype.readData=function(t){this.checkOffset(t);var e=this.data.slice(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(t,e,r){"use strict";var i=t("./DataReader");function n(t){i.call(this,t)}t("../utils").inherits(n,i),n.prototype.byteAt=function(t){return this.data.charCodeAt(this.zero+t)},n.prototype.lastIndexOfSignature=function(t){return this.data.lastIndexOf(t)-this.zero},n.prototype.readAndCheckSignature=function(t){return t===this.readData(4)},n.prototype.readData=function(t){this.checkOffset(t);var e=this.data.slice(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./DataReader":18}],21:[function(t,e,r){"use strict";var i=t("./ArrayReader");function n(t){i.call(this,t)}t("../utils").inherits(n,i),n.prototype.readData=function(t){if(this.checkOffset(t),0===t)return new Uint8Array(0);var e=this.data.subarray(this.zero+this.index,this.zero+this.index+t);return this.index+=t,e},e.exports=n},{"../utils":32,"./ArrayReader":17}],22:[function(t,e,r){"use strict";var i=t("../utils"),n=t("../support"),s=t("./ArrayReader"),a=t("./StringReader"),o=t("./NodeBufferReader"),h=t("./Uint8ArrayReader");e.exports=function(t){var e=i.getTypeOf(t);return i.checkSupport(e),"string"!==e||n.uint8array?"nodebuffer"===e?new o(t):n.uint8array?new h(i.transformTo("uint8array",t)):new s(i.transformTo("array",t)):new a(t)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(t,e,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK
",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(t,e,r){"use strict";var i=t("./GenericWorker"),n=t("../utils");function s(t){i.call(this,"ConvertWorker to "+t),this.destType=t}n.inherits(s,i),s.prototype.processChunk=function(t){this.push({data:n.transformTo(this.destType,t.data),meta:t.meta})},e.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(t,e,r){"use strict";var i=t("./GenericWorker"),n=t("../crc32");function s(){i.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}t("../utils").inherits(s,i),s.prototype.processChunk=function(t){this.streamInfo.crc32=n(t.data,this.streamInfo.crc32||0),this.push(t)},e.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(t,e,r){"use strict";var i=t("../utils"),n=t("./GenericWorker");function s(t){n.call(this,"DataLengthProbe for "+t),this.propName=t,this.withStreamInfo(t,0)}i.inherits(s,n),s.prototype.processChunk=function(t){if(t){var e=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=e+t.data.length}n.prototype.processChunk.call(this,t)},e.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(t,e,r){"use strict";var i=t("../utils"),n=t("./GenericWorker");function s(t){n.call(this,"DataWorker");var e=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,t.then(function(t){e.dataIsReady=!0,e.data=t,e.max=t&&t.length||0,e.type=i.getTypeOf(t),e.isPaused||e._tickAndRepeat()},function(t){e.error(t)})}i.inherits(s,n),s.prototype.cleanUp=function(){n.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!n.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,i.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(i.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var t=null,e=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":t=this.data.substring(this.index,e);break;case"uint8array":t=this.data.subarray(this.index,e);break;case"array":case"nodebuffer":t=this.data.slice(this.index,e)}return this.index=e,this.push({data:t,meta:{percent:this.max?this.index/this.max*100:0}})},e.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(t,e,r){"use strict";function i(t){this.name=t||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}i.prototype={push:function(t){this.emit("data",t)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(t){this.emit("error",t)}return!0},error:function(t){return!this.isFinished&&(this.isPaused?this.generatedError=t:(this.isFinished=!0,this.emit("error",t),this.previous&&this.previous.error(t),this.cleanUp()),!0)},on:function(t,e){return this._listeners[t].push(e),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(t,e){if(this._listeners[t])for(var r=0;r<this._listeners[t].length;r++)this._listeners[t][r].call(this,e)},pipe:function(t){return t.registerPrevious(this)},registerPrevious:function(t){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.streamInfo=t.streamInfo,this.mergeStreamInfo(),this.previous=t;var e=this;return t.on("data",function(t){e.processChunk(t)}),t.on("end",function(){e.end()}),t.on("error",function(t){e.error(t)}),this},pause:function(){return!this.isPaused&&!this.isFinished&&(this.isPaused=!0,this.previous&&this.previous.pause(),!0)},resume:function(){if(!this.isPaused||this.isFinished)return!1;var t=this.isPaused=!1;return this.generatedError&&(this.error(this.generatedError),t=!0),this.previous&&this.previous.resume(),!t},flush:function(){},processChunk:function(t){this.push(t)},withStreamInfo:function(t,e){return this.extraStreamInfo[t]=e,this.mergeStreamInfo(),this},mergeStreamInfo:function(){for(var t in this.extraStreamInfo)this.extraStreamInfo.hasOwnProperty(t)&&(this.streamInfo[t]=this.extraStreamInfo[t])},lock:function(){if(this.isLocked)throw new Error("The stream '"+this+"' has already been used.");this.isLocked=!0,this.previous&&this.previous.lock()},toString:function(){var t="Worker "+this.name;return this.previous?this.previous+" -> "+t:t}},e.exports=i},{}],29:[function(t,e,r){"use strict";var h=t("../utils"),n=t("./ConvertWorker"),s=t("./GenericWorker"),u=t("../base64"),i=t("../support"),a=t("../external"),o=null;if(i.nodestream)try{o=t("../nodejs/NodejsStreamOutputAdapter")}catch(t){}function l(t,o){return new a.Promise(function(e,r){var i=[],n=t._internalType,s=t._outputType,a=t._mimeType;t.on("data",function(t,e){i.push(t),o&&o(e)}).on("error",function(t){i=[],r(t)}).on("end",function(){try{var t=function(t,e,r){switch(t){case"blob":return h.newBlob(h.transformTo("arraybuffer",e),r);case"base64":return u.encode(e);default:return h.transformTo(t,e)}}(s,function(t,e){var r,i=0,n=null,s=0;for(r=0;r<e.length;r++)s+=e[r].length;switch(t){case"string":return e.join("");case"array":return Array.prototype.concat.apply([],e);case"uint8array":for(n=new Uint8Array(s),r=0;r<e.length;r++)n.set(e[r],i),i+=e[r].length;return n;case"nodebuffer":return Buffer.concat(e);default:throw new Error("concat : unsupported type '"+t+"'")}}(n,i),a);e(t)}catch(t){r(t)}i=[]}).resume()})}function f(t,e,r){var i=e;switch(e){case"blob":case"arraybuffer":i="uint8array";break;case"base64":i="string"}try{this._internalType=i,this._outputType=e,this._mimeType=r,h.checkSupport(i),this._worker=t.pipe(new n(i)),t.lock()}catch(t){this._worker=new s("error"),this._worker.error(t)}}f.prototype={accumulate:function(t){return l(this,t)},on:function(t,e){var r=this;return"data"===t?this._worker.on(t,function(t){e.call(r,t.data,t.meta)}):this._worker.on(t,function(){h.delay(e,arguments,r)}),this},resume:function(){return h.delay(this._worker.resume,[],this._worker),this},pause:function(){return this._worker.pause(),this},toNodejsStream:function(t){if(h.checkSupport("nodestream"),"nodebuffer"!==this._outputType)throw new Error(this._outputType+" is not supported by this method");return new o(this,{objectMode:"nodebuffer"!==this._outputType},t)}},e.exports=f},{"../base64":1,"../external":6,"../nodejs/NodejsStreamOutputAdapter":13,"../support":30,"../utils":32,"./ConvertWorker":24,"./GenericWorker":28}],30:[function(t,e,r){"use strict";if(r.base64=!0,r.array=!0,r.string=!0,r.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,r.nodebuffer="undefined"!=typeof Buffer,r.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)r.blob=!1;else{var i=new ArrayBuffer(0);try{r.blob=0===new Blob([i],{type:"application/zip"}).size}catch(t){try{var n=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);n.append(i),r.blob=0===n.getBlob("application/zip").size}catch(t){r.blob=!1}}}try{r.nodestream=!!t("readable-stream").Readable}catch(t){r.nodestream=!1}},{"readable-stream":16}],31:[function(t,e,s){"use strict";for(var o=t("./utils"),h=t("./support"),r=t("./nodejsUtils"),i=t("./stream/GenericWorker"),u=new Array(256),n=0;n<256;n++)u[n]=252<=n?6:248<=n?5:240<=n?4:224<=n?3:192<=n?2:1;u[254]=u[254]=1;function a(){i.call(this,"utf-8 decode"),this.leftOver=null}function l(){i.call(this,"utf-8 encode")}s.utf8encode=function(t){return h.nodebuffer?r.newBufferFrom(t,"utf-8"):function(t){var e,r,i,n,s,a=t.length,o=0;for(n=0;n<a;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),o+=r<128?1:r<2048?2:r<65536?3:4;for(e=h.uint8array?new Uint8Array(o):new Array(o),n=s=0;s<o;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),r<128?e[s++]=r:(r<2048?e[s++]=192|r>>>6:(r<65536?e[s++]=224|r>>>12:(e[s++]=240|r>>>18,e[s++]=128|r>>>12&63),e[s++]=128|r>>>6&63),e[s++]=128|63&r);return e}(t)},s.utf8decode=function(t){return h.nodebuffer?o.transformTo("nodebuffer",t).toString("utf-8"):function(t){var e,r,i,n,s=t.length,a=new Array(2*s);for(e=r=0;e<s;)if((i=t[e++])<128)a[r++]=i;else if(4<(n=u[i]))a[r++]=65533,e+=n-1;else{for(i&=2===n?31:3===n?15:7;1<n&&e<s;)i=i<<6|63&t[e++],n--;1<n?a[r++]=65533:i<65536?a[r++]=i:(i-=65536,a[r++]=55296|i>>10&1023,a[r++]=56320|1023&i)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(t=o.transformTo(h.uint8array?"uint8array":"array",t))},o.inherits(a,i),a.prototype.processChunk=function(t){var e=o.transformTo(h.uint8array?"uint8array":"array",t.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=e;(e=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),e.set(r,this.leftOver.length)}else e=this.leftOver.concat(e);this.leftOver=null}var i=function(t,e){var r;for((e=e||t.length)>t.length&&(e=t.length),r=e-1;0<=r&&128==(192&t[r]);)r--;return r<0?e:0===r?e:r+u[t[r]]>e?r:e}(e),n=e;i!==e.length&&(h.uint8array?(n=e.subarray(0,i),this.leftOver=e.subarray(i,e.length)):(n=e.slice(0,i),this.leftOver=e.slice(i,e.length))),this.push({data:s.utf8decode(n),meta:t.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,i),l.prototype.processChunk=function(t){this.push({data:s.utf8encode(t.data),meta:t.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(t,e,a){"use strict";var o=t("./support"),h=t("./base64"),r=t("./nodejsUtils"),i=t("set-immediate-shim"),u=t("./external");function n(t){return t}function l(t,e){for(var r=0;r<t.length;++r)e[r]=255&t.charCodeAt(r);return e}a.newBlob=function(e,r){a.checkSupport("blob");try{return new Blob([e],{type:r})}catch(t){try{var i=new(self.BlobBuilder||self.WebKitBlobBuilder||self.MozBlobBuilder||self.MSBlobBuilder);return i.append(e),i.getBlob(r)}catch(t){throw new Error("Bug : can't construct the Blob.")}}};var s={stringifyByChunk:function(t,e,r){var i=[],n=0,s=t.length;if(s<=r)return String.fromCharCode.apply(null,t);for(;n<s;)"array"===e||"nodebuffer"===e?i.push(String.fromCharCode.apply(null,t.slice(n,Math.min(n+r,s)))):i.push(String.fromCharCode.apply(null,t.subarray(n,Math.min(n+r,s)))),n+=r;return i.join("")},stringifyByChar:function(t){for(var e="",r=0;r<t.length;r++)e+=String.fromCharCode(t[r]);return e},applyCanBeUsed:{uint8array:function(){try{return o.uint8array&&1===String.fromCharCode.apply(null,new Uint8Array(1)).length}catch(t){return!1}}(),nodebuffer:function(){try{return o.nodebuffer&&1===String.fromCharCode.apply(null,r.allocBuffer(1)).length}catch(t){return!1}}()}};function f(t){var e=65536,r=a.getTypeOf(t),i=!0;if("uint8array"===r?i=s.applyCanBeUsed.uint8array:"nodebuffer"===r&&(i=s.applyCanBeUsed.nodebuffer),i)for(;1<e;)try{return s.stringifyByChunk(t,r,e)}catch(t){e=Math.floor(e/2)}return s.stringifyByChar(t)}function d(t,e){for(var r=0;r<t.length;r++)e[r]=t[r];return e}a.applyFromCharCode=f;var c={};c.string={string:n,array:function(t){return l(t,new Array(t.length))},arraybuffer:function(t){return c.string.uint8array(t).buffer},uint8array:function(t){return l(t,new Uint8Array(t.length))},nodebuffer:function(t){return l(t,r.allocBuffer(t.length))}},c.array={string:f,array:n,arraybuffer:function(t){return new Uint8Array(t).buffer},uint8array:function(t){return new Uint8Array(t)},nodebuffer:function(t){return r.newBufferFrom(t)}},c.arraybuffer={string:function(t){return f(new Uint8Array(t))},array:function(t){return d(new Uint8Array(t),new Array(t.byteLength))},arraybuffer:n,uint8array:function(t){return new Uint8Array(t)},nodebuffer:function(t){return r.newBufferFrom(new Uint8Array(t))}},c.uint8array={string:f,array:function(t){return d(t,new Array(t.length))},arraybuffer:function(t){return t.buffer},uint8array:n,nodebuffer:function(t){return r.newBufferFrom(t)}},c.nodebuffer={string:f,array:function(t){return d(t,new Array(t.length))},arraybuffer:function(t){return c.nodebuffer.uint8array(t).buffer},uint8array:function(t){return d(t,new Uint8Array(t.length))},nodebuffer:n},a.transformTo=function(t,e){if(e=e||"",!t)return e;a.checkSupport(t);var r=a.getTypeOf(e);return c[r][t](e)},a.getTypeOf=function(t){return"string"==typeof t?"string":"[object Array]"===Object.prototype.toString.call(t)?"array":o.nodebuffer&&r.isBuffer(t)?"nodebuffer":o.uint8array&&t instanceof Uint8Array?"uint8array":o.arraybuffer&&t instanceof ArrayBuffer?"arraybuffer":void 0},a.checkSupport=function(t){if(!o[t.toLowerCase()])throw new Error(t+" is not supported by this platform")},a.MAX_VALUE_16BITS=65535,a.MAX_VALUE_32BITS=-1,a.pretty=function(t){var e,r,i="";for(r=0;r<(t||"").length;r++)i+="\\x"+((e=t.charCodeAt(r))<16?"0":"")+e.toString(16).toUpperCase();return i},a.delay=function(t,e,r){i(function(){t.apply(r||null,e||[])})},a.inherits=function(t,e){function r(){}r.prototype=e.prototype,t.prototype=new r},a.extend=function(){var t,e,r={};for(t=0;t<arguments.length;t++)for(e in arguments[t])arguments[t].hasOwnProperty(e)&&void 0===r[e]&&(r[e]=arguments[t][e]);return r},a.prepareContent=function(r,t,i,n,s){return u.Promise.resolve(t).then(function(i){return o.blob&&(i instanceof Blob||-1!==["[object File]","[object Blob]"].indexOf(Object.prototype.toString.call(i)))&&"undefined"!=typeof FileReader?new u.Promise(function(e,r){var t=new FileReader;t.onload=function(t){e(t.target.result)},t.onerror=function(t){r(t.target.error)},t.readAsArrayBuffer(i)}):i}).then(function(t){var e=a.getTypeOf(t);return e?("arraybuffer"===e?t=a.transformTo("uint8array",t):"string"===e&&(s?t=h.decode(t):i&&!0!==n&&(t=function(t){return l(t,o.uint8array?new Uint8Array(t.length):new Array(t.length))}(t))),t):u.Promise.reject(new Error("Can't read the data of '"+r+"'. Is it in a supported JavaScript type (String, Blob, ArrayBuffer, etc) ?"))})}},{"./base64":1,"./external":6,"./nodejsUtils":14,"./support":30,"set-immediate-shim":54}],33:[function(t,e,r){"use strict";var i=t("./reader/readerFor"),n=t("./utils"),s=t("./signature"),a=t("./zipEntry"),o=(t("./utf8"),t("./support"));function h(t){this.files=[],this.loadOptions=t}h.prototype={checkSignature:function(t){if(!this.reader.readAndCheckSignature(t)){this.reader.index-=4;var e=this.reader.readString(4);throw new Error("Corrupted zip or bug: unexpected signature ("+n.pretty(e)+", expected "+n.pretty(t)+")")}},isSignature:function(t,e){var r=this.reader.index;this.reader.setIndex(t);var i=this.reader.readString(4)===e;return this.reader.setIndex(r),i},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2);var t=this.reader.readData(this.zipCommentLength),e=o.uint8array?"uint8array":"array",r=n.transformTo(e,t);this.zipComment=this.loadOptions.decodeFileName(r)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.reader.skip(4),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var t,e,r,i=this.zip64EndOfCentralSize-44;0<i;)t=this.reader.readInt(2),e=this.reader.readInt(4),r=this.reader.readData(e),this.zip64ExtensibleData[t]={id:t,length:e,value:r}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),1<this.disksCount)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var t,e;for(t=0;t<this.files.length;t++)e=this.files[t],this.reader.setIndex(e.localHeaderOffset),this.checkSignature(s.LOCAL_FILE_HEADER),e.readLocalPart(this.reader),e.handleUTF8(),e.processAttributes()},readCentralDir:function(){var t;for(this.reader.setIndex(this.centralDirOffset);this.reader.readAndCheckSignature(s.CENTRAL_FILE_HEADER);)(t=new a({zip64:this.zip64},this.loadOptions)).readCentralPart(this.reader),this.files.push(t);if(this.centralDirRecords!==this.files.length&&0!==this.centralDirRecords&&0===this.files.length)throw new Error("Corrupted zip or bug: expected "+this.centralDirRecords+" records in central dir, got "+this.files.length)},readEndOfCentral:function(){var t=this.reader.lastIndexOfSignature(s.CENTRAL_DIRECTORY_END);if(t<0)throw!this.isSignature(0,s.LOCAL_FILE_HEADER)?new Error("Can't find end of central directory : is this a zip file ? If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html"):new Error("Corrupted zip: can't find end of central directory");this.reader.setIndex(t);var e=t;if(this.checkSignature(s.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===n.MAX_VALUE_16BITS||this.diskWithCentralDirStart===n.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===n.MAX_VALUE_16BITS||this.centralDirRecords===n.MAX_VALUE_16BITS||this.centralDirSize===n.MAX_VALUE_32BITS||this.centralDirOffset===n.MAX_VALUE_32BITS){if(this.zip64=!0,(t=this.reader.lastIndexOfSignature(s.ZIP64_CENTRAL_DIRECTORY_LOCATOR))<0)throw new Error("Corrupted zip: can't find the ZIP64 end of central directory locator");if(this.reader.setIndex(t),this.checkSignature(s.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),!this.isSignature(this.relativeOffsetEndOfZip64CentralDir,s.ZIP64_CENTRAL_DIRECTORY_END)&&(this.relativeOffsetEndOfZip64CentralDir=this.reader.lastIndexOfSignature(s.ZIP64_CENTRAL_DIRECTORY_END),this.relativeOffsetEndOfZip64CentralDir<0))throw new Error("Corrupted zip: can't find the ZIP64 end of central directory");this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(s.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}var r=this.centralDirOffset+this.centralDirSize;this.zip64&&(r+=20,r+=12+this.zip64EndOfCentralSize);var i=e-r;if(0<i)this.isSignature(e,s.CENTRAL_FILE_HEADER)||(this.reader.zero=i);else if(i<0)throw new Error("Corrupted zip: missing "+Math.abs(i)+" bytes.")},prepareReader:function(t){this.reader=i(t)},load:function(t){this.prepareReader(t),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},e.exports=h},{"./reader/readerFor":22,"./signature":23,"./support":30,"./utf8":31,"./utils":32,"./zipEntry":34}],34:[function(t,e,r){"use strict";var i=t("./reader/readerFor"),s=t("./utils"),n=t("./compressedObject"),a=t("./crc32"),o=t("./utf8"),h=t("./compressions"),u=t("./support");function l(t,e){this.options=t,this.loadOptions=e}l.prototype={isEncrypted:function(){return 1==(1&this.bitFlag)},useUTF8:function(){return 2048==(2048&this.bitFlag)},readLocalPart:function(t){var e,r;if(t.skip(22),this.fileNameLength=t.readInt(2),r=t.readInt(2),this.fileName=t.readData(this.fileNameLength),t.skip(r),-1===this.compressedSize||-1===this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize === -1 || uncompressedSize === -1)");if(null===(e=function(t){for(var e in h)if(h.hasOwnProperty(e)&&h[e].magic===t)return h[e];return null}(this.compressionMethod)))throw new Error("Corrupted zip : compression "+s.pretty(this.compressionMethod)+" unknown (inner file : "+s.transformTo("string",this.fileName)+")");this.decompressed=new n(this.compressedSize,this.uncompressedSize,this.crc32,e,t.readData(this.compressedSize))},readCentralPart:function(t){this.versionMadeBy=t.readInt(2),t.skip(2),this.bitFlag=t.readInt(2),this.compressionMethod=t.readString(2),this.date=t.readDate(),this.crc32=t.readInt(4),this.compressedSize=t.readInt(4),this.uncompressedSize=t.readInt(4);var e=t.readInt(2);if(this.extraFieldsLength=t.readInt(2),this.fileCommentLength=t.readInt(2),this.diskNumberStart=t.readInt(2),this.internalFileAttributes=t.readInt(2),this.externalFileAttributes=t.readInt(4),this.localHeaderOffset=t.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");t.skip(e),this.readExtraFields(t),this.parseZIP64ExtraField(t),this.fileComment=t.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var t=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),0==t&&(this.dosPermissions=63&this.externalFileAttributes),3==t&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(t){if(this.extraFields[1]){var e=i(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(t){var e,r,i,n=t.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});t.index<n;)e=t.readInt(2),r=t.readInt(2),i=t.readData(r),this.extraFields[e]={id:e,length:r,value:i}},handleUTF8:function(){var t=u.uint8array?"uint8array":"array";if(this.useUTF8())this.fileNameStr=o.utf8decode(this.fileName),this.fileCommentStr=o.utf8decode(this.fileComment);else{var e=this.findExtraFieldUnicodePath();if(null!==e)this.fileNameStr=e;else{var r=s.transformTo(t,this.fileName);this.fileNameStr=this.loadOptions.decodeFileName(r)}var i=this.findExtraFieldUnicodeComment();if(null!==i)this.fileCommentStr=i;else{var n=s.transformTo(t,this.fileComment);this.fileCommentStr=this.loadOptions.decodeFileName(n)}}},findExtraFieldUnicodePath:function(){var t=this.extraFields[28789];if(t){var e=i(t.value);return 1!==e.readInt(1)?null:a(this.fileName)!==e.readInt(4)?null:o.utf8decode(e.readData(t.length-5))}return null},findExtraFieldUnicodeComment:function(){var t=this.extraFields[25461];if(t){var e=i(t.value);return 1!==e.readInt(1)?null:a(this.fileComment)!==e.readInt(4)?null:o.utf8decode(e.readData(t.length-5))}return null}},e.exports=l},{"./compressedObject":2,"./compressions":3,"./crc32":4,"./reader/readerFor":22,"./support":30,"./utf8":31,"./utils":32}],35:[function(t,e,r){"use strict";function i(t,e,r){this.name=t,this.dir=r.dir,this.date=r.date,this.comment=r.comment,this.unixPermissions=r.unixPermissions,this.dosPermissions=r.dosPermissions,this._data=e,this._dataBinary=r.binary,this.options={compression:r.compression,compressionOptions:r.compressionOptions}}var s=t("./stream/StreamHelper"),n=t("./stream/DataWorker"),a=t("./utf8"),o=t("./compressedObject"),h=t("./stream/GenericWorker");i.prototype={internalStream:function(t){var e=null,r="string";try{if(!t)throw new Error("No output type specified.");var i="string"===(r=t.toLowerCase())||"text"===r;"binarystring"!==r&&"text"!==r||(r="string"),e=this._decompressWorker();var n=!this._dataBinary;n&&!i&&(e=e.pipe(new a.Utf8EncodeWorker)),!n&&i&&(e=e.pipe(new a.Utf8DecodeWorker))}catch(t){(e=new h("error")).error(t)}return new s(e,r,"")},async:function(t,e){return this.internalStream(t).accumulate(e)},nodeStream:function(t,e){return this.internalStream(t||"nodebuffer").toNodejsStream(e)},_compressWorker:function(t,e){if(this._data instanceof o&&this._data.compression.magic===t.magic)return this._data.getCompressedWorker();var r=this._decompressWorker();return this._dataBinary||(r=r.pipe(new a.Utf8EncodeWorker)),o.createWorkerFrom(r,t,e)},_decompressWorker:function(){return this._data instanceof o?this._data.getContentWorker():this._data instanceof h?this._data:new n(this._data)}};for(var u=["asText","asBinary","asNodeBuffer","asUint8Array","asArrayBuffer"],l=function(){throw new Error("This method has been removed in JSZip 3.0, please check the upgrade guide.")},f=0;f<u.length;f++)i.prototype[u[f]]=l;e.exports=i},{"./compressedObject":2,"./stream/DataWorker":27,"./stream/GenericWorker":28,"./stream/StreamHelper":29,"./utf8":31}],36:[function(t,l,e){(function(e){"use strict";var r,i,t=e.MutationObserver||e.WebKitMutationObserver;if(t){var n=0,s=new t(u),a=e.document.createTextNode("");s.observe(a,{characterData:!0}),r=function(){a.data=n=++n%2}}else if(e.setImmediate||void 0===e.MessageChannel)r="document"in e&&"onreadystatechange"in e.document.createElement("script")?function(){var t=e.document.createElement("script");t.onreadystatechange=function(){u(),t.onreadystatechange=null,t.parentNode.removeChild(t),t=null},e.document.documentElement.appendChild(t)}:function(){setTimeout(u,0)};else{var o=new e.MessageChannel;o.port1.onmessage=u,r=function(){o.port2.postMessage(0)}}var h=[];function u(){var t,e;i=!0;for(var r=h.length;r;){for(e=h,h=[],t=-1;++t<r;)e[t]();r=h.length}i=!1}l.exports=function(t){1!==h.push(t)||i||r()}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],37:[function(t,e,r){"use strict";var n=t("immediate");function u(){}var l={},s=["REJECTED"],a=["FULFILLED"],i=["PENDING"];function o(t){if("function"!=typeof t)throw new TypeError("resolver must be a function");this.state=i,this.queue=[],this.outcome=void 0,t!==u&&c(this,t)}function h(t,e,r){this.promise=t,"function"==typeof e&&(this.onFulfilled=e,this.callFulfilled=this.otherCallFulfilled),"function"==typeof r&&(this.onRejected=r,this.callRejected=this.otherCallRejected)}function f(e,r,i){n(function(){var t;try{t=r(i)}catch(t){return l.reject(e,t)}t===e?l.reject(e,new TypeError("Cannot resolve promise with itself")):l.resolve(e,t)})}function d(t){var e=t&&t.then;if(t&&("object"==typeof t||"function"==typeof t)&&"function"==typeof e)return function(){e.apply(t,arguments)}}function c(e,t){var r=!1;function i(t){r||(r=!0,l.reject(e,t))}function n(t){r||(r=!0,l.resolve(e,t))}var s=p(function(){t(n,i)});"error"===s.status&&i(s.value)}function p(t,e){var r={};try{r.value=t(e),r.status="success"}catch(t){r.status="error",r.value=t}return r}(e.exports=o).prototype.finally=function(e){if("function"!=typeof e)return this;var r=this.constructor;return this.then(function(t){return r.resolve(e()).then(function(){return t})},function(t){return r.resolve(e()).then(function(){throw t})})},o.prototype.catch=function(t){return this.then(null,t)},o.prototype.then=function(t,e){if("function"!=typeof t&&this.state===a||"function"!=typeof e&&this.state===s)return this;var r=new this.constructor(u);this.state!==i?f(r,this.state===a?t:e,this.outcome):this.queue.push(new h(r,t,e));return r},h.prototype.callFulfilled=function(t){l.resolve(this.promise,t)},h.prototype.otherCallFulfilled=function(t){f(this.promise,this.onFulfilled,t)},h.prototype.callRejected=function(t){l.reject(this.promise,t)},h.prototype.otherCallRejected=function(t){f(this.promise,this.onRejected,t)},l.resolve=function(t,e){var r=p(d,e);if("error"===r.status)return l.reject(t,r.value);var i=r.value;if(i)c(t,i);else{t.state=a,t.outcome=e;for(var n=-1,s=t.queue.length;++n<s;)t.queue[n].callFulfilled(e)}return t},l.reject=function(t,e){t.state=s,t.outcome=e;for(var r=-1,i=t.queue.length;++r<i;)t.queue[r].callRejected(e);return t},o.resolve=function(t){if(t instanceof this)return t;return l.resolve(new this(u),t)},o.reject=function(t){var e=new this(u);return l.reject(e,t)},o.all=function(t){var r=this;if("[object Array]"!==Object.prototype.toString.call(t))return this.reject(new TypeError("must be an array"));var i=t.length,n=!1;if(!i)return this.resolve([]);var s=new Array(i),a=0,e=-1,o=new this(u);for(;++e<i;)h(t[e],e);return o;function h(t,e){r.resolve(t).then(function(t){s[e]=t,++a!==i||n||(n=!0,l.resolve(o,s))},function(t){n||(n=!0,l.reject(o,t))})}},o.race=function(t){var e=this;if("[object Array]"!==Object.prototype.toString.call(t))return this.reject(new TypeError("must be an array"));var r=t.length,i=!1;if(!r)return this.resolve([]);var n=-1,s=new this(u);for(;++n<r;)a=t[n],e.resolve(a).then(function(t){i||(i=!0,l.resolve(s,t))},function(t){i||(i=!0,l.reject(s,t))});var a;return s}},{immediate:36}],38:[function(t,e,r){"use strict";var i={};(0,t("./lib/utils/common").assign)(i,t("./lib/deflate"),t("./lib/inflate"),t("./lib/zlib/constants")),e.exports=i},{"./lib/deflate":39,"./lib/inflate":40,"./lib/utils/common":41,"./lib/zlib/constants":44}],39:[function(t,e,r){"use strict";var a=t("./zlib/deflate"),o=t("./utils/common"),h=t("./utils/strings"),n=t("./zlib/messages"),s=t("./zlib/zstream"),u=Object.prototype.toString,l=0,f=-1,d=0,c=8;function p(t){if(!(this instanceof p))return new p(t);this.options=o.assign({level:f,method:c,chunkSize:16384,windowBits:15,memLevel:8,strategy:d,to:""},t||{});var e=this.options;e.raw&&0<e.windowBits?e.windowBits=-e.windowBits:e.gzip&&0<e.windowBits&&e.windowBits<16&&(e.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new s,this.strm.avail_out=0;var r=a.deflateInit2(this.strm,e.level,e.method,e.windowBits,e.memLevel,e.strategy);if(r!==l)throw new Error(n[r]);if(e.header&&a.deflateSetHeader(this.strm,e.header),e.dictionary){var i;if(i="string"==typeof e.dictionary?h.string2buf(e.dictionary):"[object ArrayBuffer]"===u.call(e.dictionary)?new Uint8Array(e.dictionary):e.dictionary,(r=a.deflateSetDictionary(this.strm,i))!==l)throw new Error(n[r]);this._dict_set=!0}}function i(t,e){var r=new p(e);if(r.push(t,!0),r.err)throw r.msg||n[r.err];return r.result}p.prototype.push=function(t,e){var r,i,n=this.strm,s=this.options.chunkSize;if(this.ended)return!1;i=e===~~e?e:!0===e?4:0,"string"==typeof t?n.input=h.string2buf(t):"[object ArrayBuffer]"===u.call(t)?n.input=new Uint8Array(t):n.input=t,n.next_in=0,n.avail_in=n.input.length;do{if(0===n.avail_out&&(n.output=new o.Buf8(s),n.next_out=0,n.avail_out=s),1!==(r=a.deflate(n,i))&&r!==l)return this.onEnd(r),!(this.ended=!0);0!==n.avail_out&&(0!==n.avail_in||4!==i&&2!==i)||("string"===this.options.to?this.onData(h.buf2binstring(o.shrinkBuf(n.output,n.next_out))):this.onData(o.shrinkBuf(n.output,n.next_out)))}while((0<n.avail_in||0===n.avail_out)&&1!==r);return 4===i?(r=a.deflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===l):2!==i||(this.onEnd(l),!(n.avail_out=0))},p.prototype.onData=function(t){this.chunks.push(t)},p.prototype.onEnd=function(t){t===l&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=o.flattenChunks(this.chunks)),this.chunks=[],this.err=t,this.msg=this.strm.msg},r.Deflate=p,r.deflate=i,r.deflateRaw=function(t,e){return(e=e||{}).raw=!0,i(t,e)},r.gzip=function(t,e){return(e=e||{}).gzip=!0,i(t,e)}},{"./utils/common":41,"./utils/strings":42,"./zlib/deflate":46,"./zlib/messages":51,"./zlib/zstream":53}],40:[function(t,e,r){"use strict";var d=t("./zlib/inflate"),c=t("./utils/common"),p=t("./utils/strings"),m=t("./zlib/constants"),i=t("./zlib/messages"),n=t("./zlib/zstream"),s=t("./zlib/gzheader"),_=Object.prototype.toString;function a(t){if(!(this instanceof a))return new a(t);this.options=c.assign({chunkSize:16384,windowBits:0,to:""},t||{});var e=this.options;e.raw&&0<=e.windowBits&&e.windowBits<16&&(e.windowBits=-e.windowBits,0===e.windowBits&&(e.windowBits=-15)),!(0<=e.windowBits&&e.windowBits<16)||t&&t.windowBits||(e.windowBits+=32),15<e.windowBits&&e.windowBits<48&&0==(15&e.windowBits)&&(e.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new n,this.strm.avail_out=0;var r=d.inflateInit2(this.strm,e.windowBits);if(r!==m.Z_OK)throw new Error(i[r]);this.header=new s,d.inflateGetHeader(this.strm,this.header)}function o(t,e){var r=new a(e);if(r.push(t,!0),r.err)throw r.msg||i[r.err];return r.result}a.prototype.push=function(t,e){var r,i,n,s,a,o,h=this.strm,u=this.options.chunkSize,l=this.options.dictionary,f=!1;if(this.ended)return!1;i=e===~~e?e:!0===e?m.Z_FINISH:m.Z_NO_FLUSH,"string"==typeof t?h.input=p.binstring2buf(t):"[object ArrayBuffer]"===_.call(t)?h.input=new Uint8Array(t):h.input=t,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new c.Buf8(u),h.next_out=0,h.avail_out=u),(r=d.inflate(h,m.Z_NO_FLUSH))===m.Z_NEED_DICT&&l&&(o="string"==typeof l?p.string2buf(l):"[object ArrayBuffer]"===_.call(l)?new Uint8Array(l):l,r=d.inflateSetDictionary(this.strm,o)),r===m.Z_BUF_ERROR&&!0===f&&(r=m.Z_OK,f=!1),r!==m.Z_STREAM_END&&r!==m.Z_OK)return this.onEnd(r),!(this.ended=!0);h.next_out&&(0!==h.avail_out&&r!==m.Z_STREAM_END&&(0!==h.avail_in||i!==m.Z_FINISH&&i!==m.Z_SYNC_FLUSH)||("string"===this.options.to?(n=p.utf8border(h.output,h.next_out),s=h.next_out-n,a=p.buf2string(h.output,n),h.next_out=s,h.avail_out=u-s,s&&c.arraySet(h.output,h.output,n,s,0),this.onData(a)):this.onData(c.shrinkBuf(h.output,h.next_out)))),0===h.avail_in&&0===h.avail_out&&(f=!0)}while((0<h.avail_in||0===h.avail_out)&&r!==m.Z_STREAM_END);return r===m.Z_STREAM_END&&(i=m.Z_FINISH),i===m.Z_FINISH?(r=d.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===m.Z_OK):i!==m.Z_SYNC_FLUSH||(this.onEnd(m.Z_OK),!(h.avail_out=0))},a.prototype.onData=function(t){this.chunks.push(t)},a.prototype.onEnd=function(t){t===m.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=c.flattenChunks(this.chunks)),this.chunks=[],this.err=t,this.msg=this.strm.msg},r.Inflate=a,r.inflate=o,r.inflateRaw=function(t,e){return(e=e||{}).raw=!0,o(t,e)},r.ungzip=o},{"./utils/common":41,"./utils/strings":42,"./zlib/constants":44,"./zlib/gzheader":47,"./zlib/inflate":49,"./zlib/messages":51,"./zlib/zstream":53}],41:[function(t,e,r){"use strict";var i="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;r.assign=function(t){for(var e=Array.prototype.slice.call(arguments,1);e.length;){var r=e.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var i in r)r.hasOwnProperty(i)&&(t[i]=r[i])}}return t},r.shrinkBuf=function(t,e){return t.length===e?t:t.subarray?t.subarray(0,e):(t.length=e,t)};var n={arraySet:function(t,e,r,i,n){if(e.subarray&&t.subarray)t.set(e.subarray(r,r+i),n);else for(var s=0;s<i;s++)t[n+s]=e[r+s]},flattenChunks:function(t){var e,r,i,n,s,a;for(e=i=0,r=t.length;e<r;e++)i+=t[e].length;for(a=new Uint8Array(i),e=n=0,r=t.length;e<r;e++)s=t[e],a.set(s,n),n+=s.length;return a}},s={arraySet:function(t,e,r,i,n){for(var s=0;s<i;s++)t[n+s]=e[r+s]},flattenChunks:function(t){return[].concat.apply([],t)}};r.setTyped=function(t){t?(r.Buf8=Uint8Array,r.Buf16=Uint16Array,r.Buf32=Int32Array,r.assign(r,n)):(r.Buf8=Array,r.Buf16=Array,r.Buf32=Array,r.assign(r,s))},r.setTyped(i)},{}],42:[function(t,e,r){"use strict";var h=t("./common"),n=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(t){n=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(t){s=!1}for(var u=new h.Buf8(256),i=0;i<256;i++)u[i]=252<=i?6:248<=i?5:240<=i?4:224<=i?3:192<=i?2:1;function l(t,e){if(e<65537&&(t.subarray&&s||!t.subarray&&n))return String.fromCharCode.apply(null,h.shrinkBuf(t,e));for(var r="",i=0;i<e;i++)r+=String.fromCharCode(t[i]);return r}u[254]=u[254]=1,r.string2buf=function(t){var e,r,i,n,s,a=t.length,o=0;for(n=0;n<a;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),o+=r<128?1:r<2048?2:r<65536?3:4;for(e=new h.Buf8(o),n=s=0;s<o;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<a&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),r<128?e[s++]=r:(r<2048?e[s++]=192|r>>>6:(r<65536?e[s++]=224|r>>>12:(e[s++]=240|r>>>18,e[s++]=128|r>>>12&63),e[s++]=128|r>>>6&63),e[s++]=128|63&r);return e},r.buf2binstring=function(t){return l(t,t.length)},r.binstring2buf=function(t){for(var e=new h.Buf8(t.length),r=0,i=e.length;r<i;r++)e[r]=t.charCodeAt(r);return e},r.buf2string=function(t,e){var r,i,n,s,a=e||t.length,o=new Array(2*a);for(r=i=0;r<a;)if((n=t[r++])<128)o[i++]=n;else if(4<(s=u[n]))o[i++]=65533,r+=s-1;else{for(n&=2===s?31:3===s?15:7;1<s&&r<a;)n=n<<6|63&t[r++],s--;1<s?o[i++]=65533:n<65536?o[i++]=n:(n-=65536,o[i++]=55296|n>>10&1023,o[i++]=56320|1023&n)}return l(o,i)},r.utf8border=function(t,e){var r;for((e=e||t.length)>t.length&&(e=t.length),r=e-1;0<=r&&128==(192&t[r]);)r--;return r<0?e:0===r?e:r+u[t[r]]>e?r:e}},{"./common":41}],43:[function(t,e,r){"use strict";e.exports=function(t,e,r,i){for(var n=65535&t|0,s=t>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3<r?2e3:r;s=s+(n=n+e[i++]|0)|0,--a;);n%=65521,s%=65521}return n|s<<16|0}},{}],44:[function(t,e,r){"use strict";e.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],45:[function(t,e,r){"use strict";var o=function(){for(var t,e=[],r=0;r<256;r++){t=r;for(var i=0;i<8;i++)t=1&t?3988292384^t>>>1:t>>>1;e[r]=t}return e}();e.exports=function(t,e,r,i){var n=o,s=i+r;t^=-1;for(var a=i;a<s;a++)t=t>>>8^n[255&(t^e[a])];return-1^t}},{}],46:[function(t,e,r){"use strict";var h,d=t("../utils/common"),u=t("./trees"),c=t("./adler32"),p=t("./crc32"),i=t("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,n=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(t,e){return t.msg=i[e],e}function T(t){return(t<<1)-(4<t?9:0)}function D(t){for(var e=t.length;0<=--e;)t[e]=0}function F(t){var e=t.state,r=e.pending;r>t.avail_out&&(r=t.avail_out),0!==r&&(d.arraySet(t.output,e.pending_buf,e.pending_out,r,t.next_out),t.next_out+=r,e.pending_out+=r,t.total_out+=r,t.avail_out-=r,e.pending-=r,0===e.pending&&(e.pending_out=0))}function N(t,e){u._tr_flush_block(t,0<=t.block_start?t.block_start:-1,t.strstart-t.block_start,e),t.block_start=t.strstart,F(t.strm)}function U(t,e){t.pending_buf[t.pending++]=e}function P(t,e){t.pending_buf[t.pending++]=e>>>8&255,t.pending_buf[t.pending++]=255&e}function L(t,e){var r,i,n=t.max_chain_length,s=t.strstart,a=t.prev_length,o=t.nice_match,h=t.strstart>t.w_size-z?t.strstart-(t.w_size-z):0,u=t.window,l=t.w_mask,f=t.prev,d=t.strstart+S,c=u[s+a-1],p=u[s+a];t.prev_length>=t.good_match&&(n>>=2),o>t.lookahead&&(o=t.lookahead);do{if(u[(r=e)+a]===p&&u[r+a-1]===c&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&s<d);if(i=S-(d-s),s=d-S,a<i){if(t.match_start=e,o<=(a=i))break;c=u[s+a-1],p=u[s+a]}}}while((e=f[e&l])>h&&0!=--n);return a<=t.lookahead?a:t.lookahead}function j(t){var e,r,i,n,s,a,o,h,u,l,f=t.w_size;do{if(n=t.window_size-t.lookahead-t.strstart,t.strstart>=f+(f-z)){for(d.arraySet(t.window,t.window,f,f,0),t.match_start-=f,t.strstart-=f,t.block_start-=f,e=r=t.hash_size;i=t.head[--e],t.head[e]=f<=i?i-f:0,--r;);for(e=r=f;i=t.prev[--e],t.prev[e]=f<=i?i-f:0,--r;);n+=f}if(0===t.strm.avail_in)break;if(a=t.strm,o=t.window,h=t.strstart+t.lookahead,u=n,l=void 0,l=a.avail_in,u<l&&(l=u),r=0===l?0:(a.avail_in-=l,d.arraySet(o,a.input,a.next_in,l,h),1===a.state.wrap?a.adler=c(a.adler,o,l,h):2===a.state.wrap&&(a.adler=p(a.adler,o,l,h)),a.next_in+=l,a.total_in+=l,l),t.lookahead+=r,t.lookahead+t.insert>=x)for(s=t.strstart-t.insert,t.ins_h=t.window[s],t.ins_h=(t.ins_h<<t.hash_shift^t.window[s+1])&t.hash_mask;t.insert&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[s+x-1])&t.hash_mask,t.prev[s&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=s,s++,t.insert--,!(t.lookahead+t.insert<x)););}while(t.lookahead<z&&0!==t.strm.avail_in)}function Z(t,e){for(var r,i;;){if(t.lookahead<z){if(j(t),t.lookahead<z&&e===l)return A;if(0===t.lookahead)break}if(r=0,t.lookahead>=x&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart),0!==r&&t.strstart-r<=t.w_size-z&&(t.match_length=L(t,r)),t.match_length>=x)if(i=u._tr_tally(t,t.strstart-t.match_start,t.match_length-x),t.lookahead-=t.match_length,t.match_length<=t.max_lazy_match&&t.lookahead>=x){for(t.match_length--;t.strstart++,t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart,0!=--t.match_length;);t.strstart++}else t.strstart+=t.match_length,t.match_length=0,t.ins_h=t.window[t.strstart],t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+1])&t.hash_mask;else i=u._tr_tally(t,0,t.window[t.strstart]),t.lookahead--,t.strstart++;if(i&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=t.strstart<x-1?t.strstart:x-1,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}function W(t,e){for(var r,i,n;;){if(t.lookahead<z){if(j(t),t.lookahead<z&&e===l)return A;if(0===t.lookahead)break}if(r=0,t.lookahead>=x&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart),t.prev_length=t.match_length,t.prev_match=t.match_start,t.match_length=x-1,0!==r&&t.prev_length<t.max_lazy_match&&t.strstart-r<=t.w_size-z&&(t.match_length=L(t,r),t.match_length<=5&&(1===t.strategy||t.match_length===x&&4096<t.strstart-t.match_start)&&(t.match_length=x-1)),t.prev_length>=x&&t.match_length<=t.prev_length){for(n=t.strstart+t.lookahead-x,i=u._tr_tally(t,t.strstart-1-t.prev_match,t.prev_length-x),t.lookahead-=t.prev_length-1,t.prev_length-=2;++t.strstart<=n&&(t.ins_h=(t.ins_h<<t.hash_shift^t.window[t.strstart+x-1])&t.hash_mask,r=t.prev[t.strstart&t.w_mask]=t.head[t.ins_h],t.head[t.ins_h]=t.strstart),0!=--t.prev_length;);if(t.match_available=0,t.match_length=x-1,t.strstart++,i&&(N(t,!1),0===t.strm.avail_out))return A}else if(t.match_available){if((i=u._tr_tally(t,0,t.window[t.strstart-1]))&&N(t,!1),t.strstart++,t.lookahead--,0===t.strm.avail_out)return A}else t.match_available=1,t.strstart++,t.lookahead--}return t.match_available&&(i=u._tr_tally(t,0,t.window[t.strstart-1]),t.match_available=0),t.insert=t.strstart<x-1?t.strstart:x-1,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}function M(t,e,r,i,n){this.good_length=t,this.max_lazy=e,this.nice_length=r,this.max_chain=i,this.func=n}function H(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=v,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new d.Buf16(2*w),this.dyn_dtree=new d.Buf16(2*(2*a+1)),this.bl_tree=new d.Buf16(2*(2*o+1)),D(this.dyn_ltree),D(this.dyn_dtree),D(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new d.Buf16(k+1),this.heap=new d.Buf16(2*s+1),D(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new d.Buf16(2*s+1),D(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function G(t){var e;return t&&t.state?(t.total_in=t.total_out=0,t.data_type=n,(e=t.state).pending=0,e.pending_out=0,e.wrap<0&&(e.wrap=-e.wrap),e.status=e.wrap?C:E,t.adler=2===e.wrap?0:1,e.last_flush=l,u._tr_init(e),m):R(t,_)}function K(t){var e=G(t);return e===m&&function(t){t.window_size=2*t.w_size,D(t.head),t.max_lazy_match=h[t.level].max_lazy,t.good_match=h[t.level].good_length,t.nice_match=h[t.level].nice_length,t.max_chain_length=h[t.level].max_chain,t.strstart=0,t.block_start=0,t.lookahead=0,t.insert=0,t.match_length=t.prev_length=x-1,t.match_available=0,t.ins_h=0}(t.state),e}function Y(t,e,r,i,n,s){if(!t)return _;var a=1;if(e===g&&(e=6),i<0?(a=0,i=-i):15<i&&(a=2,i-=16),n<1||y<n||r!==v||i<8||15<i||e<0||9<e||s<0||b<s)return R(t,_);8===i&&(i=9);var o=new H;return(t.state=o).strm=t,o.wrap=a,o.gzhead=null,o.w_bits=i,o.w_size=1<<o.w_bits,o.w_mask=o.w_size-1,o.hash_bits=n+7,o.hash_size=1<<o.hash_bits,o.hash_mask=o.hash_size-1,o.hash_shift=~~((o.hash_bits+x-1)/x),o.window=new d.Buf8(2*o.w_size),o.head=new d.Buf16(o.hash_size),o.prev=new d.Buf16(o.w_size),o.lit_bufsize=1<<n+6,o.pending_buf_size=4*o.lit_bufsize,o.pending_buf=new d.Buf8(o.pending_buf_size),o.d_buf=1*o.lit_bufsize,o.l_buf=3*o.lit_bufsize,o.level=e,o.strategy=s,o.method=r,K(t)}h=[new M(0,0,0,0,function(t,e){var r=65535;for(r>t.pending_buf_size-5&&(r=t.pending_buf_size-5);;){if(t.lookahead<=1){if(j(t),0===t.lookahead&&e===l)return A;if(0===t.lookahead)break}t.strstart+=t.lookahead,t.lookahead=0;var i=t.block_start+r;if((0===t.strstart||t.strstart>=i)&&(t.lookahead=t.strstart-i,t.strstart=i,N(t,!1),0===t.strm.avail_out))return A;if(t.strstart-t.block_start>=t.w_size-z&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=0,e===f?(N(t,!0),0===t.strm.avail_out?O:B):(t.strstart>t.block_start&&(N(t,!1),t.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(t,e){return Y(t,e,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(t,e){return t&&t.state?2!==t.state.wrap?_:(t.state.gzhead=e,m):_},r.deflate=function(t,e){var r,i,n,s;if(!t||!t.state||5<e||e<0)return t?R(t,_):_;if(i=t.state,!t.output||!t.input&&0!==t.avail_in||666===i.status&&e!==f)return R(t,0===t.avail_out?-5:_);if(i.strm=t,r=i.last_flush,i.last_flush=e,i.status===C)if(2===i.wrap)t.adler=0,U(i,31),U(i,139),U(i,8),i.gzhead?(U(i,(i.gzhead.text?1:0)+(i.gzhead.hcrc?2:0)+(i.gzhead.extra?4:0)+(i.gzhead.name?8:0)+(i.gzhead.comment?16:0)),U(i,255&i.gzhead.time),U(i,i.gzhead.time>>8&255),U(i,i.gzhead.time>>16&255),U(i,i.gzhead.time>>24&255),U(i,9===i.level?2:2<=i.strategy||i.level<2?4:0),U(i,255&i.gzhead.os),i.gzhead.extra&&i.gzhead.extra.length&&(U(i,255&i.gzhead.extra.length),U(i,i.gzhead.extra.length>>8&255)),i.gzhead.hcrc&&(t.adler=p(t.adler,i.pending_buf,i.pending,0)),i.gzindex=0,i.status=69):(U(i,0),U(i,0),U(i,0),U(i,0),U(i,0),U(i,9===i.level?2:2<=i.strategy||i.level<2?4:0),U(i,3),i.status=E);else{var a=v+(i.w_bits-8<<4)<<8;a|=(2<=i.strategy||i.level<2?0:i.level<6?1:6===i.level?2:3)<<6,0!==i.strstart&&(a|=32),a+=31-a%31,i.status=E,P(i,a),0!==i.strstart&&(P(i,t.adler>>>16),P(i,65535&t.adler)),t.adler=1}if(69===i.status)if(i.gzhead.extra){for(n=i.pending;i.gzindex<(65535&i.gzhead.extra.length)&&(i.pending!==i.pending_buf_size||(i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),F(t),n=i.pending,i.pending!==i.pending_buf_size));)U(i,255&i.gzhead.extra[i.gzindex]),i.gzindex++;i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),i.gzindex===i.gzhead.extra.length&&(i.gzindex=0,i.status=73)}else i.status=73;if(73===i.status)if(i.gzhead.name){n=i.pending;do{if(i.pending===i.pending_buf_size&&(i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),F(t),n=i.pending,i.pending===i.pending_buf_size)){s=1;break}s=i.gzindex<i.gzhead.name.length?255&i.gzhead.name.charCodeAt(i.gzindex++):0,U(i,s)}while(0!==s);i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),0===s&&(i.gzindex=0,i.status=91)}else i.status=91;if(91===i.status)if(i.gzhead.comment){n=i.pending;do{if(i.pending===i.pending_buf_size&&(i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),F(t),n=i.pending,i.pending===i.pending_buf_size)){s=1;break}s=i.gzindex<i.gzhead.comment.length?255&i.gzhead.comment.charCodeAt(i.gzindex++):0,U(i,s)}while(0!==s);i.gzhead.hcrc&&i.pending>n&&(t.adler=p(t.adler,i.pending_buf,i.pending-n,n)),0===s&&(i.status=103)}else i.status=103;if(103===i.status&&(i.gzhead.hcrc?(i.pending+2>i.pending_buf_size&&F(t),i.pending+2<=i.pending_buf_size&&(U(i,255&t.adler),U(i,t.adler>>8&255),t.adler=0,i.status=E)):i.status=E),0!==i.pending){if(F(t),0===t.avail_out)return i.last_flush=-1,m}else if(0===t.avail_in&&T(e)<=T(r)&&e!==f)return R(t,-5);if(666===i.status&&0!==t.avail_in)return R(t,-5);if(0!==t.avail_in||0!==i.lookahead||e!==l&&666!==i.status){var o=2===i.strategy?function(t,e){for(var r;;){if(0===t.lookahead&&(j(t),0===t.lookahead)){if(e===l)return A;break}if(t.match_length=0,r=u._tr_tally(t,0,t.window[t.strstart]),t.lookahead--,t.strstart++,r&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=0,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}(i,e):3===i.strategy?function(t,e){for(var r,i,n,s,a=t.window;;){if(t.lookahead<=S){if(j(t),t.lookahead<=S&&e===l)return A;if(0===t.lookahead)break}if(t.match_length=0,t.lookahead>=x&&0<t.strstart&&(i=a[n=t.strstart-1])===a[++n]&&i===a[++n]&&i===a[++n]){s=t.strstart+S;do{}while(i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&i===a[++n]&&n<s);t.match_length=S-(s-n),t.match_length>t.lookahead&&(t.match_length=t.lookahead)}if(t.match_length>=x?(r=u._tr_tally(t,1,t.match_length-x),t.lookahead-=t.match_length,t.strstart+=t.match_length,t.match_length=0):(r=u._tr_tally(t,0,t.window[t.strstart]),t.lookahead--,t.strstart++),r&&(N(t,!1),0===t.strm.avail_out))return A}return t.insert=0,e===f?(N(t,!0),0===t.strm.avail_out?O:B):t.last_lit&&(N(t,!1),0===t.strm.avail_out)?A:I}(i,e):h[i.level].func(i,e);if(o!==O&&o!==B||(i.status=666),o===A||o===O)return 0===t.avail_out&&(i.last_flush=-1),m;if(o===I&&(1===e?u._tr_align(i):5!==e&&(u._tr_stored_block(i,0,0,!1),3===e&&(D(i.head),0===i.lookahead&&(i.strstart=0,i.block_start=0,i.insert=0))),F(t),0===t.avail_out))return i.last_flush=-1,m}return e!==f?m:i.wrap<=0?1:(2===i.wrap?(U(i,255&t.adler),U(i,t.adler>>8&255),U(i,t.adler>>16&255),U(i,t.adler>>24&255),U(i,255&t.total_in),U(i,t.total_in>>8&255),U(i,t.total_in>>16&255),U(i,t.total_in>>24&255)):(P(i,t.adler>>>16),P(i,65535&t.adler)),F(t),0<i.wrap&&(i.wrap=-i.wrap),0!==i.pending?m:1)},r.deflateEnd=function(t){var e;return t&&t.state?(e=t.state.status)!==C&&69!==e&&73!==e&&91!==e&&103!==e&&e!==E&&666!==e?R(t,_):(t.state=null,e===E?R(t,-3):m):_},r.deflateSetDictionary=function(t,e){var r,i,n,s,a,o,h,u,l=e.length;if(!t||!t.state)return _;if(2===(s=(r=t.state).wrap)||1===s&&r.status!==C||r.lookahead)return _;for(1===s&&(t.adler=c(t.adler,e,l,0)),r.wrap=0,l>=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new d.Buf8(r.w_size),d.arraySet(u,e,l-r.w_size,r.w_size,0),e=u,l=r.w_size),a=t.avail_in,o=t.next_in,h=t.input,t.avail_in=l,t.next_in=0,t.input=e,j(r);r.lookahead>=x;){for(i=r.strstart,n=r.lookahead-(x-1);r.ins_h=(r.ins_h<<r.hash_shift^r.window[i+x-1])&r.hash_mask,r.prev[i&r.w_mask]=r.head[r.ins_h],r.head[r.ins_h]=i,i++,--n;);r.strstart=i,r.lookahead=x-1,j(r)}return r.strstart+=r.lookahead,r.block_start=r.strstart,r.insert=r.lookahead,r.lookahead=0,r.match_length=r.prev_length=x-1,r.match_available=0,t.next_in=o,t.input=h,t.avail_in=a,r.wrap=s,m},r.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":41,"./adler32":43,"./crc32":45,"./messages":51,"./trees":52}],47:[function(t,e,r){"use strict";e.exports=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}},{}],48:[function(t,e,r){"use strict";e.exports=function(t,e){var r,i,n,s,a,o,h,u,l,f,d,c,p,m,_,g,b,v,y,w,k,x,S,z,C;r=t.state,i=t.next_in,z=t.input,n=i+(t.avail_in-5),s=t.next_out,C=t.output,a=s-(e-t.avail_out),o=s+(t.avail_out-257),h=r.dmax,u=r.wsize,l=r.whave,f=r.wnext,d=r.window,c=r.hold,p=r.bits,m=r.lencode,_=r.distcode,g=(1<<r.lenbits)-1,b=(1<<r.distbits)-1;t:do{p<15&&(c+=z[i++]<<p,p+=8,c+=z[i++]<<p,p+=8),v=m[c&g];e:for(;;){if(c>>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(c&(1<<y)-1)];continue e}if(32&y){r.mode=12;break t}t.msg="invalid literal/length code",r.mode=30;break t}w=65535&v,(y&=15)&&(p<y&&(c+=z[i++]<<p,p+=8),w+=c&(1<<y)-1,c>>>=y,p-=y),p<15&&(c+=z[i++]<<p,p+=8,c+=z[i++]<<p,p+=8),v=_[c&b];r:for(;;){if(c>>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(c&(1<<y)-1)];continue r}t.msg="invalid distance code",r.mode=30;break t}if(k=65535&v,p<(y&=15)&&(c+=z[i++]<<p,(p+=8)<y&&(c+=z[i++]<<p,p+=8)),h<(k+=c&(1<<y)-1)){t.msg="invalid distance too far back",r.mode=30;break t}if(c>>>=y,p-=y,(y=s-a)<k){if(l<(y=k-y)&&r.sane){t.msg="invalid distance too far back",r.mode=30;break t}if(S=d,(x=0)===f){if(x+=u-y,y<w){for(w-=y;C[s++]=d[x++],--y;);x=s-k,S=C}}else if(f<y){if(x+=u+f-y,(y-=f)<w){for(w-=y;C[s++]=d[x++],--y;);if(x=0,f<w){for(w-=y=f;C[s++]=d[x++],--y;);x=s-k,S=C}}}else if(x+=f-y,y<w){for(w-=y;C[s++]=d[x++],--y;);x=s-k,S=C}for(;2<w;)C[s++]=S[x++],C[s++]=S[x++],C[s++]=S[x++],w-=3;w&&(C[s++]=S[x++],1<w&&(C[s++]=S[x++]))}else{for(x=s-k;C[s++]=C[x++],C[s++]=C[x++],C[s++]=C[x++],2<(w-=3););w&&(C[s++]=C[x++],1<w&&(C[s++]=C[x++]))}break}}break}}while(i<n&&s<o);i-=w=p>>3,c&=(1<<(p-=w<<3))-1,t.next_in=i,t.next_out=s,t.avail_in=i<n?n-i+5:5-(i-n),t.avail_out=s<o?o-s+257:257-(s-o),r.hold=c,r.bits=p}},{}],49:[function(t,e,r){"use strict";var I=t("../utils/common"),O=t("./adler32"),B=t("./crc32"),R=t("./inffast"),T=t("./inftrees"),D=1,F=2,N=0,U=-2,P=1,i=852,n=592;function L(t){return(t>>>24&255)+(t>>>8&65280)+((65280&t)<<8)+((255&t)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(t){var e;return t&&t.state?(e=t.state,t.total_in=t.total_out=e.total=0,t.msg="",e.wrap&&(t.adler=1&e.wrap),e.mode=P,e.last=0,e.havedict=0,e.dmax=32768,e.head=null,e.hold=0,e.bits=0,e.lencode=e.lendyn=new I.Buf32(i),e.distcode=e.distdyn=new I.Buf32(n),e.sane=1,e.back=-1,N):U}function o(t){var e;return t&&t.state?((e=t.state).wsize=0,e.whave=0,e.wnext=0,a(t)):U}function h(t,e){var r,i;return t&&t.state?(i=t.state,e<0?(r=0,e=-e):(r=1+(e>>4),e<48&&(e&=15)),e&&(e<8||15<e)?U:(null!==i.window&&i.wbits!==e&&(i.window=null),i.wrap=r,i.wbits=e,o(t))):U}function u(t,e){var r,i;return t?(i=new s,(t.state=i).window=null,(r=h(t,e))!==N&&(t.state=null),r):U}var l,f,d=!0;function j(t){if(d){var e;for(l=new I.Buf32(512),f=new I.Buf32(32),e=0;e<144;)t.lens[e++]=8;for(;e<256;)t.lens[e++]=9;for(;e<280;)t.lens[e++]=7;for(;e<288;)t.lens[e++]=8;for(T(D,t.lens,0,288,l,0,t.work,{bits:9}),e=0;e<32;)t.lens[e++]=5;T(F,t.lens,0,32,f,0,t.work,{bits:5}),d=!1}t.lencode=l,t.lenbits=9,t.distcode=f,t.distbits=5}function Z(t,e,r,i){var n,s=t.state;return null===s.window&&(s.wsize=1<<s.wbits,s.wnext=0,s.whave=0,s.window=new I.Buf8(s.wsize)),i>=s.wsize?(I.arraySet(s.window,e,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(i<(n=s.wsize-s.wnext)&&(n=i),I.arraySet(s.window,e,r-i,n,s.wnext),(i-=n)?(I.arraySet(s.window,e,r-i,i,0),s.wnext=i,s.whave=s.wsize):(s.wnext+=n,s.wnext===s.wsize&&(s.wnext=0),s.whave<s.wsize&&(s.whave+=n))),0}r.inflateReset=o,r.inflateReset2=h,r.inflateResetKeep=a,r.inflateInit=function(t){return u(t,15)},r.inflateInit2=u,r.inflate=function(t,e){var r,i,n,s,a,o,h,u,l,f,d,c,p,m,_,g,b,v,y,w,k,x,S,z,C=0,E=new I.Buf8(4),A=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!t||!t.state||!t.output||!t.input&&0!==t.avail_in)return U;12===(r=t.state).mode&&(r.mode=13),a=t.next_out,n=t.output,h=t.avail_out,s=t.next_in,i=t.input,o=t.avail_in,u=r.hold,l=r.bits,f=o,d=h,x=N;t:for(;;)switch(r.mode){case P:if(0===r.wrap){r.mode=13;break}for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(2&r.wrap&&35615===u){E[r.check=0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){t.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){t.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){t.msg="invalid window size",r.mode=30;break}r.dmax=1<<k,t.adler=r.check=1,r.mode=512&u?10:12,l=u=0;break;case 2:for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(r.flags=u,8!=(255&r.flags)){t.msg="unknown compression method",r.mode=30;break}if(57344&r.flags){t.msg="unknown header flags set",r.mode=30;break}r.head&&(r.head.text=u>>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.head&&(r.head.time=u),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.head&&(r.head.xflags=255&u,r.head.os=u>>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.length=u,r.head&&(r.head.extra_len=u),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(c=r.length)&&(c=o),c&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,i,s,c,k)),512&r.flags&&(r.check=B(r.check,i,c,s)),o-=c,s+=c,r.length-=c),r.length))break t;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break t;for(c=0;k=i[s+c++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&c<o;);if(512&r.flags&&(r.check=B(r.check,i,c,s)),o-=c,s+=c,k)break t}else r.head&&(r.head.name=null);r.length=0,r.mode=8;case 8:if(4096&r.flags){if(0===o)break t;for(c=0;k=i[s+c++],r.head&&k&&r.length<65536&&(r.head.comment+=String.fromCharCode(k)),k&&c<o;);if(512&r.flags&&(r.check=B(r.check,i,c,s)),o-=c,s+=c,k)break t}else r.head&&(r.head.comment=null);r.mode=9;case 9:if(512&r.flags){for(;l<16;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(u!==(65535&r.check)){t.msg="header crc mismatch",r.mode=30;break}l=u=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),t.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}t.adler=r.check=L(u),l=u=0,r.mode=11;case 11:if(0===r.havedict)return t.next_out=a,t.avail_out=h,t.next_in=s,t.avail_in=o,r.hold=u,r.bits=l,2;t.adler=r.check=1,r.mode=12;case 12:if(5===e||6===e)break t;case 13:if(r.last){u>>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}switch(r.last=1&u,l-=1,3&(u>>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==e)break;u>>>=2,l-=2;break t;case 2:r.mode=17;break;case 3:t.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if((65535&u)!=(u>>>16^65535)){t.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===e)break t;case 15:r.mode=16;case 16:if(c=r.length){if(o<c&&(c=o),h<c&&(c=h),0===c)break t;I.arraySet(n,i,s,c,a),o-=c,s+=c,h-=c,a+=c,r.length-=c;break}r.mode=12;break;case 17:for(;l<14;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(r.nlen=257+(31&u),u>>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286<r.nlen||30<r.ndist){t.msg="too many length or distance symbols",r.mode=30;break}r.have=0,r.mode=18;case 18:for(;r.have<r.ncode;){for(;l<3;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.lens[A[r.have++]]=7&u,u>>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){t.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have<r.nlen+r.ndist;){for(;g=(C=r.lencode[u&(1<<r.lenbits)-1])>>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(b<16)u>>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(u>>>=_,l-=_,0===r.have){t.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],c=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}l-=_,k=0,c=3+(7&(u>>>=_)),u>>>=3,l-=3}else{for(z=_+7;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}l-=_,k=0,c=11+(127&(u>>>=_)),u>>>=7,l-=7}if(r.have+c>r.nlen+r.ndist){t.msg="invalid bit length repeat",r.mode=30;break}for(;c--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){t.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){t.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){t.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===e)break t;case 20:r.mode=21;case 21:if(6<=o&&258<=h){t.next_out=a,t.avail_out=h,t.next_in=s,t.avail_in=o,r.hold=u,r.bits=l,R(t,d),a=t.next_out,n=t.output,h=t.avail_out,s=t.next_in,i=t.input,o=t.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<<r.lenbits)-1])>>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(g&&0==(240&g)){for(v=_,y=g,w=b;g=(C=r.lencode[w+((u&(1<<v+y)-1)>>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}u>>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){t.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.length+=u&(1<<r.extra)-1,u>>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<<r.distbits)-1])>>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(0==(240&g)){for(v=_,y=g,w=b;g=(C=r.distcode[w+((u&(1<<v+y)-1)>>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}u>>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){t.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l<z;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}r.offset+=u&(1<<r.extra)-1,u>>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){t.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break t;if(c=d-h,r.offset>c){if((c=r.offset-c)>r.whave&&r.sane){t.msg="invalid distance too far back",r.mode=30;break}p=c>r.wnext?(c-=r.wnext,r.wsize-c):r.wnext-c,c>r.length&&(c=r.length),m=r.window}else m=n,p=a-r.offset,c=r.length;for(h<c&&(c=h),h-=c,r.length-=c;n[a++]=m[p++],--c;);0===r.length&&(r.mode=21);break;case 26:if(0===h)break t;n[a++]=r.length,h--,r.mode=21;break;case 27:if(r.wrap){for(;l<32;){if(0===o)break t;o--,u|=i[s++]<<l,l+=8}if(d-=h,t.total_out+=d,r.total+=d,d&&(t.adler=r.check=r.flags?B(r.check,n,d,a-d):O(r.check,n,d,a-d)),d=h,(r.flags?u:L(u))!==r.check){t.msg="incorrect data check",r.mode=30;break}l=u=0}r.mode=28;case 28:if(r.wrap&&r.flags){for(;l<32;){if(0===o)break t;o--,u+=i[s++]<<l,l+=8}if(u!==(4294967295&r.total)){t.msg="incorrect length check",r.mode=30;break}l=u=0}r.mode=29;case 29:x=1;break t;case 30:x=-3;break t;case 31:return-4;case 32:default:return U}return t.next_out=a,t.avail_out=h,t.next_in=s,t.avail_in=o,r.hold=u,r.bits=l,(r.wsize||d!==t.avail_out&&r.mode<30&&(r.mode<27||4!==e))&&Z(t,t.output,t.next_out,d-t.avail_out)?(r.mode=31,-4):(f-=t.avail_in,d-=t.avail_out,t.total_in+=f,t.total_out+=d,r.total+=d,r.wrap&&d&&(t.adler=r.check=r.flags?B(r.check,n,d,t.next_out-d):O(r.check,n,d,t.next_out-d)),t.data_type=r.bits+(r.last?64:0)+(12===r.mode?128:0)+(20===r.mode||15===r.mode?256:0),(0==f&&0===d||4===e)&&x===N&&(x=-5),x)},r.inflateEnd=function(t){if(!t||!t.state)return U;var e=t.state;return e.window&&(e.window=null),t.state=null,N},r.inflateGetHeader=function(t,e){var r;return t&&t.state?0==(2&(r=t.state).wrap)?U:((r.head=e).done=!1,N):U},r.inflateSetDictionary=function(t,e){var r,i=e.length;return t&&t.state?0!==(r=t.state).wrap&&11!==r.mode?U:11===r.mode&&O(1,e,i,0)!==r.check?-3:Z(t,e,i,i)?(r.mode=31,-4):(r.havedict=1,N):U},r.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":41,"./adler32":43,"./crc32":45,"./inffast":48,"./inftrees":50}],50:[function(t,e,r){"use strict";var D=t("../utils/common"),F=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],N=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],U=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],P=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];e.exports=function(t,e,r,i,n,s,a,o){var h,u,l,f,d,c,p,m,_,g=o.bits,b=0,v=0,y=0,w=0,k=0,x=0,S=0,z=0,C=0,E=0,A=null,I=0,O=new D.Buf16(16),B=new D.Buf16(16),R=null,T=0;for(b=0;b<=15;b++)O[b]=0;for(v=0;v<i;v++)O[e[r+v]]++;for(k=g,w=15;1<=w&&0===O[w];w--);if(w<k&&(k=w),0===w)return n[s++]=20971520,n[s++]=20971520,o.bits=1,0;for(y=1;y<w&&0===O[y];y++);for(k<y&&(k=y),b=z=1;b<=15;b++)if(z<<=1,(z-=O[b])<0)return-1;if(0<z&&(0===t||1!==w))return-1;for(B[1]=0,b=1;b<15;b++)B[b+1]=B[b]+O[b];for(v=0;v<i;v++)0!==e[r+v]&&(a[B[e[r+v]]++]=v);if(c=0===t?(A=R=a,19):1===t?(A=F,I-=257,R=N,T-=257,256):(A=U,R=P,-1),b=y,d=s,S=v=E=0,l=-1,f=(C=1<<(x=k))-1,1===t&&852<C||2===t&&592<C)return 1;for(;;){for(p=b-S,_=a[v]<c?(m=0,a[v]):a[v]>c?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<<b-S,y=u=1<<x;n[d+(E>>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<<b-1;E&h;)h>>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=e[r+a[v]]}if(k<b&&(E&f)!==l){for(0===S&&(S=k),d+=y,z=1<<(x=b-S);x+S<w&&!((z-=O[x+S])<=0);)x++,z<<=1;if(C+=1<<x,1===t&&852<C||2===t&&592<C)return 1;n[l=E&f]=k<<24|x<<16|d-s|0}}return 0!==E&&(n[d+E]=b-S<<24|64<<16|0),o.bits=k,0}},{"../utils/common":41}],51:[function(t,e,r){"use strict";e.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],52:[function(t,e,r){"use strict";var n=t("../utils/common"),o=0,h=1;function i(t){for(var e=t.length;0<=--e;)t[e]=0}var s=0,a=29,u=256,l=u+1+a,f=30,d=19,_=2*l+1,g=15,c=16,p=7,m=256,b=16,v=17,y=18,w=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],k=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],x=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],S=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],z=new Array(2*(l+2));i(z);var C=new Array(2*f);i(C);var E=new Array(512);i(E);var A=new Array(256);i(A);var I=new Array(a);i(I);var O,B,R,T=new Array(f);function D(t,e,r,i,n){this.static_tree=t,this.extra_bits=e,this.extra_base=r,this.elems=i,this.max_length=n,this.has_stree=t&&t.length}function F(t,e){this.dyn_tree=t,this.max_code=0,this.stat_desc=e}function N(t){return t<256?E[t]:E[256+(t>>>7)]}function U(t,e){t.pending_buf[t.pending++]=255&e,t.pending_buf[t.pending++]=e>>>8&255}function P(t,e,r){t.bi_valid>c-r?(t.bi_buf|=e<<t.bi_valid&65535,U(t,t.bi_buf),t.bi_buf=e>>c-t.bi_valid,t.bi_valid+=r-c):(t.bi_buf|=e<<t.bi_valid&65535,t.bi_valid+=r)}function L(t,e,r){P(t,r[2*e],r[2*e+1])}function j(t,e){for(var r=0;r|=1&t,t>>>=1,r<<=1,0<--e;);return r>>>1}function Z(t,e,r){var i,n,s=new Array(g+1),a=0;for(i=1;i<=g;i++)s[i]=a=a+r[i-1]<<1;for(n=0;n<=e;n++){var o=t[2*n+1];0!==o&&(t[2*n]=j(s[o]++,o))}}function W(t){var e;for(e=0;e<l;e++)t.dyn_ltree[2*e]=0;for(e=0;e<f;e++)t.dyn_dtree[2*e]=0;for(e=0;e<d;e++)t.bl_tree[2*e]=0;t.dyn_ltree[2*m]=1,t.opt_len=t.static_len=0,t.last_lit=t.matches=0}function M(t){8<t.bi_valid?U(t,t.bi_buf):0<t.bi_valid&&(t.pending_buf[t.pending++]=t.bi_buf),t.bi_buf=0,t.bi_valid=0}function H(t,e,r,i){var n=2*e,s=2*r;return t[n]<t[s]||t[n]===t[s]&&i[e]<=i[r]}function G(t,e,r){for(var i=t.heap[r],n=r<<1;n<=t.heap_len&&(n<t.heap_len&&H(e,t.heap[n+1],t.heap[n],t.depth)&&n++,!H(e,i,t.heap[n],t.depth));)t.heap[r]=t.heap[n],r=n,n<<=1;t.heap[r]=i}function K(t,e,r){var i,n,s,a,o=0;if(0!==t.last_lit)for(;i=t.pending_buf[t.d_buf+2*o]<<8|t.pending_buf[t.d_buf+2*o+1],n=t.pending_buf[t.l_buf+o],o++,0===i?L(t,n,e):(L(t,(s=A[n])+u+1,e),0!==(a=w[s])&&P(t,n-=I[s],a),L(t,s=N(--i),r),0!==(a=k[s])&&P(t,i-=T[s],a)),o<t.last_lit;);L(t,m,e)}function Y(t,e){var r,i,n,s=e.dyn_tree,a=e.stat_desc.static_tree,o=e.stat_desc.has_stree,h=e.stat_desc.elems,u=-1;for(t.heap_len=0,t.heap_max=_,r=0;r<h;r++)0!==s[2*r]?(t.heap[++t.heap_len]=u=r,t.depth[r]=0):s[2*r+1]=0;for(;t.heap_len<2;)s[2*(n=t.heap[++t.heap_len]=u<2?++u:0)]=1,t.depth[n]=0,t.opt_len--,o&&(t.static_len-=a[2*n+1]);for(e.max_code=u,r=t.heap_len>>1;1<=r;r--)G(t,s,r);for(n=h;r=t.heap[1],t.heap[1]=t.heap[t.heap_len--],G(t,s,1),i=t.heap[1],t.heap[--t.heap_max]=r,t.heap[--t.heap_max]=i,s[2*n]=s[2*r]+s[2*i],t.depth[n]=(t.depth[r]>=t.depth[i]?t.depth[r]:t.depth[i])+1,s[2*r+1]=s[2*i+1]=n,t.heap[1]=n++,G(t,s,1),2<=t.heap_len;);t.heap[--t.heap_max]=t.heap[1],function(t,e){var r,i,n,s,a,o,h=e.dyn_tree,u=e.max_code,l=e.stat_desc.static_tree,f=e.stat_desc.has_stree,d=e.stat_desc.extra_bits,c=e.stat_desc.extra_base,p=e.stat_desc.max_length,m=0;for(s=0;s<=g;s++)t.bl_count[s]=0;for(h[2*t.heap[t.heap_max]+1]=0,r=t.heap_max+1;r<_;r++)p<(s=h[2*h[2*(i=t.heap[r])+1]+1]+1)&&(s=p,m++),h[2*i+1]=s,u<i||(t.bl_count[s]++,a=0,c<=i&&(a=d[i-c]),o=h[2*i],t.opt_len+=o*(s+a),f&&(t.static_len+=o*(l[2*i+1]+a)));if(0!==m){do{for(s=p-1;0===t.bl_count[s];)s--;t.bl_count[s]--,t.bl_count[s+1]+=2,t.bl_count[p]--,m-=2}while(0<m);for(s=p;0!==s;s--)for(i=t.bl_count[s];0!==i;)u<(n=t.heap[--r])||(h[2*n+1]!==s&&(t.opt_len+=(s-h[2*n+1])*h[2*n],h[2*n+1]=s),i--)}}(t,e),Z(s,u,t.bl_count)}function X(t,e,r){var i,n,s=-1,a=e[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),e[2*(r+1)+1]=65535,i=0;i<=r;i++)n=a,a=e[2*(i+1)+1],++o<h&&n===a||(o<u?t.bl_tree[2*n]+=o:0!==n?(n!==s&&t.bl_tree[2*n]++,t.bl_tree[2*b]++):o<=10?t.bl_tree[2*v]++:t.bl_tree[2*y]++,s=n,u=(o=0)===a?(h=138,3):n===a?(h=6,3):(h=7,4))}function V(t,e,r){var i,n,s=-1,a=e[1],o=0,h=7,u=4;for(0===a&&(h=138,u=3),i=0;i<=r;i++)if(n=a,a=e[2*(i+1)+1],!(++o<h&&n===a)){if(o<u)for(;L(t,n,t.bl_tree),0!=--o;);else 0!==n?(n!==s&&(L(t,n,t.bl_tree),o--),L(t,b,t.bl_tree),P(t,o-3,2)):o<=10?(L(t,v,t.bl_tree),P(t,o-3,3)):(L(t,y,t.bl_tree),P(t,o-11,7));s=n,u=(o=0)===a?(h=138,3):n===a?(h=6,3):(h=7,4)}}i(T);var q=!1;function J(t,e,r,i){P(t,(s<<1)+(i?1:0),3),function(t,e,r,i){M(t),i&&(U(t,r),U(t,~r)),n.arraySet(t.pending_buf,t.window,e,r,t.pending),t.pending+=r}(t,e,r,!0)}r._tr_init=function(t){q||(function(){var t,e,r,i,n,s=new Array(g+1);for(i=r=0;i<a-1;i++)for(I[i]=r,t=0;t<1<<w[i];t++)A[r++]=i;for(A[r-1]=i,i=n=0;i<16;i++)for(T[i]=n,t=0;t<1<<k[i];t++)E[n++]=i;for(n>>=7;i<f;i++)for(T[i]=n<<7,t=0;t<1<<k[i]-7;t++)E[256+n++]=i;for(e=0;e<=g;e++)s[e]=0;for(t=0;t<=143;)z[2*t+1]=8,t++,s[8]++;for(;t<=255;)z[2*t+1]=9,t++,s[9]++;for(;t<=279;)z[2*t+1]=7,t++,s[7]++;for(;t<=287;)z[2*t+1]=8,t++,s[8]++;for(Z(z,l+1,s),t=0;t<f;t++)C[2*t+1]=5,C[2*t]=j(t,5);O=new D(z,w,u+1,l,g),B=new D(C,k,0,f,g),R=new D(new Array(0),x,0,d,p)}(),q=!0),t.l_desc=new F(t.dyn_ltree,O),t.d_desc=new F(t.dyn_dtree,B),t.bl_desc=new F(t.bl_tree,R),t.bi_buf=0,t.bi_valid=0,W(t)},r._tr_stored_block=J,r._tr_flush_block=function(t,e,r,i){var n,s,a=0;0<t.level?(2===t.strm.data_type&&(t.strm.data_type=function(t){var e,r=4093624447;for(e=0;e<=31;e++,r>>>=1)if(1&r&&0!==t.dyn_ltree[2*e])return o;if(0!==t.dyn_ltree[18]||0!==t.dyn_ltree[20]||0!==t.dyn_ltree[26])return h;for(e=32;e<u;e++)if(0!==t.dyn_ltree[2*e])return h;return o}(t)),Y(t,t.l_desc),Y(t,t.d_desc),a=function(t){var e;for(X(t,t.dyn_ltree,t.l_desc.max_code),X(t,t.dyn_dtree,t.d_desc.max_code),Y(t,t.bl_desc),e=d-1;3<=e&&0===t.bl_tree[2*S[e]+1];e--);return t.opt_len+=3*(e+1)+5+5+4,e}(t),n=t.opt_len+3+7>>>3,(s=t.static_len+3+7>>>3)<=n&&(n=s)):n=s=r+5,r+4<=n&&-1!==e?J(t,e,r,i):4===t.strategy||s===n?(P(t,2+(i?1:0),3),K(t,z,C)):(P(t,4+(i?1:0),3),function(t,e,r,i){var n;for(P(t,e-257,5),P(t,r-1,5),P(t,i-4,4),n=0;n<i;n++)P(t,t.bl_tree[2*S[n]+1],3);V(t,t.dyn_ltree,e-1),V(t,t.dyn_dtree,r-1)}(t,t.l_desc.max_code+1,t.d_desc.max_code+1,a+1),K(t,t.dyn_ltree,t.dyn_dtree)),W(t),i&&M(t)},r._tr_tally=function(t,e,r){return t.pending_buf[t.d_buf+2*t.last_lit]=e>>>8&255,t.pending_buf[t.d_buf+2*t.last_lit+1]=255&e,t.pending_buf[t.l_buf+t.last_lit]=255&r,t.last_lit++,0===e?t.dyn_ltree[2*r]++:(t.matches++,e--,t.dyn_ltree[2*(A[r]+u+1)]++,t.dyn_dtree[2*N(e)]++),t.last_lit===t.lit_bufsize-1},r._tr_align=function(t){P(t,2,3),L(t,m,z),function(t){16===t.bi_valid?(U(t,t.bi_buf),t.bi_buf=0,t.bi_valid=0):8<=t.bi_valid&&(t.pending_buf[t.pending++]=255&t.bi_buf,t.bi_buf>>=8,t.bi_valid-=8)}(t)}},{"../utils/common":41}],53:[function(t,e,r){"use strict";e.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(t,e,r){"use strict";e.exports="function"==typeof setImmediate?setImmediate:function(){var t=[].slice.apply(arguments);t.splice(1,0,0),setTimeout.apply(null,t)}},{}]},{},[10])(10)});
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/doc/overview-tree.html b/Buildings/Resources/src/convertEPW/doc/overview-tree.html
index 1ea9b1ac1b3..b1b5042fdd5 100644
--- a/Buildings/Resources/src/convertEPW/doc/overview-tree.html
+++ b/Buildings/Resources/src/convertEPW/doc/overview-tree.html
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Class Hierarchy";
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -43,131 +23,133 @@
         if (location.href.indexOf('is-external=true') == -1) {
             parent.document.title="Class Hierarchy";
         }
->>>>>>> master
     }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
+    catch(err) {
+    }
+//-->
+var pathtoroot = "./";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li>Package</li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For All Packages</H2>
-</CENTER>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle"><A HREF="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;"><B>ConvertWeatherData</B></A></UL>
-</UL>
-<HR>
-
-
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For All Packages</h1>
+</div>
+<div class="contentContainer">
+<section role="region">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.Object
+<ul>
+<li class="circle"><a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;"><span class="typeNameLink">ConvertWeatherData</span></a></li>
+</ul>
+</li>
+</ul>
+</section>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?overview-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li>Package</li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/package-frame.html b/Buildings/Resources/src/convertEPW/doc/package-frame.html
deleted file mode 100644
index 20a902ca2f1..00000000000
--- a/Buildings/Resources/src/convertEPW/doc/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-&lt;Unnamed&gt;
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="package-summary.html" target="classFrame">&lt;Unnamed&gt;</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;" target="classFrame">ConvertWeatherData</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/Buildings/Resources/src/convertEPW/doc/package-list b/Buildings/Resources/src/convertEPW/doc/package-list
deleted file mode 100644
index 8b137891791..00000000000
--- a/Buildings/Resources/src/convertEPW/doc/package-list
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Buildings/Resources/src/convertEPW/doc/package-search-index.js b/Buildings/Resources/src/convertEPW/doc/package-search-index.js
new file mode 100644
index 00000000000..f7fd003718a
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/package-search-index.js
@@ -0,0 +1 @@
+packageSearchIndex = [{"l":"All Packages","url":"allpackages-index.html"}]
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/doc/package-summary.html b/Buildings/Resources/src/convertEPW/doc/package-summary.html
index f0c3ad898c5..228ae79473b 100644
--- a/Buildings/Resources/src/convertEPW/doc/package-summary.html
+++ b/Buildings/Resources/src/convertEPW/doc/package-summary.html
@@ -1,25 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
-
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<HR>
-
-
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -58,129 +36,131 @@
 <header role="banner">
 <nav role="navigation">
 <div class="fixedNav">
->>>>>>> master
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package &lt;Unnamed&gt;
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</A></B></TD>
-<TD>This program converts a weather file
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;&lt;Unnamed&gt;</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;">ConvertWeatherData</a></th>
+<td class="colLast">
+<div class="block">This program converts a weather file
  from .epw format for EnergyPlus
- to .mos format for Modelica.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<DL>
-</DL>
-<HR>
-
-
+ to .mos format for Modelica.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/package-tree.html b/Buildings/Resources/src/convertEPW/doc/package-tree.html
index 405ab0c128c..9a81c6b564b 100644
--- a/Buildings/Resources/src/convertEPW/doc/package-tree.html
+++ b/Buildings/Resources/src/convertEPW/doc/package-tree.html
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Nov 21 08:52:45 PST 2012 -->
-<TITLE>
- Class Hierarchy
-</TITLE>
-
-<META NAME="date" CONTENT="2012-11-21">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title=" Class Hierarchy";
-=======
 <!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="en">
@@ -43,132 +23,133 @@
         if (location.href.indexOf('is-external=true') == -1) {
             parent.document.title=" Class Hierarchy";
         }
->>>>>>> master
     }
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-<HR>
-
-
+    catch(err) {
+    }
+//-->
+var pathtoroot = "./";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="topNav"><a id="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!--   -->
+</a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package &lt;Unnamed&gt;
-</H2>
-</CENTER>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle"><A HREF="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;"><B>ConvertWeatherData</B></A></UL>
-</UL>
-<HR>
-
-
+</div>
+<div class="navPadding">&nbsp;</div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package &lt;Unnamed&gt;</h1>
+</div>
+<div class="contentContainer">
+<section role="region">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.Object
+<ul>
+<li class="circle"><a href="ConvertWeatherData.html" title="class in &lt;Unnamed&gt;"><span class="typeNameLink">ConvertWeatherData</span></a></li>
+</ul>
+</li>
+</ul>
+</section>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html?package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
+<div class="bottomNav"><a id="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
   if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
   }
   //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!--   -->
+</a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
+</nav>
+</footer>
+</body>
+</html>
diff --git a/Buildings/Resources/src/convertEPW/doc/resources/glass.png b/Buildings/Resources/src/convertEPW/doc/resources/glass.png
new file mode 100644
index 00000000000..a7f591f467a
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/resources/glass.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/resources/x.png b/Buildings/Resources/src/convertEPW/doc/resources/x.png
new file mode 100644
index 00000000000..30548a756e1
Binary files /dev/null and b/Buildings/Resources/src/convertEPW/doc/resources/x.png differ
diff --git a/Buildings/Resources/src/convertEPW/doc/script.js b/Buildings/Resources/src/convertEPW/doc/script.js
new file mode 100644
index 00000000000..7dc93c48e35
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/script.js
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+var moduleSearchIndex;
+var packageSearchIndex;
+var typeSearchIndex;
+var memberSearchIndex;
+var tagSearchIndex;
+function loadScripts(doc, tag) {
+    createElem(doc, tag, 'jquery/jszip/dist/jszip.js');
+    createElem(doc, tag, 'jquery/jszip-utils/dist/jszip-utils.js');
+    if (window.navigator.userAgent.indexOf('MSIE ') > 0 || window.navigator.userAgent.indexOf('Trident/') > 0 ||
+            window.navigator.userAgent.indexOf('Edge/') > 0) {
+        createElem(doc, tag, 'jquery/jszip-utils/dist/jszip-utils-ie.js');
+    }
+    createElem(doc, tag, 'search.js');
+
+    $.get(pathtoroot + "module-search-index.zip")
+            .done(function() {
+                JSZipUtils.getBinaryContent(pathtoroot + "module-search-index.zip", function(e, data) {
+                    JSZip.loadAsync(data).then(function(zip){
+                        zip.file("module-search-index.json").async("text").then(function(content){
+                            moduleSearchIndex = JSON.parse(content);
+                        });
+                    });
+                });
+            });
+    $.get(pathtoroot + "package-search-index.zip")
+            .done(function() {
+                JSZipUtils.getBinaryContent(pathtoroot + "package-search-index.zip", function(e, data) {
+                    JSZip.loadAsync(data).then(function(zip){
+                        zip.file("package-search-index.json").async("text").then(function(content){
+                            packageSearchIndex = JSON.parse(content);
+                        });
+                    });
+                });
+            });
+    $.get(pathtoroot + "type-search-index.zip")
+            .done(function() {
+                JSZipUtils.getBinaryContent(pathtoroot + "type-search-index.zip", function(e, data) {
+                    JSZip.loadAsync(data).then(function(zip){
+                        zip.file("type-search-index.json").async("text").then(function(content){
+                            typeSearchIndex = JSON.parse(content);
+                        });
+                    });
+                });
+            });
+    $.get(pathtoroot + "member-search-index.zip")
+            .done(function() {
+                JSZipUtils.getBinaryContent(pathtoroot + "member-search-index.zip", function(e, data) {
+                    JSZip.loadAsync(data).then(function(zip){
+                        zip.file("member-search-index.json").async("text").then(function(content){
+                            memberSearchIndex = JSON.parse(content);
+                        });
+                    });
+                });
+            });
+    $.get(pathtoroot + "tag-search-index.zip")
+            .done(function() {
+                JSZipUtils.getBinaryContent(pathtoroot + "tag-search-index.zip", function(e, data) {
+                    JSZip.loadAsync(data).then(function(zip){
+                        zip.file("tag-search-index.json").async("text").then(function(content){
+                            tagSearchIndex = JSON.parse(content);
+                        });
+                    });
+                });
+            });
+    if (!moduleSearchIndex) {
+        createElem(doc, tag, 'module-search-index.js');
+    }
+    if (!packageSearchIndex) {
+        createElem(doc, tag, 'package-search-index.js');
+    }
+    if (!typeSearchIndex) {
+        createElem(doc, tag, 'type-search-index.js');
+    }
+    if (!memberSearchIndex) {
+        createElem(doc, tag, 'member-search-index.js');
+    }
+    if (!tagSearchIndex) {
+        createElem(doc, tag, 'tag-search-index.js');
+    }
+    $(window).resize(function() {
+        $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+    });
+}
+
+function createElem(doc, tag, path) {
+    var script = doc.createElement(tag);
+    var scriptElement = doc.getElementsByTagName(tag)[0];
+    script.src = pathtoroot + path;
+    scriptElement.parentNode.insertBefore(script, scriptElement);
+}
+
+function show(type) {
+    count = 0;
+    for (var key in data) {
+        var row = document.getElementById(key);
+        if ((data[key] &  type) !== 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type) {
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}
+
+function updateModuleFrame(pFrame, cFrame) {
+    top.packageFrame.location = pFrame;
+    top.classFrame.location = cFrame;
+}
diff --git a/Buildings/Resources/src/convertEPW/doc/search.js b/Buildings/Resources/src/convertEPW/doc/search.js
new file mode 100644
index 00000000000..b773531bd91
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/search.js
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+var noResult = {l: "No results found"};
+var catModules = "Modules";
+var catPackages = "Packages";
+var catTypes = "Types";
+var catMembers = "Members";
+var catSearchTags = "SearchTags";
+var highlight = "<span class=\"resultHighlight\">$&</span>";
+var camelCaseRegexp = "";
+var secondaryMatcher = "";
+function getHighlightedText(item) {
+    var ccMatcher = new RegExp(camelCaseRegexp);
+    var label = item.replace(ccMatcher, highlight);
+    if (label === item) {
+        label = item.replace(secondaryMatcher, highlight);
+    }
+    return label;
+}
+function getURLPrefix(ui) {
+    var urlPrefix="";
+    if (useModuleDirectories) {
+        var slash = "/";
+        if (ui.item.category === catModules) {
+            return ui.item.l + slash;
+        } else if (ui.item.category === catPackages && ui.item.m) {
+            return ui.item.m + slash;
+        } else if ((ui.item.category === catTypes && ui.item.p) || ui.item.category === catMembers) {
+            $.each(packageSearchIndex, function(index, item) {
+                if (ui.item.p == item.l) {
+                    urlPrefix = item.m + slash;
+                }
+            });
+            return urlPrefix;
+        } else {
+            return urlPrefix;
+        }
+    }
+    return urlPrefix;
+}
+var watermark = 'Search';
+$(function() {
+    $("#search").val('');
+    $("#search").prop("disabled", false);
+    $("#reset").prop("disabled", false);
+    $("#search").val(watermark).addClass('watermark');
+    $("#search").blur(function() {
+        if ($(this).val().length == 0) {
+            $(this).val(watermark).addClass('watermark');
+        }
+    });
+    $("#search").on('click keydown', function() {
+        if ($(this).val() == watermark) {
+            $(this).val('').removeClass('watermark');
+        }
+    });
+    $("#reset").click(function() {
+        $("#search").val('');
+        $("#search").focus();
+    });
+    $("#search").focus();
+    $("#search")[0].setSelectionRange(0, 0);
+});
+$.widget("custom.catcomplete", $.ui.autocomplete, {
+    _create: function() {
+        this._super();
+        this.widget().menu("option", "items", "> :not(.ui-autocomplete-category)");
+    },
+    _renderMenu: function(ul, items) {
+        var rMenu = this,
+                currentCategory = "";
+        rMenu.menu.bindings = $();
+        $.each(items, function(index, item) {
+            var li;
+            if (item.l !== noResult.l && item.category !== currentCategory) {
+                ul.append("<li class=\"ui-autocomplete-category\">" + item.category + "</li>");
+                currentCategory = item.category;
+            }
+            li = rMenu._renderItemData(ul, item);
+            if (item.category) {
+                li.attr("aria-label", item.category + " : " + item.l);
+                li.attr("class", "resultItem");
+            } else {
+                li.attr("aria-label", item.l);
+                li.attr("class", "resultItem");
+            }
+        });
+    },
+    _renderItem: function(ul, item) {
+        var label = "";
+        if (item.category === catModules) {
+            label = getHighlightedText(item.l);
+        } else if (item.category === catPackages) {
+            label = (item.m)
+                    ? getHighlightedText(item.m + "/" + item.l)
+                    : getHighlightedText(item.l);
+        } else if (item.category === catTypes) {
+            label = (item.p)
+                    ? getHighlightedText(item.p + "." + item.l)
+                    : getHighlightedText(item.l);
+        } else if (item.category === catMembers) {
+            label = getHighlightedText(item.p + "." + (item.c + "." + item.l));
+        } else if (item.category === catSearchTags) {
+            label = getHighlightedText(item.l);
+        } else {
+            label = item.l;
+        }
+        var li = $("<li/>").appendTo(ul);
+        var div = $("<div/>").appendTo(li);
+        if (item.category === catSearchTags) {
+            if (item.d) {
+                div.html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span><br><span class=\"searchTagDescResult\">"
+                                + item.d + "</span><br>");
+            } else {
+                div.html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span>");
+            }
+        } else {
+            div.html(label);
+        }
+        return li;
+    }
+});
+$(function() {
+    $("#search").catcomplete({
+        minLength: 1,
+        delay: 100,
+        source: function(request, response) {
+            var result = new Array();
+            var presult = new Array();
+            var tresult = new Array();
+            var mresult = new Array();
+            var tgresult = new Array();
+            var secondaryresult = new Array();
+            var displayCount = 0;
+            var exactMatcher = new RegExp("^" + $.ui.autocomplete.escapeRegex(request.term) + "$", "i");
+            camelCaseRegexp = ($.ui.autocomplete.escapeRegex(request.term)).split(/(?=[A-Z])/).join("([a-z0-9_$]*?)");
+            var camelCaseMatcher = new RegExp("^" + camelCaseRegexp);
+            secondaryMatcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
+
+            // Return the nested innermost name from the specified object
+            function nestedName(e) {
+                return e.l.substring(e.l.lastIndexOf(".") + 1);
+            }
+
+            function concatResults(a1, a2) {
+                a1 = a1.concat(a2);
+                a2.length = 0;
+                return a1;
+            }
+
+            if (moduleSearchIndex) {
+                var mdleCount = 0;
+                $.each(moduleSearchIndex, function(index, item) {
+                    item.category = catModules;
+                    if (exactMatcher.test(item.l)) {
+                        result.push(item);
+                        mdleCount++;
+                    } else if (camelCaseMatcher.test(item.l)) {
+                        result.push(item);
+                    } else if (secondaryMatcher.test(item.l)) {
+                        secondaryresult.push(item);
+                    }
+                });
+                displayCount = mdleCount;
+                result = concatResults(result, secondaryresult);
+            }
+            if (packageSearchIndex) {
+                var pCount = 0;
+                var pkg = "";
+                $.each(packageSearchIndex, function(index, item) {
+                    item.category = catPackages;
+                    pkg = (item.m)
+                            ? (item.m + "/" + item.l)
+                            : item.l;
+                    if (exactMatcher.test(item.l)) {
+                        presult.push(item);
+                        pCount++;
+                    } else if (camelCaseMatcher.test(pkg)) {
+                        presult.push(item);
+                    } else if (secondaryMatcher.test(pkg)) {
+                        secondaryresult.push(item);
+                    }
+                });
+                result = result.concat(concatResults(presult, secondaryresult));
+                displayCount = (pCount > displayCount) ? pCount : displayCount;
+            }
+            if (typeSearchIndex) {
+                var tCount = 0;
+                $.each(typeSearchIndex, function(index, item) {
+                    item.category = catTypes;
+                    var s = nestedName(item);
+                    if (exactMatcher.test(s)) {
+                        tresult.push(item);
+                        tCount++;
+                    } else if (camelCaseMatcher.test(s)) {
+                        tresult.push(item);
+                    } else if (secondaryMatcher.test(item.p + "." + item.l)) {
+                        secondaryresult.push(item);
+                    }
+                });
+                result = result.concat(concatResults(tresult, secondaryresult));
+                displayCount = (tCount > displayCount) ? tCount : displayCount;
+            }
+            if (memberSearchIndex) {
+                var mCount = 0;
+                $.each(memberSearchIndex, function(index, item) {
+                    item.category = catMembers;
+                    var s = nestedName(item);
+                    if (exactMatcher.test(s)) {
+                        mresult.push(item);
+                        mCount++;
+                    } else if (camelCaseMatcher.test(s)) {
+                        mresult.push(item);
+                    } else if (secondaryMatcher.test(item.c + "." + item.l)) {
+                        secondaryresult.push(item);
+                    }
+                });
+                result = result.concat(concatResults(mresult, secondaryresult));
+                displayCount = (mCount > displayCount) ? mCount : displayCount;
+            }
+            if (tagSearchIndex) {
+                var tgCount = 0;
+                $.each(tagSearchIndex, function(index, item) {
+                    item.category = catSearchTags;
+                    if (exactMatcher.test(item.l)) {
+                        tgresult.push(item);
+                        tgCount++;
+                    } else if (secondaryMatcher.test(item.l)) {
+                        secondaryresult.push(item);
+                    }
+                });
+                result = result.concat(concatResults(tgresult, secondaryresult));
+                displayCount = (tgCount > displayCount) ? tgCount : displayCount;
+            }
+            displayCount = (displayCount > 500) ? displayCount : 500;
+            var counter = function() {
+                var count = {Modules: 0, Packages: 0, Types: 0, Members: 0, SearchTags: 0};
+                var f = function(item) {
+                    count[item.category] += 1;
+                    return (count[item.category] <= displayCount);
+                };
+                return f;
+            }();
+            response(result.filter(counter));
+        },
+        response: function(event, ui) {
+            if (!ui.content.length) {
+                ui.content.push(noResult);
+            } else {
+                $("#search").empty();
+            }
+        },
+        autoFocus: true,
+        position: {
+            collision: "flip"
+        },
+        select: function(event, ui) {
+            if (ui.item.l !== noResult.l) {
+                var url = getURLPrefix(ui);
+                if (ui.item.category === catModules) {
+                    if (useModuleDirectories) {
+                        url += "module-summary.html";
+                    } else {
+                        url = ui.item.l + "-summary.html";
+                    }
+                } else if (ui.item.category === catPackages) {
+                    if (ui.item.url) {
+                        url = ui.item.url;
+                    } else {
+                    url += ui.item.l.replace(/\./g, '/') + "/package-summary.html";
+                    }
+                } else if (ui.item.category === catTypes) {
+                    if (ui.item.url) {
+                        url = ui.item.url;
+                    } else if (ui.item.p === "<Unnamed>") {
+                        url += ui.item.l + ".html";
+                    } else {
+                        url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.l + ".html";
+                    }
+                } else if (ui.item.category === catMembers) {
+                    if (ui.item.p === "<Unnamed>") {
+                        url += ui.item.c + ".html" + "#";
+                    } else {
+                        url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.c + ".html" + "#";
+                    }
+                    if (ui.item.url) {
+                        url += ui.item.url;
+                    } else {
+                        url += ui.item.l;
+                    }
+                } else if (ui.item.category === catSearchTags) {
+                    url += ui.item.u;
+                }
+                if (top !== window) {
+                    parent.classFrame.location = pathtoroot + url;
+                } else {
+                    window.location.href = pathtoroot + url;
+                }
+                $("#search").focus();
+            }
+        }
+    });
+});
diff --git a/Buildings/Resources/src/convertEPW/doc/stylesheet.css b/Buildings/Resources/src/convertEPW/doc/stylesheet.css
index d81286d9391..fa246765cf3 100644
--- a/Buildings/Resources/src/convertEPW/doc/stylesheet.css
+++ b/Buildings/Resources/src/convertEPW/doc/stylesheet.css
@@ -1,28 +1,906 @@
-/* Javadoc style sheet */
+/* 
+ * Javadoc style sheet
+ */
 
-/* Define colors, fonts and other style attributes here to override the defaults */
+@import url('resources/fonts/dejavu.css');
 
-/* Page background color */
-body { background-color: #FFFFFF; color:#000000 }
+/*
+ * Styles for individual HTML elements.
+ *
+ * These are styles that are specific to individual HTML elements. Changing them affects the style of a particular
+ * HTML element throughout the page.
+ */
 
-/* Headings */
-h1 { font-size: 145% }
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+    padding:0;
+    height:100%;
+    width:100%;
+}
+iframe {
+    margin:0;
+    padding:0;
+    height:100%;
+    width:100%;
+    overflow-y:scroll;
+    border:none;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[href]:hover, a[href]:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:before, a[name]:target, a[id]:before, a[id]:target {
+    content:"";
+    display:inline-block;
+    position:relative;
+    padding-top:129px;
+    margin-top:-129px;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
 
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */
-.TableRowColor         { background: #FFFFFF; color:#000000 } /* White */
+/*
+ * Styles for HTML generated by javadoc.
+ *
+ * These are style classes that are used by the standard doclet to generate HTML documentation.
+ */
 
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
+/*
+ * Styles for document title and copyright.
+ */
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+ * Styles for navigation bar.
+ */
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.navPadding {
+    padding-top: 107px;
+}
+.fixedNav {
+    position:fixed;
+    width:100%;
+    z-index:999;
+    background-color:#ffffff;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.navListSearch {
+    float:right;
+    margin:0 0 0 0;
+    padding:0;
+}
+ul.navListSearch li {
+    list-style:none;
+    float:right;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.navListSearch li label {
+    position:relative;
+    right:-16px;
+}
+ul.subNavList li {
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+ * Styles for page header and footer.
+ */
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexNav {
+    position:relative;
+    font-size:12px;
+    background-color:#dee3e9;
+}
+.indexNav ul {
+    margin-top:0;
+    padding:5px;
+}
+.indexNav ul li {
+    display:inline;
+    list-style-type:none;
+    padding-right:10px;
+    text-transform:uppercase;
+}
+.indexNav h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+ * Styles for headings.
+ */
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+ * Styles for page layout containers.
+ */
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer,
+.allClassesContainer, .allPackagesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+ * Styles for lists.
+ */
+li.circle {
+    list-style:circle;
+}
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+ * Styles for tables.
+ */
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary,
+.requiresSummary, .packagesSummary, .providesSummary, .usesSummary {
+    width:100%;
+    border-spacing:0;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary, .requiresSummary, .packagesSummary, .providesSummary, .usesSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption,
+.requiresSummary caption, .packagesSummary caption, .providesSummary caption, .usesSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.requiresSummary caption a:link, .packagesSummary caption a:link, .providesSummary caption a:link,
+.usesSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.requiresSummary caption a:hover, .packagesSummary caption a:hover, .providesSummary caption a:hover,
+.usesSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.requiresSummary caption a:active, .packagesSummary caption a:active, .providesSummary caption a:active,
+.usesSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.constantsSummary caption a:visited, .deprecatedSummary caption a:visited,
+.requiresSummary caption a:visited, .packagesSummary caption a:visited, .providesSummary caption a:visited,
+.usesSummary caption a:visited {
+    color:#FFFFFF;
+}
+.useSummary caption a:link, .useSummary caption a:hover, .useSummary caption a:active,
+.useSummary caption a:visited {
+    color:#1f389c;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span,
+.requiresSummary caption span, .packagesSummary caption span, .providesSummary caption span,
+.usesSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span, .packagesSummary caption span.activeTableTab span,
+.overviewSummary caption span.activeTableTab span, .typeSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span, .packagesSummary caption span.tableTab span,
+.overviewSummary caption span.tableTab span, .typeSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab,
+.packagesSummary caption span.tableTab, .packagesSummary caption span.activeTableTab,
+.overviewSummary caption span.tableTab, .overviewSummary caption span.activeTableTab,
+.typeSummary caption span.tableTab, .typeSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd,
+.requiresSummary .tabEnd, .packagesSummary .tabEnd, .providesSummary .tabEnd, .usesSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd, .packagesSummary .activeTableTab .tabEnd,
+.overviewSummary .activeTableTab .tabEnd, .typeSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd, .packagesSummary .tableTab .tabEnd,
+.overviewSummary .tableTab .tabEnd, .typeSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+}
+.rowColor th, .altColor th {
+    font-weight:normal;
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td,
+.requiresSummary td, .packagesSummary td, .providesSummary td, .usesSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .useSummary th,
+.constantsSummary th, .packagesSummary th, td.colFirst, td.colSecond, td.colLast, .useSummary td,
+.constantsSummary td {
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .constantsSummary th,
+.packagesSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    font-size:13px;
+}
+td.colSecond, th.colSecond, td.colLast, th.colConstructorName, th.colDeprecatedItemName, th.colLast {
+    font-size:13px;
+}
+.constantsSummary th, .packagesSummary th {
+    font-size:13px;
+}
+.providesSummary th.colFirst, .providesSummary th.colLast, .providesSummary td.colFirst,
+.providesSummary td.colLast {
+    white-space:normal;
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.requiresSummary td.colFirst, .requiresSummary th.colFirst,
+.packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th,
+.usesSummary td.colFirst, .usesSummary th.colFirst,
+.providesSummary td.colFirst, .providesSummary th.colFirst,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colSecond, .memberSummary th.colSecond, .memberSummary th.colConstructorName,
+.typeSummary td.colFirst, .typeSummary th.colFirst {
+    vertical-align:top;
+}
+.packagesSummary th.colLast, .packagesSummary td.colLast {
+    white-space:normal;
+}
+td.colFirst a:link, td.colFirst a:visited,
+td.colSecond a:link, td.colSecond a:visited,
+th.colFirst a:link, th.colFirst a:visited,
+th.colSecond a:link, th.colSecond a:visited,
+th.colConstructorName a:link, th.colConstructorName a:visited,
+th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited, 
+.constantValuesContainer td a:link, .constantValuesContainer td a:visited, 
+.allClassesContainer td a:link, .allClassesContainer td a:visited, 
+.allPackagesContainer td a:link, .allPackagesContainer td a:visited {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor, .altColor th {
+    background-color:#FFFFFF;
+}
+.rowColor, .rowColor th {
+    background-color:#EEEEEF;
+}
+/*
+ * Styles for contents.
+ */
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+td.colLast div {
+    padding-top:0px;
+}
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+ * Styles for formatting effect.
+ */
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .implementationLabel, .memberNameLabel, .memberNameLink,
+.moduleLabelInPackage, .moduleLabelInType, .overrideSpecifyLabel, .packageLabelInType,
+.packageHierarchyLabel, .paramLabel, .returnLabel, .seeLabel, .simpleTagLabel,
+.throwsLabel, .typeNameLabel, .typeNameLink, .searchTagLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+.deprecationBlock {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    border-style:solid;
+    border-width:thin;
+    border-radius:10px;
+    padding:10px;
+    margin-bottom:10px;
+    margin-right:10px;
+    display:inline-block;
+}
+div.block div.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+div.contentContainer ul.blockList li.blockList h2 {
+    padding-bottom:0px;
+}
+/*
+ * Styles for IFRAME.
+ */
+.mainContainer {
+    margin:0 auto; 
+    padding:0; 
+    height:100%; 
+    width:100%; 
+    position:fixed; 
+    top:0; 
+    left:0;
+}
+.leftContainer {
+    height:100%;
+    position:fixed;
+    width:320px;
+}
+.leftTop {
+    position:relative;
+    float:left;
+    width:315px;
+    top:0;
+    left:0;
+    height:30%;
+    border-right:6px solid #ccc;
+    border-bottom:6px solid #ccc;
+}
+.leftBottom {
+    position:relative;
+    float:left;
+    width:315px;
+    bottom:0;
+    left:0;
+    height:70%;
+    border-right:6px solid #ccc;
+    border-top:1px solid #000;
+}
+.rightContainer {
+    position:absolute;
+    left:320px;
+    top:0;
+    bottom:0;
+    height:100%;
+    right:0;
+    border-left:1px solid #000;
+}
+.rightIframe {
+    margin:0;
+    padding:0;
+    height:100%;
+    right:30px;
+    width:100%;
+    overflow:visible;
+    margin-bottom:30px;
+}
+/*
+ * Styles specific to HTML5 elements.
+ */
+main, nav, header, footer, section {
+    display:block;
+}
+/*
+ * Styles for javadoc search.
+ */
+.ui-autocomplete-category {
+    font-weight:bold;
+    font-size:15px;
+    padding:7px 0 7px 3px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+}
+.resultItem {
+    font-size:13px;
+}
+.ui-autocomplete {
+    max-height:85%;
+    max-width:65%;
+    overflow-y:scroll;
+    overflow-x:scroll;
+    white-space:nowrap;
+    box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+}
+ul.ui-autocomplete {
+    position:fixed;
+    z-index:999999;
+}
+ul.ui-autocomplete  li {
+    float:left;
+    clear:both;
+    width:100%;
+}
+.resultHighlight {
+    font-weight:bold;
+}
+#search {
+    background-image:url('resources/glass.png');
+    background-size:13px;
+    background-repeat:no-repeat;
+    background-position:2px 3px;
+    padding-left:20px;
+    position:relative;
+    right:-18px;
+}
+#reset {
+    background-color: rgb(255,255,255);
+    background-image:url('resources/x.png');
+    background-position:center;
+    background-repeat:no-repeat;
+    background-size:12px;
+    border:0 none;
+    width:16px;
+    height:17px;
+    position:relative;
+    left:-4px;
+    top:-4px;
+    font-size:0px;
+}
+.watermark {
+    color:#545454;
+}
+.searchTagDescResult {
+    font-style:italic;
+    font-size:11px;
+}
+.searchTagHolderResult {
+    font-style:italic;
+    font-size:12px;
+}
+.searchTagResult:before, .searchTagResult:target {
+    color:red;
+}
+.moduleGraph span {
+    display:none;
+    position:absolute;
+}
+.moduleGraph:hover span {
+    display:block;
+    margin: -100px 0 0 100px;
+    z-index: 1;
+}
+.methodSignature {
+    white-space:normal;
+}
 
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}
+/*
+ * Styles for user-provided tables.
+ *
+ * borderless:
+ *      No borders, vertical margins, styled caption.
+ *      This style is provided for use with existing doc comments.
+ *      In general, borderless tables should not be used for layout purposes.
+ *
+ * plain:
+ *      Plain borders around table and cells, vertical margins, styled caption.
+ *      Best for small tables or for complex tables for tables with cells that span
+ *      rows and columns, when the "striped" style does not work well.
+ *
+ * striped:
+ *      Borders around the table and vertical borders between cells, striped rows,
+ *      vertical margins, styled caption.
+ *      Best for tables that have a header row, and a body containing a series of simple rows.
+ */
 
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
+table.borderless,
+table.plain,
+table.striped {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+table.borderless > caption,
+table.plain > caption,
+table.striped > caption {
+    font-weight: bold;
+    font-size: smaller;
+}
+table.borderless th, table.borderless td,
+table.plain th, table.plain td,
+table.striped th, table.striped td {
+    padding: 2px 5px;
+}
+table.borderless,
+table.borderless > thead > tr > th, table.borderless > tbody > tr > th, table.borderless > tr > th,
+table.borderless > thead > tr > td, table.borderless > tbody > tr > td, table.borderless > tr > td {
+    border: none;
+}
+table.borderless > thead > tr, table.borderless > tbody > tr, table.borderless > tr {
+    background-color: transparent;
+}
+table.plain {
+    border-collapse: collapse;
+    border: 1px solid black;
+}
+table.plain > thead > tr, table.plain > tbody tr, table.plain > tr {
+    background-color: transparent;
+}
+table.plain > thead > tr > th, table.plain > tbody > tr > th, table.plain > tr > th,
+table.plain > thead > tr > td, table.plain > tbody > tr > td, table.plain > tr > td {
+    border: 1px solid black;
+}
+table.striped {
+    border-collapse: collapse;
+    border: 1px solid black;
+}
+table.striped > thead {
+    background-color: #E3E3E3;
+}
+table.striped > thead > tr > th, table.striped > thead > tr > td {
+    border: 1px solid black;
+}
+table.striped > tbody > tr:nth-child(even) {
+    background-color: #EEE
+}
+table.striped > tbody > tr:nth-child(odd) {
+    background-color: #FFF
+}
+table.striped > tbody > tr > th, table.striped > tbody > tr > td {
+    border-left: 1px solid black;
+    border-right: 1px solid black;
+}
+table.striped > tbody > tr > th {
+    font-weight: normal;
+}
diff --git a/Buildings/Resources/src/convertEPW/doc/type-search-index.js b/Buildings/Resources/src/convertEPW/doc/type-search-index.js
new file mode 100644
index 00000000000..bea998b7504
--- /dev/null
+++ b/Buildings/Resources/src/convertEPW/doc/type-search-index.js
@@ -0,0 +1 @@
+typeSearchIndex = [{"l":"All Classes","url":"allclasses-index.html"},{"p":"<Unnamed>","l":"ConvertWeatherData"}]
\ No newline at end of file
diff --git a/Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java b/Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java
index 8639f3c9d7f..6b2888f52d5 100644
--- a/Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java
+++ b/Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java
@@ -431,6 +431,8 @@ static public void main(String args[]) {
     if(!filename.contains(".epw")) {
       System.err.println ("Name of weather data file should end with \".epw\". To convert weather data, run this program as");
       System.out.println("java -jar ConvertWeatherData.jar inputFile.epw");
+      System.out.println("or if spaces are present in the name, write name between \"\"");
+      System.out.println("java -jar ConvertWeatherData.jar \"inputFile .epw\"");
       System.exit(1);
     }
 
diff --git a/Buildings/Resources/src/fmi-library/CMakeLists.txt b/Buildings/Resources/src/fmi-library/CMakeLists.txt
new file mode 100644
index 00000000000..6a17993256b
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/CMakeLists.txt
@@ -0,0 +1,148 @@
+# CMake file to build fmi library
+# Invoke as
+# rm -rf build && mkdir build && cd build && cmake .. && cmake --build . && cd ..
+
+cmake_policy(SET CMP0048 NEW)
+
+cmake_minimum_required(VERSION 3.8)
+
+project( fmi-library
+  VERSION 2.2
+  DESCRIPTION "FMI Library for Modelica Buildings Library"
+  LANGUAGES C
+)
+
+# Create position independent code
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+find_package(Git REQUIRED)
+
+
+##################################################################################
+# Detect OS.
+if(CMAKE_SYSTEM_NAME MATCHES Windows)
+    set(WINDOWS 1)
+    message("Windows system detected.")
+elseif(CMAKE_SYSTEM_NAME MATCHES Linux)
+    set(LINUX 1)
+    message("Linux system detected.")
+elseif(CMAKE_SYSTEM_NAME MATCHES Darwin)
+    set(MACOSX 1)
+    message("Mac OS X system detected.")
+else()
+    message(WARNING "OS unknown!")
+endif()
+
+##################################################################################
+# Set target directories.
+if (WIN32) # True also on 64 bit Windows
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(PLATFORM_INSTALL_PREFIX win64)
+    else()
+        set(PLATFORM_INSTALL_PREFIX win32)
+    endif()
+elseif(APPLE)
+    set(PLATFORM_INSTALL_PREFIX darwin64)
+elseif(UNIX)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(PLATFORM_INSTALL_PREFIX linux64)
+    else()
+        set(PLATFORM_INSTALL_PREFIX linux32)
+    endif()
+else()
+    message(FATAL_ERROR "OS unknown!")
+endif()
+##################################################################################
+
+include (ExternalProject)
+#include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+
+set (FMI_LIBRARY "fmi-library-modelon")
+
+ExternalProject_Add(
+  ${FMI_LIBRARY}
+
+  PREFIX         ${FMI_LIBRARY}
+  GIT_REPOSITORY https://github.com/modelon-community/fmi-library
+  GIT_TAG        2.2
+  GIT_SHALLOW    ON
+
+  BUILD_ALWAYS   OFF
+
+#--Configure step-------------
+#  CONFIGURE_COMMAND ""
+  CMAKE_ARGS        DFMILIB_BUILD_SHARED_LIB=OFF DFMILIB_GENERATE_DOXYGEN_DOC=OFF
+
+#--Build step-----------------
+#  BUILD_COMMAND     "" #cmake --build ..
+#--Install step---------------
+#  [INSTALL_DIR dir]           # Installation prefix
+#  INSTALL_COMMAND   ""
+#--Test step------------------
+   TEST_AFTER_INSTALL 1        # Set to 1 to add test step executed after install step
+  )
+
+##################################################################################
+# Copy the library which is used by the Modelica compiler.
+set(so_install_path "${CMAKE_CURRENT_SOURCE_DIR}/../../Library/${PLATFORM_INSTALL_PREFIX}/")
+
+add_custom_command(TARGET ${FMI_LIBRARY}
+  POST_BUILD
+  COMMAND "${CMAKE_COMMAND}" -E copy_directory
+     "fmi-library-modelon/src/install/lib"
+     "${so_install_path}"
+  COMMENT "Copying to Modelica library directory '${so_install_path}'"
+)
+
+if(CMAKE_SYSTEM_NAME MATCHES Windows)
+  add_custom_command(TARGET ${FMI_LIBRARY}
+    POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E remove
+           "${so_install_path}/fmilib.lib"
+    COMMENT "Deleting ${so_install_path}/fmilib.lib"
+)
+elseif(CMAKE_SYSTEM_NAME MATCHES Linux)
+  add_custom_command(TARGET ${FMI_LIBRARY}
+    POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E remove
+            "${so_install_path}/libfmilib.a"
+    COMMENT "Deleting ${so_install_path}/libfmilib.a"
+  )
+endif()
+
+
+
+# Copy the doc and header files
+file(REMOVE_RECURSE "${CMAKE_CURRENT_SOURCE_DIR}/doc")
+
+add_custom_command(TARGET ${FMI_LIBRARY}
+  POST_BUILD
+  COMMAND "${CMAKE_COMMAND}" -E copy_directory
+        "${CMAKE_CURRENT_SOURCE_DIR}/build/fmi-library-modelon/src/install/doc"
+        "${CMAKE_CURRENT_SOURCE_DIR}/doc"
+  COMMENT "Copying doc files to ${CMAKE_CURRENT_SOURCE_DIR}/doc"
+)
+
+add_custom_command(TARGET ${FMI_LIBRARY}
+  POST_BUILD
+  COMMAND "${CMAKE_COMMAND}" -E copy_directory
+        "${CMAKE_CURRENT_SOURCE_DIR}/build/fmi-library-modelon/src/install/include"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  COMMENT "Copying include files to ${CMAKE_CURRENT_SOURCE_DIR}/include"
+)
+
+add_custom_command(TARGET ${FMI_LIBRARY}
+  POST_BUILD
+  COMMAND "${CMAKE_COMMAND}" -E copy
+         "${CMAKE_CURRENT_SOURCE_DIR}/include/fmilib_config.h"
+         "${CMAKE_CURRENT_SOURCE_DIR}/include/fmilib_config-${PLATFORM_INSTALL_PREFIX}.h"
+  COMMENT "Copying platform specific include file to ${CMAKE_CURRENT_SOURCE_DIR}/include/fmilib_config-${PLATFORM_INSTALL_PREFIX}.h"
+)
+
+add_custom_command(TARGET ${FMI_LIBRARY}
+  POST_BUILD
+  COMMAND "${CMAKE_COMMAND}" -E copy
+         "${CMAKE_CURRENT_SOURCE_DIR}/src/fmilib_config.h"
+         "${CMAKE_CURRENT_SOURCE_DIR}/include/fmilib_config.h"
+  COMMENT "Copying portable include file to ${CMAKE_CURRENT_SOURCE_DIR}/include"
+)
diff --git a/Buildings/Resources/src/fmi-library/doc/FMILIB_Acknowledgements.txt b/Buildings/Resources/src/fmi-library/doc/FMILIB_Acknowledgements.txt
new file mode 100644
index 00000000000..5ae4f9ace2f
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/doc/FMILIB_Acknowledgements.txt
@@ -0,0 +1,31 @@
+% File: FMILIB_Acknowledgements.txt 
+% Acknowledgements on the use of third party software inside for the FMILIB.
+% Note: Content of this file is used verbatim in doxygen generated documentation.
+%
+
+\section Acknowledgements
+The FMI Library utilizes contains code from third party tools and packages.
+The respective copyright information and licenses are listed with URL 
+references to the full texts.
+
+- \b eXPat \n
+The parsing of the file modelDescription.xml is using eXpat.\n
+Homepage: <http://www.libexpat.org/> \n
+MIT License: <http://www.jclark.com/xml/copying.txt>
+
+- \b Minizip \n
+The unziping of the FMU is performed partially by using Minizip library.\n
+Homepage: <http://www.winimage.com/zLibDll/minizip.html>.\n
+Condition of use and distribution are the same as Zlib
+<http://www.zlib.net/zlib_license.html>.
+
+- \b Zlib \n
+The unziping is performed by using Zlib library called via \e minizip library.\n
+Homepage: <http://www.zlib.net/>.\n
+Zlib License: <http://www.zlib.net/zlib_license.html>. 
+
+- \b C99 snprintf \n
+C99 snprintf library is used to realize the snprintf functionality staying with C89
+code.\n
+Homepage: http://www.jhweiss.de/software/snprintf.html \n
+The code is free to use. See notice in the COPYING file included with the code.
\ No newline at end of file
diff --git a/Buildings/Resources/src/fmi-library/doc/FMILIB_License.txt b/Buildings/Resources/src/fmi-library/doc/FMILIB_License.txt
new file mode 100644
index 00000000000..eb86892ca87
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/doc/FMILIB_License.txt
@@ -0,0 +1,32 @@
+% File: FMILIB_License.txt 
+% License information file for the FMILIB.
+% Note: Content of this file is used verbatim in doxygen generated documentation.
+%
+
+\section License
+\copyright (C) 2012 Modelon AB
+
+3-Clause BSD License:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:\n
+- Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.\n
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.\n
+- Neither the name of the Modelon AB nor the
+  names of its contributors may be used to endorse or promote products
+  derived from this software without specific prior written permission.\n
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MODELON AB BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/Buildings/Resources/src/fmi-library/doc/FMILIB_Readme.txt b/Buildings/Resources/src/fmi-library/doc/FMILIB_Readme.txt
new file mode 100644
index 00000000000..ccfb7ccb7fe
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/doc/FMILIB_Readme.txt
@@ -0,0 +1,267 @@
+% FMILIB_Readme.txt
+% Readme file for the FMI Library
+%  
+% Content of this file is used verbatim in doxygen generated documentation.
+% The documentation can be downloaded as HTML at
+% https://github.com/modelon-community/fmi-library/releases
+%
+
+\mainpage FMI Library
+
+\version     2.2
+\date        11 March 2020
+\section Summary
+FMI library is intended as a foundation for applications interfacing FMUs 
+(Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.
+See <http://www.fmi-standard.org/> 
+
+The test codes provided with the library can serve as starting point for the 
+development of custom applications. See Section \ref testing for details.
+
+FMI library is an open-source project and can be found at GitHub: <https://github.com/modelon-community/fmi-library/>
+
+\section config Configuring and building
+CMake (see <http://www.cmake.org/>) is used to generate the native build scripts
+for the library. It is recommended to use "cmake-gui" on Windows or 
+"ccmake <FMIL source dir>" to configure the build. All the required third party
+libraries are included into the distribution.
+
+CMake 2.8.6 is required since this is the version used in development both on 
+Windows and Linux. The build script is KNOWN NOT TO WORK WITH CMake 2.8.3 and 
+below (due to ExternalProject interface changes). CMake 2.8.4 and 2.8.5 are not 
+tested.
+
+To build from a terminal command line on Linux or Mac with default settings use:
+\code
+	mkdir build-fmil; cd build-fmil
+	cmake -DFMILIB_INSTALL_PREFIX=<prefix> <path to FMIL source>
+	make install test
+\endcode
+To build in MSYS terminal with g++/gcc on Windows:
+\code
+	mkdir build-fmil; cd build-fmil
+	cmake -DFMILIB_INSTALL_PREFIX=<prefix> -G "MSYS Makefiles" <path to FMIL source>
+	make install test
+\endcode
+To build from command line with Microsoft Visual Studio compilers on Windows:
+\code
+	mkdir build-fmil; cd build-fmil
+	cmake -DFMILIB_INSTALL_PREFIX=<prefix> -G "Visual Studio 10" <path to FMIL source>
+	cmake --build . --config MinSizeRel --target install
+\endcode
+
+The primary targets of the library build script are:
+- <prefix>/include/fmilib.h \n
+  The include file to be used in client applications.
+- Library files under <prefix>/lib/ \n
+  Static library is named 'fmilib' and shared library 'fmilib_shared'. The 
+  prefix/suffix of the library files differ depending on the platform. Note 
+  that if you have configure and built both static and shared library on 
+  Windows but want to link with the static library compile time define 
+  "FMILIB_BUILDING_LIBRARY" must be set.
+- Doxygen generated documentation under <prefix>/doc/. Note that 
+  documentation is not generated as part   of install target and you need to 
+  build the 'doc' target separately, i.e., run 'make doc' or explicitly   build 
+  the project in Visual Studio. 
+  
+The following build configuration options are provided:
+- \b FMILIB_INSTALL_PREFIX - prefix prepended to install directories.\n
+   Default: "../install" \n
+   This is the main install directory name. Include files will be located in 
+   the "include" subdirectory and library files in the "lib" subdirectory. 
+   Client applications should only include "fmilib.h"
+
+- \b FMILIB_THIRDPARTYLIBS - thirdparty libaries are currently shipped with 
+   the library. 
+
+- \b FMILIB_FMI_STANDARD_HEADERS - Path to the FMI standard headers 
+  directory. Header for specific standards files are expected in 
+  subdirectories FMI1, FMI2, etc.\n
+  Default: "ThirdParty/FMI/default"
+
+- \b FMILIB_DEFAULT_BUILD_TYPE_RELEASE - Controls build-type used for 
+  Makefile generation.\n  
+  Default: ON\n
+  If this option is on then 'Release' mode compile flags are used. Otherwize, 
+  'Debug' mode flags are generated into the Makefile. The option may be 
+  overwritten by explicitly setting CMAKE_BUILD_TYPE.
+
+- \b FMILIB_BUILD_WITH_STATIC_RTLIB Use static run-time libraries (/MT or 
+  /MTd code generation flags).\n
+  Default: OFF\n
+  This is only used when generating Microsoft Visual Studio solutions. If the 
+  options is on then the library will be built against static runtime, 
+  otherwise - dynamic runtime (/MD or /MDd). Make sure the client code is 
+  using matching runtime.
+
+- \b FMILIB_BUILD_STATIC_LIB Build the library as static.\n
+  Default: ON\n
+  'fmilib' may be used for static linking.
+  
+- \b FMILIB_BUILD_SHARED_LIB Build the library as shared (dll/so/dylib).\n
+  Default: ON\n
+  '\e fmilib_shared' may be used for dynamic linking.
+
+- \b FMILIB_FMI_PLATFORM - FMI platform defines the subdirectory within FMU 
+  where binary is located.\n
+  The build system will automatically detect win32, win64, linux32, linux64, 
+  darwin32, darwin64.
+
+- \b FMILIB_BUILD_FOR_SHARED_LIBS  The static library 'fmilib' can be linked 
+  into shared libraries.\n
+  Default: ON\n
+  On LINUX position independent code (-fPIC) must be used on all files to be 
+  linked into a shared library (.so file). On other systems this is not 
+  needed (either is default or relocation is done).
+  Set this option to OFF if you are building an application on Linux and use 
+  static library only.
+
+- \b FMILIB_ENABLE_LOG_LEVEL_DEBUG Enable log level \e 'debug'. \n
+  Default: OFF\n
+  If the option is OFF then the debug level messages are not compiled in.
+
+- \b FMILIB_GENERATE_DOXYGEN_DOC Enable doxygen target.\n
+  Default: ON\n
+  You need Doxygen to be installed on the system for this option to have an
+  effect.
+
+- \b FMILIB_BUILD_TESTS Enable build of the tests supplied with the library.\n
+  Default: ON\n
+  \c RUN_TESTS - target will be provided in Visual Studio. 'make test' will 
+  run tests on Makefile based platforms.
+  
+- \b FMILIB_BUILD_BEFORE_TESTS Force build before testing, i.e., building the 
+  FMI library becomes the first test.\n
+  Default: ON
+
+- \b FMILIB_LINK_TEST_TO_SHAREDLIB Link the tests to fmilib_shared (if built) 
+  instead of static fmilib.\n
+  Default: ON
+
+- \b FMILIB_GENERATE_BUILD_STAMP Generate a build time stamp and include in 
+  into the library. \n
+  Default: OFF\n
+  The function \e fmilib_get_build_stamp() may be used to retrieve the time 
+  stamp. \code const char* fmilib_get_build_stamp(void); \endcode
+
+- \b FMILIB_BUILD_LEX_AND_PARSER_FILES Generate scanner and parser for variable
+  name syntax checking. Requiers Flex and Bison commands to be specified. Please
+  read src/XML/NOTE if using this option. Can only be used on windows. Only
+  tested with versions 2.4.3/2.5.3.
+
+- \b BISON_COMMAND Specifies the path to the Bison executable. Only visible if
+  FMILIB_BUILD_LEX_AND_PARSER_FILES is checked.
+
+- \b FLEX_COMMAND Specifies the path to the Flex executable. Only visible if
+  FMILIB_BUILD_LEX_AND_PARSER_FILES is checked.
+
+\section testing Automatic tests
+The FMI library comes with a number of automatic tests. Building of the test 
+is controlled by \a FMILIB_BUILD_TESTS configuration option. The test 
+porgrams are also intended as examples of library usage.\n
+ The tests can be run in Visual Studio by building project \e RUN_TESTS. For 
+Makefile based configurations (MSYS, Linux, Mac OSx) run 'make test'.\n 
+Output from the test programs and test logs can be found in the \e Testing 
+folder in the build directory.
+
+The supplied tests are:
+- \b ctest_build_all \n
+Build the library. This test is controlled by \a FMILIB_BUILD_BEFORE_TESTS 
+configuration option.
+- \b ctest_fmi_zip_unzip_test \n
+Basic unzip functionality test. Test executable is \e fmi_zip_unzip_test.
+- \b ctest_fmi_zip_zip_test \n
+Basic zip functionality test. Test executable is \e fmi_zip_zip_test.
+- \b ctest_fmi1_check_variable_naming_conventions_test \n
+Tests the name checker functionality to follow the variable naming conventions. 
+Test executable is \e ctest_fmi1_check_variable_naming_conventions_test, main
+source file is \ref ctest_fmi1_check_variable_naming_conventions_test.c.
+\e fmi_import_me_test, main source file is \ref fmi_import_me_test.c.
+- \b ctest_fmi_import_me_test \n
+Load a basic model exchange FMU and simulate it. Test executable is 
+\e fmi_import_me_test, main source file is \ref fmi_import_me_test.c.
+- \b ctest_fmi_import_cs_test \n
+Load a basic co-simulation FMU and simulate it. Test executable is 
+\e fmi_import_cs_test, main source file is \ref fmi_import_cs_test.c.
+- \b ctest_fmi_import_cs_tc_test \n
+Load a basic co-simulation tools coupling FMU and simulate it. Test executable is 
+\e fmi_import_cs_test, main source file is \ref fmi_import_cs_test.c.
+- \b ctest_fmi_import_xml_test, \b ctest_fmi_import_xml_test_empty, 
+\b ctest_fmi_import_xml_test_mf \n
+Load a small model description XML file and print out detailed information on 
+it. Test executable is \e fmi_import_xml_text, main source file is 
+\ref fmi_import_xml_test.cc. The test is run on three different XML files.
+This test depends on the success of the \e ctest_fmi_import_cs_test. 
+- \b ctest_fmi1_capi_cs_test \n
+Low level test of FMI CAPI functionality for co-simulation. Test executable 
+is \e fmi1_capi_cs_test.
+- \b ctest_fmi1_capi_me_test \n
+Low level test of FMI CAPI functionality for model exchange. Test executable 
+is \e fmi1_capi_me_test.
+- \b ctest_fmi1_logger_test_run \n
+Run logger test generating output fmi1_logger_test_output.txt. Test 
+executable is \e fmi1_logger_test.
+- \b ctest_fmi1_logger_test_check \n
+Check that the logger test output generated by \b ctest_fmi1_logger_test_run 
+is identical with the reference file found in the \b Test subdirectory.
+- \b ctest_fmi2_check_variable_naming_conventions_test \n
+Tests the name checker functionality to follow the variable naming conventions. 
+Test executable is \e ctest_fmi2_check_variable_naming_conventions_test, main
+source file is \ref ctest_fmi2_check_variable_naming_conventions_test.c.
+- \b ctest_fmi2_import_xml_test_empty, \b ctest_fmi2_import_xml_test_me,
+\b ctest_fmi2_import_xml_test_cs, \b ctest_fmi2_import_xml_test_mf \n
+Same as \b ctest_fmi_import_xml_test for FMI 2.0 modules. Test executable
+is \e fmi2_import_xml_test.exe, main source file \ref fmi2_import_xml_test.cc.
+- \b ctest_fmi2_import_test_me \n
+Load a basic FMI 2.0 model exchange FMU and simulate it. Test executable is 
+\e fmi2_import_me_test, main source file is \ref fmi2_import_me_test.c.
+- \b ctest_fmi2_import_test_cs \
+Load a basic FMI 2.0 co-simulation FMU and simulate it. Test executable is 
+\e fmi2_import_cs_test, main source file is \ref fmi2_import_me_test.c.
+- \b ctest_fmi_import_test_no_xml, \b ctest_fmi_import_test_me_1,
+\b ctest_fmi_import_test_cs_1, \b ctest_fmi_import_test_me_2, 
+\b ctest_fmi_import_test_cs_2 \n
+Test library functionality of handling FMUs with different standard interfaces
+within a single application. Test executable is \e fmi_import_test.exe. Main
+source file is \ref fmi_import_test.c
+
+\section logging Using logs
+In the text below we consider an FMU importing application (referenced as an 
+'application') that uses the FMIL. The library is designed to send log 
+messages to a logger callback function ::jm_logger_f provided as a part of 
+::jm_callbacks structure in the call to fmi_import_allocate_context(). The 
+logging/error reporting functions within FMIL support following modes: 
+-# An importing application relies on default logging functions provided by 
+FMIL and only chooses the log-level 
+	- FMIL provides default jm logger callback (See jm_callbacks.h 
+		jm_default_logger())
+	- FMIL provides default fmi logger callback for each standard version.
+    See fmi1_import_convenience.h fmi1_default_callback_logger() and
+	fmi2_import_convenience.h fmi2_default_callback_logger().
+-# An application provides a callback for reporting error messages according 
+	to jm_callbacks.h (::jm_logger_f) 
+   - Only errors from FMIL can be propagated to this callback in a 
+	thread-safe manner for FMI1. 
+	Imported FMUs may still use the default callback provided by the library. 
+	This is since logger function in FMI 1.0 standard is context 
+	independent. The non-thread safe implementation on the FMI1 callback can 
+	be found in fmi1_import_convenience.h fmi1_log_forwarding().\n
+	In FMI 2 the fmiComponentEnvironment can be utilized to forward 
+	messages from the default fmi2 logger function as provided by the library 
+	to the user defined ::jm_logger_f function. The fmi2_log_forwarding() 
+	function expects the context to be set to ::fmi2_import_t.
+-# An importing application provides logging function according to the specific
+   FMI standard version.
+   - Errors from FMIL may be forwarded to this callback. There is a function 
+	that translates calls according to jm_callbacks.h ::jm_logger_f into calls 
+	according to fmi_functions.h fmi_callbacks_logger_ft (see 
+	fmi1_import_init_logger() or fmi2_import_init_logger() that are used to setup 
+	'forwarding').\n
+    Setting of the callback can only be done at the stage where FMU standard 
+	is known.
+-# An importing application may choose not to use logging function but rely on 
+    return codes and jm_get_last_error() 
+    - jm_logger function should be set to NULL
+    - Errors from a FMI 1.0 fmu1 cannot be handled this way in a thread-safe 
+	way (see point 2 above). It works fine with FMI 2.0.
+ 
diff --git a/Buildings/Resources/src/fmi-library/include/FMI/fmi_import_context.h b/Buildings/Resources/src/fmi-library/include/FMI/fmi_import_context.h
new file mode 100644
index 00000000000..06612e043bf
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI/fmi_import_context.h
@@ -0,0 +1,136 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+/** \file fmi_import_context.h
+*  \brief Import context is the entry point to the library. It is used to initialize, unzip, get FMI version and start parsing.
+*/
+
+#ifndef FMI_IMPORT_CONTEXT_H_
+#define FMI_IMPORT_CONTEXT_H_
+
+#include <stddef.h>
+#include <fmilib_config.h>
+#include <JM/jm_callbacks.h>
+#include <FMI2/fmi2_xml_callbacks.h>
+#include <FMI/fmi_version.h> 
+#include <FMI1/fmi1_types.h>
+#include <FMI1/fmi1_enums.h>
+#include <FMI2/fmi2_types.h>
+#include <FMI2/fmi2_enums.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	
+/** 
+\addtogroup fmi_import FMI import library
+@{
+\addtogroup fmi_import_context Library initialization
+Interaction with an FMU by means of the FMI Library starts with allocation of 
+an ::fmi_import_context_t structure. This is done with a call to fmi_import_allocate_context().
+The next step is detection of FMI standard used in the specific FMU. This is achieved by
+calling fmi_import_get_fmi_version() function. When the standard is known a standard
+specific function for processing model description XML should be called to create an
+opaque FMU structure. This is done by calling either fmi1_import_parse_xml() or fmi2_import_parse_xml().
+With the FMU structure available one can proceed by loading the FMU binary 
+(fmi1_import_create_dllfmu() or fmi2_import_create_dllfmu()). After that 
+the code is able to interact with the FMU by means of the methonds presented 
+in \ref fmi1_import_capi and \ref fmi2_import_capi.
+
+\addtogroup  fmi1_import
+\addtogroup  fmi2_import
+\addtogroup  fmi_import_utils
+@}
+\addtogroup fmi_import_context
+@{
+*/
+
+/** \brief FMI version independent library context. 
+	Opaque struct returned from fmi_import_allocate_context()
+*/
+typedef struct fmi_xml_context_t fmi_import_context_t ;
+
+/** \brief Create fmi_import_context_t structure.
+	@param callbacks - a pointer to the library callbacks for memory management and logging. May be NULL if defaults are utilized.
+	@return A new structure if memory allocation was successful.
+*/
+FMILIB_EXPORT fmi_import_context_t* fmi_import_allocate_context( jm_callbacks* callbacks);
+
+/**
+	\brief Free memory allocated for the library context.
+	@param c - library context allocated by fmi_import_allocate_context()
+*/
+FMILIB_EXPORT void fmi_import_free_context( fmi_import_context_t* c);
+
+/**
+    \brief If this configuration option is set, the model description will be
+    checked to follow the variable naming conventions. Variables not following
+    the convention will be logged.
+*/
+#define FMI_IMPORT_NAME_CHECK 1
+
+/**
+    \brief Sets advanced configuration, if zero is passed default configuration
+    is set. Currently only one non default configuration is available:
+    FMI_IMPORT_XML_NAME_CHECK.
+    @param conf - specifies the configuration to use
+*/
+FMILIB_EXPORT void fmi_import_set_configuration( fmi_import_context_t* c, int conf);
+
+/**
+	\brief Unzip an FMU specified by the fileName into directory dirName and parse XML to get FMI standard version.
+	@param c - library context.
+	@param fileName - an FMU file name.
+	@param dirName - a directory name where the FMU should be unpacked
+*/
+FMILIB_EXPORT fmi_version_enu_t fmi_import_get_fmi_version( fmi_import_context_t* c, const char* fileName, const char* dirName);
+
+/**
+	\brief FMU version 1.0 object
+*/
+typedef struct fmi1_import_t fmi1_import_t;
+
+/**
+	\brief FMU version 2.0 object
+*/
+typedef struct fmi2_import_t fmi2_import_t;
+
+/**
+	\brief Parse FMI 1.0 XML file found in the directory dirName.
+	\param c - library context.
+	\param dirName - a directory where the FMU was unpacked and XML file is present.
+	\return fmi1_import_t:: opaque object pointer
+*/
+FMILIB_EXPORT fmi1_import_t* fmi1_import_parse_xml( fmi_import_context_t* c, const char* dirName);
+
+/**
+    \brief Create ::fmi2_import_t structure and parse the FMI 2.0 XML file found in the directory dirName.
+	\param context - library context.
+	\param dirPath - a directory where the FMU was unpacked and XML file is present.
+	\param xml_callbacks Callbacks to use for processing of annotations (may be NULL).
+	\return fmi2_import_t:: opaque object pointer
+*/
+FMILIB_EXPORT fmi2_import_t* fmi2_import_parse_xml( fmi_import_context_t* context, const char* dirPath, fmi2_xml_callbacks_t* xml_callbacks);
+
+/** 
+@}
+*/
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI/fmi_import_util.h b/Buildings/Resources/src/fmi-library/include/FMI/fmi_import_util.h
new file mode 100644
index 00000000000..fceb79df1d5
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI/fmi_import_util.h
@@ -0,0 +1,73 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI1_IMPORT_UTIL_H_
+#define FMI1_IMPORT_UTIL_H_
+
+#include <JM/jm_callbacks.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/**
+\addtogroup  fmi_import_utils Utility functions supporting interactions with the library
+@{
+*/
+/** 
+	\brief Create a unique temporary directory
+	\param cb - callbacks for memory allocation and logging. Default callbacks are used if this parameter is NULL.
+	\param systemTempDir - directory where the temp dir should be located both absolute and relative path are accepted.
+				System-wide directory is used if this parameter is NULL.
+	\param tempPrefix - File name template prefix used when creating temporaty directories. "fmil" is used if this is NULL.
+	\return A pointer to the temporary directory name (absolute path, no terminating '/'). Caller is responsible for freeing the memory.
+		The function returns NULL if there were errors in which case a message is send to the logger.	
+*/
+FMILIB_EXPORT char* fmi_import_mk_temp_dir(jm_callbacks* cb, const char* systemTempDir, const char* tempPrefix);
+
+/**
+\brief Remove directory and all it contents.
+	\param cb - callbacks for memory allocation and logging. Default callbacks are used if this parameter is NULL.
+	\param dir - path to be removed.
+	\return Statuc success or error.
+*/
+FMILIB_EXPORT jm_status_enu_t fmi_import_rmdir(jm_callbacks* cb, const char* dir);
+
+/** 
+	\brief Create a file:// URL from absolute path
+	\param cb - callbacks for memory allocation and logging. Default callbacks are used if this parameter is NULL.
+	\param absPath - absolute path to be converted into the URL
+	\return A pointer to the URL. Caller is responsible for freeing the memory.
+		The function returns NULL if there were errors in which case a message is send to the logger.	
+*/
+FMILIB_EXPORT char* fmi_import_create_URL_from_abs_path(jm_callbacks* cb, const char* absPath);
+
+/** Given directory name fmu_unzipped_path and model identifier consturct Dll/so name
+	@return Pointer to a string with the file name. Caller is responsible for freeing the memory.
+*/
+FMILIB_EXPORT char* fmi_import_get_dll_path(const char* fmu_unzipped_path, const char* model_identifier, jm_callbacks* callBackFunctions);
+
+/** Given directory name fmu_unzipped_path and model identifier consturct XML file name
+	@return Pointer to a string with the file name. Caller is responsible for freeing the memory.
+*/
+FMILIB_EXPORT char* fmi_import_get_model_description_path(const char* fmu_unzipped_path, jm_callbacks* callBackFunctions);
+/**
+@}
+@}
+*/
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* End of header file FMI1_IMPORT_UTIL_H_ */
\ No newline at end of file
diff --git a/Buildings/Resources/src/fmi-library/include/FMI/fmi_util.h b/Buildings/Resources/src/fmi-library/include/FMI/fmi_util.h
new file mode 100644
index 00000000000..fab87200aac
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI/fmi_util.h
@@ -0,0 +1,54 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI_UTIL_H
+#define FMI_UTIL_H
+#include <fmilib_config.h>
+#include <JM/jm_callbacks.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+	@file fmi_util.h 
+	\brief Some low-level utility functions suitable for all standards.
+
+	*/
+/** \addtogroup jm_utils
+  * @{
+*/
+/** \brief Given directory name fmu_unzipped_path and construct the directory path for Dll/so
+	\param fmu_unzipped_path Directory name where FMU is unpacked.
+	\param callbacks Callbacks for memory allocation.
+	@return Pointer to a string with the directory name (last symbol is directory separator). Caller is responsible for freeing the memory.
+*/
+FMILIB_EXPORT char* fmi_construct_dll_dir_name(jm_callbacks* callbacks, const char* fmu_unzipped_path);
+
+/** \brief Given model_identifier construct the dll/so name by adding platform suffix
+	\param callbacks Callbacks for memory allocation.
+	\param dll_dir_name Directory path for Dll/so as returned by fmi_construct_dll_dir_name
+	\param model_identifier The FMU model identifier.
+	@return Pointer to a string with the file name. Caller is responsible for freeing the memory.
+*/
+FMILIB_EXPORT char* fmi_construct_dll_file_name(jm_callbacks* callbacks, const char* dll_dir_name, const char* model_identifier);
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+/* FMI_UTIL_H */
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI/fmi_version.h b/Buildings/Resources/src/fmi-library/include/FMI/fmi_version.h
new file mode 100644
index 00000000000..3104db233b1
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI/fmi_version.h
@@ -0,0 +1,52 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI_VERSION_H
+#define FMI_VERSION_H
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+	@file fmi_version.h 
+	\brief Enum defining supported FMI versions.
+
+	*/
+/** \addtogroup jm_utils
+  * @{
+*/
+
+/** \brief Suported versions of FMI standard */
+typedef enum
+{ 
+	fmi_version_unknown_enu = 0,
+	fmi_version_1_enu,
+	fmi_version_2_0_enu,
+	fmi_version_unsupported_enu
+} fmi_version_enu_t;
+
+/** Convert version enum into string */
+FMILIB_EXPORT
+const char * fmi_version_to_string(fmi_version_enu_t v);
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+/* JM_TYPES_H */
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_enums.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_enums.h
new file mode 100644
index 00000000000..e0d21841d1a
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_enums.h
@@ -0,0 +1,114 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI1_ENUMS_H_
+#define FMI1_ENUMS_H_
+
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \file fmi1_enums.h 
+	\brief Definions the enum types used with FMI 1.0 libs
+*/
+
+/**	\addtogroup fmi1_utils
+	@{
+	\addtogroup fmi1_enums
+	@}
+*/
+/** \addtogroup fmi1_enums Enum types used with FMI 1.0 libs
+	@{
+*/
+/** \brief Naming convention for the variables in XML file*/
+typedef enum fmi1_variable_naming_convension_enu_t
+{ 
+        fmi1_naming_enu_flat,
+        fmi1_naming_enu_structured,
+        fmi1_naming_enu_unknown
+} fmi1_variable_naming_convension_enu_t;
+
+/** \brief Convert a #fmi1_variable_naming_convension_enu_t constant into string */
+FMILIB_EXPORT const char* fmi1_naming_convention_to_string(fmi1_variable_naming_convension_enu_t convention);
+
+/**  \brief FMU 1.0 kinds */
+typedef enum fmi1_fmu_kind_enu_t
+{
+        fmi1_fmu_kind_enu_me = 0,
+        fmi1_fmu_kind_enu_cs_standalone,
+        fmi1_fmu_kind_enu_cs_tool,
+		fmi1_fmu_kind_enu_unknown
+} fmi1_fmu_kind_enu_t;
+
+/** \brief Convert a #fmi1_fmu_kind_enu_t constant into string  */
+FMILIB_EXPORT const char* fmi1_fmu_kind_to_string(fmi1_fmu_kind_enu_t kind);
+
+/**  \brief Variability property for variables */
+typedef enum fmi1_variability_enu_t {
+        fmi1_variability_enu_constant,
+        fmi1_variability_enu_parameter,
+        fmi1_variability_enu_discrete,
+        fmi1_variability_enu_continuous,
+		fmi1_variability_enu_unknown
+} fmi1_variability_enu_t;
+
+/** \brief Convert a #fmi1_variability_enu_t constant into string  */
+FMILIB_EXPORT const char* fmi1_variability_to_string(fmi1_variability_enu_t v);
+
+/**  \brief Causality property for variables */
+typedef enum fmi1_causality_enu_t {
+        fmi1_causality_enu_input,
+        fmi1_causality_enu_output,
+        fmi1_causality_enu_internal,
+        fmi1_causality_enu_none,
+        fmi1_causality_enu_unknown
+} fmi1_causality_enu_t;
+
+/** \brief Convert a #fmi1_causality_enu_t constant into string  */
+FMILIB_EXPORT const char* fmi1_causality_to_string(fmi1_causality_enu_t c);
+
+/** \brief Alias property for variables */
+typedef enum fmi1_variable_alias_kind_enu_t {
+    fmi1_variable_is_negated_alias = -1,
+    fmi1_variable_is_not_alias = 0,
+    fmi1_variable_is_alias = 1
+} fmi1_variable_alias_kind_enu_t;
+
+/** \brief Base types used in type definitions */
+typedef enum fmi1_base_type_enu_t
+{
+	fmi1_base_type_real,
+	fmi1_base_type_int,
+	fmi1_base_type_bool,
+	fmi1_base_type_str,
+	fmi1_base_type_enum
+} fmi1_base_type_enu_t;
+
+/**  \brief Convert base type constant to string 
+	\param bt Base type identifier.
+	\return Corresponding base type name.
+	*/
+FMILIB_EXPORT const char* fmi1_base_type_to_string(fmi1_base_type_enu_t bt);
+
+/**	
+ @}
+*/
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* End of header file FMI1_ENUMS_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_functions.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_functions.h
new file mode 100644
index 00000000000..2515d06633e
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_functions.h
@@ -0,0 +1,136 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI1_FUNCTIONS_H_
+#define FMI1_FUNCTIONS_H_
+
+#include <fmilib_config.h>
+
+#include "fmi1_types.h"
+#include <string.h>
+/**	\file fmi1_functions.h
+	Mapping for the standard FMI 1.0 functions into fmi1_ namespace.
+
+	\addtogroup fmi1_utils
+	@{
+*/
+
+/** FMI 1.0 status codes */
+typedef enum {
+	fmi1_status_ok,
+	fmi1_status_warning,
+	fmi1_status_discard,
+	fmi1_status_error,
+	fmi1_status_fatal,
+	fmi1_status_pending
+} fmi1_status_t;
+
+/** Convert #fmi1_status_t variable to string  */
+FMILIB_EXPORT const char* fmi1_status_to_string(fmi1_status_t status);
+
+/** FMI 1.0 logger function type */
+typedef void  (*fmi1_callback_logger_ft)        (fmi1_component_t c, fmi1_string_t instanceName, fmi1_status_t status, fmi1_string_t category, fmi1_string_t message, ...);
+/** FMI 1.0 allocate memory function type */
+typedef void* (*fmi1_callback_allocate_memory_ft)(size_t nobj, size_t size);
+/** FMI 1.0 free memory  function type */
+typedef void  (*fmi1_callback_free_memory_ft)    (void* obj);
+/** FMI 1.0 step finished callback function type */
+typedef void  (*fmi1_step_finished_ft)          (fmi1_component_t c, fmi1_status_t status);
+
+/** Functions for FMI 1.0 ME */
+typedef struct {
+	fmi1_callback_logger_ft         logger;
+	fmi1_callback_allocate_memory_ft allocateMemory;
+	fmi1_callback_free_memory_ft     freeMemory;
+} fmi1_me_callback_functions_t;
+
+/** The FMI 1.0 CS strcuture adds one field to the ME, otherwize compatible */
+typedef struct {
+	fmi1_callback_logger_ft         logger;
+	fmi1_callback_allocate_memory_ft allocateMemory;
+	fmi1_callback_free_memory_ft     freeMemory;
+	fmi1_step_finished_ft           stepFinished;
+} fmi1_callback_functions_t;
+
+/** Event info structure as used in FMI 1.0 ME */
+typedef struct {
+	fmi1_boolean_t iterationConverged;
+	fmi1_boolean_t stateValueReferencesChanged;
+	fmi1_boolean_t stateValuesChanged;
+	fmi1_boolean_t terminateSimulation;
+	fmi1_boolean_t upcomingTimeEvent;
+	fmi1_real_t    nextEventTime;
+} fmi1_event_info_t;
+
+/** FMI 1.0 asyncronous co-simulation  status */
+typedef enum {
+	fmi1_do_step_status,
+	fmi1_pending_status,
+	fmi1_last_successful_time
+} fmi1_status_kind_t;
+
+/* FMI 1.0 common functions */
+typedef const char*	  	    (*fmi1_get_version_ft)					(void);
+typedef fmi1_status_t		(*fmi1_set_debug_logging_ft)			(fmi1_component_t c, fmi1_boolean_t loggingOn);
+typedef fmi1_status_t		(*fmi1_set_real_ft)						(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_real_t   value[]);
+typedef fmi1_status_t		(*fmi1_set_integer_ft)					(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_integer_t value[]);
+typedef fmi1_status_t		(*fmi1_set_boolean_ft)					(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_boolean_t value[]);
+typedef fmi1_status_t		(*fmi1_set_string_ft)					(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_string_t  value[]);
+typedef fmi1_status_t		(*fmi1_get_real_ft)						(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, fmi1_real_t   value[]);
+typedef fmi1_status_t		(*fmi1_get_integer_ft)					(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, fmi1_integer_t value[]);
+typedef fmi1_status_t		(*fmi1_get_boolean_ft)					(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, fmi1_boolean_t value[]);
+typedef fmi1_status_t		(*fmi1_get_string_ft)					(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t nvr, fmi1_string_t  value[]);
+
+/* FMI ME 1.0 functions */
+typedef const char*		    (*fmi1_get_model_typesPlatform_ft)		(void);
+typedef fmi1_component_t	(*fmi1_instantiate_model_ft)			(fmi1_string_t instanceName, fmi1_string_t GUID, fmi1_me_callback_functions_t functions, fmi1_boolean_t loggingOn);
+typedef void			    (*fmi1_free_model_instance_ft)			(fmi1_component_t c);
+typedef fmi1_status_t		(*fmi1_set_time_ft)					(fmi1_component_t c, fmi1_real_t time);
+typedef fmi1_status_t		(*fmi1_set_continuous_states_ft)		(fmi1_component_t c, const fmi1_real_t x[], size_t nx);
+typedef fmi1_status_t		(*fmi1_completed_integrator_step_ft)	(fmi1_component_t c, fmi1_boolean_t* callEventUpdate);
+typedef fmi1_status_t		(*fmi1_initialize_ft)					(fmi1_component_t c, fmi1_boolean_t toleranceControlled, fmi1_real_t relativeTolerance, fmi1_event_info_t* eventInfo);
+typedef fmi1_status_t		(*fmi1_get_derivatives_ft)				(fmi1_component_t c, fmi1_real_t derivatives[]    , size_t nx);
+typedef fmi1_status_t		(*fmi1_get_event_indicators_ft)			(fmi1_component_t c, fmi1_real_t eventIndicators[], size_t ni);
+typedef fmi1_status_t		(*fmi1_event_update_ft)				(fmi1_component_t c, fmi1_boolean_t intermediateResults, fmi1_event_info_t* eventInfo);
+typedef fmi1_status_t		(*fmi1_get_continuous_states_ft)		(fmi1_component_t c, fmi1_real_t states[], size_t nx);
+typedef fmi1_status_t		(*fmi1_get_nominal_continuousStates_ft)	(fmi1_component_t c, fmi1_real_t x_nominal[], size_t nx);
+typedef fmi1_status_t		(*fmi1_get_state_valueReferences_ft)	(fmi1_component_t c, fmi1_value_reference_t vrx[], size_t nx);
+typedef fmi1_status_t		(*fmi1_terminate_ft)					(fmi1_component_t c);  
+
+
+/* FMI CS 1.0 functions */
+typedef const char*		(*fmi1_get_types_platform_ft)			(void );
+typedef fmi1_component_t	(*fmi1_instantiate_slave_ft)			(fmi1_string_t  instanceName, fmi1_string_t  fmuGUID, fmi1_string_t  fmuLocation, 
+															 fmi1_string_t  mimeType, fmi1_real_t timeout, fmi1_boolean_t visible, fmi1_boolean_t interactive, 
+															 fmi1_callback_functions_t functions, fmi1_boolean_t loggingOn);
+typedef fmi1_status_t		(*fmi1_initialize_slave_ft)			(fmi1_component_t c, fmi1_real_t tStart, fmi1_boolean_t StopTimeDefined, fmi1_real_t tStop);
+typedef fmi1_status_t		(*fmi1_terminate_slave_ft)				(fmi1_component_t c);
+typedef fmi1_status_t		(*fmi1_reset_slave_ft)					(fmi1_component_t c);
+typedef void			    (*fmi1_free_slave_instance_ft)			(fmi1_component_t c);
+typedef fmi1_status_t		(*fmi1_set_real_inputDerivatives_ft)	(fmi1_component_t c, const  fmi1_value_reference_t vr[], size_t nvr, const fmi1_integer_t order[], const  fmi1_real_t value[]);                                                  
+typedef fmi1_status_t		(*fmi1_get_real_outputDerivatives_ft)	(fmi1_component_t c, const fmi1_value_reference_t vr[], size_t  nvr, const fmi1_integer_t order[], fmi1_real_t value[]);                                              
+typedef fmi1_status_t		(*fmi1_cancel_step_ft)					(fmi1_component_t c);
+typedef fmi1_status_t		(*fmi1_do_step_ft)						(fmi1_component_t c, fmi1_real_t currentCommunicationPoint, fmi1_real_t communicationStepSize, fmi1_boolean_t newStep);
+
+typedef fmi1_status_t		(*fmi1_get_status_ft)					(fmi1_component_t c, const fmi1_status_kind_t s, fmi1_status_t*  value);
+typedef fmi1_status_t		(*fmi1_get_real_status_ft)				(fmi1_component_t c, const fmi1_status_kind_t s, fmi1_real_t*    value);
+typedef fmi1_status_t		(*fmi1_get_integer_status_ft)			(fmi1_component_t c, const fmi1_status_kind_t s, fmi1_integer_t* value);
+typedef fmi1_status_t		(*fmi1_get_boolean_status_ft)			(fmi1_component_t c, const fmi1_status_kind_t s, fmi1_boolean_t* value);
+typedef fmi1_status_t		(*fmi1_get_string_status_ft)			(fmi1_component_t c, const fmi1_status_kind_t s, fmi1_string_t*  value); 
+
+/** @}
+*/
+
+#endif /* End of header file FMI_FUNCTIONS_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import.h
new file mode 100644
index 00000000000..f5cf82ac8b5
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import.h
@@ -0,0 +1,259 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+/** \file fmi1_import.h
+*  \brief Public interface to the FMI import C-library.
+*/
+
+#ifndef FMI1_IMPORT_H_
+#define FMI1_IMPORT_H_
+
+#include <stddef.h>
+#include <fmilib_config.h>
+#include <JM/jm_callbacks.h>
+#include <FMI/fmi_import_util.h>
+#include <FMI/fmi_import_context.h>
+/* #include <FMI1/fmi1_xml_model_description.h> */
+
+#include <FMI1/fmi1_types.h>
+#include <FMI1/fmi1_functions.h>
+#include <FMI1/fmi1_enums.h>
+
+#include "fmi1_import_type.h"
+#include "fmi1_import_unit.h"
+#include "fmi1_import_variable.h"
+#include "fmi1_import_vendor_annotations.h"
+#include "fmi1_import_capabilities.h"
+#include "fmi1_import_variable_list.h"
+
+#include "fmi1_import_capi.h"
+#include "fmi1_import_convenience.h"
+#include "fmi1_import_cosim.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \addtogroup  fmi1_import FMI 1.0 import interface
+ *  All the structures used in the interfaces are intended to
+ *  be treated as opaque objects by the client code.
+ @{ 
+ */
+
+/**	\addtogroup fmi1_import_init Constuction, destruction and error handling
+ * 	\addtogroup fmi1_import_gen General information retrieval
+ *	\addtogroup fmi1_import_capi Interface to the standard FMI 1.0 "C" API
+ *  \brief Convenient functions for calling the FMI functions. This interface wrappes the "C" API. 
+ */
+ /** @} */
+ /** @} */
+
+/** \addtogroup fmi1_import_init Constuction, destruction and error handling
+@{
+*/
+/**
+   \brief Create ::fmi1_import_t structure and parse the XML file.
+
+    @param context A context data strucutre is used to propagate the callbacks for memory handling and logging.
+    @param dirPath A directory name (full path) of a directory where the FMU was unzipped.
+    @return The new structure if parsing was successfull. 0-pointer is returned on error.
+*/
+FMILIB_EXPORT fmi1_import_t* fmi1_import_parse_xml( fmi_import_context_t* context, const char* dirPath);
+
+/**
+* \brief Retrieve the last error message.
+*
+* Error handling:
+*
+*  Many functions in the library return pointers to struct. An error is indicated by returning NULL/0-pointer.
+*  If error is returned than fmi1_import_get_last_error() functions can be used to retrieve the error message.
+*  If logging callbacks were specified then the same information is reported via logger.
+*  Memory for the error string is allocated and deallocated in the module.
+*  Client code should not store the pointer to the string since it can become invalid.
+*    @param fmu An FMU object as returned by fmi1_import_parse_xml().
+*    @return NULL-terminated string with an error message.
+*/
+FMILIB_EXPORT const char* fmi1_import_get_last_error(fmi1_import_t* fmu);
+
+/**
+\brief Clear the error message.
+* @param fmu An FMU object as returned by fmi1_import_parse_xml().
+* @return 0 if further processing is possible. If it returns 1 then the 
+*	error was not recoverable. The \p fmu object should then be freed and recreated.
+*/
+FMILIB_EXPORT int fmi1_import_clear_last_error(fmi1_import_t* fmu);
+
+/**
+\brief Release the memory allocated
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT void fmi1_import_free(fmi1_import_t* fmu);
+/** @}
+\addtogroup fmi1_import_gen
+ * \brief Functions for retrieving general model information. Memory for the strings is allocated and deallocated in the module.
+ *   All the functions take an FMU object as returned by fmi1_import_parse_xml() as a parameter. 
+ *   The information is retrieved from the XML file.
+ * @{
+*/
+/** 
+\brief Get model name. 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_model_name(fmi1_import_t* fmu);
+
+/** 
+\brief Get model identifier. 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_model_identifier(fmi1_import_t* fmu);
+
+/** 
+\brief Get FMU GUID. 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_GUID(fmi1_import_t* fmu);
+
+/** 
+\brief Get FMU description.
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_description(fmi1_import_t* fmu);
+
+/** 
+\brief Get FMU author. 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_author(fmi1_import_t* fmu);
+
+/** \brief Get FMU version.
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_model_version(fmi1_import_t* fmu);
+
+/** \brief Get FMI standard version (always 1.0). 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_model_standard_version(fmi1_import_t* fmu);
+
+/** \brief Get FMU generation tool. 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_generation_tool(fmi1_import_t* fmu);
+
+/** \brief Get FMU generation date and time. 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi1_import_get_generation_date_and_time(fmi1_import_t* fmu);
+
+/** \brief Get variable naming convention used. 
+@param fmu An fmu object as returned by fmi1_import_parse_xml().
+*/
+FMILIB_EXPORT fmi1_variable_naming_convension_enu_t fmi1_import_get_naming_convention(fmi1_import_t* fmu);
+
+/** \brief Get the number of contnuous states. */
+FMILIB_EXPORT unsigned int fmi1_import_get_number_of_continuous_states(fmi1_import_t* fmu);
+
+/** \brief Get the number of event indicators. */
+FMILIB_EXPORT unsigned int fmi1_import_get_number_of_event_indicators(fmi1_import_t* fmu);
+
+/** \brief Check if the start time for default experiment is specified in the XML file. */
+FMILIB_EXPORT int fmi1_import_get_default_experiment_has_start(fmi1_import_t* fmu);
+
+/** \brief Check if the stop time for default experiment is specified in the XML file. */
+FMILIB_EXPORT int fmi1_import_get_default_experiment_has_stop(fmi1_import_t* fmu);
+
+/** \brief Check if the tolerance for default experiment is specified in the XML file. */
+FMILIB_EXPORT int fmi1_import_get_default_experiment_has_tolerance(fmi1_import_t* fmu);
+
+/** \brief Get the start time for default experiment as specified in the XML file.
+    If it is not specified, a default value of 0.0 is returned.
+    To determine if it is specified, use the following function: #fmi1_import_get_default_experiment_has_start
+*/
+FMILIB_EXPORT double fmi1_import_get_default_experiment_start(fmi1_import_t* fmu);
+
+/** \brief Get the stop time for default experiment as specified in the XML file.
+    If it is not specified, a default value of 1.0 is returned.
+    To determine if it is specified, use the following function: #fmi1_import_get_default_experiment_has_stop
+*/
+FMILIB_EXPORT double fmi1_import_get_default_experiment_stop(fmi1_import_t* fmu);
+
+/** \brief Get the tolerance for default experiment as specified in the XML file.
+    If it is not specified, a default value of 1e-4 is returned.
+    To determine if it is specified, use the following function: #fmi1_import_get_default_experiment_has_tolerance
+*/
+FMILIB_EXPORT double fmi1_import_get_default_experiment_tolerance(fmi1_import_t* fmu);
+
+/** \brief Get the type of the FMU (model exchange or co-simulation) */
+FMILIB_EXPORT fmi1_fmu_kind_enu_t fmi1_import_get_fmu_kind(fmi1_import_t* fmu);
+
+/** \brief Get the structure with capability flags.
+	@return A pointer to the fmi1_import_capabilities_t allocated within the library. 
+			Note that for model exchange FMUs the values of all the flags are always default.
+*/
+FMILIB_EXPORT fmi1_import_capabilities_t* fmi1_import_get_capabilities(fmi1_import_t* fmu);
+
+/** \brief Get the list of all the type definitions in the model*/
+FMILIB_EXPORT fmi1_import_type_definitions_t* fmi1_import_get_type_definitions(fmi1_import_t* );
+
+/** \brief Get a list of all the unit definitions in the model. */
+FMILIB_EXPORT fmi1_import_unit_definitions_t* fmi1_import_get_unit_definitions(fmi1_import_t* fmu);
+
+/** 
+	\brief Get the direct dependency information
+
+	@return A variable list is returned for variables with causality Output. Null pointer for others. */
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_get_direct_dependency(fmi1_import_t* fmu, fmi1_import_variable_t*);
+
+/** \brief Get the variable with the same value reference that is not an alias*/
+FMILIB_EXPORT fmi1_import_variable_t* fmi1_import_get_variable_alias_base(fmi1_import_t* fmu,fmi1_import_variable_t*);
+
+/**
+    Get the list of all the variables aliased to the given one (including the base one).
+
+    Note that the list is ordered: base variable, aliases, negated aliases.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_get_variable_aliases(fmi1_import_t* fmu,fmi1_import_variable_t*);
+
+/** \brief Get the list of all the variables in the model.
+* @param fmu An FMU object as returned by fmi1_import_parse_xml().
+* @return a variable list with all the variables in the model.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_get_variable_list(fmi1_import_t* fmu);
+
+/** \brief Get the list of all the variables in the model in alphabetical order.
+* @param fmu An FMU object as returned by fmi1_import_parse_xml().
+* @return a variable list with all the variables in the model sorted in alphabetical order.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_get_variable_list_alphabetical_order(fmi1_import_t* fmu);
+
+/** \brief Create a variable list with a single variable.
+  
+\param fmu An FMU object that this variable list will reference.
+\param v A variable.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_create_var_list(fmi1_import_t* fmu,fmi1_import_variable_t* v);
+
+/**@} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capabilities.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capabilities.h
new file mode 100644
index 00000000000..be1f11caecb
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capabilities.h
@@ -0,0 +1,70 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI1_IMPORT_CAPABILITIES_H
+#define FMI1_IMPORT_CAPABILITIES_H
+
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	/**
+		\file fmi1_import_capabilities.h
+		Functions to retrieve capability flags.
+	*/
+	/**
+	\addtogroup fmi1_import
+	@{
+	\addtogroup fmi1_import_capabilities Functions to retrieve capability flags.
+	The functions accept a pointer to ::fmi1_import_capabilities_t returned by fmi1_import_get_capabilities().
+	They return the flags as specified by the FMI 1.0 standard. Default values are returned for model-exachange FMUs.
+	@}
+	\addtogroup fmi1_import_capabilities
+	@{
+	*/
+/**\name FMU capabilities flags */
+/**@{ */
+/** \brief A container for all the capability flags */
+typedef struct fmi1_xml_capabilities_t fmi1_import_capabilities_t;
+/** @} */
+
+	/** \brief Retrieve  canHandleVariableCommunicationStepSize flag. */
+FMILIB_EXPORT int fmi1_import_get_canHandleVariableCommunicationStepSize(fmi1_import_capabilities_t* );
+	/** \brief Retrieve  canHandleEvents flag. */
+FMILIB_EXPORT int fmi1_import_get_canHandleEvents(fmi1_import_capabilities_t* );
+	/** \brief Retrieve  canRejectSteps flag. */
+FMILIB_EXPORT int fmi1_import_get_canRejectSteps(fmi1_import_capabilities_t* );
+	/** \brief Retrieve  canInterpolateInputs flag. */
+FMILIB_EXPORT int fmi1_import_get_canInterpolateInputs(fmi1_import_capabilities_t* );
+	/** \brief Retrieve  maxOutputDerivativeOrder. */
+FMILIB_EXPORT unsigned int fmi1_import_get_maxOutputDerivativeOrder(fmi1_import_capabilities_t* );
+	/** \brief Retrieve  canRunAsynchronuously flag. */
+FMILIB_EXPORT int fmi1_import_get_canRunAsynchronuously(fmi1_import_capabilities_t* );
+	/** \brief Deprecated since 1.0.1, do not use. */
+FMILIB_EXPORT int fmi1_import_get_canSignalEvents(fmi1_import_capabilities_t* );
+	/** \brief Retrieve  canBeInstantiatedOnlyOncePerProcess flag. */
+FMILIB_EXPORT int fmi1_import_get_canBeInstantiatedOnlyOncePerProcess(fmi1_import_capabilities_t* );
+	/** \brief Retrieve  canNotUseMemoryManagementFunctions flag. */
+FMILIB_EXPORT int fmi1_import_get_canNotUseMemoryManagementFunctions(fmi1_import_capabilities_t* );
+/** 
+@}
+*/
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* FMI1_IMPORT_CAPABILITIES_H */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capi.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capi.h
new file mode 100644
index 00000000000..d7fd068fab4
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_capi.h
@@ -0,0 +1,507 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI1_IMPORT_CAPI_H_
+#define FMI1_IMPORT_CAPI_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <JM/jm_callbacks.h>
+#include <FMI/fmi_import_util.h>
+#include <FMI/fmi_import_context.h>
+/* #include <FMI1/fmi1_xml_model_description.h>*/
+
+#include <FMI1/fmi1_types.h>
+#include <FMI1/fmi1_functions.h>
+#include <FMI1/fmi1_enums.h>
+/* #include <FMI1/fmi1_capi.h> */
+
+/**
+\file fmi1_import_capi.h
+Wrapper functions for the FMI 1.0 functions
+*/
+
+/**
+ * \addtogroup fmi1_import_capi
+ * @{
+ */
+
+/**	\addtogroup fmi1_import_capi_const_destroy FMI 1.0 Constructor and Destructor	
+ * \brief Functions for instantiating and freeing the container of the struct that is responsible for the FMI functions.
+ *
+ *	Before any of the FMI functions may be called, the construction function must instantiate a fmi_import_t module.
+ *	After the fmi_import_t module has been succesfully instantiated, all the FMI functions can be called. To unload
+ *	the FMI functions, the destroy functions shall be called.
+ *
+ * 	\addtogroup fmi1_import_capi_me FMI 1.0 (ME) Model Exchange functions
+ * \brief List of Model Exchange wrapper functions. Common functions are not listed.
+ *	\addtogroup fmi1_import_capi_cs FMI 1.0 (CS) Co-Simulation functions 
+ * \brief List of Co-Simulation wrapper functions. Common functions are not listed.
+ *	\addtogroup fmi1_import_capi_common FMI 1.0 (ME & CS) Common functions
+ * \brief List of wrapper functions that are in common for both Model Exchange and Co-Simulation.
+ */
+
+/**
+ * \addtogroup fmi1_import_capi_const_destroy
+ * @{
+ */
+
+/**
+ * \brief Create a C-API struct. The C-API struct is a placeholder for the FMI DLL functions.
+ *
+ * This function may only be called once if it returned succesfully. fmi1_import_destroy_dllfmu 
+ * must be called before this function can be called again. 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml().
+ * @param callBackFunctions Callback functions used by the FMI functions internally.
+ * @param registerGlobally Register the FMU globally to enable use of fmi1_log_forwarding(). If this parameter is non-zero the code becomes non-thread safe.
+ * @return Error status. If the function returns with an error, it is not allowed to call any of the other C-API functions.
+ */
+FMILIB_EXPORT jm_status_enu_t fmi1_import_create_dllfmu(fmi1_import_t* fmu, fmi1_callback_functions_t callBackFunctions, int registerGlobally);
+
+/** \brief Free a C-API struct. All memory allocated since the struct was created is freed.
+ * 
+ * @param fmu A model description object returned from fmi1_import_parse_xml().
+ */
+FMILIB_EXPORT void fmi1_import_destroy_dllfmu(fmi1_import_t* fmu);
+
+/**
+ * \brief Set CAPI debug mode flag. Setting to non-zero prevents DLL unloading in fmi1_import_destroy_dllfmu
+ *  while all the memory is deallocated. This is to support valgrind debugging. 
+ * 
+ * @param fmu C-API struct that has succesfully loaded the FMI function.
+ * @param mode The debug mode to set.
+ */
+FMILIB_EXPORT void fmi1_import_set_debug_mode(fmi1_import_t* fmu, int mode);
+
+/**@} */
+
+/**
+ * \addtogroup fmi1_import_capi_common
+ * @{
+ */
+
+/**
+ * \brief Wrapper for the FMI function fmiGetVersion() 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @return FMI version.
+ */
+FMILIB_EXPORT const char* fmi1_import_get_version(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetDebugLogging(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param loggingOn Enable or disable the debug logger.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_debug_logging(fmi1_import_t* fmu, fmi1_boolean_t loggingOn);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetReal(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_real(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_real_t    value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetInteger(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_integer(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_integer_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetBoolean(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_boolean(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_boolean_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetString(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_string(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_string_t  value[]);
+
+
+/**
+ * \brief Wrapper for the FMI function fmiGetReal(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_real(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, fmi1_real_t    value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetInteger(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_integer(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, fmi1_integer_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetBoolean(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_boolean(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, fmi1_boolean_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetString(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_string(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, fmi1_string_t  value[]);
+
+/**@} */
+
+/**
+ * \addtogroup fmi1_import_capi_me
+ * @{
+ */
+
+/**
+ * \brief Wrapper for the FMI function fmiGetModelTypesPlatform(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @return The platform the FMU was compiled for.
+ */
+FMILIB_EXPORT const char* fmi1_import_get_model_types_platform(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiInstantiateModel(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param instanceName The name of the instance.
+ * @return Error status. Returnes jm_status_error if fmiInstantiateModel returned NULL, otherwise jm_status_success.
+ */
+FMILIB_EXPORT jm_status_enu_t fmi1_import_instantiate_model(fmi1_import_t* fmu, fmi1_string_t instanceName);
+
+/**
+ * \brief Wrapper for the FMI function fmiFreeModelInstance(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ */
+FMILIB_EXPORT void fmi1_import_free_model_instance(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetTime(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param time Set the current time.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_time(fmi1_import_t* fmu, fmi1_real_t time);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetContinuousStates(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param x Array of state values.
+ * @param nx Number of states.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_continuous_states(fmi1_import_t* fmu, const fmi1_real_t x[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiCompletedIntegratorStep(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param callEventUpdate (Output) Call fmiEventUpdate indicator.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_completed_integrator_step(fmi1_import_t* fmu, fmi1_boolean_t* callEventUpdate);
+
+/**
+ * \brief Wrapper for the FMI function fmiInitialize(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param toleranceControlled Enable or disable the use of relativeTolerance in the FMU.
+ * @param relativeTolerance A relative tolerance used in the FMU.
+ * @param eventInfo (Output) fmiEventInfo struct.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_initialize(fmi1_import_t* fmu, fmi1_boolean_t toleranceControlled, fmi1_real_t relativeTolerance, fmi1_event_info_t* eventInfo);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetDerivatives(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param derivatives (Output) Array of the derivatives.
+ * @param nx Number of derivatives.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_derivatives(fmi1_import_t* fmu, fmi1_real_t derivatives[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetEventIndicators(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param eventIndicators (Output) The event indicators.
+ * @param ni Number of event indicators.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_event_indicators(fmi1_import_t* fmu, fmi1_real_t eventIndicators[], size_t ni);
+
+/**
+ * \brief Wrapper for the FMI function fmiEventUpdate(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param intermediateResults Indicate whether or not the fmiEventUpdate shall return after every internal event interation.
+ * @param eventInfo (Output) An fmiEventInfo struct.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_eventUpdate(fmi1_import_t* fmu, fmi1_boolean_t intermediateResults, fmi1_event_info_t* eventInfo);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetContinuousStates(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param states (Output) Array of state values.
+ * @param nx Number of states.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_continuous_states(fmi1_import_t* fmu, fmi1_real_t states[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetNominalContinuousStates(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param x_nominal (Output) The nominal values.
+ * @param nx Number of nominal values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_nominal_continuous_states(fmi1_import_t* fmu, fmi1_real_t x_nominal[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetStateValueReferences(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vrx (Output) The value-references of the states.
+ * @param nx Number of value-references.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_state_value_references(fmi1_import_t* fmu, fmi1_value_reference_t vrx[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiTerminate(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_terminate(fmi1_import_t* fmu);
+
+/**@} */
+
+/**
+ * \addtogroup fmi1_import_capi_cs
+ * @{
+ */
+
+/**
+ * \brief Wrapper for the FMI function fmiGetTypesPlatform(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @return The platform the FMU was compiled for.
+ */
+FMILIB_EXPORT const char* fmi1_import_get_types_platform(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiInstantiateSlave(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param instanceName The name of the instance.
+ * @param fmuLocation Access path to the FMU archive. If null FMU will get the path to the directory where it was unpacked.
+ * @param mimeType MIME type. If NULL the FMU will get "application/x-fmu-sharedlibrary".
+ * @param timeout Communication timeout value in milli-seconds.
+ * @param visible Indicates whether or not the simulator application window shoule be visible.
+ * @param interactive Indicates whether the simulator application must be manually started by the user.
+ * @return Error status. Returnes jm_status_error if fmiInstantiateSlave returned NULL, otherwise jm_status_success.
+ */
+FMILIB_EXPORT jm_status_enu_t fmi1_import_instantiate_slave(fmi1_import_t* fmu, fmi1_string_t instanceName, fmi1_string_t fmuLocation, fmi1_string_t mimeType,
+																 fmi1_real_t timeout, fmi1_boolean_t visible, fmi1_boolean_t interactive);
+
+/**
+ * \brief Wrapper for the FMI function fmiInitializeSlave(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param tStart Start time of the simulation
+ * @param StopTimeDefined Indicates whether or not the stop time is used.
+ * @param tStop The stop time of the simulation.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_initialize_slave(fmi1_import_t* fmu, fmi1_real_t tStart, fmi1_boolean_t StopTimeDefined, fmi1_real_t tStop);
+
+/**
+ * \brief Wrapper for the FMI function fmiTerminateSlave(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_terminate_slave(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiResetSlave(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_reset_slave(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiFreeSlaveInstance(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ */
+FMILIB_EXPORT void fmi1_import_free_slave_instance(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetRealInputDerivatives(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param order	Array of derivative orders.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_set_real_input_derivatives(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_integer_t order[], const  fmi1_real_t value[]);                                                  
+
+/**
+ * \brief Wrapper for the FMI function fmiGetOutputDerivatives(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param order	Array of derivative orders.
+ * @param value (Output) Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_real_output_derivatives(fmi1_import_t* fmu, const fmi1_value_reference_t vr[], size_t nvr, const fmi1_integer_t order[], fmi1_real_t value[]);                                              
+
+/**
+ * \brief Wrapper for the FMI function fmiCancelStep(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_cancel_step(fmi1_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiDoStep(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param currentCommunicationPoint Current communication point of the master.
+ * @param communicationStepSize Communication step size.
+ * @param newStep Indicates whether or not the last communication step was accepted by the master.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_do_step(fmi1_import_t* fmu, fmi1_real_t currentCommunicationPoint, fmi1_real_t communicationStepSize, fmi1_boolean_t newStep);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI status value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_status(fmi1_import_t* fmu, const fmi1_status_kind_t s, fmi1_status_t*  value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetRealStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI real value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_real_status(fmi1_import_t* fmu, const fmi1_status_kind_t s, fmi1_real_t*    value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetIntegerStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI integer value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_integer_status(fmi1_import_t* fmu, const fmi1_status_kind_t s, fmi1_integer_t* value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetBooleanStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI boolean value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_boolean_status(fmi1_import_t* fmu, const fmi1_status_kind_t s, fmi1_boolean_t* value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetStringStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi1_import_parse_xml() that has loaded the FMI functions, see fmi1_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI string value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi1_status_t fmi1_import_get_string_status(fmi1_import_t* fmu, const fmi1_status_kind_t s, fmi1_string_t*  value);
+
+/**@} */
+
+
+/**@} */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* End of header FMI1_IMPORT_CAPI_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_convenience.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_convenience.h
new file mode 100644
index 00000000000..fc51903d68f
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_convenience.h
@@ -0,0 +1,142 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi1_import_convenience.h
+*  \brief Public interface to the FMI import C-library. Convenience functions.
+*
+*  The functions in this file are provided for convenience. The functionality
+*  is already available via other lower level functions.
+*/
+
+#ifndef FMI1_IMPORT_CONVENIENCE_H_
+#define FMI1_IMPORT_CONVENIENCE_H_
+
+#include <FMI/fmi_import_context.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+		/**
+	\addtogroup fmi1_import
+	@{
+	\addtogroup fmi1_import_convenience Convenience functions.
+	@}
+	\addtogroup fmi1_import_convenience Convenience functions.
+	\brief The functions in this module are provided for convenience. The functionality
+	*  is already available via other lower level functions.
+
+	@{
+	*/
+	
+/** 
+\brief Collection of counters providing model information.
+	*/
+typedef struct {
+	/** \brief Number of constants */
+	unsigned int num_constants;
+	/** \brief  Number of parameters */
+	unsigned int num_parameters;
+
+	/** \brief  Number of discrete variables */
+	unsigned int num_discrete;
+	/** \brief  Number of continuous variables */
+	unsigned int num_continuous;
+
+	/** \brief  Number of inputs */
+	unsigned int num_inputs;
+	/** \brief  Number of outputs */
+	unsigned int num_outputs;
+	/** \brief  Number of internal variables */
+	unsigned int num_internal;
+	/** \brief  Number of variables with causality 'none'*/
+	unsigned int num_causality_none;
+
+	/** \brief  Number of real variables*/
+	unsigned int num_real_vars; 
+	/** \brief  Number of integer variables*/
+	unsigned int num_integer_vars; 
+	/** \brief  Number of enumeration variables*/
+	unsigned int num_enum_vars; 
+	/** \brief  Number of boolean variables*/
+	unsigned int num_bool_vars; 
+	/** \brief  Number of string variables*/
+	unsigned int num_string_vars; 
+} fmi1_import_model_counts_t;
+
+/**
+	\brief Collect model information by counting the number of variables with specific properties and fillinf in fmi1_import_model_counts_t struct.
+	\param fmu - An fmu object as returned by fmi1_import_parse_xml().
+	\param counts - a pointer to a preallocated struct.
+*/
+FMILIB_EXPORT 
+void fmi1_import_collect_model_counts(fmi1_import_t* fmu, fmi1_import_model_counts_t* counts);
+
+/**
+  \brief Print msgIn into msgOut by expanding variable references of the form #\<Type\>\<VR\># into variable names
+  and replacing '##' with a single #.
+   \param fmu - An fmu object as returned by fmi1_import_parse_xml().
+   \param msgIn - Log message as produced by an FMU.
+   \param msgOut - Output message buffer. 
+   \param maxMsgSize - maximum message size
+   */
+FMILIB_EXPORT 
+void fmi1_import_expand_variable_references(fmi1_import_t* fmu, const char* msgIn, char* msgOut, size_t maxMsgSize);
+
+
+/**
+	\brief An implementation of FMI 1.0 logger that forwards the messages to logger function inside ::jm_callbacks structure.
+	
+	The function is using a global array of active FMUs to find out which FMU is sending the log messege. It then
+	forwards the message to the logger connected to the particular ::fmi1_import_t struct. The function is called by the FMU.
+	The FMU must be loaded with non-zero registerGlobally parameter of fmi1_import_create_dllfmu() in order to work. 
+	If no matching ::fmi1_import_t struct is found on the global list then jm_get_default_callbacks() is used to get the default logger.
+	Note that this function is not thread safe due to the use of the global list.
+*/
+FMILIB_EXPORT 
+void  fmi1_log_forwarding(fmi1_component_t c, fmi1_string_t instanceName, fmi1_status_t status, fmi1_string_t category, fmi1_string_t message, ...);
+
+/**
+	\brief An implementation of FMI 1.0 logger that forwards the messages to logger function inside ::jm_callbacks structure.
+	
+	See fmi1_log_forwarding() for more information.
+*/
+FMILIB_EXPORT 
+void  fmi1_log_forwarding_v(fmi1_component_t c, fmi1_string_t instanceName, fmi1_status_t status, fmi1_string_t category, fmi1_string_t message, va_list args);
+
+
+/** \brief  Default FMI 1.0 logger may be used when instantiating FMUs */
+FMILIB_EXPORT
+void  fmi1_default_callback_logger(fmi1_component_t c, fmi1_string_t instanceName, fmi1_status_t status, fmi1_string_t category, fmi1_string_t message, ...);
+
+/** \brief  Given ::fmi1_callback_functions_t logger (fmi1_logger), the ::jm_callbacks logger may be setup to redirect the messages to the fmi1_logger.
+
+    The functions sets up the redirection. Note that the context field in ::jm_callbacks is set to point to the provided ::fmi1_callback_functions_t.
+	\param cb FMI Library callbacks
+	\param fmiCallbacks FMI 1.0 standard callbacks
+*/
+FMILIB_EXPORT
+void fmi1_import_init_logger(jm_callbacks* cb, fmi1_callback_functions_t* fmiCallbacks);
+/**	@}
+*/
+
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* FMI1_IMPORT_CONVENIENCE_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_cosim.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_cosim.h
new file mode 100644
index 00000000000..345bb82bb17
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_cosim.h
@@ -0,0 +1,62 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI1_IMPORT_COSIM_H
+#define FMI1_IMPORT_COSIM_H
+
+#include <FMI/fmi_import_context.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	/**
+		\file fmi1_import_cosim.h
+		Functions to retrieve co-simulation related information.
+	*/
+	/**
+	\addtogroup fmi1_import
+	@{
+	\addtogroup fmi1_import_cosim Functions to retrieve co-simulation related information.
+	@}
+	*/
+	/**
+	\addtogroup fmi1_import_cosim
+	@{
+	*/
+
+	/** \brief Get the entry point.*/
+FMILIB_EXPORT const char* fmi1_import_get_entry_point(fmi1_import_t* );
+	/** \brief Get mime type. */
+FMILIB_EXPORT const char* fmi1_import_get_mime_type(fmi1_import_t* );
+	/** \brief Get manual start flag. */
+FMILIB_EXPORT int fmi1_import_get_manual_start(fmi1_import_t* );
+
+	/** \brief Get the number of additional models specified. */
+FMILIB_EXPORT size_t fmi1_import_get_number_of_additional_models(fmi1_import_t* fmu);
+
+	/** \brief Get the name of an additional model.
+		@param fmu - the FMU processed
+		@param index - the index of an additional model (must be less than the number returned by fmi1_import_get_number_of_additional_models().
+	*/
+FMILIB_EXPORT const char* fmi1_import_get_additional_model_name(fmi1_import_t* fmu, size_t index);
+
+/**
+@}
+*/
+#ifdef __cplusplus
+}
+#endif
+#endif /* FMI1_IMPORT_COSIM_H */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_type.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_type.h
new file mode 100644
index 00000000000..fec928d194c
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_type.h
@@ -0,0 +1,161 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi1_import_type.h
+*  \brief Public interface to the FMI XML C-library: variable types handling.
+*/
+
+#ifndef FMI1_IMPORT_TYPE_H_
+#define FMI1_IMPORT_TYPE_H_
+
+#include "fmi1_import_unit.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+	\addtogroup fmi1_import
+	@{
+	\addtogroup fmi1_import_typedef Support for processing variable types
+	@}
+	\addtogroup fmi1_import_typedef Support for processing variable types
+  @{
+*/
+/**@name   Type definitions supporting structures*/
+/**@{ */
+/** \brief Opaque type definition object. */
+typedef struct fmi1_xml_real_typedef_t fmi1_import_real_typedef_t;
+/** \brief Opaque integer type definition object. */
+typedef struct fmi1_xml_integer_typedef_t fmi1_import_integer_typedef_t;
+/** \brief Opaque enumeration type definition object. */
+typedef struct fmi1_xml_enumeration_typedef_t fmi1_import_enumeration_typedef_t;
+/** \brief Opaque general variable type definition object. */
+typedef struct fmi1_xml_variable_typedef_t fmi1_import_variable_typedef_t;
+/** \brief Opaque list of the type definitions in the model */
+typedef struct fmi1_xml_type_definitions_t fmi1_import_type_definitions_t;
+/**@} */
+
+/** \brief Get the number of available type definitions */
+FMILIB_EXPORT size_t fmi1_import_get_type_definition_number(fmi1_import_type_definitions_t* td);
+
+/** \brief Get a type definition specified by the index 
+	@param td the type definition list object
+	@param index the index of type definition. Must be less than the numbere returned by fmi1_import_get_type_definition_number()
+	@return A type definition object or NULL if index is out of range.
+*/
+FMILIB_EXPORT fmi1_import_variable_typedef_t* fmi1_import_get_typedef(fmi1_import_type_definitions_t* td, unsigned int  index);
+
+/** \brief Get associated display unit for a type defition if any. */
+FMILIB_EXPORT fmi1_import_display_unit_t* fmi1_import_get_type_display_unit(fmi1_import_real_typedef_t*);
+
+/** \brief Get the type name*/
+FMILIB_EXPORT const char* fmi1_import_get_type_name(fmi1_import_variable_typedef_t*);
+
+/**\brief Get type description.
+
+   Note that an empty string is returned if the attribute is not present in the XML.*/
+FMILIB_EXPORT const char* fmi1_import_get_type_description(fmi1_import_variable_typedef_t*);
+
+/** \brief Get base type used for the type definition */
+FMILIB_EXPORT fmi1_base_type_enu_t fmi1_import_get_base_type(fmi1_import_variable_typedef_t*);
+
+/* Boolean and String has no extra attributes -> not needed*/
+
+/** \brief Cast the general type definition object to an object with a specific base type 
+	@return Pointer to the specific type object or NULL if base type does not match.
+*/
+FMILIB_EXPORT fmi1_import_real_typedef_t* fmi1_import_get_type_as_real(fmi1_import_variable_typedef_t*);
+/** \brief Cast the general type definition object to an object with a specific base type 
+	@return Pointer to the specific type object or NULL if base type does not match.
+*/
+FMILIB_EXPORT fmi1_import_integer_typedef_t* fmi1_import_get_type_as_int(fmi1_import_variable_typedef_t*);
+/** \brief Cast the general type definition object to an object with a specific base type 
+	@return Pointer to the specific type object or NULL if base type does not match.
+*/
+FMILIB_EXPORT fmi1_import_enumeration_typedef_t* fmi1_import_get_type_as_enum(fmi1_import_variable_typedef_t*);
+
+/** \brief Get the quantity associated with the type definition.
+	@return The quantity, or NULL-pointer if quantity is not defined (NULL-pointer is always returned for strings and booleans).
+*/
+FMILIB_EXPORT const char* fmi1_import_get_type_quantity(fmi1_import_variable_typedef_t*);
+
+/** \brief Get minimal value for the type.
+
+	@return Either the value specified in the XML file or negated DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT double fmi1_import_get_real_type_min(fmi1_import_real_typedef_t*);
+/** \brief Get maximum value for the type
+
+	@return Either the value specified in the XML file or DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT double fmi1_import_get_real_type_max(fmi1_import_real_typedef_t*);
+
+/** \brief Get the nominal value associated with the type definition */
+FMILIB_EXPORT double fmi1_import_get_real_type_nominal(fmi1_import_real_typedef_t*);
+
+/** \brief Get the unit object associated with the type definition if any*/
+FMILIB_EXPORT fmi1_import_unit_t* fmi1_import_get_real_type_unit(fmi1_import_real_typedef_t*);
+
+/** \brief Get the relativeQuantity flag */
+FMILIB_EXPORT int fmi1_import_get_real_type_is_relative_quantity(fmi1_import_real_typedef_t*);
+
+/** \brief Get minimal value for the type.
+	
+	@return Either the value specified in the XML file or INT_MIN as defined in <limits.h>
+*/
+FMILIB_EXPORT int fmi1_import_get_integer_type_min(fmi1_import_integer_typedef_t*);
+/** \brief Get maximum value for the type
+	
+	@return Either the value specified in the XML file or INT_MAX as defined in <limits.h>
+*/
+FMILIB_EXPORT int fmi1_import_get_integer_type_max(fmi1_import_integer_typedef_t*);
+
+/** \brief Get minimal value for the type.
+	
+	@return Either the value specified in the XML file or 0
+*/
+FMILIB_EXPORT unsigned int fmi1_import_get_enum_type_min(fmi1_import_enumeration_typedef_t*);
+
+/** \brief Get maximum value for the type.
+	
+	@return Either the value specified in the XML file or INT_MAX as defined in <limits.h>
+*/
+FMILIB_EXPORT unsigned int fmi1_import_get_enum_type_max(fmi1_import_enumeration_typedef_t*);
+
+/** \brief Get the number of elements in the enum */
+FMILIB_EXPORT unsigned int  fmi1_import_get_enum_type_size(fmi1_import_enumeration_typedef_t*);
+
+/** \brief Get an enumeration item name by index */
+FMILIB_EXPORT const char* fmi1_import_get_enum_type_item_name(fmi1_import_enumeration_typedef_t*, unsigned int  item);
+/** \brief Get an enumeration item description by index */
+FMILIB_EXPORT const char* fmi1_import_get_enum_type_item_description(fmi1_import_enumeration_typedef_t*, unsigned int  item);
+
+/**
+	\brief Get display unit associated with a real type definition.
+	@return Display unit object of NULL if none was given.
+*/
+FMILIB_EXPORT fmi1_import_display_unit_t* fmi1_import_get_type_display_unit(fmi1_import_real_typedef_t*);
+
+/**
+*  @}
+*/
+#ifdef __cplusplus
+}
+#endif
+#endif
+
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_unit.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_unit.h
new file mode 100644
index 00000000000..df494a1350b
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_unit.h
@@ -0,0 +1,103 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+/** \file fmi1_import_unit.h
+*  \brief Public interface to the FMI import C-library. Handling of variable units.
+*/
+
+#ifndef FMI1_IMPORT_UNIT_H_
+#define FMI1_IMPORT_UNIT_H_
+
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+		/**
+	\addtogroup fmi1_import
+	@{
+	\addtogroup fmi1_import_units Functions for handling unit definitions.
+	@}
+	\addtogroup fmi1_import_units Functions for handling unit definitions.
+	@{
+	*/
+
+/**\name Structures encapsulating unit information */
+/**@{ */
+/** \brief A variable unit defined with a unit defition */
+typedef struct fmi1_xml_unit_t fmi1_import_unit_t;
+/** \brief A display unit. */
+typedef struct fmi1_xml_display_unit_t fmi1_import_display_unit_t;
+/** \brief The list of all the unit definitions in the model */
+typedef struct fmi1_xml_unit_definitions_t fmi1_import_unit_definitions_t;
+/**@} */
+
+/** \brief Get the number of unit definitions. */
+FMILIB_EXPORT unsigned int  fmi1_import_get_unit_definitions_number(fmi1_import_unit_definitions_t*);
+
+/** \brief Get a unit definition */
+FMILIB_EXPORT fmi1_import_unit_t* fmi1_import_get_unit(fmi1_import_unit_definitions_t*, unsigned int  index);
+
+/** \brief Get a unit name */
+FMILIB_EXPORT const char* fmi1_import_get_unit_name(fmi1_import_unit_t*);
+
+/** \brief Get the number of display units associated with this unit */
+FMILIB_EXPORT unsigned int fmi1_import_get_unit_display_unit_number(fmi1_import_unit_t*);
+
+/** \brief Get a display unit object by index.
+	@param index The index of display unit to be returned. Must be less than the number returned by fmi1_import_get_unit_display_unit_number()
+*/
+FMILIB_EXPORT fmi1_import_display_unit_t* fmi1_import_get_unit_display_unit(fmi1_import_unit_t*, size_t index);
+
+/**
+	\brief Get unit defition for a display unit.
+*/
+FMILIB_EXPORT fmi1_import_unit_t* fmi1_import_get_base_unit(fmi1_import_display_unit_t*);
+/**
+	\brief Get display unit name
+*/
+FMILIB_EXPORT const char* fmi1_import_get_display_unit_name(fmi1_import_display_unit_t*);
+
+/**
+	\brief Get the "gain" associated with the display unit.
+*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_get_display_unit_gain(fmi1_import_display_unit_t*);
+/**
+	\brief Get the "offset" associated with the display unit.
+*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_get_display_unit_offset(fmi1_import_display_unit_t*);
+
+/**
+	\brief Convert a value measured in "units" to a value measured with "display units"
+	@param value The value to be converted.
+	@param du The display unit object
+	@param isRelativeQuantity specifies if "offset" should be incorporated into conversion
+*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_convert_to_display_unit(fmi1_real_t value , fmi1_import_display_unit_t* du, int isRelativeQuantity);
+
+
+/**
+	\brief Convert a value measured in "display units" to a value measured with "units"
+	@param value The value to be converted.
+	@param du The display unit object
+	@param isRelativeQuantity specifies if "offset" should be incorporated into conversion
+*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_convert_from_display_unit(fmi1_real_t value, fmi1_import_display_unit_t* du, int isRelativeQuantity);
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable.h
new file mode 100644
index 00000000000..6e34422b160
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable.h
@@ -0,0 +1,213 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi1_import_variable.h
+*  \brief Public interface to the FMI import C-library. Handling of model variables.
+*/
+
+#ifndef FMI1_IMPORT_VARIABLE_H_
+#define FMI1_IMPORT_VARIABLE_H_
+
+#include <FMI/fmi_import_context.h>
+
+#include "fmi1_import_type.h"
+#include "fmi1_import_unit.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+		/**
+	\addtogroup fmi1_import
+	@{
+	\addtogroup fmi1_import_variables Functions for handling variable definitions.
+	@}
+	\addtogroup fmi1_import_variables Functions for handling variable definitions.
+	\brief All the functions in this group take a pointer to ::fmi1_import_variable_t as a parameter.
+	A variable pointer may be obtained via a \ref fmi1_import_varlist module or via functions
+	fmi1_import_get_variable_by_name() and fmi1_import_get_variable_by_vr().
+	@{
+	*/
+	/**@name Scalar variable types */
+/**@{ */
+/** \brief General variable type. 
+*
+* This type is convenient to unify all the variable list operations. 
+* 	However, typed variables are needed to support specific attributes.
+*/
+typedef struct fmi1_xml_variable_t fmi1_import_variable_t;
+/** \brief  Opaque real variable */
+typedef struct fmi1_xml_real_variable_t fmi1_import_real_variable_t;
+/** \brief Opaque integer variable */
+typedef struct fmi1_xml_integer_variable_t fmi1_import_integer_variable_t;
+/** \brief Opaque string variable */
+typedef struct fmi1_xml_string_variable_t fmi1_import_string_variable_t;
+/** \brief Opaque enumeration variable */
+typedef struct fmi1_xml_enum_variable_t fmi1_import_enum_variable_t;
+/** \brief Opaque boolean variable */
+typedef struct fmi1_xml_bool_variable_t fmi1_import_bool_variable_t;
+/** \brief List of variables */
+typedef struct fmi1_import_variable_list_t fmi1_import_variable_list_t;
+/**@} */
+
+/**
+	\brief Get variable by variable name.
+	\param fmu - An fmu object as returned by fmi1_import_parse_xml().
+	\param name - variable name
+	\return variable pointer.
+*/
+FMILIB_EXPORT fmi1_import_variable_t* fmi1_import_get_variable_by_name(fmi1_import_t* fmu, const char* name);
+
+/**
+	\brief Get variable by value reference.
+	\param fmu - An fmu object as returned by fmi1_import_parse_xml().
+	\param baseType - basic data type
+	\param vr - value reference
+	\return variable pointer.
+*/
+FMILIB_EXPORT fmi1_import_variable_t* fmi1_import_get_variable_by_vr(fmi1_import_t* fmu, fmi1_base_type_enu_t baseType, fmi1_value_reference_t vr);
+
+
+/** \brief Get the variable name */
+FMILIB_EXPORT const char* fmi1_import_get_variable_name(fmi1_import_variable_t*);
+
+/** \brief Get variable description. 
+	@return Description string or empty string ("") if no description in the XML file was given.
+*/
+FMILIB_EXPORT const char* fmi1_import_get_variable_description(fmi1_import_variable_t*);
+
+/** \brief Get variable value reference */
+FMILIB_EXPORT fmi1_value_reference_t fmi1_import_get_variable_vr(fmi1_import_variable_t*);
+
+/**   \brief For scalar variable gives the type definition is present
+	@return Pointer of a type #fmi1_import_variable_typedef_t object or NULL of not present.
+*/
+FMILIB_EXPORT fmi1_import_variable_typedef_t* fmi1_import_get_variable_declared_type(fmi1_import_variable_t*);
+
+/** \brief Get variable base type */
+FMILIB_EXPORT fmi1_base_type_enu_t fmi1_import_get_variable_base_type(fmi1_import_variable_t*);
+
+/** \brief Check if the variable has "start" attribute */
+FMILIB_EXPORT int   fmi1_import_get_variable_has_start(fmi1_import_variable_t*);
+/** \brief Get the variable "fixed" attribute */
+FMILIB_EXPORT int   fmi1_import_get_variable_is_fixed(fmi1_import_variable_t*);
+
+/** \brief Get variability attribute */
+FMILIB_EXPORT fmi1_variability_enu_t fmi1_import_get_variability(fmi1_import_variable_t*);
+
+/** \brief Get causality attribute */
+FMILIB_EXPORT fmi1_causality_enu_t fmi1_import_get_causality(fmi1_import_variable_t*);
+
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi1_import_real_variable_t* fmi1_import_get_variable_as_real(fmi1_import_variable_t*);
+
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi1_import_integer_variable_t* fmi1_import_get_variable_as_integer(fmi1_import_variable_t*);
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi1_import_enum_variable_t* fmi1_import_get_variable_as_enum(fmi1_import_variable_t*);
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi1_import_string_variable_t* fmi1_import_get_variable_as_string(fmi1_import_variable_t*);
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi1_import_bool_variable_t* fmi1_import_get_variable_as_boolean(fmi1_import_variable_t*);
+
+/** 
+	\brief Get the variable "relativeQuantity" attribute. 
+	@return The "relativeQuantity" attribute as specified in the XML file. False if undefined.
+*/
+FMILIB_EXPORT fmi1_boolean_t fmi1_import_get_real_variable_relative_quantity(fmi1_import_real_variable_t* v);
+
+/** 
+	\brief Get the variable start attribute. 
+
+	@return The "start" attriburte as specified in the XML file or variable nominal value.
+*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_get_real_variable_start(fmi1_import_real_variable_t* v);
+
+/** \brief Get maximum value for the variable
+
+	@return Either the value specified in the XML file or DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_get_real_variable_max(fmi1_import_real_variable_t* v);
+
+/** \brief Get minimal value for the variable.
+
+	@return Either the value specified in the XML file or negated DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_get_real_variable_min(fmi1_import_real_variable_t* v);
+
+/** \brief Get nominal value for the variable*/
+FMILIB_EXPORT fmi1_real_t fmi1_import_get_real_variable_nominal(fmi1_import_real_variable_t* v);
+
+/** \brief Get "quantity" attribute if defined, else NULL-pointer. */
+FMILIB_EXPORT fmi1_string_t fmi1_import_get_real_variable_quantity(fmi1_import_real_variable_t* v);
+
+/** \brief Get associated "unit" object if any */
+FMILIB_EXPORT fmi1_import_unit_t* fmi1_import_get_real_variable_unit(fmi1_import_real_variable_t* v);
+
+/** \brief Get associated "display unit" object if any */
+FMILIB_EXPORT fmi1_import_display_unit_t* fmi1_import_get_real_variable_display_unit(fmi1_import_real_variable_t* v);
+
+/** \brief Get start value for the variable */
+FMILIB_EXPORT const char* fmi1_import_get_string_variable_start(fmi1_import_string_variable_t* v);
+
+/** \brief Get start value for the variable */
+FMILIB_EXPORT fmi1_boolean_t fmi1_import_get_boolean_variable_start(fmi1_import_bool_variable_t* v);
+
+/** \brief Get "quantity" attribute if defined, else NULL-pointer. */
+FMILIB_EXPORT fmi1_string_t fmi1_import_get_integer_variable_quantity(fmi1_import_integer_variable_t* v);
+/** \brief Get start value for the variable*/
+FMILIB_EXPORT int fmi1_import_get_integer_variable_start(fmi1_import_integer_variable_t* v);
+/** \brief Get minimal value for the variable */
+FMILIB_EXPORT int fmi1_import_get_integer_variable_min(fmi1_import_integer_variable_t* v);
+/** \brief Get max value for the variable */
+FMILIB_EXPORT int fmi1_import_get_integer_variable_max(fmi1_import_integer_variable_t* v);
+
+/** \brief Get "quantity" attribute if defined, else NULL-pointer. */
+FMILIB_EXPORT fmi1_string_t fmi1_import_get_enum_variable_quantity(fmi1_import_enum_variable_t* v);
+/** \brief Get start value for the variable*/
+FMILIB_EXPORT int fmi1_import_get_enum_variable_start(fmi1_import_enum_variable_t* v);
+/** \brief Get minimal value for the variable */
+FMILIB_EXPORT int fmi1_import_get_enum_variable_min(fmi1_import_enum_variable_t* v);
+/** \brief Get max value for the variable */
+FMILIB_EXPORT int fmi1_import_get_enum_variable_max(fmi1_import_enum_variable_t* v);
+
+/** \brief Get the variable alias kind*/
+FMILIB_EXPORT fmi1_variable_alias_kind_enu_t fmi1_import_get_variable_alias_kind(fmi1_import_variable_t*);
+
+/** \brief Get the original index in xml of the variable */
+size_t fmi1_import_get_variable_original_order(fmi1_import_variable_t* v);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable_list.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable_list.h
new file mode 100644
index 00000000000..3be36df24ed
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_variable_list.h
@@ -0,0 +1,130 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi1_import_variable_list.h
+*  \brief Public interface to the FMI XML C-library. Handling of variable lists.
+*/
+
+#ifndef FMI1_IMPORT_VARIABLELIST_H_
+#define FMI1_IMPORT_VARIABLELIST_H_
+
+ #include "fmi1_import_variable.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ \addtogroup  fmi1_import
+ @{
+	\defgroup  fmi1_import_varlist Handling of variable lists
+ @}
+*/
+
+/** \addtogroup  fmi1_import_varlist
+*  \brief Variable lists are provided to handle sets of variables.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+ @{ 
+*/
+
+/* Allocate an empty list */
+fmi1_import_variable_list_t* fmi1_import_alloc_variable_list(fmi1_import_t* fmu, size_t size);
+
+/**  \brief Free a variable list. Note that variable lists are allocated dynamically and must be freed when not needed any longer 
+	\param vl A variable list.
+*/
+FMILIB_EXPORT void fmi1_import_free_variable_list(fmi1_import_variable_list_t* vl);
+
+/** \brief Make a copy of the list.
+	\param vl A variable list.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_clone_variable_list(fmi1_import_variable_list_t* vl);
+
+/** \brief  Get number of variables in a list */
+FMILIB_EXPORT size_t  fmi1_import_get_variable_list_size(fmi1_import_variable_list_t* vl);
+
+/** \brief  Get a pointer to the list of the value references for all the variables */
+FMILIB_EXPORT const fmi1_value_reference_t* fmi1_import_get_value_referece_list(fmi1_import_variable_list_t* vl);
+
+/** \brief Get a single variable from the list*/
+FMILIB_EXPORT fmi1_import_variable_t* fmi1_import_get_variable(fmi1_import_variable_list_t* vl, unsigned int  index);
+
+/** \name Operations on variable lists. Every operation creates a new list. 
+@{
+*/
+/** \brief Select sub-lists.
+\param vl A variable list.
+\param fromIndex Zero based start index, inclusive.
+\param toIndex Zero based end index, inclusive.
+\return A sublist. NULL is returned if toIndex is less than fromIndex or is larger than the list size or if memory allocation failed.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_get_sublist(fmi1_import_variable_list_t* vl, unsigned int  fromIndex, unsigned int  toIndex);
+
+/** \brief Callback function typedef for the fmiFilterVariables. 
+
+The function should return 0 to prevent a variable from coming to the output list. */
+typedef int (*fmi1_import_variable_filter_function_ft)(fmi1_import_variable_t*vl, void * data);
+
+/** \brief Call the provided 'filter' function on every variable in the list and create a new list.
+  
+\param vl A variable list.
+\param filter A filter function according to ::fmi1_import_variable_filter_function_ft.
+\param context A parameter to be forwarded to the filter function.
+ @return A sub-list with the variables for which filter returned non-zero value. */
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_filter_variables(fmi1_import_variable_list_t* vl, fmi1_import_variable_filter_function_ft filter, void* context);
+
+/** \brief Create a new variable list by concatenating two lists.
+  
+\param a A variable list.
+\param b A variable list.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_join_var_list(fmi1_import_variable_list_t* a, fmi1_import_variable_list_t* b);
+
+
+/** \brief Append a variable to the variable list.
+  
+\param vl A variable list.
+\param v A variable.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_append_to_var_list(fmi1_import_variable_list_t* vl, fmi1_import_variable_t* v);
+
+/** \brief Prepend a variable to the variable list.
+  
+\param vl A variable list.
+\param v A variable.
+*/
+FMILIB_EXPORT fmi1_import_variable_list_t* fmi1_import_prepend_to_var_list(fmi1_import_variable_list_t* vl, fmi1_import_variable_t* v);
+
+/** \brief Add a variable to a variable list.
+  
+\param vl A variable list.
+\param v A variable.
+*/
+FMILIB_EXPORT jm_status_enu_t fmi1_import_var_list_push_back(fmi1_import_variable_list_t* vl, fmi1_import_variable_t* v);
+/**
+  @}
+ */
+
+/**
+  @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_vendor_annotations.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_vendor_annotations.h
new file mode 100644
index 00000000000..ee85cb5495e
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_import_vendor_annotations.h
@@ -0,0 +1,81 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+/** \file fmi1_import_vendor_annotations.h
+*  \brief Public interface to the FMI XML C-library. Handling of vendor annotations.
+*/
+
+#ifndef FMI1_IMPORT_VENDORANNOTATIONS_H_
+#define FMI1_IMPORT_VENDORANNOTATIONS_H_
+
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+* \addtogroup  fmi1_import
+* @{
+*	\addtogroup  fmi1_import_annotations Basic support for vendor annotations.
+*@}
+ * \addtogroup  fmi1_import_annotations Basic support for vendor annotations.
+ @{ 
+ */
+
+/** 
+\name Vendor annotation supporting structures
+*/
+/**@{ */
+	/** \brief  Opaque list of vendor annotations. */
+typedef struct fmi1_xml_vendor_list_t fmi1_import_vendor_list_t;
+	/** \brief Opaque vendor object. */
+typedef struct fmi1_xml_vendor_t fmi1_import_vendor_t;
+	/** \brief Opaque annotation object. */
+typedef struct fmi1_xml_annotation_t fmi1_import_annotation_t;
+/**@} */
+
+/** \brief Get the number of different vendors */
+FMILIB_EXPORT unsigned int  fmi1_import_get_number_of_vendors(fmi1_import_vendor_list_t*);
+
+/** \brief Get the annotations associated with vendor specified by the index */
+FMILIB_EXPORT fmi1_import_vendor_t* fmi1_import_get_vendor(fmi1_import_vendor_list_t*, unsigned int  index);
+
+/** \brief Get the vendor name */
+FMILIB_EXPORT const char* fmi1_import_get_vendor_name(fmi1_import_vendor_t*);
+
+/** \brief Get the number of annotations provided for the vendor */
+FMILIB_EXPORT unsigned int  fmi1_import_get_number_of_vendor_annotations(fmi1_import_vendor_t*);
+
+/** \brief Get an annotation object for the vendor by index
+
+	Note: Annotations may later be used in other places but have common interface name-value 
+*/
+FMILIB_EXPORT fmi1_import_annotation_t* fmi1_import_get_vendor_annotation(fmi1_import_vendor_t*, unsigned int  index);
+
+/** \brief Get the name of the annotation */
+FMILIB_EXPORT const char* fmi1_import_get_annotation_name(fmi1_import_annotation_t*);
+
+/** \brief Get the value for the annotation */
+FMILIB_EXPORT const char* fmi1_import_get_annotation_value(fmi1_import_annotation_t*);
+
+/** \brief Get the list of all the vendor annotations present in the XML file */
+FMILIB_EXPORT fmi1_import_vendor_list_t* fmi1_import_get_vendor_list(fmi1_import_t* fmu);
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_types.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_types.h
new file mode 100644
index 00000000000..d557dae5494
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmi1_types.h
@@ -0,0 +1,80 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI1_TYPES_H_
+#define FMI1_TYPES_H_
+/** \file fmi1_types.h
+	Transformation of the standard FMI type names into fmi1_ prefixed.
+*/
+/**
+	\addtogroup jm_utils
+	@{
+		\addtogroup fmi1_utils
+	@}
+*/
+
+/**	\addtogroup fmi1_utils Functions and types supporting FMI 1.0 processing.
+	@{
+*/
+/** \name Renaming of typedefs 
+@{*/
+#define fmiComponent fmi1_component_t
+#define fmiValueReference fmi1_value_reference_t
+#define fmiReal fmi1_real_t
+#define fmiInteger fmi1_integer_t
+#define fmiBoolean fmi1_boolean_t
+#define fmiString fmi1_string_t
+/** @}*/
+/* Standard FMI 1.0 ME and CS types */
+#ifdef fmiPlatformTypes_h
+#undef fmiPlatformTypes_h
+#endif
+#include <FMI1/fmiPlatformTypes.h>
+#undef fmiPlatformTypes_h
+
+/** FMI platform name constant string.*/
+static const char * fmi1_get_platform(void) {
+	return fmiPlatform;
+}
+
+#undef fmiPlatform
+
+/** FMI boolean constants.*/
+typedef enum {
+	fmi1_true=fmiTrue,
+	fmi1_false=fmiFalse
+} fmi1_boolean_enu_t;
+
+#undef fmiTrue
+#undef fmiFalse
+
+/** Undefined value for fmiValueReference (largest unsigned int value) */
+typedef enum fmi1_value_reference_enu_t {
+	fmi1_undefined_value_reference = (int)fmiUndefinedValueReference
+} fmi1_value_reference_enu_t;
+
+/**	
+	@}
+*/
+
+#undef fmiComponent
+#undef fmiValueReference
+#undef fmiReal
+#undef fmiInteger
+#undef fmiBoolean
+#undef fmiString
+#undef fmiUndefinedValueReference
+
+#endif /* End of header file FMI1_TYPES_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmiFunctions.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmiFunctions.h
new file mode 100644
index 00000000000..8697d18a470
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmiFunctions.h
@@ -0,0 +1,231 @@
+#ifndef fmiFunctions_h
+#define fmiFunctions_h
+
+/* This header file must be utilized when compiling a FMU.
+   It defines all functions of Co-Simulation Interface.
+   In order to have unique function names even if several FMUs
+   are compiled together (e.g. for embedded systems), every "real" function name
+   is constructed by prepending the function name by
+   "MODEL_IDENTIFIER" + "_" where "MODEL_IDENTIFIER" is the short name
+   of the model used as the name of the zip-file where the model is stored.
+   Therefore, the typical usage is:
+
+      #define MODEL_IDENTIFIER MyModel
+      #include "fmiFunctions.h"
+
+   As a result, a function that is defined as "fmiGetDerivatives" in this header file,
+   is actually getting the name "MyModel_fmiGetDerivatives".
+
+   Revisions:
+   - November 4, 2010: Adapted to specification text:
+                       o fmiGetModelTypesPlatform renamed to fmiGetTypesPlatform
+                       o fmiInstantiateSlave: Argument GUID     replaced by fmuGUID
+                                              Argument mimetype replaced by mimeType
+                       o tabs replaced by spaces
+   - October 16, 2010: First public Version
+
+
+   Copyright � 2008-2010, MODELISAR consortium. All rights reserved.
+   This file is licensed by the copyright holders under the BSD License
+   (http://www.opensource.org/licenses/bsd-license.html):
+
+   ----------------------------------------------------------------------------
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   ----------------------------------------------------------------------------
+*/
+
+#include "fmiPlatformTypes.h"
+#include <stdlib.h>
+
+/* Export fmi functions on Windows */
+#ifdef _MSC_VER
+#define DllExport __declspec( dllexport )
+#else
+#define DllExport
+#endif
+
+/* Macros to construct the real function name
+   (prepend function name by MODEL_IDENTIFIER + "_") */
+
+#define fmiPaste(a,b)     a ## b
+#define fmiPasteB(a,b)    fmiPaste(a,b)
+#define fmiFullName(name) fmiPasteB(MODEL_IDENTIFIER, name)
+
+/***************************************************
+Common Functions
+****************************************************/
+#define fmiGetTypesPlatform fmiFullName(_fmiGetTypesPlatform)
+#define fmiGetVersion       fmiFullName(_fmiGetVersion)
+#define fmiSetDebugLogging  fmiFullName(_fmiSetDebugLogging)
+
+/*Data Exchange*/
+#define fmiSetReal               fmiFullName(_fmiSetReal)
+#define fmiSetInteger            fmiFullName(_fmiSetInteger)
+#define fmiSetBoolean            fmiFullName(_fmiSetBoolean)
+#define fmiSetString             fmiFullName(_fmiSetString)
+
+#define fmiGetReal               fmiFullName(_fmiGetReal)
+#define fmiGetInteger            fmiFullName(_fmiGetInteger)
+#define fmiGetBoolean            fmiFullName(_fmiGetBoolean)
+#define fmiGetString             fmiFullName(_fmiGetString)
+
+/***************************************************
+Functions for FMI for Co-Simulation
+****************************************************/
+#define fmiInstantiateSlave         fmiFullName(_fmiInstantiateSlave)
+#define fmiInitializeSlave          fmiFullName(_fmiInitializeSlave)
+#define fmiTerminateSlave           fmiFullName(_fmiTerminateSlave)
+#define fmiResetSlave               fmiFullName(_fmiResetSlave)
+#define fmiFreeSlaveInstance        fmiFullName(_fmiFreeSlaveInstance)
+#define fmiSetRealInputDerivatives  fmiFullName(_fmiSetRealInputDerivatives)
+#define fmiGetRealOutputDerivatives fmiFullName(_fmiGetRealOutputDerivatives)
+#define fmiDoStep                   fmiFullName(_fmiDoStep)
+#define fmiCancelStep               fmiFullName(_fmiCancelStep)
+#define fmiGetStatus                fmiFullName(_fmiGetStatus)
+#define fmiGetRealStatus            fmiFullName(_fmiGetRealStatus)
+#define fmiGetIntegerStatus         fmiFullName(_fmiGetIntegerStatus)
+#define fmiGetBooleanStatus         fmiFullName(_fmiGetBooleanStatus)
+#define fmiGetStringStatus          fmiFullName(_fmiGetStringStatus)
+
+/* Version number */
+#define fmiVersion "1.0"
+
+/* make sure all compiler use the same alignment policies for structures */
+#ifdef WIN32
+#pragma pack(push,8)
+#endif
+
+
+/* Type definitions */
+     typedef enum {fmiOK,
+                   fmiWarning,
+                   fmiDiscard,
+                   fmiError,
+                   fmiFatal,
+                   fmiPending} fmiStatus;
+
+     typedef void  (*fmiCallbackLogger) (fmiComponent c, fmiString instanceName, fmiStatus status,
+                                         fmiString category, fmiString message, ...);
+     typedef void* (*fmiCallbackAllocateMemory)(size_t nobj, size_t size);
+     typedef void  (*fmiCallbackFreeMemory)    (void* obj);
+     typedef void  (*fmiStepFinished)          (fmiComponent c, fmiStatus status);
+
+     typedef struct {
+     fmiCallbackLogger         logger;
+     fmiCallbackAllocateMemory allocateMemory;
+     fmiCallbackFreeMemory     freeMemory;
+     fmiStepFinished           stepFinished;
+     } fmiCallbackFunctions;
+
+   typedef struct {
+      fmiBoolean iterationConverged;
+      fmiBoolean stateValueReferencesChanged;
+      fmiBoolean stateValuesChanged;
+      fmiBoolean terminateSimulation;
+      fmiBoolean upcomingTimeEvent;
+      fmiReal    nextEventTime;
+   } fmiEventInfo;
+
+/* reset alignment policy to the one set before reading this file */
+#ifdef WIN32
+#pragma pack(pop)
+#endif
+
+/***************************************************
+Common Functions
+****************************************************/
+
+/* Inquire version numbers of header files */
+   DllExport const char* fmiGetTypesPlatform();
+   DllExport const char* fmiGetVersion();
+
+   DllExport fmiStatus fmiSetDebugLogging  (fmiComponent c, fmiBoolean loggingOn);
+
+/* Data Exchange Functions*/
+   DllExport fmiStatus fmiGetReal   (fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiReal    value[]);
+   DllExport fmiStatus fmiGetInteger(fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiInteger value[]);
+   DllExport fmiStatus fmiGetBoolean(fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiBoolean value[]);
+   DllExport fmiStatus fmiGetString (fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiString  value[]);
+
+   DllExport fmiStatus fmiSetReal    (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiReal    value[]);
+   DllExport fmiStatus fmiSetInteger (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiInteger value[]);
+   DllExport fmiStatus fmiSetBoolean (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiBoolean value[]);
+   DllExport fmiStatus fmiSetString  (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiString  value[]);
+
+/***************************************************
+Functions for FMI for Co-Simulation
+****************************************************/
+
+/* Creation and destruction of slave instances and setting debug status */
+   DllExport fmiComponent fmiInstantiateSlave(fmiString  instanceName,
+                                              fmiString  fmuGUID,
+                                              fmiString  fmuLocation,
+                                              fmiString  mimeType,
+                                              fmiReal    timeout,
+                                              fmiBoolean visible,
+                                              fmiBoolean interactive,
+                                              fmiCallbackFunctions functions,
+                                              fmiBoolean loggingOn);
+
+   DllExport fmiStatus fmiInitializeSlave(fmiComponent c,
+                                          fmiReal      tStart,
+                                          fmiBoolean   StopTimeDefined,
+                                          fmiReal      tStop);
+
+   DllExport fmiStatus fmiTerminateSlave   (fmiComponent c);
+   DllExport fmiStatus fmiResetSlave       (fmiComponent c);
+   DllExport void      fmiFreeSlaveInstance(fmiComponent c);
+
+   DllExport fmiStatus fmiSetRealInputDerivatives(fmiComponent c,
+                                                  const  fmiValueReference vr[],
+                                                  size_t nvr,
+                                                  const  fmiInteger order[],
+                                                  const  fmiReal value[]);
+
+   DllExport fmiStatus fmiGetRealOutputDerivatives(fmiComponent c,
+                                                   const   fmiValueReference vr[],
+                                                   size_t  nvr,
+                                                   const   fmiInteger order[],
+                                                   fmiReal value[]);
+
+   DllExport fmiStatus fmiCancelStep(fmiComponent c);
+   DllExport fmiStatus fmiDoStep    (fmiComponent c,
+                                     fmiReal      currentCommunicationPoint,
+                                     fmiReal      communicationStepSize,
+                                     fmiBoolean   newStep);
+
+
+   typedef enum {fmiDoStepStatus,
+                 fmiPendingStatus,
+                 fmiLastSuccessfulTime} fmiStatusKind;
+
+   DllExport fmiStatus fmiGetStatus       (fmiComponent c, const fmiStatusKind s, fmiStatus*  value);
+   DllExport fmiStatus fmiGetRealStatus   (fmiComponent c, const fmiStatusKind s, fmiReal*    value);
+   DllExport fmiStatus fmiGetIntegerStatus(fmiComponent c, const fmiStatusKind s, fmiInteger* value);
+   DllExport fmiStatus fmiGetBooleanStatus(fmiComponent c, const fmiStatusKind s, fmiBoolean* value);
+   DllExport fmiStatus fmiGetStringStatus (fmiComponent c, const fmiStatusKind s, fmiString*  value);
+
+
+#endif /* fmiFunctions_h */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmiModelFunctions.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmiModelFunctions.h
new file mode 100644
index 00000000000..73b53e02565
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmiModelFunctions.h
@@ -0,0 +1,210 @@
+#ifndef fmiModelFunctions_h
+#define fmiModelFunctions_h
+
+/* This header file must be utilized when compiling a model.
+   It defines all functions of the Model Execution Interface.
+   In order to have unique function names even if several models
+   are compiled together (e.g. for embedded systems), every "real" function name
+   is constructed by prepending the function name by
+   "MODEL_IDENTIFIER" + "_" where "MODEL_IDENTIFIER" is the short name
+   of the model used as the name of the zip-file where the model is stored.
+   Therefore, the typical usage is:
+
+      #define MODEL_IDENTIFIER MyModel
+      #include "fmiModelFunctions.h"
+
+   As a result, a function that is defined as "fmiGetDerivatives" in this header file,
+   is actually getting the name "MyModel_fmiGetDerivatives".
+
+   Revisions:
+   - Jan. 20, 2010: stateValueReferencesChanged added to struct fmiEventInfo (ticket #27)
+                    (by M. Otter, DLR)
+                    Added WIN32 pragma to define the struct layout (ticket #34)
+                    (by J. Mauss, QTronic)
+   - Jan.  4, 2010: Removed argument intermediateResults from fmiInitialize
+                    Renamed macro fmiGetModelFunctionsVersion to fmiGetVersion
+                    Renamed macro fmiModelFunctionsVersion to fmiVersion
+                    Replaced fmiModel by fmiComponent in decl of fmiInstantiateModel
+                    (by J. Mauss, QTronic)
+   - Dec. 17, 2009: Changed extension "me" to "fmi" (by Martin Otter, DLR).
+   - Dez. 14, 2009: Added eventInfo to meInitialize and added
+                    meGetNominalContinuousStates (by Martin Otter, DLR)
+   - Sept. 9, 2009: Added DllExport (according to Peter Nilsson's suggestion)
+                    (by A. Junghanns, QTronic)
+   - Sept. 9, 2009: Changes according to FMI-meeting on July 21:
+                    meInquireModelTypesVersion     -> meGetModelTypesPlatform
+                    meInquireModelFunctionsVersion -> meGetModelFunctionsVersion
+                    meSetStates                    -> meSetContinuousStates
+                    meGetStates                    -> meGetContinuousStates
+                    removal of meInitializeModelClass
+                    removal of meGetTime
+                    change of arguments of meInstantiateModel
+                    change of arguments of meCompletedIntegratorStep
+                    (by Martin Otter, DLR):
+   - July 19, 2009: Added "me" as prefix to file names (by Martin Otter, DLR).
+   - March 2, 2009: Changed function definitions according to the last design
+                    meeting with additional improvements (by Martin Otter, DLR).
+   - Dec. 3 , 2008: First version by Martin Otter (DLR) and Hans Olsson (Dynasim).
+
+
+   Copyright � 2008-2009, MODELISAR consortium. All rights reserved.
+   This file is licensed by the copyright holders under the BSD License
+   (http://www.opensource.org/licenses/bsd-license.html):
+
+   ----------------------------------------------------------------------------
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   ----------------------------------------------------------------------------
+
+   with the extension:
+
+   You may distribute or publicly perform any modification only under the
+   terms of this license.
+*/
+
+#include "fmiModelTypes.h"
+#include <stdlib.h>
+
+/* Export fmi functions on Windows */
+#ifdef _MSC_VER
+#define DllExport __declspec( dllexport )
+#else
+#define DllExport
+#endif
+
+/* Macros to construct the real function name
+   (prepend function name by MODEL_IDENTIFIER + "_") */
+
+#define fmiPaste(a,b)     a ## b
+#define fmiPasteB(a,b)    fmiPaste(a,b)
+#define fmiFullName(name) fmiPasteB(MODEL_IDENTIFIER, name)
+
+#define fmiGetModelTypesPlatform      fmiFullName(_fmiGetModelTypesPlatform)
+#define fmiGetVersion                 fmiFullName(_fmiGetVersion)
+#define fmiInstantiateModel           fmiFullName(_fmiInstantiateModel)
+#define fmiFreeModelInstance          fmiFullName(_fmiFreeModelInstance)
+#define fmiSetDebugLogging            fmiFullName(_fmiSetDebugLogging)
+#define fmiSetTime                    fmiFullName(_fmiSetTime)
+#define fmiSetContinuousStates        fmiFullName(_fmiSetContinuousStates)
+#define fmiCompletedIntegratorStep    fmiFullName(_fmiCompletedIntegratorStep)
+#define fmiSetReal                    fmiFullName(_fmiSetReal)
+#define fmiSetInteger                 fmiFullName(_fmiSetInteger)
+#define fmiSetBoolean                 fmiFullName(_fmiSetBoolean)
+#define fmiSetString                  fmiFullName(_fmiSetString)
+#define fmiInitialize                 fmiFullName(_fmiInitialize)
+#define fmiGetDerivatives             fmiFullName(_fmiGetDerivatives)
+#define fmiGetEventIndicators         fmiFullName(_fmiGetEventIndicators)
+#define fmiGetReal                    fmiFullName(_fmiGetReal)
+#define fmiGetInteger                 fmiFullName(_fmiGetInteger)
+#define fmiGetBoolean                 fmiFullName(_fmiGetBoolean)
+#define fmiGetString                  fmiFullName(_fmiGetString)
+#define fmiEventUpdate                fmiFullName(_fmiEventUpdate)
+#define fmiGetContinuousStates        fmiFullName(_fmiGetContinuousStates)
+#define fmiGetNominalContinuousStates fmiFullName(_fmiGetNominalContinuousStates)
+#define fmiGetStateValueReferences    fmiFullName(_fmiGetStateValueReferences)
+#define fmiTerminate                  fmiFullName(_fmiTerminate)
+
+
+/* Version number */
+#define fmiVersion "1.0"
+
+/* Inquire version numbers of header files */
+   DllExport const char* fmiGetModelTypesPlatform();
+   DllExport const char* fmiGetVersion();
+
+/* make sure all compiler use the same alignment policies for structures */
+#ifdef WIN32
+#pragma pack(push,8)
+#endif
+
+/* Type definitions */
+   typedef enum  {fmiOK,
+                  fmiWarning,
+                  fmiDiscard,
+                  fmiError,
+                  fmiFatal} fmiStatus;
+
+   typedef void  (*fmiCallbackLogger)        (fmiComponent c, fmiString instanceName, fmiStatus status,
+                                              fmiString category, fmiString message, ...);
+   typedef void* (*fmiCallbackAllocateMemory)(size_t nobj, size_t size);
+   typedef void  (*fmiCallbackFreeMemory)    (void* obj);
+
+   typedef struct {
+     fmiCallbackLogger         logger;
+     fmiCallbackAllocateMemory allocateMemory;
+     fmiCallbackFreeMemory     freeMemory;
+   } fmiCallbackFunctions;
+
+   typedef struct {
+      fmiBoolean iterationConverged;
+      fmiBoolean stateValueReferencesChanged;
+      fmiBoolean stateValuesChanged;
+      fmiBoolean terminateSimulation;
+      fmiBoolean upcomingTimeEvent;
+      fmiReal    nextEventTime;
+   } fmiEventInfo;
+
+/* reset alignment policy to the one set before reading this file */
+#ifdef WIN32
+#pragma pack(pop)
+#endif
+
+/* Creation and destruction of model instances and setting debug status */
+   DllExport fmiComponent fmiInstantiateModel (fmiString            instanceName,
+                                               fmiString            GUID,
+                                               fmiCallbackFunctions functions,
+                                               fmiBoolean           loggingOn);
+   DllExport void      fmiFreeModelInstance(fmiComponent c);
+   DllExport fmiStatus fmiSetDebugLogging  (fmiComponent c, fmiBoolean loggingOn);
+
+
+/* Providing independent variables and re-initialization of caching */
+   DllExport fmiStatus fmiSetTime                (fmiComponent c, fmiReal time);
+   DllExport fmiStatus fmiSetContinuousStates    (fmiComponent c, const fmiReal x[], size_t nx);
+   DllExport fmiStatus fmiCompletedIntegratorStep(fmiComponent c, fmiBoolean* callEventUpdate);
+   DllExport fmiStatus fmiSetReal                (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiReal    value[]);
+   DllExport fmiStatus fmiSetInteger             (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiInteger value[]);
+   DllExport fmiStatus fmiSetBoolean             (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiBoolean value[]);
+   DllExport fmiStatus fmiSetString              (fmiComponent c, const fmiValueReference vr[], size_t nvr, const fmiString  value[]);
+
+
+/* Evaluation of the model equations */
+   DllExport fmiStatus fmiInitialize(fmiComponent c, fmiBoolean toleranceControlled,
+                                     fmiReal relativeTolerance, fmiEventInfo* eventInfo);
+
+   DllExport fmiStatus fmiGetDerivatives    (fmiComponent c, fmiReal derivatives[]    , size_t nx);
+   DllExport fmiStatus fmiGetEventIndicators(fmiComponent c, fmiReal eventIndicators[], size_t ni);
+
+   DllExport fmiStatus fmiGetReal   (fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiReal    value[]);
+   DllExport fmiStatus fmiGetInteger(fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiInteger value[]);
+   DllExport fmiStatus fmiGetBoolean(fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiBoolean value[]);
+   DllExport fmiStatus fmiGetString (fmiComponent c, const fmiValueReference vr[], size_t nvr, fmiString  value[]);
+
+   DllExport fmiStatus fmiEventUpdate               (fmiComponent c, fmiBoolean intermediateResults, fmiEventInfo* eventInfo);
+   DllExport fmiStatus fmiGetContinuousStates       (fmiComponent c, fmiReal states[], size_t nx);
+   DllExport fmiStatus fmiGetNominalContinuousStates(fmiComponent c, fmiReal x_nominal[], size_t nx);
+   DllExport fmiStatus fmiGetStateValueReferences   (fmiComponent c, fmiValueReference vrx[], size_t nx);
+   DllExport fmiStatus fmiTerminate                 (fmiComponent c);
+
+#endif /* fmiModelFunctions_h */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmiModelTypes.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmiModelTypes.h
new file mode 100644
index 00000000000..17e9e300e50
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmiModelTypes.h
@@ -0,0 +1,91 @@
+#ifndef fmiModelTypes_h
+#define fmiModelTypes_h
+
+/* Standard header file to define the argument types of the
+   functions of the Model Execution Interface.
+   This header file must be utilized both by the model and
+   by the simulation engine.
+
+   Revisions:
+   - Jan.  4, 2010: Renamed meModelTypes_h to fmiModelTypes_h (by Mauss, QTronic)
+   - Dec. 21, 2009: Changed "me" to "fmi" and "meModel" to "fmiComponent"
+                    according to meeting on Dec. 18 (by Martin Otter, DLR)
+   - Dec.  6, 2009: Added meUndefinedValueReference (by Martin Otter, DLR)
+   - Sept. 9, 2009: Changes according to FMI-meeting on July 21:
+                    Changed "version" to "platform", "standard" to "standard32",
+                    Added a precise definition of "standard32" as comment
+                    (by Martin Otter, DLR)
+   - July 19, 2009: Added "me" as prefix to file names, added meTrue/meFalse,
+                    and changed meValueReferenced from int to unsigned int
+                    (by Martin Otter, DLR).
+   - March 2, 2009: Moved enums and function pointer definitions to
+                    ModelFunctions.h (by Martin Otter, DLR).
+   - Dec. 3, 2008 : First version by Martin Otter (DLR) and
+                    Hans Olsson (Dynasim).
+
+
+   Copyright © 2008-2010, MODELISAR consortium. All rights reserved.
+   This file is licensed by the copyright holders under the BSD License
+   (http://www.opensource.org/licenses/bsd-license.html)
+
+   ----------------------------------------------------------------------------
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   ----------------------------------------------------------------------------
+
+   with the extension:
+
+   You may distribute or publicly perform any modification only under the
+   terms of this license.
+*/
+
+/* Platform (combination of machine, compiler, operating system) */
+#define fmiModelTypesPlatform "standard32"
+
+/* Type definitions of variables passed as arguments
+   Version "standard32" means:
+
+   fmiComponent     : 32 bit pointer
+   fmiValueReference: 32 bit
+   fmiReal          : 64 bit
+   fmiInteger       : 32 bit
+   fmiBoolean       :  8 bit
+   fmiString        : 32 bit pointer
+
+*/
+   typedef void*        fmiComponent;
+   typedef unsigned int fmiValueReference;
+   typedef double       fmiReal   ;
+   typedef int          fmiInteger;
+   typedef char         fmiBoolean;
+   typedef const char*  fmiString ;
+
+/* Values for fmiBoolean  */
+#define fmiTrue  1
+#define fmiFalse 0
+
+/* Undefined value for fmiValueReference (largest unsigned int value) */
+#define fmiUndefinedValueReference (fmiValueReference)(-1)
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI1/fmiPlatformTypes.h b/Buildings/Resources/src/fmi-library/include/FMI1/fmiPlatformTypes.h
new file mode 100644
index 00000000000..7916f7922d1
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI1/fmiPlatformTypes.h
@@ -0,0 +1,73 @@
+#ifndef fmiPlatformTypes_h
+#define fmiPlatformTypes_h
+
+/* Standard header file to define the argument types of the
+   functions of the Model Execution Interface.
+   This header file must be utilized both by the model and
+   by the simulation engine.
+
+   Revisions:
+   - October 2010: First public Version
+
+
+   Copyright © 2008-2010, MODELISAR consortium. All rights reserved.
+   This file is licensed by the copyright holders under the BSD License
+   (http://www.opensource.org/licenses/bsd-license.html):
+
+
+   ----------------------------------------------------------------------------
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   ----------------------------------------------------------------------------
+*/
+
+/* Platform (combination of machine, compiler, operating system) */
+#define fmiPlatform "standard32"
+
+/* Type definitions of variables passed as arguments
+   Version "standard32" means:
+
+   fmiComponent     : 32 bit pointer
+   fmiValueReference: 32 bit
+   fmiReal          : 64 bit
+   fmiInteger       : 32 bit
+   fmiBoolean       :  8 bit
+   fmiString        : 32 bit pointer
+
+*/
+   typedef void*        fmiComponent;
+   typedef unsigned int fmiValueReference;
+   typedef double       fmiReal   ;
+   typedef int          fmiInteger;
+   typedef char         fmiBoolean;
+   typedef const char*  fmiString ;
+
+/* Values for fmiBoolean  */
+#define fmiTrue  1
+#define fmiFalse 0
+
+/* Undefined value for fmiValueReference (largest unsigned int value) */
+#define fmiUndefinedValueReference (fmiValueReference)(-1)
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2FunctionTypes.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2FunctionTypes.h
new file mode 100644
index 00000000000..348c76e9ae3
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2FunctionTypes.h
@@ -0,0 +1,243 @@
+#ifndef fmi2FunctionTypes_h
+#define fmi2FunctionTypes_h
+
+#include "fmi2TypesPlatform.h"
+
+/* This header file must be utilized when compiling an FMU or an FMI master.
+   It declares data and function types for FMI 2.0
+
+   Revisions:
+   - Apr.  9, 2014: all prefixes "fmi" renamed to "fmi2" (decision from April 8)
+   - Apr.  3, 2014: Added #include <stddef.h> for size_t definition
+   - Mar. 27, 2014: Added #include "fmiTypesPlatform.h" (#179)
+   - Mar. 26, 2014: Introduced function argument "void" for the functions (#171)
+                      fmiGetTypesPlatformTYPE and fmiGetVersionTYPE
+   - Oct. 11, 2013: Functions of ModelExchange and CoSimulation merged:
+                      fmiInstantiateModelTYPE , fmiInstantiateSlaveTYPE  -> fmiInstantiateTYPE
+                      fmiFreeModelInstanceTYPE, fmiFreeSlaveInstanceTYPE -> fmiFreeInstanceTYPE
+                      fmiEnterModelInitializationModeTYPE, fmiEnterSlaveInitializationModeTYPE -> fmiEnterInitializationModeTYPE
+                      fmiExitModelInitializationModeTYPE , fmiExitSlaveInitializationModeTYPE  -> fmiExitInitializationModeTYPE
+                      fmiTerminateModelTYPE , fmiTerminateSlaveTYPE  -> fmiTerminate
+                      fmiResetSlave -> fmiReset (now also for ModelExchange and not only for CoSimulation)
+                    Functions renamed
+                      fmiUpdateDiscreteStatesTYPE -> fmiNewDiscreteStatesTYPE
+                    Renamed elements of the enumeration fmiEventInfo
+                      upcomingTimeEvent             -> nextEventTimeDefined // due to generic naming scheme: varDefined + var
+                      newUpdateDiscreteStatesNeeded -> newDiscreteStatesNeeded;
+   - June 13, 2013: Changed type fmiEventInfo
+                    Functions removed:
+                       fmiInitializeModelTYPE
+                       fmiEventUpdateTYPE
+                       fmiCompletedEventIterationTYPE
+                       fmiInitializeSlaveTYPE
+                    Functions added:
+                       fmiEnterModelInitializationModeTYPE
+                       fmiExitModelInitializationModeTYPE
+                       fmiEnterEventModeTYPE
+                       fmiUpdateDiscreteStatesTYPE
+                       fmiEnterContinuousTimeModeTYPE
+                       fmiEnterSlaveInitializationModeTYPE;
+                       fmiExitSlaveInitializationModeTYPE;
+   - Feb. 17, 2013: Added third argument to fmiCompletedIntegratorStepTYPE
+                    Changed function name "fmiTerminateType" to "fmiTerminateModelType" (due to #113)
+                    Changed function name "fmiGetNominalContinuousStateTYPE" to
+                                          "fmiGetNominalsOfContinuousStatesTYPE"
+                    Removed fmiGetStateValueReferencesTYPE.
+   - Nov. 14, 2011: First public Version
+
+
+   Copyright © 2011 MODELISAR consortium,
+               2012-2013 Modelica Association Project "FMI"
+               All rights reserved.
+   This file is licensed by the copyright holders under the BSD 2-Clause License
+   (http://www.opensource.org/licenses/bsd-license.html):
+
+   ----------------------------------------------------------------------------
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   ----------------------------------------------------------------------------
+
+   with the extension:
+
+   You may distribute or publicly perform any modification only under the
+   terms of this license.
+   (Note, this means that if you distribute a modified file,
+    the modified file must also be provided under this license).
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* make sure all compiler use the same alignment policies for structures */
+#if defined _MSC_VER || defined __GNUC__
+#pragma pack(push,8)
+#endif
+
+/* Include stddef.h, in order that size_t etc. is defined */
+#include <stddef.h>
+
+
+/* Type definitions */
+typedef enum {
+    fmi2OK,
+    fmi2Warning,
+    fmi2Discard,
+    fmi2Error,
+    fmi2Fatal,
+    fmi2Pending
+} fmi2Status;
+
+typedef enum {
+    fmi2ModelExchange,
+    fmi2CoSimulation
+} fmi2Type;
+
+typedef enum {
+    fmi2DoStepStatus,
+    fmi2PendingStatus,
+    fmi2LastSuccessfulTime,
+    fmi2Terminated
+} fmi2StatusKind;
+
+typedef void      (*fmi2CallbackLogger)        (fmi2ComponentEnvironment, fmi2String, fmi2Status, fmi2String, fmi2String, ...);
+typedef void*     (*fmi2CallbackAllocateMemory)(size_t, size_t);
+typedef void      (*fmi2CallbackFreeMemory)    (void*);
+typedef void      (*fmi2StepFinished)          (fmi2ComponentEnvironment, fmi2Status);
+
+typedef struct {
+   const fmi2CallbackLogger         logger;
+   const fmi2CallbackAllocateMemory allocateMemory;
+   const fmi2CallbackFreeMemory     freeMemory;
+   const fmi2StepFinished           stepFinished;
+   const fmi2ComponentEnvironment   componentEnvironment;
+} fmi2CallbackFunctions;
+
+typedef struct {
+	 fmi2Boolean newDiscreteStatesNeeded;
+   fmi2Boolean terminateSimulation;
+   fmi2Boolean nominalsOfContinuousStatesChanged;
+   fmi2Boolean valuesOfContinuousStatesChanged;
+   fmi2Boolean nextEventTimeDefined;
+   fmi2Real    nextEventTime;
+} fmi2EventInfo;
+
+
+/* reset alignment policy to the one set before reading this file */
+#if defined _MSC_VER || defined __GNUC__
+#pragma pack(pop)
+#endif
+
+
+/* Define fmi2 function pointer types to simplify dynamic loading */
+
+/***************************************************
+Types for Common Functions
+****************************************************/
+
+/* Inquire version numbers of header files and setting logging status */
+   typedef const char* fmi2GetTypesPlatformTYPE(void);
+   typedef const char* fmi2GetVersionTYPE(void);
+   typedef fmi2Status  fmi2SetDebugLoggingTYPE(fmi2Component, fmi2Boolean, size_t, const fmi2String[]);
+
+/* Creation and destruction of FMU instances and setting debug status */
+   typedef fmi2Component fmi2InstantiateTYPE (fmi2String, fmi2Type, fmi2String, fmi2String, const fmi2CallbackFunctions*, fmi2Boolean, fmi2Boolean);
+   typedef void          fmi2FreeInstanceTYPE(fmi2Component);
+
+/* Enter and exit initialization mode, terminate and reset */
+   typedef fmi2Status fmi2SetupExperimentTYPE        (fmi2Component, fmi2Boolean, fmi2Real, fmi2Real, fmi2Boolean, fmi2Real);
+   typedef fmi2Status fmi2EnterInitializationModeTYPE(fmi2Component);
+   typedef fmi2Status fmi2ExitInitializationModeTYPE (fmi2Component);
+   typedef fmi2Status fmi2TerminateTYPE              (fmi2Component);
+   typedef fmi2Status fmi2ResetTYPE                  (fmi2Component);
+
+/* Getting and setting variable values */
+   typedef fmi2Status fmi2GetRealTYPE   (fmi2Component, const fmi2ValueReference[], size_t, fmi2Real   []);
+   typedef fmi2Status fmi2GetIntegerTYPE(fmi2Component, const fmi2ValueReference[], size_t, fmi2Integer[]);
+   typedef fmi2Status fmi2GetBooleanTYPE(fmi2Component, const fmi2ValueReference[], size_t, fmi2Boolean[]);
+   typedef fmi2Status fmi2GetStringTYPE (fmi2Component, const fmi2ValueReference[], size_t, fmi2String []);
+
+   typedef fmi2Status fmi2SetRealTYPE   (fmi2Component, const fmi2ValueReference[], size_t, const fmi2Real   []);
+   typedef fmi2Status fmi2SetIntegerTYPE(fmi2Component, const fmi2ValueReference[], size_t, const fmi2Integer[]);
+   typedef fmi2Status fmi2SetBooleanTYPE(fmi2Component, const fmi2ValueReference[], size_t, const fmi2Boolean[]);
+   typedef fmi2Status fmi2SetStringTYPE (fmi2Component, const fmi2ValueReference[], size_t, const fmi2String []);
+
+/* Getting and setting the internal FMU state */
+   typedef fmi2Status fmi2GetFMUstateTYPE           (fmi2Component, fmi2FMUstate*);
+   typedef fmi2Status fmi2SetFMUstateTYPE           (fmi2Component, fmi2FMUstate);
+   typedef fmi2Status fmi2FreeFMUstateTYPE          (fmi2Component, fmi2FMUstate*);
+   typedef fmi2Status fmi2SerializedFMUstateSizeTYPE(fmi2Component, fmi2FMUstate, size_t*);
+   typedef fmi2Status fmi2SerializeFMUstateTYPE     (fmi2Component, fmi2FMUstate, fmi2Byte[], size_t);
+   typedef fmi2Status fmi2DeSerializeFMUstateTYPE   (fmi2Component, const fmi2Byte[], size_t, fmi2FMUstate*);
+
+/* Getting partial derivatives */
+   typedef fmi2Status fmi2GetDirectionalDerivativeTYPE(fmi2Component, const fmi2ValueReference[], size_t,
+                                                                   const fmi2ValueReference[], size_t,
+                                                                   const fmi2Real[], fmi2Real[]);
+
+/***************************************************
+Types for Functions for FMI2 for Model Exchange
+****************************************************/
+
+/* Enter and exit the different modes */
+   typedef fmi2Status fmi2EnterEventModeTYPE         (fmi2Component);
+   typedef fmi2Status fmi2NewDiscreteStatesTYPE      (fmi2Component, fmi2EventInfo*);
+   typedef fmi2Status fmi2EnterContinuousTimeModeTYPE(fmi2Component);
+   typedef fmi2Status fmi2CompletedIntegratorStepTYPE(fmi2Component, fmi2Boolean, fmi2Boolean*, fmi2Boolean*);
+
+/* Providing independent variables and re-initialization of caching */
+   typedef fmi2Status fmi2SetTimeTYPE            (fmi2Component, fmi2Real);
+   typedef fmi2Status fmi2SetContinuousStatesTYPE(fmi2Component, const fmi2Real[], size_t);
+
+/* Evaluation of the model equations */
+   typedef fmi2Status fmi2GetDerivativesTYPE               (fmi2Component, fmi2Real[], size_t);
+   typedef fmi2Status fmi2GetEventIndicatorsTYPE           (fmi2Component, fmi2Real[], size_t);
+   typedef fmi2Status fmi2GetContinuousStatesTYPE          (fmi2Component, fmi2Real[], size_t);
+   typedef fmi2Status fmi2GetNominalsOfContinuousStatesTYPE(fmi2Component, fmi2Real[], size_t);
+
+
+/***************************************************
+Types for Functions for FMI2 for Co-Simulation
+****************************************************/
+
+/* Simulating the slave */
+   typedef fmi2Status fmi2SetRealInputDerivativesTYPE (fmi2Component, const fmi2ValueReference [], size_t, const fmi2Integer [], const fmi2Real []);
+   typedef fmi2Status fmi2GetRealOutputDerivativesTYPE(fmi2Component, const fmi2ValueReference [], size_t, const fmi2Integer [], fmi2Real []);
+
+   typedef fmi2Status fmi2DoStepTYPE     (fmi2Component, fmi2Real, fmi2Real, fmi2Boolean);
+   typedef fmi2Status fmi2CancelStepTYPE (fmi2Component);
+
+/* Inquire slave status */
+   typedef fmi2Status fmi2GetStatusTYPE       (fmi2Component, const fmi2StatusKind, fmi2Status* );
+   typedef fmi2Status fmi2GetRealStatusTYPE   (fmi2Component, const fmi2StatusKind, fmi2Real*   );
+   typedef fmi2Status fmi2GetIntegerStatusTYPE(fmi2Component, const fmi2StatusKind, fmi2Integer*);
+   typedef fmi2Status fmi2GetBooleanStatusTYPE(fmi2Component, const fmi2StatusKind, fmi2Boolean*);
+   typedef fmi2Status fmi2GetStringStatusTYPE (fmi2Component, const fmi2StatusKind, fmi2String* );
+
+
+#ifdef __cplusplus
+}  /* end of extern "C" { */
+#endif
+
+#endif /* fmi2FunctionTypes_h */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2Functions.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2Functions.h
new file mode 100644
index 00000000000..a23697ff67b
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2Functions.h
@@ -0,0 +1,333 @@
+#ifndef fmi2Functions_h
+#define fmi2Functions_h
+
+/* This header file must be utilized when compiling a FMU.
+   It defines all functions of the
+         FMI 2.0 Model Exchange and Co-Simulation Interface.
+
+   In order to have unique function names even if several FMUs
+   are compiled together (e.g. for embedded systems), every "real" function name
+   is constructed by prepending the function name by "FMI2_FUNCTION_PREFIX".
+   Therefore, the typical usage is:
+
+      #define FMI2_FUNCTION_PREFIX MyModel_
+      #include "fmi2Functions.h"
+
+   As a result, a function that is defined as "fmi2GetDerivatives" in this header file,
+   is actually getting the name "MyModel_fmi2GetDerivatives".
+
+   This only holds if the FMU is shipped in C source code, or is compiled in a
+   static link library. For FMUs compiled in a DLL/sharedObject, the "actual" function
+   names are used and "FMI2_FUNCTION_PREFIX" must not be defined.
+
+   Revisions:
+   - Apr.  9, 2014: all prefixes "fmi" renamed to "fmi2" (decision from April 8)
+   - Mar. 26, 2014: FMI_Export set to empty value if FMI_Export and FMI_FUNCTION_PREFIX
+                    are not defined (#173)
+   - Oct. 11, 2013: Functions of ModelExchange and CoSimulation merged:
+                      fmiInstantiateModel , fmiInstantiateSlave  -> fmiInstantiate
+                      fmiFreeModelInstance, fmiFreeSlaveInstance -> fmiFreeInstance
+                      fmiEnterModelInitializationMode, fmiEnterSlaveInitializationMode -> fmiEnterInitializationMode
+                      fmiExitModelInitializationMode , fmiExitSlaveInitializationMode  -> fmiExitInitializationMode
+                      fmiTerminateModel, fmiTerminateSlave  -> fmiTerminate
+                      fmiResetSlave -> fmiReset (now also for ModelExchange and not only for CoSimulation)
+                    Functions renamed:
+                      fmiUpdateDiscreteStates -> fmiNewDiscreteStates
+   - June 13, 2013: Functions removed:
+                       fmiInitializeModel
+                       fmiEventUpdate
+                       fmiCompletedEventIteration
+                       fmiInitializeSlave
+                    Functions added:
+                       fmiEnterModelInitializationMode
+                       fmiExitModelInitializationMode
+                       fmiEnterEventMode
+                       fmiUpdateDiscreteStates
+                       fmiEnterContinuousTimeMode
+                       fmiEnterSlaveInitializationMode;
+                       fmiExitSlaveInitializationMode;
+   - Feb. 17, 2013: Portability improvements:
+                       o DllExport changed to FMI_Export
+                       o FUNCTION_PREFIX changed to FMI_FUNCTION_PREFIX
+                       o Allow undefined FMI_FUNCTION_PREFIX (meaning no prefix is used)
+                    Changed function name "fmiTerminate" to "fmiTerminateModel" (due to #113)
+                    Changed function name "fmiGetNominalContinuousState" to
+                                          "fmiGetNominalsOfContinuousStates"
+                    Removed fmiGetStateValueReferences.
+   - Nov. 14, 2011: Adapted to FMI 2.0:
+                       o Split into two files (fmiFunctions.h, fmiTypes.h) in order
+                         that code that dynamically loads an FMU can directly
+                         utilize the header files).
+                       o Added C++ encapsulation of C-part, in order that the header
+                         file can be directly utilized in C++ code.
+                       o fmiCallbackFunctions is passed as pointer to fmiInstantiateXXX
+                       o stepFinished within fmiCallbackFunctions has as first
+                         argument "fmiComponentEnvironment" and not "fmiComponent".
+                       o New functions to get and set the complete FMU state
+                         and to compute partial derivatives.
+   - Nov.  4, 2010: Adapted to specification text:
+                       o fmiGetModelTypesPlatform renamed to fmiGetTypesPlatform
+                       o fmiInstantiateSlave: Argument GUID     replaced by fmuGUID
+                                              Argument mimetype replaced by mimeType
+                       o tabs replaced by spaces
+   - Oct. 16, 2010: Functions for FMI for Co-simulation added
+   - Jan. 20, 2010: stateValueReferencesChanged added to struct fmiEventInfo (ticket #27)
+                    (by M. Otter, DLR)
+                    Added WIN32 pragma to define the struct layout (ticket #34)
+                    (by J. Mauss, QTronic)
+   - Jan.  4, 2010: Removed argument intermediateResults from fmiInitialize
+                    Renamed macro fmiGetModelFunctionsVersion to fmiGetVersion
+                    Renamed macro fmiModelFunctionsVersion to fmiVersion
+                    Replaced fmiModel by fmiComponent in decl of fmiInstantiateModel
+                    (by J. Mauss, QTronic)
+   - Dec. 17, 2009: Changed extension "me" to "fmi" (by Martin Otter, DLR).
+   - Dez. 14, 2009: Added eventInfo to meInitialize and added
+                    meGetNominalContinuousStates (by Martin Otter, DLR)
+   - Sept. 9, 2009: Added DllExport (according to Peter Nilsson's suggestion)
+                    (by A. Junghanns, QTronic)
+   - Sept. 9, 2009: Changes according to FMI-meeting on July 21:
+                    meInquireModelTypesVersion     -> meGetModelTypesPlatform
+                    meInquireModelFunctionsVersion -> meGetModelFunctionsVersion
+                    meSetStates                    -> meSetContinuousStates
+                    meGetStates                    -> meGetContinuousStates
+                    removal of meInitializeModelClass
+                    removal of meGetTime
+                    change of arguments of meInstantiateModel
+                    change of arguments of meCompletedIntegratorStep
+                    (by Martin Otter, DLR):
+   - July 19, 2009: Added "me" as prefix to file names (by Martin Otter, DLR).
+   - March 2, 2009: Changed function definitions according to the last design
+                    meeting with additional improvements (by Martin Otter, DLR).
+   - Dec. 3 , 2008: First version by Martin Otter (DLR) and Hans Olsson (Dynasim).
+
+   Copyright © 2008-2011 MODELISAR consortium,
+               2012-2013 Modelica Association Project "FMI"
+               All rights reserved.
+   This file is licensed by the copyright holders under the BSD 2-Clause License
+   (http://www.opensource.org/licenses/bsd-license.html):
+
+   ----------------------------------------------------------------------------
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   ----------------------------------------------------------------------------
+
+   with the extension:
+
+   You may distribute or publicly perform any modification only under the
+   terms of this license.
+   (Note, this means that if you distribute a modified file,
+    the modified file must also be provided under this license).
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "fmi2TypesPlatform.h"
+#include "fmi2FunctionTypes.h"
+#include <stdlib.h>
+
+
+/*
+  Export FMI2 API functions on Windows and under GCC.
+  If custom linking is desired then the FMI2_Export must be
+  defined before including this file. For instance,
+  it may be set to __declspec(dllimport).
+*/
+#if !defined(FMI2_Export)
+  #if !defined(FMI2_FUNCTION_PREFIX)
+    #if defined _WIN32 || defined __CYGWIN__
+     /* Note: both gcc & MSVC on Windows support this syntax. */
+        #define FMI2_Export __declspec(dllexport)
+    #else
+      #if __GNUC__ >= 4
+        #define FMI2_Export __attribute__ ((visibility ("default")))
+      #else
+        #define FMI2_Export
+      #endif
+    #endif
+  #else
+    #define FMI2_Export
+  #endif
+#endif
+
+/* Macros to construct the real function name
+   (prepend function name by FMI2_FUNCTION_PREFIX) */
+#if defined(FMI2_FUNCTION_PREFIX)
+  #define fmi2Paste(a,b)     a ## b
+  #define fmi2PasteB(a,b)    fmi2Paste(a,b)
+  #define fmi2FullName(name) fmi2PasteB(FMI2_FUNCTION_PREFIX, name)
+#else
+  #define fmi2FullName(name) name
+#endif
+
+/***************************************************
+Common Functions
+****************************************************/
+#define fmi2GetTypesPlatform         fmi2FullName(fmi2GetTypesPlatform)
+#define fmi2GetVersion               fmi2FullName(fmi2GetVersion)
+#define fmi2SetDebugLogging          fmi2FullName(fmi2SetDebugLogging)
+#define fmi2Instantiate              fmi2FullName(fmi2Instantiate)
+#define fmi2FreeInstance             fmi2FullName(fmi2FreeInstance)
+#define fmi2SetupExperiment          fmi2FullName(fmi2SetupExperiment)
+#define fmi2EnterInitializationMode  fmi2FullName(fmi2EnterInitializationMode)
+#define fmi2ExitInitializationMode   fmi2FullName(fmi2ExitInitializationMode)
+#define fmi2Terminate                fmi2FullName(fmi2Terminate)
+#define fmi2Reset                    fmi2FullName(fmi2Reset)
+#define fmi2GetReal                  fmi2FullName(fmi2GetReal)
+#define fmi2GetInteger               fmi2FullName(fmi2GetInteger)
+#define fmi2GetBoolean               fmi2FullName(fmi2GetBoolean)
+#define fmi2GetString                fmi2FullName(fmi2GetString)
+#define fmi2SetReal                  fmi2FullName(fmi2SetReal)
+#define fmi2SetInteger               fmi2FullName(fmi2SetInteger)
+#define fmi2SetBoolean               fmi2FullName(fmi2SetBoolean)
+#define fmi2SetString                fmi2FullName(fmi2SetString)
+#define fmi2GetFMUstate              fmi2FullName(fmi2GetFMUstate)
+#define fmi2SetFMUstate              fmi2FullName(fmi2SetFMUstate)
+#define fmi2FreeFMUstate             fmi2FullName(fmi2FreeFMUstate)
+#define fmi2SerializedFMUstateSize   fmi2FullName(fmi2SerializedFMUstateSize)
+#define fmi2SerializeFMUstate        fmi2FullName(fmi2SerializeFMUstate)
+#define fmi2DeSerializeFMUstate      fmi2FullName(fmi2DeSerializeFMUstate)
+#define fmi2GetDirectionalDerivative fmi2FullName(fmi2GetDirectionalDerivative)
+
+
+/***************************************************
+Functions for FMI2 for Model Exchange
+****************************************************/
+#define fmi2EnterEventMode                fmi2FullName(fmi2EnterEventMode)
+#define fmi2NewDiscreteStates             fmi2FullName(fmi2NewDiscreteStates)
+#define fmi2EnterContinuousTimeMode       fmi2FullName(fmi2EnterContinuousTimeMode)
+#define fmi2CompletedIntegratorStep       fmi2FullName(fmi2CompletedIntegratorStep)
+#define fmi2SetTime                       fmi2FullName(fmi2SetTime)
+#define fmi2SetContinuousStates           fmi2FullName(fmi2SetContinuousStates)
+#define fmi2GetDerivatives                fmi2FullName(fmi2GetDerivatives)
+#define fmi2GetEventIndicators            fmi2FullName(fmi2GetEventIndicators)
+#define fmi2GetContinuousStates           fmi2FullName(fmi2GetContinuousStates)
+#define fmi2GetNominalsOfContinuousStates fmi2FullName(fmi2GetNominalsOfContinuousStates)
+
+
+/***************************************************
+Functions for FMI2 for Co-Simulation
+****************************************************/
+#define fmi2SetRealInputDerivatives      fmi2FullName(fmi2SetRealInputDerivatives)
+#define fmi2GetRealOutputDerivatives     fmi2FullName(fmi2GetRealOutputDerivatives)
+#define fmi2DoStep                       fmi2FullName(fmi2DoStep)
+#define fmi2CancelStep                   fmi2FullName(fmi2CancelStep)
+#define fmi2GetStatus                    fmi2FullName(fmi2GetStatus)
+#define fmi2GetRealStatus                fmi2FullName(fmi2GetRealStatus)
+#define fmi2GetIntegerStatus             fmi2FullName(fmi2GetIntegerStatus)
+#define fmi2GetBooleanStatus             fmi2FullName(fmi2GetBooleanStatus)
+#define fmi2GetStringStatus              fmi2FullName(fmi2GetStringStatus)
+
+/* Version number */
+#define fmi2Version "2.0"
+
+
+/***************************************************
+Common Functions
+****************************************************/
+
+/* Inquire version numbers of header files */
+   FMI2_Export fmi2GetTypesPlatformTYPE fmi2GetTypesPlatform;
+   FMI2_Export fmi2GetVersionTYPE       fmi2GetVersion;
+   FMI2_Export fmi2SetDebugLoggingTYPE  fmi2SetDebugLogging;
+
+/* Creation and destruction of FMU instances */
+   FMI2_Export fmi2InstantiateTYPE  fmi2Instantiate;
+   FMI2_Export fmi2FreeInstanceTYPE fmi2FreeInstance;
+
+/* Enter and exit initialization mode, terminate and reset */
+   FMI2_Export fmi2SetupExperimentTYPE         fmi2SetupExperiment;
+   FMI2_Export fmi2EnterInitializationModeTYPE fmi2EnterInitializationMode;
+   FMI2_Export fmi2ExitInitializationModeTYPE  fmi2ExitInitializationMode;
+   FMI2_Export fmi2TerminateTYPE               fmi2Terminate;
+   FMI2_Export fmi2ResetTYPE                   fmi2Reset;
+
+/* Getting and setting variables values */
+   FMI2_Export fmi2GetRealTYPE    fmi2GetReal;
+   FMI2_Export fmi2GetIntegerTYPE fmi2GetInteger;
+   FMI2_Export fmi2GetBooleanTYPE fmi2GetBoolean;
+   FMI2_Export fmi2GetStringTYPE  fmi2GetString;
+
+   FMI2_Export fmi2SetRealTYPE    fmi2SetReal;
+   FMI2_Export fmi2SetIntegerTYPE fmi2SetInteger;
+   FMI2_Export fmi2SetBooleanTYPE fmi2SetBoolean;
+   FMI2_Export fmi2SetStringTYPE  fmi2SetString;
+
+/* Getting and setting the internal FMU state */
+   FMI2_Export fmi2GetFMUstateTYPE            fmi2GetFMUstate;
+   FMI2_Export fmi2SetFMUstateTYPE            fmi2SetFMUstate;
+   FMI2_Export fmi2FreeFMUstateTYPE           fmi2FreeFMUstate;
+   FMI2_Export fmi2SerializedFMUstateSizeTYPE fmi2SerializedFMUstateSize;
+   FMI2_Export fmi2SerializeFMUstateTYPE      fmi2SerializeFMUstate;
+   FMI2_Export fmi2DeSerializeFMUstateTYPE    fmi2DeSerializeFMUstate;
+
+/* Getting partial derivatives */
+   FMI2_Export fmi2GetDirectionalDerivativeTYPE fmi2GetDirectionalDerivative;
+
+
+/***************************************************
+Functions for FMI2 for Model Exchange
+****************************************************/
+
+/* Enter and exit the different modes */
+   FMI2_Export fmi2EnterEventModeTYPE               fmi2EnterEventMode;
+   FMI2_Export fmi2NewDiscreteStatesTYPE            fmi2NewDiscreteStates;
+   FMI2_Export fmi2EnterContinuousTimeModeTYPE      fmi2EnterContinuousTimeMode;
+   FMI2_Export fmi2CompletedIntegratorStepTYPE      fmi2CompletedIntegratorStep;
+
+/* Providing independent variables and re-initialization of caching */
+   FMI2_Export fmi2SetTimeTYPE             fmi2SetTime;
+   FMI2_Export fmi2SetContinuousStatesTYPE fmi2SetContinuousStates;
+
+/* Evaluation of the model equations */
+   FMI2_Export fmi2GetDerivativesTYPE                fmi2GetDerivatives;
+   FMI2_Export fmi2GetEventIndicatorsTYPE            fmi2GetEventIndicators;
+   FMI2_Export fmi2GetContinuousStatesTYPE           fmi2GetContinuousStates;
+   FMI2_Export fmi2GetNominalsOfContinuousStatesTYPE fmi2GetNominalsOfContinuousStates;
+
+
+/***************************************************
+Functions for FMI2 for Co-Simulation
+****************************************************/
+
+/* Simulating the slave */
+   FMI2_Export fmi2SetRealInputDerivativesTYPE  fmi2SetRealInputDerivatives;
+   FMI2_Export fmi2GetRealOutputDerivativesTYPE fmi2GetRealOutputDerivatives;
+
+   FMI2_Export fmi2DoStepTYPE     fmi2DoStep;
+   FMI2_Export fmi2CancelStepTYPE fmi2CancelStep;
+
+/* Inquire slave status */
+   FMI2_Export fmi2GetStatusTYPE        fmi2GetStatus;
+   FMI2_Export fmi2GetRealStatusTYPE    fmi2GetRealStatus;
+   FMI2_Export fmi2GetIntegerStatusTYPE fmi2GetIntegerStatus;
+   FMI2_Export fmi2GetBooleanStatusTYPE fmi2GetBooleanStatus;
+   FMI2_Export fmi2GetStringStatusTYPE  fmi2GetStringStatus;
+
+#ifdef __cplusplus
+}  /* end of extern "C" { */
+#endif
+
+#endif /* fmi2Functions_h */
\ No newline at end of file
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2TypesPlatform.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2TypesPlatform.h
new file mode 100644
index 00000000000..03c733938fc
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2TypesPlatform.h
@@ -0,0 +1,115 @@
+#ifndef fmi2TypesPlatform_h
+#define fmi2TypesPlatform_h
+
+/* Standard header file to define the argument types of the
+   functions of the Functional Mock-up Interface 2.0.
+   This header file must be utilized both by the model and
+   by the simulation engine.
+
+   Revisions:
+   - Apr.  9, 2014: all prefixes "fmi" renamed to "fmi2" (decision from April 8)
+   - Mar   31, 2014: New datatype fmiChar introduced.
+   - Feb.  17, 2013: Changed fmiTypesPlatform from "standard32" to "default".
+                     Removed fmiUndefinedValueReference since no longer needed
+                     (because every state is defined in ScalarVariables).
+   - March 20, 2012: Renamed from fmiPlatformTypes.h to fmiTypesPlatform.h
+   - Nov.  14, 2011: Use the header file "fmiPlatformTypes.h" for FMI 2.0
+                     both for "FMI for model exchange" and for "FMI for co-simulation"
+                     New types "fmiComponentEnvironment", "fmiState", and "fmiByte".
+                     The implementation of "fmiBoolean" is change from "char" to "int".
+                     The #define "fmiPlatform" changed to "fmiTypesPlatform"
+                     (in order that #define and function call are consistent)
+   - Oct.   4, 2010: Renamed header file from "fmiModelTypes.h" to fmiPlatformTypes.h"
+                     for the co-simulation interface
+   - Jan.   4, 2010: Renamed meModelTypes_h to fmiModelTypes_h (by Mauss, QTronic)
+   - Dec.  21, 2009: Changed "me" to "fmi" and "meModel" to "fmiComponent"
+                     according to meeting on Dec. 18 (by Martin Otter, DLR)
+   - Dec.   6, 2009: Added meUndefinedValueReference (by Martin Otter, DLR)
+   - Sept.  9, 2009: Changes according to FMI-meeting on July 21:
+                     Changed "version" to "platform", "standard" to "standard32",
+                     Added a precise definition of "standard32" as comment
+                     (by Martin Otter, DLR)
+   - July  19, 2009: Added "me" as prefix to file names, added meTrue/meFalse,
+                     and changed meValueReferenced from int to unsigned int
+                     (by Martin Otter, DLR).
+   - March  2, 2009: Moved enums and function pointer definitions to
+                     ModelFunctions.h (by Martin Otter, DLR).
+   - Dec.  3, 2008 : First version by Martin Otter (DLR) and
+                     Hans Olsson (Dynasim).
+
+
+   Copyright © 2008-2011 MODELISAR consortium,
+               2012-2013 Modelica Association Project "FMI"
+               All rights reserved.
+   This file is licensed by the copyright holders under the BSD 2-Clause License
+   (http://www.opensource.org/licenses/bsd-license.html):
+
+   ----------------------------------------------------------------------------
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   ----------------------------------------------------------------------------
+
+   with the extension:
+
+   You may distribute or publicly perform any modification only under the
+   terms of this license.
+   (Note, this means that if you distribute a modified file,
+    the modified file must also be provided under this license).
+*/
+
+/* Platform (unique identification of this header file) */
+#define fmi2TypesPlatform "default"
+
+/* Type definitions of variables passed as arguments
+   Version "default" means:
+
+   fmi2Component           : an opaque object pointer
+   fmi2ComponentEnvironment: an opaque object pointer
+   fmi2FMUstate            : an opaque object pointer
+   fmi2ValueReference      : handle to the value of a variable
+   fmi2Real                : double precision floating-point data type
+   fmi2Integer             : basic signed integer data type
+   fmi2Boolean             : basic signed integer data type
+   fmi2Char                : character data type
+   fmi2String              : a pointer to a vector of fmi2Char characters
+                             ('\0' terminated, UTF8 encoded)
+   fmi2Byte                : smallest addressable unit of the machine, typically one byte.
+*/
+   typedef void*           fmi2Component;               /* Pointer to FMU instance       */
+   typedef void*           fmi2ComponentEnvironment;    /* Pointer to FMU environment    */
+   typedef void*           fmi2FMUstate;                /* Pointer to internal FMU state */
+   typedef unsigned int    fmi2ValueReference;
+   typedef double          fmi2Real   ;
+   typedef int             fmi2Integer;
+   typedef int             fmi2Boolean;
+   typedef char            fmi2Char;
+   typedef const fmi2Char* fmi2String;
+   typedef char            fmi2Byte;
+
+/* Values for fmi2Boolean  */
+#define fmi2True  1
+#define fmi2False 0
+
+
+#endif /* fmi2TypesPlatform_h */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_enums.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_enums.h
new file mode 100644
index 00000000000..7669e2b968b
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_enums.h
@@ -0,0 +1,242 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI2_ENUMS_H_
+#define FMI2_ENUMS_H_
+
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \file fmi2_enums.h
+    \brief Definions the enum types used with FMI 2.0 libs
+*/
+
+/**    \addtogroup fmi2_utils
+    @{
+    \addtogroup fmi2_enums
+    @}
+*/
+/** \addtogroup fmi2_enums Enum types used with FMI 2.0 libs
+    @{
+*/
+/** \brief Naming convention for the variables in XML file*/
+typedef enum fmi2_variable_naming_convension_enu_t
+{
+        fmi2_naming_enu_flat,
+        fmi2_naming_enu_structured,
+        fmi2_naming_enu_unknown
+} fmi2_variable_naming_convension_enu_t;
+
+/** \brief Convert a #fmi2_variable_naming_convension_enu_t constant into string */
+FMILIB_EXPORT const char* fmi2_naming_convention_to_string(fmi2_variable_naming_convension_enu_t convention);
+
+/**  \brief FMU 2.0 kinds */
+typedef enum fmi2_fmu_kind_enu_t
+{
+        fmi2_fmu_kind_unknown = 0,
+        fmi2_fmu_kind_me = 1,
+        fmi2_fmu_kind_cs = 2,
+        fmi2_fmu_kind_me_and_cs = 3 /* defined to be equal to (fmi2_fmu_kind_me|fmi2_fmu_kind_cs) */
+} fmi2_fmu_kind_enu_t;
+
+/** \brief Convert a #fmi2_fmu_kind_enu_t constant into string  */
+FMILIB_EXPORT const char* fmi2_fmu_kind_to_string(fmi2_fmu_kind_enu_t kind);
+
+/**  \brief Variability property for variables */
+typedef enum fmi2_variability_enu_t {
+        fmi2_variability_enu_constant = 0,
+        fmi2_variability_enu_fixed  = 1,
+        fmi2_variability_enu_tunable  = 2,
+        fmi2_variability_enu_discrete  = 3,
+        fmi2_variability_enu_continuous  = 4,
+        fmi2_variability_enu_unknown  = 5
+} fmi2_variability_enu_t;
+
+/** \brief Convert a #fmi2_variability_enu_t constant into string  */
+FMILIB_EXPORT const char* fmi2_variability_to_string(fmi2_variability_enu_t v);
+
+/**  \brief Causality property for variables */
+typedef enum fmi2_causality_enu_t {
+        fmi2_causality_enu_parameter = 0,
+        fmi2_causality_enu_calculated_parameter = 1,
+        fmi2_causality_enu_input  = 2,
+        fmi2_causality_enu_output  = 3,
+        fmi2_causality_enu_local  = 4,
+        fmi2_causality_enu_independent = 5,
+        fmi2_causality_enu_unknown = 6
+} fmi2_causality_enu_t;
+
+/** \brief Convert a #fmi2_causality_enu_t constant into string  */
+FMILIB_EXPORT const char* fmi2_causality_to_string(fmi2_causality_enu_t c);
+
+/**
+ * \brief Get the default variability for a given causality. NOTE: the FMI 2.0
+ *        defines the default to always be continuous, but this is incompatible
+ *        with causalities "parameter" and "calculatedParameter". These will
+ *        instead be treated as having variability "fixed".
+ *
+ * \return A default variability compatible with the given causality.
+ *
+ */
+FMILIB_EXPORT fmi2_variability_enu_t fmi2_get_default_valid_variability(fmi2_causality_enu_t c);
+
+/**
+ * \brief Check if a given combination of variablity and causality is valid.
+ *
+ * \return 0 if not valid, non-zero otherwise
+ */
+FMILIB_EXPORT int fmi2_is_valid_variability_causality(fmi2_variability_enu_t v,
+                                                      fmi2_causality_enu_t c);
+
+/**  \brief Initial property for variables */
+typedef enum fmi2_initial_enu_t {
+        fmi2_initial_enu_exact,
+        fmi2_initial_enu_approx,
+        fmi2_initial_enu_calculated,
+        fmi2_initial_enu_unknown /* must be last*/
+} fmi2_initial_enu_t;
+
+/** \brief Convert a #fmi2_initial_enu_t constant into string  */
+FMILIB_EXPORT const char* fmi2_initial_to_string(fmi2_initial_enu_t c);
+
+/**
+    \brief Get default initial attribute value for the given variability and causality combination.
+    \return The default initial attribute or fmi2_initial_enu_unknown if combination of causality
+            and variability is not valid.
+*/
+FMILIB_EXPORT fmi2_initial_enu_t fmi2_get_default_initial(fmi2_variability_enu_t v, fmi2_causality_enu_t c);
+
+/**
+    \brief Check if the combination of variability, causality and initial is valid.
+    \return Same initial as submitted if the combination is valid. Otherwise, same as fmi2_get_default_initial.
+*/
+FMILIB_EXPORT fmi2_initial_enu_t fmi2_get_valid_initial(fmi2_variability_enu_t v, fmi2_causality_enu_t c, fmi2_initial_enu_t i);
+
+/** \brief Alias property for variables */
+typedef enum fmi2_variable_alias_kind_enu_t {
+    fmi2_variable_is_not_alias = 0,
+    fmi2_variable_is_alias = 1
+} fmi2_variable_alias_kind_enu_t;
+
+/** \brief Base types used in type definitions */
+typedef enum fmi2_base_type_enu_t
+{
+    fmi2_base_type_real,
+    fmi2_base_type_int,
+    fmi2_base_type_bool,
+    fmi2_base_type_str,
+    fmi2_base_type_enum
+} fmi2_base_type_enu_t;
+
+/**  \brief Convert base type constant to string
+    \param bt Base type identifier.
+    \return Corresponding base type name.
+    */
+FMILIB_EXPORT const char* fmi2_base_type_to_string(fmi2_base_type_enu_t bt);
+
+/** \brief List of capability flags for ModelExchange */
+#define FMI2_ME_CAPABILITIES(H) \
+    H(needsExecutionTool) \
+    H(completedIntegratorStepNotNeeded) \
+    H(canBeInstantiatedOnlyOncePerProcess) \
+    H(canNotUseMemoryManagementFunctions) \
+    H(canGetAndSetFMUstate) \
+    H(canSerializeFMUstate) \
+    H(providesDirectionalDerivatives)\
+    H(completedEventIterationIsProvided)
+
+/** \brief List of capability flags for CoSimulation */
+#define FMI2_CS_CAPABILITIES(H) \
+    H(needsExecutionTool) \
+    H(canHandleVariableCommunicationStepSize) \
+    H(canInterpolateInputs) \
+    H(maxOutputDerivativeOrder) \
+    H(canRunAsynchronuously) \
+    H(canBeInstantiatedOnlyOncePerProcess) \
+    H(canNotUseMemoryManagementFunctions) \
+    H(canGetAndSetFMUstate) \
+    H(canSerializeFMUstate) \
+    H(providesDirectionalDerivatives)
+
+/** \brief Capability flags for ModelExchange and CoSimulation */
+typedef enum fmi2_capabilities_enu_t {
+#define FMI2_EXPAND_ME_CAPABILITIES_ENU(c) fmi2_me_ ## c,
+#define FMI2_EXPAND_CS_CAPABILITIES_ENU(c) fmi2_cs_ ## c,
+    FMI2_ME_CAPABILITIES(FMI2_EXPAND_ME_CAPABILITIES_ENU)
+    FMI2_CS_CAPABILITIES(FMI2_EXPAND_CS_CAPABILITIES_ENU)
+    fmi2_capabilities_Num
+} fmi2_capabilities_enu_t;
+
+/** \brief Convert capability flag to a string
+    \param id Capability flag ID.
+    \return Name of the flag or Unknown if the id is out of range.
+*/
+FMILIB_EXPORT const char * fmi2_capability_to_string(fmi2_capabilities_enu_t id);
+
+/** \brief List of SI base units used in Unit defitions*/
+#define FMI2_SI_BASE_UNITS(H) \
+    H(kg) H(m) H(s) H(A) H(K) H(mol) H(cd) H(rad)
+
+/** \brief SI base units used in Unit defitions*/
+typedef enum fmi2_SI_base_units_enu_t {
+#define FMI2_EXPAND_SI_BASE_UNIT_ENU(c) fmi2_SI_base_unit_ ## c,
+    FMI2_SI_BASE_UNITS(FMI2_EXPAND_SI_BASE_UNIT_ENU)
+    fmi2_SI_base_units_Num
+} fmi2_SI_base_units_enu_t;
+
+/** \brief Convert SI base unit ID a string
+    \param id SI base unit ID.
+    \return Name of the base unit or "unknown" if the id is out of range.
+*/
+FMILIB_EXPORT const char * fmi2_SI_base_unit_to_string(fmi2_SI_base_units_enu_t id);
+
+/** \brief Convert a list of SI base unit exponents (corresponding to the IDs from  fmi2_SI_base_units_enu_t)
+    to a string of the form kg*m^2/s^2. Prints '-' if all the exponents are zero.
+    \param exp An array of SI base units exponents.
+    \param bufSize Size of the buffer to store the string.
+    \param buf Buffer to store the string
+    \return Required size of the buffer to store the string. This most likely be under [8*fmi2_SI_base_units_Num].
+    If the return value is larger or equal than bufSize than the string could not be fitted in the buffer.
+*/
+FMILIB_EXPORT size_t fmi2_SI_base_unit_exp_to_string(const int exp[fmi2_SI_base_units_Num], size_t bufSize, char buf[]);
+
+
+/** \brief Dependency factor kinds are used as part of ModelStructure definition */
+typedef enum fmi2_dependency_factor_kind_enu_t
+{
+    fmi2_dependency_factor_kind_dependent = 0,
+    fmi2_dependency_factor_kind_constant,
+    fmi2_dependency_factor_kind_fixed,
+    fmi2_dependency_factor_kind_tunable,
+    fmi2_dependency_factor_kind_discrete,
+    fmi2_dependency_factor_kind_num
+} fmi2_dependency_factor_kind_enu_t;
+
+/**  \brief Convert dependency factor kind constant to string
+    \param fc Dependency factor kind identifier.
+    \return Corresponding factor kind as string.
+    */
+FMILIB_EXPORT const char* fmi2_dependency_factor_kind_to_string(fmi2_dependency_factor_kind_enu_t fc);
+/**
+ @}
+*/
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* End of header file FMI2_ENUMS_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_functions.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_functions.h
new file mode 100644
index 00000000000..abb3c049227
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_functions.h
@@ -0,0 +1,197 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef _FMI2_FUNCTION_TYPES_H_
+#define _FMI2_FUNCTION_TYPES_H_
+
+#include <string.h>
+#include <fmilib_config.h>
+
+#include "fmi2_types.h"
+/**	\file fmi2_functions.h
+	Mapping for the standard FMI 2.0 functions into fmi2_ namespace.
+
+	\addtogroup fmi2_utils
+	@{
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* make sure all compiler use the same alignment policies for structures */
+#if defined _MSC_VER || defined __GNUC__
+#pragma pack(push,8)
+#endif
+
+
+/** FMI 2.0 status codes */
+typedef enum {
+	fmi2_status_ok,
+	fmi2_status_warning,
+	fmi2_status_discard,
+	fmi2_status_error,
+	fmi2_status_fatal,
+	fmi2_status_pending
+} fmi2_status_t;
+
+typedef enum {
+    fmi2_model_exchange,
+    fmi2_cosimulation
+} fmi2_type_t;
+
+
+/* Type definitions */
+
+/** Convert #fmi2_status_t variable to string  */
+FMILIB_EXPORT const char* fmi2_status_to_string(fmi2_status_t status);
+
+/** FMI 2.0 logger function type */
+typedef void  (*fmi2_callback_logger_ft)        (fmi2_component_environment_t env, fmi2_string_t instanceName, fmi2_status_t status, fmi2_string_t category, fmi2_string_t message, ...);
+/** FMI 2.0 allocate memory function type */
+typedef void* (*fmi2_callback_allocate_memory_ft)(size_t nobj, size_t size);
+/** FMI 2.0 free memory  function type */
+typedef void  (*fmi2_callback_free_memory_ft)    (void* obj);
+/** FMI 2.0 step finished callback function type */
+typedef void  (*fmi2_step_finished_ft)          (fmi2_component_environment_t env, fmi2_status_t status);
+
+/** The FMI 2.0 callbacks */
+typedef struct {
+	fmi2_callback_logger_ft         logger;
+	fmi2_callback_allocate_memory_ft allocateMemory;
+	fmi2_callback_free_memory_ft     freeMemory;
+	fmi2_step_finished_ft           stepFinished;
+	fmi2_component_environment_t    componentEnvironment;
+} fmi2_callback_functions_t;
+
+/** Event info structure as used in FMI 2.0 ME */
+/* TODO: reuse from fmiFunctions.h */
+typedef struct {
+    fmi2_boolean_t newDiscreteStatesNeeded;
+    fmi2_boolean_t terminateSimulation;
+    fmi2_boolean_t nominalsOfContinuousStatesChanged;
+    fmi2_boolean_t valuesOfContinuousStatesChanged;
+    fmi2_boolean_t nextEventTimeDefined;
+    fmi2_real_t    nextEventTime;
+} fmi2_event_info_t;
+
+/** Co-simulation status for FMI 2.0 CS */
+/* TODO: reuse from fmiFunctions.h */
+typedef enum {
+    fmi2_do_step_status,
+    fmi2_pending_status,
+    fmi2_last_successful_time,
+    fmi2_terminated
+} fmi2_status_kind_t;
+
+
+
+/* reset alignment policy to the one set before reading this file */
+#if defined _MSC_VER || defined __GNUC__
+#pragma pack(pop)
+#endif
+
+/* Define fmi function pointer types to simplify dynamic loading */
+
+/***************************************************
+Types for Common Functions
+****************************************************/
+
+/* Inquire version numbers of header files and setting logging status */
+   typedef const char* (*fmi2_get_types_platform_ft)();
+   typedef const char* (*fmi2_get_version_ft)();
+   typedef fmi2_status_t   (*fmi2_set_debug_logging_ft)(fmi2_component_t, fmi2_boolean_t,size_t nCategories, const fmi2_string_t categories[]);
+
+/* Creation and destruction of fmu instances and setting debug status */
+   typedef fmi2_component_t (*fmi2_instantiate_ft) (fmi2_string_t, fmi2_type_t, fmi2_string_t, fmi2_string_t, const fmi2_callback_functions_t*, fmi2_boolean_t, fmi2_boolean_t);
+   typedef void         (*fmi2_free_instance_ft)(fmi2_component_t);
+
+/* Enter and exit initialization mode, terminate and reset */
+   typedef fmi2_status_t (*fmi2_setup_experiment_ft)          (fmi2_component_t, fmi2_boolean_t, fmi2_real_t, fmi2_real_t, fmi2_boolean_t, fmi2_real_t);
+   typedef fmi2_status_t (*fmi2_enter_initialization_mode_ft) (fmi2_component_t);
+   typedef fmi2_status_t (*fmi2_exit_initialization_mode_ft)  (fmi2_component_t);
+   typedef fmi2_status_t (*fmi2_terminate_ft)              (fmi2_component_t);
+   typedef fmi2_status_t (*fmi2_reset_ft)     (fmi2_component_t);
+
+/* Getting and setting variable values */
+   typedef fmi2_status_t (*fmi2_get_real_ft)   (fmi2_component_t, const fmi2_value_reference_t[], size_t, fmi2_real_t   []);
+   typedef fmi2_status_t (*fmi2_get_integer_ft)(fmi2_component_t, const fmi2_value_reference_t[], size_t, fmi2_integer_t[]);
+   typedef fmi2_status_t (*fmi2_get_boolean_ft)(fmi2_component_t, const fmi2_value_reference_t[], size_t, fmi2_boolean_t[]);
+   typedef fmi2_status_t (*fmi2_get_string_ft) (fmi2_component_t, const fmi2_value_reference_t[], size_t, fmi2_string_t []);
+
+   typedef fmi2_status_t (*fmi2_set_real_ft)   (fmi2_component_t, const fmi2_value_reference_t[], size_t, const fmi2_real_t   []);
+   typedef fmi2_status_t (*fmi2_set_integer_ft)(fmi2_component_t, const fmi2_value_reference_t[], size_t, const fmi2_integer_t[]);
+   typedef fmi2_status_t (*fmi2_set_boolean_ft)(fmi2_component_t, const fmi2_value_reference_t[], size_t, const fmi2_boolean_t[]);
+   typedef fmi2_status_t (*fmi2_set_string_ft) (fmi2_component_t, const fmi2_value_reference_t[], size_t, const fmi2_string_t []);
+
+/* Getting and setting the internal _fmu_ state */
+   typedef fmi2_status_t (*fmi2_get_fmu_state_ft)           (fmi2_component_t, fmi2_FMU_state_t*);
+   typedef fmi2_status_t (*fmi2_set_fmu_state_ft)           (fmi2_component_t, fmi2_FMU_state_t);
+   typedef fmi2_status_t (*fmi2_free_fmu_state_ft)          (fmi2_component_t, fmi2_FMU_state_t*);
+   typedef fmi2_status_t (*fmi2_serialized_fmu_state_size_ft)(fmi2_component_t, fmi2_FMU_state_t, size_t*);
+   typedef fmi2_status_t (*fmi2_serialize_fmu_state_ft)     (fmi2_component_t, fmi2_FMU_state_t, fmi2_byte_t[], size_t);
+   typedef fmi2_status_t (*fmi2_de_serialize_fmu_state_ft)   (fmi2_component_t, const fmi2_byte_t[], size_t, fmi2_FMU_state_t*);
+
+/* Getting directional derivatives */
+   typedef fmi2_status_t (*fmi2_get_directional_derivative_ft)(fmi2_component_t, const fmi2_value_reference_t[], size_t,
+                                                                   const fmi2_value_reference_t[], size_t,
+                                                                   const fmi2_real_t[], fmi2_real_t[]);
+
+/***************************************************
+Types for Functions for FMI for Model Exchange
+****************************************************/
+
+/* Enter and exit the different modes */
+   typedef fmi2_status_t (*fmi2_enter_event_mode_ft)          (fmi2_component_t);
+   typedef fmi2_status_t (*fmi2_new_discrete_states_ft)       (fmi2_component_t, fmi2_event_info_t*);
+   typedef fmi2_status_t (*fmi2_enter_continuous_time_mode_ft)(fmi2_component_t);
+   typedef fmi2_status_t (*fmi2_completed_integrator_step_ft) (fmi2_component_t, fmi2_boolean_t, fmi2_boolean_t*, fmi2_boolean_t*);
+
+/* Providing independent variables and re-initialization of caching */
+   typedef fmi2_status_t (*fmi2_set_time_ft)                (fmi2_component_t, fmi2_real_t);
+   typedef fmi2_status_t (*fmi2_set_continuous_states_ft)    (fmi2_component_t, const fmi2_real_t[], size_t);
+
+/* Evaluation of the model equations */
+   typedef fmi2_status_t (*fmi2_get_derivatives_ft)            (fmi2_component_t, fmi2_real_t[], size_t);
+   typedef fmi2_status_t (*fmi2_get_event_indicators_ft)        (fmi2_component_t, fmi2_real_t[], size_t);
+   typedef fmi2_status_t (*fmi2_get_continuous_states_ft)       (fmi2_component_t, fmi2_real_t[], size_t);
+   typedef fmi2_status_t (*fmi2_get_nominals_of_continuous_states_ft)(fmi2_component_t, fmi2_real_t[], size_t);
+
+
+/***************************************************
+Types for_functions for FMI for Co-_simulation
+****************************************************/
+
+/* Simulating the slave */
+   typedef fmi2_status_t (*fmi2_set_real_input_derivatives_ft) (fmi2_component_t, const fmi2_value_reference_t [], size_t, const fmi2_integer_t [], const fmi2_real_t []);
+   typedef fmi2_status_t (*fmi2_get_real_output_derivatives_ft)(fmi2_component_t, const fmi2_value_reference_t [], size_t, const fmi2_integer_t [], fmi2_real_t []);
+
+   typedef fmi2_status_t (*fmi2_do_step_ft)     (fmi2_component_t, fmi2_real_t, fmi2_real_t, fmi2_boolean_t);
+   typedef fmi2_status_t (*fmi2_cancel_step_ft) (fmi2_component_t);
+
+/* Inquire slave status */
+   typedef fmi2_status_t (*fmi2_get_status_ft)       (fmi2_component_t, const fmi2_status_kind_t, fmi2_status_t* );
+   typedef fmi2_status_t (*fmi2_get_real_status_ft)   (fmi2_component_t, const fmi2_status_kind_t, fmi2_real_t*   );
+   typedef fmi2_status_t (*fmi2_get_integer_status_ft)(fmi2_component_t, const fmi2_status_kind_t, fmi2_integer_t*);
+   typedef fmi2_status_t (*fmi2_get_boolean_status_ft)(fmi2_component_t, const fmi2_status_kind_t, fmi2_boolean_t*);
+   typedef fmi2_status_t (*fmi2_get_string_status_ft) (fmi2_component_t, const fmi2_status_kind_t, fmi2_string_t* );
+
+/**	@}
+*/
+
+#ifdef __cplusplus
+}  /* end of extern "C" { */
+#endif
+
+#endif /* fmi2_function_types_h */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import.h
new file mode 100644
index 00000000000..00a97a926be
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import.h
@@ -0,0 +1,381 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+/** \file fmi2_import.h
+*  \brief Public interface to the FMI import C-library.
+*/
+
+#ifndef FMI2_IMPORT_H_
+#define FMI2_IMPORT_H_
+
+#include <stddef.h>
+#include <fmilib_config.h>
+#include <JM/jm_callbacks.h>
+#include <FMI/fmi_import_util.h>
+#include <FMI/fmi_import_context.h>
+/* #include <FMI2/fmi2_xml_model_description.h> */
+
+#include <FMI2/fmi2_types.h>
+#include <FMI2/fmi2_functions.h>
+#include <FMI2/fmi2_enums.h>
+
+#include "fmi2_import_type.h"
+#include "fmi2_import_unit.h"
+#include "fmi2_import_variable.h"
+#include "fmi2_import_variable_list.h"
+
+#include "fmi2_import_capi.h"
+#include "fmi2_import_convenience.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \addtogroup  fmi2_import FMI 2.0 import interface
+ *  All the structures used in the interfaces are intended to
+ *  be treated as opaque objects by the client code.
+ @{ 
+ */
+
+/**	\addtogroup fmi2_import_init Constuction, destruction and error handling
+ * 	\addtogroup fmi2_import_gen General information retrieval
+ *	\addtogroup fmi2_import_capi Interface to the standard FMI 2.0 "C" API
+ *  \brief Convenient functions for calling the FMI functions. This interface wrappes the "C" API. 
+ */
+ /** @} */
+ /** @} */
+
+/** \addtogroup fmi2_import_init Constuction, destruction and error handling
+@{
+*/
+
+/**
+* \brief Retrieve the last error message.
+*
+* Error handling:
+*
+*  Many functions in the library return pointers to struct. An error is indicated by returning NULL/0-pointer.
+*  If error is returned than fmi2_import_get_last_error() functions can be used to retrieve the error message.
+*  If logging callbacks were specified then the same information is reported via logger.
+*  Memory for the error string is allocated and deallocated in the module.
+*  Client code should not store the pointer to the string since it can become invalid.
+*    @param fmu An FMU object as returned by fmi2_import_parse_xml().
+*    @return NULL-terminated string with an error message.
+*/
+FMILIB_EXPORT const char* fmi2_import_get_last_error(fmi2_import_t* fmu);
+
+/**
+\brief Clear the error message.
+* @param fmu An FMU object as returned by fmi2_import_parse_xml().
+* @return 0 if further processing is possible. If it returns 1 then the 
+*	error was not recoverable. The \p fmu object should then be freed and recreated.
+*/
+FMILIB_EXPORT int fmi2_import_clear_last_error(fmi2_import_t* fmu);
+
+/**
+\brief Release the memory allocated
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT void fmi2_import_free(fmi2_import_t* fmu);
+/** @}
+\addtogroup fmi2_import_gen
+ * \brief Functions for retrieving general model information. Memory for the strings is allocated and deallocated in the module.
+ *   All the functions take an FMU object as returned by fmi2_import_parse_xml() as a parameter. 
+ *   The information is retrieved from the XML file.
+ * @{
+*/
+/** 
+\brief Get model name. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_model_name(fmi2_import_t* fmu);
+
+/** \brief Retrieve capability flags by ID. */
+FMILIB_EXPORT unsigned int fmi2_import_get_capability(fmi2_import_t* , fmi2_capabilities_enu_t id);
+
+/** 
+\brief Get model identifier for ModelExchange. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_model_identifier_ME(fmi2_import_t* fmu);
+
+/** 
+\brief Get model identifier for CoSimulation. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_model_identifier_CS(fmi2_import_t* fmu);
+
+/** 
+\brief Get FMU GUID. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_GUID(fmi2_import_t* fmu);
+
+/** 
+\brief Get FMU description.
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_description(fmi2_import_t* fmu);
+
+/** 
+\brief Get FMU author. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_author(fmi2_import_t* fmu);
+
+/** 
+\brief Get FMU copyright information. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_copyright(fmi2_import_t* fmu);
+
+/** 
+\brief Get FMU license information. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_license(fmi2_import_t* fmu);
+
+/** \brief Get FMU version.
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_model_version(fmi2_import_t* fmu);
+
+/** \brief Get FMI standard version (always 2.0). 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_model_standard_version(fmi2_import_t* fmu);
+
+/** \brief Get FMU generation tool. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_generation_tool(fmi2_import_t* fmu);
+
+/** \brief Get FMU generation date and time. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT const char* fmi2_import_get_generation_date_and_time(fmi2_import_t* fmu);
+
+/** \brief Get variable naming convention used. 
+@param fmu An fmu object as returned by fmi2_import_parse_xml().
+*/
+FMILIB_EXPORT fmi2_variable_naming_convension_enu_t fmi2_import_get_naming_convention(fmi2_import_t* fmu);
+
+/** \brief Get the number of continuous states. 
+*/
+FMILIB_EXPORT size_t fmi2_import_get_number_of_continuous_states(fmi2_import_t* fmu);
+
+/** \brief Get the number of event indicators. */
+FMILIB_EXPORT size_t fmi2_import_get_number_of_event_indicators(fmi2_import_t* fmu);
+
+/** \brief Check if the start time for default experiment is specified in the XML file. */
+FMILIB_EXPORT int fmi2_import_get_default_experiment_has_start(fmi2_import_t* fmu);
+
+/** \brief Check if the stop time for default experiment is specified in the XML file. */
+FMILIB_EXPORT int fmi2_import_get_default_experiment_has_stop(fmi2_import_t* fmu);
+
+/** \brief Check if the tolerance for default experiment is specified in the XML file. */
+FMILIB_EXPORT int fmi2_import_get_default_experiment_has_tolerance(fmi2_import_t* fmu);
+
+/** \brief Check if the step size time for default experiment is specified in the XML file. */
+FMILIB_EXPORT int fmi2_import_get_default_experiment_has_step(fmi2_import_t* fmu);
+
+/** \brief Get the start time for default experiment as specified in the XML file.
+    If it is not specified, a default value of 0.0 is returned.
+    To determine if it is specified, use the following function: #fmi2_import_get_default_experiment_has_start
+*/
+FMILIB_EXPORT double fmi2_import_get_default_experiment_start(fmi2_import_t* fmu);
+
+/** \brief Get the stop time for default experiment as specified in the XML file.
+    If it is not specified, a default value of 1.0 is returned.
+    To determine if it is specified, use the following function: #fmi2_import_get_default_experiment_has_stop
+*/
+FMILIB_EXPORT double fmi2_import_get_default_experiment_stop(fmi2_import_t* fmu);
+
+/** \brief Get the tolerance for default experiment as specified in the XML file.
+    If it is not specified, a default value of 1e-4 is returned.
+    To determine if it is specified, use the following function: #fmi2_import_get_default_experiment_has_tolerance
+*/
+FMILIB_EXPORT double fmi2_import_get_default_experiment_tolerance(fmi2_import_t* fmu);
+
+/** \brief Get the step size for default experiment as specified in the XML file.
+    If it is not specified, a default value of 1e-2 is returned.
+    To determine if it is specified, use the following function: #fmi2_import_get_default_experiment_has_step
+*/
+FMILIB_EXPORT double fmi2_import_get_default_experiment_step(fmi2_import_t* fmu);
+
+/** \brief Get the type of the FMU (model exchange or co-simulation) */
+FMILIB_EXPORT fmi2_fmu_kind_enu_t fmi2_import_get_fmu_kind(fmi2_import_t* fmu);
+
+/** \brief Get the list of all the type definitions in the model*/
+FMILIB_EXPORT fmi2_import_type_definitions_t* fmi2_import_get_type_definitions(fmi2_import_t* );
+
+/** \brief Get a list of all the unit definitions in the model. */
+FMILIB_EXPORT fmi2_import_unit_definitions_t* fmi2_import_get_unit_definitions(fmi2_import_t* fmu);
+
+/** \brief Get the variable with the same value reference that is not an alias*/
+FMILIB_EXPORT fmi2_import_variable_t* fmi2_import_get_variable_alias_base(fmi2_import_t* fmu,fmi2_import_variable_t*);
+
+/**
+    Get the list of all the variables aliased to the given one (including the base one).
+
+    Note that the list is ordered: base variable, aliases, negated aliases.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_get_variable_aliases(fmi2_import_t* fmu,fmi2_import_variable_t*);
+
+/** \brief Get the list of all the variables in the model.
+* @param fmu An FMU object as returned by fmi2_import_parse_xml().
+* @param sortOrder Specifies the order of the variables in the list: 
+		0 - original order as found in the XML file; 1 - sorted alfabetically by variable name; 2 sorted by types/value references.
+* @return a variable list with all the variables in the model.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_get_variable_list(fmi2_import_t* fmu, int sortOrder);
+
+/** \brief Create a variable list with a single variable.
+  
+\param fmu An FMU object that this variable list will reference.
+\param v A variable.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_create_var_list(fmi2_import_t* fmu,fmi2_import_variable_t* v);
+
+/** \brief Get the number of vendors that had annotations in the XML*/
+FMILIB_EXPORT size_t fmi2_import_get_vendors_num(fmi2_import_t* fmu);
+
+/** \brief Get the name of the vendor with that had annotations in the XML by index */
+FMILIB_EXPORT const char* fmi2_import_get_vendor_name(fmi2_import_t* fmu, size_t index);
+
+/** \brief Get the number of log categories defined in the XML */
+FMILIB_EXPORT size_t fmi2_import_get_log_categories_num(fmi2_import_t* fmu);
+
+/** \brief Get the log category by index */
+FMILIB_EXPORT const char* fmi2_import_get_log_category(fmi2_import_t* fmu, size_t index);
+
+/** \brief Get the log category description by index */
+FMILIB_EXPORT const char* fmi2_import_get_log_category_description(fmi2_import_t* fmu, size_t index);
+
+/** \brief Get the number of source files for ME defined in the XML */
+FMILIB_EXPORT size_t fmi2_import_get_source_files_me_num(fmi2_import_t* fmu);
+
+/** \brief Get the ME source file by index */
+FMILIB_EXPORT const char* fmi2_import_get_source_file_me(fmi2_import_t* fmu, size_t index);
+
+/** \brief Get the number of source files for CS defined in the XML */
+FMILIB_EXPORT size_t fmi2_import_get_source_files_cs_num(fmi2_import_t* fmu);
+
+/** \brief Get the CS source file by index */
+FMILIB_EXPORT const char* fmi2_import_get_source_file_cs(fmi2_import_t* fmu, size_t index);
+
+/**
+	\brief Get variable by variable name.
+	\param fmu - An fmu object as returned by fmi2_import_parse_xml().
+	\param name - variable name
+	\return variable pointer.
+*/
+FMILIB_EXPORT fmi2_import_variable_t* fmi2_import_get_variable_by_name(fmi2_import_t* fmu, const char* name);
+
+/**
+	\brief Get variable by value reference.
+	\param fmu - An fmu object as returned by fmi2_import_parse_xml().
+	\param baseType - basic data type
+	\param vr - value reference
+	\return variable pointer.
+*/
+FMILIB_EXPORT fmi2_import_variable_t* fmi2_import_get_variable_by_vr(fmi2_import_t* fmu, fmi2_base_type_enu_t baseType, fmi2_value_reference_t vr);
+
+/** \brief Get the list of all the output variables in the model.
+* @param fmu An FMU object as returned by fmi2_import_parse_xml().
+* @return a variable list with all the output variables in the model.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_get_outputs_list(fmi2_import_t* fmu);
+
+/** \brief Get the list of all the derivative variables in the model.
+* @param fmu An FMU object as returned by fmi2_import_parse_xml().
+* @return a variable list with all the continuous state derivatives in the model.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_get_derivatives_list(fmi2_import_t* fmu);
+
+/** \brief Get the list of all the discrete state variables in the model.
+* @param fmu An FMU object as returned by fmi2_import_parse_xml().
+* @return a variable list with all the discrete state variables in the model.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_get_discrete_states_list(fmi2_import_t* fmu);
+
+/** \brief Get the list of all the initial unknown variables in the model.
+* @param fmu An FMU object as returned by fmi2_import_parse_xml().
+* @return a variable list with all the initial unknowns in the model.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_get_initial_unknowns_list(fmi2_import_t* fmu);
+
+/** \brief Get dependency information in row-compressed format. 
+ * @param fmu An FMU object as returned by fmi2_import_parse_xml(). 
+ * @param startIndex - outputs a pointer to an array of start indices (size of array is number of outputs + 1).
+ *                     First element is zero, last is equal to the number of elements in the dependency and factor arrays. 
+ *                     NULL pointer is returned if no dependency information was provided in the XML. 
+ * @param dependency - outputs a pointer to the dependency index data. Indices are 1-based. Index equals to zero  
+ *                     means "depends on all" (no information in the XML). 
+ * @param factorKind - outputs a pointer to the factor kind data. The values can be converted to ::fmi2_dependency_factor_kind_enu_t 
+ */ 
+FMILIB_EXPORT void fmi2_import_get_outputs_dependencies(fmi2_import_t* fmu, size_t** startIndex, size_t** dependency, char** factorKind);
+ 
+/** \brief Get dependency information in row-compressed format. 
+ * @param fmu An FMU object as returned by fmi2_import_parse_xml(). 
+ * @param startIndex - outputs a pointer to an array of start indices (size of array is number of derivatives + 1).
+ *                     First element is zero, last is equal to the number of elements in the dependency and factor arrays. 
+ *                     NULL pointer is returned if no dependency information was provided in the XML. 
+ * @param dependency - outputs a pointer to the dependency index data. Indices are 1-based. Index equals to zero  
+ *                     means "depends on all" (no information in the XML). 
+ * @param factorKind - outputs a pointer to the factor kind data. The values can be converted to ::fmi2_dependency_factor_kind_enu_t 
+ */ 
+FMILIB_EXPORT void fmi2_import_get_derivatives_dependencies(fmi2_import_t* fmu, size_t** startIndex, size_t** dependency, char** factorKind);
+
+/** \brief Get dependency information in row-compressed format. 
+ * @param fmu An FMU object as returned by fmi2_import_parse_xml(). 
+ * @param startIndex - outputs a pointer to an array of start indices (size of array is number of discrete states + 1).
+ *                     First element is zero, last is equal to the number of elements in the dependency and factor arrays. 
+ *                     NULL pointer is returned if no dependency information was provided in the XML. 
+ * @param dependency - outputs a pointer to the dependency index data. Indices are 1-based. Index equals to zero  
+ *                     means "depends on all" (no information in the XML). 
+ * @param factorKind - outputs a pointer to the factor kind data. The values can be converted to ::fmi2_dependency_factor_kind_enu_t 
+ */ 
+FMILIB_EXPORT void fmi2_import_get_discrete_states_dependencies(fmi2_import_t* fmu, size_t** startIndex, size_t** dependency, char** factorKind);
+ 
+/** \brief Get dependency information in row-compressed format. 
+ * @param fmu An FMU object as returned by fmi2_import_parse_xml(). 
+ * @param startIndex - outputs a pointer to an array of start indices (size of array is number of initial unknowns + 1).
+ *                     First element is zero, last is equal to the number of elements in the dependency and factor arrays. 
+ *                     NULL pointer is returned if no dependency information was provided in the XML. 
+ * @param dependency - outputs a pointer to the dependency index data. Indices are 1-based. Index equals to zero  
+ *                     means "depends on all" (no information in the XML). 
+ * @param factorKind - outputs a pointer to the factor kind data. The values can be converted to ::fmi2_dependency_factor_kind_enu_t 
+ */ 
+FMILIB_EXPORT void fmi2_import_get_initial_unknowns_dependencies(fmi2_import_t* fmu, size_t** startIndex, size_t** dependency, char** factorKind);
+ 
+/**@} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_capi.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_capi.h
new file mode 100644
index 00000000000..7503d5a8ae0
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_capi.h
@@ -0,0 +1,577 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI2_IMPORT_CAPI_H_
+#define FMI2_IMPORT_CAPI_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <JM/jm_callbacks.h>
+#include <FMI/fmi_import_util.h>
+#include <FMI/fmi_import_context.h>
+/* #include <FMI2/fmi2_xml_model_description.h>*/
+
+#include <FMI2/fmi2_types.h>
+#include <FMI2/fmi2_functions.h>
+#include <FMI2/fmi2_enums.h>
+/* #include <FMI2/fmi2_capi.h> */
+
+/**
+\file fmi2_import_capi.h
+Wrapper functions for the FMI 2.0 functions
+*/
+
+/**
+ * \addtogroup fmi2_import_capi
+ * @{
+ */
+
+/**	\addtogroup fmi2_import_capi_const_destroy FMI 2.0 Constructor and Destructor	
+ * \brief Functions for instantiating and freeing the container of the struct that is responsible for the FMI functions.
+ *
+ *	Before any of the FMI functions may be called, the construction function must instantiate a fmi_import_t module.
+ *	After the fmi_import_t module has been succesfully instantiated, all the FMI functions can be called. To unload
+ *	the FMI functions, the destroy functions shall be called.
+ *
+ * 	\addtogroup fmi2_import_capi_me FMI 2.0 (ME) Model Exchange functions
+ * \brief List of Model Exchange wrapper functions. Common functions are not listed.
+ *	\addtogroup fmi2_import_capi_cs FMI 2.0 (CS) Co-Simulation functions 
+ * \brief List of Co-Simulation wrapper functions. Common functions are not listed.
+ *	\addtogroup fmi2_import_capi_common FMI 2.0 (ME & CS) Common functions
+ * \brief List of wrapper functions that are in common for both Model Exchange and Co-Simulation.
+ */
+
+/**
+ * \addtogroup fmi2_import_capi_const_destroy
+ * @{
+ */
+
+/**
+ * \brief Create a C-API struct. The C-API struct is a placeholder for the FMI DLL functions.
+ *
+ * This function may only be called once if it returned succesfully. fmi2_import_destroy_dllfmu 
+ * must be called before this function can be called again. 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml().
+ * @param fmuKind Specifies if ModelExchange or CoSimulation binary should be loaded.
+ * @param callBackFunctions Callback functions to be used by the FMI functions internally. If this parameter is NULL
+ *           then the jm_callbacks:: and fmi2_log_forwarding are utitlized to fill in the default structure.
+ * @return Error status. If the function returns with an error, it is not allowed to call any of the other C-API functions.
+ */
+FMILIB_EXPORT jm_status_enu_t fmi2_import_create_dllfmu(fmi2_import_t* fmu, fmi2_fmu_kind_enu_t fmuKind, const fmi2_callback_functions_t* callBackFunctions);
+
+/** \brief Free a C-API struct. All memory allocated since the struct was created is freed.
+ * 
+ * @param fmu A model description object returned from fmi2_import_parse_xml().
+ */
+FMILIB_EXPORT void fmi2_import_destroy_dllfmu(fmi2_import_t* fmu);
+
+/**
+ * \brief Set CAPI debug mode flag. Setting to non-zero prevents DLL unloading in fmi2_import_destroy_dllfmu
+ *  while all the memory is deallocated. This is to support valgrind debugging. 
+ * 
+ * @param fmu C-API struct that has succesfully loaded the FMI function.
+ * @param mode The debug mode to set.
+ */
+FMILIB_EXPORT void fmi2_import_set_debug_mode(fmi2_import_t* fmu, int mode);
+/**@} */
+
+/**
+ * \addtogroup fmi2_import_capi_common
+ * @{
+ */
+
+/**
+ * \brief Wrapper for the FMI function fmiGetVersion() 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI version.
+ */
+FMILIB_EXPORT const char* fmi2_import_get_version(fmi2_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetDebugLogging(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param loggingOn Enable or disable the debug logger.
+ * @param nCategories Number of categories to log.
+ * @param categories Which categories to log.
+* @return FMI status.
+ */
+ FMILIB_EXPORT fmi2_status_t fmi2_import_set_debug_logging(fmi2_import_t* fmu, fmi2_boolean_t loggingOn, size_t nCategories, fmi2_string_t categories[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiInstantiate(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param instanceName The name of the instance.
+ * @param fmuType fmi2_model_exchange or fmi2_cosimulation.
+ * @param fmuResourceLocation Access path URI to the FMU archive resources. If this is NULL pointer the FMU will get the path to the unzipped location.
+ * @param visible Indicates whether or not the simulator application window shoule be visible.
+ * @return Error status. Returnes jm_status_error if fmiInstantiate returned NULL, otherwise jm_status_success.
+ */
+FMILIB_EXPORT jm_status_enu_t fmi2_import_instantiate(fmi2_import_t* fmu,
+    fmi2_string_t instanceName, fmi2_type_t fmuType,
+    fmi2_string_t fmuResourceLocation, fmi2_boolean_t visible);
+
+/**
+ * \brief Wrapper for the FMI function fmiFreeInstance(...) 
+ * 
+ * @param fmu An fmu description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ */
+FMILIB_EXPORT void fmi2_import_free_instance(fmi2_import_t* fmu);
+
+
+/**
+ * \brief Calls the FMI function fmiSetupExperiment(...)
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param tolerance_defined True if the @p tolerance argument is to be used
+ * @param tolerance Solvers internal to the FMU should use this tolerance or finer, if @p tolerance_defined is true
+ * @param start_time Start time of the experiment
+ * @param stop_time_defined True if the @p stop_time argument is to be used
+ * @param stop_time Stop time of the experiment, if @p stop_time_defined is true
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_setup_experiment(fmi2_import_t* fmu,
+    fmi2_boolean_t toleranceDefined, fmi2_real_t tolerance,
+    fmi2_real_t startTime, fmi2_boolean_t stopTimeDefined,
+    fmi2_real_t stopTime);
+
+/**
+ * \brief Calls the FMI function fmiEnterInitializationMode(...)
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_enter_initialization_mode(fmi2_import_t* fmu);
+
+/**
+ * \brief Calls the FMI function fmiExitInitializationMode(...)
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_exit_initialization_mode(fmi2_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiTerminate(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_terminate(fmi2_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiReset(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_reset(fmi2_import_t* fmu);
+
+
+/**
+ * \brief Wrapper for the FMI function fmiSetReal(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_real(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, const fmi2_real_t    value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetInteger(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_integer(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, const fmi2_integer_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetBoolean(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_boolean(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, const fmi2_boolean_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetString(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_string(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, const fmi2_string_t  value[]);
+
+
+/**
+ * \brief Wrapper for the FMI function fmiGetReal(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_real(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, fmi2_real_t    value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetInteger(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_integer(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, fmi2_integer_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetBoolean(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_boolean(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, fmi2_boolean_t value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetString(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param value (Output)Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_string(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, fmi2_string_t  value[]);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetTypesPlatform(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return The platform the FMU was compiled for.
+ */
+FMILIB_EXPORT const char* fmi2_import_get_types_platform(fmi2_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetFMUstate(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s The state object to be set by the FMU
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_fmu_state           (fmi2_import_t* fmu, fmi2_FMU_state_t* s );
+
+/**
+ * \brief Wrapper for the FMI function fmiSetFMUstate(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s The FMU state object
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_fmu_state           (fmi2_import_t* fmu, fmi2_FMU_state_t s);
+
+/**
+ * \brief Wrapper for the FMI function fmiFreeFMUstate(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s The FMU state object
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_free_fmu_state          (fmi2_import_t* fmu, fmi2_FMU_state_t* s);
+
+/**
+ * \brief Wrapper for the FMI function fmiSerializedFMUstateSize(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s The FMU state object
+ * @param sz The size of the serialized state in bytes
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_serialized_fmu_state_size(fmi2_import_t* fmu, fmi2_FMU_state_t s, size_t* sz);
+
+/**
+ * \brief Wrapper for the FMI function fmiSerializeFMUstate(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s The FMU state object
+ * @param data The buffer that will receive serialized FMU state
+ * @param sz The size of the data buffer
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_serialize_fmu_state     (fmi2_import_t* fmu, fmi2_FMU_state_t s, fmi2_byte_t data[], size_t sz);
+
+/**
+ * \brief Wrapper for the FMI function fmiSerializeFMUstate(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param data The buffer that contains serialized FMU state
+ * @param sz The size of the data buffer
+ * @param s The FMU state object to be created
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_de_serialize_fmu_state  (fmi2_import_t* fmu, const fmi2_byte_t data[], size_t sz, fmi2_FMU_state_t* s);
+
+
+
+/**
+ * \brief Wrapper for the FMI function fmiGetDirectionalDerivative(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param v_ref Value references for the seed vector
+ * @param nv   size of v_ref array
+ * @param z_ref Value references for the derivatives/outputs to be processed
+ * @param nz Size of z_ref array
+ * @param dv The seed vector.
+ * @param dz Calculated directional derivative on output.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_directional_derivative(fmi2_import_t* fmu, const fmi2_value_reference_t v_ref[], size_t nv,
+                                                                   const fmi2_value_reference_t z_ref[], size_t nz,
+                                                                   const fmi2_real_t dv[], fmi2_real_t dz[]);
+
+/**@} */
+
+/**
+ * \addtogroup fmi2_import_capi_me
+ * @{
+ */
+
+/**
+ * \brief Calls the FMI function fmiEnterEventMode(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_enter_event_mode(fmi2_import_t* fmu);
+
+/**
+ * \brief Calls the FMI function fmiNewDiscreteStates(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param eventInfo Pointer to fmi2_event_info_t structure that will be filled in.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_new_discrete_states(fmi2_import_t* fmu, fmi2_event_info_t* eventInfo);
+
+/**
+ * \brief Calls the FMI function fmiEnterContinuousTimeMode(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_enter_continuous_time_mode(fmi2_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetTime(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param time Set the current time.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_time(fmi2_import_t* fmu, fmi2_real_t time);
+
+/**
+ * \brief Wrapper for the FMI function fmiSetContinuousStates(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param x Array of state values.
+ * @param nx Number of states.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_continuous_states(fmi2_import_t* fmu, const fmi2_real_t x[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiCompletedIntegratorStep(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param noSetFMUStatePriorToCurrentPoint True if fmiSetFMUState will no
+          longer be called for time instants prior to current time in this
+          simulation run.
+ * @param enterEventMode (Output) Call fmiEnterEventMode indicator.
+ * @param terminateSimulation (Output) Terminate simulation indicator.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_completed_integrator_step(fmi2_import_t* fmu,
+    fmi2_boolean_t noSetFMUStatePriorToCurrentPoint,
+    fmi2_boolean_t* enterEventMode, fmi2_boolean_t* terminateSimulation);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetDerivatives(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param derivatives (Output) Array of the derivatives.
+ * @param nx Number of derivatives.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_derivatives(fmi2_import_t* fmu, fmi2_real_t derivatives[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetEventIndicators(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param eventIndicators (Output) The event indicators.
+ * @param ni Number of event indicators.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_event_indicators(fmi2_import_t* fmu, fmi2_real_t eventIndicators[], size_t ni);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetContinuousStates(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param states (Output) Array of state values.
+ * @param nx Number of states.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_continuous_states(fmi2_import_t* fmu, fmi2_real_t states[], size_t nx);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetNominalsOfContinuousStates(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param x_nominal (Output) The nominal values.
+ * @param nx Number of nominal values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_nominals_of_continuous_states(fmi2_import_t* fmu, fmi2_real_t x_nominal[], size_t nx);
+
+/**@} */
+
+/**
+ * \addtogroup fmi2_import_capi_cs
+ * @{
+ */
+
+
+/**
+ * \brief Wrapper for the FMI function fmiSetRealInputDerivatives(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param order	Array of derivative orders.
+ * @param value Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_set_real_input_derivatives(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, const fmi2_integer_t order[], const  fmi2_real_t value[]);                                                  
+
+/**
+ * \brief Wrapper for the FMI function fmiGetOutputDerivatives(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param vr Array of value references.
+ * @param nvr Number of array elements.
+ * @param order	Array of derivative orders.
+ * @param value (Output) Array of variable values.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_real_output_derivatives(fmi2_import_t* fmu, const fmi2_value_reference_t vr[], size_t nvr, const fmi2_integer_t order[], fmi2_real_t value[]);                                              
+
+/**
+ * \brief Wrapper for the FMI function fmiCancelStep(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_cancel_step(fmi2_import_t* fmu);
+
+/**
+ * \brief Wrapper for the FMI function fmiDoStep(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param currentCommunicationPoint Current communication point of the master.
+ * @param communicationStepSize Communication step size.
+ * @param newStep Indicates whether or not the last communication step was accepted by the master.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_do_step(fmi2_import_t* fmu, fmi2_real_t currentCommunicationPoint, fmi2_real_t communicationStepSize, fmi2_boolean_t newStep);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI status value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_status(fmi2_import_t* fmu, const fmi2_status_kind_t s, fmi2_status_t*  value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetRealStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI real value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_real_status(fmi2_import_t* fmu, const fmi2_status_kind_t s, fmi2_real_t*    value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetIntegerStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu.
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI integer value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_integer_status(fmi2_import_t* fmu, const fmi2_status_kind_t s, fmi2_integer_t* value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetBooleanStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu.
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI boolean value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_boolean_status(fmi2_import_t* fmu, const fmi2_status_kind_t s, fmi2_boolean_t* value);
+
+/**
+ * \brief Wrapper for the FMI function fmiGetStringStatus(...) 
+ * 
+ * @param fmu A model description object returned by fmi2_import_parse_xml() that has loaded the FMI functions, see fmi2_import_create_dllfmu().
+ * @param s Kind of status to return the value for.
+ * @param value (Output) FMI string value.
+ * @return FMI status.
+ */
+FMILIB_EXPORT fmi2_status_t fmi2_import_get_string_status(fmi2_import_t* fmu, const fmi2_status_kind_t s, fmi2_string_t*  value);
+
+/**@} */
+
+
+/**@} */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* End of header FMI2_IMPORT_CAPI_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_convenience.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_convenience.h
new file mode 100644
index 00000000000..0eeafb3fff4
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_convenience.h
@@ -0,0 +1,147 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi2_import_convenience.h
+*  \brief Public interface to the FMI import C-library. Convenience functions.
+*
+*  The functions in this file are provided for convenience. The functionality
+*  is already available via other lower level functions.
+*/
+
+#ifndef FMI2_IMPORT_CONVENIENCE_H_
+#define FMI2_IMPORT_CONVENIENCE_H_
+
+#include <FMI/fmi_import_context.h>
+#include <FMI2/fmi2_functions.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+		/**
+	\addtogroup fmi2_import
+	@{
+	\addtogroup fmi2_import_convenience Convenience functions.
+	@}
+	\addtogroup fmi2_import_convenience Convenience functions.
+	\brief The functions in this module are provided for convenience. The functionality
+	*  is already available via other lower level functions.
+
+	@{
+	*/	
+/** 
+\brief Collection of counters providing model information.
+	*/
+typedef struct {
+	/** \brief Number of constants */
+	unsigned int num_constants;
+	/** \brief  Number of fixed */
+	unsigned int num_fixed;
+	/** \brief  Number of tunable */
+	unsigned int num_tunable;
+	/** \brief  Number of discrete variables */
+	unsigned int num_discrete;
+	/** \brief  Number of continuous variables */
+	unsigned int num_continuous;
+
+	/** \brief  Number of parameters*/
+	unsigned int num_parameters;
+	/** \brief  Number of calculated parameters*/
+	unsigned int num_calculated_parameters;
+	/** \brief  Number of inputs */
+	unsigned int num_inputs;
+	/** \brief  Number of outputs */
+	unsigned int num_outputs;
+	/** \brief  Number of local variables */
+	unsigned int num_local;
+	/** \brief  Number of independent variables */
+	unsigned int num_independent;
+
+	/** \brief  Number of real variables*/
+	unsigned int num_real_vars; 
+	/** \brief  Number of integer variables*/
+	unsigned int num_integer_vars; 
+	/** \brief  Number of enumeration variables*/
+	unsigned int num_enum_vars; 
+	/** \brief  Number of boolean variables*/
+	unsigned int num_bool_vars; 
+	/** \brief  Number of string variables*/
+	unsigned int num_string_vars; 
+} fmi2_import_model_counts_t;
+
+/**
+	\brief Collect model information by counting the number of variables with specific properties and fillinf in fmi2_import_model_counts_t struct.
+	\param fmu - An fmu object as returned by fmi2_import_parse_xml().
+	\param counts - a pointer to a preallocated struct.
+*/
+FMILIB_EXPORT 
+void fmi2_import_collect_model_counts(fmi2_import_t* fmu, fmi2_import_model_counts_t* counts);
+
+/**
+  \brief Print msgIn into msgOut by expanding variable references of the form #\<Type\>\<VR\># into variable names
+  and replacing '##' with a single #.
+   \param fmu - An fmu object as returned by fmi2_import_parse_xml().
+   \param msgIn - Log message as produced by an FMU.
+   \param msgOut - Output message buffer. 
+   \param maxMsgSize - maximum message size
+   */
+FMILIB_EXPORT 
+void fmi2_import_expand_variable_references(fmi2_import_t* fmu, const char* msgIn, char* msgOut, size_t maxMsgSize);
+
+
+/**
+	\brief An implementation of FMI 2.0 logger that forwards the messages to logger function inside ::jm_callbacks structure.
+	
+	The function is using a global array of active FMUs to find out which FMU is sending the log messege. It then
+	forwards the message to the logger connected to the particular ::fmi2_import_t struct. The function is called by the FMU.
+	The FMU must be loaded with non-zero registerGlobally parameter of fmi2_import_create_dllfmu() in order to work. 
+	If no matching ::fmi2_import_t struct is found on the global list then jm_get_default_callbacks() is used to get the default logger.
+	Note that this function is not thread safe due to the use of the global list.
+*/
+FMILIB_EXPORT 
+void  fmi2_log_forwarding(fmi2_component_t c, fmi2_string_t instanceName, fmi2_status_t status, fmi2_string_t category, fmi2_string_t message, ...);
+
+/**
+	\brief An implementation of FMI 2.0 logger that forwards the messages to logger function inside ::jm_callbacks structure.
+	
+	See fmi2_log_forwarding() for more information.
+*/
+FMILIB_EXPORT 
+void  fmi2_log_forwarding_v(fmi2_component_t c, fmi2_string_t instanceName, fmi2_status_t status, fmi2_string_t category, fmi2_string_t message, va_list args);
+
+
+/** \brief  Default FMI 2.0 logger may be used when instantiating FMUs */
+FMILIB_EXPORT
+void  fmi2_default_callback_logger(fmi2_component_t c, fmi2_string_t instanceName, fmi2_status_t status, fmi2_string_t category, fmi2_string_t message, ...);
+
+/** \brief  Given ::fmi2_callback_functions_t logger (fmi2_logger), the ::jm_callbacks logger may be setup to redirect the messages to the fmi2_logger.
+
+    The functions sets up the redirection. Note that the context field in ::jm_callbacks is set to point to the provided ::fmi2_callback_functions_t.
+	\param cb FMI Library callbacks
+	\param fmiCallbacks FMI 2.0 standard callbacks
+*/
+FMILIB_EXPORT
+void fmi2_import_init_logger(jm_callbacks* cb, fmi2_callback_functions_t* fmiCallbacks);
+/**	@}
+*/
+
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* FMI2_IMPORT_CONVENIENCE_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_type.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_type.h
new file mode 100644
index 00000000000..95d438cc194
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_type.h
@@ -0,0 +1,171 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi2_import_type.h
+*  \brief Public interface to the FMI XML C-library: variable types handling.
+*/
+
+#ifndef FMI2_IMPORT_TYPE_H_
+#define FMI2_IMPORT_TYPE_H_
+
+#include "fmi2_import_unit.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+	\addtogroup fmi2_import
+	@{
+	\addtogroup fmi2_import_typedef Support for processing variable types
+	@}
+	\addtogroup fmi2_import_typedef Support for processing variable types
+  @{
+*/
+/**@name   Type definitions supporting structures*/
+/**@{ */
+/** \brief Opaque type definition object. */
+typedef struct fmi2_xml_real_typedef_t fmi2_import_real_typedef_t;
+/** \brief Opaque integer type definition object. */
+typedef struct fmi2_xml_integer_typedef_t fmi2_import_integer_typedef_t;
+/** \brief Opaque enumeration type definition object. */
+typedef struct fmi2_xml_enumeration_typedef_t fmi2_import_enumeration_typedef_t;
+/** \brief Opaque general variable type definition object. */
+typedef struct fmi2_xml_variable_typedef_t fmi2_import_variable_typedef_t;
+/** \brief Opaque list of the type definitions in the model */
+typedef struct fmi2_xml_type_definitions_t fmi2_import_type_definitions_t;
+/**@} */
+
+/** \brief Get the number of available type definitions */
+FMILIB_EXPORT unsigned int fmi2_import_get_type_definition_number(fmi2_import_type_definitions_t* td);
+
+/** \brief Get a type definition specified by the index 
+	@param td the type definition list object
+	@param index the index of type definition. Must be less than the number returned by fmi2_import_get_type_definition_number()
+	@return A type definition object or NULL if index is out of range.
+*/
+FMILIB_EXPORT fmi2_import_variable_typedef_t* fmi2_import_get_typedef(fmi2_import_type_definitions_t* td, unsigned int index);
+
+/** \brief Get associated display unit for a type defition if any. */
+FMILIB_EXPORT fmi2_import_display_unit_t* fmi2_import_get_type_display_unit(fmi2_import_real_typedef_t*);
+
+/** \brief Get the type name*/
+FMILIB_EXPORT const char* fmi2_import_get_type_name(fmi2_import_variable_typedef_t*);
+
+/**\brief Get type description.
+
+   Note that an empty string is returned if the attribute is not present in the XML.*/
+FMILIB_EXPORT const char* fmi2_import_get_type_description(fmi2_import_variable_typedef_t*);
+
+/** \brief Get base type used for the type definition */
+FMILIB_EXPORT fmi2_base_type_enu_t fmi2_import_get_base_type(fmi2_import_variable_typedef_t*);
+
+/* Boolean and String has no extra attributes -> not needed*/
+
+/** \brief Cast the general type definition object to an object with a specific base type 
+	@return Pointer to the specific type object or NULL if base type does not match.
+*/
+FMILIB_EXPORT fmi2_import_real_typedef_t* fmi2_import_get_type_as_real(fmi2_import_variable_typedef_t*);
+/** \brief Cast the general type definition object to an object with a specific base type 
+	@return Pointer to the specific type object or NULL if base type does not match.
+*/
+FMILIB_EXPORT fmi2_import_integer_typedef_t* fmi2_import_get_type_as_int(fmi2_import_variable_typedef_t*);
+/** \brief Cast the general type definition object to an object with a specific base type 
+	@return Pointer to the specific type object or NULL if base type does not match.
+*/
+FMILIB_EXPORT fmi2_import_enumeration_typedef_t* fmi2_import_get_type_as_enum(fmi2_import_variable_typedef_t*);
+
+/** \brief Get the quantity associated with the type definition.
+	@return The quantity, or NULL-pointer if quantity is not defined (NULL-pointer is always returned for strings and booleans).
+*/
+FMILIB_EXPORT const char* fmi2_import_get_type_quantity(fmi2_import_variable_typedef_t*);
+
+/** \brief Get minimal value for the type.
+
+	@return Either the value specified in the XML file or negated DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT double fmi2_import_get_real_type_min(fmi2_import_real_typedef_t*);
+/** \brief Get maximum value for the type
+
+	@return Either the value specified in the XML file or DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT double fmi2_import_get_real_type_max(fmi2_import_real_typedef_t*);
+
+/** \brief Get the nominal value associated with the type definition */
+FMILIB_EXPORT double fmi2_import_get_real_type_nominal(fmi2_import_real_typedef_t*);
+
+/** \brief Get the unit object associated with the type definition if any*/
+FMILIB_EXPORT fmi2_import_unit_t* fmi2_import_get_real_type_unit(fmi2_import_real_typedef_t*);
+
+/** \brief Get the 'relativeQuantity' flag */
+FMILIB_EXPORT int fmi2_import_get_real_type_is_relative_quantity(fmi2_import_real_typedef_t*);
+
+/** \brief Get the 'unbounded' flag */
+FMILIB_EXPORT int fmi2_import_get_real_type_is_unbounded(fmi2_import_real_typedef_t*);
+
+/** \brief Get minimal value for the type.
+	
+	@return Either the value specified in the XML file or INT_MIN as defined in <limits.h>
+*/
+FMILIB_EXPORT int fmi2_import_get_integer_type_min(fmi2_import_integer_typedef_t*);
+/** \brief Get maximum value for the type
+	
+	@return Either the value specified in the XML file or INT_MAX as defined in <limits.h>
+*/
+FMILIB_EXPORT int fmi2_import_get_integer_type_max(fmi2_import_integer_typedef_t*);
+
+/** \brief Get minimal value for the type.
+	
+	@return Either the value specified in the XML file or 0
+*/
+FMILIB_EXPORT unsigned int fmi2_import_get_enum_type_min(fmi2_import_enumeration_typedef_t*);
+
+/** \brief Get maximum value for the type.
+	
+	@return Either the value specified in the XML file or INT_MAX as defined in <limits.h>
+*/
+FMILIB_EXPORT unsigned int fmi2_import_get_enum_type_max(fmi2_import_enumeration_typedef_t*);
+
+/** \brief Get the number of elements in the enum */
+FMILIB_EXPORT unsigned int  fmi2_import_get_enum_type_size(fmi2_import_enumeration_typedef_t*);
+
+/** \brief Get an enumeration item name by index */
+FMILIB_EXPORT const char* fmi2_import_get_enum_type_item_name(fmi2_import_enumeration_typedef_t*, unsigned int  item);
+
+/** \brief Get an enumeration item value by index */
+FMILIB_EXPORT int fmi2_import_get_enum_type_item_value(fmi2_import_enumeration_typedef_t*, unsigned int  item);
+
+/** \brief Get an enumeration item description by index */
+FMILIB_EXPORT const char* fmi2_import_get_enum_type_item_description(fmi2_import_enumeration_typedef_t*, unsigned int  item);
+
+/** \brief Get an enumeration item name for the given value */
+FMILIB_EXPORT const char* fmi2_import_get_enum_type_value_name(fmi2_import_enumeration_typedef_t* t, int value);
+
+/**
+	\brief Get display unit associated with a real type definition.
+	@return Display unit object of NULL if none was given.
+*/
+FMILIB_EXPORT fmi2_import_display_unit_t* fmi2_import_get_type_display_unit(fmi2_import_real_typedef_t*);
+
+/**
+*  @}
+*/
+#ifdef __cplusplus
+}
+#endif
+#endif
+
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_unit.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_unit.h
new file mode 100644
index 00000000000..6ab809ca0fd
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_unit.h
@@ -0,0 +1,130 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+/** \file fmi2_import_unit.h
+*  \brief Public interface to the FMI import C-library. Handling of variable units.
+*/
+
+#ifndef FMI2_IMPORT_UNIT_H_
+#define FMI2_IMPORT_UNIT_H_
+
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+		/**
+	\addtogroup fmi2_import
+	@{
+	\addtogroup fmi2_import_units Functions for handling unit definitions.
+	@}
+	\addtogroup fmi2_import_units Functions for handling unit definitions.
+	@{
+	*/
+
+/**\name Structures encapsulating unit information */
+/**@{ */
+/** \brief A variable unit defined with a unit defition */
+typedef struct fmi2_xml_unit_t fmi2_import_unit_t;
+/** \brief A display unit. */
+typedef struct fmi2_xml_display_unit_t fmi2_import_display_unit_t;
+/** \brief The list of all the unit definitions in the model */
+typedef struct fmi2_xml_unit_definitions_t fmi2_import_unit_definitions_t;
+/**@} */
+
+/** \brief Get the number of unit definitions. */
+FMILIB_EXPORT unsigned int  fmi2_import_get_unit_definitions_number(fmi2_import_unit_definitions_t*);
+
+/** \brief Get a unit definition */
+FMILIB_EXPORT fmi2_import_unit_t* fmi2_import_get_unit(fmi2_import_unit_definitions_t*, unsigned int  index);
+
+/** \brief Get a unit name */
+FMILIB_EXPORT const char* fmi2_import_get_unit_name(fmi2_import_unit_t*);
+
+/** \brief Get the number of display units associated with this unit */
+FMILIB_EXPORT unsigned int fmi2_import_get_unit_display_unit_number(fmi2_import_unit_t*);
+
+/**
+	\brief Get fmi2_SI_base_units_Num SI base units exponents associated with the unit.
+*/
+FMILIB_EXPORT const int* fmi2_import_get_SI_unit_exponents(fmi2_import_unit_t*);
+
+/**
+	\brief Get factor to the corresponding SI base units.
+*/
+FMILIB_EXPORT double fmi2_import_get_SI_unit_factor(fmi2_import_unit_t*);
+
+/**
+	\brief Get offset to the corresponding SI base units.
+*/
+FMILIB_EXPORT double fmi2_import_get_SI_unit_offset(fmi2_import_unit_t*);
+
+/**
+	\brief Convert a value with respect to the unit to the
+	value with respect to the SI base unit.
+*/
+FMILIB_EXPORT double fmi2_import_convert_to_SI_base_unit(double, fmi2_import_unit_t*);
+
+/**
+	\brief Convert a value with respect to the SI base unit to the
+	value with respect to the unit.
+*/
+FMILIB_EXPORT double fmi2_import_convert_from_SI_base_unit(double, fmi2_import_unit_t*);
+
+/** \brief Get a display unit object by index.
+	@param index The index of display unit to be returned. Must be less than the number returned by fmi2_import_get_unit_display_unit_number()
+*/
+FMILIB_EXPORT fmi2_import_display_unit_t* fmi2_import_get_unit_display_unit(fmi2_import_unit_t*, size_t index);
+
+/**
+	\brief Get unit defition for a display unit.
+*/
+FMILIB_EXPORT fmi2_import_unit_t* fmi2_import_get_base_unit(fmi2_import_display_unit_t*);
+/**
+	\brief Get display unit name
+*/
+FMILIB_EXPORT const char* fmi2_import_get_display_unit_name(fmi2_import_display_unit_t*);
+
+/**
+	\brief Get the "factor" associated with the display unit.
+*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_get_display_unit_factor(fmi2_import_display_unit_t*);
+/**
+	\brief Get the "offset" associated with the display unit.
+*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_get_display_unit_offset(fmi2_import_display_unit_t*);
+
+/**
+	\brief Convert a value measured in "units" to a value measured with "display units"
+	@param value The value to be converted.
+	@param du The display unit object
+	@param isRelativeQuantity specifies if "offset" should be incorporated into conversion
+*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_convert_to_display_unit(fmi2_real_t value , fmi2_import_display_unit_t* du, int isRelativeQuantity);
+
+
+/**
+	\brief Convert a value measured in "display units" to a value measured with "units"
+	@param value The value to be converted.
+	@param du The display unit object
+	@param isRelativeQuantity specifies if "offset" should be incorporated into conversion
+*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_convert_from_display_unit(fmi2_real_t value, fmi2_import_display_unit_t* du, int isRelativeQuantity);
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable.h
new file mode 100644
index 00000000000..7e75a3a0f35
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable.h
@@ -0,0 +1,233 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi2_import_variable.h
+*  \brief Public interface to the FMI import C-library. Handling of model variables.
+*/
+
+#ifndef FMI2_IMPORT_VARIABLE_H_
+#define FMI2_IMPORT_VARIABLE_H_
+
+#include <FMI/fmi_import_context.h>
+
+#include "fmi2_import_type.h"
+#include "fmi2_import_unit.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+		/**
+	\addtogroup fmi2_import
+	@{
+	\addtogroup fmi2_import_variables Functions for handling variable definitions.
+	@}
+	\addtogroup fmi2_import_variables Functions for handling variable definitions.
+	\brief All the functions in this group take a pointer to ::fmi2_import_variable_t as a parameter.
+	A variable pointer may be obtained via a \ref fmi2_import_varlist module or via functions
+	fmi2_import_get_variable_by_name() and fmi2_import_get_variable_by_vr().
+	@{
+	*/
+	/**@name Scalar variable types */
+/**@{ */
+/** \brief General variable type. 
+*
+* This type is convenient to unify all the variable list operations. 
+* 	However, typed variables are needed to support specific attributes.
+*/
+typedef struct fmi2_xml_variable_t fmi2_import_variable_t;
+/** \brief  Opaque real variable */
+typedef struct fmi2_xml_real_variable_t fmi2_import_real_variable_t;
+/** \brief Opaque integer variable */
+typedef struct fmi2_xml_integer_variable_t fmi2_import_integer_variable_t;
+/** \brief Opaque string variable */
+typedef struct fmi2_xml_string_variable_t fmi2_import_string_variable_t;
+/** \brief Opaque enumeration variable */
+typedef struct fmi2_xml_enum_variable_t fmi2_import_enum_variable_t;
+/** \brief Opaque boolean variable */
+typedef struct fmi2_xml_bool_variable_t fmi2_import_bool_variable_t;
+/** \brief List of variables */
+typedef struct fmi2_import_variable_list_t fmi2_import_variable_list_t;
+/**@} */
+
+
+/** \brief Get the variable name */
+FMILIB_EXPORT const char* fmi2_import_get_variable_name(fmi2_import_variable_t*);
+
+/** \brief Get variable description. 
+	@return Description string or empty string ("") if no description in the XML file was given.
+*/
+FMILIB_EXPORT const char* fmi2_import_get_variable_description(fmi2_import_variable_t*);
+
+/** \brief Get variable value reference */
+FMILIB_EXPORT fmi2_value_reference_t fmi2_import_get_variable_vr(fmi2_import_variable_t*);
+
+/**   \brief For scalar variable gives the type definition is present
+	@return Pointer of a type #fmi2_import_variable_typedef_t object or NULL of not present.
+*/
+FMILIB_EXPORT fmi2_import_variable_typedef_t* fmi2_import_get_variable_declared_type(fmi2_import_variable_t*);
+
+/** \brief Get variable base type */
+FMILIB_EXPORT fmi2_base_type_enu_t fmi2_import_get_variable_base_type(fmi2_import_variable_t*);
+
+/** \brief Check if the variable has "start" attribute */
+FMILIB_EXPORT int   fmi2_import_get_variable_has_start(fmi2_import_variable_t*);
+
+/** \brief Get variability attribute */
+FMILIB_EXPORT fmi2_variability_enu_t fmi2_import_get_variability(fmi2_import_variable_t*);
+
+/** \brief Get causality attribute */
+FMILIB_EXPORT fmi2_causality_enu_t fmi2_import_get_causality(fmi2_import_variable_t*);
+
+/** \brief Get initial attribute */
+FMILIB_EXPORT fmi2_initial_enu_t fmi2_import_get_initial(fmi2_import_variable_t* );
+
+/** 
+    \brief Get the variable that holds the previous value of this variable, if defined.
+
+    @return If this variable is a discrete-time state, return the variable holds its previous value;
+            NULL otherwise.
+*/
+FMILIB_EXPORT fmi2_import_variable_t* fmi2_import_get_previous(fmi2_import_variable_t* v);
+
+/** \brief Get the canHandleMultipleSetPerTimeInstant flag for a variable.
+
+	@return For inputs: If false, then only one fmiSetXXX call is allowed at
+    one super dense time instant. In other words, this input is not allowed to
+    appear in an algebraic loop.
+*/
+FMILIB_EXPORT fmi2_boolean_t fmi2_import_get_canHandleMultipleSetPerTimeInstant(fmi2_import_variable_t* v);
+
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi2_import_real_variable_t* fmi2_import_get_variable_as_real(fmi2_import_variable_t*);
+
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi2_import_integer_variable_t* fmi2_import_get_variable_as_integer(fmi2_import_variable_t*);
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi2_import_enum_variable_t* fmi2_import_get_variable_as_enum(fmi2_import_variable_t*);
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi2_import_string_variable_t* fmi2_import_get_variable_as_string(fmi2_import_variable_t*);
+/** \brief Cast general variable to a one with the specific type 
+	
+	@return Typed object or NULL if base type does not match
+*/
+FMILIB_EXPORT fmi2_import_bool_variable_t* fmi2_import_get_variable_as_boolean(fmi2_import_variable_t*);
+
+/** 
+	\brief Get the variable "relativeQuantity" attribute. 
+	@return The "relativeQuantity" attribute as specified in the XML file. False if undefined.
+*/
+FMILIB_EXPORT fmi2_boolean_t fmi2_import_get_real_variable_relative_quantity(fmi2_import_real_variable_t* v);
+
+/** 
+	\brief Get the variable "unbounded" attribute. 
+	@return The "unbounded" attribute as specified in the XML file. False if undefined.
+*/
+FMILIB_EXPORT fmi2_boolean_t fmi2_import_get_real_variable_unbounded(fmi2_import_real_variable_t* v);
+
+/** 
+	\brief Get the variable start attribute. 
+
+	@return The "start" attribute as specified in the XML file or variable nominal value.
+*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_get_real_variable_start(fmi2_import_real_variable_t* v);
+
+/** 
+    \brief Get the variable that this is a derivative of, if defined.
+
+    @return If this variable is a derivative, return the variable that it is a derivative of;
+            NULL otherwise.
+*/
+FMILIB_EXPORT fmi2_import_real_variable_t* fmi2_import_get_real_variable_derivative_of(fmi2_import_real_variable_t* v);
+
+/** \brief Get the reinit flag for a real variable.
+
+	@return True if the real variable may change value at events.
+*/
+FMILIB_EXPORT fmi2_boolean_t fmi2_import_get_real_variable_reinit(fmi2_import_real_variable_t* v);
+
+/** \brief Get maximum value for the variable
+
+	@return Either the value specified in the XML file or DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_get_real_variable_max(fmi2_import_real_variable_t* v);
+
+/** \brief Get minimal value for the variable.
+
+	@return Either the value specified in the XML file or negated DBL_MAX as defined in <float.h>
+*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_get_real_variable_min(fmi2_import_real_variable_t* v);
+
+/** \brief Get nominal value for the variable*/
+FMILIB_EXPORT fmi2_real_t fmi2_import_get_real_variable_nominal(fmi2_import_real_variable_t* v);
+
+/** \brief Get "quantity" attribute if defined, else NULL-pointer. */
+FMILIB_EXPORT fmi2_string_t fmi2_import_get_real_variable_quantity(fmi2_import_real_variable_t* v);
+
+/** \brief Get associated "unit" object if any */
+FMILIB_EXPORT fmi2_import_unit_t* fmi2_import_get_real_variable_unit(fmi2_import_real_variable_t* v);
+
+/** \brief Get associated "display unit" object if any */
+FMILIB_EXPORT fmi2_import_display_unit_t* fmi2_import_get_real_variable_display_unit(fmi2_import_real_variable_t* v);
+
+/** \brief Get start value for the variable */
+FMILIB_EXPORT const char* fmi2_import_get_string_variable_start(fmi2_import_string_variable_t* v);
+
+/** \brief Get start value for the variable */
+FMILIB_EXPORT fmi2_boolean_t fmi2_import_get_boolean_variable_start(fmi2_import_bool_variable_t* v);
+
+/** \brief Get "quantity" attribute if defined, else NULL-pointer. */
+FMILIB_EXPORT fmi2_string_t fmi2_import_get_integer_variable_quantity(fmi2_import_integer_variable_t* v);
+/** \brief Get start value for the variable*/
+FMILIB_EXPORT int fmi2_import_get_integer_variable_start(fmi2_import_integer_variable_t* v);
+/** \brief Get minimal value for the variable */
+FMILIB_EXPORT int fmi2_import_get_integer_variable_min(fmi2_import_integer_variable_t* v);
+/** \brief Get max value for the variable */
+FMILIB_EXPORT int fmi2_import_get_integer_variable_max(fmi2_import_integer_variable_t* v);
+
+/** \brief Get "quantity" attribute if defined, else NULL-pointer. */
+FMILIB_EXPORT fmi2_string_t fmi2_import_get_enum_variable_quantity(fmi2_import_enum_variable_t* v);
+/** \brief Get start value for the variable*/
+FMILIB_EXPORT int fmi2_import_get_enum_variable_start(fmi2_import_enum_variable_t* v);
+/** \brief Get minimal value for the variable */
+FMILIB_EXPORT int fmi2_import_get_enum_variable_min(fmi2_import_enum_variable_t* v);
+/** \brief Get max value for the variable */
+FMILIB_EXPORT int fmi2_import_get_enum_variable_max(fmi2_import_enum_variable_t* v);
+
+/** \brief Get the variable alias kind*/
+FMILIB_EXPORT fmi2_variable_alias_kind_enu_t fmi2_import_get_variable_alias_kind(fmi2_import_variable_t*);
+
+/** \brief Get the original index in xml of the variable */
+FMILIB_EXPORT size_t fmi2_import_get_variable_original_order(fmi2_import_variable_t* v);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable_list.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable_list.h
new file mode 100644
index 00000000000..11444c4dfa8
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_import_variable_list.h
@@ -0,0 +1,130 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+
+
+/** \file fmi2_import_variable_list.h
+*  \brief Public interface to the FMI XML C-library. Handling of variable lists.
+*/
+
+#ifndef FMI2_IMPORT_VARIABLELIST_H_
+#define FMI2_IMPORT_VARIABLELIST_H_
+
+ #include "fmi2_import_variable.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ \addtogroup  fmi2_import
+ @{
+	\defgroup  fmi2_import_varlist Handling of variable lists
+ @}
+*/
+
+/** \addtogroup  fmi2_import_varlist
+*  \brief Variable lists are provided to handle sets of variables.
+*
+* Note that variable lists are allocated dynamically and must be freed when not needed any longer.
+ @{ 
+*/
+
+/** \brief Allocate an empty list */
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_alloc_variable_list(fmi2_import_t* fmu, size_t size);
+
+/**  \brief Free a variable list. Note that variable lists are allocated dynamically and must be freed when not needed any longer 
+	\param vl A variable list.
+*/
+FMILIB_EXPORT void fmi2_import_free_variable_list(fmi2_import_variable_list_t* vl);
+
+/** \brief Make a copy of the list.
+	\param vl A variable list.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_clone_variable_list(fmi2_import_variable_list_t* vl);
+
+/** \brief  Get number of variables in a list */
+FMILIB_EXPORT size_t  fmi2_import_get_variable_list_size(fmi2_import_variable_list_t* vl);
+
+/** \brief  Get a pointer to the list of the value references for all the variables */
+FMILIB_EXPORT const fmi2_value_reference_t* fmi2_import_get_value_referece_list(fmi2_import_variable_list_t* vl);
+
+/** \brief Get a single variable from the list*/
+FMILIB_EXPORT fmi2_import_variable_t* fmi2_import_get_variable(fmi2_import_variable_list_t* vl, size_t  index);
+
+/** \name Operations on variable lists. Every operation creates a new list. 
+@{
+*/
+/** \brief Select sub-lists.
+\param vl A variable list.
+\param fromIndex Zero based start index, inclusive.
+\param toIndex Zero based end index, inclusive.
+\return A sublist. NULL is returned if toIndex is less than fromIndex or is larger than the list size or if memory allocation failed.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_get_sublist(fmi2_import_variable_list_t* vl, size_t  fromIndex, size_t  toIndex);
+
+/** \brief Callback function typedef for the fmiFilterVariables. 
+
+The function should return 0 to prevent a variable from coming to the output list. */
+typedef int (*fmi2_import_variable_filter_function_ft)(fmi2_import_variable_t*vl, void * data);
+
+/** \brief Call the provided 'filter' function on every variable in the list and create a new list.
+  
+\param vl A variable list.
+\param filter A filter function according to ::fmi2_import_variable_filter_function_ft.
+\param context A parameter to be forwarded to the filter function.
+ @return A sub-list with the variables for which filter returned non-zero value. */
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_filter_variables(fmi2_import_variable_list_t* vl, fmi2_import_variable_filter_function_ft filter, void* context);
+
+/** \brief Create a new variable list by concatenating two lists.
+  
+\param a A variable list.
+\param b A variable list.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_join_var_list(fmi2_import_variable_list_t* a, fmi2_import_variable_list_t* b);
+
+
+/** \brief Append a variable to the variable list.
+  
+\param vl A variable list.
+\param v A variable.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_append_to_var_list(fmi2_import_variable_list_t* vl, fmi2_import_variable_t* v);
+
+/** \brief Prepend a variable to the variable list.
+  
+\param vl A variable list.
+\param v A variable.
+*/
+FMILIB_EXPORT fmi2_import_variable_list_t* fmi2_import_prepend_to_var_list(fmi2_import_variable_list_t* vl, fmi2_import_variable_t* v);
+
+/** \brief Add a variable to a variable list.
+  
+\param vl A variable list.
+\param v A variable.
+*/
+FMILIB_EXPORT jm_status_enu_t fmi2_import_var_list_push_back(fmi2_import_variable_list_t* vl, fmi2_import_variable_t* v);
+/**
+  @}
+ */
+
+/**
+  @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_types.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_types.h
new file mode 100644
index 00000000000..5fa11fe7194
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_types.h
@@ -0,0 +1,80 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI2_TYPES_H_
+#define FMI2_TYPES_H_
+/** \file fmi2_types.h
+	Transformation of the standard FMI type names into fmi2_ prefixed.
+*/
+/**
+	\addtogroup jm_utils
+	@{
+		\addtogroup fmi2_utils
+	@}
+*/
+
+/**	\addtogroup fmi2_utils Functions and types supporting FMI 2.0 processing.
+	@{
+*/
+/** \name Renaming of typedefs 
+@{*/
+#define fmi2Component fmi2_component_t
+#define fmi2ComponentEnvironment fmi2_component_environment_t
+#define fmi2FMUstate fmi2_FMU_state_t
+#define fmi2ValueReference fmi2_value_reference_t
+#define fmi2Real fmi2_real_t
+#define fmi2Integer fmi2_integer_t
+#define fmi2Boolean fmi2_boolean_t
+#define fmi2Char fmi2_char_t
+#define fmi2String fmi2_string_t
+#define fmi2Byte fmi2_byte_t
+
+/** @}*/
+/* Standard FMI 2.0 types */
+#ifdef fmi2TypesPlatform_h
+#undef fmi2TypesPlatform_h
+#endif
+#include <FMI2/fmi2TypesPlatform.h>
+#undef fmi2TypesPlatform_h
+
+/** FMI platform name constant string.*/
+static const char * fmi2_get_types_platform(void) {
+	return fmi2TypesPlatform;
+}
+
+#undef fmi2TypesPlatform
+
+/** FMI boolean constants.*/
+typedef enum {
+	fmi2_true=fmi2True,
+	fmi2_false=fmi2False
+} fmi2_boolean_enu_t;
+
+#undef fmi2True
+#undef fmi2False
+
+/**	
+	@}
+*/
+
+#undef fmi2Component
+#undef fmi2ValueReference
+#undef fmi2Real
+#undef fmi2Integer
+#undef fmi2Boolean
+#undef fmi2String
+#undef fmi2UndefinedValueReference
+
+#endif /* End of header file FMI2_TYPES_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_xml_callbacks.h b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_xml_callbacks.h
new file mode 100644
index 00000000000..6ec5f0ad8cf
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/FMI2/fmi2_xml_callbacks.h
@@ -0,0 +1,80 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef FMI2_XML_CALLBACKS_H
+#define FMI2_XML_CALLBACKS_H
+
+#include <fmilib_config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/** \file fmi2_xml_callbacks.h Definition of ::fmi2_xml_callbacks_t and supporting functions
+	*
+	* \addtogroup fmi2_utils
+	* @{
+		\addtogroup fmi2_xml_callbacks
+	* @}
+*/
+/** \addtogroup fmi2_xml_callbacks Definition of XML callbacks struct
+* @{  */
+typedef struct fmi2_xml_callbacks_t fmi2_xml_callbacks_t;
+
+/** \name XML handling callbacks
+* @{ 
+*/
+/** \brief Handle start of an XML element within tool annotation in a SAX parser.
+*
+*	@param context as specified when setting up the callbacks,
+*   @param parentName - tool name as given by name attibute to the Tool elelent,
+*   @param parent - NULL for model level annotations; fmi2_import_variable_t * variable pointer for variable annotations. 
+*   @param elm - name of the element, 
+*   @param attr - attributes (names and values).
+*  The function should return 0 on success or error code on exit (in which case parsing will be aborted).
+*/
+typedef int (*fmi2_xml_element_start_handle_ft)(	void *context, const char *toolName, void *parent, const char *elm, const char **attr);
+
+/** \brief Handle data of an XML element within tool annotation in a SAX parser.
+*
+*  @param context as specified when setting up the callbacks
+*  @param s - data string
+*  @param len - length of the data.
+*  The function should return 0 on success or error code on exit (in which case parsing will be aborted).
+*/
+typedef int (*fmi2_xml_element_data_handle_ft)(void* context, const char *s, int len);
+
+/** \brief Handle end of an XML element within tool annotation in a SAX parser.
+*
+*  @param context as specified when setting up the callbacks
+*  @param elm - name of the element.
+*  The function should return 0 on success or error code on exit (in which case parsing will be aborted).
+*/
+typedef int (*fmi2_xml_element_end_handle_ft)(void *context, const char *elm);
+
+/** \brief XML callbacks are used to process parts of XML that are not handled by the library */
+struct fmi2_xml_callbacks_t {
+	fmi2_xml_element_start_handle_ft startHandle; /** \brief Handle start of an XML element within tool annotation in a SAX parser. */
+	fmi2_xml_element_data_handle_ft  dataHandle;  /** \brief Handle data of an XML element within tool annotation in a SAX parser.  */
+	fmi2_xml_element_end_handle_ft   endHandle;   /** \brief Handle end of an XML element within tool annotation in a SAX parser. */
+	void* context;	/** \breif Context ponter is forwarded to the handle functions. */
+};
+/* @}
+*/
+
+#ifdef __cplusplus
+}
+#endif
+/* JM_CONTEXT_H */
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_callbacks.h b/Buildings/Resources/src/fmi-library/include/JM/jm_callbacks.h
new file mode 100644
index 00000000000..0468eeb4eac
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_callbacks.h
@@ -0,0 +1,225 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef JM_CALLBACKS_H
+#define JM_CALLBACKS_H
+#include <stddef.h>
+#include <stdarg.h>
+
+#include <fmilib_config.h>
+
+#include "jm_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/** \file jm_callbacks.h Definition of ::jm_callbacks and supporting functions
+	*
+	* \addtogroup jm_utils
+	* @{
+		\addtogroup jm_callbacks
+	* @}
+*/
+/** \addtogroup jm_callbacks Definition of callbacks struct and supporting functions
+* @{  */
+typedef struct jm_callbacks jm_callbacks;
+
+/** \name Memory management callbacks
+* jm_malloc_f, jm_realloc_f, jm_calloc_f, jm_free_f function 
+* types correspond to the standard C memory management functions
+* @{ 
+*/
+/** \brief Allocation function type. */
+typedef jm_voidp (*jm_malloc_f)(size_t size);
+
+/** \brief Re-allocation function type. */
+typedef jm_voidp (*jm_realloc_f)(void *ptr, size_t size);
+
+/** \brief Zero-initialized allocation function type. */
+typedef jm_voidp (*jm_calloc_f)(size_t numitems, size_t itemsize);
+
+/** \brief Free memory function type. */
+typedef void (*jm_free_f)(jm_voidp p);
+/** @}
+*/
+
+/**
+*  
+* \brief Logger callback type.
+*
+* The logger callback is used to report errors. Note that this function is
+* by default only used in FMI standard intependent code (e.g., fmi_import_get_fmi_version()).
+* Since logging functions are different between different standard versions separate
+* logging functions are necessary for each fmi implementation.\n
+* Defaults are provided for each standard. 
+*/
+typedef void (*jm_logger_f)(jm_callbacks* c, jm_string module, jm_log_level_enu_t log_level, jm_string message);
+
+/** \brief Maximum message size that can be stored in the ::jm_callbacks struct */
+#define JM_MAX_ERROR_MESSAGE_SIZE 2000
+
+/** \brief The callbacks struct is sent to all the modules in the library */
+struct jm_callbacks {
+	/** \brief Allocate non-initialized memory */
+	jm_malloc_f malloc; 
+	/** \brief Allocate zero initialized memory */
+	jm_calloc_f calloc; 
+	/** \brief Re-allocate memory */
+	jm_realloc_f realloc; 
+	/** \brief Free-allocated memory */
+	jm_free_f free;        
+	/** \brief Logging callback */
+	jm_logger_f logger;		
+	/** \brief Logging level */
+	jm_log_level_enu_t log_level; 
+	/** \brief Arbitrary context pointer passed to the logger function  */
+	jm_voidp context;	
+	/** \brief The buffer used along with jm_get_last_error() */
+	char errMessageBuffer[JM_MAX_ERROR_MESSAGE_SIZE]; 
+};
+
+/**
+* \brief Get the last log message produced by the library.
+*
+* An alternative way to get error information is to use jm_get_last_error(). This is only meaningful
+* if logger function is not present.
+*/
+static jm_string jm_get_last_error(jm_callbacks* cb) {return cb->errMessageBuffer; }
+
+/**
+ \brief Clear the last generated log message.
+*/
+static void jm_clear_last_error(jm_callbacks* cb) { cb->errMessageBuffer[0] = 0; }
+
+/**
+\brief Set the structure to be returned by jm_get_default_callbacks().
+
+@param c - a pointer to initialized struct to be used as default later on. If this is NULL
+	library default implementation will be used.
+*/
+FMILIB_EXPORT
+void jm_set_default_callbacks(jm_callbacks* c);
+
+/**
+\brief Get default callbacks. The function never returns NULL.
+\return Default ::jm_callbacks struture. Either the one supplied by the library of the one set with jm_set_default_callbacks().
+*/
+FMILIB_EXPORT
+jm_callbacks* jm_get_default_callbacks(void);
+
+/**
+\brief The default logger implementation prints messages to stderr.
+*/
+FMILIB_EXPORT
+void jm_default_logger(jm_callbacks* c, jm_string module, jm_log_level_enu_t log_level, jm_string message);
+
+/**
+\brief Send a message to the logger function.
+	@param cb - callbacks to be used for reporting;
+	@param module - a name of reporting module;
+	@param log_level - message kind;
+	@param fmt - "printf" type of format followed by the arguments.
+*/
+FMILIB_EXPORT
+void jm_log(jm_callbacks* cb, const char* module, jm_log_level_enu_t log_level, const char* fmt, ...);
+
+/** \copydoc jm_log()
+	@param ap - variable size argument list.
+*/
+FMILIB_EXPORT
+void jm_log_v(jm_callbacks* cb, const char* module, jm_log_level_enu_t log_level, const char* fmt, va_list ap);
+
+/** \brief Send a fatal error message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_fatal_v(jm_callbacks* cb, const char* module, const char* fmt, va_list ap);
+/** \brief Send a fatal error message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_fatal(jm_callbacks* cb, const char* module, const char* fmt, ...);
+
+/** \brief Send a error message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_error_v(jm_callbacks* cb, const char* module, const char* fmt, va_list ap);
+
+/** \brief Send a error message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_error(jm_callbacks* cb, const char* module, const char* fmt, ...);
+
+/** \brief Send a warning message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_warning_v(jm_callbacks* cb, const char* module, const char* fmt, va_list ap);
+
+/** \brief Send a warning message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_warning(jm_callbacks* cb, const char* module, const char* fmt, ...);
+
+/** \brief Send an info message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_info_v(jm_callbacks* cb, const char* module, const char* fmt, va_list ap);
+/** \brief Send an info message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_info(jm_callbacks* cb, const char* module, const char* fmt, ...);
+
+/** \brief Send a verbose message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_verbose_v(jm_callbacks* cb, const char* module, const char* fmt, va_list ap);
+/** \brief Send a verbose message to the logger function. See jm_log() for details.
+*/
+FMILIB_EXPORT
+void jm_log_verbose(jm_callbacks* cb, const char* module, const char* fmt, ...);
+
+#ifdef FMILIB_ENABLE_LOG_LEVEL_DEBUG
+/** \brief Send a debug message to the logger function. See jm_log() for details.
+
+	Note that the function is only active if the library is configure with FMILIB_ENABLE_LOG_LEVEL_DEBUG=ON
+*/
+FMILIB_EXPORT
+void jm_log_debug_v(jm_callbacks* cb, const char* module, const char* fmt, va_list ap);
+/** \brief Send a debug message to the logger function. See jm_log() for details.
+
+	Note that the function is only active if the library is configure with FMILIB_ENABLE_LOG_LEVEL_DEBUG=ON
+*/
+FMILIB_EXPORT
+void jm_log_debug(jm_callbacks* cb, const char* module, const char* fmt, ...);
+#else
+/** \brief Send a debug message to the logger function. See jm_log() for details.
+
+	Note that the function is only active if the library is configure with FMILIB_ENABLE_LOG_LEVEL_DEBUG=ON
+*/
+static void jm_log_debug_v(jm_callbacks* cb, const char* module, const char* fmt, va_list ap) {}
+/** \brief Send a debug message to the logger function. See jm_log() for details.
+
+	Note that the function is only active if the library is configure with FMILIB_ENABLE_LOG_LEVEL_DEBUG=ON
+*/
+static void jm_log_debug(jm_callbacks* cb, const char* module, const char* fmt, ...) {}
+#endif
+
+
+/* @}
+*/
+
+#ifdef __cplusplus
+}
+#endif
+/* JM_CONTEXT_H */
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_named_ptr.h b/Buildings/Resources/src/fmi-library/include/JM/jm_named_ptr.h
new file mode 100644
index 00000000000..150e538c4f0
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_named_ptr.h
@@ -0,0 +1,100 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef JM_NAMED_PTR_H
+#define JM_NAMED_PTR_H
+
+#include "jm_vector.h"
+#include "jm_callbacks.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \file jm_named_ptr.h Definition of ::jm_named_ptr and supporting functions
+	*
+	* \addtogroup jm_utils
+	* @{
+		\addtogroup jm_named_ptr
+	* @}
+*/
+/** \addtogroup jm_named_ptr Named objects
+ @{
+*/
+/** \brief Name and object pointer pair */
+typedef struct jm_named_ptr jm_named_ptr;
+
+/** \brief Name and object pointer pair */
+struct jm_named_ptr {
+    jm_voidp ptr; /** \brief Object pointer */
+    jm_string name; /** \brief Name string */
+};
+
+/**
+\brief Allocate memory for the object and the name string and sets pointer to it packed together with the name pointer.
+ \param name Name for the object.
+ \param size Size of the data structure.
+ \param nameoffset Offset of the name field within the data structure.
+ \param c Callbacks to be used for memory allocation.
+
+The function jm_named_alloc() is intended for types defined as:
+\code
+struct T { 
+    < some data fields> 
+    char name[1]; 
+} 
+\endcode
+The "name" is copied into the allocated memory.
+*/
+jm_named_ptr jm_named_alloc(jm_string name, size_t size, size_t nameoffset, jm_callbacks* c);
+
+/** \brief Same as jm_named_alloc() but name is given as a jm_vector(char) pointer */
+jm_named_ptr jm_named_alloc_v(jm_vector(char)* name, size_t size, size_t nameoffset, jm_callbacks* c);
+
+/** \brief Free the memory allocated for the object pointed by jm_named_ptr */
+static void jm_named_free(jm_named_ptr np, jm_callbacks* c) { c->free(np.ptr); }
+
+jm_vector_declare_template(jm_named_ptr)
+
+/** \brief Helper to construct comparison operation */
+#define jm_diff_named(a, b) strcmp(a.name,b.name)
+
+jm_define_comp_f(jm_compare_named, jm_named_ptr, jm_diff_named)
+
+/** \brief Release the data allocated by the items
+  in a vector and then clears the memory used by the vector as well.
+
+  This should be used for vectors initialized with jm_vector_init.
+*/
+static void jm_named_vector_free_data(jm_vector(jm_named_ptr)* v) {
+    jm_vector_foreach_c(jm_named_ptr)(v, (void (*)(jm_named_ptr, void*))jm_named_free,v->callbacks);
+    jm_vector_free_data(jm_named_ptr)(v);
+}
+
+/** \brief Release the data allocated by the items
+  in a vector and then clears the memory used by the vector as well.
+
+  This should be used for vectors created with jm_vector_alloc.
+*/
+static void jm_named_vector_free(jm_vector(jm_named_ptr)* v) {
+    jm_vector_foreach_c(jm_named_ptr)(v,(void (*)(jm_named_ptr, void*))jm_named_free,v->callbacks);
+    jm_vector_free(jm_named_ptr)(v);
+}
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+/* JM_NAMED_PTR_H */
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_portability.h b/Buildings/Resources/src/fmi-library/include/JM/jm_portability.h
new file mode 100644
index 00000000000..82e472a4872
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_portability.h
@@ -0,0 +1,144 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef JM_PORTABILITY_H_
+#define JM_PORTABILITY_H_
+#include <fmilib_config.h>
+#include "jm_callbacks.h"
+
+/* Include platform dependent headers */
+#if defined(_MSC_VER) || defined(WIN32) || defined(__MINGW32__)
+#include <windows.h> /* Microsoft Windows API */
+#define DLL_HANDLE HANDLE
+#else
+#define DLL_HANDLE void*
+#include <dlfcn.h>  /* Standard POSIX/UNIX API */
+#endif
+
+#include "jm_types.h"
+/** \file jm_portability.h
+	Handling platform specific defines and functions.
+*/
+/**
+	\addtogroup jm_utils
+	@{
+		\addtogroup jm_portability
+	@}
+*/
+/** \addtogroup jm_portability Handling platform specific defines and functions
+@{*/
+/** \brief Load a dll/so library into the process and return a handle. */
+DLL_HANDLE		jm_portability_load_dll_handle		(const char* dll_file_path);
+
+/** \brief Unload a Dll and release the handle*/
+jm_status_enu_t jm_portability_free_dll_handle		(DLL_HANDLE dll_handle);
+
+/** \brief A function pointer as returned when DLL symbol is loaded.*/
+#ifdef WIN32
+#define jm_dll_function_ptr FARPROC
+#else
+typedef void* jm_dll_function_ptr; 
+#endif
+
+/** \brief Find a function in the Dll and return a function pointer */
+jm_status_enu_t jm_portability_load_dll_function	(DLL_HANDLE dll_handle, char* dll_function_name, jm_dll_function_ptr* dll_function_ptrptr);
+
+/** \brief Return error associated with Dll handling */
+char* jm_portability_get_last_dll_error	(void);
+
+/** \brief Get current working directory name */
+jm_status_enu_t jm_portability_get_current_working_directory(char* buffer, size_t len);
+
+/** \brief Set current working directory*/
+jm_status_enu_t jm_portability_set_current_working_directory(const char* cwd);
+
+/** \brief Get system-wide temporary directory */
+const char* jm_get_system_temp_dir();
+
+/**
+    \brief Create a uniquely named temporary directory.
+    \param cb - callbacks for memory allocation and logging. Default callbacks
+            are used if this parameter is NULL.
+    \param tmplt Directory name template ending with XXXXXX. The template is
+            modified by the call.
+    \return A pointer to the modified template. The function returns NULL if
+            the template does not end with XXXXXX, or if the directory could
+            not be created.
+*/
+char *jm_mkdtemp(jm_callbacks *cb, char *tmplt);
+
+
+/** 
+	\brief Get absolute path to an existing directory
+	\param cb - callbacks for memory allocation and logging. Default callbacks are used if this parameter is NULL.
+	\param dir - path to a directory (relative or absolute).
+	\param outPath - buffer for storing the directory
+	\param len - of the buffer (if size is larger than FILENAME_MAX + 1 then the path will always fit in)
+	\return Pointer to outPath on success, 0 - on error in which case a message is send to the logger.	
+*/
+char* jm_get_dir_abspath(jm_callbacks* cb, const char* dir, char* outPath, size_t len);
+
+/** 
+	\brief Create a unique temporary directory
+	\param cb - callbacks for memory allocation and logging. Default callbacks are used if this parameter is NULL.
+	\param systemTempDir - directory where the temp dir should be located both absolute and relative path are accepted.
+				System-wide directory is used if this parameter is NULL.
+	\param tempPrefix - File name template prefix used when creating temporaty directories. "jm" is used if this is NULL.
+	\return A pointer to the temporary directory name (absolute path, no terminating '/'). Caller is responsible for freeing the memory.
+		The function returns NULL if there were errors in which case a message is send to the logger.	
+*/
+char* jm_mk_temp_dir(jm_callbacks* cb, const char* systemTempDir, const char* tempPrefix);
+
+/** 
+	\brief Create a file:// URL from absolute path
+	\param cb - callbacks for memory allocation and logging. Default callbacks are used if this parameter is NULL.
+	\param absPath - absolute path to be converted into the URL
+	\return A pointer to the URL. Caller is responsible for freeing the memory.
+		The function returns NULL if there were errors in which case a message is send to the logger.	
+*/
+char* jm_create_URL_from_abs_path(jm_callbacks* cb, const char* absPath);
+
+/**
+	\brief Make a directory.
+*/
+jm_status_enu_t jm_mkdir(jm_callbacks* cb, const char* dir);
+
+/**
+\brief Remove directory and all it contents.
+*/
+jm_status_enu_t jm_rmdir(jm_callbacks* cb, const char* dir);
+
+/**
+\brief C89 compatible implementation of C99 vsnprintf. 
+*/
+FMILIB_EXPORT
+int jm_vsnprintf(char * str, size_t size, const char * fmt, va_list al);
+
+/**
+\brief C89 compatible implementation of C99 snprintf. 
+*/
+FMILIB_EXPORT
+int jm_snprintf(char * str, size_t size, const char * fmt, ...);
+
+#ifdef HAVE_VA_COPY
+#define JM_VA_COPY va_copy
+#elif defined(HAVE___VA_COPY)
+#define JM_VA_COPY __va_copy
+#elif defined(WIN32)
+#define JM_VA_COPY(dest,src) dest=src
+#endif
+
+/*@}*/
+#endif /* End of header file JM_PORTABILITY_H_ */
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_stack.h b/Buildings/Resources/src/fmi-library/include/JM/jm_stack.h
new file mode 100644
index 00000000000..bf3cf9f690d
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_stack.h
@@ -0,0 +1,192 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef jm_stack_h_
+#define jm_stack_h_
+
+#include "jm_vector.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \file jm_named_ptr.h Definition of ::jm_named_ptr and supporting functions
+	*
+	* \addtogroup jm_utils
+	* @{
+	*    \defgroup jm_stack_grp  A basic stack
+	* @}
+	*/
+
+	/** \addtogroup jm_stack_grp
+	 @{
+	*/
+/** 
+	\brief A basic stack of items.
+	
+	Stack is implemented on top of jm_vector right now. There is a couple of extra methonds that are convenient.
+
+  */
+#define jm_stack(T) jm_mangle(jm_stack, T)
+
+/**
+*  \brief  Allocates a stack with the given reserved memory
+*  \code
+*  jm_stack(T)* jm_stack_alloc(T)(size_t capacity,jm_callbacks*c );
+*  \endcode
+*  @param capacity - initial stack capacity, can be 0
+*  @param c - jm_callbacks callbacks, can be zero
+*  @return Newly allocated stack
+*/
+#define jm_stack_alloc(T) jm_mangle(jm_stack_alloc, T)
+
+/** 
+*  \brief Release memory allocated for a stack.
+\code
+extern void jm_stack_free(T)(jm_stack(T)* a); 
+\endcode
+*/
+#define jm_stack_free(T) jm_mangle(jm_stack_free, T)
+
+/**
+*  \brief Initializes a #jm_stack allocated on stack.
+*  \param a - pointer to the stack to be initialized;
+*  \param c - ::jm_callbacks callbacks, can be zero
+*
+*  \code
+void jm_stack_init(T)(jm_stack(T)* a, jm_callbacks* c)
+  \endcode
+*/
+#define jm_stack_init(T) jm_mangle(jm_stack_init, T)
+
+/**
+*  \brief  Releases memory allocated for stack data.
+*
+*  This only needs to be called both for stack allocated #jm_stack structs.
+*\code
+inline void jm_stack_free_data(T)(jm_stack(T)* a)
+\endcode
+*\param a - pointer to the stack.
+*
+*/
+#define jm_stack_free_data(T) jm_mangle(jm_stack_free_data, T)
+
+/**
+\brief  Get the number of elements in the stack.
+
+\code
+inline size_t jm_stack_get_size(T)(jm_stack(T)* a)
+\endcode
+*/
+#define jm_stack_get_size(T) jm_mangle(jm_stack_get_size, T)
+
+/**
+*  \brief Preallocate memory for the stack (to speed up consequent push).
+*
+*  \return The actually reserved space. Can be smaller than "capacity" if memory allocation failed.
+*  Can be larger than "capacity" if more memory was previously allocated.
+*  size_t jm_stack_reserve(T)(jm_stack(T)* a, size_t capacity)
+*/
+#define jm_stack_reserve(T) jm_mangle(jm_stack_reserve, T)
+
+/**
+*  \brief Put an element on the stack.
+*  \return A pointer to the inserted element or zero pointer if failed.
+*
+\code
+T* jm_stack_push_back(jm_stack(T)* a, T item);
+\endcode
+*/
+#define jm_stack_push(T) jm_mangle(jm_stack_push, T)
+
+/**
+  jm_stack_is_empty returns 1 if the stack is empty and 0 otherwize.
+  int jm_stack_is_empty(jm_stack(T)*)
+  */
+#define jm_stack_is_empty(T) jm_mangle(jm_stack_is_empty, T)
+
+/**
+*  jm_stack_pop gets the stack head and moves to the next element. Popping an empty stack gives assertion failure.
+*  T jm_stack_pop(jm_stack(T)* a)
+*/
+#define jm_stack_pop(T) jm_mangle(jm_stack_pop, T)
+
+/**
+*  jm_stack_top gets the stack top. Call on an empty stack gives assertion failure.
+*  T jm_stack_top(jm_stack(T)* a)
+*/
+#define jm_stack_top(T) jm_mangle(jm_stack_top, T)
+
+/**
+*  jm_stack_foreach calls f for each element in the stack. "data" parameter
+*  is forwarded to the function as the second argument.
+*  void jm_stack_foreach(T)(jm_stack(T)* a, void (*f)(T, void*), void * data)
+*/
+#define jm_stack_foreach(T) jm_mangle(jm_stack_foreach, T)
+
+
+/** minimal number of items always allocated for the stack */
+#define JM_STACK_MINIMAL_CAPACITY JM_VECTOR_MINIMAL_CAPACITY
+
+/** maximum memory chunk (in items) to be allocated in push. */
+#define JM_STACK_MAX_MEMORY_CHUNK JM_VECTOR_MAX_MEMORY_CHUNK
+
+/** Declare stack for the specific type. */
+#define jm_stack_declare_template(T)		\
+typedef jm_vector(T) jm_stack(T);					\
+ \
+static jm_stack(T)* jm_stack_alloc(T)(size_t capacity,jm_callbacks* c) { return jm_vector_alloc(T)(0, capacity, c); }	\
+    \
+static void jm_stack_free(T)(jm_stack(T) * a) { jm_vector_free(T)(a); } \
+    \
+static void jm_stack_init(T)(jm_stack(T)* a, jm_callbacks* c) { jm_vector_init(T)(a,0,c); }	\
+\
+static void jm_stack_free_data(T)(jm_stack(T)* a) { jm_vector_free_data(T)(a); } \
+\
+static size_t jm_stack_get_size(T)(jm_stack(T)* a) { return jm_vector_get_size(T)(a); } \
+\
+static size_t jm_stack_reserve(T)(jm_stack(T)* a, size_t capacity) { return jm_vector_reserve(T)(a, capacity);  } \
+    \
+static T* jm_stack_push(T)(jm_stack(T)* a, T item) { return jm_vector_push_back(T)(a, item); }\
+    \
+static int jm_stack_is_empty(T)(jm_stack(T)* a) { return ((jm_stack_get_size(T)(a) > 0)? 0:1); } \
+    \
+static T jm_stack_top(T)(jm_stack(T)* a) { \
+    assert(!jm_stack_is_empty(T)(a)); \
+    return jm_vector_get_item(T)(a,jm_vector_get_size(T)(a)-1) ; \
+} \
+            \
+static T jm_stack_pop(T)(jm_stack(T)* a) { \
+    T ret; \
+    ret = jm_stack_top(T)(a); \
+    jm_vector_resize(T)(a, jm_vector_get_size(T)(a) - 1); \
+    return ret; \
+} \
+\
+static void jm_stack_foreach(T)(jm_stack(T)* a, void (*f)(T, void*), void * data) { jm_vector_foreach_c(T)(a,f,data); }
+
+/** @} */
+
+jm_stack_declare_template(char)
+jm_stack_declare_template(int)
+jm_stack_declare_template(double)
+jm_stack_declare_template(jm_voidp)
+jm_stack_declare_template(size_t)
+jm_stack_declare_template(jm_string)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_string_set.h b/Buildings/Resources/src/fmi-library/include/JM/jm_string_set.h
new file mode 100644
index 00000000000..982ecab07dd
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_string_set.h
@@ -0,0 +1,122 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef JM_STRING_SET_H
+#define JM_STRING_SET_H
+
+#include <string.h>
+#include <stdio.h>
+
+#include "jm_types.h"
+#include "jm_vector.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+/** \file jm_string_set.h Definition of ::jm_string_set and supporting functions
+	*
+	* \addtogroup jm_utils
+	* @{
+	*    \addtogroup jm_string_set_group
+	* @}
+	*/
+
+	/** \addtogroup jm_string_set_group A set of strings
+	 @{
+	*/
+
+/** 
+	\brief Set of string is based on a vector	
+
+*/
+typedef struct jm_vector_jm_string jm_string_set; /* equivalent to "typedef jm_vector(jm_string) jm_string_set" which Doxygen does not understand */
+
+/**
+\brief Find a string in a set.
+
+\param s A string set.
+\param str Search string.
+\return If found returns a pointer to the string saved in the set. If not found returns NULL.
+*/
+static jm_string jm_string_set_find(jm_string_set* s, jm_string str) {
+    jm_string* found = jm_vector_bsearch(jm_string)(s,&str,jm_compare_string);
+    if(found) return *found;
+    return 0;
+}
+
+/**
+\brief Find index of a string in a set.
+
+\param s A string set.
+\param str Search string.
+\return If found returns the index to the string saved in the set. If not found returns the insertion index of the string.
+*/
+static size_t jm_string_set_find_index(jm_string_set* s, jm_string str) {
+    size_t len = jm_vector_get_size(jm_string)(s);
+    size_t first = 0;
+    size_t mid = 0;
+    size_t last = len - 1;
+    if(len == 0) {
+        return 0;
+    }
+    while (first <= last) {
+        mid = (last + first)/2;
+        if (strcmp(jm_vector_get_item(jm_string)(s,mid), str) == 0) {
+            return mid;
+        } else if (strcmp(jm_vector_get_item(jm_string)(s,mid), str) > 0) {
+            if (mid == 0) return first;
+            last = mid - 1;
+        } else if (strcmp(jm_vector_get_item(jm_string)(s,mid), str) < 0) {
+            first = mid + 1;
+        }
+    }
+    return first;
+}
+
+/**
+*  \brief Put an element in the set if it is not there yet.
+*
+*  @param s A string set.
+*  \param str String to put.
+*  @return A pointer to the inserted (or found) element or zero pointer if failed.
+*/
+static jm_string jm_string_set_put(jm_string_set* s, jm_string str) {
+    jm_string* pnewstr;
+    char* newstr = 0;
+    size_t len = strlen(str) + 1;
+    size_t idx = jm_string_set_find_index(s, str);
+
+    if (idx != jm_vector_get_size(jm_string)(s)) {
+        if (strcmp(jm_vector_get_item(jm_string)(s, idx), str) != 0) {
+            pnewstr = jm_vector_insert(jm_string)(s, idx, str);
+        } else {
+            return jm_vector_get_item(jm_string)(s, idx);
+        }
+    } else {
+        pnewstr = jm_vector_push_back(jm_string)(s, str);
+    }
+    if(pnewstr) *pnewstr = newstr = s->callbacks->malloc(len);
+    if(!pnewstr || !newstr) return 0;
+    memcpy(newstr, str, len);
+    return *pnewstr;
+}
+
+/** @}
+	*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* JM_STRING_SET_H */
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_types.h b/Buildings/Resources/src/fmi-library/include/JM/jm_types.h
new file mode 100644
index 00000000000..2dc7293ce16
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_types.h
@@ -0,0 +1,72 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef JM_TYPES_H
+#define JM_TYPES_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <fmilib_config.h>
+
+/**
+	@file jm_types.h Types used in the Utils module.
+
+	*/
+/** 
+\defgroup jm_utils Utilities 
+\addtogroup jm_utils
+  * @{
+*/
+/** \brief A constant string.*/
+typedef const char* jm_string;
+/** \brief A void pointer.*/
+typedef void* jm_voidp;
+
+/** \brief Mapping between a string and an integer ID */
+typedef struct jm_name_ID_map_t {
+    jm_string name;
+    unsigned int ID;
+} jm_name_ID_map_t;
+
+/** \brief Return status codes */
+typedef enum {	
+	jm_status_error = -1,
+	jm_status_success = 0,
+	jm_status_warning = 1
+} jm_status_enu_t;
+
+/** \brief Log levels supported via the logger functions in ::jm_callbacks */
+typedef enum {	
+	jm_log_level_nothing = 0, /** \brief Must be first in this enum. May be usefull in application relying solely on jm_get_last_error() */
+	jm_log_level_fatal, /** \brief Unrecoverable errors */
+	jm_log_level_error, /** \brief Errors that may be not critical for some FMUs. */
+	jm_log_level_warning, /** \brief Non-critical issues */
+	jm_log_level_info, /** \brief Informative messages */
+	jm_log_level_verbose, /** \brief Verbose messages */
+	jm_log_level_debug, /** \brief Debug messages. Only enabled if library is configured with FMILIB_ENABLE_LOG_LEVEL_DEBUG */
+	jm_log_level_all /** \brief  Must be last in this enum. */
+} jm_log_level_enu_t;
+
+/** \brief Convert log level into a string */
+FMILIB_EXPORT
+const char* jm_log_level_to_string(jm_log_level_enu_t level);
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+/* JM_TYPES_H */
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_vector.h b/Buildings/Resources/src/fmi-library/include/JM/jm_vector.h
new file mode 100644
index 00000000000..f8d8dd3c570
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_vector.h
@@ -0,0 +1,385 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef jm_vector_h_
+#define jm_vector_h_
+#include <assert.h>
+#include <string.h>
+
+#include "jm_callbacks.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** 
+\file jm_vector.h Definition of ::jm_vector and supporting functions
+*/
+/**
+\addtogroup jm_utils
+ @{
+   \addtogroup jm_vector
+ @}
+*/
+
+/** 
+\addtogroup jm_vector A vector of items (dynamic array)
+@{
+*/
+
+/** \brief jm_mange macro is used to construct names for the template instances
+   Extra level (jm_mange_ex) is needed to force argument expansion (pre-scan)
+*/
+#define jm_mangle_ex(name, type)  name## _ ##type
+#define jm_mangle(name, type)  jm_mangle_ex(name,type)
+
+/** \brief jm_vector(T) is the type name (i.e., to be used as jm_vector(int) vi;) */
+#define jm_vector(T) jm_mangle(jm_vector, T)
+
+/**
+* \name  Vector handling functions.
+*
+* \brief Allocates a vector on heap with the specified size and specified number of preallocated items (can be larger than size).
+
+*  extern jm_vector(T)* jm_vector_alloc(T)(size_t size, size_t capacity, jm_callbacks*c );
+*  Note that there is no need to call jm_vector_init for a vector allocated with this function.
+*  @param  size - initial size of the vector, can be 0
+*  @param  capacity - initial capacity of the vector, can be 0. At least initSize elements are allocated.
+*  @param  c - jm_callbacks callbacks, can be zero
+*  @return Newly allocated vector
+*/
+#define jm_vector_alloc(T) jm_mangle(jm_vector_alloc, T)
+
+/**
+  jm_vector_free releases the memory allocated by jm_vector_alloc.
+extern void jm_vector_free(T)(jm_vector(T)* a);
+*/
+#define jm_vector_free(T) jm_mangle(jm_vector_free, T)
+
+/**
+*  \brief jm_vector_init initializes a vector allocated on stack.
+*
+*  Input:
+*    a - pointer to the vector to be initialized;
+*    size - initial size of the vector, can be 0
+*    c - jm_callbacks callbacks, can be zero
+*  Returns:
+*    size of the vector (can be zero for non-zero size if memory allocation failed)
+*    Note that for initSize < JM_VECTOR_MINIMAL_CAPACITY no heap memory allocation is needed
+*  size_t jm_vector_init(T)(jm_vector(T)* a, size_t initSize, jm_callbacks* c)
+*/
+#define jm_vector_init(T) jm_mangle(jm_vector_init, T)
+
+/**
+*  jm_vector_free_data releases memory allocated for vector data
+*  This only needs to be called for stack allocated vectors
+*  (jm_vector_free does the job for heap vectors automatically)
+* inline void jm_vector_free_data(T)(jm_vector(T)* a)
+*/
+#define jm_vector_free_data(T) jm_mangle(jm_vector_free_data, T)
+
+/**
+  jm_vector_get_size get the vector size
+inline size_t jm_vector_get_size(T)(jm_vector(T)* a)
+*/
+#define jm_vector_get_size(T) jm_mangle(jm_vector_get_size, T)
+
+/**
+  jm_vector_get_item returns the specified item. Range checking is done with an assert.
+inline T jm_vector_get_item(jm_vector(T)* a, size_t index)
+*/
+#define jm_vector_get_item(T) jm_mangle(jm_vector_get_item, T)
+
+/**
+  jm_vector_get_itemp returns a pointer to the specified item. Range checking is done with an assert.
+inline T* jm_vector_get_itemp(jm_vector(T)* a, size_t index)
+*/
+#define jm_vector_get_itemp(T) jm_mangle(jm_vector_get_itemp, T)
+
+
+/**
+  jm_vector_get_lastp returns a pointer to the last item in the vector. It is an error to call this if size=0
+inline T jm_vector_get_last(jm_vector(T)* a)
+*/
+#define jm_vector_get_last(T) jm_mangle(jm_vector_get_last, T)
+
+/**
+  jm_vector_get_lastp returns a pointer to the last item in the vector. Zero pointer is returned if size=0
+inline T* jm_vector_get_lastp(jm_vector(T)* a)
+*/
+#define jm_vector_get_lastp(T) jm_mangle(jm_vector_get_lastp, T)
+
+/**
+\brief Function type for item comparison. Can be generated with jm_define_comp_f.
+
+*/
+typedef int (*jm_compare_ft) (const void* , const void*);
+
+/**
+\brief  A conveniece macro for comparison function definition
+
+#define jm_define_comp_f(F, T, COMPAR_OP) is a conveniece macro for comparison function definition to be used in sort/search operations.
+Here F - is the defined function name;
+     T - type of the argument;
+     COMPAR_OP(A,B) is a macro that returns an integer less than, equal to, or greater than zero if the first argument
+is considered to be respectively less than, equal to, or greater than the second.  If two  members  compare  as
+equal, their order in the sorted array is undefined.
+Default definition below is jm_diff and is implemented as (int)(first-second)
+*/
+#define jm_define_comp_f(F, T, COMPAR_OP) \
+    static int F (const void* first, const void* second) { \
+        return COMPAR_OP(  (*(T*)first), (*(T*)second)); \
+    } \
+
+#define jm_diff(first, second) (int)(first-second)
+
+/**
+  \brief jm_vector_find functions use linear search to find items in a vector. JM_COMPAR_OP is used for comparison.
+
+  T* jm_vector_find(T)(jm_vector(T)* a, T item, jm_compare_ft f)
+
+  size_t jm_vector_find_index(T)(jm_vector(T)* a, T item, jm_compare_ft f)
+
+  @param a - the vector;
+  @param item - the searched item;
+
+  Return:
+    T* jm_vector_find(T)(jm_vector(T)* a, T item, jm_compare_ft f)  returns a pointer to the found item or NULL if not found
+    size_t jm_vector_find_index(T)(jm_vector(T)* a, T item, jm_compare_ft f) return the index of the found item or size of the vector if not found.
+*/
+#define jm_vector_find(T) jm_mangle(jm_vector_find, T)
+#define jm_vector_find_index(T) jm_mangle(jm_vector_find_index, T)
+
+/*
+    jm_vector_qsort uses standard quick sort to sort the vector contents.
+    JM_COMPAR_OP is used for comparison.
+
+    void jm_vector_qsort(T)(jm_vector(T)* v, jm_compare_ft f);
+*/
+#define jm_vector_qsort(T) jm_mangle(jm_vector_qsort, T)
+
+/**
+  jm_vector_bsearch uses standard binary search (bsearch) to find elements in a sorted vector.
+  It returns the index of an item in the vector or vector's size if not found.
+    JM_COMPAR_OP is used for comparison.
+
+  T* jm_vector_bsearch(T)(jm_vector(T)* v, T* key, jm_compare_ft f)
+  size_t jm_vector_bsearch_index(T)(jm_vector(T)* v, T* key, jm_compare_ft f)
+*/
+#define jm_vector_bsearch(T) jm_mangle(jm_vector_bsearch, T)
+#define jm_vector_bsearch_index(T) jm_mangle(jm_vector_bsearch_index, T)
+
+/**
+  jm_vector_set_item sets the specified item. Range checking is done with an assert.
+ void jm_vector_set_item(T)(jm_vector(T)* a, size_t index, T item)
+*/
+#define jm_vector_set_item(T) jm_mangle(jm_vector_set_item, T)
+
+/**
+  jm_vector_zero sets all elements in the vector to zero
+  void jm_vector_zero(T)(jm_vector(T)* a);
+  */
+#define jm_vector_zero(T) jm_mangle(jm_vector_zero, T)
+
+/**
+*  jm_vector_resize resizes the vector
+*   Input:
+*     a - the vector
+*     size - new size
+*   Return:
+*     size of the vector after operation. Can be less than size if memory allocation failed.
+*     Note: resizing to smaller vector does not release memory.
+*  size_t jm_vector_resize(T)(jm_vector(T)* a, size_t size)
+*/
+#define jm_vector_resize(T) jm_mangle(jm_vector_resize, T)
+
+/**
+*  jm_vector_reserve preallocates memory for the vector (to speed up consequent push_back)
+*  Returns: the actually reserved space. Can be smaller than requested "capacity" if memory allocation failed.
+*  Can be larger than "capacity" if more memory was previously allocated.
+*  size_t jm_vector_reserve(T)(jm_vector(T)* a, size_t capacity)
+*/
+#define jm_vector_reserve(T) jm_mangle(jm_vector_reserve, T)
+
+/**
+*  jm_vector_copy copies source vector into destination.
+*  Returns the number of elements actually copied (may be less than the source size if allocation failed).
+*  size_t jm_vector_copy(T)(jm_vector(T)* destination, jm_vector(T)* source)
+*/
+#define jm_vector_copy(T) jm_mangle(jm_vector_copy, T)
+
+/**
+*  jm_vector_clone creates a copy of the provided vector on heap and returns it.
+*  Allocated capacity matches the size of the given vector. Returns the vector pointer or zero if memory allocation failed.
+*  jm_vector(T)* jm_vector_clone(T)(jm_vector(T)* source)
+*/
+#define jm_vector_clone(T) jm_mangle(jm_vector_clone, T)
+
+/**
+*  jm_vector_append appends source vector into destination.
+*  Returns the number of elements actually appended (may be less than the source size if allocation failed).
+*  size_t jm_vector_append(T)(jm_vector(T)* destination, jm_vector(T)* source)
+*/
+#define jm_vector_append(T) jm_mangle(jm_vector_append, T)
+
+/**
+*  jm_vector_insert inserts an element at a given location.
+*  Returns a pointer to the inserted element or zero pointer if failed
+*  T* jm_vector_insert(T)(jm_vector(T)* a, size_t index, T item)
+*/
+#define jm_vector_insert(T) jm_mangle(jm_vector_insert, T)
+
+/**
+* jm_vector_remove_item removes an item from the vector.
+* Vector size is reduced by 1. Supplying index > size gives assertion fault.
+* void jm_vector_remove_item(T)(jm_vector(T)* v, size_t index)
+*/
+#define jm_vector_remove_item(T) jm_mangle(jm_vector_remove_item, T)
+
+/**
+* T* jm_vector_resize1(jm_vector(T)* a)
+* Increase the size of the vector by 1 and return a pointer to the last item. 
+* Return 0 if memory allocation failed.
+*/
+#define jm_vector_resize1(T)  jm_mangle(jm_vector_resize1, T)
+
+/**
+*  jm_vector_push_back
+*  Returns a pointer to the inserted element or zero pointer if failed.
+*  T* jm_vector_push_back(jm_vector(T)* a, T item)
+*/
+#define jm_vector_push_back(T) jm_mangle(jm_vector_push_back, T)
+
+/**
+*  jm_vector_foreach calls f for each element in the vector. "contect" parameter
+*  is passed directly to the function as the second argument for the second version.
+*  void jm_vector_foreach(T)(jm_vector(T)* a, void (*f)(T))
+*  void jm_vector_foreach_c(T)(jm_vector(T)* a, void (*f)(T, void*), void * context)
+*/
+#define jm_vector_foreach(T) jm_mangle(jm_vector_foreach, T)
+#define jm_vector_foreach_c(T) jm_mangle(jm_vector_foreach_c, T)
+
+/** @} */
+
+/** number of items always allocated on the stack */
+#define JM_VECTOR_MINIMAL_CAPACITY 16
+
+/** maximum memory chunk (in items) to be allocated in push_back. */
+#define JM_VECTOR_MAX_MEMORY_CHUNK 1024
+
+/** Declare the struct and functions for the specified type. */
+#define jm_vector_declare_template(T)		\
+typedef struct  jm_vector(T) {                \
+        jm_callbacks* callbacks; 			\
+        T  *items;     				\
+	size_t size;  				 \
+        size_t capacity; 			\
+        T preallocated[JM_VECTOR_MINIMAL_CAPACITY];			\
+} jm_vector(T);					\
+ \
+extern jm_vector(T)* jm_vector_alloc(T)(size_t size,size_t capacity, jm_callbacks*);	\
+    \
+extern size_t jm_vector_copy(T)(jm_vector(T)* destination, jm_vector(T)* source); \
+static jm_vector(T)* jm_vector_clone(T)(jm_vector(T)* v) {	\
+    jm_vector(T)* ret = jm_vector_alloc(T)(v->size, v->size, v->callbacks);\
+    if(ret) jm_vector_copy(T)(ret, v) ; \
+    return ret; \
+}\
+        \
+extern void jm_vector_free(T)(jm_vector(T) * a); \
+    \
+extern size_t jm_vector_init(T)(jm_vector(T)* a, size_t size,jm_callbacks*);	\
+\
+static void jm_vector_free_data(T)(jm_vector(T)* a) { \
+    if(a) { \
+        if(a->items != a->preallocated) { \
+          a->callbacks->free((void*)(a->items)); \
+          a->items = a->preallocated; \
+          a->capacity=JM_VECTOR_MINIMAL_CAPACITY;\
+        } \
+        a->size=0; \
+    } \
+} \
+   \
+static size_t jm_vector_get_size(T)(jm_vector(T)* a) { return a->size; } \
+\
+static T jm_vector_get_item(T)(jm_vector(T)* a, size_t index) { \
+           assert(index < a->size); \
+           return a->items[index]; \
+}\
+static T* jm_vector_get_itemp(T)(jm_vector(T)* a, size_t index) { \
+           assert(index < a->size); \
+           return (a->items+index); \
+}\
+ static T jm_vector_get_last(T)(jm_vector(T)* a) { \
+        assert(a->size); \
+        return (a->items[a->size-1]); \
+} \
+static T* jm_vector_get_lastp(T)(jm_vector(T)* a) { \
+    if(a->size) return (a->items+(a->size-1)); \
+    else return 0; \
+} \
+ static void jm_vector_set_item(T)(jm_vector(T)* a, size_t index, T item) {\
+    *(jm_vector_get_itemp(T)(a, index)) = item; \
+} \
+extern size_t jm_vector_resize(T)(jm_vector(T)* a, size_t size); \
+extern size_t jm_vector_reserve(T)(jm_vector(T)* a, size_t capacity); \
+extern size_t jm_vector_append(T)(jm_vector(T)* destination, jm_vector(T)* source); \
+extern T* jm_vector_insert(T)(jm_vector(T)* a, size_t index, T item);\
+extern T* jm_vector_push_back(T)(jm_vector(T)* a, T item);\
+extern T* jm_vector_resize1(T)(jm_vector(T)* a);\
+extern void jm_vector_remove_item(T)(jm_vector(T)* v, size_t index); \
+extern size_t jm_vector_find_index(T)(jm_vector(T)* a,  T *itemp, jm_compare_ft f); \
+extern T* jm_vector_find(T)(jm_vector(T)* a,  T *itemp, jm_compare_ft f); \
+extern void jm_vector_qsort(T)(jm_vector(T)* v, jm_compare_ft f); \
+extern size_t jm_vector_bsearch_index(T)(jm_vector(T)* v, T* key, jm_compare_ft f); \
+extern T* jm_vector_bsearch(T)(jm_vector(T)* v, T* key, jm_compare_ft f); \
+extern void jm_vector_foreach(T)(jm_vector(T)* a, void (*f)(T)); \
+extern void jm_vector_foreach_c(T)(jm_vector(T)* a, void (*f)(T, void*), void * data); \
+extern void jm_vector_zero(T)(jm_vector(T)* a);    
+
+jm_vector_declare_template(char)
+static jm_string jm_vector_char2string(jm_vector(char)* v) {
+    jm_string str = "";
+    if(v->size) return v->items;
+    return str;
+}
+
+jm_vector_declare_template(int)
+jm_vector_declare_template(double)
+jm_vector_declare_template(jm_voidp)
+jm_vector_declare_template(size_t)
+jm_vector_declare_template(jm_string)
+jm_vector_declare_template(jm_name_ID_map_t)
+
+
+jm_define_comp_f(jm_compare_voidp, int*, jm_diff)
+jm_define_comp_f(jm_compare_int, int, jm_diff)
+jm_define_comp_f(jm_compare_char, char, jm_diff)
+jm_define_comp_f(jm_compare_double, double, jm_diff)
+jm_define_comp_f(jm_compare_size_t, size_t, jm_diff)
+jm_define_comp_f(jm_compare_string, jm_string, strcmp)
+
+#define jm_diff_name(a, b) strcmp(a.name,b.name)
+jm_define_comp_f(jm_compare_name, jm_name_ID_map_t, jm_diff_name)
+
+/** 
+@}
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/JM/jm_vector_template.h b/Buildings/Resources/src/fmi-library/include/JM/jm_vector_template.h
new file mode 100644
index 00000000000..e1def3b9cf5
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/JM/jm_vector_template.h
@@ -0,0 +1,238 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+/**
+* \file jm_vector_template.h
+* \brief Vector template definition.
+*
+* This file is supposed to be included into a C-file that instantiate the template.
+* jm_vector.h must be included before this file.
+* It expects JM_TEMPLATE_INSTANCE_TYPE to be defined to the template type to be instantiated.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include "jm_vector.h"
+
+/** \addtogroup jm_vector  A vector of items (dynamic array)*/
+/** @{
+*/
+
+#ifndef JM_TEMPLATE_INSTANCE_TYPE
+#error "JM_TEMPLATE_INSTANCE_TYPE must be defined before including this file"
+#endif
+
+jm_vector(JM_TEMPLATE_INSTANCE_TYPE) * jm_vector_alloc(JM_TEMPLATE_INSTANCE_TYPE) (size_t size, size_t capacity, jm_callbacks* c) {
+        size_t reserve;
+        jm_callbacks* cc;
+        jm_vector(JM_TEMPLATE_INSTANCE_TYPE) * v;
+        if(c)
+            cc = c;
+        else
+            cc = jm_get_default_callbacks();
+
+        reserve = capacity;
+        if(reserve < size) reserve = size;
+        if(reserve > JM_VECTOR_MINIMAL_CAPACITY) {
+            v = (jm_vector(JM_TEMPLATE_INSTANCE_TYPE)*)cc->malloc(
+                        sizeof(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)) +
+                        sizeof(JM_TEMPLATE_INSTANCE_TYPE) * (reserve -JM_VECTOR_MINIMAL_CAPACITY));
+            if(!v) return 0;
+            v->capacity = reserve;
+        }
+        else {
+            v = (jm_vector(JM_TEMPLATE_INSTANCE_TYPE)*)cc->malloc(sizeof(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)));
+            if(!v) return 0;
+            v->capacity = JM_VECTOR_MINIMAL_CAPACITY;
+        }
+        v->callbacks = cc;
+        v->items = &(v->preallocated[0]);
+        v->size = size;
+        return v;
+}
+
+void jm_vector_free(JM_TEMPLATE_INSTANCE_TYPE) (jm_vector(JM_TEMPLATE_INSTANCE_TYPE) * a) {
+    if(!a) return;
+    jm_vector_free_data(JM_TEMPLATE_INSTANCE_TYPE)(a);
+    a->callbacks->free(a);
+}
+
+size_t jm_vector_init(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a, size_t initSize, jm_callbacks* c) {        
+        if(c)
+            a->callbacks = c;
+        else
+            a->callbacks = jm_get_default_callbacks();
+        a->items = a->preallocated;
+        a->size = 0;
+        a->capacity = JM_VECTOR_MINIMAL_CAPACITY;
+
+        if(initSize > a->size)
+            return jm_vector_resize(JM_TEMPLATE_INSTANCE_TYPE)(a, initSize);
+        return 0;
+}
+
+size_t jm_vector_resize(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a, size_t size) {
+        if(size > a->capacity)  {
+            if(jm_vector_reserve(JM_TEMPLATE_INSTANCE_TYPE)(a, size) < size) {
+                a->size = a->capacity;
+                return a->capacity;
+            }
+        }
+        a->size = size;
+        return size;
+}
+
+size_t jm_vector_reserve(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a, size_t size) {
+        void* newmem;
+        if(size <= a->capacity) return a->capacity;
+        newmem = a->callbacks->malloc(size * sizeof(JM_TEMPLATE_INSTANCE_TYPE));
+        if(!newmem) return a->capacity;
+        memcpy(newmem, a->items, a->size * sizeof(JM_TEMPLATE_INSTANCE_TYPE));
+        if(a->items !=  a->preallocated) a->callbacks->free((void*)(a->items));
+        a->items = newmem;
+        a->capacity = size;
+        return a->capacity;
+}
+
+size_t jm_vector_copy(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* destination, jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* source) {
+        size_t destsize = jm_vector_resize(JM_TEMPLATE_INSTANCE_TYPE)(destination, source->size);
+        if(destsize > 0) {
+            memcpy((void*)destination->items, (void*)source->items, sizeof(JM_TEMPLATE_INSTANCE_TYPE)*destsize);
+        }
+        return destination->size;
+}
+
+size_t jm_vector_append(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* destination, jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* source) {
+        size_t oldsize, newsize;
+        oldsize = jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(destination);
+        newsize = jm_vector_resize(JM_TEMPLATE_INSTANCE_TYPE)(destination, source->size + oldsize);
+        memcpy((void*)(destination->items + oldsize), (void*)source->items, sizeof(JM_TEMPLATE_INSTANCE_TYPE)*(newsize - oldsize));
+        return (newsize - oldsize);
+}
+
+JM_TEMPLATE_INSTANCE_TYPE* jm_vector_insert(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a, size_t index, JM_TEMPLATE_INSTANCE_TYPE item) {
+        size_t reserve;
+        JM_TEMPLATE_INSTANCE_TYPE* pitem;
+        if(index >= a->size) return 0;
+        if(a->size == a->capacity) {
+                if(a->capacity > JM_VECTOR_MAX_MEMORY_CHUNK)
+                        reserve = JM_VECTOR_MAX_MEMORY_CHUNK + a->capacity;
+                else
+                        reserve = a->capacity * 2;
+                if( jm_vector_reserve(JM_TEMPLATE_INSTANCE_TYPE)(a, reserve) != reserve) return 0;
+        }
+        assert(a->size < a->capacity);
+        memmove((void*)(a->items+index+1),(void*)(a->items+index), (a->size - index)*sizeof(JM_TEMPLATE_INSTANCE_TYPE));
+        a->items[index] = item;
+        pitem = &(a->items[index]);
+        a->size++;
+        return pitem;
+}
+
+JM_TEMPLATE_INSTANCE_TYPE* jm_vector_resize1(JM_TEMPLATE_INSTANCE_TYPE) (jm_vector(JM_TEMPLATE_INSTANCE_TYPE) * a) {
+        size_t reserve;
+        JM_TEMPLATE_INSTANCE_TYPE* pitem;
+        if(a->size == a->capacity) {
+                if(a->capacity > JM_VECTOR_MAX_MEMORY_CHUNK)
+                        reserve = JM_VECTOR_MAX_MEMORY_CHUNK + a->capacity;
+                else
+                        reserve = a->capacity * 2;
+                if( jm_vector_reserve(JM_TEMPLATE_INSTANCE_TYPE)(a, reserve) != reserve) return 0;
+        }
+        assert(a->size < a->capacity);
+        pitem = &(a->items[a->size]);
+        a->size++;
+        return pitem;
+}
+
+JM_TEMPLATE_INSTANCE_TYPE* jm_vector_push_back(JM_TEMPLATE_INSTANCE_TYPE) (jm_vector(JM_TEMPLATE_INSTANCE_TYPE) * a, JM_TEMPLATE_INSTANCE_TYPE item) {
+        JM_TEMPLATE_INSTANCE_TYPE* pitem= jm_vector_resize1(JM_TEMPLATE_INSTANCE_TYPE) (a);
+        if(!pitem) return 0;
+        *pitem = item;
+        return pitem;
+}
+
+void jm_vector_remove_item(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* v, size_t index) {
+    size_t n =v->size - index -1;
+    assert(index < v->size);
+    if(n) {
+        memmove((void*)&(v->items[index]),(void*) &(v->items[index+1]), n * sizeof(JM_TEMPLATE_INSTANCE_TYPE));
+    }
+    v->size--;
+}
+
+void jm_vector_zero(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a) {
+    if(jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(a) > 0) {
+        memset((void*)a->items,0,a->size * sizeof(JM_TEMPLATE_INSTANCE_TYPE));
+    }
+}
+
+void jm_vector_foreach_c(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a,
+                                                    void (*f)(JM_TEMPLATE_INSTANCE_TYPE, void*), void * data) {
+        size_t i;
+        for(i = 0; i < jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(a); i++)
+            f(jm_vector_get_item(JM_TEMPLATE_INSTANCE_TYPE)(a, i), data);
+}
+
+void jm_vector_foreach(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a,
+                                                    void (*f)(JM_TEMPLATE_INSTANCE_TYPE)) {
+        size_t i;
+        for(i = 0; i < jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(a); i++)
+            f(jm_vector_get_item(JM_TEMPLATE_INSTANCE_TYPE)(a, i));
+}
+
+void jm_vector_qsort(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* v, jm_compare_ft f) {
+    if(jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(v) > 1) {
+        qsort((void*)v->items, jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(v), sizeof(JM_TEMPLATE_INSTANCE_TYPE),f);
+    }
+}
+
+#define jm_vector_ptr2index(T) jm_mangle(jm_vector_ptr2index, T)
+
+static size_t jm_vector_ptr2index(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* v, JM_TEMPLATE_INSTANCE_TYPE* itemp) {
+    if(itemp)
+        return (itemp - v->items);
+    else
+        return jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(v);
+}
+
+
+size_t jm_vector_bsearch_index(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* v, JM_TEMPLATE_INSTANCE_TYPE* key, jm_compare_ft f) {
+    return jm_vector_ptr2index(JM_TEMPLATE_INSTANCE_TYPE)(v, jm_vector_bsearch(JM_TEMPLATE_INSTANCE_TYPE)(v, key,f));
+}
+
+JM_TEMPLATE_INSTANCE_TYPE* jm_vector_bsearch(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* v, JM_TEMPLATE_INSTANCE_TYPE* key, jm_compare_ft f) {
+    return bsearch(key, v->items,
+                   jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(v),
+                   sizeof(JM_TEMPLATE_INSTANCE_TYPE),
+                   f);
+}
+
+JM_TEMPLATE_INSTANCE_TYPE* jm_vector_find(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* a, JM_TEMPLATE_INSTANCE_TYPE* itemp, jm_compare_ft f) {
+    size_t i = jm_vector_get_size(JM_TEMPLATE_INSTANCE_TYPE)(a);
+    while(i--) {
+        JM_TEMPLATE_INSTANCE_TYPE* cur = jm_vector_get_itemp(JM_TEMPLATE_INSTANCE_TYPE)(a, i);
+        if(f(cur, itemp) == 0)
+           return cur;
+    };
+    return 0;
+}
+
+size_t jm_vector_find_index(JM_TEMPLATE_INSTANCE_TYPE)(jm_vector(JM_TEMPLATE_INSTANCE_TYPE)* v, JM_TEMPLATE_INSTANCE_TYPE* itemp, jm_compare_ft f) {
+    return jm_vector_ptr2index(JM_TEMPLATE_INSTANCE_TYPE)(v,jm_vector_find(JM_TEMPLATE_INSTANCE_TYPE)(v, itemp, f));
+}
+
+/** @}
+*/
\ No newline at end of file
diff --git a/Buildings/Resources/src/fmi-library/include/fmilib.h b/Buildings/Resources/src/fmi-library/include/fmilib.h
new file mode 100644
index 00000000000..e962af6069e
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/fmilib.h
@@ -0,0 +1,31 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+/** \file fmilib.h
+	\brief Include file to be used in client applications of the FMI Library.
+	\defgroup fmi_import FMI import library
+*/
+
+#ifndef FMILIB_H_
+#define FMILIB_H_
+
+#include <stddef.h>
+#include "fmilib_config.h"
+
+#include <FMI/fmi_import_context.h>
+#include <FMI1/fmi1_import.h>
+#include <FMI2/fmi2_import.h>
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/fmilib_config-darwin64.h b/Buildings/Resources/src/fmi-library/include/fmilib_config-darwin64.h
new file mode 100644
index 00000000000..c613dc65412
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/fmilib_config-darwin64.h
@@ -0,0 +1,163 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef CONFIG_FMILIB_H_
+#define CONFIG_FMILIB_H_
+
+/** \file fmilib_config.h
+	\brief Library configuration file generated by the build system. 
+*/
+
+#ifndef WIN32
+/* #undef WIN32 */
+#ifdef WIN32
+/** \def WIN32
+	\brief WIN32 is used to identify Windows OS (set on both Win32 and Win64) 
+*/
+#endif
+#endif
+
+/* #undef MINGW */
+#ifdef MINGW
+/** \def MINGW
+	\brief MINGW is used to identify MSYS/MinGW environment 
+*/
+#endif
+
+#ifndef CMAKE_INTDIR
+#define CMAKE_INTDIR "."
+/** \def CMAKE_INTDIR
+	\brief The macro #CMAKE_INTDIR gives intermediate directory for the current configuration (Debug/Release). 
+
+It is redefined to "." for Makefile based build environments. Otherwise is set by MSVC. */
+#endif
+
+/** \brief Platform folder separator */
+#define FMI_FILE_SEP "/"	
+
+/** \brief DLL file name suffix(.so, .dll, ...) */
+#define FMI_DLL_EXT ".dylib" 
+
+/** \brief Folder name inside FMU in which the DLL is found for this platform */
+#define FMI_PLATFORM "darwin64"
+
+/** \brief Folder name inside FMU where binaries are */
+#define FMI_BINARIES "binaries"
+/** \brief Model description XML file name */
+#define FMI_MODEL_DESCRIPTION_XML "modelDescription.xml"
+
+/* #undef FMILIB_STATIC_LIB_ONLY */
+#ifdef FMILIB_STATIC_LIB_ONLY
+/** 
+\def FMILIB_STATIC_LIB_ONLY
+\brief The macro #FMILIB_STATIC_LIB_ONLY is defined if no fmilib_shared is build. */
+#endif
+
+#ifndef FMILIB_STATIC_LIB_ONLY
+ #if defined WIN32
+  #ifdef FMILIB_BUILDING_LIBRARY
+    #if 0 /* defined(__GNUC__)  MSYS currently does not support visibility attribute */ 
+      #define FMILIB_EXPORT __attribute__ ((dllexport))
+    #else
+		/* Note: actually gcc seems to also supports this syntax. */
+      #define FMILIB_EXPORT __declspec(dllexport) 
+    #endif
+  #else
+    #if 0 /* defined(__GNUC__) MSYS currently does not support visibility attribute  */
+      #define FMILIB_EXPORT __attribute__ ((dllimport))
+    #else
+		/* Note: actually gcc seems to also supports this syntax. */
+      #define FMILIB_EXPORT __declspec(dllimport)
+    #endif
+  #endif
+  #define FMILIB_PRIVATE
+ #else
+  #if __GNUC__ >= 4
+    #define FMILIB_EXPORT __attribute__ ((visibility ("default")))
+    #define FMILIB_PRIVATE  __attribute__ ((visibility ("hidden")))
+  #else
+    #define FMILIB_EXPORT
+    #define FMILIB_PRIVATE
+  #endif
+ #endif
+#else
+  #if __GNUC__ >= 4
+    #define FMILIB_EXPORT __attribute__ ((visibility ("default")))
+    #define FMILIB_PRIVATE  __attribute__ ((visibility ("hidden")))
+  #else
+    #define FMILIB_EXPORT
+    #define FMILIB_PRIVATE
+  #endif
+#endif
+
+/** \def FMILIB_EXPORT
+	\brief Used to declare the public API of the library needed for dynamic linking. 
+	\def FMILIB_PRIVATE
+	\brief Intended for declaration of the private library functions.
+*/
+
+/* #undef FMILIB_ENABLE_LOG_LEVEL_DEBUG */
+#ifndef FMILIB_ENABLE_LOG_LEVEL_DEBUG
+/* Just for doxygen */
+#define FMILIB_ENABLE_LOG_LEVEL_DEBUG
+#undef FMILIB_ENABLE_LOG_LEVEL_DEBUG
+#endif
+/** 
+\def FMILIB_ENABLE_LOG_LEVEL_DEBUG
+\brief Activates debug level log messages. If not defined the debug messages are compiled out. 
+*/
+
+#if defined _MSC_VER
+	#define FMILIB_SIZET_FORMAT "%Iu"
+#else 
+	#define FMILIB_SIZET_FORMAT "%zu"
+#endif
+
+/* #undef FMILIB_GENERATE_BUILD_STAMP */
+#ifndef FMILIB_GENERATE_BUILD_STAMP
+/* Just for Doxygen */
+#define FMILIB_GENERATE_BUILD_STAMP
+#undef FMILIB_GENERATE_BUILD_STAMP
+#endif
+/** 
+\def FMILIB_GENERATE_BUILD_STAMP
+\brief Generate build-stamp file and enable fmilib_get_build_stamp(). 
+*/
+
+#ifdef FMILIB_GENERATE_BUILD_STAMP
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \brief Get the library build stamp. 
+	\return A string giving SVN revision and build time for the library.
+	
+	The function is only active if the library was configured with #FMILIB_GENERATE_BUILD_STAMP ON
+*/
+FMILIB_EXPORT const char* fmilib_get_build_stamp(void);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#define HAVE_VA_COPY
+#define HAVE___VA_COPY
+
+#define HAVE_VSNPRINTF
+#ifdef HAVE_VSNPRINTF
+#define jm_rpl_vsnprintf vsnprintf
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/fmilib_config-linux64.h b/Buildings/Resources/src/fmi-library/include/fmilib_config-linux64.h
new file mode 100644
index 00000000000..4e209ffe6c6
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/fmilib_config-linux64.h
@@ -0,0 +1,163 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef CONFIG_FMILIB_H_
+#define CONFIG_FMILIB_H_
+
+/** \file fmilib_config.h
+	\brief Library configuration file generated by the build system. 
+*/
+
+#ifndef WIN32
+/* #undef WIN32 */
+#ifdef WIN32
+/** \def WIN32
+	\brief WIN32 is used to identify Windows OS (set on both Win32 and Win64) 
+*/
+#endif
+#endif
+
+/* #undef MINGW */
+#ifdef MINGW
+/** \def MINGW
+	\brief MINGW is used to identify MSYS/MinGW environment 
+*/
+#endif
+
+#ifndef CMAKE_INTDIR
+#define CMAKE_INTDIR "."
+/** \def CMAKE_INTDIR
+	\brief The macro #CMAKE_INTDIR gives intermediate directory for the current configuration (Debug/Release). 
+
+It is redefined to "." for Makefile based build environments. Otherwise is set by MSVC. */
+#endif
+
+/** \brief Platform folder separator */
+#define FMI_FILE_SEP "/"	
+
+/** \brief DLL file name suffix(.so, .dll, ...) */
+#define FMI_DLL_EXT ".so" 
+
+/** \brief Folder name inside FMU in which the DLL is found for this platform */
+#define FMI_PLATFORM "linux64"
+
+/** \brief Folder name inside FMU where binaries are */
+#define FMI_BINARIES "binaries"
+/** \brief Model description XML file name */
+#define FMI_MODEL_DESCRIPTION_XML "modelDescription.xml"
+
+/* #undef FMILIB_STATIC_LIB_ONLY */
+#ifdef FMILIB_STATIC_LIB_ONLY
+/** 
+\def FMILIB_STATIC_LIB_ONLY
+\brief The macro #FMILIB_STATIC_LIB_ONLY is defined if no fmilib_shared is build. */
+#endif
+
+#ifndef FMILIB_STATIC_LIB_ONLY
+ #if defined WIN32
+  #ifdef FMILIB_BUILDING_LIBRARY
+    #if 0 /* defined(__GNUC__)  MSYS currently does not support visibility attribute */ 
+      #define FMILIB_EXPORT __attribute__ ((dllexport))
+    #else
+		/* Note: actually gcc seems to also supports this syntax. */
+      #define FMILIB_EXPORT __declspec(dllexport) 
+    #endif
+  #else
+    #if 0 /* defined(__GNUC__) MSYS currently does not support visibility attribute  */
+      #define FMILIB_EXPORT __attribute__ ((dllimport))
+    #else
+		/* Note: actually gcc seems to also supports this syntax. */
+      #define FMILIB_EXPORT __declspec(dllimport)
+    #endif
+  #endif
+  #define FMILIB_PRIVATE
+ #else
+  #if __GNUC__ >= 4
+    #define FMILIB_EXPORT __attribute__ ((visibility ("default")))
+    #define FMILIB_PRIVATE  __attribute__ ((visibility ("hidden")))
+  #else
+    #define FMILIB_EXPORT
+    #define FMILIB_PRIVATE
+  #endif
+ #endif
+#else
+  #if __GNUC__ >= 4
+    #define FMILIB_EXPORT __attribute__ ((visibility ("default")))
+    #define FMILIB_PRIVATE  __attribute__ ((visibility ("hidden")))
+  #else
+    #define FMILIB_EXPORT
+    #define FMILIB_PRIVATE
+  #endif
+#endif
+
+/** \def FMILIB_EXPORT
+	\brief Used to declare the public API of the library needed for dynamic linking. 
+	\def FMILIB_PRIVATE
+	\brief Intended for declaration of the private library functions.
+*/
+
+/* #undef FMILIB_ENABLE_LOG_LEVEL_DEBUG */
+#ifndef FMILIB_ENABLE_LOG_LEVEL_DEBUG
+/* Just for doxygen */
+#define FMILIB_ENABLE_LOG_LEVEL_DEBUG
+#undef FMILIB_ENABLE_LOG_LEVEL_DEBUG
+#endif
+/** 
+\def FMILIB_ENABLE_LOG_LEVEL_DEBUG
+\brief Activates debug level log messages. If not defined the debug messages are compiled out. 
+*/
+
+#if defined _MSC_VER
+	#define FMILIB_SIZET_FORMAT "%Iu"
+#else 
+	#define FMILIB_SIZET_FORMAT "%zu"
+#endif
+
+/* #undef FMILIB_GENERATE_BUILD_STAMP */
+#ifndef FMILIB_GENERATE_BUILD_STAMP
+/* Just for Doxygen */
+#define FMILIB_GENERATE_BUILD_STAMP
+#undef FMILIB_GENERATE_BUILD_STAMP
+#endif
+/** 
+\def FMILIB_GENERATE_BUILD_STAMP
+\brief Generate build-stamp file and enable fmilib_get_build_stamp(). 
+*/
+
+#ifdef FMILIB_GENERATE_BUILD_STAMP
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \brief Get the library build stamp. 
+	\return A string giving SVN revision and build time for the library.
+	
+	The function is only active if the library was configured with #FMILIB_GENERATE_BUILD_STAMP ON
+*/
+FMILIB_EXPORT const char* fmilib_get_build_stamp(void);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+/* #undef HAVE_VA_COPY */
+#define HAVE___VA_COPY
+
+#define HAVE_VSNPRINTF
+#ifdef HAVE_VSNPRINTF
+#define jm_rpl_vsnprintf vsnprintf
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/fmilib_config-win64.h b/Buildings/Resources/src/fmi-library/include/fmilib_config-win64.h
new file mode 100644
index 00000000000..7d9861aad03
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/fmilib_config-win64.h
@@ -0,0 +1,163 @@
+/*
+    Copyright (C) 2012 Modelon AB
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the BSD style license.
+
+     This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    FMILIB_License.txt file for more details.
+
+    You should have received a copy of the FMILIB_License.txt file
+    along with this program. If not, contact Modelon AB <http://www.modelon.com>.
+*/
+
+#ifndef CONFIG_FMILIB_H_
+#define CONFIG_FMILIB_H_
+
+/** \file fmilib_config.h
+	\brief Library configuration file generated by the build system. 
+*/
+
+#ifndef WIN32
+#define WIN32
+#ifdef WIN32
+/** \def WIN32
+	\brief WIN32 is used to identify Windows OS (set on both Win32 and Win64) 
+*/
+#endif
+#endif
+
+/* #undef MINGW */
+#ifdef MINGW
+/** \def MINGW
+	\brief MINGW is used to identify MSYS/MinGW environment 
+*/
+#endif
+
+#ifndef CMAKE_INTDIR
+#define CMAKE_INTDIR "."
+/** \def CMAKE_INTDIR
+	\brief The macro #CMAKE_INTDIR gives intermediate directory for the current configuration (Debug/Release). 
+
+It is redefined to "." for Makefile based build environments. Otherwise is set by MSVC. */
+#endif
+
+/** \brief Platform folder separator */
+#define FMI_FILE_SEP "\\"	
+
+/** \brief DLL file name suffix(.so, .dll, ...) */
+#define FMI_DLL_EXT ".dll" 
+
+/** \brief Folder name inside FMU in which the DLL is found for this platform */
+#define FMI_PLATFORM "win64"
+
+/** \brief Folder name inside FMU where binaries are */
+#define FMI_BINARIES "binaries"
+/** \brief Model description XML file name */
+#define FMI_MODEL_DESCRIPTION_XML "modelDescription.xml"
+
+/* #undef FMILIB_STATIC_LIB_ONLY */
+#ifdef FMILIB_STATIC_LIB_ONLY
+/** 
+\def FMILIB_STATIC_LIB_ONLY
+\brief The macro #FMILIB_STATIC_LIB_ONLY is defined if no fmilib_shared is build. */
+#endif
+
+#ifndef FMILIB_STATIC_LIB_ONLY
+ #if defined WIN32
+  #ifdef FMILIB_BUILDING_LIBRARY
+    #if 0 /* defined(__GNUC__)  MSYS currently does not support visibility attribute */ 
+      #define FMILIB_EXPORT __attribute__ ((dllexport))
+    #else
+		/* Note: actually gcc seems to also supports this syntax. */
+      #define FMILIB_EXPORT __declspec(dllexport) 
+    #endif
+  #else
+    #if 0 /* defined(__GNUC__) MSYS currently does not support visibility attribute  */
+      #define FMILIB_EXPORT __attribute__ ((dllimport))
+    #else
+		/* Note: actually gcc seems to also supports this syntax. */
+      #define FMILIB_EXPORT __declspec(dllimport)
+    #endif
+  #endif
+  #define FMILIB_PRIVATE
+ #else
+  #if __GNUC__ >= 4
+    #define FMILIB_EXPORT __attribute__ ((visibility ("default")))
+    #define FMILIB_PRIVATE  __attribute__ ((visibility ("hidden")))
+  #else
+    #define FMILIB_EXPORT
+    #define FMILIB_PRIVATE
+  #endif
+ #endif
+#else
+  #if __GNUC__ >= 4
+    #define FMILIB_EXPORT __attribute__ ((visibility ("default")))
+    #define FMILIB_PRIVATE  __attribute__ ((visibility ("hidden")))
+  #else
+    #define FMILIB_EXPORT
+    #define FMILIB_PRIVATE
+  #endif
+#endif
+
+/** \def FMILIB_EXPORT
+	\brief Used to declare the public API of the library needed for dynamic linking. 
+	\def FMILIB_PRIVATE
+	\brief Intended for declaration of the private library functions.
+*/
+
+/* #undef FMILIB_ENABLE_LOG_LEVEL_DEBUG */
+#ifndef FMILIB_ENABLE_LOG_LEVEL_DEBUG
+/* Just for doxygen */
+#define FMILIB_ENABLE_LOG_LEVEL_DEBUG
+#undef FMILIB_ENABLE_LOG_LEVEL_DEBUG
+#endif
+/** 
+\def FMILIB_ENABLE_LOG_LEVEL_DEBUG
+\brief Activates debug level log messages. If not defined the debug messages are compiled out. 
+*/
+
+#if defined _MSC_VER
+	#define FMILIB_SIZET_FORMAT "%Iu"
+#else 
+	#define FMILIB_SIZET_FORMAT "%zu"
+#endif
+
+/* #undef FMILIB_GENERATE_BUILD_STAMP */
+#ifndef FMILIB_GENERATE_BUILD_STAMP
+/* Just for Doxygen */
+#define FMILIB_GENERATE_BUILD_STAMP
+#undef FMILIB_GENERATE_BUILD_STAMP
+#endif
+/** 
+\def FMILIB_GENERATE_BUILD_STAMP
+\brief Generate build-stamp file and enable fmilib_get_build_stamp(). 
+*/
+
+#ifdef FMILIB_GENERATE_BUILD_STAMP
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \brief Get the library build stamp. 
+	\return A string giving SVN revision and build time for the library.
+	
+	The function is only active if the library was configured with #FMILIB_GENERATE_BUILD_STAMP ON
+*/
+FMILIB_EXPORT const char* fmilib_get_build_stamp(void);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#define HAVE_VA_COPY
+/* #undef HAVE___VA_COPY */
+
+#define HAVE_VSNPRINTF
+#ifdef HAVE_VSNPRINTF
+#define jm_rpl_vsnprintf vsnprintf
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/include/fmilib_config.h b/Buildings/Resources/src/fmi-library/include/fmilib_config.h
new file mode 100644
index 00000000000..b86ea3b4079
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/include/fmilib_config.h
@@ -0,0 +1,22 @@
+/*
+   The file fmilib_config.h from the fmi-library is platform specific.
+   This file is a wrapper that includes the correct file.
+*/
+
+#ifndef CONFIG_FMILIB_PORATABLE_H_
+#define CONFIG_FMILIB_PORATABLE_H_
+
+#include <stdint.h>
+#if UINTPTR_MAX == 0xffffffff
+#error "32 bit compilation is not supported."
+#endif
+
+#ifdef __linux__
+#include <fmilib_config-linux64.h>
+#elif _WIN32
+#include <fmilib_config-win64.h>
+#else
+#include <fmilib_config-darwin64.h>
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/fmi-library/src/fmilib_config.h b/Buildings/Resources/src/fmi-library/src/fmilib_config.h
new file mode 100644
index 00000000000..b86ea3b4079
--- /dev/null
+++ b/Buildings/Resources/src/fmi-library/src/fmilib_config.h
@@ -0,0 +1,22 @@
+/*
+   The file fmilib_config.h from the fmi-library is platform specific.
+   This file is a wrapper that includes the correct file.
+*/
+
+#ifndef CONFIG_FMILIB_PORATABLE_H_
+#define CONFIG_FMILIB_PORATABLE_H_
+
+#include <stdint.h>
+#if UINTPTR_MAX == 0xffffffff
+#error "32 bit compilation is not supported."
+#endif
+
+#ifdef __linux__
+#include <fmilib_config-linux64.h>
+#elif _WIN32
+#include <fmilib_config-win64.h>
+#else
+#include <fmilib_config-darwin64.h>
+#endif
+
+#endif
diff --git a/Buildings/Resources/src/python/Makefile.linux b/Buildings/Resources/src/python/Makefile.linux
index b16507ff1f8..bfda66d806c 100755
--- a/Buildings/Resources/src/python/Makefile.linux
+++ b/Buildings/Resources/src/python/Makefile.linux
@@ -13,8 +13,8 @@ ARCH = $(shell getconf LONG_BIT)
 ifndef PYTHONHOME
 $(error PYTHONHOME is not set)
 endif
-PYTHONInc=$(PYTHONHOME)/include/python2.7
-PYTHONLib=$(PYTHONHOME)/lib
+PYTHONInc=$(PYTHONHOME)/include/python3.6m
+PYTHONLib=$(PYTHONHOME)/lib/x86_64-linux-gnu/
 
 # Directory where executable will be copied to
 BINDIR = ../../Library/linux$(ARCH)
@@ -23,12 +23,12 @@ BINDIR = ../../Library/linux$(ARCH)
 ## Compilation flags
 CC = gcc
 
-CC_FLAGS_32 = -Wall -std=c89 -pedantic -msse2 -mfpmath=sse -I$(PYTHONInc) -L$(PYTHONLib) -lpython2.7 -lm -m32
-CC_FLAGS_64 = -Wall -std=c89 -pedantic -msse2 -mfpmath=sse -I$(PYTHONInc) -L$(PYTHONLib) -lpython2.7 -lm -m64
+CC_FLAGS_32 = -Wall -std=c89 -pedantic -msse2 -mfpmath=sse -I$(PYTHONInc) -L$(PYTHONLib) -lpython3.6m -lm -m32
+CC_FLAGS_64 = -Wall -std=c89 -pedantic -msse2 -mfpmath=sse -I$(PYTHONInc) -L$(PYTHONLib) -lpython3.6m -lm -m64
 
 SRCS = pythonInterpreter.c
 OBJS = pythonInterpreter.o
-LIB  = libModelicaBuildingsPython2.7.so
+LIB  = libModelicaBuildingsPython3.6.so
 
 # Note that -fPIC is recommended on Linux according to the Modelica specification
 
diff --git a/Buildings/Resources/src/python/Makefile.windows.bat b/Buildings/Resources/src/python/Makefile.windows.bat
index b5db8f48af0..feb334557d2 100755
--- a/Buildings/Resources/src/python/Makefile.windows.bat
+++ b/Buildings/Resources/src/python/Makefile.windows.bat
@@ -17,19 +17,11 @@ SET /A errno=0
 SET SRCS=pythonInterpreter.c
 SET LIBS=pythonInterpreter.lib
 
-<<<<<<< HEAD
-SET MOD_DLL=ModelicaBuildingsPython2.7.dll
-SET MOD_LIB=ModelicaBuildingsPython2.7.lib
-
-SET DUMMY_SRC=dummy.c
-SET DUMMY_DLL=python2.7.dll
-=======
 SET MOD_DLL=ModelicaBuildingsPython3.6.dll
 SET MOD_LIB=ModelicaBuildingsPython3.6.lib
 
 SET DUMMY_SRC=dummy.c
 SET DUMMY_DLL=python3.6.dll
->>>>>>> master
 
 REM The first parameter is the architecture flag (x86 or x64).
 REM + Architecture related paths must be specified before running the batch file:
@@ -47,11 +39,16 @@ REM   activate {name of Python 64-bit environment}
 REM   set PYTHONHOME=%HOME%\Miniconda2\envs\{name of Python 64-bit environment}
 REM   set CLPATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 
+SET PYTHONHOME="C:\Miniconda3-4-3-31"
+SET CLPATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\vcvars64.bat"
+
 IF NOT -%1-==-- (
   IF "%~1"=="x86" SET ARCH=%~1
   IF "%~1"=="x64" SET ARCH=%~1
 )
 
+SET ARCH=x64
+
 VERIFY OTHER 2>nul
 SETLOCAL ENABLEEXTENSIONS
 IF ERRORLEVEL 1 ECHO Unable to enable extensions.
@@ -86,11 +83,7 @@ IF %ARCH%==x64 (
 ECHO DLL will be saved in: %BINDIR%.
 
 SET PYTHONInc=%PYTHONHOME%\include
-<<<<<<< HEAD
-SET PYTHONLibs=%PYTHONHOME%\libs\python27.lib
-=======
 SET PYTHONLibs=%PYTHONHOME%\libs\python36.lib
->>>>>>> master
 
 CALL %CLPATH%
 IF %ERRORLEVEL% neq 0 (
diff --git a/Buildings/Resources/src/python/ModelicaBuildingsPython3.6.def b/Buildings/Resources/src/python/ModelicaBuildingsPython3.6.def
new file mode 100644
index 00000000000..e651ccff27d
--- /dev/null
+++ b/Buildings/Resources/src/python/ModelicaBuildingsPython3.6.def
@@ -0,0 +1,2 @@
+EXPORTS
+  pythonExchangeValuesNoModelica
diff --git a/Buildings/Resources/src/python/pythonInterpreter.c b/Buildings/Resources/src/python/pythonInterpreter.c
index 2373d921b72..0f3f0e64a95 100644
--- a/Buildings/Resources/src/python/pythonInterpreter.c
+++ b/Buildings/Resources/src/python/pythonInterpreter.c
@@ -7,6 +7,13 @@
 #define putenv(x) (_putenv(x))
 #endif
 
+#if PY_MAJOR_VERSION >= 3
+#define PyInt_AsLong(x) (PyLong_AsLong((x)))
+#define PyString_FromString(x) (PyUnicode_FromString(x))
+#define PyString_AsString(x) (PyBytes_AsString(x))
+#define PyInt_Check(x) (PySet_Check(x))
+#endif
+
 extern char **environ;
 
 /*
diff --git a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
index 2ddcbed0085..27cbd5824b6 100644
--- a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
+++ b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
@@ -36,8 +36,7 @@ model MixedAirCO2
     Ti=120,
     yMax=10,
     yMin=0,
-    reverseAction=true,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI)
+    reverseActing=false)
     "PI controller for fresh air supply, with negative minimum because of reverse action"
     annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
   Buildings.Controls.OBC.CDL.Continuous.AddParameter addFlo(
diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600.mo
index 83fb9e0575e..41574ae0fff 100644
--- a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600.mo
@@ -6,22 +6,18 @@ model Case600 "Case 600FF, but with dual-setpoint for heating and cooling"
     annualCoo(Min=-6.137*3.6e9, Max=-7.964*3.6e9, Mean=-6.832*3.6e9),
     peakHea(Min=3.437*1000, Max=4.354*1000, Mean=4.000*1000),
     peakCoo(Min=-5.965*1000, Max=-6.827*1000, Mean=-6.461*1000)));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conHea(
-    Td=60,
-    yMax=1,
-    yMin=0,
+  Buildings.Controls.OBC.CDL.Continuous.PID conHea(
+    k=0.1,
     Ti=300,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    k=0.1) "Controller for heating"
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI)
+    "Controller for heating"
     annotation (Placement(transformation(extent={{-72,30},{-64,38}})));
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conCoo(
-    Td=60,
-    yMax=1,
-    yMin=0,
-    reverseAction=true,
+  Buildings.Controls.OBC.CDL.Continuous.PID conCoo(
+    k=0.1,
     Ti=300,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    k=0.1) "Controller for cooling"
+    reverseActing=false,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI)
+    "Controller for cooling"
     annotation (Placement(transformation(extent={{-72,8},{-64,16}})));
   Buildings.Controls.OBC.CDL.Continuous.Gain gaiHea(k=1E6) "Gain for heating"
     annotation (Placement(transformation(extent={{-58,30},{-50,38}})));
@@ -53,10 +49,10 @@ model Case600 "Case 600FF, but with dual-setpoint for heating and cooling"
     annotation (Placement(transformation(extent={{-92,30},{-84,38}})));
   BaseClasses.DaySchedule TSetCoo(table=[0.0,273.15 + 27]) "Cooling setpoint"
     annotation (Placement(transformation(extent={{-92,8},{-84,16}})));
-  Controls.OBC.CDL.Continuous.MovingMean PHea(delta=3600)
+  Buildings.Controls.OBC.CDL.Continuous.MovingMean PHea(delta=3600)
   "Hourly averaged heating power"
     annotation (Placement(transformation(extent={{-20,48},{-12,56}})));
-  Controls.OBC.CDL.Continuous.MovingMean PCoo(delta=3600)
+  Buildings.Controls.OBC.CDL.Continuous.MovingMean PCoo(delta=3600)
   "Hourly averaged cooling power"
     annotation (Placement(transformation(extent={{-20,-8},{-12,0}})));
 equation
@@ -131,7 +127,7 @@ equation
 <li>
 April 8, 2020, by Michael Wetter:<br/>
 Removed <code>initType</code> in PID controller.
-</li>   
+</li>
 <li>
 January 21, 2020, by Michael Wetter:<br/>
 Changed calculation of time averaged values to use
diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo
index 5e4cb5356ea..21d88a7bf8c 100644
--- a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo
@@ -183,7 +183,9 @@ model Case600FF
   Modelica.Blocks.Math.Product product
     "Product to compute infiltration mass flow rate"
     annotation (Placement(transformation(extent={{-50,-60},{-40,-50}})));
-  Buildings.Fluid.Sensors.Density density(redeclare package Medium = MediumA)
+  Buildings.Fluid.Sensors.Density density(
+    redeclare package Medium = MediumA,
+    warnAboutOnePortConnection=false)
     "Air density inside the building"
     annotation (Placement(transformation(extent={{-40,-76},{-50,-66}})));
   Buildings.BoundaryConditions.WeatherData.Bus weaBus
@@ -244,7 +246,7 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(product.y, sinInf.m_flow_in)       annotation (Line(
-      points={{-39.5,-55},{-36,-55},{-36,-55.2},{4,-55.2}},
+      points={{-39.5,-55},{-36,-55},{-36,-55.2},{2.8,-55.2}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(density.port, roo.ports[1])  annotation (Line(
diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/UsersGuide.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/UsersGuide.mo
index f12413d2d01..cad2652ea48 100644
--- a/Buildings/ThermalZones/Detailed/Validation/BESTEST/UsersGuide.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/BESTEST/UsersGuide.mo
@@ -283,7 +283,7 @@ in the table after the plots below.
 <td>2.489</td>
 <td>2.416</td>
 <td>0.000</td>
-<td>3.180</td>
+<td>3.179</td>
 </tr>
 <tr>
 <td>Case640</td>
@@ -343,7 +343,7 @@ in the table after the plots below.
 <td>2.489</td>
 <td>2.383</td>
 <td>2.516</td>
-<td>2.114</td>
+<td>2.113</td>
 </tr>
 <tr>
 <td>Case950</td>
@@ -677,7 +677,7 @@ in the table after the plots below.
 <td>26-Jul:17</td>
 <td>5.096</td>
 <td>26-Jul:16</td>
-<td>4.032</td>
+<td>4.033</td>
 <td>26-Jul:17</td>
 </tr>
 <tr>
diff --git a/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo b/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo
index ee4fc4024e2..76bfa2a5cd6 100644
--- a/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/BaseClasses/SingleZoneFloorHeater.mo
@@ -27,11 +27,9 @@ model SingleZoneFloorHeater
     annotation (Placement(transformation(extent={{-140,-110},{-100,-70}}),
     iconTransformation(extent={{-140,-110},{-100,-70}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID conPID(
+  Buildings.Controls.OBC.CDL.Continuous.PID conPID(
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     Ti=900,
-    yMax=1,
-    yMin=0,
     u_s(unit="K", displayUnit="degC"),
     u_m(unit="K", displayUnit="degC")) "Controller for heater"
     annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
diff --git a/Buildings/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo b/Buildings/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo
index ce3782aa126..2222cd9d5bb 100644
--- a/Buildings/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/LBNL_71T/RoomB/ElectroChromicWindow.mo
@@ -197,10 +197,9 @@ model ElectroChromicWindow
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea
     "Prescribed heat flow for heating and cooling"
     annotation (Placement(transformation(extent={{36,-102},{60,-78}})));
-  Controls.Continuous.LimPID           conHea(
+  Controls.Continuous.LimPID conHea(
     Td=60,
     initType=Modelica.Blocks.Types.InitPID.InitialState,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMin=-1,
     k=5,
     Ti=30) "Controller for heating"
diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.mo b/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.mo
new file mode 100644
index 00000000000..f03c3e080f2
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.mo
@@ -0,0 +1,23 @@
+within Buildings.ThermalZones.EnergyPlus.BaseClasses;
+package Validation
+  "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.ThermalZones.EnergyPlus.BaseClasses\">
+Buildings.ThermalZones.EnergyPlus.BaseClasses</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.order b/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.order
new file mode 100644
index 00000000000..16929d52e68
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.order
@@ -0,0 +1,3 @@
+FMUZoneAdapterZones1
+FMUZoneAdapterZones2
+FMUZoneAdapterZones3
diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/package.mo b/Buildings/ThermalZones/EnergyPlus/Examples/package.mo
new file mode 100644
index 00000000000..7150e634467
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Examples/package.mo
@@ -0,0 +1,15 @@
+within Buildings.ThermalZones.EnergyPlus;
+package Examples
+  "Collection of models that illustrate model use and test models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains examples for the use of models that can be found in
+<a href=\"modelica://Buildings.ThermalZones.EnergyPlus\">
+Buildings.ThermalZones.EnergyPlus</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/ThermalZones/EnergyPlus/Types/LogLevels.mo b/Buildings/ThermalZones/EnergyPlus/Types/LogLevels.mo
new file mode 100644
index 00000000000..1d7d3604605
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Types/LogLevels.mo
@@ -0,0 +1,52 @@
+within Buildings.ThermalZones.EnergyPlus.Types;
+type LogLevels=enumeration(Error
+  "Errors",Warning
+  "Warnings",Info
+  "Information",Verbose
+  "Verbose, log calls in initialization and shut-down",Debug
+  "Verbose, log everything at each time step")
+  "Enumeration for logging"
+  annotation (Documentation(info="<html>
+<p>
+Enumeration for the level of outputs written by EnergyPlus.
+The possible values are:
+</p>
+<table summary=\"log levels\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><th>LogLevels</th><th>Explanation</th></tr>
+<tr><td>Error</td><td>Logs EnergyPlus errors and fatal errors.</td></tr>
+<tr><td>Warning</td><td>Logs in addition EnergyPlus warnings.</td></tr>
+<tr><td>Info</td><td>Logs in addition EnergyPlus informational messages.</td></tr>
+<tr><td>Verbose</td><td>Logs in addition main C function calls during initialization and shut-down.</td></tr>
+<tr><td>Debug</td><td>Logs everything, including all calls during time steps which can give large log files.</td></tr>
+</table>
+</html>",revisions="<html>
+<ul>
+<li>
+July 23, 2020, by Michael Wetter:<br/>
+Revised implementation to combine errors and fatal errors, as they should both be reported always.
+</li>
+<li>
+September 25, 2019, by Michael Wetter:<br/>
+Revised implementation.
+</li>
+<li>
+August 21, 2019, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+  Icon(
+    graphics={Rectangle(
+      lineColor={200,200,200},
+      fillColor={248,248,248},
+      fillPattern=FillPattern.HorizontalCylinder,
+      extent={{-100,-100},{100,100}},radius=25.0),
+      Polygon(points={{0,76},{-80,-64},{80,-64},{0,76}},
+      fillColor={0,0,0},
+      fillPattern=FillPattern.Solid,pattern=LinePattern.None,lineColor={0,0,0}),
+      Polygon(points={{0,68},{-72,-60},{72,-60},{0,68}},lineColor={0,0,0},
+      fillColor={255,255,170},fillPattern=FillPattern.Solid),
+      Ellipse(extent={{-6,-36},{4,-46}},pattern=LinePattern.None,
+      fillColor={0,0,0},fillPattern=FillPattern.Solid),
+      Rectangle(extent={{-4,34},{2,-28}},fillColor={0,0,0},fillPattern=FillPattern.Solid,
+      pattern=LinePattern.None)}));
diff --git a/Buildings/ThermalZones/EnergyPlus/Types/Units.mo b/Buildings/ThermalZones/EnergyPlus/Types/Units.mo
new file mode 100644
index 00000000000..725d0237e51
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Types/Units.mo
@@ -0,0 +1,125 @@
+within Buildings.ThermalZones.EnergyPlus.Types;
+type Units=enumeration(Normalized
+  "Normalized, such as a control signal between 0 and 1 or status 0, 1, 2, ... (1)",AngleRad
+  "Angle (rad)",AngleDeg
+  "Angle (deg)",Energy
+  "Energy (J)",Illuminance
+  "Illuminance",HumidityAbsolute
+  "Absolute humidity (mass fraction per total mass of moist air)",HumidityRelative
+  "Relative humidity (1)",LuminousFlux
+  "Luminous flux (cd.sr)",MassFlowRate
+  "Mass flow rate (kg/s)",Power
+  "Power (W)",Pressure
+  "Pressure (Pa)",Status
+  "Status (e.g., rain) (1)",Temperature
+  "Temperature (K)",Time
+  "Time (s)",VolumeFlowRate
+  "VolumeFlowRate (m3/s)")
+  "Enumeration for units used for schedules and EMS actuators"
+  annotation (Documentation(info="<html>
+<p>
+Enumeration for the units used as inputs to the block
+<a href=\"modelica://Buildings.ThermalZones.EnergyPlus.Schedule\">Buildings.ThermalZones.EnergyPlus.Schedule</a>.
+</p>
+<p>
+The units are converted between Modelica and EnergyPlus as shown in the table below.
+</p>
+<table summary=\"Table with unit conversions\">
+<colgroup>
+<col style=\"width: 32%\" />
+<col style=\"width: 24%\" />
+<col style=\"width: 44%\" />
+</colgroup>
+<thead>
+<tr class=\"row-odd\"><th class=\"head\"><p>Quantity</p></th>
+<th class=\"head\"><p>EnergyPlus
+Unit String</p></th>
+<th class=\"head\"><p>Modelica Unit</p></th>
+</tr>
+</thead>
+<tbody>
+<tr class=\"row-even\"><td><p>Angle (rad)</p></td>
+<td><p>rad</p></td>
+<td><p>rad</p></td>
+</tr>
+<tr class=\"row-odd\"><td><p>Angle (deg)</p></td>
+<td><p>deg</p></td>
+<td><p>rad</p></td>
+</tr>
+<tr class=\"row-even\"><td><p>Energy</p></td>
+<td><p>J</p></td>
+<td><p>J</p></td>
+</tr>
+<tr class=\"row-odd\"><td><p>Illuminance</p></td>
+<td><p>lux</p></td>
+<td><p>lm/m2</p></td>
+</tr>
+<tr class=\"row-even\"><td><p>Humidity (absolute)</p></td>
+<td><p>kgWater/kgDryAir</p></td>
+<td><p>1 (converted to mass fraction
+per total mass of moist air)</p></td>
+</tr>
+<tr class=\"row-odd\"><td><p>Humidity (relative)</p></td>
+<td><p>%</p></td>
+<td><p>1</p></td>
+</tr>
+<tr class=\"row-even\"><td><p>Luminous flux</p></td>
+<td><p>lum</p></td>
+<td><p>cd.sr</p></td>
+</tr>
+<tr class=\"row-odd\"><td><p>Mass flow rate</p></td>
+<td><p>kg/s</p></td>
+<td><p>kg/s</p></td>
+</tr>
+<tr class=\"row-even\"><td><p>Power</p></td>
+<td><p>W</p></td>
+<td><p>W</p></td>
+</tr>
+<tr class=\"row-odd\"><td><p>Pressure</p></td>
+<td><p>Pa</p></td>
+<td><p>Pa</p></td>
+</tr>
+<tr class=\"row-even\"><td><p>Status (e.g., rain)</p></td>
+<td><p>(no character)</p></td>
+<td><p>1</p></td>
+</tr>
+<tr class=\"row-odd\"><td><p>Temperature</p></td>
+<td><p>degC</p></td>
+<td><p>K</p></td>
+</tr>
+<tr class=\"row-even\"><td><p>Time</p></td>
+<td><p>s</p></td>
+<td><p>s</p></td>
+</tr>
+<tr class=\"row-odd\"><td><p>Volume flow rate</p></td>
+<td><p>m3/s</p></td>
+<td><p>m3/s</p></td>
+</tr>
+</tbody>
+</table>
+</html>",revisions="<html>
+<ul>
+<li>
+November 8, 2019, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+Icon(
+  graphics={Rectangle(lineColor={200,200,200},fillColor={248,248,248},
+  fillPattern=FillPattern.HorizontalCylinder,extent={{-100,-100},{100,100}},radius=25.0),
+  Polygon(fillColor={128,128,128},pattern=LinePattern.None,fillPattern=FillPattern.Solid,
+  points={{-80,-40},{-80,-40},{-55,50},{-52.5,62.5},{-65,60},{-65,65},{-35,77.5},{-32.5,60},{-50,0},
+  {-50,0},{-30,15},{-20,27.5},{-32.5,27.5},{-32.5,27.5},{-32.5,32.5},{-32.5,32.5},{2.5,32.5},
+  {2.5,32.5},{2.5,27.5},{2.5,27.5},{-7.5,27.5},{-30,7.5},{-30,7.5},{-25,-25},{-17.5,-28.75},
+  {-10,-25},{-5,-26.25},{-5,-32.5},{-16.25,-41.25},{-31.25,-43.75},{-40,-33.75},{-45,-5},
+  {-45,-5},{-52.5,-10},{-52.5,-10},{-60,-40},{-60,-40}},smooth=Smooth.Bezier),
+  Polygon(fillColor={128,128,128},pattern=LinePattern.None,fillPattern=FillPattern.Solid,
+  points={{87.5,30},{62.5,30},{62.5,30},{55,33.75},{36.25,35},{16.25,25},{7.5,6.25},{11.25,-7.5},
+  {22.5,-12.5},{22.5,-12.5},{6.25,-22.5},{6.25,-35},{16.25,-38.75},{16.25,-38.75},{21.25,-41.25},
+  {21.25,-41.25},{45,-48.75},{47.5,-61.25},{32.5,-70},{12.5,-65},{7.5,-51.25},{21.25,-41.25},
+  {21.25,-41.25},{16.25,-38.75},{16.25,-38.75},{6.25,-41.25},{-6.25,-50},{-3.75,-68.75},
+  {30,-76.25},{65,-62.5},{63.75,-35},{27.5,-26.25},{22.5,-20},{27.5,-15},{27.5,-15},{30,-7.5},
+  {30,-7.5},{27.5,-2.5},{28.75,11.25},{36.25,27.5},{47.5,30},{53.75,22.5},{51.25,8.75},{45,-6.25},
+  {35,-11.25},{30,-7.5},{30,-7.5},{27.5,-15},{27.5,-15},{43.75,-16.25},{65,-6.25},{72.5,10},{70,20},
+  {70,20},{80,20}},smooth=Smooth.Bezier)}));
diff --git a/Buildings/ThermalZones/EnergyPlus/Types/package.mo b/Buildings/ThermalZones/EnergyPlus/Types/package.mo
new file mode 100644
index 00000000000..3599eff1276
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Types/package.mo
@@ -0,0 +1,21 @@
+within Buildings.ThermalZones.EnergyPlus;
+package Types
+  "Package with type definitions"
+  extends Modelica.Icons.TypesPackage;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains type definitions.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+August 21, 2019, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Types;
diff --git a/Buildings/ThermalZones/EnergyPlus/Types/package.order b/Buildings/ThermalZones/EnergyPlus/Types/package.order
new file mode 100644
index 00000000000..ea8753bb2c9
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Types/package.order
@@ -0,0 +1,2 @@
+LogLevels
+Units
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo b/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo
new file mode 100644
index 00000000000..a6c11a2cf60
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo
@@ -0,0 +1,42 @@
+within Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings;
+model TwoIdenticalTwoZoneBuildings
+  "Validation model with two identical buildings, each having two thermal zones"
+  extends Modelica.Icons.Example;
+  constant Integer n=2
+    "Number of buildings";
+  Zone bui[n]
+    "Buildings"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  model Zone
+    "Model of a thermal zone"
+    extends Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.TwoIdenticalZones;
+    extends Modelica.Blocks.Icons.Block;
+  end Zone;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+Model that validates that multiple buildings can be simulated that use the same EnergyPlus idf file.
+The model has two identical buildings, each having two thermal zones.
+</p>
+<p>
+This model has been added because a building with multiple thermal zones executes
+C code that is not executed if there is only one thermal zone, as is the case in
+<a href=\"modelica://Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings\">
+Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+October 1, 2019, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos" "Simulate and plot"),
+    experiment(
+      StopTime=172800,
+      Tolerance=1e-06));
+end TwoIdenticalTwoZoneBuildings;
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.mo b/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.mo
new file mode 100644
index 00000000000..fd95c92ba65
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.mo
@@ -0,0 +1,13 @@
+within Buildings.ThermalZones.EnergyPlus.Validation;
+package MultipleBuildings
+  "Collection of validation models for multiple EnergyPlus buildings"
+  extends Modelica.Icons.Package;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for multiple EnergyPlus buildings in one Modelica model.
+</p>
+</html>"));
+end MultipleBuildings;
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.order b/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.order
new file mode 100644
index 00000000000..44c29266a37
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.order
@@ -0,0 +1,3 @@
+ThreeZonesTwoBuildings
+TwoIdenticalOneZoneBuildings
+TwoIdenticalTwoZoneBuildings
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo b/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo
new file mode 100644
index 00000000000..1422205c00b
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo
@@ -0,0 +1,33 @@
+within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+model OneZoneTwoDifferentOutputVariables
+  "Validation model for one zone with two different output variables"
+  extends OneZoneOneOutputVariable;
+  Buildings.ThermalZones.EnergyPlus.OutputVariable incBeaSou(
+    name="Surface Outside Face Incident Beam Solar Radiation Rate per Area",
+    key="Living:South",
+    y(
+      final unit="W/m2"))
+    "Block that reads incident beam solar radiation on south window from EnergyPlus"
+    annotation (Placement(transformation(extent={{60,0},{80,20}})));
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+Simple test case for one building with one thermal zone and two different output variables.
+This test case validates that the outputs are correct if requested from different
+EnergyPlus variables.
+</p>
+</html>",
+      revisions="<html>
+<ul><li>
+December 13, 2019, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos" "Simulate and plot"),
+    experiment(
+      StopTime=432000,
+      Tolerance=1e-06));
+end OneZoneTwoDifferentOutputVariables;
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo b/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo
new file mode 100644
index 00000000000..36fee11cc56
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo
@@ -0,0 +1,33 @@
+within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+model OneZoneTwoIdenticalOutputVariables
+  "Validation model for one zone with two identical output variables"
+  extends OneZoneOneOutputVariable;
+  Buildings.ThermalZones.EnergyPlus.OutputVariable equEle2(
+    name="Zone Electric Equipment Electricity Rate",
+    key="LIVING ZONE",
+    y(
+      final unit="W"))
+    "Block that reads output from EnergyPlus"
+    annotation (Placement(transformation(extent={{60,0},{80,20}})));
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+Simple test case for one building with one thermal zone and two identical output variables.
+This test case validates that the outputs are correct even if requested twice
+from the same EnergyPlus variable.
+</p>
+</html>",
+      revisions="<html>
+<ul><li>
+December 13, 2019, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos" "Simulate and plot"),
+    experiment(
+      StopTime=432000,
+      Tolerance=1e-06));
+end OneZoneTwoIdenticalOutputVariables;
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.mo b/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.mo
new file mode 100644
index 00000000000..3b7b8fa9c1b
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.mo
@@ -0,0 +1,13 @@
+within Buildings.ThermalZones.EnergyPlus.Validation;
+package OutputVariable
+  "Collection of validation models for EnergyPlus output variables"
+  extends Modelica.Icons.Package;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for EnergyPlus output variables.
+</p>
+</html>"));
+end OutputVariable;
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.mo b/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.mo
new file mode 100644
index 00000000000..382d6acde68
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.mo
@@ -0,0 +1,13 @@
+within Buildings.ThermalZones.EnergyPlus.Validation;
+package Schedule
+  "Collection of validation models for EnergyPlus schedules"
+  extends Modelica.Icons.Package;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for EnergyPlus schedules.
+</p>
+</html>"));
+end Schedule;
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.mo b/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.mo
new file mode 100644
index 00000000000..6eee787fcf0
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.mo
@@ -0,0 +1,13 @@
+within Buildings.ThermalZones.EnergyPlus.Validation;
+package ThermalZone
+  "Collection of validation models for EnergyPlus thermal zones"
+  extends Modelica.Icons.Package;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for EnergyPlus thermal zones.
+</p>
+</html>"));
+end ThermalZone;
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/package.mo b/Buildings/ThermalZones/EnergyPlus/Validation/package.mo
new file mode 100644
index 00000000000..fbd777043be
--- /dev/null
+++ b/Buildings/ThermalZones/EnergyPlus/Validation/package.mo
@@ -0,0 +1,23 @@
+within Buildings.ThermalZones.EnergyPlus;
+package Validation
+  "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.ThermalZones.EnergyPlus\">
+Buildings.ThermalZones.EnergyPlus</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo b/Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo
index c89af2ccff9..712da853b73 100644
--- a/Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo
+++ b/Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo
@@ -59,7 +59,7 @@ model SimpleRoomFourElements
     AWin={7,7},
     ATransparent={7,7},
     AExt={3.5,8},
-    redeclare package Medium = Modelica.Media.Air.SimpleAir,
+    redeclare replaceable package Medium = Modelica.Media.Air.SimpleAir,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     extWallRC(thermCapExt(each der_T(fixed=true))),
     intWallRC(thermCapInt(each der_T(fixed=true))),
diff --git a/Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo b/Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo
new file mode 100644
index 00000000000..b6c3b24042c
--- /dev/null
+++ b/Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo
@@ -0,0 +1,113 @@
+within Buildings.ThermalZones.ReducedOrder.Examples;
+model SimpleRoomFourElementsTraceSubstance
+  "Illustrates the use of a thermal zone considering a trace substance"
+  extends Modelica.Icons.Example;
+  extends Buildings.ThermalZones.ReducedOrder.Examples.SimpleRoomFourElements(thermalZoneFourElements(
+      redeclare package Medium = Medium,
+      use_C_flow=true,
+      nPorts=2));
+
+  replaceable package Medium = Buildings.Media.Air (
+    extraPropertiesNames={"C_flow"}) "Medium model"
+    annotation (choicesAllMatching=true);
+
+  parameter Real airChaRat(final unit="1/s") = 2/3600 "Air change rate";
+
+  Modelica.Blocks.Sources.Pulse traSub(
+    amplitude=10.4*2*(28.949/44.01),
+    width=50,
+    period=86400,
+    offset=0) "Source of trace substance (for example CO2)"
+    annotation (Placement(transformation(extent={{-88,-58},{-68,-38}})));
+  Buildings.Fluid.Sources.MassFlowSource_T souAir(
+    redeclare package Medium = Medium,
+    use_C_in=true,
+    m_flow=airChaRat*rho_default*thermalZoneFourElements.VAir,
+    nPorts=1) "Source of air"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,-70})));
+  Buildings.Fluid.Sources.Boundary_pT sinAir(
+    redeclare package Medium = Medium,
+    C={400},
+    nPorts=1) "Sink of air"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=180,
+        origin={-28,-90})));
+  Modelica.Blocks.Sources.Ramp traSubAmb(
+    height=200,
+    duration(displayUnit="d") = 259200,
+    offset=200) "Source for CO2 concentration in fresh air"
+    annotation (Placement(transformation(extent={{-88,-88},{-68,-68}})));
+
+protected
+  final parameter Medium.ThermodynamicState state_default = Medium.setState_pTX(
+      T=Medium.T_default,
+      p=Medium.p_default,
+      X=Medium.X_default[1:Medium.nXi]) "Medium state at default values";
+
+  final parameter Modelica.SIunits.Density rho_default=Medium.density(
+    state=state_default) "Density, used to compute fluid mass";
+
+equation
+  connect(traSub.y, thermalZoneFourElements.C_flow[1])
+    annotation (Line(points={{-67,-48},{0,-48},{0,26},{43,26}},color={0,0,127}));
+  connect(souAir.ports[1], thermalZoneFourElements.ports[1])
+    annotation (Line(points={{-20,-70},{2,-70},{2,-24},{44,-24},{44,-4},{84,-4},
+          {84,-1.95},{83,-1.95}},                                                      color={0,127,255}));
+  connect(sinAir.ports[1], thermalZoneFourElements.ports[2])
+    annotation (Line(points={{-18,-90},{4,-90},{4,-26},{46,-26},{46,-4},{86,-4},
+          {86,-1.95},{83,-1.95}},                                                      color={0,127,255}));
+  connect(traSubAmb.y, souAir.C_in[1])
+    annotation (Line(points={{-67,-78},{-42,-78}}, color={0,0,127}));
+  annotation ( Documentation(info="<html>
+<p>
+This example shows the application of
+<a href=\"Buildings.ThermalZones.ReducedOrder.RC.FourElements\">
+Buildings.ThermalZones.ReducedOrder.RC.FourElements</a>
+considering a trace substance such as CO2
+in combination with
+<a href=\"Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007WithWindow\">
+Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007WithWindow</a>
+and
+<a href=\"Buildings.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane\">
+Buildings.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane</a>.
+Solar radiation on tilted surface is calculated using models of
+Buildings. The thermal zone is a simple room defined in Guideline
+VDI 6007 Part 1 (VDI, 2012).
+The trace substance calculation is based on the CO2 emissions of 2 persons.
+They stay in the thermal zone for 12 hours every 24 hours. The air exchange rate is 2 air changes per hour.
+All further models, parameters and inputs
+except sunblinds, separate handling of heat transfer through
+windows, no wall element for internal walls and solar radiation
+are similar to the ones defined for the guideline&apos;s test
+room. For solar radiation, the example relies on the standard
+weather file in Buildings.
+</p>
+<p>
+The idea of the example is to show a typical application of all
+sub-models and to use the example in unit tests. The results are
+reasonable, but not related to any real use case or measurement
+data.
+</p>
+<h4>References</h4>
+<p>VDI. German Association of Engineers Guideline VDI 6007-1
+March 2012. Calculation of transient thermal response of rooms
+and buildings - modelling of rooms.</p>
+</html>",   revisions="<html>
+<ul>
+<li>
+April 15, 2020, by Katharina Brinkmann:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+  experiment(Tolerance=1e-6, StopTime=604800),
+  __Dymola_Commands(file=
+  "modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mos"
+        "Simulate and plot"),
+    Diagram(coordinateSystem(extent={{-100,-120},{100,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
+end SimpleRoomFourElementsTraceSubstance;
diff --git a/Buildings/ThermalZones/ReducedOrder/Examples/package.order b/Buildings/ThermalZones/ReducedOrder/Examples/package.order
index 7f7c3d436cf..d0f4429ce2b 100644
--- a/Buildings/ThermalZones/ReducedOrder/Examples/package.order
+++ b/Buildings/ThermalZones/ReducedOrder/Examples/package.order
@@ -1,4 +1,5 @@
 SimpleRoomFourElements
+SimpleRoomFourElementsTraceSubstance
 SimpleRoomOneElement
 SimpleRoomThreeElements
 SimpleRoomTwoElements
diff --git a/Buildings/ThermalZones/ReducedOrder/RC/OneElement.mo b/Buildings/ThermalZones/ReducedOrder/RC/OneElement.mo
index df18daab1be..782b1616d15 100644
--- a/Buildings/ThermalZones/ReducedOrder/RC/OneElement.mo
+++ b/Buildings/ThermalZones/ReducedOrder/RC/OneElement.mo
@@ -59,6 +59,10 @@ model OneElement "Thermal Zone with one element for exterior walls"
     "If true, input connector QLat_flow is enabled and room air computes moisture balance"
     annotation(choices(checkBox = true));
 
+  parameter Boolean use_C_flow = false
+    "Set to true to enable input connector for trace substance"
+    annotation(Evaluate=true, Dialog(tab="Advanced"));
+
   Modelica.Blocks.Interfaces.RealInput solRad[nOrientations](
     each final quantity="RadiantEnergyFluenceRate",
     each final unit="W/m2") if sum(ATransparent) > 0
@@ -139,7 +143,7 @@ model OneElement "Thermal Zone with one element for exterior walls"
     final C_start=C_start,
     final C_nominal=C_nominal,
     final mSenFac=mSenFac,
-    final use_C_flow=false) if VAir > 0 and not use_moisture_balance
+    final use_C_flow=use_C_flow) if VAir > 0 and not use_moisture_balance
     "Indoor air volume"
     annotation (Placement(transformation(extent={{42,-26},{22,-6}})));
   Fluid.MixingVolumes.MixingVolumeMoistAir volMoiAir(
@@ -155,7 +159,7 @@ model OneElement "Thermal Zone with one element for exterior walls"
     final C_start=C_start,
     final C_nominal=C_nominal,
     final mSenFac=mSenFac,
-    final use_C_flow=false) if VAir > 0 and use_moisture_balance
+    final use_C_flow=use_C_flow) if VAir > 0 and use_moisture_balance
     "Indoor air volume"
     annotation (Placement(transformation(extent={{-20,-26},{0,-6}})));
   Modelica.Thermal.HeatTransfer.Components.ThermalResistor resWin(final R=RWin) if
@@ -192,6 +196,10 @@ model OneElement "Thermal Zone with one element for exterior walls"
     final T_start=T_start) if ATotExt > 0 "RC-element for exterior walls"
     annotation (Placement(transformation(extent={{-158,-50},{-178,-28}})));
 
+  Modelica.Blocks.Interfaces.RealInput[Medium.nC] C_flow if use_C_flow
+    "Trace substance mass flow rate added to the thermal zone"
+    annotation (Placement(transformation(extent={{-280,70},{-240,110}}), iconTransformation(extent={{-260,90},{-240,110}})));
+
 protected
   constant Modelica.SIunits.SpecificEnergy h_fg=
     Buildings.Media.Air.enthalpyOfCondensingGas(273.15+37) "Latent heat of water vapor";
@@ -410,13 +418,11 @@ equation
     pattern=LinePattern.Dash));
   connect(sumSolRad.y, convHeatSol.Q_flow)
     annotation (Line(points={{-173.4,124},{-166,124}}, color={0,0,127}));
-  if use_moisture_balance then
-    connect(mWat_flow.y, volMoiAir.mWat_flow) annotation (Line(
+  connect(mWat_flow.y, volMoiAir.mWat_flow) annotation (Line(
         points={{-179,-90},{-168,-90},{-168,-80},{-34,-80},{-34,-8},{-22,-8}},
         color={0,0,127},
         pattern=LinePattern.Dash));
 
-  end if;
   connect(conQLat_flow.port, volMoiAir.heatPort) annotation (Line(points={{-182,
           -120},{-166,-120},{-166,-82},{-32,-82},{-32,-16},{-20,-16}}, color={191,
           0,0}));
@@ -425,6 +431,10 @@ equation
   connect(conQLat_flow.Q_flow, QLat_flow)
     annotation (Line(points={{-202,-120},{-232,-120},{-232,-130},{-260,-130}},
                                                        color={0,0,127}));
+  connect(volMoiAir.C_flow, C_flow) annotation (Line(points={{-22,-22},{-52,-22},
+          {-52,90},{-260,90}}, color={0,0,127}));
+  connect(volAir.C_flow, C_flow) annotation (Line(points={{44,-22},{56,-22},{56,
+          90},{-260,90}}, color={0,0,127}));
   annotation (defaultComponentName="theZon",Diagram(coordinateSystem(
   preserveAspectRatio=false, extent={{-240,-180},{240,180}},
   grid={2,2}),  graphics={
diff --git a/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase11.mo b/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase11.mo
index f7169220bc0..9f455ca454d 100644
--- a/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase11.mo
+++ b/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase11.mo
@@ -114,7 +114,6 @@ model TestCase11 "VDI 6007 Test Case 11 model"
   Controls.Continuous.LimPID conHeaCoo(
     yMin=-1,
     Td=5,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMax=1,
     k=0.1,
     Ti=1.2)
diff --git a/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase7.mo b/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase7.mo
index 98221d04081..ea8289a9098 100644
--- a/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase7.mo
+++ b/Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase7.mo
@@ -95,7 +95,6 @@ model TestCase7 "VDI 6007 Test Case 7 model"
     "Convert set temperature from degC to Kelvin"
     annotation (Placement(transformation(extent={{-38,-42},{-26,-30}})));
   Controls.Continuous.LimPID conHeaCoo(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     yMax=1,
     yMin=-1,
     k=0.1,
diff --git a/Buildings/Utilities/Comfort/Examples/Fanger.mo b/Buildings/Utilities/Comfort/Examples/Fanger.mo
index 3379fe9e586..f4d9e095bfe 100644
--- a/Buildings/Utilities/Comfort/Examples/Fanger.mo
+++ b/Buildings/Utilities/Comfort/Examples/Fanger.mo
@@ -83,6 +83,14 @@ equation
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/Comfort/Examples/Fanger.mos"
         "Simulate and plot"),
     Documentation(info="<html>
+<p>
 This is a test of the Thermal Comfort Model.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>March 03, 2005, by Michael Wetter and Sorin Costiner:<br/>
+First implementation.
+</li>
+</ul>
 </html>"));
 end Fanger;
diff --git a/Buildings/Utilities/Comfort/Fanger.mo b/Buildings/Utilities/Comfort/Fanger.mo
index d1b504d22bc..62eacf7b3f5 100644
--- a/Buildings/Utilities/Comfort/Fanger.mo
+++ b/Buildings/Utilities/Comfort/Fanger.mo
@@ -54,7 +54,7 @@ extends Buildings.BaseClasses.BaseIcon;
         iconTransformation(extent={{-120,50},{-100,70}})));
 
   Modelica.SIunits.Temperature TOpe "Operative temperature";
-  Modelica.SIunits.Temperature TClo "Surface temperature of clothing";
+  Modelica.SIunits.Temperature TClo(start=273.15+40) "Surface temperature of clothing";
   Modelica.SIunits.Temperature TSki(
     min=273.15+10,
     max=273.15+42) "Skin temperature";
@@ -108,7 +108,6 @@ protected
     "Model to compute the steam mass fraction";
   Real fCl1 "work variable for fCl";
   Real fCl2 "work variable for fCl";
-  Real aux "Auxiliary variable used to eliminate common subexpressions";
 
   Modelica.Blocks.Interfaces.RealInput vAir_in_internal
     "Needed to connect to conditional connector";
@@ -126,6 +125,7 @@ protected
 
 initial equation
  assert(W <= 0, "Parameter W must be equal to zero or negative.");
+
 equation
   // Conditional connectors
   connect(vAir_in, vAir_in_internal);
@@ -161,41 +161,41 @@ equation
 
   // fcl eq (61)
   fCl = fCl1 + (fCl2 - fCl1)*Buildings.Utilities.Math.Functions.smoothHeaviside(
-                                 x=(ICl_in_internal - 0.5), delta=0.01);
-  // hCon, table 6, Mitchell
-  hCon = 8.3*Buildings.Utilities.Math.Functions.smoothMax(x1=vAir_in_internal*vAir_in_internal,
-                                                          x2=0.0375213,
-                                                          deltaX=0.01)^0.3;
+    x=(ICl_in_internal - 0.5),
+    delta=0.01);
+
+
+  hCon = Buildings.Utilities.Math.Functions.smoothMax(
+    x1=12.1*sqrt(abs(vAir_in_internal)),
+    x2=2.38*abs(TClo - TAir)^0.25,
+    deltaX=0.0001);
+
   hCom = hRad + hCon;
 
   // operative temperature (8)
   TOpe = (hRad*TRad + hCon*TAir)/hCom;
 
   // Clothing temperature (59)
-  aux = - 3.05*(5.73 - 0.007*(M_in_internal - W) - pSte*1E-3)
-        - 0.42*((M_in_internal - W) - 58.15)
-        - 0.0173*M_in_internal*(5.87 - pSte*1E-3)
-        - 0.0014*M_in_internal*(307.15 - TAir);
+  TClo = 35.7 - 0.028 * (M_in_internal-W) - RCl*((3.96E-8*fCl*((TClo)^4 - (TRad)^4))+ fCl*hCon*(TClo - TAir)) + 273.15;
+
 
-  TClo = Modelica.SIunits.Conversions.from_degC(35.7 - 0.0275 * (M_in_internal-W)
-                 - RCl * (  (M_in_internal-W)
-                 + aux));
-  // heat load on body, see (58)
   L = (M_in_internal - W)
-      - 3.96*1e-8*fCl*(TClo^4 - TRad^4)
-      - fCl*hCon*(TClo - TAir)
-      + aux;
+       - 3.05E-3*(5733 - 6.99*(M_in_internal - W) - pSte)
+        - 0.42*((M_in_internal - W) - 58.15)
+        - 1.7E-5*M_in_internal*(5867 - pSte)
+        - 0.0014*M_in_internal*(307.15 - TAir)
+        - 3.96E-8*fCl*(TClo^4 - TRad^4)
+        - fCl*hCon*(TClo - TAir);
 
-  // PMV (62)
-  PMV = (0.303*Modelica.Math.exp(-0.036*M) + 0.028)*L;
-  // PPD (64)
+  PMV = (0.303*Modelica.Math.exp(-0.036*M_in_internal) + 0.028)*L;
   PPD = 1 - 0.95*Modelica.Math.exp(-(0.03353*PMV^4 + 0.2179*PMV^2));
+
   annotation (
 defaultComponentName="com",
     Documentation(info="<html>
 <p>
 Thermal comfort model according to Fanger, as described in
-the ASHRAE Fundamentals (1997).
+the ASHRAE Fundamentals (2017).
 </p>
 <p>
 The thermal sensation of a human being is mainly related to the thermal balance of its
@@ -219,7 +219,7 @@ of a large group of people.
 </p>
 <p>
 To determine appropriate thermal conditions, practitioners refer to standards such
-as ASHRAE Standard 55 (ASHRAE, 1992) and ISO Standard 7730 (ISO, 1994).
+as ASHRAE Standard 55 (ASHRAE, 2017) and ISO Standard 7730 (ISO, 1994).
 These standards define temperature ranges that should result in thermal satisfaction
 for at least 80% of occupants in a space.
 </p>
@@ -337,6 +337,10 @@ per unit surface area of a seated person at rest.</p>
 <h4>References</h4>
 
 <ul><li>
+ANSI/ASHRAE Standard 55-2017:Thermal Environmental Conditions for Human Occupancy.
+ American Society of Heating, Refrigerating and Air-Conditioning Engineers,2017.
+</li>
+<li>
 ASHRAE Handbook, Fundamentals (SI Edition).
  American Society of Heating, Refrigerating and Air-Conditioning Engineers,
 Chapter 8, Thermal Comfort; pages 8.1-8.26; Atlanta, USA, 1997.
@@ -347,23 +351,17 @@ Moderate Thermal Environments: Determination of the PMV and PPD Indices
 and Specification of the Conditions for Thermal Comfort (ISO 7730).
 Geneva, Switzerland: ISO. 1994.
 </li>
-<li>
-Charles, K.E. Fanger Thermal Comfort and Draught Models. Institute for Research in Construction
-National Research Council of Canada, Ottawa, K1A 0R6, Canada.
-IRC Research Report RR-162. October 2003.
-<a href=\"http://irc.nrc-cnrc.gc.ca/ircpubs\">http://irc.nrc-cnrc.gc.ca/ircpubs</a>.
-</li>
-<li>
-Data, References and Links at: Thermal Comfort; Dr. Sam C M Hui
-Department of Mechanical Engineering
-The University of Hong Kong MEBS6006 Environmental Services I;
-<a href=\"http://me.hku.hk/msc-courses/MEBS6006/index.html\">
-http://me.hku.hk/msc-courses/MEBS6006/index.html</a>
-</li>
 </ul>
+
 </html>", revisions="<html>
 <ul>
 <li>
+May 27, 2020, by Donghun Kim and Michael Wetter:<br/>
+Updated model equations to ANSI/ASHRAE Standard 55-2017.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1936\">#1936</a>.
+</li>
+<li>
 May 30, 2014, by Michael Wetter:<br/>
 Removed undesirable annotation <code>Evaluate=true</code>.
 Added default value for <code>ICl</code>.
diff --git a/Buildings/Utilities/Comfort/Validation/FangerCBE.mo b/Buildings/Utilities/Comfort/Validation/FangerCBE.mo
new file mode 100644
index 00000000000..a630fcb5336
--- /dev/null
+++ b/Buildings/Utilities/Comfort/Validation/FangerCBE.mo
@@ -0,0 +1,108 @@
+within Buildings.Utilities.Comfort.Validation;
+model FangerCBE
+  "Script for comparing the PMV model with the CBE thermal comfort tool"
+  extends Modelica.Icons.Example;
+  Buildings.Utilities.Comfort.Fanger com(
+    use_vAir_in=true,
+    use_M_in=true,
+    use_ICl_in=true,
+    use_pAir_in=false,
+    M=58,
+    ICl=0.6) "Thermal comfort model"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Modelica.Blocks.Sources.CombiTimeTable inp(
+    table=[
+         0, 293.15,  0.1,  0.5,    58,  0.6;
+       100, 295.15,  0.1,  0.5,    58,  0.6;
+       200, 297.15,  0.1,  0.5,    58,  0.6;
+       300, 299.15,  0.1,  0.5,    58,  0.6;
+       400, 301.15,  0.1,  0.5,    58,  0.6;
+       500, 303.15,  0.1,  0.5,    58,  0.6;
+       600, 297.15, 0.05,  0.5,    58,  0.6;
+       700, 297.15, 0.15,  0.5,    58,  0.6;
+       800, 297.15,  0.1,  0.2,    58,  0.6;
+       900, 297.15,  0.1,  0.3,    58,  0.6;
+      1000, 297.15,  0.1,  0.4,    58,  0.6;
+      1100, 297.15,  0.1,  0.5,    58,  0.6;
+      1200, 297.15,  0.1,  0.6,    58,  0.6;
+      1300, 297.15,  0.1,  0.7,    58,  0.6;
+      1400, 297.15,  0.1,  0.5,  72.5,  0.6;
+      1500, 297.15,  0.1,  0.5,    87,  0.6;
+      1600, 297.15,  0.1,  0.5, 101.5,  0.6;
+      1700, 297.15,  0.1,  0.5,    58,  0.4;
+      1800, 297.15,  0.1,  0.5,    58,  0.6;
+      1900, 297.15,  0.1,  0.5,    58,  0.8;
+      2000, 297.15,  0.1,  0.5,    58,    1;
+      2100, 297.15,  0.1,  0.5,    58,    1],
+      smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments)
+    "PMV input conditions"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+  Modelica.Blocks.Interaction.Show.RealValue realValue(significantDigits=3)
+    annotation (Placement(transformation(extent={{60,-6},{80,14}})));
+  Modelica.Blocks.Sources.CombiTimeTable PMVRef(
+    table=[
+         0, -1.91;
+       100, -1.20;
+       200, -0.52;
+       300,  0.17;
+       400,  0.87;
+       500,  1.58;
+       600, -0.48;
+       700, -0.70;
+       800, -0.76;
+       900, -0.68;
+      1000, -0.60;
+      1100, -0.52;
+      1200, -0.44;
+      1300, -0.36;
+      1400,  0.08;
+      1500,  0.45;
+      1600,  0.73;
+      1700, -1.04;
+      1800, -0.52;
+      1900, -0.12;
+      2000,  0.20;
+      2100,  0.20],
+      smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments)
+    "PMV value calculated by the CBE Thermal Comfort Tool"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+equation
+  connect(com.PMV, realValue.numberPort)
+    annotation (Line(points={{11,4},{58.5,4}}, color={0,0,127}));
+  connect(inp.y[1], com.TAir) annotation (Line(points={{-59,50},{-28,50},{-28,10},
+          {-11,10}}, color={0,0,127}));
+  connect(inp.y[1], com.TRad) annotation (Line(points={{-59,50},{-26,50},{-26,6},
+          {-11,6}}, color={0,0,127}));
+  connect(inp.y[2], com.vAir_in) annotation (Line(points={{-59,50},{-28,50},{-28,
+          -1},{-11,-1}}, color={0,0,127}));
+  connect(inp.y[3], com.phi) annotation (Line(points={{-59,50},{-28,50},{-28,2},
+          {-11,2}}, color={0,0,127}));
+  connect(inp.y[4], com.M_in) annotation (Line(points={{-59,50},{-28,50},{-28,-4},
+          {-11,-4}}, color={0,0,127}));
+  connect(inp.y[5], com.ICl_in) annotation (Line(points={{-59,50},{-28,50},{-28,
+          -7},{-11,-7}}, color={0,0,127}));
+ annotation (experiment(
+      StopTime=2300,
+      Tolerance=1e-06),
+__Dymola_Commands(file=
+          "modelica://Buildings/Resources/Scripts/Dymola/Utilities/Comfort/Validation/FangerCBE.mos"
+        "Simulate and plot"),
+        Documentation(info="<html>
+<p>
+This example validates the PMV values against values calculated with
+the CBE (Center for the Built Environment, UC Berkeley)
+<a href=\"https://comfort.cbe.berkeley.edu\">Thermal Comfort Tool</a> for a variety of cases.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+May 27, 2020, by Donghun Kim and Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1936\">#1936</a>.
+</li>
+</ul>
+</html>"),
+Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end FangerCBE;
diff --git a/Buildings/Utilities/Comfort/Validation/package.mo b/Buildings/Utilities/Comfort/Validation/package.mo
new file mode 100644
index 00000000000..64d4eabc321
--- /dev/null
+++ b/Buildings/Utilities/Comfort/Validation/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Utilities.Comfort;
+package Validation "Result comparison with a different comfort evaluation tool"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation cases for the Fanger model that can be found in
+<a href=\"modelica://Buildings.Utilities.Comfort\">
+Buildings.Utilities.Comfort</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Utilities/Comfort/Validation/package.order b/Buildings/Utilities/Comfort/Validation/package.order
new file mode 100644
index 00000000000..fdd265e5b96
--- /dev/null
+++ b/Buildings/Utilities/Comfort/Validation/package.order
@@ -0,0 +1 @@
+FangerCBE
diff --git a/Buildings/Utilities/Comfort/package.order b/Buildings/Utilities/Comfort/package.order
index dade7e2dd60..6dd38dcc23d 100644
--- a/Buildings/Utilities/Comfort/package.order
+++ b/Buildings/Utilities/Comfort/package.order
@@ -1,2 +1,3 @@
 Fanger
 Examples
+Validation
diff --git a/Buildings/Utilities/IO/BCVTB/BaseClasses/package.mo b/Buildings/Utilities/IO/BCVTB/BaseClasses/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Utilities/IO/BCVTB/Examples/MoistAir.mo b/Buildings/Utilities/IO/BCVTB/Examples/MoistAir.mo
index d970b4585ed..bddf516968e 100644
--- a/Buildings/Utilities/IO/BCVTB/Examples/MoistAir.mo
+++ b/Buildings/Utilities/IO/BCVTB/Examples/MoistAir.mo
@@ -69,14 +69,12 @@ model MoistAir
     yMax=1,
     yMin=0,
     Td=1,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=0.1,
     Ti=600) "Controller for heating"
     annotation (Placement(transformation(extent={{140,150},{160,170}})));
   Buildings.Controls.Continuous.LimPID PIDHum(
     yMax=1,
     yMin=0,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     k=20,
     Td=60,
     Ti=600) "Controller for humidifier"
diff --git a/Buildings/Utilities/IO/BCVTB/Examples/package.mo b/Buildings/Utilities/IO/BCVTB/Examples/package.mo
old mode 100755
new mode 100644
diff --git a/Buildings/Utilities/IO/Python27/Functions/Examples/Exchange.mo b/Buildings/Utilities/IO/Python27/Functions/Examples/Exchange.mo
deleted file mode 100644
index b84d16bc63a..00000000000
--- a/Buildings/Utilities/IO/Python27/Functions/Examples/Exchange.mo
+++ /dev/null
@@ -1,176 +0,0 @@
-within Buildings.Utilities.IO.Python27.Functions.Examples;
-model Exchange "Test model for exchange function"
-  extends Modelica.Icons.Example;
-
-  parameter Boolean passPythonObject = false
-    "Set to true if the Python function returns and receives an object, see User's Guide";
-
-  Real    yR1[1] "Real function value";
-  Integer yI1[1] "Integer function value";
-  Real    yR2[2] "Real function value";
-  Integer yI2[2] "Integer function value";
-
-protected
-  model M "Class that contains the Python object"
-    Buildings.Utilities.IO.Python27.Functions.BaseClasses.PythonObject pytObj=
-      Buildings.Utilities.IO.Python27.Functions.BaseClasses.PythonObject()
-      "Instance of Python object";
-  end M;
-
-  M[8] m "Array with instances of Python objects";
-
-algorithm
-  yR1 := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="r1_r1",
-      pytObj=m[1].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={2.0},
-      intWri={0},
-      nDblWri=1,
-      nDblRea=1,
-      nIntWri=0,
-      nIntRea=0,
-      nStrWri=0,
-      strWri={""});
-    assert(abs(4-yR1[1]) < 1e-5, "Error in function r1_r1");
-
-    yR1 := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="r2_r1",
-      pytObj=m[2].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={2.0, 3.0},
-      intWri={0},
-      nDblWri=2,
-      nDblRea=1,
-      nIntWri=0,
-      nIntRea=0,
-      nStrWri=0,
-      strWri={""});
-    assert(abs(6-yR1[1]) < 1e-5, "Error in function r2_r1");
-
-  yR2 := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="r1_r2",
-      pytObj=m[3].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={2.0},
-      intWri={0},
-      nDblWri=1,
-      nDblRea=2,
-      nIntWri=0,
-      nIntRea=0,
-      nStrWri=0,
-      strWri={""});
-  assert(abs(yR2[1]-2) + abs(yR2[2]-4) < 1E-5, "Error in function r1_r2");
-
-  // In the call below, yR1 is a dummy variable, as exchange returns (Real[1], Integer[1])
-  (yR1, yI1) := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="i1_i1",
-      pytObj=m[4].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={0.0},
-      intWri={3},
-      nDblWri=0,
-      nDblRea=0,
-      nIntWri=1,
-      nIntRea=1,
-      nStrWri=0,
-      strWri={""});
-  assert((6-yI1[1]) < 1e-5, "Error in function i1_i1");
-
-  // In the call below, yR1 is a dummy variable, as exchange returns (Real[1], Integer[2])
-  (yR1, yI2) := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="i1_i2",
-      pytObj=m[5].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={0.0},
-      intWri={2},
-      nDblWri=0,
-      nDblRea=0,
-      nIntWri=1,
-      nIntRea=2,
-      nStrWri=0,
-      strWri={""});
-  assert(abs(yI2[1]-2) + abs(yI2[2]-4) < 1E-5, "Error in function i1_i2");
-
-  yR2 := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="r1i1_r2",
-      pytObj=m[6].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={0.3},
-      intWri={2},
-      nDblWri=1,
-      nDblRea=2,
-      nIntWri=1,
-      nIntRea=0,
-      nStrWri=0,
-      strWri={""});
-  assert(abs(yR2[1]-0.6) + abs(yI2[2]-4) < 1E-5, "Error in function r1i1_r2");
-
-  // From Modelica, write a number to a text file, and from Python, read the text file
-  // and return the number.
-  Modelica.Utilities.Files.removeFile(fileName="tmp-TestPythonInterface.txt");
-  Modelica.Utilities.Streams.print(string="1.23", fileName="tmp-TestPythonInterface.txt");
-  yR1 := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="s2_r1",
-      pytObj=m[7].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={0.0},
-      intWri={0},
-      nDblWri=0,
-      nDblRea=1,
-      nIntWri=0,
-      nIntRea=0,
-      nStrWri=2,
-      strWri={"tmp-TestPythonInterface", "txt"});
-   assert(abs(yR1[1]-1.23) < 1E-5, "Error in function s2_r1");
-
-  (yR2, yI1) := Buildings.Utilities.IO.Python27.Functions.exchange(
-      moduleName="testFunctions",
-      functionName="r1i1_r2i1",
-      pytObj=m[8].pytObj,
-      passPythonObject=passPythonObject,
-      dblWri={0.3},
-      intWri={2},
-      nDblWri=1,
-      nDblRea=2,
-      nIntWri=1,
-      nIntRea=1,
-      nStrWri=0,
-      strWri={""});
-  assert(abs(yR2[1]-0.6) + abs(yR2[2]-4) < 1E-5, "Error in function r1i1_r2i1");
-  assert(abs(yI1[1]-3) == 0, "Error in function r1i1_r2i1");
-  annotation (
-experiment(Tolerance=1e-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/Exchange.mos"
-        "Simulate and plot"),
-Documentation(info="<html>
-<p>
-This example calls various functions in the Python module <code>testFunctions.py</code>.
-It tests whether arguments and return values are passed correctly.
-The functions in  <code>testFunctions.py</code> are very simple in order to test
-whether they compute correctly, and whether the data conversion between Modelica and
-Python is implemented correctly.
-Each call to Python is followed by an <code>assert</code> statement which terminates
-the simulation if the return value is different from the expected value.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 2, 2016, by Michael Wetter:<br/>
-Changed constant arguments of exchange function from <code>int</code> to <code>double</code>.
-This is required for OpenModelica.
-</li>
-<li>
-January 31, 2013, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Exchange;
diff --git a/Buildings/Utilities/IO/Python27/Examples/KalmanFilter.mo b/Buildings/Utilities/IO/Python36/Examples/KalmanFilter.mo
similarity index 91%
rename from Buildings/Utilities/IO/Python27/Examples/KalmanFilter.mo
rename to Buildings/Utilities/IO/Python36/Examples/KalmanFilter.mo
index 2e1233d6be6..5408a3d800a 100644
--- a/Buildings/Utilities/IO/Python27/Examples/KalmanFilter.mo
+++ b/Buildings/Utilities/IO/Python36/Examples/KalmanFilter.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27.Examples;
+within Buildings.Utilities.IO.Python36.Examples;
 model KalmanFilter
   "Kalman filter implemented in Python and called from Modelica"
   extends Modelica.Icons.Example;
@@ -24,6 +24,7 @@ model KalmanFilter
   Modelica.Blocks.Sources.Sine sine(freqHz=1) "Sine wave"
     annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
   Modelica.Blocks.Math.Add add
+    "Addition of signals before sending it to the Kalman filter"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
 equation
  // Delete the temporary file generated by the Python file
@@ -51,7 +52,7 @@ equation
       smooth=Smooth.None));
   annotation (
 experiment(Tolerance=1e-6, StopTime=1),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/KalmanFilter.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/KalmanFilter.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
@@ -73,7 +74,7 @@ shows the sine wave, the sine wave plus noise, which is input to the Kalman filt
 and the estimated state which is the output of the Kalman filter.
 </p>
 <p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Utilities/IO/Python27/Examples/KalmanFilter.png\"/>
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Utilities/IO/Python36/Examples/KalmanFilter.png\"/>
 </p>
 <h4>Implementation</h4>
 <p>
@@ -84,6 +85,10 @@ http://www.scipy.org/Cookbook/KalmanFiltering</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
 October 24, 2019, by Antoine Gautier:<br/>
 Changed the temporary file format from <code>pickle</code> to <code>json</code> as the former can trigger a
 segfault with JModelica simulation run in a subprocess.<br/>
diff --git a/Buildings/Utilities/IO/Python27/Examples/SimpleRoom.mo b/Buildings/Utilities/IO/Python36/Examples/SimpleRoom.mo
similarity index 85%
rename from Buildings/Utilities/IO/Python27/Examples/SimpleRoom.mo
rename to Buildings/Utilities/IO/Python36/Examples/SimpleRoom.mo
index c4281893a0f..ffac58bdc66 100644
--- a/Buildings/Utilities/IO/Python27/Examples/SimpleRoom.mo
+++ b/Buildings/Utilities/IO/Python36/Examples/SimpleRoom.mo
@@ -1,8 +1,8 @@
-within Buildings.Utilities.IO.Python27.Examples;
+within Buildings.Utilities.IO.Python36.Examples;
 model SimpleRoom
   "Simple room model implemented in Python that outputs the temperature and the energy"
   extends Modelica.Icons.Example;
-  Modelica.Blocks.Sources.Clock clock
+  Time.ModelTime modTim
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
 
   Real_Real pyt(
@@ -11,8 +11,7 @@ model SimpleRoom
     nDblRea=2,
     nDblWri=4,
     samplePeriod=60,
-    passPythonObject=true)
-                     "Python interface"
+    passPythonObject=true) "Python interface"
     annotation (Placement(transformation(extent={{-10,0},{10,20}})));
   Modelica.Blocks.Sources.Constant T0(k=293.15) "Initial temperature"
     annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
@@ -20,8 +19,7 @@ model SimpleRoom
     annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
   Controls.OBC.CDL.Logical.OnOffController onOffCon(
     bandwidth=2,
-    u(unit="K", displayUnit="degC"))
-    "On/off controller"
+    u(unit="K", displayUnit="degC")) "On/off controller"
     annotation (Placement(transformation(extent={{30,10},{50,30}})));
   Controls.OBC.CDL.Conversions.BooleanToReal onOff(realTrue=1.2)
     "On off control"
@@ -36,8 +34,8 @@ model SimpleRoom
 equation
   connect(mul.u1[1], T0.y) annotation (Line(points={{-42,19},{-46,19},{-46,80},{
           -59,80}}, color={0,0,127}));
-  connect(clock.y, mul.u4[1]) annotation (Line(points={{-59,0},{-50,0},{-50,1},{
-          -42,1}},     color={0,0,127}));
+  connect(modTim.y, mul.u4[1]) annotation (Line(points={{-59,0},{-50,0},{-50,1},
+          {-42,1}}, color={0,0,127}));
   connect(mul.y, pyt.uR)
     annotation (Line(points={{-19,10},{-12,10}}, color={0,0,127}));
   connect(pyt.yR[1], onOffCon.u) annotation (Line(points={{11,9.5},{18,9.5},{18,
@@ -45,14 +43,14 @@ equation
   connect(onOffCon.reference, T0.y) annotation (Line(points={{28,26},{0,26},{0,80},
           {-59,80}}, color={0,0,127}));
   connect(onOffCon.y, onOff.u)
-    annotation (Line(points={{51,20},{58,20}}, color={255,0,255}));
-  connect(onOff.y, mul.u3[1]) annotation (Line(points={{81,20},{90,20},{90,-10},
+    annotation (Line(points={{52,20},{58,20}}, color={255,0,255}));
+  connect(onOff.y, mul.u3[1]) annotation (Line(points={{82,20},{90,20},{90,-10},
           {-48,-10},{-48,7},{-42,7}}, color={0,0,127}));
   connect(TAmb.y, mul.u2[1]) annotation (Line(points={{-59,40},{-52,40},{-52,13},
           {-42,13}}, color={0,0,127}));
   annotation (
 experiment(Tolerance=1e-6, StopTime=86400),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Examples/SimpleRoom.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Examples/SimpleRoom.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
@@ -75,6 +73,10 @@ would be much simpler and computationally more efficient.
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
 January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Utilities/IO/Python27/Examples/package.mo b/Buildings/Utilities/IO/Python36/Examples/package.mo
similarity index 68%
rename from Buildings/Utilities/IO/Python27/Examples/package.mo
rename to Buildings/Utilities/IO/Python36/Examples/package.mo
index 3d60738ca17..d55f9519fa7 100644
--- a/Buildings/Utilities/IO/Python27/Examples/package.mo
+++ b/Buildings/Utilities/IO/Python36/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27;
+within Buildings.Utilities.IO.Python36;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -6,8 +6,8 @@ package Examples "Collection of models that illustrate model use and test models
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Utilities.IO.Python27\">
-Buildings.Utilities.IO.Python27</a>.
+<a href=\"modelica://Buildings.Utilities.IO.Python36\">
+Buildings.Utilities.IO.Python36</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Utilities/IO/Python27/Examples/package.order b/Buildings/Utilities/IO/Python36/Examples/package.order
similarity index 100%
rename from Buildings/Utilities/IO/Python27/Examples/package.order
rename to Buildings/Utilities/IO/Python36/Examples/package.order
diff --git a/Buildings/Utilities/IO/Python27/Functions/BaseClasses/PythonObject.mo b/Buildings/Utilities/IO/Python36/Functions/BaseClasses/PythonObject.mo
similarity index 65%
rename from Buildings/Utilities/IO/Python27/Functions/BaseClasses/PythonObject.mo
rename to Buildings/Utilities/IO/Python36/Functions/BaseClasses/PythonObject.mo
index 028c1d800fb..24fad64c359 100644
--- a/Buildings/Utilities/IO/Python27/Functions/BaseClasses/PythonObject.mo
+++ b/Buildings/Utilities/IO/Python36/Functions/BaseClasses/PythonObject.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27.Functions.BaseClasses;
+within Buildings.Utilities.IO.Python36.Functions.BaseClasses;
 class PythonObject
   "class used to create the external object: PythonObject"
 extends ExternalObject;
@@ -6,9 +6,9 @@ extends ExternalObject;
       "Construct an external object that can be used to store a Python object"
     output PythonObject pytObj;
     external "C" pytObj = initPythonMemory()
-        annotation (Library={"ModelicaBuildingsPython2.7",  "python2.7"},
+        annotation (Library={"ModelicaBuildingsPython3.6",  "python3.6m"},
           LibraryDirectory="modelica://Buildings/Resources/Library",
-          __iti_dll = "ITI_ModelicaBuildingsPython2.7.dll",
+          __iti_dll = "ITI_ModelicaBuildingsPython3.6.dll",
           __iti_dllNoExport = true);
 
     annotation(Documentation(info="<html>
@@ -18,12 +18,21 @@ exactly once during the initialization.
 The function returns the object <code>PythonObject</code> that
 will be used to store a Python object and pass it from one invocation to another
 in the function
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions.BaseClasses.exchange\">
-Buildings.Utilities.IO.Python27.Functions.BaseClasses.exchange</a>.
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions.BaseClasses.exchange\">
+Buildings.Utilities.IO.Python36.Functions.BaseClasses.exchange</a>.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
+March 06, 2020, by Jianjun Hu:<br/>
+Upgraded python version from 2.7 to 3.6.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue 1760</a>.
+</li>
+<li>
 April 13, 2018, by Michael Wetter:<br/>
 Corrected <code>LibraryDirectory</code> annotation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1160\">issue 1160</a>.
@@ -39,9 +48,9 @@ First implementation.
   function destructor "Release memory"
     input PythonObject pytObj;
     external "C" freePythonMemory(pytObj)
-      annotation (Library={"ModelicaBuildingsPython2.7",  "python2.7"},
+      annotation (Library={"ModelicaBuildingsPython3.6",  "python3.6m"},
         LibraryDirectory="modelica://Buildings/Resources/Library",
-        __iti_dll = "ITI_ModelicaBuildingsPython2.7.dll",
+        __iti_dll = "ITI_ModelicaBuildingsPython3.6.dll",
         __iti_dllNoExport = true);
 
   annotation(Documentation(info="<html>
@@ -52,6 +61,15 @@ Destructor that frees the memory of the object
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
+March 06, 2020, by Jianjun Hu:<br/>
+Upgraded python version from 2.7 to 3.6.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue 1760</a>.
+</li>
+<li>
 January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
 First implementation.
 </li>
@@ -62,14 +80,19 @@ annotation(Documentation(info="<html>
 <p>
 Class derived from <code>ExternalObject</code> having two local external functions
 named <code>destructor</code> and <code>constructor</code>.
+</p>
 <p>
 These functions create and release an external object that allows the storage
 of a Python object.
-
+</p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
 January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Utilities/IO/Python27/Functions/BaseClasses/exchange.mo b/Buildings/Utilities/IO/Python36/Functions/BaseClasses/exchange.mo
similarity index 77%
rename from Buildings/Utilities/IO/Python27/Functions/BaseClasses/exchange.mo
rename to Buildings/Utilities/IO/Python36/Functions/BaseClasses/exchange.mo
index 1fa862b7a26..1736ba20ca3 100644
--- a/Buildings/Utilities/IO/Python27/Functions/BaseClasses/exchange.mo
+++ b/Buildings/Utilities/IO/Python36/Functions/BaseClasses/exchange.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27.Functions.BaseClasses;
+within Buildings.Utilities.IO.Python36.Functions.BaseClasses;
 function exchange "Function that communicates with Python"
   input String moduleName
     "Name of the python module that contains the function";
@@ -35,26 +35,35 @@ function exchange "Function that communicates with Python"
                                     strWri, nStrWri,
                                     pytObj,
                                     passPythonObject)
-    annotation (Library={"ModelicaBuildingsPython2.7",  "python2.7"},
+    annotation (Library={"ModelicaBuildingsPython3.6",  "python3.6m"},
       LibraryDirectory="modelica://Buildings/Resources/Library",
       IncludeDirectory="modelica://Buildings/Resources/C-Sources",
-      Include="#include \"python27Wrapper.c\"",
-      __iti_dll = "ITI_ModelicaBuildingsPython2.7.dll",
+      Include="#include \"pythonWrapper.c\"",
+      __iti_dll = "ITI_ModelicaBuildingsPython3.6.dll",
       __iti_dllNoExport = true);
   annotation (Documentation(info="<html>
 <p>
 This function exchanges data with Python.
 See
-<a href=\"modelica://Buildings.Utilities.IO.Python27.UsersGuide\">
-Buildings.Utilities.IO.Python27.UsersGuide</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.UsersGuide\">
+Buildings.Utilities.IO.Python36.UsersGuide</a>
 for instructions, and
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions.Examples\">
-Buildings.Utilities.IO.Python27.Functions.Examples</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions.Examples\">
+Buildings.Utilities.IO.Python36.Functions.Examples</a>
 for examples.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
+March 06, 2020, by Jianjun Hu:<br/>
+Upgraded python version from 2.7 to 3.6.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue 1760</a>.
+</li>
+<li>
 April 13, 2018, by Michael Wetter:<br/>
 Corrected <code>LibraryDirectory</code> annotation.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1160\">issue 1160</a>.
diff --git a/Buildings/Utilities/IO/Python27/Functions/BaseClasses/package.mo b/Buildings/Utilities/IO/Python36/Functions/BaseClasses/package.mo
similarity index 83%
rename from Buildings/Utilities/IO/Python27/Functions/BaseClasses/package.mo
rename to Buildings/Utilities/IO/Python36/Functions/BaseClasses/package.mo
index 84788e3b63c..e4a2e5c9e73 100644
--- a/Buildings/Utilities/IO/Python27/Functions/BaseClasses/package.mo
+++ b/Buildings/Utilities/IO/Python36/Functions/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27.Functions;
+within Buildings.Utilities.IO.Python36.Functions;
 package BaseClasses "Package with functions that call Python"
   extends Modelica.Icons.BasesPackage;
 
diff --git a/Buildings/Utilities/IO/Python27/Functions/BaseClasses/package.order b/Buildings/Utilities/IO/Python36/Functions/BaseClasses/package.order
similarity index 100%
rename from Buildings/Utilities/IO/Python27/Functions/BaseClasses/package.order
rename to Buildings/Utilities/IO/Python36/Functions/BaseClasses/package.order
diff --git a/Buildings/Utilities/IO/Python36/Functions/Examples/Exchange.mo b/Buildings/Utilities/IO/Python36/Functions/Examples/Exchange.mo
new file mode 100644
index 00000000000..162a7918757
--- /dev/null
+++ b/Buildings/Utilities/IO/Python36/Functions/Examples/Exchange.mo
@@ -0,0 +1,180 @@
+within Buildings.Utilities.IO.Python36.Functions.Examples;
+model Exchange "Test model for exchange function"
+  extends Modelica.Icons.Example;
+
+  parameter Boolean passPythonObject = false
+    "Set to true if the Python function returns and receives an object, see User's Guide";
+
+  Real    yR1[1] "Real function value";
+  Integer yI1[1] "Integer function value";
+  Real    yR2[2] "Real function value";
+  Integer yI2[2] "Integer function value";
+
+protected
+  model M "Class that contains the Python object"
+    Buildings.Utilities.IO.Python36.Functions.BaseClasses.PythonObject pytObj=
+        Buildings.Utilities.IO.Python36.Functions.BaseClasses.PythonObject()
+      "Instance of Python object";
+  end M;
+
+  M[8] m "Array with instances of Python objects";
+
+algorithm
+  yR1 := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="r1_r1",
+    pytObj=m[1].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={2.0},
+    intWri={0},
+    nDblWri=1,
+    nDblRea=1,
+    nIntWri=0,
+    nIntRea=0,
+    nStrWri=0,
+    strWri={""});
+    assert(abs(4-yR1[1]) < 1e-5, "Error in function r1_r1");
+
+  yR1 := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="r2_r1",
+    pytObj=m[2].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={2.0,3.0},
+    intWri={0},
+    nDblWri=2,
+    nDblRea=1,
+    nIntWri=0,
+    nIntRea=0,
+    nStrWri=0,
+    strWri={""});
+    assert(abs(6-yR1[1]) < 1e-5, "Error in function r2_r1");
+
+  yR2 := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="r1_r2",
+    pytObj=m[3].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={2.0},
+    intWri={0},
+    nDblWri=1,
+    nDblRea=2,
+    nIntWri=0,
+    nIntRea=0,
+    nStrWri=0,
+    strWri={""});
+  assert(abs(yR2[1]-2) + abs(yR2[2]-4) < 1E-5, "Error in function r1_r2");
+
+  // In the call below, yR1 is a dummy variable, as exchange returns (Real[1], Integer[1])
+  (yR1,yI1) := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="i1_i1",
+    pytObj=m[4].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={0.0},
+    intWri={3},
+    nDblWri=0,
+    nDblRea=0,
+    nIntWri=1,
+    nIntRea=1,
+    nStrWri=0,
+    strWri={""});
+  assert((6-yI1[1]) < 1e-5, "Error in function i1_i1");
+
+  // In the call below, yR1 is a dummy variable, as exchange returns (Real[1], Integer[2])
+  (yR1,yI2) := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="i1_i2",
+    pytObj=m[5].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={0.0},
+    intWri={2},
+    nDblWri=0,
+    nDblRea=0,
+    nIntWri=1,
+    nIntRea=2,
+    nStrWri=0,
+    strWri={""});
+  assert(abs(yI2[1]-2) + abs(yI2[2]-4) < 1E-5, "Error in function i1_i2");
+
+  yR2 := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="r1i1_r2",
+    pytObj=m[6].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={0.3},
+    intWri={2},
+    nDblWri=1,
+    nDblRea=2,
+    nIntWri=1,
+    nIntRea=0,
+    nStrWri=0,
+    strWri={""});
+  assert(abs(yR2[1]-0.6) + abs(yI2[2]-4) < 1E-5, "Error in function r1i1_r2");
+
+  // From Modelica, write a number to a text file, and from Python, read the text file
+  // and return the number.
+  Modelica.Utilities.Files.removeFile(fileName="tmp-TestPythonInterface.txt");
+  Modelica.Utilities.Streams.print(string="1.23", fileName="tmp-TestPythonInterface.txt");
+  yR1 := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="s2_r1",
+    pytObj=m[7].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={0.0},
+    intWri={0},
+    nDblWri=0,
+    nDblRea=1,
+    nIntWri=0,
+    nIntRea=0,
+    nStrWri=2,
+    strWri={"tmp-TestPythonInterface","txt"});
+   assert(abs(yR1[1]-1.23) < 1E-5, "Error in function s2_r1");
+
+  (yR2,yI1) := Buildings.Utilities.IO.Python36.Functions.exchange(
+    moduleName="testFunctions",
+    functionName="r1i1_r2i1",
+    pytObj=m[8].pytObj,
+    passPythonObject=passPythonObject,
+    dblWri={0.3},
+    intWri={2},
+    nDblWri=1,
+    nDblRea=2,
+    nIntWri=1,
+    nIntRea=1,
+    nStrWri=0,
+    strWri={""});
+  assert(abs(yR2[1]-0.6) + abs(yR2[2]-4) < 1E-5, "Error in function r1i1_r2i1");
+  assert(abs(yI1[1]-3) == 0, "Error in function r1i1_r2i1");
+  annotation (
+experiment(Tolerance=1e-6, StopTime=1.0),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/Exchange.mos"
+        "Simulate and plot"),
+Documentation(info="<html>
+<p>
+This example calls various functions in the Python module <code>testFunctions.py</code>.
+It tests whether arguments and return values are passed correctly.
+The functions in  <code>testFunctions.py</code> are very simple in order to test
+whether they compute correctly, and whether the data conversion between Modelica and
+Python is implemented correctly.
+Each call to Python is followed by an <code>assert</code> statement which terminates
+the simulation if the return value is different from the expected value.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
+February 2, 2016, by Michael Wetter:<br/>
+Changed constant arguments of exchange function from <code>int</code> to <code>double</code>.
+This is required for OpenModelica.
+</li>
+<li>
+January 31, 2013, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Exchange;
diff --git a/Buildings/Utilities/IO/Python27/Functions/Examples/ExchangeWithPassPythonObject.mo b/Buildings/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mo
similarity index 80%
rename from Buildings/Utilities/IO/Python27/Functions/Examples/ExchangeWithPassPythonObject.mo
rename to Buildings/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mo
index eec93ce49f4..483a32a870c 100644
--- a/Buildings/Utilities/IO/Python27/Functions/Examples/ExchangeWithPassPythonObject.mo
+++ b/Buildings/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mo
@@ -1,19 +1,18 @@
-within Buildings.Utilities.IO.Python27.Functions.Examples;
+within Buildings.Utilities.IO.Python36.Functions.Examples;
 model ExchangeWithPassPythonObject
   "Test model for exchange function with memory"
   extends Modelica.Icons.Example;
 
   parameter Boolean passPythonObject = true
     "Set to true if the Python function returns and receives an object, see User's Guide";
-  Buildings.Utilities.IO.Python27.Functions.BaseClasses.PythonObject pytObj=
-    Buildings.Utilities.IO.Python27.Functions.BaseClasses.PythonObject();
+  Buildings.Utilities.IO.Python36.Functions.BaseClasses.PythonObject pytObj=
+      Buildings.Utilities.IO.Python36.Functions.BaseClasses.PythonObject();
 
   Real yR1[1] "Real function value";
   Real yR2[1] "Real function value";
 
-
 equation
-  yR1 = Buildings.Utilities.IO.Python27.Functions.exchange(
+  yR1 = Buildings.Utilities.IO.Python36.Functions.exchange(
     moduleName="testFunctions",
     functionName="r1_r1PassPythonObject",
     dblWri={2.0},
@@ -30,7 +29,7 @@ equation
 
   // Invoke the same function with the same Python object.
   // Hence, pytObj is reused.
-  yR2 = Buildings.Utilities.IO.Python27.Functions.exchange(
+  yR2 = Buildings.Utilities.IO.Python36.Functions.exchange(
     moduleName="testFunctions",
     functionName="r1_r1PassPythonObject",
     dblWri=yR1,
@@ -45,10 +44,9 @@ equation
     passPythonObject=passPythonObject);
     assert(abs(16-yR2[1]) < 1e-5, "Error in function r1_r1PassPythonObject");
 
-
   annotation (
 experiment(Tolerance=1e-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python27/Functions/Examples/ExchangeWithPassPythonObject.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos"
         "Simulate and plot"),
 Documentation(info="<html>
 <p>
@@ -63,6 +61,10 @@ the simulation if the return value is different from the expected value.
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
 January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Utilities/IO/Python27/Functions/Examples/package.mo b/Buildings/Utilities/IO/Python36/Functions/Examples/package.mo
similarity index 70%
rename from Buildings/Utilities/IO/Python27/Functions/Examples/package.mo
rename to Buildings/Utilities/IO/Python36/Functions/Examples/package.mo
index 7df4aa16983..e5261ee9e29 100644
--- a/Buildings/Utilities/IO/Python27/Functions/Examples/package.mo
+++ b/Buildings/Utilities/IO/Python36/Functions/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27.Functions;
+within Buildings.Utilities.IO.Python36.Functions;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -6,8 +6,8 @@ package Examples "Collection of models that illustrate model use and test models
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions\">
-Buildings.Utilities.IO.Python27.Functions</a>.
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions\">
+Buildings.Utilities.IO.Python36.Functions</a>.
 </p>
 <p>
 The examples demonstrate how to call Python functions from Modelica.
diff --git a/Buildings/Utilities/IO/Python27/Functions/Examples/package.order b/Buildings/Utilities/IO/Python36/Functions/Examples/package.order
similarity index 100%
rename from Buildings/Utilities/IO/Python27/Functions/Examples/package.order
rename to Buildings/Utilities/IO/Python36/Functions/Examples/package.order
diff --git a/Buildings/Utilities/IO/Python27/Functions/exchange.mo b/Buildings/Utilities/IO/Python36/Functions/exchange.mo
similarity index 88%
rename from Buildings/Utilities/IO/Python27/Functions/exchange.mo
rename to Buildings/Utilities/IO/Python36/Functions/exchange.mo
index 4beff02badc..aeb314a70cc 100644
--- a/Buildings/Utilities/IO/Python27/Functions/exchange.mo
+++ b/Buildings/Utilities/IO/Python36/Functions/exchange.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27.Functions;
+within Buildings.Utilities.IO.Python36.Functions;
 function exchange "Function that communicates with Python"
   input String moduleName
     "Name of the python module that contains the function";
@@ -73,24 +73,28 @@ algorithm
   annotation (Documentation(info="<html>
 <p>
 This function is a wrapper for
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions.BaseClasses.exchange\">
-Buildings.Utilities.IO.Python27.Functions.BaseClasses.exchange</a>.
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions.BaseClasses.exchange\">
+Buildings.Utilities.IO.Python36.Functions.BaseClasses.exchange</a>.
 It adds the directory <code>modelica://Buildings/Resources/Python-Sources</code>
 to the environment variable <code>PYTHONPATH</code>
 prior to calling the function that exchanges data with Python.
 After the function call, the <code>PYTHONPATH</code> is set back to what
 it used to be when entering this function.
 See
-<a href=\"modelica://Buildings.Utilities.IO.Python27.UsersGuide\">
-Buildings.Utilities.IO.Python27.UsersGuide</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.UsersGuide\">
+Buildings.Utilities.IO.Python36.UsersGuide</a>
 for instructions, and
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions.Examples\">
-Buildings.Utilities.IO.Python27.Functions.Examples</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions.Examples\">
+Buildings.Utilities.IO.Python36.Functions.Examples</a>
 for examples.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
 June 14, 2019, by Antoine Gautier and Michael Wetter:<br/>
 Refactored for setting <code>PYTHONPATH</code> correctly independent of working directory.
 </li>
diff --git a/Buildings/Utilities/IO/Python27/Functions/package.mo b/Buildings/Utilities/IO/Python36/Functions/package.mo
similarity index 86%
rename from Buildings/Utilities/IO/Python27/Functions/package.mo
rename to Buildings/Utilities/IO/Python36/Functions/package.mo
index ba288cbfc21..7a4daeafd3b 100644
--- a/Buildings/Utilities/IO/Python27/Functions/package.mo
+++ b/Buildings/Utilities/IO/Python36/Functions/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27;
+within Buildings.Utilities.IO.Python36;
 package Functions "Package with functions that call Python"
   extends Modelica.Icons.BasesPackage;
 
diff --git a/Buildings/Utilities/IO/Python27/Functions/package.order b/Buildings/Utilities/IO/Python36/Functions/package.order
similarity index 100%
rename from Buildings/Utilities/IO/Python27/Functions/package.order
rename to Buildings/Utilities/IO/Python36/Functions/package.order
diff --git a/Buildings/Utilities/IO/Python27/Real_Real.mo b/Buildings/Utilities/IO/Python36/Real_Real.mo
similarity index 73%
rename from Buildings/Utilities/IO/Python27/Real_Real.mo
rename to Buildings/Utilities/IO/Python36/Real_Real.mo
index c1af16bdd29..65f5258c1be 100644
--- a/Buildings/Utilities/IO/Python27/Real_Real.mo
+++ b/Buildings/Utilities/IO/Python36/Real_Real.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27;
+within Buildings.Utilities.IO.Python36;
 model Real_Real
   "Block that exchanges a vector of real values with a Python function"
   extends Modelica.Blocks.Interfaces.DiscreteBlock(
@@ -12,7 +12,9 @@ model Real_Real
   parameter Integer nDblWri(min=1) "Number of double values to write to Python";
   parameter Integer nDblRea(min=1)
     "Number of double values to be read from the Python";
-  parameter Integer flaDblWri[nDblWri] = zeros(nDblWri)
+  parameter Integer flag = 0
+    "Flag for double values (0: use current value, 1: use average over interval, 2: use integral over interval)";
+  final parameter Integer flaDblWri[nDblWri] = fill(flag, nDblWri)
     "Flag for double values (0: use current value, 1: use average over interval, 2: use integral over interval)";
 
   parameter Boolean passPythonObject = false
@@ -28,12 +30,14 @@ model Real_Real
   Real uRInt[nDblWri] "Value of integral";
   Real uRIntPre[nDblWri] "Value of integral at previous sampling instance";
   Real uRWri[nDblWri] "Value to be sent to Python";
+  Real uRWri_temp[nDblWri] "Internal value";
 protected
-  Buildings.Utilities.IO.Python27.Functions.BaseClasses.PythonObject pytObj=
-    Buildings.Utilities.IO.Python27.Functions.BaseClasses.PythonObject()
+  Buildings.Utilities.IO.Python36.Functions.BaseClasses.PythonObject pytObj=
+    Buildings.Utilities.IO.Python36.Functions.BaseClasses.PythonObject()
     "Python object, used to avoid instantiating Python in each call, and to pass python object if passPythonObject=true";
 initial equation
    uRWri    =  pre(uR);
+   uRWri_temp = pre(uR);
    uRInt    =  zeros(nDblWri);
    uRIntPre =  zeros(nDblWri);
    for i in 1:nDblWri loop
@@ -52,19 +56,26 @@ equation
 
   when {sampleTrigger} then
      // Compute value that will be sent to Python
-     for i in 1:nDblWri loop
-       if (flaDblWri[i] == 0) then
-         uRWri[i] = pre(uR[i]);                 // Send the current value.
-       else
-         uRWri[i] = uRInt[i] - pre(uRIntPre[i]);     // Integral over the sampling interval
-         if (flaDblWri[i] == 1) then
-            uRWri[i] =  uRWri[i]/samplePeriod;  // Average value over the sampling interval
-         end if;
-       end if;
+      for i in 1:nDblWri loop
+        if (flaDblWri[i] == 0) then
+          uRWri_temp[i] = pre(uR[i]);
+          uRWri[i] = pre(uR[i]);                 // Send the current value.
+        else
+          if (time > 0) then
+            uRWri_temp[i] = uRInt[i] - pre(uRIntPre[i]); // Integral over the sampling interval
+            if (flaDblWri[i] == 2) then
+              uRWri[i] = uRWri_temp[i];
+            else
+              uRWri[i] = uRWri_temp[i]/samplePeriod;  // Average value over the sampling interval
+            end if;
+          else
+            uRWri[i] = pre(uR[i]);
+            uRWri_temp[i] = pre(uR[i]);
+          end if;
+        end if;
       end for;
-
     // Exchange data
-    yR = Buildings.Utilities.IO.Python27.Functions.exchange(
+    yR = Buildings.Utilities.IO.Python36.Functions.exchange(
       moduleName=moduleName,
       functionName=functionName,
       dblWri=uRWri,
@@ -77,15 +88,14 @@ equation
       strWri={""},
       pytObj=pytObj,
       passPythonObject = passPythonObject);
-
     // Store current value of integral
-  uRIntPre= uRInt;
+    uRIntPre= uRInt;
   end when;
 
   annotation (defaultComponentName="pyt",
  Icon(coordinateSystem(
           preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={Bitmap(
-            extent={{-88,82},{80,-78}}, fileName="modelica://Buildings/Resources/Images/Utilities/IO/Python27/python.png")}),
+            extent={{-88,82},{80,-78}}, fileName="modelica://Buildings/Resources/Images/Utilities/IO/Python36/python.png")}),
     Documentation(info="<html>
 <p>
 Block that exchanges data with a Python function that does not need to pass
@@ -140,11 +150,20 @@ Otherwise, leave it at its default value <code>passPythonObject = false</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
+Updated to Python 3.6.
+</li>
+<li>
+March 06, 2020, by Jianjun Hu:<br/>
+Corrected implementation so it allows different flag for double values.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1716\">issue #1716</a>.
+</li>
+<li>
 June 9, 2015 by Michael Wetter:<br/>
 Set <code>firstTrigger(fixed=true, start=false)</code> to avoid a
 warning about unspecified initial conditions if
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Examples.KalmanFilter\">
-Buildings.Utilities.IO.Python27.Examples.KalmanFilter</a>
+<code>Buildings.Obsolete.Utilities.IO.Python27.Examples.KalmanFilter</code>
 is translated
 using pedantic mode in Dymola 2016.
 This is for
diff --git a/Buildings/Utilities/IO/Python27/UsersGuide.mo b/Buildings/Utilities/IO/Python36/UsersGuide.mo
similarity index 61%
rename from Buildings/Utilities/IO/Python27/UsersGuide.mo
rename to Buildings/Utilities/IO/Python36/UsersGuide.mo
index ea4123ee01a..23f5de21250 100644
--- a/Buildings/Utilities/IO/Python27/UsersGuide.mo
+++ b/Buildings/Utilities/IO/Python36/UsersGuide.mo
@@ -1,4 +1,4 @@
-within Buildings.Utilities.IO.Python27;
+within Buildings.Utilities.IO.Python36;
 package UsersGuide "User's Guide"
   extends Modelica.Icons.Information;
 
@@ -13,142 +13,75 @@ with web services, with hardware, or to do other computations
 inside a Python module.
 </p>
 <p>
-The code has been tested with Python 2.7 on
-Linux 32 and 64 bit and Windows 32 and 64 bit.
+The code has been tested with Python 3.6 on
+Linux 64 bit and Windows 64 bit.
 </p>
 <h4>Software configuration to use classes from this package</h4>
 <p>
-To use classes from this package, a Python 2.7
+To use classes from this package, a Python 3.6
 runtime environment must be installed.
 Also, the system environment variable
-<code>PYTHONPATH</code> must be set in order for Python
+<code>PYTHONPATH</code> may need to be set in order for Python
 to find the modules that contain the functions.
 These modules are stored in the directory
 <code>Buildings/Resources/Python-Sources</code>.
 In addition, an environment variable (<code>LD_LIBRARY_PATH</code> on Linux
-and <code>PATH</code> on Windows) must be set in order for a simulation
+and <code>PATH</code> on Windows) may need to be set in order for a simulation
 environment to find the dynamically linked libraries.
-The table below explains how to set these variables for
-various system configurations.
 </p>
 <p>
-Because some Python libraries may also link to compiled C code, we
-recommend that if you are using a 64-bit operating system, you configure
-Dymola to generate 64 bit code. Configuring the compilation
-can be done by entering on the
-Dymola command line the assignment
-<code>Advanced.CompileWith64=1</code> for 32-bit, or
-<code>Advanced.CompileWith64=2</code> for 64-bit.
+The table below gives hints if there are problems running models that use Python code.
 </p>
-  <table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-  <tr>
-      <th>System</th>
-      <th>Settings</th>
-   </tr>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+  <th>System</th>
+  <th>Settings</th>
+</tr>
   <!-- =================================================================== -->
-    <tr>
-      <td>Linux 32 bit, Dymola 2016</td>
-      <td>
-      <p>
-      Enter on a console the commands
-      </p>
-<pre>
-  export PYTHONPATH=${PYTHONPATH}:\"Path_To_Buildings_Library\"/Resources/Python-Sources
-  export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:\"Path_To_Buildings_Library\"/Resources/Library/linux32
-  </pre>
+<tr>
+  <td>Linux 64 bit</td>
+  <td>
   <p>
-  Alternatively, these lines could be added to the file <code>~/.bashrc</code>.
+  If the examples do not translate or simulate, enter on a console the commands
   </p>
-      </td>
-    </tr>
-    <tr>
-  <!-- =================================================================== -->
-      <td>Linux 64 bit, Dymola 2016</td>
-      <td>
-      <p>
-      Use the same commands as for <i>Linux 64 bit, Dymola 2016</i>
-      because Dymola 2016 generates by default 32 bit code.
-      </p>
-      <p>
-      However, if you load other Python libraries such as numpy, you need to make sure
-      that Dymola compiles 64 bit and uses the 64 bit library from
-      <code>Buildings/Resources/Library/linux64</code>.
-      To do so, enter on a console the commands
-      </p>
 <pre>
-  export PYTHONPATH=${PYTHONPATH}:\"Path_To_Buildings_Library\"/Resources/Python-Sources
-  export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:\"Path_To_Buildings_Library\"/Resources/Library/linux64
-  </pre>
-  <p>
-Alternatively, these lines could be added to the file <code>~/.bashrc</code>.</p>
+export PYTHONPATH=${PYTHONPATH}:\"Path_To_Buildings_Library\"/Resources/Python-Sources
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:\"Path_To_Buildings_Library\"/Resources/Library/linux64
+</pre>
 <p>
-Next, in the Dymola command window, set
+and restart the Modelica environment.
+</p>
+<p>
+If this does not help, make sure <code>libpython3.6.m.so</code> is installed
+on your system. You can check this with
 </p>
 <pre>
- Advanced.CompileWith64=2;
-</pre>
-      </td>
-    </tr>
-  <!-- =================================================================== -->
-    <tr>
-      <td>Linux 32 bit, Dymola 2014</td>
-      <td>
-Enter on a console the commands
-<pre>
-  export PYTHONPATH=${PYTHONPATH}:\"Path_To_Buildings_Library\"/Resources/Python-Sources
-  export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:\"Path_To_Buildings_Library\"/Resources/Library/linux32
-</pre>
-Alternatively, these lines could be added to the file <code>~/.bashrc</code>.
-      </td>
-    </tr>
-    <tr>
-  <!-- =================================================================== -->
-      <td>Linux 64 bit, Dymola 2014</td>
-      <td>
-Use the same commands as for <i>Linux 64 bit, Dymola 2014</i> because Dymola 2014 only generates 32 bit code.
-      </td>
-    </tr>
-  <!-- =================================================================== -->
-    <tr>
-      <td>Linux 32 bit, Dymola 2013 FD01</td>
-      <td>
-Enter on a console the commands
-<pre>
-  export PYTHONPATH=${PYTHONPATH}:\"Path_To_Buildings_Library\"/Resources/Python-Sources
+whereis libpython3.6m.so
 </pre>
-Alternatively, these lines could be added to the file <code>~/.bashrc</code>.<br/>
-<br/>
-Next, modify <code>/opt/dymola/bin/dymola.sh</code> by replacing the line
+<p>
+On Ubuntu 18.04, this library can be installed with
+</p>
 <pre>
-  export LD_LIBRARY_PATH=$DYMOLA/bin/lib
+sudo apt-get install libpython3.6-dev
 </pre>
-with
+</td>
+</tr>
+<!-- =================================================================== -->
+<tr>
+<td>Dymola</td>
+<td>
+<p>
+Because the Python libraries link to compiled C code,
+Dymola needs to be configured to generate code for 64-bit.
+This can be done by entering on the
+Dymola command line the assignment</p>
 <pre>
-  export LD_LIBRARY_PATH=$DYMOLA/bin/lib:\"Path_To_Buildings_Library\"/Resources/Library/linux32
-  export LD_LIBRARY_PATH=$DYMOLA/bin/lib:Resources/Library/linux32
+Advanced.CompileWith64=2
 </pre>
-      </td>
-    </tr>
-  <!-- =================================================================== -->
-    <tr>
-      <td>Linux 64 bit, Dymola 2013 FD01</td>
-      <td>
-Use the same commands as for <i>Linux 32 bit, Dymola 2013 FD01</i> because Dymola 2013 FD01 only generates 32 bit code.
-      </td>
-    </tr>
-  <!-- =================================================================== -->
-    <tr>
-      <td>Windows 32 bit, Dymola 2014
-      <br/>Windows 64 bit, Dymola 2014
-      <br/>Windows 32 bit, Dymola 2013 FD01
-      <br/>Windows 64 bit, Dymola 2013 FD01 </td>
-      <td>
-        Add to the system environment variable <code>PYTHONPATH</code> the directory
-        <code>\"Path_To_Buildings_Library\"\\Resources\\Python-Sources</code>.
-      </td>
-    </tr>
-  <!-- =================================================================== -->
-  </table>
+</td>
+</tr>
+<!-- =================================================================== -->
+</table>
 
 <h4>Type of Python functions</h4>
 <p>
@@ -176,8 +109,8 @@ def incrementAndReturnACounter(i, obj):
 </pre>
 <p>
 For the first case, set in the function
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions.exchange\">
-Buildings.Utilities.IO.Python27.Functions.exchange</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions.exchange\">
+Buildings.Utilities.IO.Python36.Functions.exchange</a>
 the input argument <code>passPythonObject = false</code>,
 and for the second case, set <code>passPythonObject = true</code>.
 The second case
@@ -318,25 +251,25 @@ Various examples are provided, and for each of these, the Python functions are s
 </p>
 <p>
 The examples
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions.Examples.Exchange\">
-Buildings.Utilities.IO.Python27.Functions.Examples.Exchange</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions.Examples.Exchange\">
+Buildings.Utilities.IO.Python36.Functions.Examples.Exchange</a>
 and
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Functions.Examples.ExchangeWithPassPythonObject\">
-Buildings.Utilities.IO.Python27.Functions.Examples.ExchangeWithPassPythonObject</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject\">
+Buildings.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject</a>
 contains various calls to different Python functions without and with memory.
 </p>
 <p>
 The example
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Examples.KalmanFilter\">
-Buildings.Utilities.IO.Python27.Examples.KalmanFilter</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Examples.KalmanFilter\">
+Buildings.Utilities.IO.Python36.Examples.KalmanFilter</a>
 shows how to implement in a Modelica block a call to a Python function.
 This Python function stores its memory on disk between invocations (which,
 in general, is not recommended).
 </p>
 <p>
 The example
-<a href=\"modelica://Buildings.Utilities.IO.Python27.Examples.SimpleRoom\">
-Buildings.Utilities.IO.Python27.Examples.SimpleRoom</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.Examples.SimpleRoom\">
+Buildings.Utilities.IO.Python36.Examples.SimpleRoom</a>
 shows a similiar example. However, rather than using a file to store the
 room temperature and energy between invocations, the function returns
 an object with this information, and receives this object again in the next invocation.
@@ -350,44 +283,5 @@ if a Modelica function returns <code>(Real[nR], Integer[nI], String)</code>.
 This will be fixed in Dymola 2014.
 (Support request #14983.)
 </p>
-<h4>Known Issues</h4>
-<p>
-The Python installation of Ubuntu 14.04 has a bug that causes Dymola
-to produce output of the following form:
-</p>
-<pre>
-Traceback (most recent call last):
-  File \"/usr/lib/python2.7/site.py\", line 563, in &lt;module&gt;
-    main()
-  File \"/usr/lib/python2.7/site.py\", line 545, in main
-    known_paths = addusersitepackages(known_paths)
-  File \"/usr/lib/python2.7/site.py\", line 272, in addusersitepackages
-    user_site = getusersitepackages()
-  File \"/usr/lib/python2.7/site.py\", line 247, in getusersitepackages
-    user_base = getuserbase() # this will also set USER_BASE
-  File \"/usr/lib/python2.7/site.py\", line 237, in getuserbase
-    USER_BASE = get_config_var('userbase')
-  File \"/usr/lib/python2.7/sysconfig.py\", line 578, in get_config_var
-    return get_config_vars().get(name)
-  File \"/usr/lib/python2.7/sysconfig.py\", line 524, in get_config_vars
-    _init_posix(_CONFIG_VARS)
-  File \"/usr/lib/python2.7/sysconfig.py\", line 408, in _init_posix
-    from _sysconfigdata import build_time_vars
-  File \"/usr/lib/python2.7/_sysconfigdata.py\", line 6, in &lt;module&gt;
-    from _sysconfigdata_nd import *
-ImportError: No module named _sysconfigdat
-...(message truncated)
-</pre>
-<p>
-As a work-around, type in a shell the commands
-</p>
-<pre>
-$ cd /usr/lib/python2.7
-$ sudo ln -s plat-x86_64-linux-gnu/_sysconfigdata_nd.py .
-</pre>
-<p>
-See also <a href=\"https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/1115466\">
-https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/1115466</a>.
-</p>
 </html>"));
 end UsersGuide;
diff --git a/Buildings/Utilities/IO/Python27/package.mo b/Buildings/Utilities/IO/Python36/package.mo
similarity index 65%
rename from Buildings/Utilities/IO/Python27/package.mo
rename to Buildings/Utilities/IO/Python36/package.mo
index 963ed9e442b..85820824317 100644
--- a/Buildings/Utilities/IO/Python27/package.mo
+++ b/Buildings/Utilities/IO/Python36/package.mo
@@ -1,11 +1,10 @@
 within Buildings.Utilities.IO;
-package Python27 "Package to call Python functions"
+package Python36 "Package to call Python functions"
   extends Modelica.Icons.VariantsPackage;
 
-
 annotation (preferredView="info", Documentation(info="<html>
 <p>
-This package contains blocks and functions that embed Python 2.7 in Modelica.
+This package contains blocks and functions that embed Python 3.6 in Modelica.
 Data can be sent to Python functions and received from Python functions.
 This allows for example data analysis in Python as part of a Modelica model,
 or data exchange as part of a hardware-in-the-loop simulation in which
@@ -13,9 +12,9 @@ Python is used to communicate with hardware.
 </p>
 <p>
 See
-<a href=\"modelica://Buildings.Utilities.IO.Python27.UsersGuide\">
-Buildings.Utilities.IO.Python27.UsersGuide</a>
+<a href=\"modelica://Buildings.Utilities.IO.Python36.UsersGuide\">
+Buildings.Utilities.IO.Python36.UsersGuide</a>
 for instruction.
 </p>
 </html>"));
-end Python27;
+end Python36;
diff --git a/Buildings/Utilities/IO/Python27/package.order b/Buildings/Utilities/IO/Python36/package.order
similarity index 100%
rename from Buildings/Utilities/IO/Python27/package.order
rename to Buildings/Utilities/IO/Python36/package.order
diff --git a/Buildings/Utilities/Math/Functions/Examples/Round.mo b/Buildings/Utilities/Math/Functions/Examples/Round.mo
new file mode 100644
index 00000000000..618cb96d42f
--- /dev/null
+++ b/Buildings/Utilities/Math/Functions/Examples/Round.mo
@@ -0,0 +1,35 @@
+within Buildings.Utilities.Math.Functions.Examples;
+model Round "Example for round function"
+  extends Modelica.Icons.Example;
+  Real ym2 "Function value";
+  Real ym1 "Function value";
+  Real y "Function value";
+  Real y1 "Function value";
+  Real y2 "Function value";
+equation
+  ym2=Buildings.Utilities.Math.Functions.round(x=time*100, n=-2)/100;
+  ym1=Buildings.Utilities.Math.Functions.round(x=time*10, n=-1)/10;
+  y=Buildings.Utilities.Math.Functions.round(x=time, n=0);
+  y1=Buildings.Utilities.Math.Functions.round(x=time/10, n=1)*10;
+  y2=Buildings.Utilities.Math.Functions.round(x=time/100, n=2)*100;
+  annotation(experiment(StartTime=-2,Tolerance=1e-6, StopTime=2.0),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Utilities/Math/Functions/Examples/Round.mos"
+        "Simulate and plot"),
+Documentation(info="<html>
+<p>
+This example tests the implementation of
+<a href=\"modelica://Buildings.Utilities.Math.Functions.round\">
+Buildings.Utilities.Math.Functions.round</a>
+for different values of <i>n</i>.
+Arguments and return values are scale to simplify the show that the scaling for the rounding
+is implemented correctly.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 19, 2020, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Round;
diff --git a/Buildings/Utilities/Math/Functions/Examples/package.order b/Buildings/Utilities/Math/Functions/Examples/package.order
index 1f7f461fae3..63df062cb22 100644
--- a/Buildings/Utilities/Math/Functions/Examples/package.order
+++ b/Buildings/Utilities/Math/Functions/Examples/package.order
@@ -18,6 +18,7 @@ RegNonZeroPower
 RegNonZeroPowerDerivativeCheck
 RegNonZeroPowerDerivative_2_Check
 RegStep
+Round
 SmoothExponentialDerivativeCheck
 SmoothHeavisideDerivatives
 SmoothInterpolation
diff --git a/Buildings/Utilities/Math/Functions/package.order b/Buildings/Utilities/Math/Functions/package.order
index ff8b7e92e68..d6c6c27a865 100644
--- a/Buildings/Utilities/Math/Functions/package.order
+++ b/Buildings/Utilities/Math/Functions/package.order
@@ -20,6 +20,7 @@ quadraticLinear
 quinticHermite
 regNonZeroPower
 regStep
+round
 smoothExponential
 smoothHeaviside
 smoothInterpolation
diff --git a/Buildings/Utilities/Math/Functions/round.mo b/Buildings/Utilities/Math/Functions/round.mo
new file mode 100644
index 00000000000..1f3b91667b6
--- /dev/null
+++ b/Buildings/Utilities/Math/Functions/round.mo
@@ -0,0 +1,56 @@
+within Buildings.Utilities.Math.Functions;
+function round "Round real number to specified digits"
+  extends Modelica.Icons.Function;
+
+  input Real x "Argument to be rounded";
+  input Integer n "Number of digits being round to";
+  output Real y "Connector of Real output signal";
+
+protected
+  parameter Real fac = 10^n "Factor used for rounding";
+
+algorithm
+  y := if (x>0) then floor(x*fac + 0.5)/fac else ceil(x*fac - 0.5)/fac;
+
+annotation (
+Documentation(info="<html>
+<p>
+Function that outputs the input after rounding it to <code>n</code> digits.
+</p>
+<p>
+For example,
+</p>
+<ul>
+<li>
+set <code>n = 0</code> to round to the nearest integer,
+</li>
+<li>
+set <code>n = 1</code> to round to the next decimal point, and
+</li>
+<li>
+set <code>n = -1</code> to round to the next multiple of ten.
+</li>
+</ul>
+<p>
+Hence, the function outputs
+</p>
+<pre>
+    y = floor(x*(10^n) + 0.5)/(10^n)  for  x &gt; 0,
+    y = ceil( x*(10^n) - 0.5)/(10^n)  for  x &lt; 0.
+</pre>
+<p>
+To use this function as a block, use
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Round\">
+Buildings.Controls.OBC.CDL.Continuous.Round</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 2, 2020, by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">#2170</a>.
+</li>
+</ul>
+</html>"));
+end round;
diff --git a/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo b/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo
index 3a10921dbb6..c7548f1d979 100644
--- a/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo
+++ b/Buildings/Utilities/Plotters/Examples/BaseClasses/CoolingCoilValve.mo
@@ -41,7 +41,7 @@ block CoolingCoilValve "Cooling coil valve position control sequence"
     "Recorded interval at which integration part of the output gets updated"
     annotation(Evaluate=true, Dialog(group="Controller"));
 
-  parameter Boolean reverseAction = true "Controller reverse action"
+  parameter Boolean reverseActing=false "Controller reverse action"
     annotation(Evaluate=true, Dialog(tab="Advanced", group="Controller"));
 
   parameter Real k(final unit="1/K") = alc_prop_k * alc_k_unit_conv
@@ -102,15 +102,13 @@ block CoolingCoilValve "Cooling coil valve position control sequence"
     annotation (Placement(transformation(extent={{120,-10},{140,10}}),
       iconTransformation(extent={{100,-10},{120,10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.LimPID limPI(
-    final reverseAction=reverseAction,
-    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
+  Buildings.Controls.OBC.CDL.Continuous.PIDWithReset limPI(
+    final reverseActing=reverseActing,
     final k=k,
     final Ti = Ti,
     final yMax=1,
     final yMin=0,
-    final y_reset=0,
-    final reset=Buildings.Controls.OBC.CDL.Types.Reset.Parameter)
+    final y_reset=0)
     "Custom PI controller"
     annotation (Placement(transformation(extent={{-40,80},{-20,100}})));
 
@@ -175,46 +173,46 @@ equation
   connect(TOut, TOutThr.u)
     annotation (Line(points={{-140,-20},{-112,-20}}, color={0,0,127}));
   connect(TOutThr.y, andIntErr.u1)
-    annotation (Line(points={{-89,-20},{-86,-20},{-86,-52},{-72,-52}}, color={255,0,255}));
+    annotation (Line(points={{-88,-20},{-86,-20},{-86,-52},{-72,-52}}, color={255,0,255}));
   connect(TSup, higLim.u)
     annotation (Line(points={{-140,40},{20,40},{20,-20},{78,-20}}, color={0,0,127}));
   connect(yCooVal,min. y)
-    annotation (Line(points={{130,0},{114,0},{114,30},{101,30}},color={0,0,127}));
+    annotation (Line(points={{130,0},{114,0},{114,30},{102,30}},color={0,0,127}));
   connect(TSupMax.y, higLim.x2)
-    annotation (Line(points={{61,-50},{64,-50},{64,-24},{68,-24},{68,-24},{78,-24}},
+    annotation (Line(points={{62,-50},{64,-50},{64,-24},{68,-24},{68,-24},{78,-24}},
     color={0,0,127}));
   connect(yCooValMax.y, higLim.f2)
-    annotation (Line(points={{61,-90},{70,-90},{70,-28},{78,-28}}, color={0,0,127}));
+    annotation (Line(points={{62,-90},{70,-90},{70,-28},{78,-28}}, color={0,0,127}));
   connect(higLim.y,min. u2)
-    annotation (Line(points={{101,-20},{106,-20},{106,0},{70,0},{70,24},{78,24}}, color={0,0,127}));
+    annotation (Line(points={{102,-20},{106,-20},{106,0},{70,0},{70,24},{78,24}}, color={0,0,127}));
   connect(TSupSet, limPI.u_s)
     annotation (Line(points={{-140,90},{-92,90},{-92,90},{-42,90}}, color={0,0,127}));
   connect(TSup, limPI.u_m)
     annotation (Line(points={{-140,40},{-30,40},{-30,78}}, color={0,0,127}));
   connect(andIntErr.u2, uFanFeeThr.y)
-    annotation (Line(points={{-72,-60},{-89,-60}}, color={255,0,255}));
+    annotation (Line(points={{-72,-60},{-88,-60}}, color={255,0,255}));
   connect(uFanFee, uFanFeeThr.u)
     annotation (Line(points={{-140,-60},{-112,-60}}, color={0,0,127}));
   connect(andIntErr.y, cha.u)
-    annotation (Line(points={{-49,-60},{-42,-60}}, color={255,0,255}));
+    annotation (Line(points={{-48,-60},{-42,-60}}, color={255,0,255}));
   connect(cha.y, limPI.trigger)
-    annotation (Line(points={{-19,-60},{-16,-60},{
-          -16,20},{-38,20},{-38,78}}, color={255,0,255}));
+    annotation (Line(points={{-18,-60},{-16,-60},{-16,20},{-36,20},{-36,78}},
+                                      color={255,0,255}));
   connect(TSupMin.y, higLim.x1)
-    annotation (Line(points={{21,-50},{26,-50},{26,-12},{78,-12}},color={0,0,127}));
+    annotation (Line(points={{22,-50},{26,-50},{26,-12},{78,-12}},color={0,0,127}));
   connect(yCooValMin.y, higLim.f1)
-    annotation (Line(points={{21,-90},{30,-90},{30,-16},{78,-16}},
+    annotation (Line(points={{22,-90},{30,-90},{30,-16},{78,-16}},
     color={0,0,127}));
   connect(uFanSta, andIntErr.u3) annotation (Line(points={{-140,-100},{-82,-100},
           {-82,-68},{-72,-68}}, color={255,0,255}));
-  connect(andIntErr.y, booToRea.u) annotation (Line(points={{-49,-60},{-46,-60},
+  connect(andIntErr.y, booToRea.u) annotation (Line(points={{-48,-60},{-46,-60},
           {-46,-20},{-42,-20}},color={255,0,255}));
-  connect(limPI.y, pro.u1) annotation (Line(points={{-19,90},{38,90}},
+  connect(limPI.y, pro.u1) annotation (Line(points={{-18,90},{38,90}},
                 color={0,0,127}));
-  connect(booToRea.y, pro.u2) annotation (Line(points={{-19,-20},{0,-20},{0,78},
+  connect(booToRea.y, pro.u2) annotation (Line(points={{-18,-20},{0,-20},{0,78},
           {38,78}},color={0,0,127}));
   connect(min.u1, pro.y)
-    annotation (Line(points={{78,36},{72,36},{72,84},{61,84}},color={0,0,127}));
+    annotation (Line(points={{78,36},{72,36},{72,84},{62,84}},color={0,0,127}));
   annotation (
     defaultComponentName = "cooVal",
     Icon(graphics={
@@ -242,7 +240,7 @@ equation
         Text(
           extent={{80,-102},{120,-110}},
           lineColor={0,0,127},
-          textString="Limiter for 
+          textString="Limiter for
 low TSup"),
         Rectangle(
           extent={{-120,0},{-12,-120}},
diff --git a/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo b/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo
index 03123860e29..10a5f2dca98 100644
--- a/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo
+++ b/Buildings/Utilities/Plotters/Examples/BaseClasses/Validation/CoolingCoilValve.mo
@@ -38,25 +38,25 @@ model CoolingCoilValve
     "Fan feedback";
 
   Buildings.Utilities.Plotters.Examples.BaseClasses.CoolingCoilValve cooVal(
-    final reverseAction=true,
+    final reverseActing=false,
     final alc_int_k=1/100)
     "Cooling valve control sequence"
     annotation (Placement(transformation(extent={{-40,80},{-20,100}})));
 
   Buildings.Utilities.Plotters.Examples.BaseClasses.CoolingCoilValve cooVal1(
-    final reverseAction=true,
+    final reverseActing=false,
     final alc_int_k=1/100)
     "Cooling valve control sequence"
     annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
 
   Buildings.Utilities.Plotters.Examples.BaseClasses.CoolingCoilValve cooVal2(
-    final reverseAction=true,
+    final reverseActing=false,
     final alc_int_k=1/100)
     "Cooling valve control sequence"
     annotation (Placement(transformation(extent={{140,78},{160,98}})));
 
   Buildings.Utilities.Plotters.Examples.BaseClasses.CoolingCoilValve cooVal3(
-    final reverseAction=true,
+    final reverseActing=false,
     final alc_int_k=1/100)
     "Cooling valve control sequence"
     annotation (Placement(transformation(extent={{140,-42},{160,-22}})));
@@ -248,7 +248,7 @@ annotation (experiment(StopTime=1800.0, Tolerance=1e-06),
           extent={{22,22},{116,2}},
           lineColor={0,0,127},
           horizontalAlignment=TextAlignment.Left,
-          textString="Normal operation above 
+          textString="Normal operation above
 the upper limit TSup range."),
         Rectangle(
           extent={{14,-4},{176,-116}},
@@ -259,12 +259,12 @@ the upper limit TSup range."),
           extent={{22,-98},{116,-118}},
           lineColor={0,0,127},
           horizontalAlignment=TextAlignment.Left,
-          textString="Operation within the 
+          textString="Operation within the
           upper limit TSup range.")}),
     Documentation(
     info="<html>
 <p>
-This model validates the cooling coil signal control sequece as implemented 
+This model validates the cooling coil signal control sequece as implemented
 in B33 on the main LBNL campus.
 </p>
 </html>",
diff --git a/Buildings/Utilities/Plotters/Examples/ControlsVerification_CoolingCoilValve.mo b/Buildings/Utilities/Plotters/Examples/ControlsVerification_CoolingCoilValve.mo
index 2b1bcd51ed6..4375f90ec00 100644
--- a/Buildings/Utilities/Plotters/Examples/ControlsVerification_CoolingCoilValve.mo
+++ b/Buildings/Utilities/Plotters/Examples/ControlsVerification_CoolingCoilValve.mo
@@ -82,7 +82,7 @@ model ControlsVerification_CoolingCoilValve
     annotation (Placement(transformation(extent={{-140,40},{-120,60}})));
 
   Buildings.Utilities.Plotters.Examples.BaseClasses.CoolingCoilValve cooValSta(
-    reverseAction=true,
+    reverseActing=false,
     TSupHighLim(displayUnit="degC"),
     TSupHigLim(displayUnit="degC"),
     TOutDelta(displayUnit="degC"),
@@ -90,7 +90,7 @@ model ControlsVerification_CoolingCoilValve
     "Cooling valve position control sequence"
     annotation (Placement(transformation(extent={{20,-10},{40,10}})));
 
-  Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold greEquThr(threshold=0.5)
+  Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(t=0.5)
     "Converter to boolean"
     annotation (Placement(transformation(extent={{-100,-100},{-80,-80}})));
 
@@ -172,49 +172,49 @@ equation
   connect(cooValSta.yCooVal, correlation.y[1])
     annotation (Line(points={{41,0},{70,0},{70,30},{98,30}}, color={0,0,127}));
   connect(percConv.y, timSerRes.y[2])
-    annotation (Line(points={{-79,90},{98,90},{98,89}},
+    annotation (Line(points={{-78,90},{98,90},{98,89}},
     color={0,0,127}));
   connect(percConv.y, correlation.x)
-    annotation (Line(points={{-79,90},{50,90},{50,22},{98,22}},color={0,0,127}));
-  connect(greEquThr.y, cooValSta.uFanSta)
-    annotation (Line(points={{-79,-90},{0,-90},{0,-8},{19,-8}},
-    color={255,0,255}));
+    annotation (Line(points={{-78,90},{50,90},{50,22},{98,22}},color={0,0,127}));
+  connect(greThr.y, cooValSta.uFanSta) annotation (Line(points={{-78,-90},{0,
+          -90},{0,-8},{19,-8}}, color={255,0,255}));
   connect(percConv1.y, cooValSta.uFanFee)
-    annotation (Line(points={{-79,-60},{-6,-60},{-6,-4},{19,-4}},color={0,0,127}));
+    annotation (Line(points={{-78,-60},{-6,-60},{-6,-4},{19,-4}},color={0,0,127}));
   connect(coolingValveSignal.y[1], percConv.u)
     annotation (Line(points={{-119,90},{-102,90}}, color={0,0,127}));
   connect(fanFeedback.y[1], percConv1.u)
     annotation (Line(points={{-119,-60},{-102,-60}}, color={0,0,127}));
-  connect(fanStatus.y[1], greEquThr.u)
+  connect(fanStatus.y[1], greThr.u)
     annotation (Line(points={{-119,-90},{-102,-90}}, color={0,0,127}));
   connect(percConv.y,csvWriter. u[1])
-    annotation (Line(points={{-79,90},{50,90},{50,-29},{100,-29}}, color={0,0,127}));
+    annotation (Line(points={{-78,90},{50,90},{50,-29},{100,-29}}, color={0,0,127}));
   connect(cooValSta.yCooVal,csvWriter. u[2]) annotation (Line(points={{41,0},{
           70,0},{70,-31},{100,-31}}, color={0,0,127}));
   connect(TSupply_F.y[1], from_degF.u)
     annotation (Line(points={{-119,50},{-102,50}}, color={0,0,127}));
-  connect(from_degF.y, to_degC.u) annotation (Line(points={{-79,50},{-70,50},{-70,
-          70},{-62,70}}, color={0,0,127}));
+  connect(from_degF.y, to_degC.u) annotation (Line(points={{-78,50},{-70,50},{
+          -70,70},{-62,70}},
+                         color={0,0,127}));
   connect(TSupSetpoint_F.y[1], from_degF1.u)
     annotation (Line(points={{-119,20},{-102,20}}, color={0,0,127}));
-  connect(from_degF1.y, to_degC1.u) annotation (Line(points={{-79,20},{-70,20},
+  connect(from_degF1.y, to_degC1.u) annotation (Line(points={{-78,20},{-70,20},
           {-70,30},{-62,30}}, color={0,0,127}));
   connect(TOut_F.y[1], from_degF2.u)
     annotation (Line(points={{-119,-20},{-102,-20}}, color={0,0,127}));
-  connect(from_degF2.y, to_degC2.u) annotation (Line(points={{-79,-20},{-72,-20},
+  connect(from_degF2.y, to_degC2.u) annotation (Line(points={{-78,-20},{-72,-20},
           {-72,-10},{-62,-10}}, color={0,0,127}));
-  connect(from_degF2.y, cooValSta.TOut) annotation (Line(points={{-79,-20},{-72,
+  connect(from_degF2.y, cooValSta.TOut) annotation (Line(points={{-78,-20},{-72,
           -20},{-72,-30},{-10,-30},{-10,0},{19,0}},color={0,0,127}));
-  connect(from_degF1.y, cooValSta.TSupSet) annotation (Line(points={{-79,20},{
+  connect(from_degF1.y, cooValSta.TSupSet) annotation (Line(points={{-78,20},{
           -70,20},{-70,10},{-10,10},{-10,4},{19,4}},
                                                 color={0,0,127}));
-  connect(from_degF.y, cooValSta.TSup) annotation (Line(points={{-79,50},{0,50},
+  connect(from_degF.y, cooValSta.TSup) annotation (Line(points={{-78,50},{0,50},
           {0,8},{19,8}},   color={0,0,127}));
-  connect(to_degC.y, timSerInp.y[1]) annotation (Line(points={{-39,70},{-30,70},
+  connect(to_degC.y, timSerInp.y[1]) annotation (Line(points={{-38,70},{-30,70},
           {-30,61.3333},{98,61.3333}},color={0,0,127}));
-  connect(to_degC1.y, timSerInp.y[2]) annotation (Line(points={{-39,30},{-30,30},
+  connect(to_degC1.y, timSerInp.y[2]) annotation (Line(points={{-38,30},{-30,30},
           {-30,60},{98,60}},color={0,0,127}));
-  connect(to_degC2.y, timSerInp.y[3]) annotation (Line(points={{-39,-10},{-20,
+  connect(to_degC2.y, timSerInp.y[3]) annotation (Line(points={{-38,-10},{-20,
           -10},{-20,58.6667},{98,58.6667}},
                                       color={0,0,127}));
   annotation(experiment(Tolerance=1e-06, StopTime = 315710),
diff --git a/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo b/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo
index 0aad119fba9..6e83cc4dd86 100644
--- a/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo
+++ b/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo
@@ -2,16 +2,16 @@ within Buildings.Utilities.Psychrometrics.Functions.BaseClasses;
 function der_saturationPressureLiquid
   "Derivative of the function saturationPressureLiquid"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature Tsat "Saturation temperature";
-  input Real dTsat(unit="K/s") "Saturation temperature derivative";
+  input Modelica.SIunits.Temperature TSat "Saturation temperature";
+  input Real dTSat(unit="K/s") "Saturation temperature derivative";
   output Real psat_der(unit="Pa/s") "Differential of saturation pressure";
 
 algorithm
   psat_der:=611.657*Modelica.Math.exp(17.2799 - 4102.99
-            /(Tsat - 35.719))*4102.99*dTsat/(Tsat - 35.719)^2;
+            /(TSat - 35.719))*4102.99*dTSat/(TSat - 35.719)^2;
 
   annotation(Inline=false,
-    smoothOrder=5,
+    smoothOrder=98,
     Documentation(info="<html>
 <p>
 Derivative of function
@@ -22,6 +22,12 @@ Buildings.Utilities.Psychrometrics.Functions.saturationPressureLiquid</a>.
 revisions="<html>
 <ul>
 <li>
+September 12, 2020, by Michael Wetter:<br/>
+Corrected name of argument to comply with derivative specification.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1393\">#1393</a>.
+</li>
+<li>
 November 20, 2013 by Michael Wetter:<br/>
 First implementation, moved from <code>Buildings.Media</code>.
 </li>
diff --git a/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo b/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo
index ba0fabb0f6f..a6c8b026523 100644
--- a/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo
+++ b/Buildings/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo
@@ -5,13 +5,13 @@ function der_sublimationPressureIce
     input Modelica.SIunits.Temperature TSat(displayUnit="degC",
                                             nominal=300)
     "Saturation temperature";
-    input Real dTsat(unit="K/s") "Sublimation temperature derivative";
+    input Real dTSat(unit="K/s") "Sublimation temperature derivative";
     output Real psat_der(unit="Pa/s") "Sublimation pressure derivative";
 protected
     Modelica.SIunits.Temperature TTriple=273.16 "Triple point temperature";
     Modelica.SIunits.AbsolutePressure pTriple=611.657 "Triple point pressure";
     Real r1=TSat/TTriple "Common subexpression 1";
-    Real r1_der=dTsat/TTriple "Derivative of common subexpression 1";
+    Real r1_der=dTSat/TTriple "Derivative of common subexpression 1";
     Real a[2]={-13.9281690,34.7078238} "Coefficients a[:]";
     Real n[2]={-1.5,-1.25} "Coefficients n[:]";
 algorithm
@@ -30,6 +30,13 @@ Buildings.Utilities.Psychrometrics.Functions.sublimationPressureIce</a>.
 revisions="<html>
 <ul>
 <li>
+September 12, 2020, by Michael Wetter:<br/>
+Change name of argument <code>dTsat</code> to <code>dTSat</code> for consistency
+with
+<a href=\"modelica://Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_saturationPressureLiquid\">
+Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_saturationPressureLiquid</a>.
+</li>
+<li>
 November 20, 2013 by Michael Wetter:<br/>
 First implementation, moved from <code>Buildings.Media</code>.
 </li>
diff --git a/Buildings/legal.html b/Buildings/legal.html
index 5d61dc5f9e9..514583a6463 100644
--- a/Buildings/legal.html
+++ b/Buildings/legal.html
@@ -5,7 +5,7 @@
 
 <h1>License</h1>
 <p>
-Modelica Buildings Library. Copyright (c) 1998-2019
+Modelica Buildings Library. Copyright (c) 1998-2020
 Modelica Association,
 International Building Performance Simulation Association (IBPSA),
 The Regents of the University of California, through Lawrence Berkeley National Laboratory
diff --git a/Buildings/package.mo b/Buildings/package.mo
index e5e24887ba9..12fd5eaf4f8 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -12,6 +12,7 @@ package UsersGuide "User's Guide"
 The <code>Buildings</code> library uses the following conventions,
 which largely are based on the conventions of the Modelica Standard Library.
 </p>
+
 <h4>Package structure</h4>
 <p>
 Packages have usually the following subpackages:
@@ -36,6 +37,8 @@ behavior of a model.
 <code>Types</code> containing type, enumeration and choice definitions.
 </li>
 </ul>
+
+
 <h4>Naming</h4>
 <ol>
 <li>
@@ -148,6 +151,7 @@ or electrical connectors
 <code>terminal_p</code> and <code>terminal_n</code>.
 </li>
 </ol>
+
 <h4>Documentation</h4>
 <ol>
 <li>
@@ -167,6 +171,7 @@ The first character should be upper case.
 For one-line comments of parameters, variables and classes, no period should be used at the end of the comment.
 </li>
 </ol>
+
 <h4>Graphical display</h4>
 <ol>
 <li>
@@ -183,6 +188,7 @@ in the icon in black color in a smaller font size as the instance name
 if this helps with usability.
 </li>
 </ol>
+
 <h4>Miscellaneous</h4>
 <ol>
 <li>
@@ -501,11 +507,7 @@ to <b style=\"color:blue\">existing</b> libraries:
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2125\">issue 2125</a>
                        and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2282\">issue 2282</a>.</td>
 </tr>
-<<<<<<< HEAD
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integer.TimeTable
-=======
 <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable
->>>>>>> master
     </td>
     <td valign=\"top\">Time table for <code>Integer</code> outputs.<br/>
                        Each output is held constant between two consecutive entries in each column of the <code>table</code> parameters.<br/>
@@ -1466,6 +1468,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                            For Dymola, a conversion script makes this change.
         </td>
     </tr>
+
     <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
         </td>
         <td valign=\"top\">Removed homotopy that may be used during initialization to ensure that outputs are bounded.<br/>
@@ -1696,6 +1699,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                            Buildings.Examples.VAVReheat.ASHRAE2006<br/>
                            Buildings.Examples.VAVReheat.Guideline36<br/>
                            Buildings.Examples.DualFanDualDuct
+
         </td>
         <td valign=\"top\">Updated core zone geometry parameters related to room heat and mass balance.
                            This change was done in
@@ -1889,6 +1893,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                            Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.BaseClasses.PartialVDI6007<br/>
                            Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.BaseClasses.PartialVDI6007<br/>
                            Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007WithWindow
+
         </td>
         <td valign=\"top\">Renamed convection coefficient from <code>alpha*</code> to <code>hCon*</code>.<br/>
                            For Dymola, a conversion script makes this change.<br/>
@@ -2514,6 +2519,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1402\">issue 1402</a>.
         </td>
     </tr>
+
     <tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
         </td>
     </tr>
@@ -2523,6 +2529,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1062\">IBPSA, #1062</a>.
         </td>
     </tr>
+
     <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
         </td>
     </tr>
@@ -3075,6 +3082,8 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/724\">Buildings, #724</a>.
        </td>
    </tr>
+
+
    </table>
    <!-- Errors that have been fixed -->
    <p>
@@ -3093,6 +3102,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                           See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/743\">#743</a>.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Controls</b>
        </td>
    </tr>
@@ -3104,6 +3114,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                           See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/743\">IBPSA, #743</a>.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
        </td>
    </tr>
@@ -3258,17 +3269,15 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
    The following <b style=\"color:blue\">new libraries</b> have been added:
    </p>
    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<<<<<<< HEAD
-   <tr><td valign=\"top\">Buildings.Experimental.DistrictHeatingCooling
-=======
 
    <tr><td valign=\"top\">Buildings.Obsolete.DistrictHeatingCooling
->>>>>>> master
        </td>
        <td valign=\"top\">Package with models for district heating and cooling
                           with bi-directional flow in the distribution pipes.
+
        </td>
        </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.FMI.Adaptors<br/>
                           Buildings.Fluid.FMI.ExportContainers
        </td>
@@ -3278,11 +3287,13 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">Buildings, #506</a>.
        </td>
        </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.ActiveBeams
        </td>
        <td valign=\"top\">Package with models of active beams for space cooling and heating.
        </td>
        </tr>
+
     <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DXCoils.WaterCooled
        </td>
        <td valign=\"top\">Package with models of water-cooled direct expansion
@@ -3290,17 +3301,20 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
                           or multi-stage compressor.
         </td>
         </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Compressors
        </td>
        <td valign=\"top\">Package with models of compressors for heat pumps.
        </td>
        </tr>
+
      <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder
        </td>
        <td valign=\"top\">Package with reduced order models of thermal zones based
                         on VDI 6007.
        </td>
        </tr>
+
    </table>
    <!-- New components for existing libraries -->
    <p>
@@ -3316,6 +3330,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
        <td valign=\"top\">Sensor for the flow velocity.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
        </td>
    </tr>
@@ -3324,6 +3339,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
        <td valign=\"top\">Model for evaporator/condenser with refrigerant experiencing constant temperature phase change.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
        </td>
    </tr>
@@ -3337,6 +3353,7 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
        <td valign=\"top\">Model for water to water heat pump with a scroll compressor.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows.BaseClasses</b>
        </td>
    </tr>
@@ -3346,6 +3363,8 @@ as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">I
 This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
        </td>
    </tr>
+
+
    <tr><td colspan=\"2\"><b>Buildings.Media</b>
        </td>
    </tr>
@@ -3383,6 +3402,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/501\">IBPSA, #501</a>.
        </td>
    </tr>
+
    </table>
    <!-- Backward compatible changes -->
    <p>
@@ -3435,8 +3455,10 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
        <td valign=\"top\">Reduced tolerance for regularization if the sky clearness is near one or eight.
                           This closes
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/521\">IBPSA, #521</a>.
+
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Controls</b>
        </td>
    </tr>
@@ -3450,6 +3472,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                            <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/494\">IBPSA, #494</a>.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
        </td>
    </tr>
@@ -3466,6 +3489,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
    </tr>
    <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
                           Buildings.Examples.VAVReheat.ClosedLoop
+
        </td>
        <td valign=\"top\">Added hysteresis to the economizer control to avoid many events.
                           This change was done in
@@ -3475,13 +3499,16 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop
+
        </td>
        <td valign=\"top\">Set <code>filteredSpeed=false</code> in fan models to avoid a large
                           increase in computing time when simulated between <i>t=1.60E7</i>
                           and <i>t=1.66E7</i>.
+
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.ClosedLoop
+
        </td>
        <td valign=\"top\">Changed chilled water supply temperature to <i>6&deg;C</i>.
                           This closes
@@ -3523,6 +3550,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BeamDepthInRoom
        </td>
        <td valign=\"top\">Refactored the use of <code>Modelica.Utilities.Files.loadResource</code>.
@@ -3530,6 +3558,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">issue 506</a>.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
        </td>
    </tr>
@@ -3609,9 +3638,11 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/555\">issue 555</a>.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
                           Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
                           Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
@@ -3633,6 +3664,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/665\">IBPSA, #665</a>
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
                           Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
                           Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
@@ -3648,6 +3680,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/544\">IBPSA, #544</a>
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
        </td>
    </tr>
@@ -3666,6 +3699,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/497\">IBPSA, #497</a>
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.FixedResistances</b>
        </td>
    </tr>
@@ -3694,6 +3728,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <code>Buildings.Fluid.FixedResistances.HydraulicDiameter</code> at each fluid port.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
        </td>
    </tr>
@@ -3720,6 +3755,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           For Dymola, the conversion script updates these models.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
        </td>
    </tr>
@@ -3745,6 +3781,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           For Dymola, the conversion script updates these models.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
        </td>
    </tr>
@@ -3763,6 +3800,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/497\">IBPSA, #497</a>
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Boreholes
        </td>
        <td valign=\"top\">Moved the package <code>Buildings.Fluid.HeatExchangers.Boreholes</code> to
@@ -3785,6 +3823,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           this change as the function are called by a low-level implementation only.
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Movers.
                           Buildings.Fluid.Movers.FlowControlled_dp<br/>
                           Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
@@ -3799,6 +3838,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/665\">IBPSA, #665</a>
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers
        </td>
        <td valign=\"top\">Changed the name of the function
@@ -3828,6 +3868,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           which is needed for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/451\">issue 451</a>.
        </td>
     </tr>
+
     <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.BaseClasses.PartialConstruction
        </td>
        <td valign=\"top\">Removed parameter <code>A</code> as it is already declared in
@@ -3835,10 +3876,12 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           which is often used with this class.
        </td>
     </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed
+
        </td>
        <td valign=\"top\">Moved package from <code>Buildings.Rooms</code> to <code>Buildings.ThermalZones.Detailed</code>.
                           This was done because <code>Buildings</code> has a new package
@@ -3849,18 +3892,21 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <code>Buildings.ThermalZones</code>.
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD<br/>
                           Buildings.ThermalZones.Detailed.MixedAir<br/>
                           Buildings.ThermalZones.Detailed.BaseClasses.CFDAirHeatMassBalance<br/>
                           Buildings.ThermalZones.Detailed.BaseClasses.MixedAirHeatMassBalance<br/>
                           Buildings.ThermalZones.Detailed.BaseClasses.PartialAirHeatMassBalance<br/>
                           Buildings.ThermalZones.Detailed.BaseClasses.RoomHeatMassBalance
+
        </td>
        <td valign=\"top\">Refactored implementation of latent heat gain for
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
                           Users who simply use <code>Buildings.MixedAir.Rooms.CFD</code> or
                           <code>Buildings.MixedAir.Rooms.MixedAir</code> will not be affected by this change,
                           except if they access variables related to the heat gain.
+
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.AirHeatMassBalanceMixed<br/>
@@ -3884,6 +3930,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
 "    +
     "       </td>
     </tr>
+
    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDHeatGain
        </td>
        <td valign=\"top\">Renamed model from <code>Buildings.ThermalZones.Detailed.BaseClasses.CFDHeatGain</code> to
@@ -3892,6 +3939,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDExchange
        </td>
        <td valign=\"top\">Removed the parameter <code>uStart</code> as it is not required. As this is in a base
@@ -3901,6 +3949,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/579\">Buildings, #579</a>.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
        </td>
    </tr>
@@ -3916,6 +3965,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/475\">IBPSA, #475</a>.
        </td>
     </tr>
+
    </table>
    <!-- Errors that have been fixed -->
    <p>
@@ -3937,6 +3987,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/520\">issue 520</a>
                           and integrates the change of
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/474\">IBPSA, #474</a>.
+
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
@@ -4096,6 +4147,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/426\">#426</a>.
        </td>
        </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
        </td>
    </tr>
@@ -4147,6 +4199,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
                           Buildings.Fluid.Actuators.Valves.ThreeWayLinear
     </td>
@@ -4156,6 +4209,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                        and avoids an assertion that would be triggered if <code>l=0</code>.
     </td>
     </tr>
+
     <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.UTube
        </td>
        <td valign=\"top\">Updated code for 64 bit on Linux and Windows.
@@ -4163,6 +4217,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/485\">issue 485</a>.
        </td>
     </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryEffectivenessNTU
     </td>
     <td valign=\"top\">Reformulated model to allow translation in OpenModelica.
@@ -4170,6 +4225,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/490\">#490</a>.
     </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
     </td>
     <td valign=\"top\">Changed the sign convention for <code>dTEva_nominal</code>.
@@ -4184,6 +4240,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                        to assign default values for the nominal mass flow rates.
     </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolume<br/>
                           Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir
     </td>
@@ -4192,6 +4249,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                        to add a trace substance flow rate, such as CO2, to the volume.
     </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
                           Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
                           Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
@@ -4204,6 +4262,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                        to assign the control signal.
     </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
        </td>
        <td valign=\"top\">Added option to set dynamics of heat exchanger material
@@ -4215,12 +4274,14 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
    </tr>
    <tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
                           Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger
+
        </td>
        <td valign=\"top\">Propagated parameter <code>allowFlowReversal</code>
                           which can cause a simpler energy balance to be used.
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPortTransport
+
        </td>
        <td valign=\"top\">Implemented more efficient computation of <code>port_a.Xi_outflow</code>
                           and <code>port_a.C_outflow</code> when <code>allowFlowReversal=false</code>.
@@ -4230,6 +4291,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
    </tr>
    <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp<br/>
                         Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow
+
        </td>
        <td valign=\"top\">Refactored for a more efficient implementation.
                         Removed double declaration of <code>smooth(..)</code> and <code>smoothOrder</code>
@@ -4297,6 +4359,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           require a manual update.
        </td>
      </tr>
+
     <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
        </td>
    </tr>
@@ -4355,6 +4418,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                      by setting <code>nominalValuesDefineDefaultPressureCurve=true</code>.
      </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.Movers.Data
      </td>
      <td valign=\"top\">Replaced the parameters
@@ -4380,6 +4444,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                         For Dymola, the conversion script updates this parameter.
      </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.PartialThreeWayResistance<br/>
                           Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine<br/>
                           Buildings.Fluid.Movers.FlowControlled_dp<br/>
@@ -4534,6 +4599,8 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/468\">issue 468</a>.
        </td>
    </tr>
+
+
    <tr><td colspan=\"2\"><b>Buildings.Media</b>
        </td>
    </tr>
@@ -4544,6 +4611,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/303\">IBPSA issue 303</a>.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
        </td>
    </tr>
@@ -4553,18 +4621,23 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/493\">issue 493</a>.
        </td>
    </tr>
+
+
    <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_2_regNonZeroPower<br/>
                           Buildings.Utilities.Math.Functions.BaseClasses.der_polynomial<br/>
                           Buildings.Utilities.Math.Functions.BaseClasses.der_regNonZeroPower
+
        </td>
        <td valign=\"top\">Corrected wrong derivative implementation and improved their regression tests.
                           This is for
                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/303\">IBPSA issue 303</a>.
+
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b>
        </td>
    </tr>
@@ -4573,6 +4646,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
        <td valign=\"top\">Corrected wrong default component name.
        </td>
    </tr>
+
    <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.saturationPressure
        </td>
        <td valign=\"top\">Changed <code>smoothOrder</code> from <i>5</i> to <i>1</i> as
@@ -4581,6 +4655,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                          Inlined the function.
        </td>
    </tr>
+
    <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python27</b>
        </td>
    </tr>
@@ -4595,6 +4670,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/287\">issue 287</a>.
        </td>
    </tr>
+
    </table>
    </html>"));
    end Version_3_0_0;
@@ -4631,6 +4707,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
        </tr>
    </table>
    <!-- New components for existing libraries -->
+
    <!-- Backward compatible changes -->
    <p>
    The following <b style=\"color:blue\">existing components</b>
@@ -4682,6 +4759,8 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
        </td>
    </tr>
    <tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume
+
+
        </td>
        <td valign=\"top\">Added test on <code>allowFlowReversal</code> in criteria
                           about what energy balance implementation to use.
@@ -4692,6 +4771,7 @@ This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\"
    </tr>
    </table>
    <!-- Non-backward compatible changes to existing components -->
+
    <!-- Errors that have been fixed -->
    <p>
    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
@@ -4828,6 +4908,7 @@ to <b style=\"color:blue\">existing</b> libraries:
                        a dynamic rather than a steady-state response.
     </td>
     </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
     </td>
 </tr>
@@ -4838,6 +4919,7 @@ to <b style=\"color:blue\">existing</b> libraries:
                        for given pressure, temperature and water vapor mass fraction.
     </td>
     </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
     </td>
 </tr>
@@ -4853,6 +4935,7 @@ to <b style=\"color:blue\">existing</b> libraries:
                        for detailed explanations.
     </td>
     </tr>
+
 </table>
 <!-- Backward compatible changes -->
 <p>
@@ -4876,6 +4959,7 @@ have been <b style=\"color:blue\">improved</b> in a
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.Chillers.ElectricEIR<br/>
                        Buildings.Chillers.ElectricReformulatedEIR
     </td>
@@ -4885,6 +4969,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/373\">373</a>.
     </td>
     </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow
     </td>
     <td valign=\"top\">Changed assignment of <code>T_m</code> to avoid using the conditionally
@@ -4896,6 +4981,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        to avoid mixing graphical and textual modeling within the same model.
     </td>
     </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized
     </td>
     <td valign=\"top\">Removed parameter <code>m1_flow_nominal</code>, as this parameter is already
@@ -4914,6 +5000,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        as this language construct is not supported in OpenModelica.
     </td>
     </tr>
+
     <tr>
     <td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab
     </td>
@@ -4921,10 +5008,12 @@ have been <b style=\"color:blue\">improved</b> in a
                        a warning about conflicting start values.
     </td>
     </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
                        Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
                        Buildings.Fluid.Movers.FlowControlled_dp<br/>
                        Buildings.Fluid.Movers.FlowControlled_m_flow
+
     </td>
     <td valign=\"top\">For the parameter setting <code>use_powerCharacteristic=true</code>,
                      changed the computation of the power consumption at
@@ -4933,6 +5022,7 @@ have been <b style=\"color:blue\">improved</b> in a
                      <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/202\">#202</a>.
     </td>
 </tr>
+
     <tr>
     <td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
                        Buildings.Fluid.SolarCollectors.EN12975
@@ -4944,6 +5034,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        and set <code>prescribedHeatFlowRate=true</code>.
     </td>
     </tr>
+
     <tr>
     <td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
     </td>
@@ -4965,6 +5056,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        and translation in Dymola 2015 FD01 beta1.
     </td>
     </tr>
+
 <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.InteriorHeatTransferConvective
     </td>
     <td valign=\"top\">Changed model to allow a temperature dependent convective heat transfer
@@ -4973,6 +5065,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/52\">52</a>.
     </td>
     </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Media</b>
     </td>
 </tr>
@@ -4987,9 +5080,11 @@ have been <b style=\"color:blue\">improved</b> in a
                        <code>Buildings.Examples.VAVReheat.ClosedLoop</code> in pedantic mode.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
     </td>
     </tr>
+
 <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
     </td>
     <td valign=\"top\">Changed model to allow a temperature dependent convective heat transfer
@@ -4998,6 +5093,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/52\">52</a>.
     </td>
     </tr>
+
 <tr><td valign=\"top\">Rooms.BaseClasses.ExteriorBoundaryConditionsWithWindow
     </td>
     <td valign=\"top\">Conditionally removed the shade model if no shade is present.
@@ -5005,6 +5101,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/234\">#234</a>.
     </td>
 </tr>
+
 </table>
 <!-- Non-backward compatible changes to existing components -->
 <p>
@@ -5024,6 +5121,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        update existing models.
    </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
    </td>
 </tr>
@@ -5038,6 +5136,7 @@ have been <b style=\"color:blue\">improved</b> in a
                       update existing models.
    </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Examples</b>
    </td>
 </tr>
@@ -5053,9 +5152,11 @@ have been <b style=\"color:blue\">improved</b> in a
    <td valign=\"top\">Removed block as it is not used in any model.
    </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
     </td>
     </tr>
+
 <tr><td valign=\"top\">Buildings.HeatTransfer.Data.GlazingSystems.Generic
     </td>
     <td valign=\"top\">Removed parameter <code>nLay</code> as OpenModelica
@@ -5083,9 +5184,12 @@ have been <b style=\"color:blue\">improved</b> in a
                        update existing models.
     </td>
 </tr>
+
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
     </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.Pipe<br/>
                        Buildings.Fluid.FixedResistances.BaseClasses.Pipe<br/>
                        Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab
@@ -5098,6 +5202,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        update existing models.
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
                        Buildings.Fluid.HeatExchangers.WetCoilDiscretized
     </td>
@@ -5113,16 +5218,20 @@ have been <b style=\"color:blue\">improved</b> in a
                        Removed the parameter <code>ductConnectionDynamics</code>.<br/>
                        For Dymola, the conversion script will automatically
                        update existing models.
+
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed
     </td>
     <td valign=\"top\">Renamed the model to <code>HeaterCooler_u</code> due to
                        the introduction of the new model <code>HeaterCooler_T</code>.<br/>
                        For Dymola, the conversion script will automatically
                        update existing models.
+
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab<br/>
                        Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab
     </td>
@@ -5140,6 +5249,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        update existing models.
  </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.DuctManifoldFixedResistance
     </td>
     <td valign=\"top\">Reformulated flow splitter in the model to reduce
@@ -5164,6 +5274,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        update existing models.
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed
     </td>
     <td valign=\"top\">Renamed the model to <code>Humidifier_u</code> due to
@@ -5171,8 +5282,10 @@ have been <b style=\"color:blue\">improved</b> in a
                        and to use the same naming pattern as <code>HeaterCooler_u</code>.<br/>
                        For Dymola, the conversion script will automatically
                        update existing models.
+
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.Fluid.Movers
     </td>
     <td valign=\"top\">This package has been redesigned.
@@ -5221,6 +5334,8 @@ have been <b style=\"color:blue\">improved</b> in a
                        which are now in the package <code>Buildings.Obsolete.Fluid.Movers</code>.
     </td>
 </tr>
+
+
 <tr><td colspan=\"2\"><b>Buildings.Media</b>
     </td>
 </tr>
@@ -5252,14 +5367,18 @@ have been <b style=\"color:blue\">improved</b> in a
                        to <code>Buildings.Obsolete.Media.GasesPTDecoupled.SimpleAir</code>.<br/><br/>
                        For Dymola, the conversion script will
                        update existing models according to the above list.
+
 </td>
 </tr>
+
+
 <tr><td valign=\"top\">Buildings.Media.Water
     </td>
     <td valign=\"top\">Removed option to model water as a compressible medium as
                        this option was not useful.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
     </td>
 </tr>
@@ -5287,6 +5406,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        update existing models according to the above list.
     </td>
 </tr>
+
 </table>
 <!-- Errors that have been fixed -->
 <p>
@@ -5337,9 +5457,11 @@ that can lead to wrong simulation results):
                        and the tank had different media.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer
     </td>
     <td valign=\"top\">Corrected issue
@@ -5348,6 +5470,7 @@ that can lead to wrong simulation results):
                        is very small.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
     </td>
 </tr>
@@ -5392,7 +5515,9 @@ units are wrong or errors in documentation):
                        This avoids a type error in OpenModelica.
     </td>
 </tr>
+
 </table>
+
 <p>
 <b>Note:</b>
 </p>
@@ -5529,6 +5654,7 @@ have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">non-backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -5628,6 +5754,7 @@ units are wrong or errors in documentation):
                        enumeration with an integer, which triggers a warning
                        in Dymola 2015.
     </td>
+
     </tr>    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWall<br/>
                            Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
                            Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows
@@ -5830,6 +5957,7 @@ have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
     </td>
 </tr>
@@ -5845,6 +5973,8 @@ have been <b style=\"color:blue\">improved</b> in a
                        is on the <code>MODELICAPATH</code>.
     </td>
 </tr>
+
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -5922,6 +6052,7 @@ have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">non-backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.Airflow</b>
     </td>
 </tr>
@@ -5936,6 +6067,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        can be used to update old models that use this parameter.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -6050,6 +6182,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        and derived quantities.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer<br/>
                          Buildings.ThermalZones</b>
     </td>
@@ -6124,6 +6257,8 @@ have been <b style=\"color:blue\">improved</b> in a
     <td valign=\"top\">Renamed function from <code>raleigh</code> to <code>rayleigh</code>.
     </td>
 </tr>
+
+
 </table>
 <!-- Errors that have been fixed -->
 <p>
@@ -6140,6 +6275,7 @@ that can lead to wrong simulation results):
            Corrected wrong computation of the dynamics used for the sensor signal.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
     </td>
 </tr>
@@ -6198,6 +6334,7 @@ units are wrong or errors in documentation):
                      with <code>quantity=\"ThermodynamicTemperature\"</code>.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -6268,6 +6405,9 @@ units are wrong or errors in documentation):
                        when a python module accessed <code>sys.argv</code>.
     </td>
 </tr>
+
+
+
 </table>
 <!-- Github issues -->
 <p>
@@ -6309,6 +6449,7 @@ It also contains in the package <code>Buildings.HeatTransfer.Conduction.SingleLa
 a new model for heat conduction in phase change material. This model can be used as a layer
 of the room heat transfer model.
 </p>
+
 <p>
 Non-backward compatible changes had to be introduced
 in the valve models
@@ -6318,6 +6459,7 @@ language specification, and in the models in the package
 as they used the <code>cardinality</code> function which is deprecated in the Modelica
 Language Specification.
 </p>
+
 <p>
 See below for details.
 <!-- New libraries -->
@@ -6389,12 +6531,14 @@ have been <b style=\"color:blue\">improved</b> in a
 </tr>
 </table>
 <!-- Non-backward compatible changes to existing components -->
+
 <p>
 The following <b style=\"color:blue\">existing components</b>
 have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">non-backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -6445,11 +6589,13 @@ have been <b style=\"color:blue\">improved</b> in a
     </td>
 </tr></table>
 <!-- Errors that have been fixed -->
+
 <p>
 The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
 that can lead to wrong simulation results):
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.Controls</b>
     </td>
 </tr>
@@ -6460,6 +6606,7 @@ that can lead to wrong simulation results):
                      This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/74\">issue 74</a>.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
     </td>
 </tr>
@@ -6472,6 +6619,7 @@ that can lead to wrong simulation results):
                      This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/79\">issue 79</a>.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
     </td>
 </tr>
@@ -6486,6 +6634,7 @@ that can lead to wrong simulation results):
 </tr>
 </table>
 <!-- Uncritical errors -->
+
 <p>
 The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
 that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
@@ -6584,6 +6733,7 @@ should be formulated as
     </td>
 </tr>
 </table>
+
 <p>
 Note:
 </p>
@@ -6679,6 +6829,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        wet bulb temperature can be removed.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Controls</b>
     </td>
 </tr>
@@ -6687,6 +6838,7 @@ have been <b style=\"color:blue\">improved</b> in a
     <td valign=\"top\">Added <code>pre</code> operator and relaxed tolerance in <code>assert</code> statement.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -6737,6 +6889,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        spectrum.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -6886,6 +7039,7 @@ The following <b style=\"color:blue\">new libraries</b> have been added:
     </tr>
 </table>
 <!-- New components for existing libraries -->
+
 <p>
 The following <b style=\"color:blue\">new components</b> have been added
 to <b style=\"color:blue\">existing</b> libraries:
@@ -6906,6 +7060,7 @@ to <b style=\"color:blue\">existing</b> libraries:
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
     </td>
 </tr>
+
 <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Examples.BESTEST
     </td>
     <td valign=\"top\">Added BESTEST validation models for case 610, 620, 630, 640,
@@ -7198,6 +7353,7 @@ to <b style=\"color:blue\">existing</b> libraries:
     </tr>
 </table>
 <!-- Backward compatible changes -->
+
 <p>
 The following <b style=\"color:blue\">existing components</b>
 have been <b style=\"color:blue\">improved</b> in a
@@ -7292,12 +7448,14 @@ have been <b style=\"color:blue\">improved</b> in a
 </tr>
 </table>
 <!-- Non-backward compatible changes to existing components -->
+
 <p>
 The following <b style=\"color:blue\">existing components</b>
 have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">non-backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
     </td>
 </tr>
@@ -7322,6 +7480,7 @@ have been <b style=\"color:blue\">improved</b> in a
                        See also <code>Buildings.Fluid.Actuators.UsersGuide</code>.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
     </td>
 </tr>
@@ -7350,6 +7509,7 @@ have been <b style=\"color:blue\">improved</b> in a
 </tr>
 </table>
 <!-- Errors that have been fixed -->
+
 <p>
 The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
 that can lead to wrong simulation results):
@@ -7378,6 +7538,7 @@ that can lead to wrong simulation results):
 </tr>
 </table>
 <!-- Uncritical errors -->
+
 <p>
 The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
 that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
@@ -7412,6 +7573,7 @@ units are wrong or errors in documentation):
 </tr>
 </table>
 <!-- Github issues -->
+
 <p>
 The following
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
@@ -7437,6 +7599,7 @@ have been fixed:
     </td>
 </tr>
 </table>
+
 <p>
 Note:
 </p>
@@ -7466,6 +7629,7 @@ of various example models.
 <!-- New components for existing libraries -->
 <!-- Backward compatible changes -->
 </p>
+
 <p>
 The following <b style=\"color:blue\">existing components</b>
 have been <b style=\"color:blue\">improved</b> in a
@@ -7508,6 +7672,7 @@ have been <b style=\"color:blue\">improved</b> in a
     </td>
 </tr>
 </table>
+
 <!-- Non-backward compatbile changes to existing components -->
 <!-- Errors that have been fixed -->
 <p>
@@ -7515,6 +7680,7 @@ The following <b style=\"color:red\">critical errors</b> have been fixed (i.e.,
 that can lead to wrong simulation results):
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
     </td>
 </tr>
@@ -7524,6 +7690,7 @@ that can lead to wrong simulation results):
                      The old implementation did not take into account the surface roughness.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
     </td>
 </tr>
@@ -7552,6 +7719,7 @@ that can lead to wrong simulation results):
 </table>
 <!-- Uncritical errors -->
 <!-- Github issues -->
+
 <p>
 The following
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
@@ -7575,6 +7743,7 @@ have been fixed:
     <td valign=\"top\">The convective internal heat gain has the wrong sign.
     </td>
 </tr>
+
 </table>
 </html>"));
   end Version_1_0_build2;
@@ -7653,12 +7822,14 @@ to <b style=\"color:blue\">existing</b> libraries:
                        option for monotone increasing (or decreasing) spline.
     </td> </tr>
 </table>
+
 <p>
 The following <b style=\"color:blue\">existing components</b>
 have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b></td></tr>
 <tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.powerLaw</td>
     <td valign=\"top\">This function has been reimplemented to handle zero flow rate
@@ -7666,6 +7837,7 @@ have been <b style=\"color:blue\">improved</b> in a
                      This change improves all components that model flow resistance in
                      the package Buildings.Airflow.Multizone.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b></td></tr>
 <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3</td>
     <td valign=\"top\">This model has now the option of using a constant value,
@@ -7674,6 +7846,7 @@ have been <b style=\"color:blue\">improved</b> in a
                      global horizontal radiation, diffuse horizontal radiation,
                      wind direction and wind speed.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
 <tr><td valign=\"top\">
                       Buildings.Fluid.Actuators.BaseClasses.PartialActuator<br/>
@@ -7693,6 +7866,7 @@ have been <b style=\"color:blue\">improved</b> in a
                      These improvements affect all models in <code>Buildings.Fluid</code> that compute
                      flow resistance.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed</td>
     <td valign=\"top\">This model can now be configured as a steady-state or dynamic model.</td>
@@ -7711,6 +7885,8 @@ are used as steady-state models, have been improved.</td>
                      which was removed for this version of the library.
                      </td>
 </tr>
+
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers.CoolingTowers</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc<br/>
                      Buildings.Fluid.HeatExchangers.CoolingTowers.FixedApproach</td>
@@ -7722,10 +7898,12 @@ are used as steady-state models, have been improved.</td>
     <td valign=\"top\">
        Changed implementation of performance curve to avoid division by zero.
     </td></tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.MassExchangers</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed</td>
     <td valign=\"top\">This model can now be configured as a steady-state or dynamic model.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Sensors.*TwoPort</td>
     <td valign=\"top\">All sensors with two ports, except for the mass flow rate sensor,
@@ -7735,12 +7913,14 @@ are used as steady-state models, have been improved.</td>
                      flow reversal. See
                      <code>Buildings.Fluid.Sensors.UsersGuide</code> for details.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Storage</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified<br/>
                      Buildings.Fluid.Storage.StratifiedEnhanced</td>
     <td valign=\"top\">Changed the implementation of the model <code>Buoyancy</code>
                      to make it differentiable in the temperatures.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
 <tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleMedium<br/>
                      Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</td>
@@ -7749,6 +7929,7 @@ are used as steady-state models, have been improved.</td>
                      <code>Buildings.Fluid.MixingVolumes.MixingVolume</code>. This allows
                      to handle it differently for steady-state and dynamic models.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b></td></tr>
 <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.TDewPoi_pW</td>
     <td valign=\"top\">Changed implementation to use
@@ -7757,19 +7938,23 @@ are used as steady-state models, have been improved.</td>
                      which was removed for this version of the library.
                      </td>
 </tr>
+
 </table>
+
 <p>
 The following <b style=\"color:blue\">existing components</b>
 have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">non-backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
 <tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b></td></tr>
 <tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumnDynamic</td>
     <td valign=\"top\">The implementation has been changed to better handle mass flow rates
 near zero flow.
 This required the introduction of a new parameter <code>m_flow_nominal</code>
 that is used for the regularization near zero mass flow rate.</td></tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Storage.Examples.Stratified<br/>
                      Buildings.Fluid.MixingVolumes</td>
@@ -7779,6 +7964,7 @@ that is used for the regularization near zero mass flow rate.</td></tr>
                      for building simulation.
                      </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Boilers</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Boilers.BoilerPolynomial</td>
     <td valign=\"top\">The parameter <code>dT_nominal</code> has been removed
@@ -7786,6 +7972,7 @@ as it can be computed from the parameter <code>m_flow_nominal</code>.
 This change was needed to avoid a non-literal value for the nominal
 attribute for the mass flow rate in the pressure drop model.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.MixingVolumes</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolume<br/>
                      Buildings.Fluid.MixingVolumes.MixingVolumeDryAir<br/>
@@ -7795,6 +7982,7 @@ near zero flow if the components have exactly two fluid ports connected.
 This required the introduction of a new parameter <code>m_flow_nominal</code>
 that is used for the regularization near zero mass flow rate.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
                      Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
@@ -7820,6 +8008,9 @@ that is used for the regularization near zero mass flow rate.</td>
                      near zero volume flow rate and zero speed.<br/>
                      The implementation has also been simplified to avoid using two different flow paths
                      if the models are configured for steady-state or dynamic simulation.</td></tr>
+
+
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
                      Buildings.Fluid.Interfaces.PartialDynamicStaticFourPortHeatMassExchanger<br/>
@@ -7829,12 +8020,15 @@ that is used for the regularization near zero mass flow rate.</td>
     <td valign=\"top\">The implementation has been changed to better handle mass flow rates
 near zero flow if the components have exactly two fluid ports connected.</td>
 </tr>
+
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Sensors.TemperatureTwoPortDynamic</td>
     <td valign=\"top\">This model has been deleted since the sensor
                      <code>Buildings.Fluid.Sensors.TemperatureTwoPort</code> has been revised
                      and can now also be used as a dynamic model of a sensor.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
 <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticTwoPortInterface</td>
     <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.PartialTwoPortInterface</td>
@@ -7851,11 +8045,13 @@ near zero flow if the components have exactly two fluid ports connected.</td>
 <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPortHeatMassExchanger</td>
     <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.FourPortHeatMassExchanger</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b></td></tr>
 <tr><td valign=\"top\">Buildings.Utilities.Math.BaseClasses.OneNonLinearEquation</td>
     <td valign=\"top\">This package has been removed, and all functions have been
                        revised to use Modelica.Media.Common.OneNonLinearEquation.</td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Utilities.Reports</b></td></tr>
 <tr><td valign=\"top\">Buildings.Utilities.IO.Files.Printer<br/>
                      Buildings.Utilities.IO.Files.BaseClasses.printRealArray</td>
@@ -7863,12 +8059,16 @@ near zero flow if the components have exactly two fluid ports connected.</td>
                      <code>minimumWidth</code> to <code>minimumLength</code>
                      to use the same terminology as the Modelica Standard Library.</td>
 </tr>
+
 </table>
+
 <p>
 The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
 that can lead to wrong simulation results):
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
+
 <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b></td></tr>
 <tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody</td>
     <td valign=\"top\">Fixed error in <code>if-then</code> statement that led to
@@ -7880,6 +8080,7 @@ that can lead to wrong simulation results):
                        This change can lead to different initial conditions if the density of
                        water is modeled as a function of pressure, or if the
                        medium model Buildings.Media.GasesConstantDensity.SimpleAir is used.</td></tr>
+
 <tr><td valign=\"top\">Buildings.Media.GasesConstantDensity<br/>
                        Buildings.Media.GasesConstantDensity.MoistAir<br/>
                        Buildings.Media.GasesConstantDensity.MoistAirUnsaturated<br/>
@@ -7889,23 +8090,28 @@ that can lead to wrong simulation results):
                      function cannot assign the medium pressure based on the density (as density is a constant
                      in this model).
 </td></tr>
+
 <tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</td>
     <td valign=\"top\">Updated package with a new copy from the Modelica Standard Library, since
                      the Modelica Standard Library fixed a bug in computing the internal energy of the medium.
                      This bug led to very fast temperature transients at the start of the simulation.
 </td></tr>
+
 <tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleMedium</td>
     <td valign=\"top\">Fixed bug in function density, which always returned <code>d_const</code>,
                        regardless of the value of <code>constantDensity</code>.
 </td></tr>
+
 <tr><td valign=\"top\">Buildings.Media.GasesPTDecoupled</td>
     <td valign=\"top\">Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
                        For this medium, the function is <code>u=h-pStd/dStp</code>.
 </td></tr>
+
 <tr><td valign=\"top\">Buildings.Media.GasesConstantDensity</td>
     <td valign=\"top\">Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
                        For this medium, the function is <code>u=h-p/dStp</code>.
 </td></tr>
+
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
 <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
                      Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditions</td>
@@ -7921,7 +8127,9 @@ that can lead to wrong simulation results):
                      it receives solar radiation. The previous version did not compute
                      the infrared radiation exchange between the
                      window frame and the sky.</td></tr>
+
 </table>
+
 <p>
 The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
 that do <b style=\"color:red\">not</b> lead to wrong simulation results, but, e.g.,
@@ -7934,6 +8142,7 @@ units are wrong or errors in documentation):
     </td>
 </tr>
 </table>
+
 <p>
 The following
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
@@ -7972,6 +8181,7 @@ have been fixed:
          Move scripts to Buildings\\Resources\\Scripts\\Dymola.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b></td></tr>
 <tr><td valign=\"top\">
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/18\">&#35;18</a></td>
@@ -7979,6 +8189,7 @@ have been fixed:
          Add a smooth interpolation function to avoid the event.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
 <tr><td valign=\"top\">
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/30\">&#35;30</a></td>
@@ -7986,6 +8197,7 @@ have been fixed:
          Removed non-required structurally incomplete annotation.
     </td>
 </tr>
+
 <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
 <tr><td valign=\"top\">
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/35\">&#35;35</a></td>
@@ -8000,6 +8212,7 @@ have been fixed:
     </td>
 </tr>
 </table>
+
 <p>
 Note:
 </p>
@@ -8033,6 +8246,7 @@ are still being validated.
 The following <b style=\"color:red\">critical error</b> has been fixed (i.e. error
 that can lead to wrong simulation results):
 </p>
+
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
   <tr><td valign=\"top\"><code>Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange</code></td>
@@ -8045,6 +8259,7 @@ that can lead to wrong simulation results):
       </td>
   </tr>
 </table>
+
 <p>
 The following improvements and additions have been made:
 </p>
@@ -8088,6 +8303,7 @@ to allow use of the room model with media that do not contain water vapor.
 <b>Note:</b> The packages whose name ends with <code>Beta</code>
 are still being validated.
 </p>
+
 <ul>
 <li>
 Added the package
@@ -8231,6 +8447,7 @@ by the parameters. This also required a change in the parameters.
 The following <b style=\"color:red\">critical error</b> has been fixed (i.e. error
 that can lead to wrong simulation results):
 </p>
+
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
   <tr><td colspan=\"2\"><b>Buildings.Fluid.Storage.</b></td></tr>
   <tr><td valign=\"top\"><code>Buildings.Fluid.Storage.StratifiedEnhanced</code></td>
@@ -8839,6 +9056,7 @@ on the Buildings library.
 <a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_1_0\">Version 0.1.0 </a> (May 27, 2008)
 </li>
 </ul>
+
 </html>"));
   end ReleaseNotes;
 
@@ -9206,24 +9424,29 @@ particular package.<br/>
    <td valign=\"top\">Package for heat transfer in rooms and through the building envelope with the
                       room air being modeled using computational fluid dynamics.</td>
 </tr>
+
 <tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.Detailed.Examples.FFD.UsersGuide\">ThermalZones.Detailed.Examples.FFD.UsersGuide</a>
    </td>
    <td valign=\"top\">Package with examples that use the Fast Fluid Dynamics program for
                     the computational fluid dynamics.</td>
 </tr>
+
 <tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.EnergyPlus.UsersGuide\">ThermalZones.EnergyPlus.UsersGuide</a>
    </td>
    <td valign=\"top\">Package for Spawn of EnergyPlus with models that use EnergyPlus to simulate
                     one or several building envelope models.</td>
 </tr>
+
 <tr><td valign=\"top\"><a href=\"modelica://Buildings.Utilities.IO.Python36.UsersGuide\">Utilities.IO.Python36</a>
    </td>
    <td valign=\"top\">Package to call Python functions from Modelica.</td>
 </tr>
+
 <tr><td valign=\"top\"><a href=\"modelica://Buildings.Utilities.Plotters.UsersGuide\">Utilities.Plotters</a>
    </td>
    <td valign=\"top\">Package that allow writing time series and scatter plots to an html output file.</td>
 </tr>
+
 </table><br/>
 </li>
 <li>
@@ -9278,4 +9501,4 @@ requirements definition or providing feedback regarding the model applicability
 to solve specific problems.
 </p>
 </html>"));
-end Buildings;
\ No newline at end of file
+end Buildings;
diff --git a/Buildings/package.order b/Buildings/package.order
old mode 100755
new mode 100644
diff --git a/bin/cleanHTML.py b/bin/cleanHTML.py
index ca32276f05d..99940f0b866 100755
--- a/bin/cleanHTML.py
+++ b/bin/cleanHTML.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #####################################################################
 # This script cleans up the html code generated by Dymola,
 # and it adds the link to the style sheet
@@ -157,7 +157,7 @@ def validateLine(line, filNam):
         filObj=open(filNam, 'r')
         lines = filObj.readlines()
         filObj.close()
-        for old, new in replacements.iteritems():
+        for old, new in replacements.items():
             for i in range(len(lines)):
                 lines[i] = lines[i].replace(old, new)
         filObj=open(filNam, 'w')
diff --git a/bin/verifyFiles.py b/bin/verifyFiles.py
index 6f3f3edcea7..a208062efa1 100755
--- a/bin/verifyFiles.py
+++ b/bin/verifyFiles.py
@@ -16,7 +16,7 @@
 INVALID_IN_ALL=["fixme", "import \"",
                 "import Buildings;",
                 "import IBPSA;",
-                "<h1", "<h2", "<h3", "todo", "xxx", "tt>", "<--",
+                "<h1", "<h2", "<h3", "todo", "tt>", "<--",
                 "realString", "integerString", "structurallyIncomplete",
                 "preferedView", "Algorithm=", "Diagram,", "DocumentationClass",
                 "Modelica.Icons.Info;",