Merge branch 'master'; solve conflicts

lbl-srg · Aug 22, 2019 · e026e02 · e026e02
1 parent ceb0f77
commit e026e02
Show file tree

Hide file tree

Showing 138 changed files with 880 additions and 959 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,10 @@ stop
 stop.
 Thumbs.db
 # Ignore files created by the unit tests.
-simulator.log
+simulator*.log
+comparison*.log
+unitTests*.log
+funnel_comp
 
 # Files in top-level directory
 #####################################
@@ -36,7 +39,7 @@ simulator.log
 /build
 
 
-# Temporary files generated by emacs #
+# Temporary files generated by emacs
 ######################################
 *~
 \#*\#
@@ -65,4 +68,4 @@ Buildings/Resources/src/fluid/heatpumps/calibration/doc/build/doctrees
 
 # Spawn temporary directories
 #########################################
-tmp-eplus-*
+tmp-eplus-*
diff --git a/.travis.yml b/.travis.yml
@@ -53,7 +53,7 @@ env:
 
 before_install:
   - if [[ "$TEST_ARG" == *test-dymola* ]]; then
-       docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2019fd01-x86_64;
+       docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2020-x86_64;
        chmod +x Buildings/Resources/Scripts/travis/bin/dymola;
        cp Buildings/Resources/Scripts/travis/bin/dymola $HOME/bin/;
     fi;

diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo
@@ -65,13 +65,13 @@ model ChillerSetPointControl
         extent={{-10,-10},{10,10}},
         origin={-170,30})));
   Buildings.Controls.Continuous.LimPID limPID(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
     reverseAction=true,
     y_start=1,
     yMin=0,
     k=10,
     Ti=0.01,
-    Td=10,
-    initType=Modelica.Blocks.Types.InitPID.SteadyState)
+    Td=10) "PI controller"
            annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         origin={-130,30})));
@@ -153,7 +153,7 @@ equation
       color={255,0,255},
       smooth=Smooth.None));
   connect(gain.y, pum.m_flow_in) annotation (Line(
-      points={{107,-8},{116.4,-8},{116.4,-9.2},{122,-9.2}},
+      points={{107,-8},{116.4,-8},{116.4,-9},{122,-9}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(sou2.T_in, sine.y) annotation (Line(
@@ -216,6 +216,10 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+August 16, 2019, by Michael Wetter:<br/>
+Changed initialization of PI controller for Dymola 2020.
+</li>
+<li>
 December 22, 2014 by Michael Wetter:<br/>
 Removed <code>Modelica.Fluid.System</code>
 to address issue

diff --git a/Buildings/Examples/Tutorial/Boiler/System3.mo b/Buildings/Examples/Tutorial/Boiler/System3.mo
@@ -498,7 +498,7 @@ A non-zero value also represent a more realistic situation, as most valves have
 <li>
 <p>
 For the bypass between the valve and the radiator, we note that the
-mass flow rate is equal to <code>mRad_flow_nomial - mRadVal_flow_nominal</code>.
+mass flow rate is equal to <code>mRad_flow_nominal - mRadVal_flow_nominal</code>.
 This is a fixed bypass that is used to allow the valve to work across
 its full range.
 We decided to lump the pressure drop of this bypass, and the pressure drop of the

diff --git a/...ages/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/EconModulationControlChart.png b/...ages/Controls/OBC/ASHRAE/G36_PR1/AHUs/SingleZone/EconModulationControlChart.png
diff --git a/...ces/ReferenceResults/Dymola/Buildings_Airflow_Multizone_Examples_ChimneyShaftNoVolume.txt b/...ces/ReferenceResults/Dymola/Buildings_Airflow_Multizone_Examples_ChimneyShaftNoVolume.txt
diff --git a/...s/ReferenceResults/Dymola/Buildings_Airflow_Multizone_Examples_ChimneyShaftWithVolume.txt b/...s/ReferenceResults/Dymola/Buildings_Airflow_Multizone_Examples_ChimneyShaftWithVolume.txt
diff --git a/...taCenters_ChillerCooled_Equipment_Validation_CoolingCoilHumidifyingHeating_ClosedLoop.txt b/...taCenters_ChillerCooled_Equipment_Validation_CoolingCoilHumidifyingHeating_ClosedLoop.txt
@@ -1,7 +1,7 @@
-last-generated=2019-04-18
+last-generated=2019-08-15
 statistics-initialization=
 {
-  "nonlinear": "1, 0, 1",
+  "nonlinear": "1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...DataCenters_ChillerCooled_Equipment_Validation_CoolingCoilHumidifyingHeating_OpenLoop.txt b/...DataCenters_ChillerCooled_Equipment_Validation_CoolingCoilHumidifyingHeating_OpenLoop.txt
@@ -1,7 +1,7 @@
-last-generated=2019-04-18
+last-generated=2019-08-15
 statistics-initialization=
 {
-  "nonlinear": "1, 0",
+  "nonlinear": "1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/.../Buildings_Applications_DataCenters_ChillerCooled_Equipment_Validation_ElectricHeater.txt b/.../Buildings_Applications_DataCenters_ChillerCooled_Equipment_Validation_ElectricHeater.txt
diff --git a/...Applications_DataCenters_ChillerCooled_Equipment_Validation_IntegratedPrimaryLoadSide.txt b/...Applications_DataCenters_ChillerCooled_Equipment_Validation_IntegratedPrimaryLoadSide.txt
diff --git a/...pplications_DataCenters_ChillerCooled_Equipment_Validation_IntegratedPrimaryPlantSide.txt b/...pplications_DataCenters_ChillerCooled_Equipment_Validation_IntegratedPrimaryPlantSide.txt
diff --git a/...la/Buildings_Applications_DataCenters_ChillerCooled_Equipment_Validation_PumpParallel.txt b/...la/Buildings_Applications_DataCenters_ChillerCooled_Equipment_Validation_PumpParallel.txt
diff --git a/...s_Applications_DataCenters_ChillerCooled_Examples_IntegratedPrimaryLoadSideEconomizer.txt b/...s_Applications_DataCenters_ChillerCooled_Examples_IntegratedPrimaryLoadSideEconomizer.txt
diff --git a/..._Applications_DataCenters_ChillerCooled_Examples_IntegratedPrimarySecondaryEconomizer.txt b/..._Applications_DataCenters_ChillerCooled_Examples_IntegratedPrimarySecondaryEconomizer.txt
diff --git a/...plications_DataCenters_ChillerCooled_Examples_NonIntegratedPrimarySecondaryEconomizer.txt b/...plications_DataCenters_ChillerCooled_Examples_NonIntegratedPrimarySecondaryEconomizer.txt
diff --git a/...Dymola/Buildings_Applications_DataCenters_DXCooled_Examples_DXCooledAirsideEconomizer.txt b/...Dymola/Buildings_Applications_DataCenters_DXCooled_Examples_DXCooledAirsideEconomizer.txt
diff --git a/...ings/Resources/ReferenceResults/Dymola/Buildings_Controls_Predictors_Examples_BESTEST.txt b/...ings/Resources/ReferenceResults/Dymola/Buildings_Controls_Predictors_Examples_BESTEST.txt
@@ -1,4 +1,4 @@
-last-generated=2019-02-01
+last-generated=2019-08-15
 statistics-initialization=
 {
   "linear": "19",
@@ -12,7 +12,7 @@ statistics-simulation=
   "number of continuous time states": "59",
   "numerical Jacobians": "0"
 }
-preErr.u1=[0e+00, 0e+00, 0e+00, 0e+00, 2.1856455078125e+03, 0e+00, 9.65357666015625e+02, 2.9288779296875e+03, 3.708630859375e+03, 3.24432470703125e+03, 4.16904541015625e+03, 3.807259521484375e+03, 1.806343017578125e+03, 3.47114208984375e+03, 2.362857421875e+03, 1.937535400390625e+02, 1.902880126953125e+03, 2.202432373046875e+03, -3.82723388671875e+01, 1.38265771484375e+03, 2.575294677734375e+03, 1.347510833740234e+02, 4.936152954101562e+02, 2.470232666015625e+03, 4.490605773925781e+02, -1.750101661682129e+01, 2.14287158203125e+03, 1.389410888671875e+03, -5.496752548217773e+01, 1.782306762695312e+03, 1.68974853515625e+03, -1.308668365478516e+02, 1.918577392578125e+03, 1.641926147460938e+03, -4.462433242797852e+01, 5.160675048827666e+02, 1.953617309570312e+03, 1.615622711181641e+01, -2.080411987304688e+02, 1.780260864257812e+03, 1.322261199951172e+02, -1.848265533447266e+02, 1.214889038085938e+03, 1.667252807617188e+03, 0e+00, 2.689625e+03, 2.721177734375e+03, 0e+00, 2.3247587890625e+03, 2.9974267578125e+03, 2.688410949707031e+02, 1.25853910446167e+01, 1.999369995117188e+03, 1.896202697753906e+02, 8.242588043212891e+01, 1.41043310546875e+03, 6.886357421875e+02, 5.687900781626871e-01, 1.429358154296875e+03, 1.919659912109375e+03, 0e+00, 2.08862841796875e+03, 2.2647470703125e+03, 4.177767639160156e+02, 3.337123046875e+03, 3.362253173828125e+03, 9.97639404296875e+02, 1.228570068359375e+03, 2.50876171875e+03, 4.924544982911775e+02, 2.714795227050809e+02, 2.064878173828125e+03, 2.086879638671875e+03, -7.021415710449219e+01, 1.368669311523438e+03, 1.927192993164062e+03, -3.002102966308594e+02, -6.704579925537109e+01, 1.490250732421875e+03, -1.089743194580078e+02, 2.446071929931641e+02, 1.833571533203125e+03, 5.27848388671875e+02, 5.047645568847656e+02, 2.4230830078125e+03, 1.28728271484375e+03, 2.547687377929688e+02, 1.945649291992188e+03, 1.5950791015625e+03, -2.18167667388916e+01, 6.871680297851562e+02, 2.08695947265625e+03, 4.655415344238281e+02, 1.24466015625e+03, 2.775301025390625e+03, 6.61103515625e+02, 5.1891552734375e+02, 2.426155029296875e+03, 2.430409088134766e+02, 0e+00, 2.761642822265625e+03]
-preErr.u2=[0e+00, 1.634865844726562e+03, 0e+00, 1.555835815429688e+03, 2.851077392578125e+03, 2.89493115234375e+03, 3.604327392578125e+03, 3.667735107421875e+03, 1.038743041992188e+03, 3.151175537109375e+03, 4.162916015625e+03, 8.550938720703125e+02, 0e+00, 3.664784912109375e+03, 1.955420776367153e+03, 0e+00, 2.008154418945312e+03, 2.103272705078125e+03, 0e+00, 1.210316162109375e+03, 2.053267333984375e+03, 0e+00, 7.249322509765625e+02, 2.248749755859375e+03, 0e+00, 0e+00, 2.307014892578125e+03, 0e+00, 0e+00, 1.768399291992188e+03, 1.6733349609375e+03, 0e+00, 1.469412475585938e+03, 1.664748413085938e+03, 0e+00, 6.255274658202878e+02, 1.921257446289062e+03, 0e+00, 0e+00, 1.81917333984375e+03, 0e+00, 0e+00, 1.249674926757812e+03, 1.825371337890625e+03, 0e+00, 2.337364013671875e+03, 2.75711083984375e+03, 0e+00, 2.655267822265625e+03, 2.935947021484375e+03, 0e+00, 3.571427612304688e+02, 1.842480102539062e+03, 0e+00, 0e+00, 1.634388305664045e+03, 2.291945037841385e+02, 0e+00, 1.699311889648438e+03, 1.93484619140625e+03, 1.383818237304688e+03, 2.001844970703125e+03, 2.28924755859375e+03, 1.981300659179688e+03, 2.999371337890625e+03, 3.565345458984375e+03, 0e+00, 3.540010070800781e+02, 2.697609375000002e+03, 0e+00, 0e+00, 2.20462158203125e+03, 1.563404541015625e+03, 0e+00, 1.5503369140625e+03, 1.93295068359375e+03, 0e+00, 0e+00, 1.618613037109375e+03, 0e+00, 0e+00, 1.740765258789062e+03, 1.688273071289062e+03, 0e+00, 2.471811767578125e+03, 6.1159228515625e+02, 0e+00, 2.000730346679688e+03, 1.5529912109375e+03, 0e+00, 9.545323486328125e+02, 2.0834970703125e+03, 0e+00, 1.419356567382812e+03, 2.752780029296875e+03, 0e+00, 3.20126220703125e+02, 2.29591943359375e+03, 2.014620727539062e+03, 0e+00, 2.690970703125e+03]
+preErr.u1=[0e+00, 0e+00, 0e+00, 0e+00, 2.1856455078125e+03, 0e+00, 9.653017578125e+02, 2.928869873046875e+03, 3.708544189453125e+03, 3.24432470703125e+03, 4.169140625e+03, 3.807001953125e+03, 1.806124877929688e+03, 3.471313720703125e+03, 2.362814453125e+03, 1.937535400390625e+02, 1.90275732421875e+03, 2.202437744140625e+03, -3.82723274230957e+01, 1.382645385742188e+03, 2.57529345703125e+03, 1.347510681152344e+02, 4.937361145019531e+02, 2.47024658203125e+03, 4.490294189453125e+02, -1.74873046875e+01, 2.142815673828125e+03, 1.389404907226562e+03, -5.495285034179688e+01, 1.7815830078125e+03, 1.689787475585938e+03, -1.308667755126953e+02, 1.918469116210938e+03, 1.641933715820312e+03, -4.462428665161133e+01, 5.160369262694853e+02, 1.953619018554688e+03, 1.616366767883301e+01, -2.080370788574219e+02, 1.780393798828125e+03, 1.322301483154297e+02, -1.84783447265625e+02, 1.215143432617188e+03, 1.6672373046875e+03, 0e+00, 2.689588623046875e+03, 2.72129052734375e+03, 0e+00, 2.324423828125e+03, 2.9974287109375e+03, 2.687924194335938e+02, 1.258802127838135e+01, 1.999125e+03, 1.896299133300781e+02, 8.240889739990234e+01, 1.410423706054688e+03, 6.883449096679688e+02, 5.678130984301745e-01, 1.429859497070312e+03, 1.919700073242188e+03, 0e+00, 2.0886982421875e+03, 2.2649033203125e+03, 4.176612243652344e+02, 3.337203125e+03, 3.362941162109375e+03, 9.97631591796875e+02, 1.228586547851562e+03, 2.5087802734375e+03, 4.92499786377115e+02, 2.714662780761746e+02, 2.064737060546875e+03, 2.086950439453125e+03, -7.021226501464844e+01, 1.369031982421875e+03, 1.927212158203125e+03, -3.002084350585938e+02, -6.681477355957031e+01, 1.490077514648438e+03, -1.089712905883789e+02, 2.447946624755859e+02, 1.833712158203125e+03, 5.278546142578125e+02, 5.047753601074219e+02, 2.423057861328125e+03, 1.287310424804688e+03, 2.547722778320312e+02, 1.94544970703125e+03, 1.595139892578125e+03, -2.181466865539551e+01, 6.871959838867188e+02, 2.0868603515625e+03, 4.655264587402344e+02, 1.244693115234375e+03, 2.775333740234375e+03, 6.610966186523438e+02, 5.189222412109375e+02, 2.426125e+03, 2.430370025634766e+02, 0e+00, 2.762220947265625e+03]
+preErr.u2=[0e+00, 1.634865844726562e+03, 0e+00, 1.555866333007812e+03, 2.85107763671875e+03, 2.894930908203125e+03, 3.604327392578125e+03, 3.667735107421875e+03, 1.0382568359375e+03, 3.15099072265625e+03, 4.1632333984375e+03, 8.544815673828125e+02, 0e+00, 3.664715576171875e+03, 1.955420776367153e+03, 0e+00, 2.0080732421875e+03, 2.1032724609375e+03, 0e+00, 1.21049072265625e+03, 2.053268798828125e+03, 0e+00, 7.251807861328125e+02, 2.248751220703125e+03, 0e+00, 0e+00, 2.3070595703125e+03, 0e+00, 0e+00, 1.768312255859375e+03, 1.673334350585938e+03, 0e+00, 1.469397827148438e+03, 1.664748168945312e+03, 0e+00, 6.252893066406003e+02, 1.921174194335938e+03, 0e+00, 0e+00, 1.819188842773438e+03, 0e+00, 0e+00, 1.24965380859375e+03, 1.825371337890625e+03, 0e+00, 2.337357666015625e+03, 2.757052490234375e+03, 0e+00, 2.655285888671875e+03, 2.935947021484375e+03, 0e+00, 3.577272338867188e+02, 1.842435302734375e+03, 0e+00, 0e+00, 1.634355712890607e+03, 2.293178405761307e+02, 0e+00, 1.699374633789062e+03, 1.93484765625e+03, 1.38387939453125e+03, 2.001841796875e+03, 2.28930078125e+03, 1.981300903320312e+03, 2.999358642578125e+03, 3.56534521484375e+03, 0e+00, 3.539983520507812e+02, 2.697608154296877e+03, 0e+00, 0e+00, 2.2046201171875e+03, 1.563404541015625e+03, 0e+00, 1.550414794921875e+03, 1.932951538085938e+03, 0e+00, 0e+00, 1.618611206054688e+03, 0e+00, 0e+00, 1.740770263671875e+03, 1.688297973632812e+03, 0e+00, 2.4716513671875e+03, 6.116630249023438e+02, 0e+00, 2.000723754882812e+03, 1.552996704101562e+03, 0e+00, 9.546934204101562e+02, 2.0835146484375e+03, 0e+00, 1.419503295898438e+03, 2.7527685546875e+03, 0e+00, 3.190717468261719e+02, 2.295930908203125e+03, 2.014620483398438e+03, 0e+00, 2.691063720703125e+03]
 time=[0e+00, 2.6784e+06]
-preErr.y=[0e+00, -4.087164700031281e-01, 0e+00, -3.889589607715607e-01, -1.663579940795898e-01, -7.237328290939331e-01, -6.597424745559692e-01, -1.847143024206163e-01, 6.674720048904419e-01, 2.328729629516602e-02, 1.532298978418112e-03, 7.380414009094238e-01, 4.515857696533203e-01, -4.841068387031555e-02, 1.018591970205392e-01, 4.843838512897491e-02, -2.631856314837933e-02, 2.478992752730835e-02, -9.568084962666035e-03, 4.308539628982544e-02, 1.305068582296371e-01, 3.36877703666687e-02, -5.782924592494965e-02, 5.537072196602821e-02, 1.122651398181915e-01, -4.375253804028034e-03, -4.103587195277214e-02, 3.473527133464813e-01, -1.374188158661127e-02, 3.476867219433188e-03, 4.103385843336582e-03, -3.271671012043953e-02, 1.122912243008614e-01, -5.705541931092739e-03, -1.115608308464289e-02, -2.736498415470653e-02, 8.089973591268063e-03, 4.039056599140167e-03, -5.201029777526855e-02, -9.728133678436279e-03, 3.305653110146523e-02, -4.620663821697235e-02, -8.696485310792923e-03, -3.952964767813683e-02, 0e+00, 8.80652442574501e-02, -8.98326188325882e-03, 0e+00, -8.26273038983345e-02, 1.536998711526394e-02, 6.721027940511703e-02, -8.613934367895126e-02, 3.922247141599655e-02, 4.740506783127785e-02, 2.060647122561932e-02, -5.598877742886101e-02, 1.148603111505611e-01, 1.421975321135265e-04, -6.748843938112259e-02, -3.796572564169765e-03, -3.45954567193985e-01, 2.169587835669518e-02, -6.125167943537235e-03, -3.908809721469879e-01, 8.443789929151535e-02, -5.077309533953667e-02, 2.494098544120789e-01, 2.186422497034073e-01, -4.721191525459347e-02, 1.231136247516083e-01, 6.78698793053634e-02, -3.49358543753624e-02, 1.308687627315521e-01, -1.75535399466753e-02, -4.541690275073051e-02, -1.439425628632307e-03, -7.505257427692413e-02, -1.676145009696484e-02, -3.209056332707405e-02, -2.724358066916466e-02, 6.115179881453514e-02, 2.320155128836632e-02, -2.901061773300171e-01, 1.261911392211914e-01, -1.218219008296728e-02, 1.689226031303406e-01, 6.369218230247498e-02, -1.377024780958891e-02, 1.052198745310307e-02, -5.454191472381353e-03, -6.684107333421707e-02, 8.655841811560094e-04, 1.163853779435158e-01, -4.367412999272346e-02, 5.630295723676682e-03, 1.652758866548538e-01, 4.969732835888863e-02, 3.255893290042877e-02, -4.428949356079102e-01, 0e+00, 1.766807772219181e-02]
+preErr.y=[0e+00, -4.087164700031281e-01, 0e+00, -3.889665901660919e-01, -1.663580685853958e-01, -7.237327694892883e-01, -6.597564220428467e-01, -1.847162842750551e-01, 6.675718426704407e-01, 2.333348616957664e-02, 1.47681578528136e-03, 7.381300926208496e-01, 4.515312016010284e-01, -4.835046082735062e-02, 1.018484011292543e-01, 4.843838512897491e-02, -2.632898092269897e-02, 2.479135803878296e-02, -9.568082168698311e-03, 4.303864389657974e-02, 1.305061280727386e-01, 3.36877666413784e-02, -5.786117166280746e-02, 5.537384003400803e-02, 1.122573539614677e-01, -4.371826071292162e-03, -4.106098040938377e-02, 3.473512232303619e-01, -1.373821217566729e-02, 3.31768486648798e-03, 4.113282542675734e-03, -3.271669521927834e-02, 1.122678220272064e-01, -5.703638307750225e-03, -1.115607190877199e-02, -2.731309644878441e-02, 8.111217990517616e-03, 4.040916915982962e-03, -5.200926959514618e-02, -9.698757901787758e-03, 3.305753692984581e-02, -4.61958609521389e-02, -8.627604693174362e-03, -3.953349962830544e-02, 0e+00, 8.8057741522789e-02, -8.940502069890499e-03, 0e+00, -8.27154815196991e-02, 1.537040434777737e-02, 6.719810515642166e-02, -8.62848088145256e-02, 3.917242586612701e-02, 4.740747809410095e-02, 2.060222439467907e-02, -5.598301067947901e-02, 1.147567629814251e-01, 1.419532782164186e-04, -6.737875938415527e-02, -3.786889603361487e-03, -3.459698557853699e-01, 2.171414531767368e-02, -6.099364720284939e-03, -3.909099102020264e-01, 8.446113765239716e-02, -5.060097575187683e-02, 2.494079023599625e-01, 2.186470627784729e-01, -4.72069904208189e-02, 1.23124942183535e-01, 6.786657124757835e-02, -3.497079387307167e-02, 1.308864504098892e-01, -1.75530668348074e-02, -4.534569010138512e-02, -1.434837118722498e-03, -7.505210489034653e-02, -1.670369505882263e-02, -3.213342651724815e-02, -2.724282443523407e-02, 6.119866669178009e-02, 2.32354924082756e-02, -2.901108264923096e-01, 1.261938363313675e-01, -1.21483625844121e-02, 1.689118444919586e-01, 6.369306892156601e-02, -1.381851546466351e-02, 1.053579896688461e-02, -5.453667137771845e-03, -6.687435507774353e-02, 8.364140521734953e-04, 1.163816154003143e-01, -4.370256885886192e-02, 5.641288589686155e-03, 1.652741581201553e-01, 4.996262490749359e-02, 3.254855051636696e-02, -4.428958594799042e-01, 0e+00, 1.778928190469742e-02]
diff --git a/...ical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_BalancedStepUp_DD.txt b/...ical_AC_ThreePhasesUnbalanced_Validation_IEEETests_Test4NodesFeeder_BalancedStepUp_DD.txt
@@ -1,22 +1,31 @@
-last-generated=2015-05-08
-statistics-initialization={'numerical Jacobians': '0', 'nonlinear': '18'}
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': ' '}
-err_V3[3]=[0.02597785741090774536, 0.02597785741090774536]
-err_V4[1]=[-0.41787311434745788574, -0.41787311434745788574]
-err_V4[3]=[-0.46693411469459533691, -0.46693411469459533691]
-err_V4[2]=[-0.40907499194145202637, -0.40907499194145202637]
-err_V2[3]=[-0.32798844575881958008, -0.32798844575881958008]
-err_V2[1]=[0.0041571897454559803, 0.0041571897454559803]
-time=[0., 1.]
-err_V3[2]=[0.03351049870252609253, 0.03351049870252609253]
-err_V2[2]=[-0.33523881435394287109, -0.33523881435394287109]
-err_V3[1]=[-0.48662394285202026367, -0.48662394285202026367]
-err_Theta4[1]=[-0.00011993118823738769, -0.00011993118823738769]
-err_Theta4[3]=[-0.00067186914384365082, -0.00067186914384365082]
-err_Theta3[2]=[-0.00007155979983508587, -0.00007155979983508587]
-err_Theta4[2]=[0.00105114805046468973, 0.00105114805046468973]
-err_Theta3[3]=[-0.00004979170626029372, -0.00004979170626029372]
-err_Theta3[1]=[-0.0000534292048541829, -0.0000534292048541829]
-err_Theta2[3]=[0.00032330086105503142, 0.00032330086105503142]
-err_Theta2[2]=[0.00020013588073197752, 0.00020013588073197752]
-err_Theta2[1]=[0.00019728828920051455, 0.00019728828920051455]
+last-generated=2019-08-19
+statistics-initialization=
+{
+  "nonlinear": "18",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+err_V3[3]=[2.597730979323387e-02, 2.597730979323387e-02]
+err_V4[1]=[-4.178710281848907e-01, -4.178710281848907e-01]
+err_V4[3]=[-4.66948002576828e-01, -4.66948002576828e-01]
+err_V4[2]=[-4.090897738933563e-01, -4.090897738933563e-01]
+err_V2[3]=[-3.27988475561142e-01, -3.27988475561142e-01]
+err_V2[1]=[4.157164134085178e-03, 4.157164134085178e-03]
+time=[0e+00, 1e+00]
+err_V3[2]=[3.350959345698357e-02, 3.350959345698357e-02]
+err_V2[2]=[-3.352388441562653e-01, -3.352388441562653e-01]
+err_V3[1]=[-4.866242706775665e-01, -4.866242706775665e-01]
+err_Theta4[1]=[-1.19930919026956e-04, -1.19930919026956e-04]
+err_Theta4[3]=[-6.718684453517199e-04, -6.718684453517199e-04]
+err_Theta3[2]=[-7.155983621487394e-05, -7.155983621487394e-05]
+err_Theta4[2]=[1.051147934049368e-03, 1.051147934049368e-03]
+err_Theta3[3]=[-4.979172081220895e-05, -4.979172081220895e-05]
+err_Theta3[1]=[-5.342924487194978e-05, -5.342924487194978e-05]
+err_Theta2[3]=[3.233008610550314e-04, 3.233008610550314e-04]
+err_Theta2[2]=[2.001358807319775e-04, 2.001358807319775e-04]
+err_Theta2[1]=[1.972882892005146e-04, 1.972882892005146e-04]