urbanopt-cli 0.9.0 → 0.9.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/nightly_build.yml +60 -0
- data/CHANGELOG.md +12 -0
- data/CMakeLists.txt +8 -8
- data/FindOpenStudioSDK.cmake +10 -10
- data/LICENSE.md +1 -1
- data/README.md +25 -23
- data/Rakefile +1 -1
- data/example_files/Gemfile +2 -0
- data/example_files/mappers/Baseline.rb +155 -155
- data/example_files/mappers/ClassProject.rb +4 -4
- data/example_files/mappers/CreateBar.rb +1 -1
- data/example_files/mappers/EvCharging.rb +1 -1
- data/example_files/mappers/FlexibleHotWater.rb +1 -1
- data/example_files/mappers/Floorspace.rb +1 -1
- data/example_files/mappers/HighEfficiency.rb +1 -1
- data/example_files/mappers/HighEfficiencyCreateBar.rb +1 -1
- data/example_files/mappers/HighEfficiencyFloorspace.rb +1 -1
- data/example_files/mappers/PeakHoursMelsShedding.rb +1 -1
- data/example_files/mappers/PeakHoursThermostatAdjust.rb +1 -1
- data/example_files/mappers/ThermalStorage.rb +1 -1
- data/example_files/measures/BuildResidentialModel/measure.rb +3 -3
- data/example_files/measures/BuildResidentialModel/measure.xml +3 -3
- data/example_files/measures/BuildResidentialModel/resources/util.rb +45 -45
- data/example_files/resources/hpxml-measures/BuildResidentialScheduleFile/measure.rb +7 -0
- data/example_files/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml +18 -10
- data/example_files/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb +15 -0
- data/example_files/resources/hpxml-measures/BuildResidentialScheduleFile/tests/build_residential_schedule_file_test.rb +53 -5
- data/example_files/resources/hpxml-measures/Changelog.md +39 -28
- data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/measure.xml +27 -27
- data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/battery.rb +9 -4
- data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_defaults.rb +5 -4
- data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/version.rb +2 -2
- data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/waterheater.rb +5 -1
- data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb +28 -10
- data/example_files/resources/hpxml-measures/ReportSimulationOutput/measure.rb +6 -1
- data/example_files/resources/hpxml-measures/ReportSimulationOutput/measure.xml +3 -3
- data/example_files/resources/hpxml-measures/docs/source/usage_instructions.rst +2 -1
- data/example_files/resources/hpxml-measures/docs/source/workflow_inputs.rst +14 -10
- data/example_files/resources/hpxml-measures/docs/source/workflow_outputs.rst +4 -4
- data/example_files/resources/hpxml-measures/workflow/template-run-hpxml-with-stochastic-occupancy-subset.osw +64 -0
- data/example_files/resources/hpxml-measures/workflow/template-run-hpxml-with-stochastic-occupancy.osw +2 -2
- data/example_files/resources/hpxml-measures/workflow/tests/base_results/results.csv +12 -12
- data/example_files/resources/hpxml-measures/workflow/tests/hpxml_translator_test.rb +36 -110
- data/lib/uo_cli/version.rb +2 -2
- data/lib/uo_cli.rb +62 -67
- data/uo_cli.gemspec +3 -1
- metadata +32 -3
- data/requirements.txt +0 -2
|
@@ -18,7 +18,7 @@ base-atticroof-flat.xml,54.998,54.998,35.082,35.082,19.917,0.0,0.0,0.0,0.0,0.0,0
|
|
|
18
18
|
base-atticroof-radiant-barrier.xml,37.328,37.328,33.111,33.111,4.217,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.018,9.19,1.951,6.821,0.0,0.0,2.647,0.0,0.238,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,4.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.217,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.894,31.746,6.675,0.58,0.0,0.0,0.0,0.0,1664.3,3181.6,13.54,17.97,0.0,6.125,1.589,0.0,0.0,0.33,-1.485,0.0,0.0,0.856,-0.331,0.992,0.0,0.4,0.0,0.104,-4.908,0.0,2.477,0.172,0.0,0.0,0.203,18.136,0.0,0.0,2.125,-0.323,-0.274,-1.707,-0.046,0.0,0.367,10.902,1354.8,997.6,9989.1,2461.3,24000.0,24000.0,0.0,25.88,98.42,25739.0,1416.0,5241.0,0.0,401.0,1535.0,0.0,0.0,8539.0,6846.0,1760.0,21453.0,156.0,7662.0,0.0,313.0,637.0,0.0,0.0,0.0,9596.0,568.0,2520.0,1416.0,325.0,291.0,800.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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
|
19
19
|
base-atticroof-unvented-insulated-roof.xml,57.528,57.528,35.236,35.236,22.292,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.368,3.732,0.695,9.165,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.292,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.862,11.601,9.234,0.615,0.0,0.0,0.0,0.0,2128.9,2939.2,19.261,13.198,0.0,5.41,3.618,0.509,7.459,0.625,-2.094,0.0,0.0,8.254,-0.063,4.802,0.0,0.728,0.0,2.71,-11.418,0.0,-1.421,-0.414,-0.045,2.832,-0.014,9.931,0.0,0.0,-6.09,-0.054,-1.129,-2.881,-0.16,0.0,1.4,9.871,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,30549.0,4825.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,4190.0,4597.0,18589.0,1653.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,6198.0,619.0,2520.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,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,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,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
|
|
20
20
|
base-atticroof-vented.xml,58.215,58.215,35.577,35.577,22.638,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.373,3.861,0.727,9.34,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.638,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.198,12.237,9.234,0.803,0.0,0.0,0.0,0.0,2134.3,3231.4,21.558,14.345,0.0,3.887,3.629,0.511,7.487,0.628,-2.065,0.0,0.0,8.265,-0.062,4.804,0.0,0.728,0.0,4.161,-11.089,0.0,-0.516,-0.438,-0.048,2.753,-0.019,9.86,0.0,0.0,-6.236,-0.058,-1.149,-2.986,-0.162,0.0,1.888,9.584,1354.8,997.6,11399.6,2615.8,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,15605.0,3604.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,1263.0,619.0,2520.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,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,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,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
|
|
21
|
-
base-battery-scheduled.xml,60.
|
|
21
|
+
base-battery-scheduled.xml,60.446,60.446,37.615,37.615,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.703,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
22
22
|
base-battery.xml,58.743,58.743,35.912,35.912,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
23
23
|
base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml,36.616,36.616,24.806,24.806,11.811,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.087,1.6,0.205,9.832,0.0,0.0,2.026,0.0,0.206,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,2.791,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,11.811,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,10.949,3.054,9.539,0.73,0.0,0.0,0.0,0.0,1572.3,1915.2,7.667,5.81,0.0,2.94,3.649,0.0,0.0,0.582,-0.166,0.0,2.975,0.0,-0.035,1.668,0.0,0.0,0.0,4.733,-5.435,0.0,-0.922,-0.231,0.0,0.0,-0.054,1.071,0.0,-0.935,0.0,-0.032,-0.285,-0.349,0.0,0.0,0.558,4.263,1354.8,997.6,11399.5,3156.5,12000.0,12000.0,0.0,6.8,91.76,12347.0,5659.0,903.0,0.0,378.0,1949.0,0.0,963.0,0.0,963.0,1532.0,7440.0,2262.0,1223.0,0.0,142.0,280.0,0.0,403.0,0.0,403.0,206.0,2520.0,458.0,0.0,-342.0,800.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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
|
24
24
|
base-bldgtype-multifamily-adjacent-to-multiple.xml,31.829,31.829,25.239,25.239,6.59,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.048,2.08,0.311,9.717,0.0,0.0,2.026,0.0,0.206,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,2.791,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,6.59,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,6.113,4.964,9.539,0.61,0.0,0.0,0.0,0.0,1569.8,2359.3,9.397,10.56,0.0,-0.004,3.294,0.0,0.0,1.383,-0.201,0.0,4.543,0.0,-0.057,1.248,0.0,0.79,0.0,2.45,-7.438,0.0,0.0,-0.445,0.0,0.0,-0.418,3.387,0.0,-3.023,0.0,-0.051,-0.247,-1.106,-0.13,0.0,0.48,6.588,1354.8,997.6,11399.6,3156.5,12000.0,12000.0,0.0,6.8,91.76,12328.0,5014.0,2576.0,0.0,296.0,1671.0,0.0,1239.0,0.0,0.0,1532.0,9379.0,1558.0,3495.0,0.0,142.0,277.0,0.0,1181.0,0.0,0.0,206.0,2520.0,458.0,0.0,-342.0,800.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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
|
@@ -55,7 +55,7 @@ base-bldgtype-multifamily.xml,26.876,26.876,26.2,26.2,0.676,0.0,0.0,0.0,0.0,0.0,
|
|
|
55
55
|
base-bldgtype-single-family-attached-2stories.xml,51.612,51.612,34.559,34.559,17.053,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.222,3.253,0.58,9.228,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,17.053,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,15.904,9.714,9.269,0.614,0.0,0.0,0.0,0.0,2112.4,3021.3,17.872,14.196,0.0,2.424,5.051,0.296,4.358,0.636,-0.789,0.0,0.0,4.99,-0.068,7.092,0.0,0.728,0.0,2.352,-11.4,0.0,0.007,-0.648,-0.026,1.614,-0.018,6.155,0.0,0.0,-3.98,-0.063,-1.693,-2.541,-0.162,0.0,1.305,9.887,1354.8,997.6,11399.6,2678.3,48000.0,36000.0,0.0,6.8,91.76,27861.0,7450.0,5147.0,0.0,575.0,5388.0,0.0,0.0,1913.0,1447.0,5942.0,16506.0,4315.0,6988.0,0.0,207.0,333.0,0.0,0.0,0.0,1340.0,803.0,2520.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,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,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,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
|
|
56
56
|
base-bldgtype-single-family-attached-atticroof-cathedral.xml,98.047,98.047,37.197,37.197,60.85,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.793,4.948,0.944,9.236,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,60.85,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,56.741,15.617,9.269,0.623,0.0,0.0,0.0,0.0,2161.4,4385.4,36.465,27.658,49.5,0.0,2.937,0.289,3.699,0.667,-0.088,0.0,0.0,3.437,-0.838,7.548,0.0,0.773,0.0,0.0,-12.354,8.574,0.0,-0.154,0.004,1.546,0.121,4.57,0.0,0.0,-4.261,-0.799,-0.85,-1.172,-0.093,0.0,0.0,8.942,1354.8,997.6,11399.6,2678.3,48000.0,36000.0,0.0,6.8,91.76,43510.0,0.0,3210.0,0.0,575.0,4222.0,27649.0,0.0,1913.0,0.0,5942.0,23553.0,0.0,5262.0,0.0,207.0,210.0,14551.0,0.0,0.0,0.0,803.0,2520.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,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,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,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
|
|
57
57
|
base-bldgtype-single-family-attached.xml,42.689,42.689,29.914,29.914,12.774,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.094,2.733,0.467,9.441,0.0,0.0,3.268,0.0,0.27,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,5.583,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,12.774,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,11.846,7.788,9.387,0.614,0.0,0.0,0.0,0.0,1823.2,2597.4,13.184,9.997,0.0,2.342,2.365,0.292,4.233,0.623,-0.404,0.0,0.0,4.663,-0.043,3.032,0.0,0.726,0.0,3.241,-9.37,0.0,0.024,-0.285,-0.027,1.554,-0.023,2.998,0.0,0.0,-4.085,-0.041,-0.769,-1.218,-0.166,0.0,1.59,8.289,1354.8,997.6,11399.6,2887.5,24000.0,24000.0,0.0,6.8,91.76,21565.0,8148.0,2576.0,0.0,575.0,3842.0,0.0,0.0,1913.0,1447.0,3065.0,13226.0,5081.0,3495.0,0.0,207.0,170.0,0.0,0.0,0.0,1340.0,413.0,2520.0,117.0,0.0,-683.0,800.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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
|
58
|
-
base-calctype-operational-misc-defaults.xml,70.
|
|
58
|
+
base-calctype-operational-misc-defaults.xml,70.058,49.806,40.008,19.756,30.05,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.496,2.306,0.347,7.15,0.0,0.326,4.51,0.0,0.334,1.118,0.0,0.0,1.097,2.36,0.0,0.0,0.769,0.544,4.047,2.057,0.745,3.051,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-20.251,0.0,0.377,30.05,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,28.127,5.641,18.469,0.643,0.0,11.971,0.0,0.0,3202.3,3060.6,25.615,14.631,0.0,3.791,3.686,0.519,7.502,0.644,-1.967,0.0,0.0,8.352,-0.075,1.526,0.0,14.997,0.0,2.607,-13.727,0.0,0.229,-0.157,-0.008,3.413,0.052,10.641,0.0,0.0,-5.233,-0.071,-0.212,0.0,-3.563,-11.335,0.461,12.435,2592.2,2706.6,21154.0,5664.2,36000.0,24000.0,0.0,6.8,91.76,31061.0,4629.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,7324.0,14665.0,902.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,1634.0,2520.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,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,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,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
|
|
59
59
|
base-calctype-operational-misc-loads-large-uncommon.xml,101.546,101.546,51.96,51.96,41.68,0.0,2.609,5.297,0.0,0.0,0.0,0.0,0.354,4.467,0.872,3.939,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,4.61,1.024,0.0,0.158,0.21,0.868,1.158,0.0,1.46,8.374,5.687,1.186,0.0,6.721,3.032,2.994,0.0,0.0,0.0,21.458,0.0,0.0,0.0,0.0,0.0,18.628,0.0,0.0,1.594,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,0.0,0.0,0.0,0.0,0.0,2.609,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.297,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.095,14.998,3.621,0.613,0.0,0.0,0.0,0.0,2605.5,4111.2,23.013,18.578,0.0,3.568,3.651,0.514,7.558,0.632,-1.976,0.0,0.0,8.348,-0.065,4.809,0.0,0.728,0.0,4.681,-12.696,0.0,-0.083,-0.488,-0.055,2.62,-0.032,9.738,0.0,0.0,-6.456,-0.062,-1.189,-3.18,-0.169,0.0,3.274,11.26,777.8,496.4,4294.1,850.6,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
60
60
|
base-calctype-operational-misc-loads-large-uncommon2.xml,80.492,80.492,49.534,49.534,23.052,2.609,0.0,0.0,5.297,0.0,0.0,0.0,0.354,4.467,0.872,3.939,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,4.61,1.024,0.0,0.158,0.21,0.868,1.158,0.0,1.46,8.374,5.687,1.186,0.0,6.721,0.606,2.994,0.0,0.0,0.0,21.458,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.594,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2.609,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,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,0.0,0.0,0.0,0.0,0.0,5.297,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.095,14.998,3.621,0.613,0.0,0.0,0.0,0.0,2407.2,3924.9,23.013,18.578,0.0,3.568,3.651,0.514,7.558,0.632,-1.976,0.0,0.0,8.348,-0.065,4.809,0.0,0.728,0.0,4.681,-12.696,0.0,-0.083,-0.488,-0.055,2.62,-0.032,9.738,0.0,0.0,-6.456,-0.062,-1.189,-3.18,-0.169,0.0,3.274,11.26,777.8,496.4,4294.1,850.6,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
61
61
|
base-calctype-operational.xml,53.293,53.293,28.339,28.339,24.954,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.412,3.948,0.744,3.942,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.158,0.21,0.868,1.158,0.0,1.46,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.954,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.371,12.781,3.621,0.616,0.0,0.0,0.0,0.0,1659.7,3135.5,23.657,17.331,0.0,3.519,3.624,0.51,7.468,0.627,-2.082,0.0,0.0,8.25,-0.061,4.801,0.0,0.725,0.0,5.36,-9.692,0.0,-0.003,-0.422,-0.046,2.807,-0.015,9.91,0.0,0.0,-6.153,-0.057,-1.131,-2.89,-0.16,0.0,2.908,8.203,777.8,496.4,4294.0,850.5,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
@@ -352,9 +352,9 @@ base-misc-bills-pv-detailed-only.xml,58.743,31.857,35.912,9.026,22.831,0.0,0.0,0
|
|
|
352
352
|
base-misc-bills-pv-mixed.xml,58.743,31.857,35.912,9.026,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,0.0,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
353
353
|
base-misc-bills-pv.xml,58.743,1.48,35.912,-21.351,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-57.264,0.0,0.0,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
354
354
|
base-misc-bills.xml,58.743,58.743,35.912,35.912,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
355
|
-
base-misc-defaults.xml,63.
|
|
356
|
-
base-misc-emissions.xml,59.
|
|
357
|
-
base-misc-generators-battery-scheduled.xml,77.
|
|
355
|
+
base-misc-defaults.xml,63.823,44.275,31.476,11.928,32.347,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.534,2.189,0.321,2.18,0.0,0.312,4.51,0.0,0.334,1.118,0.0,0.0,1.066,2.36,0.0,0.0,0.447,0.338,2.514,1.528,0.745,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-19.548,0.0,0.494,32.347,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,30.278,5.223,10.641,0.694,0.0,9.158,0.0,0.0,2426.4,2793.5,26.061,14.278,0.0,3.486,3.682,0.517,7.45,1.118,-1.945,0.0,0.0,8.236,-0.093,1.533,0.0,15.072,0.0,2.802,-11.852,0.0,0.704,-0.084,0.003,3.464,-0.192,10.775,0.0,0.0,-5.195,-0.089,-0.197,0.0,-3.391,-10.662,0.429,10.567,1610.4,1574.2,10555.8,3720.0,36000.0,24000.0,0.0,6.8,91.76,31061.0,4629.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,7324.0,14665.0,902.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,1634.0,2520.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,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,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,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
|
|
356
|
+
base-misc-emissions.xml,59.524,32.637,36.693,9.807,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,0.781,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.0,0.0,0.0,0.0,0.0,5147.32,1784.34,66.43,708.27,135.22,1590.64,790.52,60.7,392.41,55.6,62.16,257.77,261.29,375.64,1467.15,-4339.79,-99.69,3362.98,3362.98,4556.72,1193.74,43.71,405.48,75.83,943.85,474.09,37.41,232.37,33.15,36.24,150.75,155.82,224.9,888.52,-2371.19,-137.2,3362.98,3362.98,5850.56,2487.58,95.54,1083.82,208.81,2324.48,1143.92,84.66,563.04,80.8,92.67,383.71,387.61,536.3,2124.29,-6820.1,198.04,3362.98,3362.98,1.12,1.1,0.04,0.48,0.09,1.03,0.51,0.04,0.25,0.04,0.04,0.17,0.17,0.24,0.94,-3.03,0.09,0.01,0.01,4.03,1.93,0.07,0.84,0.16,1.8,0.89,0.07,0.44,0.06,0.07,0.3,0.3,0.42,1.64,-5.28,0.15,2.11,2.11
|
|
357
|
+
base-misc-generators-battery-scheduled.xml,77.446,74.034,37.615,34.203,31.331,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,-3.412,1.703,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,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,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,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,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
358
358
|
base-misc-generators-battery.xml,75.743,72.331,35.912,32.5,31.331,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,-3.412,0.0,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,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,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,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,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
359
359
|
base-misc-generators.xml,75.743,72.331,35.912,32.5,31.331,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,-3.412,0.0,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,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,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,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,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
360
360
|
base-misc-ground-conductivity.xml,56.423,56.423,35.833,35.833,20.591,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.34,4.239,0.815,9.163,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.591,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.282,13.826,9.234,0.614,0.0,0.0,0.0,0.0,2105.7,3303.7,22.17,17.953,0.0,3.58,3.657,0.515,7.281,0.633,-1.974,0.0,0.0,6.657,-0.06,4.809,0.0,0.729,0.0,4.507,-11.389,0.0,-0.051,-0.464,-0.052,2.411,-0.027,9.796,0.0,0.0,-6.108,-0.055,-1.176,-3.078,-0.167,0.0,3.08,9.898,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,31497.0,8574.0,7508.0,0.0,575.0,6098.0,0.0,0.0,1975.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
@@ -364,13 +364,13 @@ base-misc-loads-none.xml,53.537,53.537,24.68,24.68,28.857,0.0,0.0,0.0,0.0,0.0,0.
|
|
|
364
364
|
base-misc-neighbor-shading.xml,61.613,61.613,35.585,35.585,26.028,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.429,3.964,0.749,9.166,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,26.028,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.376,12.696,9.234,0.616,0.0,0.0,0.0,0.0,2116.8,3194.6,23.3,17.061,0.0,3.507,3.809,0.561,7.402,0.827,0.339,0.0,0.0,8.048,-0.061,4.794,0.0,0.725,0.0,5.537,-11.433,0.0,-0.003,-0.534,-0.07,2.804,-0.081,8.486,0.0,0.0,-6.136,-0.056,-1.138,-2.926,-0.16,0.0,2.833,9.856,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
365
365
|
base-misc-shielding-of-home.xml,58.397,58.397,36.051,36.051,22.345,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.369,4.391,0.853,9.163,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.345,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.926,14.505,9.234,0.614,0.0,0.0,0.0,0.0,2132.0,3292.2,23.034,17.861,0.0,3.547,3.636,0.512,7.503,0.629,-2.038,0.0,0.0,8.27,-0.064,4.422,0.0,0.729,0.0,4.848,-11.406,0.0,-0.057,-0.467,-0.052,2.669,-0.027,9.781,0.0,0.0,-6.372,-0.061,-1.059,-2.575,-0.167,0.0,3.166,9.881,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,31456.0,8573.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,3775.0,17855.0,5214.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,512.0,2520.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,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,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,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
|
|
366
366
|
base-misc-usage-multiplier.xml,126.558,126.558,50.735,50.735,68.627,0.0,2.249,4.947,0.0,0.0,0.0,0.0,0.349,4.541,0.89,8.303,0.0,0.0,4.059,0.0,0.3,0.0,0.0,0.0,0.0,1.998,2.151,0.0,0.287,0.329,1.361,1.375,0.0,1.903,7.537,0.0,0.0,0.0,8.286,3.993,3.073,0.0,0.0,0.0,21.139,0.0,0.0,0.0,0.0,0.0,44.97,0.0,0.0,2.518,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,0.0,0.0,0.0,0.0,0.0,2.249,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.947,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.796,15.117,8.31,0.613,0.0,0.0,0.0,0.0,2739.6,4281.9,22.756,18.522,0.0,3.566,3.647,0.513,7.543,0.631,-1.992,0.0,0.0,8.318,-0.065,4.859,0.0,0.657,0.0,4.608,-12.834,0.0,-0.083,-0.487,-0.055,2.615,-0.033,9.737,0.0,0.0,-6.459,-0.061,-1.206,-3.21,-0.152,0.0,3.276,11.416,1219.3,897.9,10259.7,2354.3,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
367
|
-
base-pv-battery-ah.xml,59.
|
|
368
|
-
base-pv-battery-garage.xml,59.
|
|
369
|
-
base-pv-battery-round-trip-efficiency.xml,60.
|
|
370
|
-
base-pv-battery-scheduled.xml,60.
|
|
371
|
-
base-pv-battery.xml,59.
|
|
372
|
-
base-pv-generators-battery-scheduled.xml,77.
|
|
373
|
-
base-pv-generators-battery.xml,76.
|
|
367
|
+
base-pv-battery-ah.xml,59.524,32.637,36.693,9.807,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,0.781,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
368
|
+
base-pv-battery-garage.xml,59.897,33.011,35.422,8.536,24.475,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.404,2.985,0.523,9.264,0.0,0.0,4.51,0.142,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,0.828,24.475,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.914,8.733,9.234,0.722,0.0,0.0,0.0,0.0,2135.7,2506.5,18.053,10.771,0.0,3.527,3.787,0.502,5.84,0.613,1.992,0.0,0.0,6.558,-0.041,5.37,0.0,0.0,0.0,3.843,-9.273,0.0,0.117,-0.268,-0.035,2.444,0.002,6.623,0.0,0.0,-5.628,-0.038,-1.216,-2.073,0.0,0.0,1.281,7.682,1354.8,997.6,11399.5,2615.8,36000.0,24000.0,0.0,6.8,91.76,29872.0,8041.0,5506.0,0.0,575.0,6537.0,0.0,0.0,2446.0,2171.0,4597.0,15062.0,3154.0,6028.0,0.0,207.0,523.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
369
|
+
base-pv-battery-round-trip-efficiency.xml,60.657,33.771,37.826,10.94,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,1.914,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
370
|
+
base-pv-battery-scheduled.xml,60.446,33.559,37.615,10.728,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,1.703,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
371
|
+
base-pv-battery.xml,59.524,32.637,36.693,9.807,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,0.781,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
372
|
+
base-pv-generators-battery-scheduled.xml,77.446,47.147,37.615,7.316,31.331,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,-3.412,1.703,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,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,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,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,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
373
|
+
base-pv-generators-battery.xml,76.55,46.251,36.719,6.42,31.331,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,-3.412,0.807,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,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,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,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,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
374
374
|
base-pv-generators.xml,75.743,45.445,35.912,5.614,31.331,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,-3.412,0.0,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,8.5,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,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,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,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
375
375
|
base-pv.xml,58.743,31.857,35.912,9.026,22.831,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.377,4.273,0.823,9.164,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,-26.886,0.0,0.0,22.831,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.381,13.978,9.234,0.614,0.0,0.0,0.0,0.0,2109.6,3297.4,23.054,17.898,0.0,3.542,3.634,0.511,7.499,0.628,-2.046,0.0,0.0,8.272,-0.062,4.804,0.0,0.728,0.0,4.94,-11.406,0.0,-0.043,-0.455,-0.051,2.706,-0.024,9.816,0.0,0.0,-6.314,-0.059,-1.166,-3.064,-0.165,0.0,3.097,9.882,1354.8,997.6,11399.6,2615.9,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
376
376
|
base-schedules-detailed-all-10-mins.xml,60.176,60.176,36.175,36.175,24.001,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.396,4.462,0.863,9.169,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.218,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.001,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,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,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,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,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.476,14.586,9.21,0.638,0.0,0.0,0.333,1.0,9360.3,10852.1,37.395,21.881,0.0,3.592,3.658,0.515,7.565,0.64,-1.883,0.0,0.0,8.29,-0.061,5.303,0.0,0.776,0.0,5.225,-11.445,0.0,-0.163,-0.479,-0.055,2.728,-0.03,9.808,0.0,0.0,-6.288,-0.057,-1.272,-2.954,-0.176,0.0,3.329,10.339,1354.7,998.0,11489.7,2636.5,36000.0,24000.0,0.0,6.8,91.76,32302.0,8597.0,7508.0,0.0,575.0,6409.0,0.0,0.0,2446.0,2171.0,4597.0,17964.0,5216.0,7127.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,2520.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,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,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,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
|
|
@@ -210,127 +210,53 @@ class HPXMLTest < MiniTest::Test
|
|
|
210
210
|
end
|
|
211
211
|
end
|
|
212
212
|
|
|
213
|
-
def
|
|
214
|
-
# Check that simulation works using template
|
|
213
|
+
def test_template_osws
|
|
214
|
+
# Check that simulation works using template-*.osw
|
|
215
215
|
require 'json'
|
|
216
216
|
|
|
217
|
-
|
|
217
|
+
['template-run-hpxml.osw',
|
|
218
|
+
'template-run-hpxml-with-stochastic-occupancy.osw',
|
|
219
|
+
'template-run-hpxml-with-stochastic-occupancy-subset.osw',
|
|
220
|
+
'template-build-and-run-hpxml-with-stochastic-occupancy.osw'].each do |osw_name|
|
|
221
|
+
osw_path = File.join(File.dirname(__FILE__), '..', osw_name)
|
|
218
222
|
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
223
|
+
# Create derivative OSW for testing
|
|
224
|
+
osw_path_test = osw_path.gsub('.osw', '_test.osw')
|
|
225
|
+
FileUtils.cp(osw_path, osw_path_test)
|
|
222
226
|
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
227
|
+
# Turn on debug mode
|
|
228
|
+
json = JSON.parse(File.read(osw_path_test), symbolize_names: true)
|
|
229
|
+
measure_index = json[:steps].find_index { |m| m[:measure_dir_name] == 'HPXMLtoOpenStudio' }
|
|
230
|
+
json[:steps][measure_index][:arguments][:debug] = true
|
|
226
231
|
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
File.open(osw_path_test, 'w') do |f|
|
|
233
|
-
f.write(JSON.pretty_generate(json))
|
|
234
|
-
end
|
|
235
|
-
|
|
236
|
-
command = "\"#{OpenStudio.getOpenStudioCLI}\" run -w \"#{osw_path_test}\""
|
|
237
|
-
system(command, err: File::NULL)
|
|
238
|
-
|
|
239
|
-
# Check for output files
|
|
240
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'eplusout.msgpack'))
|
|
241
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'results_annual.csv'))
|
|
242
|
-
|
|
243
|
-
# Check for debug files
|
|
244
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'in.osm'))
|
|
245
|
-
hpxml_defaults_path = File.join(File.dirname(osw_path_test), 'run', 'in.xml')
|
|
246
|
-
assert(File.exist? hpxml_defaults_path)
|
|
247
|
-
|
|
248
|
-
# Cleanup
|
|
249
|
-
File.delete(osw_path_test)
|
|
250
|
-
end
|
|
251
|
-
|
|
252
|
-
def test_template_osw_with_schedule
|
|
253
|
-
# Check that simulation works using template-run-hpxml-with-stochastic-occupancy.osw
|
|
254
|
-
require 'json'
|
|
255
|
-
|
|
256
|
-
osw_path = File.join(File.dirname(__FILE__), '..', 'template-run-hpxml-with-stochastic-occupancy.osw')
|
|
257
|
-
|
|
258
|
-
# Create derivative OSW for testing
|
|
259
|
-
osw_path_test = osw_path.gsub('.osw', '_test.osw')
|
|
260
|
-
FileUtils.cp(osw_path, osw_path_test)
|
|
261
|
-
|
|
262
|
-
# Turn on debug mode
|
|
263
|
-
json = JSON.parse(File.read(osw_path_test), symbolize_names: true)
|
|
264
|
-
json[:steps][1][:arguments][:debug] = true
|
|
265
|
-
|
|
266
|
-
if Dir.exist? File.join(File.dirname(__FILE__), '..', '..', 'project')
|
|
267
|
-
# CI checks out the repo as "project", so update dir name
|
|
268
|
-
json[:steps][1][:measure_dir_name] = 'project'
|
|
269
|
-
end
|
|
270
|
-
|
|
271
|
-
File.open(osw_path_test, 'w') do |f|
|
|
272
|
-
f.write(JSON.pretty_generate(json))
|
|
273
|
-
end
|
|
274
|
-
|
|
275
|
-
command = "\"#{OpenStudio.getOpenStudioCLI}\" run -w \"#{osw_path_test}\""
|
|
276
|
-
system(command, err: File::NULL)
|
|
277
|
-
|
|
278
|
-
# Check for output files
|
|
279
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'eplusout.msgpack'))
|
|
280
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'results_annual.csv'))
|
|
281
|
-
|
|
282
|
-
# Check for debug files
|
|
283
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'in.osm'))
|
|
284
|
-
hpxml_defaults_path = File.join(File.dirname(osw_path_test), 'run', 'in.xml')
|
|
285
|
-
assert(File.exist? hpxml_defaults_path)
|
|
286
|
-
|
|
287
|
-
# Cleanup
|
|
288
|
-
File.delete(osw_path_test)
|
|
289
|
-
xml_path_test = File.join(File.dirname(__FILE__), '..', 'run', 'base-stochastic-schedules.xml')
|
|
290
|
-
File.delete(xml_path_test)
|
|
291
|
-
end
|
|
292
|
-
|
|
293
|
-
def test_template_osw_with_build_hpxml_and_schedule
|
|
294
|
-
# Check that simulation works using template-build-and-run-hpxml-with-stochastic-occupancy.osw
|
|
295
|
-
require 'json'
|
|
232
|
+
if Dir.exist? File.join(File.dirname(__FILE__), '..', '..', 'project')
|
|
233
|
+
# CI checks out the repo as "project", so update dir name
|
|
234
|
+
json[:steps][measure_index][:measure_dir_name] = 'project'
|
|
235
|
+
end
|
|
296
236
|
|
|
297
|
-
|
|
237
|
+
File.open(osw_path_test, 'w') do |f|
|
|
238
|
+
f.write(JSON.pretty_generate(json))
|
|
239
|
+
end
|
|
298
240
|
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
FileUtils.cp(osw_path, osw_path_test)
|
|
241
|
+
command = "\"#{OpenStudio.getOpenStudioCLI}\" run -w \"#{osw_path_test}\""
|
|
242
|
+
system(command, err: File::NULL)
|
|
302
243
|
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
244
|
+
# Check for output files
|
|
245
|
+
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'eplusout.msgpack'))
|
|
246
|
+
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'results_annual.csv'))
|
|
306
247
|
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
248
|
+
# Check for debug files
|
|
249
|
+
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'in.osm'))
|
|
250
|
+
hpxml_defaults_path = File.join(File.dirname(osw_path_test), 'run', 'in.xml')
|
|
251
|
+
assert(File.exist? hpxml_defaults_path)
|
|
311
252
|
|
|
312
|
-
|
|
313
|
-
|
|
253
|
+
# Cleanup
|
|
254
|
+
File.delete(osw_path_test)
|
|
255
|
+
xml_path_test = File.join(File.dirname(__FILE__), '..', 'run', 'built.xml')
|
|
256
|
+
File.delete(xml_path_test) if File.exist?(xml_path_test)
|
|
257
|
+
xml_path_test = File.join(File.dirname(__FILE__), '..', 'run', 'built-stochastic-schedules.xml')
|
|
258
|
+
File.delete(xml_path_test) if File.exist?(xml_path_test)
|
|
314
259
|
end
|
|
315
|
-
|
|
316
|
-
command = "\"#{OpenStudio.getOpenStudioCLI}\" run -w \"#{osw_path_test}\""
|
|
317
|
-
system(command, err: File::NULL)
|
|
318
|
-
|
|
319
|
-
# Check for output files
|
|
320
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'eplusout.msgpack'))
|
|
321
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'results_annual.csv'))
|
|
322
|
-
|
|
323
|
-
# Check for debug files
|
|
324
|
-
assert(File.exist? File.join(File.dirname(osw_path_test), 'run', 'in.osm'))
|
|
325
|
-
hpxml_defaults_path = File.join(File.dirname(osw_path_test), 'run', 'in.xml')
|
|
326
|
-
assert(File.exist? hpxml_defaults_path)
|
|
327
|
-
|
|
328
|
-
# Cleanup
|
|
329
|
-
File.delete(osw_path_test)
|
|
330
|
-
xml_path_test = File.join(File.dirname(__FILE__), '..', 'run', 'built.xml')
|
|
331
|
-
File.delete(xml_path_test)
|
|
332
|
-
xml_path_test = File.join(File.dirname(__FILE__), '..', 'run', 'built-stochastic-schedules.xml')
|
|
333
|
-
File.delete(xml_path_test)
|
|
334
260
|
end
|
|
335
261
|
|
|
336
262
|
def test_multiple_building_ids
|
data/lib/uo_cli/version.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# *********************************************************************************
|
|
2
|
-
# URBANopt™, Copyright (c) 2019-
|
|
2
|
+
# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
|
|
3
3
|
# contributors. All rights reserved.
|
|
4
4
|
|
|
5
5
|
# Redistribution and use in source and binary forms, with or without modification,
|
|
@@ -40,6 +40,6 @@
|
|
|
40
40
|
|
|
41
41
|
module URBANopt
|
|
42
42
|
module CLI
|
|
43
|
-
VERSION = '0.9.
|
|
43
|
+
VERSION = '0.9.2'.freeze
|
|
44
44
|
end
|
|
45
45
|
end
|
data/lib/uo_cli.rb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/ ruby
|
|
2
2
|
|
|
3
3
|
# *********************************************************************************
|
|
4
|
-
# URBANopt™, Copyright (c) 2019-
|
|
4
|
+
# URBANopt™, Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other
|
|
5
5
|
# contributors. All rights reserved.
|
|
6
6
|
|
|
7
7
|
# Redistribution and use in source and binary forms, with or without modification,
|
|
@@ -453,26 +453,26 @@ module URBANopt
|
|
|
453
453
|
# One solution would be changing scenario_file to feature.
|
|
454
454
|
# Would that be confusing when creating a ScenarioFile from the FeatureFile?
|
|
455
455
|
if @opthash.subopts[:feature]
|
|
456
|
-
@feature_path, @feature_name =
|
|
456
|
+
@feature_path, @feature_name = Pathname(File.expand_path(@opthash.subopts[:feature])).split
|
|
457
457
|
end
|
|
458
458
|
if @opthash.subopts[:scenario]
|
|
459
|
-
@root_dir, @scenario_file_name =
|
|
459
|
+
@root_dir, @scenario_file_name = Pathname(File.expand_path(@opthash.subopts[:scenario])).split
|
|
460
460
|
@scenario_name = File.basename(@scenario_file_name, File.extname(@scenario_file_name))
|
|
461
461
|
end
|
|
462
462
|
|
|
463
463
|
# Simulate energy usage as defined by ScenarioCSV
|
|
464
464
|
def self.run_func
|
|
465
|
-
run_dir =
|
|
466
|
-
csv_file =
|
|
467
|
-
featurefile =
|
|
468
|
-
mapper_files_dir =
|
|
469
|
-
reopt_files_dir =
|
|
465
|
+
run_dir = @root_dir / 'run' / @scenario_name.downcase
|
|
466
|
+
csv_file = @root_dir / @scenario_file_name
|
|
467
|
+
featurefile = @root_dir / @feature_name
|
|
468
|
+
mapper_files_dir = @root_dir / 'mappers'
|
|
469
|
+
reopt_files_dir = @root_dir / 'reopt/'
|
|
470
470
|
num_header_rows = 1
|
|
471
471
|
|
|
472
472
|
if @feature_id
|
|
473
|
-
feature_run_dir =
|
|
473
|
+
feature_run_dir = run_dir / @feature_id
|
|
474
474
|
# If run folder for feature exists, remove it
|
|
475
|
-
FileUtils.rm_rf(feature_run_dir) if
|
|
475
|
+
FileUtils.rm_rf(feature_run_dir) if feature_run_dir.exist?
|
|
476
476
|
end
|
|
477
477
|
|
|
478
478
|
feature_file = URBANopt::GeoJSON::GeoFile.from_file(featurefile)
|
|
@@ -578,6 +578,26 @@ module URBANopt
|
|
|
578
578
|
end
|
|
579
579
|
end
|
|
580
580
|
|
|
581
|
+
# Change num_parallel in runner.conf to set number of cores to use when running simulations
|
|
582
|
+
# This function is called during project_dir creation/updating so users aren't surprised if they look at the config file
|
|
583
|
+
def self.use_num_parallel(project_dir)
|
|
584
|
+
if ENV['UO_NUM_PARALLEL'] || @opthash.subopts[:num_parallel]
|
|
585
|
+
runner_file_path = Pathname(project_dir) / 'runner.conf'
|
|
586
|
+
runner_conf_hash = JSON.parse(File.read(runner_file_path))
|
|
587
|
+
if @opthash.subopts[:num_parallel]
|
|
588
|
+
runner_conf_hash['num_parallel'] = @opthash.subopts[:num_parallel]
|
|
589
|
+
File.open(runner_file_path, 'w+') do |f|
|
|
590
|
+
f << runner_conf_hash.to_json
|
|
591
|
+
end
|
|
592
|
+
elsif ENV['UO_NUM_PARALLEL']
|
|
593
|
+
runner_conf_hash['num_parallel'] = ENV['UO_NUM_PARALLEL'].to_i
|
|
594
|
+
File.open(runner_file_path, 'w+') do |f|
|
|
595
|
+
f << runner_conf_hash.to_json
|
|
596
|
+
end
|
|
597
|
+
end
|
|
598
|
+
end
|
|
599
|
+
end
|
|
600
|
+
|
|
581
601
|
# Create project folder
|
|
582
602
|
# params\
|
|
583
603
|
# +dir_name+:: _string_ Name of new project folder
|
|
@@ -617,15 +637,7 @@ module URBANopt
|
|
|
617
637
|
|
|
618
638
|
# copy config file
|
|
619
639
|
FileUtils.cp(File.join(path_item, 'runner.conf'), dir_name)
|
|
620
|
-
|
|
621
|
-
if ENV['UO_NUM_PARALLEL']
|
|
622
|
-
runner_file_path = File.join(dir_name, 'runner.conf')
|
|
623
|
-
runner_conf_hash = JSON.parse(File.read(runner_file_path))
|
|
624
|
-
runner_conf_hash['num_parallel'] = ENV['UO_NUM_PARALLEL'].to_i
|
|
625
|
-
File.open(runner_file_path, 'w+') do |f|
|
|
626
|
-
f << runner_conf_hash.to_json
|
|
627
|
-
end
|
|
628
|
-
end
|
|
640
|
+
use_num_parallel(dir_name)
|
|
629
641
|
|
|
630
642
|
# copy gemfile
|
|
631
643
|
FileUtils.cp(File.join(path_item, 'Gemfile'), dir_name)
|
|
@@ -681,6 +693,9 @@ module URBANopt
|
|
|
681
693
|
FileUtils.cp(File.join(path_item, 'mappers/ThermalStorage.rb'), File.join(dir_name, 'mappers'))
|
|
682
694
|
FileUtils.cp(File.join(path_item, 'mappers/EvCharging.rb'), File.join(dir_name, 'mappers'))
|
|
683
695
|
FileUtils.cp(File.join(path_item, 'mappers/FlexibleHotWater.rb'), File.join(dir_name, 'mappers'))
|
|
696
|
+
FileUtils.cp(File.join(path_item, 'mappers/ChilledWaterStorage.rb'), File.join(dir_name, 'mappers'))
|
|
697
|
+
FileUtils.cp(File.join(path_item, 'mappers/PeakHoursThermostatAdjust.rb'), File.join(dir_name, 'mappers'))
|
|
698
|
+
FileUtils.cp(File.join(path_item, 'mappers/PeakHoursMelsShedding.rb'), File.join(dir_name, 'mappers'))
|
|
684
699
|
|
|
685
700
|
# copy osw file
|
|
686
701
|
FileUtils.cp(File.join(path_item, 'mappers/base_workflow.osw'), File.join(dir_name, 'mappers'))
|
|
@@ -811,19 +826,10 @@ module URBANopt
|
|
|
811
826
|
|
|
812
827
|
# copy config file
|
|
813
828
|
FileUtils.cp_r(File.join(path_item, 'runner.conf'), new_path, remove_destination: true)
|
|
814
|
-
|
|
815
|
-
# TODO: make this into a function...it's used in 2 places
|
|
816
|
-
if ENV['UO_NUM_PARALLEL']
|
|
817
|
-
runner_file_path = File.join(new_path, 'runner.conf')
|
|
818
|
-
runner_conf_hash = JSON.parse(File.read(runner_file_path))
|
|
819
|
-
runner_conf_hash['num_parallel'] = ENV['UO_NUM_PARALLEL'].to_i
|
|
820
|
-
File.open(runner_file_path, 'w+') do |f|
|
|
821
|
-
f << runner_conf_hash.to_json
|
|
822
|
-
end
|
|
823
|
-
end
|
|
829
|
+
use_num_parallel(new_path)
|
|
824
830
|
|
|
825
831
|
# Replace standard mappers
|
|
826
|
-
#
|
|
832
|
+
# FIXME: this also copies createBar and Floorspace without checking project type (for now)
|
|
827
833
|
mappers = File.join(path_item, 'mappers')
|
|
828
834
|
Pathname.new(mappers).children.each { |mapper| FileUtils.cp_r(mapper, File.join(new_path, 'mappers'), remove_destination: true) }
|
|
829
835
|
|
|
@@ -920,7 +926,7 @@ module URBANopt
|
|
|
920
926
|
# Return UO python packages list from python_deps/dependencies.json
|
|
921
927
|
def self.get_python_deps
|
|
922
928
|
deps = []
|
|
923
|
-
the_path =
|
|
929
|
+
the_path = ''
|
|
924
930
|
$LOAD_PATH.each do |path_item|
|
|
925
931
|
if path_item.to_s.end_with?('example_files')
|
|
926
932
|
# install python in cli gem's example_files/python_deps folder
|
|
@@ -980,18 +986,18 @@ module URBANopt
|
|
|
980
986
|
puts "DEPENDENCIES RETRIEVED FROM FILE: #{deps}"
|
|
981
987
|
errors = []
|
|
982
988
|
deps.each do |dep|
|
|
983
|
-
#TODO: Update when there is a stable release for DISCO
|
|
984
|
-
if dep[:name].to_s.include?
|
|
989
|
+
# TODO: Update when there is a stable release for DISCO
|
|
990
|
+
if dep[:name].to_s.include? 'disco'
|
|
985
991
|
stdout, stderr, status = Open3.capture3("#{pvars[:pip_path]} show NREL-disco")
|
|
986
|
-
else
|
|
992
|
+
else
|
|
987
993
|
stdout, stderr, status = Open3.capture3("#{pvars[:pip_path]} show #{dep[:name]}")
|
|
988
994
|
end
|
|
989
995
|
if stderr.empty?
|
|
990
996
|
# check versions
|
|
991
|
-
m = stdout.match
|
|
997
|
+
m = stdout.match(/^Version: (\S{3,}$)/)
|
|
992
998
|
err = true
|
|
993
|
-
if m
|
|
994
|
-
if !dep[:version].nil?
|
|
999
|
+
if m && m.size > 1
|
|
1000
|
+
if !dep[:version].nil? && dep[:version].to_s == m[1].to_s
|
|
995
1001
|
puts "...#{dep[:name]} found with specified version #{dep[:version]}"
|
|
996
1002
|
err = false
|
|
997
1003
|
elsif dep[:version].nil?
|
|
@@ -1107,14 +1113,14 @@ module URBANopt
|
|
|
1107
1113
|
deps = get_python_deps
|
|
1108
1114
|
deps.each do |dep|
|
|
1109
1115
|
puts "Installing #{dep[:name]}..."
|
|
1110
|
-
the_command =
|
|
1116
|
+
the_command = ''
|
|
1111
1117
|
if dep[:version].nil?
|
|
1112
1118
|
the_command = "#{pvars[:pip_path]} install #{dep[:name]}"
|
|
1113
1119
|
else
|
|
1114
1120
|
the_command = "#{pvars[:pip_path]} install #{dep[:name]}~=#{dep[:version]}"
|
|
1115
1121
|
end
|
|
1116
1122
|
# system(the_command)
|
|
1117
|
-
#puts "INSTALL COMMAND: #{the_command}"
|
|
1123
|
+
# puts "INSTALL COMMAND: #{the_command}"
|
|
1118
1124
|
stdout, stderr, status = Open3.capture3(the_command)
|
|
1119
1125
|
if stderr && !stderr == ''
|
|
1120
1126
|
puts "Error installing: #{stderr}"
|
|
@@ -1197,7 +1203,7 @@ module URBANopt
|
|
|
1197
1203
|
@opthash.subopts[:scenario_file].nil? &&
|
|
1198
1204
|
@opthash.subopts[:reopt_scenario_file].nil? &&
|
|
1199
1205
|
@opthash.subopts[:project_folder].nil?
|
|
1200
|
-
abort("\nNo options provided
|
|
1206
|
+
abort("\nNo options provided for the `create` command. Did you forget a flag? Perhaps `-p`? See `uo create --help` for all options\n")
|
|
1201
1207
|
end
|
|
1202
1208
|
|
|
1203
1209
|
# Update existing URBANopt Project files
|
|
@@ -1217,26 +1223,10 @@ module URBANopt
|
|
|
1217
1223
|
|
|
1218
1224
|
# Run simulations
|
|
1219
1225
|
if @opthash.command == 'run' && @opthash.subopts[:scenario] && @opthash.subopts[:feature]
|
|
1220
|
-
|
|
1221
|
-
# If set by env variable, use that, otherwise use what the user specified in the cli
|
|
1222
|
-
if ENV['UO_NUM_PARALLEL'] || @opthash.subopts[:num_parallel]
|
|
1223
|
-
runner_file_path = File.join(@root_dir, 'runner.conf')
|
|
1224
|
-
runner_conf_hash = JSON.parse(File.read(runner_file_path))
|
|
1225
|
-
if @opthash.subopts[:num_parallel]
|
|
1226
|
-
runner_conf_hash['num_parallel'] = @opthash.subopts[:num_parallel]
|
|
1227
|
-
File.open(runner_file_path, 'w+') do |f|
|
|
1228
|
-
f << runner_conf_hash.to_json
|
|
1229
|
-
end
|
|
1230
|
-
elsif ENV['UO_NUM_PARALLEL']
|
|
1231
|
-
runner_conf_hash['num_parallel'] = ENV['UO_NUM_PARALLEL'].to_i
|
|
1232
|
-
File.open(runner_file_path, 'w+') do |f|
|
|
1233
|
-
f << runner_conf_hash.to_json
|
|
1234
|
-
end
|
|
1235
|
-
end
|
|
1236
|
-
end
|
|
1226
|
+
use_num_parallel(@root_dir)
|
|
1237
1227
|
|
|
1238
1228
|
if @opthash.subopts[:scenario].to_s.include? '-'
|
|
1239
|
-
@feature_id = (@feature_name.split(/\W+/)[1])
|
|
1229
|
+
@feature_id = (@feature_name.to_s.split(/\W+/)[1])
|
|
1240
1230
|
end
|
|
1241
1231
|
|
|
1242
1232
|
puts "\nSimulating features of '#{@feature_name}' as directed by '#{@scenario_file_name}'...\n\n"
|
|
@@ -1414,12 +1404,12 @@ module URBANopt
|
|
|
1414
1404
|
commands.each do |command|
|
|
1415
1405
|
# TODO: This will be updated so stderr only reports error/warnings at DISCO level
|
|
1416
1406
|
stdout, stderr, status = Open3.capture3(command)
|
|
1417
|
-
if !stderr.empty?
|
|
1407
|
+
if !stderr.empty?
|
|
1418
1408
|
puts "ERROR running DISCO: #{stderr}"
|
|
1419
1409
|
end
|
|
1420
1410
|
end
|
|
1421
|
-
puts "Refer to detailed log file #{File.join(run_folder,'disco','run_upgrade_cost_analysis.log')} for more information on the run."
|
|
1422
|
-
puts "Refer to the output summary file #{File.join(run_folder,'disco','output_summary.json')} for a summary of the results."
|
|
1411
|
+
puts "Refer to detailed log file #{File.join(run_folder, 'disco', 'run_upgrade_cost_analysis.log')} for more information on the run."
|
|
1412
|
+
puts "Refer to the output summary file #{File.join(run_folder, 'disco', 'output_summary.json')} for a summary of the results."
|
|
1423
1413
|
end
|
|
1424
1414
|
end
|
|
1425
1415
|
|
|
@@ -1459,7 +1449,7 @@ module URBANopt
|
|
|
1459
1449
|
|
|
1460
1450
|
# Post-process the scenario
|
|
1461
1451
|
if @opthash.command == 'process'
|
|
1462
|
-
if @opthash.subopts[:default] == false && @opthash.subopts[:opendss] == false && @opthash.subopts[:reopt_scenario] == false && @opthash.subopts[:reopt_feature] == false && @opthash.subopts[:disco] == false
|
|
1452
|
+
if @opthash.subopts[:default] == false && @opthash.subopts[:opendss] == false && @opthash.subopts[:reopt_scenario] == false && @opthash.subopts[:reopt_feature] == false && @opthash.subopts[:disco] == false
|
|
1463
1453
|
abort("\nERROR: No valid process type entered. Must enter a valid process type\n")
|
|
1464
1454
|
end
|
|
1465
1455
|
|
|
@@ -1720,12 +1710,17 @@ module URBANopt
|
|
|
1720
1710
|
abort("\nERROR: Units type not recognized. Please use a valid option in the CLI")
|
|
1721
1711
|
end
|
|
1722
1712
|
building_type = feature[:properties][:building_type] # From FeatureFile
|
|
1723
|
-
|
|
1724
|
-
|
|
1725
|
-
|
|
1726
|
-
puts "\nFeature #{File.basename(feature_path)} (#{building_type}) EUI of #{feature_eui_value.round(2)} #{unit_value}
|
|
1713
|
+
validation_upper_limit = validation_params['EUI'][@opthash.subopts[:units]][building_type]['max']
|
|
1714
|
+
validation_lower_limit = validation_params['EUI'][@opthash.subopts[:units]][building_type]['min']
|
|
1715
|
+
if feature_eui_value > validation_upper_limit
|
|
1716
|
+
puts "\nFeature #{File.basename(feature_path)} (#{building_type}) EUI of #{feature_eui_value.round(2)} #{unit_value} " \
|
|
1717
|
+
"is greater than the validation maximum of #{validation_upper_limit}."
|
|
1718
|
+
elsif feature_eui_value < validation_lower_limit
|
|
1719
|
+
puts "\nFeature #{File.basename(feature_path)} (#{building_type}) EUI of #{feature_eui_value.round(2)} #{unit_value} " \
|
|
1720
|
+
"is less than the validation minimum of #{validation_lower_limit}."
|
|
1727
1721
|
else
|
|
1728
|
-
puts "\nFeature #{File.basename(feature_path)} (#{building_type}) EUI of #{feature_eui_value.round(2)} #{unit_value}
|
|
1722
|
+
puts "\nFeature #{File.basename(feature_path)} (#{building_type}) EUI of #{feature_eui_value.round(2)} #{unit_value} " \
|
|
1723
|
+
"is within bounds set by #{validation_file_name} (#{validation_lower_limit} - #{validation_upper_limit})."
|
|
1729
1724
|
end
|
|
1730
1725
|
end
|
|
1731
1726
|
end
|
data/uo_cli.gemspec
CHANGED
|
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
|
|
|
32
32
|
spec.require_paths = ['lib', 'example_files']
|
|
33
33
|
spec.required_ruby_version = '~> 2.7.0'
|
|
34
34
|
|
|
35
|
-
#
|
|
35
|
+
# use specific versions of urbanopt and openstudio dependencies while under heavy development
|
|
36
36
|
spec.add_runtime_dependency 'optimist', '~> 3'
|
|
37
37
|
spec.add_runtime_dependency 'urbanopt-geojson', '~> 0.9.0'
|
|
38
38
|
spec.add_runtime_dependency 'urbanopt-reopt', '~> 0.9.0'
|
|
@@ -47,4 +47,6 @@ Gem::Specification.new do |spec|
|
|
|
47
47
|
spec.add_development_dependency 'rubocop', '~> 1.15.0'
|
|
48
48
|
spec.add_development_dependency 'rubocop-checkstyle_formatter', '~> 0.4.0'
|
|
49
49
|
spec.add_development_dependency 'rubocop-performance', '~> 1.11.3'
|
|
50
|
+
spec.add_development_dependency 'simplecov', '~> 0.18.2'
|
|
51
|
+
spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
|
|
50
52
|
end
|